diff --git a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java
index 240f8e43e5..f4145d4b98 100644
--- a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java
+++ b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java
@@ -40,201 +40,234 @@ import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-
 /**
  * <p>
- * Given a domain object instance passed as a method argument, ensures the principal has appropriate permission
- * as indicated by the {@link AclService}.
+ * Given a domain object instance passed as a method argument, ensures the principal has
+ * appropriate permission as indicated by the {@link AclService}.
  * <p>
- * The <tt>AclService</tt> is used to retrieve the access control list (ACL) permissions associated with a
- * domain object instance for the current <tt>Authentication</tt> object.
+ * The <tt>AclService</tt> is used to retrieve the access control list (ACL) permissions
+ * associated with a domain object instance for the current <tt>Authentication</tt>
+ * object.
  * <p>
- * The voter will vote if any  {@link ConfigAttribute#getAttribute()} matches the {@link #processConfigAttribute}.
- * The provider will then locate the first method argument of type {@link #processDomainObjectClass}. Assuming that
- * method argument is non-null, the provider will then lookup the ACLs from the <code>AclManager</code> and ensure the
- * principal is {@link Acl#isGranted(List,
- * List, boolean)} when presenting the {@link #requirePermission} array to that
- * method.
+ * The voter will vote if any {@link ConfigAttribute#getAttribute()} matches the
+ * {@link #processConfigAttribute}. The provider will then locate the first method
+ * argument of type {@link #processDomainObjectClass}. Assuming that method argument is
+ * non-null, the provider will then lookup the ACLs from the <code>AclManager</code> and
+ * ensure the principal is {@link Acl#isGranted(List, List, boolean)} when presenting the
+ * {@link #requirePermission} array to that method.
  * <p>
- * If the method argument is <tt>null</tt>, the voter will abstain from voting. If the method argument
- * could not be found, an {@link AuthorizationServiceException} will be thrown.
+ * If the method argument is <tt>null</tt>, the voter will abstain from voting. If the
+ * method argument could not be found, an {@link AuthorizationServiceException} will be
+ * thrown.
  * <p>
- * In practical terms users will typically setup a number of <tt>AclEntryVoter</tt>s. Each will have a
- * different {@link #setProcessDomainObjectClass processDomainObjectClass}, {@link #processConfigAttribute} and
- * {@link #requirePermission} combination. For example, a small application might employ the following instances of
+ * In practical terms users will typically setup a number of <tt>AclEntryVoter</tt>s. Each
+ * will have a different {@link #setProcessDomainObjectClass processDomainObjectClass},
+ * {@link #processConfigAttribute} and {@link #requirePermission} combination. For
+ * example, a small application might employ the following instances of
  * <tt>AclEntryVoter</tt>:
- *  <ul>
- *      <li>Process domain object class <code>BankAccount</code>, configuration attribute
- *      <code>VOTE_ACL_BANK_ACCONT_READ</code>, require permission <code>BasePermission.READ</code></li>
- *      <li>Process domain object class <code>BankAccount</code>, configuration attribute
- *      <code>VOTE_ACL_BANK_ACCOUNT_WRITE</code>, require permission list <code>BasePermission.WRITE</code> and
- *      <code>BasePermission.CREATE</code> (allowing the principal to have <b>either</b> of these two permissions)</li>
- *      <li>Process domain object class <code>Customer</code>, configuration attribute
- *      <code>VOTE_ACL_CUSTOMER_READ</code>, require permission <code>BasePermission.READ</code></li>
- *      <li>Process domain object class <code>Customer</code>, configuration attribute
- *      <code>VOTE_ACL_CUSTOMER_WRITE</code>, require permission list <code>BasePermission.WRITE</code> and
- *      <code>BasePermission.CREATE</code></li>
- *  </ul>
- *  Alternatively, you could have used a common superclass or interface for the {@link #processDomainObjectClass}
- * if both <code>BankAccount</code> and <code>Customer</code> had common parents.</p>
- *  <p>If the principal does not have sufficient permissions, the voter will vote to deny access.</p>
- *  <p>All comparisons and prefixes are case sensitive.</p>
+ * <ul>
+ * <li>Process domain object class <code>BankAccount</code>, configuration attribute
+ * <code>VOTE_ACL_BANK_ACCONT_READ</code>, require permission
+ * <code>BasePermission.READ</code></li>
+ * <li>Process domain object class <code>BankAccount</code>, configuration attribute
+ * <code>VOTE_ACL_BANK_ACCOUNT_WRITE</code>, require permission list
+ * <code>BasePermission.WRITE</code> and <code>BasePermission.CREATE</code> (allowing the
+ * principal to have <b>either</b> of these two permissions)</li>
+ * <li>Process domain object class <code>Customer</code>, configuration attribute
+ * <code>VOTE_ACL_CUSTOMER_READ</code>, require permission
+ * <code>BasePermission.READ</code></li>
+ * <li>Process domain object class <code>Customer</code>, configuration attribute
+ * <code>VOTE_ACL_CUSTOMER_WRITE</code>, require permission list
+ * <code>BasePermission.WRITE</code> and <code>BasePermission.CREATE</code></li>
+ * </ul>
+ * Alternatively, you could have used a common superclass or interface for the
+ * {@link #processDomainObjectClass} if both <code>BankAccount</code> and
+ * <code>Customer</code> had common parents.
+ * </p>
+ * <p>
+ * If the principal does not have sufficient permissions, the voter will vote to deny
+ * access.
+ * </p>
+ * <p>
+ * All comparisons and prefixes are case sensitive.
+ * </p>
  *
  * @author Ben Alex
  */
 public class AclEntryVoter extends AbstractAclVoter {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(AclEntryVoter.class);
+	private static final Log logger = LogFactory.getLog(AclEntryVoter.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AclService aclService;
-    private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
-    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
-    private String internalMethod;
-    private String processConfigAttribute;
-    private List<Permission> requirePermission;
+	private AclService aclService;
+	private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+	private String internalMethod;
+	private String processConfigAttribute;
+	private List<Permission> requirePermission;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AclEntryVoter(AclService aclService, String processConfigAttribute, Permission[] requirePermission) {
-        Assert.notNull(processConfigAttribute, "A processConfigAttribute is mandatory");
-        Assert.notNull(aclService, "An AclService is mandatory");
+	public AclEntryVoter(AclService aclService, String processConfigAttribute,
+			Permission[] requirePermission) {
+		Assert.notNull(processConfigAttribute, "A processConfigAttribute is mandatory");
+		Assert.notNull(aclService, "An AclService is mandatory");
 
-        if ((requirePermission == null) || (requirePermission.length == 0)) {
-            throw new IllegalArgumentException("One or more requirePermission entries is mandatory");
-        }
+		if ((requirePermission == null) || (requirePermission.length == 0)) {
+			throw new IllegalArgumentException(
+					"One or more requirePermission entries is mandatory");
+		}
 
-        this.aclService = aclService;
-        this.processConfigAttribute = processConfigAttribute;
-        this.requirePermission = Arrays.asList(requirePermission);
-    }
+		this.aclService = aclService;
+		this.processConfigAttribute = processConfigAttribute;
+		this.requirePermission = Arrays.asList(requirePermission);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Optionally specifies a method of the domain object that will be used to obtain a contained domain
-     * object. That contained domain object will be used for the ACL evaluation. This is useful if a domain object
-     * contains a parent that an ACL evaluation should be targeted for, instead of the child domain object (which
-     * perhaps is being created and as such does not yet have any ACL permissions)
-     *
-     * @return <code>null</code> to use the domain object, or the name of a method (that requires no arguments) that
-     *         should be invoked to obtain an <code>Object</code> which will be the domain object used for ACL
-     *         evaluation
-     */
-    protected String getInternalMethod() {
-        return internalMethod;
-    }
+	/**
+	 * Optionally specifies a method of the domain object that will be used to obtain a
+	 * contained domain object. That contained domain object will be used for the ACL
+	 * evaluation. This is useful if a domain object contains a parent that an ACL
+	 * evaluation should be targeted for, instead of the child domain object (which
+	 * perhaps is being created and as such does not yet have any ACL permissions)
+	 *
+	 * @return <code>null</code> to use the domain object, or the name of a method (that
+	 * requires no arguments) that should be invoked to obtain an <code>Object</code>
+	 * which will be the domain object used for ACL evaluation
+	 */
+	protected String getInternalMethod() {
+		return internalMethod;
+	}
 
-    public void setInternalMethod(String internalMethod) {
-        this.internalMethod = internalMethod;
-    }
+	public void setInternalMethod(String internalMethod) {
+		this.internalMethod = internalMethod;
+	}
 
-    protected String getProcessConfigAttribute() {
-        return processConfigAttribute;
-    }
+	protected String getProcessConfigAttribute() {
+		return processConfigAttribute;
+	}
 
-    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-        Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
-        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-    }
+	public void setObjectIdentityRetrievalStrategy(
+			ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+		Assert.notNull(objectIdentityRetrievalStrategy,
+				"ObjectIdentityRetrievalStrategy required");
+		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+	}
 
-    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-        this.sidRetrievalStrategy = sidRetrievalStrategy;
-    }
+	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+		this.sidRetrievalStrategy = sidRetrievalStrategy;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return (attribute.getAttribute() != null) && attribute.getAttribute().equals(getProcessConfigAttribute());
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return (attribute.getAttribute() != null)
+				&& attribute.getAttribute().equals(getProcessConfigAttribute());
+	}
 
-    public int vote(Authentication authentication, MethodInvocation object, Collection<ConfigAttribute> attributes) {
+	public int vote(Authentication authentication, MethodInvocation object,
+			Collection<ConfigAttribute> attributes) {
 
-        for(ConfigAttribute attr : attributes) {
+		for (ConfigAttribute attr : attributes) {
 
-            if (!this.supports(attr)) {
-                continue;
-            }
-            // Need to make an access decision on this invocation
-            // Attempt to locate the domain object instance to process
-            Object domainObject = getDomainObjectInstance(object);
+			if (!this.supports(attr)) {
+				continue;
+			}
+			// Need to make an access decision on this invocation
+			// Attempt to locate the domain object instance to process
+			Object domainObject = getDomainObjectInstance(object);
 
-            // If domain object is null, vote to abstain
-            if (domainObject == null) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Voting to abstain - domainObject is null");
-                }
+			// If domain object is null, vote to abstain
+			if (domainObject == null) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Voting to abstain - domainObject is null");
+				}
 
-                return ACCESS_ABSTAIN;
-            }
+				return ACCESS_ABSTAIN;
+			}
 
-            // Evaluate if we are required to use an inner domain object
-            if (StringUtils.hasText(internalMethod)) {
-                try {
-                    Class<?> clazz = domainObject.getClass();
-                    Method method = clazz.getMethod(internalMethod, new Class[0]);
-                    domainObject = method.invoke(domainObject);
-                } catch (NoSuchMethodException nsme) {
-                    throw new AuthorizationServiceException("Object of class '" + domainObject.getClass()
-                        + "' does not provide the requested internalMethod: " + internalMethod);
-                } catch (IllegalAccessException iae) {
-                    logger.debug("IllegalAccessException", iae);
+			// Evaluate if we are required to use an inner domain object
+			if (StringUtils.hasText(internalMethod)) {
+				try {
+					Class<?> clazz = domainObject.getClass();
+					Method method = clazz.getMethod(internalMethod, new Class[0]);
+					domainObject = method.invoke(domainObject);
+				}
+				catch (NoSuchMethodException nsme) {
+					throw new AuthorizationServiceException("Object of class '"
+							+ domainObject.getClass()
+							+ "' does not provide the requested internalMethod: "
+							+ internalMethod);
+				}
+				catch (IllegalAccessException iae) {
+					logger.debug("IllegalAccessException", iae);
 
-                    throw new AuthorizationServiceException("Problem invoking internalMethod: " + internalMethod
-                        + " for object: " + domainObject);
-                } catch (InvocationTargetException ite) {
-                    logger.debug("InvocationTargetException", ite);
+					throw new AuthorizationServiceException(
+							"Problem invoking internalMethod: " + internalMethod
+									+ " for object: " + domainObject);
+				}
+				catch (InvocationTargetException ite) {
+					logger.debug("InvocationTargetException", ite);
 
-                    throw new AuthorizationServiceException("Problem invoking internalMethod: " + internalMethod
-                        + " for object: " + domainObject);
-                }
-            }
+					throw new AuthorizationServiceException(
+							"Problem invoking internalMethod: " + internalMethod
+									+ " for object: " + domainObject);
+				}
+			}
 
-            // Obtain the OID applicable to the domain object
-            ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
+			// Obtain the OID applicable to the domain object
+			ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy
+					.getObjectIdentity(domainObject);
 
-            // Obtain the SIDs applicable to the principal
-            List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+			// Obtain the SIDs applicable to the principal
+			List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-            Acl acl;
+			Acl acl;
 
-            try {
-                // Lookup only ACLs for SIDs we're interested in
-                acl = aclService.readAclById(objectIdentity, sids);
-            } catch (NotFoundException nfe) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Voting to deny access - no ACLs apply for this principal");
-                }
+			try {
+				// Lookup only ACLs for SIDs we're interested in
+				acl = aclService.readAclById(objectIdentity, sids);
+			}
+			catch (NotFoundException nfe) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Voting to deny access - no ACLs apply for this principal");
+				}
 
-                return ACCESS_DENIED;
-            }
+				return ACCESS_DENIED;
+			}
 
-            try {
-                if (acl.isGranted(requirePermission, sids, false)) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Voting to grant access");
-                    }
+			try {
+				if (acl.isGranted(requirePermission, sids, false)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Voting to grant access");
+					}
 
-                    return ACCESS_GRANTED;
-                } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug(
-                            "Voting to deny access - ACLs returned, but insufficient permissions for this principal");
-                    }
+					return ACCESS_GRANTED;
+				}
+				else {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Voting to deny access - ACLs returned, but insufficient permissions for this principal");
+					}
 
-                    return ACCESS_DENIED;
-                }
-            } catch (NotFoundException nfe) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Voting to deny access - no ACLs apply for this principal");
-                }
+					return ACCESS_DENIED;
+				}
+			}
+			catch (NotFoundException nfe) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Voting to deny access - no ACLs apply for this principal");
+				}
 
-                return ACCESS_DENIED;
-            }
-        }
+				return ACCESS_DENIED;
+			}
+		}
 
-        // No configuration attribute matched, so abstain
-        return ACCESS_ABSTAIN;
-    }
+		// No configuration attribute matched, so abstain
+		return ACCESS_ABSTAIN;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java
index 42f403fc78..857ea67669 100644
--- a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java
+++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java
@@ -23,44 +23,45 @@ import org.springframework.security.core.Authentication;
  * @since 3.1
  */
 public class AclPermissionCacheOptimizer implements PermissionCacheOptimizer {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final AclService aclService;
-    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
-    private ObjectIdentityRetrievalStrategy oidRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+	private final Log logger = LogFactory.getLog(getClass());
+	private final AclService aclService;
+	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+	private ObjectIdentityRetrievalStrategy oidRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
 
-    public AclPermissionCacheOptimizer(AclService aclService) {
-        this.aclService = aclService;
-    }
+	public AclPermissionCacheOptimizer(AclService aclService) {
+		this.aclService = aclService;
+	}
 
-    public void cachePermissionsFor(Authentication authentication, Collection<?> objects) {
-        if (objects.isEmpty()) {
-            return;
-        }
+	public void cachePermissionsFor(Authentication authentication, Collection<?> objects) {
+		if (objects.isEmpty()) {
+			return;
+		}
 
-        List<ObjectIdentity> oidsToCache = new ArrayList<ObjectIdentity>(objects.size());
+		List<ObjectIdentity> oidsToCache = new ArrayList<ObjectIdentity>(objects.size());
 
-        for (Object domainObject : objects) {
-            if (domainObject == null) {
-                continue;
-            }
-            ObjectIdentity oid = oidRetrievalStrategy.getObjectIdentity(domainObject);
-            oidsToCache.add(oid);
-        }
+		for (Object domainObject : objects) {
+			if (domainObject == null) {
+				continue;
+			}
+			ObjectIdentity oid = oidRetrievalStrategy.getObjectIdentity(domainObject);
+			oidsToCache.add(oid);
+		}
 
-        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+		List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Eagerly loading Acls for " + oidsToCache.size() + " objects");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Eagerly loading Acls for " + oidsToCache.size() + " objects");
+		}
 
-        aclService.readAclsById(oidsToCache, sids);
-    }
+		aclService.readAclsById(oidsToCache, sids);
+	}
 
-    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-        this.oidRetrievalStrategy = objectIdentityRetrievalStrategy;
-    }
+	public void setObjectIdentityRetrievalStrategy(
+			ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+		this.oidRetrievalStrategy = objectIdentityRetrievalStrategy;
+	}
 
-    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-        this.sidRetrievalStrategy = sidRetrievalStrategy;
-    }
+	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+		this.sidRetrievalStrategy = sidRetrievalStrategy;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java
index adfddd1c6a..13ece9872f 100644
--- a/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java
+++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java
@@ -23,8 +23,8 @@ import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 
 /**
- * Used by Spring Security's expression-based access control implementation to evaluate permissions for a particular
- * object using the ACL module. Similar in behaviour to
+ * Used by Spring Security's expression-based access control implementation to evaluate
+ * permissions for a particular object using the ACL module. Similar in behaviour to
  * {@link org.springframework.security.acls.AclEntryVoter AclEntryVoter}.
  *
  * @author Luke Taylor
@@ -32,120 +32,130 @@ import org.springframework.security.core.Authentication;
  */
 public class AclPermissionEvaluator implements PermissionEvaluator {
 
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final AclService aclService;
-    private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
-    private ObjectIdentityGenerator objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
-    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
-    private PermissionFactory permissionFactory = new DefaultPermissionFactory();
+	private final AclService aclService;
+	private ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+	private ObjectIdentityGenerator objectIdentityGenerator = new ObjectIdentityRetrievalStrategyImpl();
+	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+	private PermissionFactory permissionFactory = new DefaultPermissionFactory();
 
-    public AclPermissionEvaluator(AclService aclService) {
-        this.aclService = aclService;
-    }
+	public AclPermissionEvaluator(AclService aclService) {
+		this.aclService = aclService;
+	}
 
-    /**
-     * Determines whether the user has the given permission(s) on the domain object using the ACL
-     * configuration. If the domain object is null, returns false (this can always be overridden using a null
-     * check in the expression itself).
-     */
-    public boolean hasPermission(Authentication authentication, Object domainObject, Object permission) {
-        if (domainObject == null) {
-            return false;
-        }
+	/**
+	 * Determines whether the user has the given permission(s) on the domain object using
+	 * the ACL configuration. If the domain object is null, returns false (this can always
+	 * be overridden using a null check in the expression itself).
+	 */
+	public boolean hasPermission(Authentication authentication, Object domainObject,
+			Object permission) {
+		if (domainObject == null) {
+			return false;
+		}
 
-        ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
+		ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy
+				.getObjectIdentity(domainObject);
 
-        return checkPermission(authentication, objectIdentity, permission);
-    }
+		return checkPermission(authentication, objectIdentity, permission);
+	}
 
-    public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission) {
-        ObjectIdentity objectIdentity = objectIdentityGenerator.createObjectIdentity(targetId, targetType);
+	public boolean hasPermission(Authentication authentication, Serializable targetId,
+			String targetType, Object permission) {
+		ObjectIdentity objectIdentity = objectIdentityGenerator.createObjectIdentity(
+				targetId, targetType);
 
-        return checkPermission(authentication, objectIdentity, permission);
-    }
+		return checkPermission(authentication, objectIdentity, permission);
+	}
 
-    private boolean checkPermission(Authentication authentication, ObjectIdentity oid, Object permission) {
-        // Obtain the SIDs applicable to the principal
-        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
-        List<Permission> requiredPermission = resolvePermission(permission);
+	private boolean checkPermission(Authentication authentication, ObjectIdentity oid,
+			Object permission) {
+		// Obtain the SIDs applicable to the principal
+		List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+		List<Permission> requiredPermission = resolvePermission(permission);
 
-        final boolean debug = logger.isDebugEnabled();
+		final boolean debug = logger.isDebugEnabled();
 
-        if (debug) {
-            logger.debug("Checking permission '" + permission + "' for object '" + oid + "'");
-        }
+		if (debug) {
+			logger.debug("Checking permission '" + permission + "' for object '" + oid
+					+ "'");
+		}
 
-        try {
-            // Lookup only ACLs for SIDs we're interested in
-            Acl acl = aclService.readAclById(oid, sids);
+		try {
+			// Lookup only ACLs for SIDs we're interested in
+			Acl acl = aclService.readAclById(oid, sids);
 
-            if (acl.isGranted(requiredPermission, sids, false)) {
-                if (debug) {
-                    logger.debug("Access is granted");
-                }
+			if (acl.isGranted(requiredPermission, sids, false)) {
+				if (debug) {
+					logger.debug("Access is granted");
+				}
 
-                return true;
-            }
+				return true;
+			}
 
-            if (debug) {
-                logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal");
-            }
+			if (debug) {
+				logger.debug("Returning false - ACLs returned, but insufficient permissions for this principal");
+			}
 
-        } catch (NotFoundException nfe) {
-            if (debug) {
-                logger.debug("Returning false - no ACLs apply for this principal");
-            }
-        }
+		}
+		catch (NotFoundException nfe) {
+			if (debug) {
+				logger.debug("Returning false - no ACLs apply for this principal");
+			}
+		}
 
-        return false;
+		return false;
 
-    }
+	}
 
-    List<Permission> resolvePermission(Object permission) {
-        if (permission instanceof Integer) {
-            return Arrays.asList(permissionFactory.buildFromMask(((Integer)permission).intValue()));
-        }
+	List<Permission> resolvePermission(Object permission) {
+		if (permission instanceof Integer) {
+			return Arrays.asList(permissionFactory.buildFromMask(((Integer) permission)
+					.intValue()));
+		}
 
-        if (permission instanceof Permission) {
-            return Arrays.asList((Permission)permission);
-        }
+		if (permission instanceof Permission) {
+			return Arrays.asList((Permission) permission);
+		}
 
-        if (permission instanceof Permission[]) {
-            return Arrays.asList((Permission[])permission);
-        }
+		if (permission instanceof Permission[]) {
+			return Arrays.asList((Permission[]) permission);
+		}
 
-        if (permission instanceof String) {
-            String permString = (String)permission;
-            Permission p;
+		if (permission instanceof String) {
+			String permString = (String) permission;
+			Permission p;
 
-            try {
-                p = permissionFactory.buildFromName(permString);
-            } catch(IllegalArgumentException notfound) {
-                p = permissionFactory.buildFromName(permString.toUpperCase());
-            }
+			try {
+				p = permissionFactory.buildFromName(permString);
+			}
+			catch (IllegalArgumentException notfound) {
+				p = permissionFactory.buildFromName(permString.toUpperCase());
+			}
 
-            if (p != null) {
-                return Arrays.asList(p);
-            }
+			if (p != null) {
+				return Arrays.asList(p);
+			}
 
-        }
-        throw new IllegalArgumentException("Unsupported permission: " + permission);
-    }
+		}
+		throw new IllegalArgumentException("Unsupported permission: " + permission);
+	}
 
-    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-    }
+	public void setObjectIdentityRetrievalStrategy(
+			ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+	}
 
-    public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
-        this.objectIdentityGenerator = objectIdentityGenerator;
-    }
+	public void setObjectIdentityGenerator(ObjectIdentityGenerator objectIdentityGenerator) {
+		this.objectIdentityGenerator = objectIdentityGenerator;
+	}
 
-    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-        this.sidRetrievalStrategy = sidRetrievalStrategy;
-    }
+	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+		this.sidRetrievalStrategy = sidRetrievalStrategy;
+	}
 
-    public void setPermissionFactory(PermissionFactory permissionFactory) {
-        this.permissionFactory = permissionFactory;
-    }
+	public void setPermissionFactory(PermissionFactory permissionFactory) {
+		this.permissionFactory = permissionFactory;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java
index 0e54862cb3..86cb373157 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java
@@ -34,92 +34,103 @@ import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
-
 /**
- * Abstract {@link AfterInvocationProvider} which provides commonly-used ACL-related services.
+ * Abstract {@link AfterInvocationProvider} which provides commonly-used ACL-related
+ * services.
  *
  * @author Ben Alex
-  */
+ */
 public abstract class AbstractAclProvider implements AfterInvocationProvider {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final AclService aclService;
-    protected Class<?> processDomainObjectClass = Object.class;
-    protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
-    protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
-    protected String processConfigAttribute;
-    protected final List<Permission> requirePermission;
+	protected final AclService aclService;
+	protected Class<?> processDomainObjectClass = Object.class;
+	protected ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy = new ObjectIdentityRetrievalStrategyImpl();
+	protected SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+	protected String processConfigAttribute;
+	protected final List<Permission> requirePermission;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AbstractAclProvider(AclService aclService, String processConfigAttribute, List<Permission> requirePermission) {
-        Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
-        Assert.notNull(aclService, "An AclService is mandatory");
+	public AbstractAclProvider(AclService aclService, String processConfigAttribute,
+			List<Permission> requirePermission) {
+		Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
+		Assert.notNull(aclService, "An AclService is mandatory");
 
-        if (requirePermission == null || requirePermission.isEmpty()) {
-            throw new IllegalArgumentException("One or more requirePermission entries is mandatory");
-        }
+		if (requirePermission == null || requirePermission.isEmpty()) {
+			throw new IllegalArgumentException(
+					"One or more requirePermission entries is mandatory");
+		}
 
-        this.aclService = aclService;
-        this.processConfigAttribute = processConfigAttribute;
-        this.requirePermission = requirePermission;
-    }
+		this.aclService = aclService;
+		this.processConfigAttribute = processConfigAttribute;
+		this.requirePermission = requirePermission;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    protected Class<?> getProcessDomainObjectClass() {
-        return processDomainObjectClass;
-    }
+	protected Class<?> getProcessDomainObjectClass() {
+		return processDomainObjectClass;
+	}
 
-    protected boolean hasPermission(Authentication authentication, Object domainObject) {
-        // Obtain the OID applicable to the domain object
-        ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy.getObjectIdentity(domainObject);
+	protected boolean hasPermission(Authentication authentication, Object domainObject) {
+		// Obtain the OID applicable to the domain object
+		ObjectIdentity objectIdentity = objectIdentityRetrievalStrategy
+				.getObjectIdentity(domainObject);
 
-        // Obtain the SIDs applicable to the principal
-        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+		// Obtain the SIDs applicable to the principal
+		List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-        try {
-            // Lookup only ACLs for SIDs we're interested in
-            Acl acl = aclService.readAclById(objectIdentity, sids);
+		try {
+			// Lookup only ACLs for SIDs we're interested in
+			Acl acl = aclService.readAclById(objectIdentity, sids);
 
-            return acl.isGranted(requirePermission, sids, false);
-        } catch (NotFoundException ignore) {
-            return false;
-        }
-    }
+			return acl.isGranted(requirePermission, sids, false);
+		}
+		catch (NotFoundException ignore) {
+			return false;
+		}
+	}
 
-    public void setObjectIdentityRetrievalStrategy(ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
-        Assert.notNull(objectIdentityRetrievalStrategy, "ObjectIdentityRetrievalStrategy required");
-        this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
-    }
+	public void setObjectIdentityRetrievalStrategy(
+			ObjectIdentityRetrievalStrategy objectIdentityRetrievalStrategy) {
+		Assert.notNull(objectIdentityRetrievalStrategy,
+				"ObjectIdentityRetrievalStrategy required");
+		this.objectIdentityRetrievalStrategy = objectIdentityRetrievalStrategy;
+	}
 
-    protected void setProcessConfigAttribute(String processConfigAttribute) {
-        Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
-        this.processConfigAttribute = processConfigAttribute;
-    }
+	protected void setProcessConfigAttribute(String processConfigAttribute) {
+		Assert.hasText(processConfigAttribute, "A processConfigAttribute is mandatory");
+		this.processConfigAttribute = processConfigAttribute;
+	}
 
-    public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
-        Assert.notNull(processDomainObjectClass, "processDomainObjectClass cannot be set to null");
-        this.processDomainObjectClass = processDomainObjectClass;
-    }
+	public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
+		Assert.notNull(processDomainObjectClass,
+				"processDomainObjectClass cannot be set to null");
+		this.processDomainObjectClass = processDomainObjectClass;
+	}
 
-    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-        this.sidRetrievalStrategy = sidRetrievalStrategy;
-    }
+	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+		this.sidRetrievalStrategy = sidRetrievalStrategy;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return processConfigAttribute.equals(attribute.getAttribute());
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return processConfigAttribute.equals(attribute.getAttribute());
+	}
 
-    /**
-     * This implementation supports any type of class, because it does not query the presented secure object.
-     *
-     * @param clazz the secure object
-     *
-     * @return always <code>true</code>
-     */
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	/**
+	 * This implementation supports any type of class, because it does not query the
+	 * presented secure object.
+	 *
+	 * @param clazz the secure object
+	 *
+	 * @return always <code>true</code>
+	 */
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java
index 2ddcf12230..673c753910 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java
@@ -26,96 +26,113 @@ import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * <p>
- * Given a <code>Collection</code> of domain object instances returned from a secure object invocation, remove
- * any <code>Collection</code> elements the principal does not have appropriate permission to access as defined by the
- * {@link AclService}.
+ * Given a <code>Collection</code> of domain object instances returned from a secure
+ * object invocation, remove any <code>Collection</code> elements the principal does not
+ * have appropriate permission to access as defined by the {@link AclService}.
  * <p>
- * The <code>AclService</code> is used to retrieve the access control list (ACL) permissions associated with
- * each <code>Collection</code> domain object instance element for the current <code>Authentication</code> object.
+ * The <code>AclService</code> is used to retrieve the access control list (ACL)
+ * permissions associated with each <code>Collection</code> domain object instance element
+ * for the current <code>Authentication</code> object.
  * <p>
- * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()} matches the {@link
- * #processConfigAttribute}. The provider will then lookup the ACLs from the <code>AclService</code> and ensure the
- * principal is {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean) Acl.isGranted()}
- * when presenting the {@link #requirePermission} array to that method.
+ * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()}
+ * matches the {@link #processConfigAttribute}. The provider will then lookup the ACLs
+ * from the <code>AclService</code> and ensure the principal is
+ * {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
+ * Acl.isGranted()} when presenting the {@link #requirePermission} array to that method.
  * <p>
- * If the principal does not have permission, that element will not be included in the returned
- * <code>Collection</code>.
+ * If the principal does not have permission, that element will not be included in the
+ * returned <code>Collection</code>.
  * <p>
- * Often users will setup a <code>BasicAclEntryAfterInvocationProvider</code> with a {@link
- * #processConfigAttribute} of <code>AFTER_ACL_COLLECTION_READ</code> and a {@link #requirePermission} of
- * <code>BasePermission.READ</code>. These are also the defaults.
+ * Often users will setup a <code>BasicAclEntryAfterInvocationProvider</code> with a
+ * {@link #processConfigAttribute} of <code>AFTER_ACL_COLLECTION_READ</code> and a
+ * {@link #requirePermission} of <code>BasePermission.READ</code>. These are also the
+ * defaults.
  * <p>
- * If the provided <code>returnObject</code> is <code>null</code>, a <code>null</code><code>Collection</code>
- * will be returned. If the provided <code>returnObject</code> is not a <code>Collection</code>, an {@link
- * AuthorizationServiceException} will be thrown.
+ * If the provided <code>returnObject</code> is <code>null</code>, a <code>null</code>
+ * <code>Collection</code> will be returned. If the provided <code>returnObject</code> is
+ * not a <code>Collection</code>, an {@link AuthorizationServiceException} will be thrown.
  * <p>
  * All comparisons and prefixes are case sensitive.
  *
  * @author Ben Alex
  * @author Paulo Neves
  */
-public class AclEntryAfterInvocationCollectionFilteringProvider extends AbstractAclProvider {
-    //~ Static fields/initializers =====================================================================================
+public class AclEntryAfterInvocationCollectionFilteringProvider extends
+		AbstractAclProvider {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationCollectionFilteringProvider.class);
+	protected static final Log logger = LogFactory
+			.getLog(AclEntryAfterInvocationCollectionFilteringProvider.class);
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AclEntryAfterInvocationCollectionFilteringProvider(AclService aclService, List<Permission> requirePermission) {
-        super(aclService, "AFTER_ACL_COLLECTION_READ", requirePermission);
-    }
+	public AclEntryAfterInvocationCollectionFilteringProvider(AclService aclService,
+			List<Permission> requirePermission) {
+		super(aclService, "AFTER_ACL_COLLECTION_READ", requirePermission);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @SuppressWarnings("unchecked")
-    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-            Object returnedObject) throws AccessDeniedException {
+	@SuppressWarnings("unchecked")
+	public Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config, Object returnedObject)
+			throws AccessDeniedException {
 
-        if (returnedObject == null) {
-            logger.debug("Return object is null, skipping");
+		if (returnedObject == null) {
+			logger.debug("Return object is null, skipping");
 
-            return null;
-        }
+			return null;
+		}
 
-        for (ConfigAttribute attr : config) {
-            if (!this.supports(attr)) {
-                continue;
-            }
+		for (ConfigAttribute attr : config) {
+			if (!this.supports(attr)) {
+				continue;
+			}
 
-            // Need to process the Collection for this invocation
-            Filterer filterer;
+			// Need to process the Collection for this invocation
+			Filterer filterer;
 
-            if (returnedObject instanceof Collection) {
-                filterer = new CollectionFilterer((Collection) returnedObject);
-            } else if (returnedObject.getClass().isArray()) {
-                filterer = new ArrayFilterer((Object[]) returnedObject);
-            } else {
-                throw new AuthorizationServiceException("A Collection or an array (or null) was required as the "
-                        + "returnedObject, but the returnedObject was: " + returnedObject);
-            }
+			if (returnedObject instanceof Collection) {
+				filterer = new CollectionFilterer((Collection) returnedObject);
+			}
+			else if (returnedObject.getClass().isArray()) {
+				filterer = new ArrayFilterer((Object[]) returnedObject);
+			}
+			else {
+				throw new AuthorizationServiceException(
+						"A Collection or an array (or null) was required as the "
+								+ "returnedObject, but the returnedObject was: "
+								+ returnedObject);
+			}
 
-            // Locate unauthorised Collection elements
-            for (Object domainObject : filterer) {
-                // Ignore nulls or entries which aren't instances of the configured domain object class
-                if (domainObject == null || !getProcessDomainObjectClass().isAssignableFrom(domainObject.getClass())) {
-                    continue;
-                }
+			// Locate unauthorised Collection elements
+			for (Object domainObject : filterer) {
+				// Ignore nulls or entries which aren't instances of the configured domain
+				// object class
+				if (domainObject == null
+						|| !getProcessDomainObjectClass().isAssignableFrom(
+								domainObject.getClass())) {
+					continue;
+				}
 
-                if(!hasPermission(authentication, domainObject)) {
-                    filterer.remove(domainObject);
+				if (!hasPermission(authentication, domainObject)) {
+					filterer.remove(domainObject);
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Principal is NOT authorised for element: " + domainObject);
-                    }
-                }
-            }
+					if (logger.isDebugEnabled()) {
+						logger.debug("Principal is NOT authorised for element: "
+								+ domainObject);
+					}
+				}
+			}
 
-            return filterer.getFilteredObject();
-        }
+			return filterer.getFilteredObject();
+		}
 
-        return returnedObject;
-    }
+		return returnedObject;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java
index e12cf3f307..80f21f2618 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java
@@ -29,90 +29,103 @@ import org.springframework.security.acls.model.Permission;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.SpringSecurityMessageSource;
 
-
 /**
- * Given a domain object instance returned from a secure object invocation, ensures the principal has
- * appropriate permission as defined by the {@link AclService}.
+ * Given a domain object instance returned from a secure object invocation, ensures the
+ * principal has appropriate permission as defined by the {@link AclService}.
  * <p>
- * The <code>AclService</code> is used to retrieve the access control list (ACL) permissions associated with a
- * domain object instance for the current <code>Authentication</code> object.
+ * The <code>AclService</code> is used to retrieve the access control list (ACL)
+ * permissions associated with a domain object instance for the current
+ * <code>Authentication</code> object.
  * <p>
- * This after invocation provider will fire if any  {@link ConfigAttribute#getAttribute()} matches the {@link
- * #processConfigAttribute}. The provider will then lookup the ACLs from the <tt>AclService</tt> and ensure the
- * principal is {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
- * Acl.isGranted(List, List, boolean)} when presenting the {@link #requirePermission} array to that method.
+ * This after invocation provider will fire if any {@link ConfigAttribute#getAttribute()}
+ * matches the {@link #processConfigAttribute}. The provider will then lookup the ACLs
+ * from the <tt>AclService</tt> and ensure the principal is
+ * {@link org.springframework.security.acls.model.Acl#isGranted(List, List, boolean)
+ * Acl.isGranted(List, List, boolean)} when presenting the {@link #requirePermission}
+ * array to that method.
  * <p>
- * Often users will set up an <code>AclEntryAfterInvocationProvider</code> with a {@link
- * #processConfigAttribute} of <code>AFTER_ACL_READ</code> and a {@link #requirePermission} of
- * <code>BasePermission.READ</code>. These are also the defaults.
+ * Often users will set up an <code>AclEntryAfterInvocationProvider</code> with a
+ * {@link #processConfigAttribute} of <code>AFTER_ACL_READ</code> and a
+ * {@link #requirePermission} of <code>BasePermission.READ</code>. These are also the
+ * defaults.
  * <p>
- * If the principal does not have sufficient permissions, an <code>AccessDeniedException</code> will be thrown.
+ * If the principal does not have sufficient permissions, an
+ * <code>AccessDeniedException</code> will be thrown.
  * <p>
- * If the provided <tt>returnedObject</tt> is <code>null</code>, permission will always be granted and
- * <code>null</code> will be returned.
+ * If the provided <tt>returnedObject</tt> is <code>null</code>, permission will always be
+ * granted and <code>null</code> will be returned.
  * <p>
  * All comparisons and prefixes are case sensitive.
  */
-public class AclEntryAfterInvocationProvider extends AbstractAclProvider implements MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
+public class AclEntryAfterInvocationProvider extends AbstractAclProvider implements
+		MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(AclEntryAfterInvocationProvider.class);
+	protected static final Log logger = LogFactory
+			.getLog(AclEntryAfterInvocationProvider.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AclEntryAfterInvocationProvider(AclService aclService, List<Permission> requirePermission) {
-        this(aclService, "AFTER_ACL_READ", requirePermission);
-    }
+	public AclEntryAfterInvocationProvider(AclService aclService,
+			List<Permission> requirePermission) {
+		this(aclService, "AFTER_ACL_READ", requirePermission);
+	}
 
-    public AclEntryAfterInvocationProvider(AclService aclService, String processConfigAttribute,
-            List<Permission> requirePermission) {
-        super(aclService, processConfigAttribute, requirePermission);
-    }
+	public AclEntryAfterInvocationProvider(AclService aclService,
+			String processConfigAttribute, List<Permission> requirePermission) {
+		super(aclService, processConfigAttribute, requirePermission);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-            Object returnedObject) throws AccessDeniedException {
+	public Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config, Object returnedObject)
+			throws AccessDeniedException {
 
-        if (returnedObject == null) {
-            // AclManager interface contract prohibits nulls
-            // As they have permission to null/nothing, grant access
-            logger.debug("Return object is null, skipping");
+		if (returnedObject == null) {
+			// AclManager interface contract prohibits nulls
+			// As they have permission to null/nothing, grant access
+			logger.debug("Return object is null, skipping");
 
-            return null;
-        }
+			return null;
+		}
 
-        if (!getProcessDomainObjectClass().isAssignableFrom(returnedObject.getClass())) {
-            logger.debug("Return object is not applicable for this provider, skipping");
+		if (!getProcessDomainObjectClass().isAssignableFrom(returnedObject.getClass())) {
+			logger.debug("Return object is not applicable for this provider, skipping");
 
-            return returnedObject;
-        }
+			return returnedObject;
+		}
 
-        for (ConfigAttribute attr : config) {
-            if (!this.supports(attr)) {
-                continue;
-            }
-            // Need to make an access decision on this invocation
+		for (ConfigAttribute attr : config) {
+			if (!this.supports(attr)) {
+				continue;
+			}
+			// Need to make an access decision on this invocation
 
-            if (hasPermission(authentication, returnedObject)) {
-                return returnedObject;
-            }
+			if (hasPermission(authentication, returnedObject)) {
+				return returnedObject;
+			}
 
-            logger.debug("Denying access");
+			logger.debug("Denying access");
 
-            throw new AccessDeniedException(messages.getMessage("AclEntryAfterInvocationProvider.noPermission",
-                    new Object[] {authentication.getName(), returnedObject},
-                    "Authentication {0} has NO permissions to the domain object {1}"));
-        }
+			throw new AccessDeniedException(messages.getMessage(
+					"AclEntryAfterInvocationProvider.noPermission", new Object[] {
+							authentication.getName(), returnedObject },
+					"Authentication {0} has NO permissions to the domain object {1}"));
+		}
 
-        return returnedObject;
-    }
+		return returnedObject;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java
index 3cdd3c124d..45d782369d 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java
@@ -24,7 +24,6 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-
 /**
  * A filter used to filter arrays.
  *
@@ -32,86 +31,91 @@ import org.apache.commons.logging.LogFactory;
  * @author Paulo Neves
  */
 class ArrayFilterer<T> implements Filterer<T> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(ArrayFilterer.class);
+	protected static final Log logger = LogFactory.getLog(ArrayFilterer.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Set<T> removeList;
-    private final T[] list;
+	private final Set<T> removeList;
+	private final T[] list;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    ArrayFilterer(T[] list) {
-        this.list = list;
+	ArrayFilterer(T[] list) {
+		this.list = list;
 
-        // Collect the removed objects to a HashSet so that
-        // it is fast to lookup them when a filtered array
-        // is constructed.
-        removeList = new HashSet<T>();
-    }
+		// Collect the removed objects to a HashSet so that
+		// it is fast to lookup them when a filtered array
+		// is constructed.
+		removeList = new HashSet<T>();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
-     */
-    @SuppressWarnings("unchecked")
-    public T[] getFilteredObject() {
-        // Recreate an array of same type and filter the removed objects.
-        int originalSize = list.length;
-        int sizeOfResultingList = originalSize - removeList.size();
-        T[] filtered = (T[]) Array.newInstance(list.getClass().getComponentType(), sizeOfResultingList);
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
+	 */
+	@SuppressWarnings("unchecked")
+	public T[] getFilteredObject() {
+		// Recreate an array of same type and filter the removed objects.
+		int originalSize = list.length;
+		int sizeOfResultingList = originalSize - removeList.size();
+		T[] filtered = (T[]) Array.newInstance(list.getClass().getComponentType(),
+				sizeOfResultingList);
 
-        for (int i = 0, j = 0; i < list.length; i++) {
-            T object = list[i];
+		for (int i = 0, j = 0; i < list.length; i++) {
+			T object = list[i];
 
-            if (!removeList.contains(object)) {
-                filtered[j] = object;
-                j++;
-            }
-        }
+			if (!removeList.contains(object)) {
+				filtered[j] = object;
+				j++;
+			}
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Original array contained " + originalSize + " elements; now contains " + sizeOfResultingList
-                + " elements");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Original array contained " + originalSize
+					+ " elements; now contains " + sizeOfResultingList + " elements");
+		}
 
-        return filtered;
-    }
+		return filtered;
+	}
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
-     */
-    public Iterator<T> iterator() {
-        return new Iterator<T>() {
-            private int index = 0;
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
+	 */
+	public Iterator<T> iterator() {
+		return new Iterator<T>() {
+			private int index = 0;
 
-            public boolean hasNext() {
-                return index < list.length;
-            }
+			public boolean hasNext() {
+				return index < list.length;
+			}
 
-            public T next() {
-                if (!hasNext()) {
-                    throw new NoSuchElementException();
-                }
-                return list[index++];
-            }
+			public T next() {
+				if (!hasNext()) {
+					throw new NoSuchElementException();
+				}
+				return list[index++];
+			}
 
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
+			public void remove() {
+				throw new UnsupportedOperationException();
+			}
+		};
+	}
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
-     */
-    public void remove(T object) {
-        removeList.add(object);
-    }
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
+	 */
+	public void remove(T object) {
+		removeList.add(object);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java
index 7a01322a49..58fcc9a400 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-
 /**
  * A filter used to filter Collections.
  *
@@ -31,68 +30,72 @@ import java.util.Set;
  * @author Paulo Neves
  */
 class CollectionFilterer<T> implements Filterer<T> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(CollectionFilterer.class);
+	protected static final Log logger = LogFactory.getLog(CollectionFilterer.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Collection<T> collection;
+	private final Collection<T> collection;
 
-    private final Set<T> removeList;
+	private final Set<T> removeList;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    CollectionFilterer(Collection<T> collection) {
-        this.collection = collection;
+	CollectionFilterer(Collection<T> collection) {
+		this.collection = collection;
 
-        // We create a Set of objects to be removed from the Collection,
-        // as ConcurrentModificationException prevents removal during
-        // iteration, and making a new Collection to be returned is
-        // problematic as the original Collection implementation passed
-        // to the method may not necessarily be re-constructable (as
-        // the Collection(collection) constructor is not guaranteed and
-        // manually adding may lose sort order or other capabilities)
-        removeList = new HashSet<T>();
-    }
+		// We create a Set of objects to be removed from the Collection,
+		// as ConcurrentModificationException prevents removal during
+		// iteration, and making a new Collection to be returned is
+		// problematic as the original Collection implementation passed
+		// to the method may not necessarily be re-constructable (as
+		// the Collection(collection) constructor is not guaranteed and
+		// manually adding may lose sort order or other capabilities)
+		removeList = new HashSet<T>();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
-     */
-    public Object getFilteredObject() {
-        // Now the Iterator has ended, remove Objects from Collection
-        Iterator<T> removeIter = removeList.iterator();
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#getFilteredObject()
+	 */
+	public Object getFilteredObject() {
+		// Now the Iterator has ended, remove Objects from Collection
+		Iterator<T> removeIter = removeList.iterator();
 
-        int originalSize = collection.size();
+		int originalSize = collection.size();
 
-        while (removeIter.hasNext()) {
-            collection.remove(removeIter.next());
-        }
+		while (removeIter.hasNext()) {
+			collection.remove(removeIter.next());
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Original collection contained " + originalSize + " elements; now contains "
-                + collection.size() + " elements");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Original collection contained " + originalSize
+					+ " elements; now contains " + collection.size() + " elements");
+		}
 
-        return collection;
-    }
+		return collection;
+	}
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
-     */
-    public Iterator<T> iterator() {
-        return collection.iterator();
-    }
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#iterator()
+	 */
+	public Iterator<T> iterator() {
+		return collection.iterator();
+	}
 
-    /**
-     *
-     * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
-     */
-    public void remove(T object) {
-        removeList.add(object);
-    }
+	/**
+	 *
+	 * @see org.springframework.security.acls.afterinvocation.Filterer#remove(java.lang.Object)
+	 */
+	public void remove(T object) {
+		removeList.add(object);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java
index 9c7f685ac0..610d7b6f45 100644
--- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java
+++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java
@@ -17,7 +17,6 @@ package org.springframework.security.acls.afterinvocation;
 
 import java.util.Iterator;
 
-
 /**
  * Filterer strategy interface.
  *
@@ -25,26 +24,27 @@ import java.util.Iterator;
  * @author Paulo Neves
  */
 interface Filterer<T> extends Iterable<T> {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Gets the filtered collection or array.
-     *
-     * @return the filtered collection or array
-     */
-    Object getFilteredObject();
+	/**
+	 * Gets the filtered collection or array.
+	 *
+	 * @return the filtered collection or array
+	 */
+	Object getFilteredObject();
 
-    /**
-     * Returns an iterator over the filtered collection or array.
-     *
-     * @return an Iterator
-     */
-    Iterator<T> iterator();
+	/**
+	 * Returns an iterator over the filtered collection or array.
+	 *
+	 * @return an Iterator
+	 */
+	Iterator<T> iterator();
 
-    /**
-     * Removes the the given object from the resulting list.
-     *
-     * @param object the object to be removed
-     */
-    void remove(T object);
+	/**
+	 * Removes the the given object from the resulting list.
+	 *
+	 * @param object the object to be removed
+	 */
+	void remove(T object);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java
index 8d55f75fac..575ad5361a 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java
@@ -10,63 +10,67 @@ import org.springframework.security.acls.model.Permission;
  */
 public abstract class AbstractPermission implements Permission {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final char code;
-    protected int mask;
+	protected final char code;
+	protected int mask;
 
-    //~ Constructors ===================================================================================================
-    /**
-     * Sets the permission mask and uses the '*' character to represent active bits when represented as a bit
-     * pattern string.
-     *
-     * @param mask the integer bit mask for the permission
-     */
-    protected AbstractPermission(int mask) {
-        this.mask = mask;
-        this.code = '*';
-    }
+	// ~ Constructors
+	// ===================================================================================================
+	/**
+	 * Sets the permission mask and uses the '*' character to represent active bits when
+	 * represented as a bit pattern string.
+	 *
+	 * @param mask the integer bit mask for the permission
+	 */
+	protected AbstractPermission(int mask) {
+		this.mask = mask;
+		this.code = '*';
+	}
 
-    /**
-     * Sets the permission mask and uses the specified character for active bits.
-     *
-     * @param mask the integer bit mask for the permission
-     * @param code the character to print for each active bit in the mask (see {@link Permission#getPattern()})
-     */
-    protected AbstractPermission(int mask, char code) {
-        this.mask = mask;
-        this.code = code;
-    }
+	/**
+	 * Sets the permission mask and uses the specified character for active bits.
+	 *
+	 * @param mask the integer bit mask for the permission
+	 * @param code the character to print for each active bit in the mask (see
+	 * {@link Permission#getPattern()})
+	 */
+	protected AbstractPermission(int mask, char code) {
+		this.mask = mask;
+		this.code = code;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final boolean equals(Object arg0) {
-        if (arg0 == null) {
-            return false;
-        }
+	public final boolean equals(Object arg0) {
+		if (arg0 == null) {
+			return false;
+		}
 
-        if (!(arg0 instanceof Permission)) {
-            return false;
-        }
+		if (!(arg0 instanceof Permission)) {
+			return false;
+		}
 
-        Permission rhs = (Permission) arg0;
+		Permission rhs = (Permission) arg0;
 
-        return (this.mask == rhs.getMask());
-    }
+		return (this.mask == rhs.getMask());
+	}
 
-    public final int getMask() {
-        return mask;
-    }
+	public final int getMask() {
+		return mask;
+	}
 
-    public String getPattern() {
-        return AclFormattingUtils.printBinary(mask, code);
-    }
+	public String getPattern() {
+		return AclFormattingUtils.printBinary(mask, code);
+	}
 
-    public final String toString() {
-        return this.getClass().getSimpleName() + "[" + getPattern() + "=" + mask + "]";
-    }
+	public final String toString() {
+		return this.getClass().getSimpleName() + "[" + getPattern() + "=" + mask + "]";
+	}
 
-    public final int hashCode() {
-        return this.mask;
-    }
+	public final int hashCode() {
+		return this.mask;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
index b19a9f6f2d..faa9189458 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
@@ -24,151 +24,161 @@ import org.springframework.util.Assert;
 
 import java.io.Serializable;
 
-
 /**
  * An immutable default implementation of <code>AccessControlEntry</code>.
  *
  * @author Ben Alex
  */
-public class AccessControlEntryImpl implements AccessControlEntry, AuditableAccessControlEntry {
-    //~ Instance fields ================================================================================================
+public class AccessControlEntryImpl implements AccessControlEntry,
+		AuditableAccessControlEntry {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Acl acl;
-    private Permission permission;
-    private final Serializable id;
-    private final Sid sid;
-    private boolean auditFailure = false;
-    private boolean auditSuccess = false;
-    private final boolean granting;
+	private final Acl acl;
+	private Permission permission;
+	private final Serializable id;
+	private final Sid sid;
+	private boolean auditFailure = false;
+	private boolean auditSuccess = false;
+	private final boolean granting;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AccessControlEntryImpl(Serializable id, Acl acl, Sid sid, Permission permission, boolean granting,
-        boolean auditSuccess, boolean auditFailure) {
-        Assert.notNull(acl, "Acl required");
-        Assert.notNull(sid, "Sid required");
-        Assert.notNull(permission, "Permission required");
-        this.id = id;
-        this.acl = acl; // can be null
-        this.sid = sid;
-        this.permission = permission;
-        this.granting = granting;
-        this.auditSuccess = auditSuccess;
-        this.auditFailure = auditFailure;
-    }
+	public AccessControlEntryImpl(Serializable id, Acl acl, Sid sid,
+			Permission permission, boolean granting, boolean auditSuccess,
+			boolean auditFailure) {
+		Assert.notNull(acl, "Acl required");
+		Assert.notNull(sid, "Sid required");
+		Assert.notNull(permission, "Permission required");
+		this.id = id;
+		this.acl = acl; // can be null
+		this.sid = sid;
+		this.permission = permission;
+		this.granting = granting;
+		this.auditSuccess = auditSuccess;
+		this.auditFailure = auditFailure;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object arg0) {
-        if (!(arg0 instanceof AccessControlEntryImpl)) {
-            return false;
-        }
+	public boolean equals(Object arg0) {
+		if (!(arg0 instanceof AccessControlEntryImpl)) {
+			return false;
+		}
 
-        AccessControlEntryImpl rhs = (AccessControlEntryImpl) arg0;
+		AccessControlEntryImpl rhs = (AccessControlEntryImpl) arg0;
 
-        if (this.acl == null) {
-            if (rhs.getAcl() != null) {
-                return false;
-            }
-            // Both this.acl and rhs.acl are null and thus equal
-        } else {
-            // this.acl is non-null
-            if (rhs.getAcl() == null) {
-                return false;
-            }
+		if (this.acl == null) {
+			if (rhs.getAcl() != null) {
+				return false;
+			}
+			// Both this.acl and rhs.acl are null and thus equal
+		}
+		else {
+			// this.acl is non-null
+			if (rhs.getAcl() == null) {
+				return false;
+			}
 
-            // Both this.acl and rhs.acl are non-null, so do a comparison
-            if (this.acl.getObjectIdentity() == null) {
-                if (rhs.acl.getObjectIdentity() != null) {
-                    return false;
-                }
-                // Both this.acl and rhs.acl are null and thus equal
-            } else {
-                // Both this.acl.objectIdentity and rhs.acl.objectIdentity are non-null
-                if (!this.acl.getObjectIdentity().equals(rhs.getAcl().getObjectIdentity())) {
-                    return false;
-                }
-            }
-        }
+			// Both this.acl and rhs.acl are non-null, so do a comparison
+			if (this.acl.getObjectIdentity() == null) {
+				if (rhs.acl.getObjectIdentity() != null) {
+					return false;
+				}
+				// Both this.acl and rhs.acl are null and thus equal
+			}
+			else {
+				// Both this.acl.objectIdentity and rhs.acl.objectIdentity are non-null
+				if (!this.acl.getObjectIdentity()
+						.equals(rhs.getAcl().getObjectIdentity())) {
+					return false;
+				}
+			}
+		}
 
-        if (this.id == null) {
-            if (rhs.id != null) {
-                return false;
-            }
-            // Both this.id and rhs.id are null and thus equal
-        } else {
-            // this.id is non-null
-            if (rhs.id == null) {
-                return false;
-            }
+		if (this.id == null) {
+			if (rhs.id != null) {
+				return false;
+			}
+			// Both this.id and rhs.id are null and thus equal
+		}
+		else {
+			// this.id is non-null
+			if (rhs.id == null) {
+				return false;
+			}
 
-            // Both this.id and rhs.id are non-null
-            if (!this.id.equals(rhs.id)) {
-                return false;
-            }
-        }
+			// Both this.id and rhs.id are non-null
+			if (!this.id.equals(rhs.id)) {
+				return false;
+			}
+		}
 
-        if ((this.auditFailure != rhs.isAuditFailure()) || (this.auditSuccess != rhs.isAuditSuccess())
-            || (this.granting != rhs.isGranting())
-            || !this.permission.equals(rhs.getPermission()) || !this.sid.equals(rhs.getSid())) {
-            return false;
-        }
+		if ((this.auditFailure != rhs.isAuditFailure())
+				|| (this.auditSuccess != rhs.isAuditSuccess())
+				|| (this.granting != rhs.isGranting())
+				|| !this.permission.equals(rhs.getPermission())
+				|| !this.sid.equals(rhs.getSid())) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    public Acl getAcl() {
-        return acl;
-    }
+	public Acl getAcl() {
+		return acl;
+	}
 
-    public Serializable getId() {
-        return id;
-    }
+	public Serializable getId() {
+		return id;
+	}
 
-    public Permission getPermission() {
-        return permission;
-    }
+	public Permission getPermission() {
+		return permission;
+	}
 
-    public Sid getSid() {
-        return sid;
-    }
+	public Sid getSid() {
+		return sid;
+	}
 
-    public boolean isAuditFailure() {
-        return auditFailure;
-    }
+	public boolean isAuditFailure() {
+		return auditFailure;
+	}
 
-    public boolean isAuditSuccess() {
-        return auditSuccess;
-    }
+	public boolean isAuditSuccess() {
+		return auditSuccess;
+	}
 
-    public boolean isGranting() {
-        return granting;
-    }
+	public boolean isGranting() {
+		return granting;
+	}
 
-    void setAuditFailure(boolean auditFailure) {
-        this.auditFailure = auditFailure;
-    }
+	void setAuditFailure(boolean auditFailure) {
+		this.auditFailure = auditFailure;
+	}
 
-    void setAuditSuccess(boolean auditSuccess) {
-        this.auditSuccess = auditSuccess;
-    }
+	void setAuditSuccess(boolean auditSuccess) {
+		this.auditSuccess = auditSuccess;
+	}
 
-    void setPermission(Permission permission) {
-        Assert.notNull(permission, "Permission required");
-        this.permission = permission;
-    }
+	void setPermission(Permission permission) {
+		Assert.notNull(permission, "Permission required");
+		this.permission = permission;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("AccessControlEntryImpl[");
-        sb.append("id: ").append(this.id).append("; ");
-        sb.append("granting: ").append(this.granting).append("; ");
-        sb.append("sid: ").append(this.sid).append("; ");
-        sb.append("permission: ").append(this.permission).append("; ");
-        sb.append("auditSuccess: ").append(this.auditSuccess).append("; ");
-        sb.append("auditFailure: ").append(this.auditFailure);
-        sb.append("]");
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("AccessControlEntryImpl[");
+		sb.append("id: ").append(this.id).append("; ");
+		sb.append("granting: ").append(this.granting).append("; ");
+		sb.append("sid: ").append(this.sid).append("; ");
+		sb.append("permission: ").append(this.permission).append("; ");
+		sb.append("auditSuccess: ").append(this.auditSuccess).append("; ");
+		sb.append("auditFailure: ").append(this.auditFailure);
+		sb.append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java
index a5cfcbd253..0541c16252 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java
@@ -17,7 +17,6 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Acl;
 
-
 /**
  * Strategy used by {@link AclImpl} to determine whether a principal is permitted to call
  * adminstrative methods on the <code>AclImpl</code>.
@@ -25,13 +24,15 @@ import org.springframework.security.acls.model.Acl;
  * @author Ben Alex
  */
 public interface AclAuthorizationStrategy {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    int CHANGE_OWNERSHIP = 0;
-    int CHANGE_AUDITING = 1;
-    int CHANGE_GENERAL = 2;
+	int CHANGE_OWNERSHIP = 0;
+	int CHANGE_AUDITING = 1;
+	int CHANGE_GENERAL = 2;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void securityCheck(Acl acl, int changeType);
+	void securityCheck(Acl acl, int changeType);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
index 46e5601b0b..6514cd655e 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java
@@ -27,115 +27,124 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
-
 /**
  * Default implementation of {@link AclAuthorizationStrategy}.
  * <p>
- * Permission will be granted if at least one of the following conditions is true for the current 
- * principal. 
+ * Permission will be granted if at least one of the following conditions is true for the
+ * current principal.
  * <ul>
- * <li> is the owner (as defined by the ACL). </li>
- * <li> holds the relevant system-wide {@link GrantedAuthority} injected into the 
- *      constructor. </li>
- * <li> has {@link BasePermission#ADMINISTRATION} permission (as defined by the ACL). </li>
+ * <li>is the owner (as defined by the ACL).</li>
+ * <li>holds the relevant system-wide {@link GrantedAuthority} injected into the
+ * constructor.</li>
+ * <li>has {@link BasePermission#ADMINISTRATION} permission (as defined by the ACL).</li>
  * </ul>
  *
  * @author Ben Alex
  */
 public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final GrantedAuthority gaGeneralChanges;
-    private final GrantedAuthority gaModifyAuditing;
-    private final GrantedAuthority gaTakeOwnership;
-    private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
+	private final GrantedAuthority gaGeneralChanges;
+	private final GrantedAuthority gaModifyAuditing;
+	private final GrantedAuthority gaTakeOwnership;
+	private SidRetrievalStrategy sidRetrievalStrategy = new SidRetrievalStrategyImpl();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor. The only mandatory parameter relates to the system-wide {@link GrantedAuthority} instances that
-     * can be held to always permit ACL changes.
-     *
-     * @param auths the <code>GrantedAuthority</code>s that have
-     * special permissions (index 0 is the authority needed to change
-     * ownership, index 1 is the authority needed to modify auditing details,
-     * index 2 is the authority needed to change other ACL and ACE details) (required)
-     * <p>
-     * Alternatively, a single value can be supplied for all three permissions.
-     */
-    public AclAuthorizationStrategyImpl(GrantedAuthority... auths) {
-        Assert.isTrue(auths != null && (auths.length == 3 || auths.length == 1),
-                "One or three GrantedAuthority instances required");
-        if (auths.length == 3) {
-            gaTakeOwnership = auths[0];
-            gaModifyAuditing = auths[1];
-            gaGeneralChanges = auths[2];
-        } else {
-            gaTakeOwnership = gaModifyAuditing = gaGeneralChanges = auths[0];
-        }
-    }
+	/**
+	 * Constructor. The only mandatory parameter relates to the system-wide
+	 * {@link GrantedAuthority} instances that can be held to always permit ACL changes.
+	 *
+	 * @param auths the <code>GrantedAuthority</code>s that have special permissions
+	 * (index 0 is the authority needed to change ownership, index 1 is the authority
+	 * needed to modify auditing details, index 2 is the authority needed to change other
+	 * ACL and ACE details) (required)
+	 * <p>
+	 * Alternatively, a single value can be supplied for all three permissions.
+	 */
+	public AclAuthorizationStrategyImpl(GrantedAuthority... auths) {
+		Assert.isTrue(auths != null && (auths.length == 3 || auths.length == 1),
+				"One or three GrantedAuthority instances required");
+		if (auths.length == 3) {
+			gaTakeOwnership = auths[0];
+			gaModifyAuditing = auths[1];
+			gaGeneralChanges = auths[2];
+		}
+		else {
+			gaTakeOwnership = gaModifyAuditing = gaGeneralChanges = auths[0];
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void securityCheck(Acl acl, int changeType) {
-        if ((SecurityContextHolder.getContext() == null)
-            || (SecurityContextHolder.getContext().getAuthentication() == null)
-            || !SecurityContextHolder.getContext().getAuthentication().isAuthenticated()) {
-            throw new AccessDeniedException("Authenticated principal required to operate with ACLs");
-        }
+	public void securityCheck(Acl acl, int changeType) {
+		if ((SecurityContextHolder.getContext() == null)
+				|| (SecurityContextHolder.getContext().getAuthentication() == null)
+				|| !SecurityContextHolder.getContext().getAuthentication()
+						.isAuthenticated()) {
+			throw new AccessDeniedException(
+					"Authenticated principal required to operate with ACLs");
+		}
 
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        // Check if authorized by virtue of ACL ownership
-        Sid currentUser = createCurrentUser(authentication);
+		// Check if authorized by virtue of ACL ownership
+		Sid currentUser = createCurrentUser(authentication);
 
-        if (currentUser.equals(acl.getOwner())
-                && ((changeType == CHANGE_GENERAL) || (changeType == CHANGE_OWNERSHIP))) {
-            return;
-        }
+		if (currentUser.equals(acl.getOwner())
+				&& ((changeType == CHANGE_GENERAL) || (changeType == CHANGE_OWNERSHIP))) {
+			return;
+		}
 
-        // Not authorized by ACL ownership; try via adminstrative permissions
-        GrantedAuthority requiredAuthority;
+		// Not authorized by ACL ownership; try via adminstrative permissions
+		GrantedAuthority requiredAuthority;
 
-        if (changeType == CHANGE_AUDITING) {
-            requiredAuthority = this.gaModifyAuditing;
-        } else if (changeType == CHANGE_GENERAL) {
-            requiredAuthority = this.gaGeneralChanges;
-        } else if (changeType == CHANGE_OWNERSHIP) {
-            requiredAuthority = this.gaTakeOwnership;
-        } else {
-            throw new IllegalArgumentException("Unknown change type");
-        }
+		if (changeType == CHANGE_AUDITING) {
+			requiredAuthority = this.gaModifyAuditing;
+		}
+		else if (changeType == CHANGE_GENERAL) {
+			requiredAuthority = this.gaGeneralChanges;
+		}
+		else if (changeType == CHANGE_OWNERSHIP) {
+			requiredAuthority = this.gaTakeOwnership;
+		}
+		else {
+			throw new IllegalArgumentException("Unknown change type");
+		}
 
-        // Iterate this principal's authorities to determine right
-        if (authentication.getAuthorities().contains(requiredAuthority)) {
-            return;
-        }
+		// Iterate this principal's authorities to determine right
+		if (authentication.getAuthorities().contains(requiredAuthority)) {
+			return;
+		}
 
-        // Try to get permission via ACEs within the ACL
-        List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
+		// Try to get permission via ACEs within the ACL
+		List<Sid> sids = sidRetrievalStrategy.getSids(authentication);
 
-        if (acl.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), sids, false)) {
-            return;
-        }
+		if (acl.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), sids, false)) {
+			return;
+		}
 
-        throw new AccessDeniedException(
-                "Principal does not have required ACL permissions to perform requested operation");
-    }
+		throw new AccessDeniedException(
+				"Principal does not have required ACL permissions to perform requested operation");
+	}
 
-    /**
-     * Creates a principal-like sid from the authentication information.
-     *
-     * @param authentication the authentication information that can provide principal and thus the sid's id will be
-     *                       dependant on the value inside
-     * @return a sid with the ID taken from the authentication information
-     */
-    protected Sid createCurrentUser(Authentication authentication) {
-        return new PrincipalSid(authentication);
-    }
+	/**
+	 * Creates a principal-like sid from the authentication information.
+	 *
+	 * @param authentication the authentication information that can provide principal and
+	 * thus the sid's id will be dependant on the value inside
+	 * @return a sid with the ID taken from the authentication information
+	 */
+	protected Sid createCurrentUser(Authentication authentication) {
+		return new PrincipalSid(authentication);
+	}
 
-    public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
-        Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
-        this.sidRetrievalStrategy = sidRetrievalStrategy;
-    }
+	public void setSidRetrievalStrategy(SidRetrievalStrategy sidRetrievalStrategy) {
+		Assert.notNull(sidRetrievalStrategy, "SidRetrievalStrategy required");
+		this.sidRetrievalStrategy = sidRetrievalStrategy;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java b/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java
index 229f60be8b..04c663e7e0 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java
@@ -17,7 +17,6 @@ package org.springframework.security.acls.domain;
 import org.springframework.security.acls.model.Permission;
 import org.springframework.util.Assert;
 
-
 /**
  * Utility methods for displaying ACL information.
  *
@@ -25,83 +24,88 @@ import org.springframework.util.Assert;
  */
 public abstract class AclFormattingUtils {
 
-    public static String demergePatterns(String original, String removeBits) {
-        Assert.notNull(original, "Original string required");
-        Assert.notNull(removeBits, "Bits To Remove string required");
-        Assert.isTrue(original.length() == removeBits.length(),
-            "Original and Bits To Remove strings must be identical length");
+	public static String demergePatterns(String original, String removeBits) {
+		Assert.notNull(original, "Original string required");
+		Assert.notNull(removeBits, "Bits To Remove string required");
+		Assert.isTrue(original.length() == removeBits.length(),
+				"Original and Bits To Remove strings must be identical length");
 
-        char[] replacement = new char[original.length()];
+		char[] replacement = new char[original.length()];
 
-        for (int i = 0; i < original.length(); i++) {
-            if (removeBits.charAt(i) == Permission.RESERVED_OFF) {
-                replacement[i] = original.charAt(i);
-            } else {
-                replacement[i] = Permission.RESERVED_OFF;
-            }
-        }
+		for (int i = 0; i < original.length(); i++) {
+			if (removeBits.charAt(i) == Permission.RESERVED_OFF) {
+				replacement[i] = original.charAt(i);
+			}
+			else {
+				replacement[i] = Permission.RESERVED_OFF;
+			}
+		}
 
-        return new String(replacement);
-    }
+		return new String(replacement);
+	}
 
-    public static String mergePatterns(String original, String extraBits) {
-        Assert.notNull(original, "Original string required");
-        Assert.notNull(extraBits, "Extra Bits string required");
-        Assert.isTrue(original.length() == extraBits.length(),
-            "Original and Extra Bits strings must be identical length");
+	public static String mergePatterns(String original, String extraBits) {
+		Assert.notNull(original, "Original string required");
+		Assert.notNull(extraBits, "Extra Bits string required");
+		Assert.isTrue(original.length() == extraBits.length(),
+				"Original and Extra Bits strings must be identical length");
 
-        char[] replacement = new char[extraBits.length()];
+		char[] replacement = new char[extraBits.length()];
 
-        for (int i = 0; i < extraBits.length(); i++) {
-            if (extraBits.charAt(i) == Permission.RESERVED_OFF) {
-                replacement[i] = original.charAt(i);
-            } else {
-                replacement[i] = extraBits.charAt(i);
-            }
-        }
+		for (int i = 0; i < extraBits.length(); i++) {
+			if (extraBits.charAt(i) == Permission.RESERVED_OFF) {
+				replacement[i] = original.charAt(i);
+			}
+			else {
+				replacement[i] = extraBits.charAt(i);
+			}
+		}
 
-        return new String(replacement);
-    }
+		return new String(replacement);
+	}
 
-    /**
-     * Returns a representation of the active bits in the presented mask, with each active bit being denoted by
-     * character '*'.
-     * <p>
-     * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
-     *
-     * @param i the integer bit mask to print the active bits for
-     *
-     * @return a 32-character representation of the bit mask
-     */
-    public static String printBinary(int i) {
-        return printBinary(i, '*', Permission.RESERVED_OFF);
-    }
+	/**
+	 * Returns a representation of the active bits in the presented mask, with each active
+	 * bit being denoted by character '*'.
+	 * <p>
+	 * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
+	 *
+	 * @param i the integer bit mask to print the active bits for
+	 *
+	 * @return a 32-character representation of the bit mask
+	 */
+	public static String printBinary(int i) {
+		return printBinary(i, '*', Permission.RESERVED_OFF);
+	}
 
-    /**
-     * Returns a representation of the active bits in the presented mask, with each active bit being denoted by
-     * the passed character.
-     * <p>
-     * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
-     *
-     * @param mask the integer bit mask to print the active bits for
-     * @param code the character to print when an active bit is detected
-     *
-     * @return a 32-character representation of the bit mask
-     */
-    public static String printBinary(int mask, char code) {
-        Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_ON),
-            Permission.RESERVED_ON + " is a reserved character code");
-        Assert.doesNotContain(Character.toString(code), Character.toString(Permission.RESERVED_OFF),
-            Permission.RESERVED_OFF + " is a reserved character code");
+	/**
+	 * Returns a representation of the active bits in the presented mask, with each active
+	 * bit being denoted by the passed character.
+	 * <p>
+	 * Inactive bits will be denoted by character {@link Permission#RESERVED_OFF}.
+	 *
+	 * @param mask the integer bit mask to print the active bits for
+	 * @param code the character to print when an active bit is detected
+	 *
+	 * @return a 32-character representation of the bit mask
+	 */
+	public static String printBinary(int mask, char code) {
+		Assert.doesNotContain(Character.toString(code),
+				Character.toString(Permission.RESERVED_ON), Permission.RESERVED_ON
+						+ " is a reserved character code");
+		Assert.doesNotContain(Character.toString(code),
+				Character.toString(Permission.RESERVED_OFF), Permission.RESERVED_OFF
+						+ " is a reserved character code");
 
-        return printBinary(mask, Permission.RESERVED_ON, Permission.RESERVED_OFF).replace(Permission.RESERVED_ON, code);
-    }
+		return printBinary(mask, Permission.RESERVED_ON, Permission.RESERVED_OFF)
+				.replace(Permission.RESERVED_ON, code);
+	}
 
-    private static String printBinary(int i, char on, char off) {
-        String s = Integer.toBinaryString(i);
-        String pattern = Permission.THIRTY_TWO_RESERVED_OFF;
-        String temp2 = pattern.substring(0, pattern.length() - s.length()) + s;
+	private static String printBinary(int i, char on, char off) {
+		String s = Integer.toBinaryString(i);
+		String pattern = Permission.THIRTY_TWO_RESERVED_OFF;
+		String temp2 = pattern.substring(0, pattern.length() - s.length()) + s;
 
-        return temp2.replace('0', off).replace('1', on);
-    }
+		return temp2.replace('0', off).replace('1', on);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
index b6f915c0ab..9f6b94623d 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
@@ -31,297 +31,333 @@ import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.UnloadedSidException;
 import org.springframework.util.Assert;
 
-
 /**
  * Base implementation of <code>Acl</code>.
  *
  * @author Ben Alex
  */
 public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Acl parentAcl;
-    private transient AclAuthorizationStrategy aclAuthorizationStrategy;
-    private transient PermissionGrantingStrategy permissionGrantingStrategy;
-    private final List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
-    private ObjectIdentity objectIdentity;
-    private Serializable id;
-    private Sid owner; // OwnershipAcl
-    private List<Sid> loadedSids = null; // includes all SIDs the WHERE clause covered, even if there was no ACE for a SID
-    private boolean entriesInheriting = true;
+	private Acl parentAcl;
+	private transient AclAuthorizationStrategy aclAuthorizationStrategy;
+	private transient PermissionGrantingStrategy permissionGrantingStrategy;
+	private final List<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+	private ObjectIdentity objectIdentity;
+	private Serializable id;
+	private Sid owner; // OwnershipAcl
+	private List<Sid> loadedSids = null; // includes all SIDs the WHERE clause covered,
+											// even if there was no ACE for a SID
+	private boolean entriesInheriting = true;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Minimal constructor, which should be used {@link
-     * org.springframework.security.acls.model.MutableAclService#createAcl(ObjectIdentity)}.
-     *
-     * @param objectIdentity the object identity this ACL relates to (required)
-     * @param id the primary key assigned to this ACL (required)
-     * @param aclAuthorizationStrategy authorization strategy (required)
-     * @param auditLogger audit logger (required)
-     */
-    public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
-                    AuditLogger auditLogger) {
-        Assert.notNull(objectIdentity, "Object Identity required");
-        Assert.notNull(id, "Id required");
-        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-        Assert.notNull(auditLogger, "AuditLogger required");
-        this.objectIdentity = objectIdentity;
-        this.id = id;
-        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-        this.permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(auditLogger);
-    }
+	/**
+	 * Minimal constructor, which should be used
+	 * {@link org.springframework.security.acls.model.MutableAclService#createAcl(ObjectIdentity)}
+	 * .
+	 *
+	 * @param objectIdentity the object identity this ACL relates to (required)
+	 * @param id the primary key assigned to this ACL (required)
+	 * @param aclAuthorizationStrategy authorization strategy (required)
+	 * @param auditLogger audit logger (required)
+	 */
+	public AclImpl(ObjectIdentity objectIdentity, Serializable id,
+			AclAuthorizationStrategy aclAuthorizationStrategy, AuditLogger auditLogger) {
+		Assert.notNull(objectIdentity, "Object Identity required");
+		Assert.notNull(id, "Id required");
+		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+		Assert.notNull(auditLogger, "AuditLogger required");
+		this.objectIdentity = objectIdentity;
+		this.id = id;
+		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+		this.permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(
+				auditLogger);
+	}
 
-    /**
-     * Full constructor, which should be used by persistence tools that do not
-     * provide field-level access features.
-     *
-     * @param objectIdentity the object identity this ACL relates to
-     * @param id the primary key assigned to this ACL
-     * @param aclAuthorizationStrategy authorization strategy
-     * @param grantingStrategy the {@code PermissionGrantingStrategy} which will be used by the {@code isGranted()} method
-     * @param parentAcl the parent (may be may be {@code null})
-     * @param loadedSids the loaded SIDs if only a subset were loaded (may be {@code null})
-     * @param entriesInheriting if ACEs from the parent should inherit into
-     *        this ACL
-     * @param owner the owner (required)
-     */
-    public AclImpl(ObjectIdentity objectIdentity, Serializable id, AclAuthorizationStrategy aclAuthorizationStrategy,
-            PermissionGrantingStrategy grantingStrategy, Acl parentAcl, List<Sid> loadedSids, boolean entriesInheriting, Sid owner) {
-        Assert.notNull(objectIdentity, "Object Identity required");
-        Assert.notNull(id, "Id required");
-        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-        Assert.notNull(owner, "Owner required");
+	/**
+	 * Full constructor, which should be used by persistence tools that do not provide
+	 * field-level access features.
+	 *
+	 * @param objectIdentity the object identity this ACL relates to
+	 * @param id the primary key assigned to this ACL
+	 * @param aclAuthorizationStrategy authorization strategy
+	 * @param grantingStrategy the {@code PermissionGrantingStrategy} which will be used
+	 * by the {@code isGranted()} method
+	 * @param parentAcl the parent (may be may be {@code null})
+	 * @param loadedSids the loaded SIDs if only a subset were loaded (may be {@code null}
+	 * )
+	 * @param entriesInheriting if ACEs from the parent should inherit into this ACL
+	 * @param owner the owner (required)
+	 */
+	public AclImpl(ObjectIdentity objectIdentity, Serializable id,
+			AclAuthorizationStrategy aclAuthorizationStrategy,
+			PermissionGrantingStrategy grantingStrategy, Acl parentAcl,
+			List<Sid> loadedSids, boolean entriesInheriting, Sid owner) {
+		Assert.notNull(objectIdentity, "Object Identity required");
+		Assert.notNull(id, "Id required");
+		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+		Assert.notNull(owner, "Owner required");
 
-        this.objectIdentity = objectIdentity;
-        this.id = id;
-        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-        this.parentAcl = parentAcl; // may be null
-        this.loadedSids = loadedSids; // may be null
-        this.entriesInheriting = entriesInheriting;
-        this.owner = owner;
-        this.permissionGrantingStrategy = grantingStrategy;
-    }
+		this.objectIdentity = objectIdentity;
+		this.id = id;
+		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+		this.parentAcl = parentAcl; // may be null
+		this.loadedSids = loadedSids; // may be null
+		this.entriesInheriting = entriesInheriting;
+		this.owner = owner;
+		this.permissionGrantingStrategy = grantingStrategy;
+	}
 
-    /**
-     * Private no-argument constructor for use by reflection-based persistence
-     * tools along with field-level access.
-     */
-    @SuppressWarnings("unused")
-    private AclImpl() {}
+	/**
+	 * Private no-argument constructor for use by reflection-based persistence tools along
+	 * with field-level access.
+	 */
+	@SuppressWarnings("unused")
+	private AclImpl() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void deleteAce(int aceIndex) throws NotFoundException {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        verifyAceIndexExists(aceIndex);
+	public void deleteAce(int aceIndex) throws NotFoundException {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		verifyAceIndexExists(aceIndex);
 
-        synchronized (aces) {
-            this.aces.remove(aceIndex);
-        }
-    }
+		synchronized (aces) {
+			this.aces.remove(aceIndex);
+		}
+	}
 
-    private void verifyAceIndexExists(int aceIndex) {
-        if (aceIndex < 0) {
-            throw new NotFoundException("aceIndex must be greater than or equal to zero");
-        }
-        if (aceIndex >= this.aces.size()) {
-            throw new NotFoundException("aceIndex must refer to an index of the AccessControlEntry list. " +
-                    "List size is " + aces.size() + ", index was " + aceIndex);
-        }
-    }
+	private void verifyAceIndexExists(int aceIndex) {
+		if (aceIndex < 0) {
+			throw new NotFoundException("aceIndex must be greater than or equal to zero");
+		}
+		if (aceIndex >= this.aces.size()) {
+			throw new NotFoundException(
+					"aceIndex must refer to an index of the AccessControlEntry list. "
+							+ "List size is " + aces.size() + ", index was " + aceIndex);
+		}
+	}
 
-    public void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting) throws NotFoundException {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        Assert.notNull(permission, "Permission required");
-        Assert.notNull(sid, "Sid required");
-        if (atIndexLocation < 0) {
-            throw new NotFoundException("atIndexLocation must be greater than or equal to zero");
-        }
-        if (atIndexLocation > this.aces.size()) {
-            throw new NotFoundException("atIndexLocation must be less than or equal to the size of the AccessControlEntry collection");
-        }
+	public void insertAce(int atIndexLocation, Permission permission, Sid sid,
+			boolean granting) throws NotFoundException {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		Assert.notNull(permission, "Permission required");
+		Assert.notNull(sid, "Sid required");
+		if (atIndexLocation < 0) {
+			throw new NotFoundException(
+					"atIndexLocation must be greater than or equal to zero");
+		}
+		if (atIndexLocation > this.aces.size()) {
+			throw new NotFoundException(
+					"atIndexLocation must be less than or equal to the size of the AccessControlEntry collection");
+		}
 
-        AccessControlEntryImpl ace = new AccessControlEntryImpl(null, this, sid, permission, granting, false, false);
+		AccessControlEntryImpl ace = new AccessControlEntryImpl(null, this, sid,
+				permission, granting, false, false);
 
-        synchronized (aces) {
-            this.aces.add(atIndexLocation, ace);
-        }
-    }
+		synchronized (aces) {
+			this.aces.add(atIndexLocation, ace);
+		}
+	}
 
-    public List<AccessControlEntry> getEntries() {
-        // Can safely return AccessControlEntry directly, as they're immutable outside the ACL package
-        return new ArrayList<AccessControlEntry>(aces);
-    }
+	public List<AccessControlEntry> getEntries() {
+		// Can safely return AccessControlEntry directly, as they're immutable outside the
+		// ACL package
+		return new ArrayList<AccessControlEntry>(aces);
+	}
 
-    public Serializable getId() {
-        return this.id;
-    }
+	public Serializable getId() {
+		return this.id;
+	}
 
-    public ObjectIdentity getObjectIdentity() {
-        return objectIdentity;
-    }
+	public ObjectIdentity getObjectIdentity() {
+		return objectIdentity;
+	}
 
-    public boolean isEntriesInheriting() {
-        return entriesInheriting;
-    }
+	public boolean isEntriesInheriting() {
+		return entriesInheriting;
+	}
 
-    /**
-     * Delegates to the {@link PermissionGrantingStrategy}.
-     *
-     * @throws UnloadedSidException if the passed SIDs are unknown to this ACL because the ACL was only loaded for a
-     *         subset of SIDs
-     * @see DefaultPermissionGrantingStrategy
-     */
-    public boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-            throws NotFoundException, UnloadedSidException {
-        Assert.notEmpty(permission, "Permissions required");
-        Assert.notEmpty(sids, "SIDs required");
+	/**
+	 * Delegates to the {@link PermissionGrantingStrategy}.
+	 *
+	 * @throws UnloadedSidException if the passed SIDs are unknown to this ACL because the
+	 * ACL was only loaded for a subset of SIDs
+	 * @see DefaultPermissionGrantingStrategy
+	 */
+	public boolean isGranted(List<Permission> permission, List<Sid> sids,
+			boolean administrativeMode) throws NotFoundException, UnloadedSidException {
+		Assert.notEmpty(permission, "Permissions required");
+		Assert.notEmpty(sids, "SIDs required");
 
-        if (!this.isSidLoaded(sids)) {
-            throw new UnloadedSidException("ACL was not loaded for one or more SID");
-        }
+		if (!this.isSidLoaded(sids)) {
+			throw new UnloadedSidException("ACL was not loaded for one or more SID");
+		}
 
-        return permissionGrantingStrategy.isGranted(this, permission, sids, administrativeMode);
-    }
+		return permissionGrantingStrategy.isGranted(this, permission, sids,
+				administrativeMode);
+	}
 
-    public boolean isSidLoaded(List<Sid> sids) {
-        // If loadedSides is null, this indicates all SIDs were loaded
-        // Also return true if the caller didn't specify a SID to find
-        if ((this.loadedSids == null) || (sids == null) || (sids.size() == 0)) {
-            return true;
-        }
+	public boolean isSidLoaded(List<Sid> sids) {
+		// If loadedSides is null, this indicates all SIDs were loaded
+		// Also return true if the caller didn't specify a SID to find
+		if ((this.loadedSids == null) || (sids == null) || (sids.size() == 0)) {
+			return true;
+		}
 
-        // This ACL applies to a SID subset only. Iterate to check it applies.
-        for (Sid sid: sids) {
-            boolean found = false;
+		// This ACL applies to a SID subset only. Iterate to check it applies.
+		for (Sid sid : sids) {
+			boolean found = false;
 
-            for (Sid loadedSid : loadedSids) {
-                if (sid.equals(loadedSid)) {
-                    // this SID is OK
-                    found = true;
+			for (Sid loadedSid : loadedSids) {
+				if (sid.equals(loadedSid)) {
+					// this SID is OK
+					found = true;
 
-                    break; // out of loadedSids for loop
-                }
-            }
+					break; // out of loadedSids for loop
+				}
+			}
 
-            if (!found) {
-                return false;
-            }
-        }
+			if (!found) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    public void setEntriesInheriting(boolean entriesInheriting) {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        this.entriesInheriting = entriesInheriting;
-    }
+	public void setEntriesInheriting(boolean entriesInheriting) {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		this.entriesInheriting = entriesInheriting;
+	}
 
-    public void setOwner(Sid newOwner) {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-        Assert.notNull(newOwner, "Owner required");
-        this.owner = newOwner;
-    }
+	public void setOwner(Sid newOwner) {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+		Assert.notNull(newOwner, "Owner required");
+		this.owner = newOwner;
+	}
 
-    public Sid getOwner() {
-        return this.owner;
-    }
+	public Sid getOwner() {
+		return this.owner;
+	}
 
-    public void setParent(Acl newParent) {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        Assert.isTrue(newParent == null || !newParent.equals(this), "Cannot be the parent of yourself");
-        this.parentAcl = newParent;
-    }
+	public void setParent(Acl newParent) {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		Assert.isTrue(newParent == null || !newParent.equals(this),
+				"Cannot be the parent of yourself");
+		this.parentAcl = newParent;
+	}
 
-    public Acl getParentAcl() {
-        return parentAcl;
-    }
+	public Acl getParentAcl() {
+		return parentAcl;
+	}
 
-    public void updateAce(int aceIndex, Permission permission)
-        throws NotFoundException {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_GENERAL);
-        verifyAceIndexExists(aceIndex);
+	public void updateAce(int aceIndex, Permission permission) throws NotFoundException {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		verifyAceIndexExists(aceIndex);
 
-        synchronized (aces) {
-            AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
-            ace.setPermission(permission);
-        }
-    }
+		synchronized (aces) {
+			AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
+			ace.setPermission(permission);
+		}
+	}
 
-    public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) {
-        aclAuthorizationStrategy.securityCheck(this, AclAuthorizationStrategy.CHANGE_AUDITING);
-        verifyAceIndexExists(aceIndex);
+	public void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure) {
+		aclAuthorizationStrategy.securityCheck(this,
+				AclAuthorizationStrategy.CHANGE_AUDITING);
+		verifyAceIndexExists(aceIndex);
 
-        synchronized (aces) {
-            AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
-            ace.setAuditSuccess(auditSuccess);
-            ace.setAuditFailure(auditFailure);
-        }
-    }
+		synchronized (aces) {
+			AccessControlEntryImpl ace = (AccessControlEntryImpl) aces.get(aceIndex);
+			ace.setAuditSuccess(auditSuccess);
+			ace.setAuditFailure(auditFailure);
+		}
+	}
 
-    public boolean equals(Object obj) {
-        if (obj instanceof AclImpl) {
-            AclImpl rhs = (AclImpl) obj;
-            if (this.aces.equals(rhs.aces)) {
-                if ((this.parentAcl == null && rhs.parentAcl == null) || (this.parentAcl !=null && this.parentAcl.equals(rhs.parentAcl))) {
-                    if ((this.objectIdentity == null && rhs.objectIdentity == null) || (this.objectIdentity != null && this.objectIdentity.equals(rhs.objectIdentity))) {
-                        if ((this.id == null && rhs.id == null) || (this.id != null && this.id.equals(rhs.id))) {
-                            if ((this.owner == null && rhs.owner == null) || (this.owner != null && this.owner.equals(rhs.owner))) {
-                                if (this.entriesInheriting == rhs.entriesInheriting) {
-                                    if ((this.loadedSids == null && rhs.loadedSids == null)) {
-                                        return true;
-                                    }
-                                    if (this.loadedSids != null && (this.loadedSids.size() == rhs.loadedSids.size())) {
-                                        for (int i = 0; i < this.loadedSids.size(); i++) {
-                                            if (!this.loadedSids.get(i).equals(rhs.loadedSids.get(i))) {
-                                                return false;
-                                            }
-                                        }
-                                        return true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
+	public boolean equals(Object obj) {
+		if (obj instanceof AclImpl) {
+			AclImpl rhs = (AclImpl) obj;
+			if (this.aces.equals(rhs.aces)) {
+				if ((this.parentAcl == null && rhs.parentAcl == null)
+						|| (this.parentAcl != null && this.parentAcl
+								.equals(rhs.parentAcl))) {
+					if ((this.objectIdentity == null && rhs.objectIdentity == null)
+							|| (this.objectIdentity != null && this.objectIdentity
+									.equals(rhs.objectIdentity))) {
+						if ((this.id == null && rhs.id == null)
+								|| (this.id != null && this.id.equals(rhs.id))) {
+							if ((this.owner == null && rhs.owner == null)
+									|| (this.owner != null && this.owner
+											.equals(rhs.owner))) {
+								if (this.entriesInheriting == rhs.entriesInheriting) {
+									if ((this.loadedSids == null && rhs.loadedSids == null)) {
+										return true;
+									}
+									if (this.loadedSids != null
+											&& (this.loadedSids.size() == rhs.loadedSids
+													.size())) {
+										for (int i = 0; i < this.loadedSids.size(); i++) {
+											if (!this.loadedSids.get(i).equals(
+													rhs.loadedSids.get(i))) {
+												return false;
+											}
+										}
+										return true;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("AclImpl[");
-        sb.append("id: ").append(this.id).append("; ");
-        sb.append("objectIdentity: ").append(this.objectIdentity).append("; ");
-        sb.append("owner: ").append(this.owner).append("; ");
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("AclImpl[");
+		sb.append("id: ").append(this.id).append("; ");
+		sb.append("objectIdentity: ").append(this.objectIdentity).append("; ");
+		sb.append("owner: ").append(this.owner).append("; ");
 
-        int count = 0;
+		int count = 0;
 
-        for (AccessControlEntry ace : aces) {
-            count++;
+		for (AccessControlEntry ace : aces) {
+			count++;
 
-            if (count == 1) {
-                sb.append("\n");
-            }
+			if (count == 1) {
+				sb.append("\n");
+			}
 
-            sb.append(ace).append("\n");
-        }
+			sb.append(ace).append("\n");
+		}
 
-        if (count == 0) {
-            sb.append("no ACEs; ");
-        }
+		if (count == 0) {
+			sb.append("no ACEs; ");
+		}
 
-        sb.append("inheriting: ").append(this.entriesInheriting).append("; ");
-        sb.append("parent: ").append((this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity().toString());
-        sb.append("; ");
-        sb.append("aclAuthorizationStrategy: ").append(this.aclAuthorizationStrategy).append("; ");
-        sb.append("permissionGrantingStrategy: ").append(this.permissionGrantingStrategy);
-        sb.append("]");
+		sb.append("inheriting: ").append(this.entriesInheriting).append("; ");
+		sb.append("parent: ").append(
+				(this.parentAcl == null) ? "Null" : this.parentAcl.getObjectIdentity()
+						.toString());
+		sb.append("; ");
+		sb.append("aclAuthorizationStrategy: ").append(this.aclAuthorizationStrategy)
+				.append("; ");
+		sb.append("permissionGrantingStrategy: ").append(this.permissionGrantingStrategy);
+		sb.append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java
index e233cfa99e..4f767639ca 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java
@@ -16,7 +16,6 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.AccessControlEntry;
 
-
 /**
  * Used by <code>AclImpl</code> to log audit events.
  *
@@ -24,7 +23,8 @@ import org.springframework.security.acls.model.AccessControlEntry;
  *
  */
 public interface AuditLogger {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void logIfNeeded(boolean granted, AccessControlEntry ace);
+	void logIfNeeded(boolean granted, AccessControlEntry ace);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java b/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java
index a1fe8f0fb1..6953027f8e 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java
@@ -16,7 +16,6 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 
-
 /**
  * A set of standard permissions.
  *
@@ -28,17 +27,17 @@ import org.springframework.security.acls.model.Permission;
  * @author Ben Alex
  */
 public class BasePermission extends AbstractPermission {
-    public static final Permission READ = new BasePermission(1 << 0, 'R'); // 1
-    public static final Permission WRITE = new BasePermission(1 << 1, 'W'); // 2
-    public static final Permission CREATE = new BasePermission(1 << 2, 'C'); // 4
-    public static final Permission DELETE = new BasePermission(1 << 3, 'D'); // 8
-    public static final Permission ADMINISTRATION = new BasePermission(1 << 4, 'A'); // 16
+	public static final Permission READ = new BasePermission(1 << 0, 'R'); // 1
+	public static final Permission WRITE = new BasePermission(1 << 1, 'W'); // 2
+	public static final Permission CREATE = new BasePermission(1 << 2, 'C'); // 4
+	public static final Permission DELETE = new BasePermission(1 << 3, 'D'); // 8
+	public static final Permission ADMINISTRATION = new BasePermission(1 << 4, 'A'); // 16
 
-    protected BasePermission(int mask) {
-       super(mask);
-    }
+	protected BasePermission(int mask) {
+		super(mask);
+	}
 
-    protected BasePermission(int mask, char code) {
-        super(mask, code);
-    }
+	protected BasePermission(int mask, char code) {
+		super(mask, code);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java
index 5c0b059b02..482f49f71e 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java
@@ -19,26 +19,27 @@ import org.springframework.security.acls.model.AuditableAccessControlEntry;
 
 import org.springframework.util.Assert;
 
-
 /**
  * A basic implementation of {@link AuditLogger}.
  *
  * @author Ben Alex
  */
 public class ConsoleAuditLogger implements AuditLogger {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void logIfNeeded(boolean granted, AccessControlEntry ace) {
-        Assert.notNull(ace, "AccessControlEntry required");
+	public void logIfNeeded(boolean granted, AccessControlEntry ace) {
+		Assert.notNull(ace, "AccessControlEntry required");
 
-        if (ace instanceof AuditableAccessControlEntry) {
-            AuditableAccessControlEntry auditableAce = (AuditableAccessControlEntry) ace;
+		if (ace instanceof AuditableAccessControlEntry) {
+			AuditableAccessControlEntry auditableAce = (AuditableAccessControlEntry) ace;
 
-            if (granted && auditableAce.isAuditSuccess()) {
-                System.out.println("GRANTED due to ACE: " + ace);
-            } else if (!granted && auditableAce.isAuditFailure()) {
-                System.out.println("DENIED due to ACE: " + ace);
-            }
-        }
-    }
+			if (granted && auditableAce.isAuditSuccess()) {
+				System.out.println("GRANTED due to ACE: " + ace);
+			}
+			else if (!granted && auditableAce.isAuditFailure()) {
+				System.out.println("DENIED due to ACE: " + ace);
+			}
+		}
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java b/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java
index 554989dabf..158fd4150f 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java
@@ -16,45 +16,49 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 
-
 /**
- * Represents a <code>Permission</code> that is constructed at runtime from other permissions.
+ * Represents a <code>Permission</code> that is constructed at runtime from other
+ * permissions.
  *
- * <p>Methods return <code>this</code>, in order to facilitate method chaining.</p>
+ * <p>
+ * Methods return <code>this</code>, in order to facilitate method chaining.
+ * </p>
  *
  * @author Ben Alex
  */
 public class CumulativePermission extends AbstractPermission {
 
-    private String pattern = THIRTY_TWO_RESERVED_OFF;
+	private String pattern = THIRTY_TWO_RESERVED_OFF;
 
-    public CumulativePermission() {
-        super(0, ' ');
-    }
+	public CumulativePermission() {
+		super(0, ' ');
+	}
 
-    public CumulativePermission clear(Permission permission) {
-        this.mask &= ~permission.getMask();
-        this.pattern = AclFormattingUtils.demergePatterns(this.pattern, permission.getPattern());
+	public CumulativePermission clear(Permission permission) {
+		this.mask &= ~permission.getMask();
+		this.pattern = AclFormattingUtils.demergePatterns(this.pattern,
+				permission.getPattern());
 
-        return this;
-    }
+		return this;
+	}
 
-    public CumulativePermission clear() {
-        this.mask = 0;
-        this.pattern = THIRTY_TWO_RESERVED_OFF;
+	public CumulativePermission clear() {
+		this.mask = 0;
+		this.pattern = THIRTY_TWO_RESERVED_OFF;
 
-        return this;
-    }
+		return this;
+	}
 
-    public CumulativePermission set(Permission permission) {
-        this.mask |= permission.getMask();
-        this.pattern = AclFormattingUtils.mergePatterns(this.pattern, permission.getPattern());
+	public CumulativePermission set(Permission permission) {
+		this.mask |= permission.getMask();
+		this.pattern = AclFormattingUtils.mergePatterns(this.pattern,
+				permission.getPattern());
 
-        return this;
-    }
+		return this;
+	}
 
-    public String getPattern() {
-        return this.pattern;
-    }
+	public String getPattern() {
+		return this.pattern;
+	}
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java
index c64e7c0652..ec3150406f 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java
@@ -13,8 +13,8 @@ import org.springframework.util.Assert;
 /**
  * Default implementation of {@link PermissionFactory}.
  * <p>
- * Used as a strategy by classes which wish to map integer masks and permission names to <tt>Permission</tt>
- * instances for use with the ACL implementation.
+ * Used as a strategy by classes which wish to map integer masks and permission names to
+ * <tt>Permission</tt> instances for use with the ACL implementation.
  * <p>
  * Maintains a registry of permission names and masks to <tt>Permission</tt> instances.
  *
@@ -23,125 +23,131 @@ import org.springframework.util.Assert;
  * @since 2.0.3
  */
 public class DefaultPermissionFactory implements PermissionFactory {
-    private final Map<Integer, Permission> registeredPermissionsByInteger = new HashMap<Integer, Permission>();
-    private final Map<String, Permission> registeredPermissionsByName = new HashMap<String, Permission>();
+	private final Map<Integer, Permission> registeredPermissionsByInteger = new HashMap<Integer, Permission>();
+	private final Map<String, Permission> registeredPermissionsByName = new HashMap<String, Permission>();
 
-    /**
-     * Registers the <tt>Permission</tt> fields from the <tt>BasePermission</tt> class.
-     */
-    public DefaultPermissionFactory() {
-        registerPublicPermissions(BasePermission.class);
-    }
+	/**
+	 * Registers the <tt>Permission</tt> fields from the <tt>BasePermission</tt> class.
+	 */
+	public DefaultPermissionFactory() {
+		registerPublicPermissions(BasePermission.class);
+	}
 
-    /**
-     * Registers the <tt>Permission</tt> fields from the supplied class.
-     */
-    public DefaultPermissionFactory(Class<? extends Permission> permissionClass) {
-        registerPublicPermissions(permissionClass);
-    }
+	/**
+	 * Registers the <tt>Permission</tt> fields from the supplied class.
+	 */
+	public DefaultPermissionFactory(Class<? extends Permission> permissionClass) {
+		registerPublicPermissions(permissionClass);
+	}
 
-    /**
-     * Registers a map of named <tt>Permission</tt> instances.
-     *
-     * @param namedPermissions the map of <tt>Permission</tt>s, keyed by name.
-     */
-    public DefaultPermissionFactory(Map<String, ? extends Permission> namedPermissions) {
-        for (String name : namedPermissions.keySet()) {
-            registerPermission(namedPermissions.get(name), name);
-        }
-    }
+	/**
+	 * Registers a map of named <tt>Permission</tt> instances.
+	 *
+	 * @param namedPermissions the map of <tt>Permission</tt>s, keyed by name.
+	 */
+	public DefaultPermissionFactory(Map<String, ? extends Permission> namedPermissions) {
+		for (String name : namedPermissions.keySet()) {
+			registerPermission(namedPermissions.get(name), name);
+		}
+	}
 
-    /**
-     * Registers the public static fields of type {@link Permission} for a give class.
-     * <p>
-     * These permissions will be registered under the name of the field. See {@link BasePermission}
-     * for an example.
-     *
-     * @param clazz a {@link Permission} class with public static fields to register
-     */
-    protected void registerPublicPermissions(Class<? extends Permission> clazz) {
-        Assert.notNull(clazz, "Class required");
+	/**
+	 * Registers the public static fields of type {@link Permission} for a give class.
+	 * <p>
+	 * These permissions will be registered under the name of the field. See
+	 * {@link BasePermission} for an example.
+	 *
+	 * @param clazz a {@link Permission} class with public static fields to register
+	 */
+	protected void registerPublicPermissions(Class<? extends Permission> clazz) {
+		Assert.notNull(clazz, "Class required");
 
-        Field[] fields = clazz.getFields();
+		Field[] fields = clazz.getFields();
 
-        for (Field field : fields) {
-            try {
-                Object fieldValue = field.get(null);
+		for (Field field : fields) {
+			try {
+				Object fieldValue = field.get(null);
 
-                if (Permission.class.isAssignableFrom(fieldValue.getClass())) {
-                    // Found a Permission static field
-                    Permission perm = (Permission) fieldValue;
-                    String permissionName = field.getName();
+				if (Permission.class.isAssignableFrom(fieldValue.getClass())) {
+					// Found a Permission static field
+					Permission perm = (Permission) fieldValue;
+					String permissionName = field.getName();
 
-                    registerPermission(perm, permissionName);
-                }
-            } catch (Exception ignore) {
-            }
-        }
-    }
+					registerPermission(perm, permissionName);
+				}
+			}
+			catch (Exception ignore) {
+			}
+		}
+	}
 
-    protected void registerPermission(Permission perm, String permissionName) {
-        Assert.notNull(perm, "Permission required");
-        Assert.hasText(permissionName, "Permission name required");
+	protected void registerPermission(Permission perm, String permissionName) {
+		Assert.notNull(perm, "Permission required");
+		Assert.hasText(permissionName, "Permission name required");
 
-        Integer mask = Integer.valueOf(perm.getMask());
+		Integer mask = Integer.valueOf(perm.getMask());
 
-        // Ensure no existing Permission uses this integer or code
-        Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask), "An existing Permission already provides mask " + mask);
-        Assert.isTrue(!registeredPermissionsByName.containsKey(permissionName), "An existing Permission already provides name '" + permissionName + "'");
+		// Ensure no existing Permission uses this integer or code
+		Assert.isTrue(!registeredPermissionsByInteger.containsKey(mask),
+				"An existing Permission already provides mask " + mask);
+		Assert.isTrue(!registeredPermissionsByName.containsKey(permissionName),
+				"An existing Permission already provides name '" + permissionName + "'");
 
-        // Register the new Permission
-        registeredPermissionsByInteger.put(mask, perm);
-        registeredPermissionsByName.put(permissionName, perm);
-    }
+		// Register the new Permission
+		registeredPermissionsByInteger.put(mask, perm);
+		registeredPermissionsByName.put(permissionName, perm);
+	}
 
-    public Permission buildFromMask(int mask) {
-        if (registeredPermissionsByInteger.containsKey(Integer.valueOf(mask))) {
-            // The requested mask has an exact match against a statically-defined Permission, so return it
-            return registeredPermissionsByInteger.get(Integer.valueOf(mask));
-        }
+	public Permission buildFromMask(int mask) {
+		if (registeredPermissionsByInteger.containsKey(Integer.valueOf(mask))) {
+			// The requested mask has an exact match against a statically-defined
+			// Permission, so return it
+			return registeredPermissionsByInteger.get(Integer.valueOf(mask));
+		}
 
-        // To get this far, we have to use a CumulativePermission
-        CumulativePermission permission = new CumulativePermission();
+		// To get this far, we have to use a CumulativePermission
+		CumulativePermission permission = new CumulativePermission();
 
-        for (int i = 0; i < 32; i++) {
-            int permissionToCheck = 1 << i;
+		for (int i = 0; i < 32; i++) {
+			int permissionToCheck = 1 << i;
 
-            if ((mask & permissionToCheck) == permissionToCheck) {
-                Permission p = registeredPermissionsByInteger.get(Integer.valueOf(permissionToCheck));
+			if ((mask & permissionToCheck) == permissionToCheck) {
+				Permission p = registeredPermissionsByInteger.get(Integer
+						.valueOf(permissionToCheck));
 
-                if (p == null) {
-                    throw new IllegalStateException("Mask '" + permissionToCheck + "' does not have a corresponding static Permission");
-                }
-                permission.set(p);
-            }
-        }
+				if (p == null) {
+					throw new IllegalStateException("Mask '" + permissionToCheck
+							+ "' does not have a corresponding static Permission");
+				}
+				permission.set(p);
+			}
+		}
 
-        return permission;
-    }
+		return permission;
+	}
 
-    public Permission buildFromName(String name) {
-        Permission p = registeredPermissionsByName.get(name);
+	public Permission buildFromName(String name) {
+		Permission p = registeredPermissionsByName.get(name);
 
-        if (p == null) {
-            throw new IllegalArgumentException("Unknown permission '" + name + "'");
-        }
+		if (p == null) {
+			throw new IllegalArgumentException("Unknown permission '" + name + "'");
+		}
 
-        return p;
-    }
+		return p;
+	}
 
-    public List<Permission> buildFromNames(List<String> names) {
-        if ((names == null) || (names.size() == 0)) {
-            return Collections.emptyList();
-        }
+	public List<Permission> buildFromNames(List<String> names) {
+		if ((names == null) || (names.size() == 0)) {
+			return Collections.emptyList();
+		}
 
-        List<Permission> permissions = new ArrayList<Permission>(names.size());
+		List<Permission> permissions = new ArrayList<Permission>(names.size());
 
-        for (String name : names) {
-            permissions.add(buildFromName(name));
-        }
+		for (String name : names) {
+			permissions.add(buildFromName(name));
+		}
 
-        return permissions;
-    }
+		return permissions;
+	}
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java
index 915dcde32f..1167f3b4ae 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java
@@ -12,108 +12,119 @@ import org.springframework.util.Assert;
 
 public class DefaultPermissionGrantingStrategy implements PermissionGrantingStrategy {
 
-    private final transient AuditLogger auditLogger;
+	private final transient AuditLogger auditLogger;
 
-    /**
-     * Creates an instance with the logger which will be used to record granting and denial of requested permissions.
-     */
-    public DefaultPermissionGrantingStrategy(AuditLogger auditLogger) {
-        Assert.notNull(auditLogger, "auditLogger cannot be null");
-        this.auditLogger = auditLogger;
-    }
+	/**
+	 * Creates an instance with the logger which will be used to record granting and
+	 * denial of requested permissions.
+	 */
+	public DefaultPermissionGrantingStrategy(AuditLogger auditLogger) {
+		Assert.notNull(auditLogger, "auditLogger cannot be null");
+		this.auditLogger = auditLogger;
+	}
 
-    /**
-     * Determines authorization. The order of the <code>permission</code> and <code>sid</code> arguments is
-     * <em>extremely important</em>! The method will iterate through each of the <code>permission</code>s in the order
-     * specified. For each iteration, all of the <code>sid</code>s will be considered, again in the order they are
-     * presented. A search will then be performed for the first {@link AccessControlEntry} object that directly
-     * matches that <code>permission:sid</code> combination. When the <em>first full match</em> is found (ie an ACE
-     * that has the SID currently being searched for and the exact permission bit mask being search for), the grant or
-     * deny flag for that ACE will prevail. If the ACE specifies to grant access, the method will return
-     * <code>true</code>. If the ACE specifies to deny access, the loop will stop and the next <code>permission</code>
-     * iteration will be performed. If each permission indicates to deny access, the first deny ACE found will be
-     * considered the reason for the failure (as it was the first match found, and is therefore the one most logically
-     * requiring changes - although not always). If absolutely no matching ACE was found at all for any permission,
-     * the parent ACL will be tried (provided that there is a parent and {@link Acl#isEntriesInheriting()} is
-     * <code>true</code>. The parent ACL will also scan its parent and so on. If ultimately no matching ACE is found,
-     * a <code>NotFoundException</code> will be thrown and the caller will need to decide how to handle the permission
-     * check. Similarly, if any of the SID arguments presented to the method were not loaded by the ACL,
-     * <code>UnloadedSidException</code> will be thrown.
-     *
-     * @param permission the exact permissions to scan for (order is important)
-     * @param sids the exact SIDs to scan for (order is important)
-     * @param administrativeMode if <code>true</code> denotes the query is for administrative purposes and no auditing
-     *        will be undertaken
-     *
-     * @return <code>true</code> if one of the permissions has been granted, <code>false</code> if one of the
-     *         permissions has been specifically revoked
-     *
-     * @throws NotFoundException if an exact ACE for one of the permission bit masks and SID combination could not be
-     *         found
-     */
-    public boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-            throws NotFoundException {
+	/**
+	 * Determines authorization. The order of the <code>permission</code> and
+	 * <code>sid</code> arguments is <em>extremely important</em>! The method will iterate
+	 * through each of the <code>permission</code>s in the order specified. For each
+	 * iteration, all of the <code>sid</code>s will be considered, again in the order they
+	 * are presented. A search will then be performed for the first
+	 * {@link AccessControlEntry} object that directly matches that
+	 * <code>permission:sid</code> combination. When the <em>first full match</em> is
+	 * found (ie an ACE that has the SID currently being searched for and the exact
+	 * permission bit mask being search for), the grant or deny flag for that ACE will
+	 * prevail. If the ACE specifies to grant access, the method will return
+	 * <code>true</code>. If the ACE specifies to deny access, the loop will stop and the
+	 * next <code>permission</code> iteration will be performed. If each permission
+	 * indicates to deny access, the first deny ACE found will be considered the reason
+	 * for the failure (as it was the first match found, and is therefore the one most
+	 * logically requiring changes - although not always). If absolutely no matching ACE
+	 * was found at all for any permission, the parent ACL will be tried (provided that
+	 * there is a parent and {@link Acl#isEntriesInheriting()} is <code>true</code>. The
+	 * parent ACL will also scan its parent and so on. If ultimately no matching ACE is
+	 * found, a <code>NotFoundException</code> will be thrown and the caller will need to
+	 * decide how to handle the permission check. Similarly, if any of the SID arguments
+	 * presented to the method were not loaded by the ACL,
+	 * <code>UnloadedSidException</code> will be thrown.
+	 *
+	 * @param permission the exact permissions to scan for (order is important)
+	 * @param sids the exact SIDs to scan for (order is important)
+	 * @param administrativeMode if <code>true</code> denotes the query is for
+	 * administrative purposes and no auditing will be undertaken
+	 *
+	 * @return <code>true</code> if one of the permissions has been granted,
+	 * <code>false</code> if one of the permissions has been specifically revoked
+	 *
+	 * @throws NotFoundException if an exact ACE for one of the permission bit masks and
+	 * SID combination could not be found
+	 */
+	public boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids,
+			boolean administrativeMode) throws NotFoundException {
 
-        final List<AccessControlEntry> aces = acl.getEntries();
+		final List<AccessControlEntry> aces = acl.getEntries();
 
-        AccessControlEntry firstRejection = null;
+		AccessControlEntry firstRejection = null;
 
-        for (Permission p : permission) {
-            for (Sid sid: sids) {
-                // Attempt to find exact match for this permission mask and SID
-                boolean scanNextSid = true;
+		for (Permission p : permission) {
+			for (Sid sid : sids) {
+				// Attempt to find exact match for this permission mask and SID
+				boolean scanNextSid = true;
 
-                for (AccessControlEntry ace : aces ) {
+				for (AccessControlEntry ace : aces) {
 
-                    if ((ace.getPermission().getMask() == p.getMask()) && ace.getSid().equals(sid)) {
-                        // Found a matching ACE, so its authorization decision will prevail
-                        if (ace.isGranting()) {
-                            // Success
-                            if (!administrativeMode) {
-                                auditLogger.logIfNeeded(true, ace);
-                            }
+					if ((ace.getPermission().getMask() == p.getMask())
+							&& ace.getSid().equals(sid)) {
+						// Found a matching ACE, so its authorization decision will
+						// prevail
+						if (ace.isGranting()) {
+							// Success
+							if (!administrativeMode) {
+								auditLogger.logIfNeeded(true, ace);
+							}
 
-                            return true;
-                        }
+							return true;
+						}
 
-                        // Failure for this permission, so stop search
-                        // We will see if they have a different permission
-                        // (this permission is 100% rejected for this SID)
-                        if (firstRejection == null) {
-                            // Store first rejection for auditing reasons
-                            firstRejection = ace;
-                        }
+						// Failure for this permission, so stop search
+						// We will see if they have a different permission
+						// (this permission is 100% rejected for this SID)
+						if (firstRejection == null) {
+							// Store first rejection for auditing reasons
+							firstRejection = ace;
+						}
 
-                        scanNextSid = false; // helps break the loop
+						scanNextSid = false; // helps break the loop
 
-                        break; // exit aces loop
-                    }
-                }
+						break; // exit aces loop
+					}
+				}
 
-                if (!scanNextSid) {
-                    break; // exit SID for loop (now try next permission)
-                }
-            }
-        }
+				if (!scanNextSid) {
+					break; // exit SID for loop (now try next permission)
+				}
+			}
+		}
 
-        if (firstRejection != null) {
-            // We found an ACE to reject the request at this point, as no
-            // other ACEs were found that granted a different permission
-            if (!administrativeMode) {
-                auditLogger.logIfNeeded(false, firstRejection);
-            }
+		if (firstRejection != null) {
+			// We found an ACE to reject the request at this point, as no
+			// other ACEs were found that granted a different permission
+			if (!administrativeMode) {
+				auditLogger.logIfNeeded(false, firstRejection);
+			}
 
-            return false;
-        }
+			return false;
+		}
 
-        // No matches have been found so far
-        if (acl.isEntriesInheriting() && (acl.getParentAcl() != null)) {
-            // We have a parent, so let them try to find a matching ACE
-            return acl.getParentAcl().isGranted(permission, sids, false);
-        } else {
-            // We either have no parent, or we're the uppermost parent
-            throw new NotFoundException("Unable to locate a matching ACE for passed permissions and SIDs");
-        }
-    }
+		// No matches have been found so far
+		if (acl.isEntriesInheriting() && (acl.getParentAcl() != null)) {
+			// We have a parent, so let them try to find a matching ACE
+			return acl.getParentAcl().isGranted(permission, sids, false);
+		}
+		else {
+			// We either have no parent, or we're the uppermost parent
+			throw new NotFoundException(
+					"Unable to locate a matching ACE for passed permissions and SIDs");
+		}
+	}
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
index 64ed55f3a4..d84459c74a 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java
@@ -27,124 +27,135 @@ import org.springframework.security.acls.model.PermissionGrantingStrategy;
 import org.springframework.security.util.FieldUtils;
 import org.springframework.util.Assert;
 
-
 /**
  * Simple implementation of {@link AclCache} that delegates to EH-CACHE.
  * <p>
- * Designed to handle the transient fields in {@link AclImpl}. Note that this implementation assumes all
- * {@link AclImpl} instances share the same {@link PermissionGrantingStrategy} and {@link AclAuthorizationStrategy}
- * instances.
+ * Designed to handle the transient fields in {@link AclImpl}. Note that this
+ * implementation assumes all {@link AclImpl} instances share the same
+ * {@link PermissionGrantingStrategy} and {@link AclAuthorizationStrategy} instances.
  *
  * @author Ben Alex
  */
 public class EhCacheBasedAclCache implements AclCache {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Ehcache cache;
-    private PermissionGrantingStrategy permissionGrantingStrategy;
-    private AclAuthorizationStrategy aclAuthorizationStrategy;
+	private final Ehcache cache;
+	private PermissionGrantingStrategy permissionGrantingStrategy;
+	private AclAuthorizationStrategy aclAuthorizationStrategy;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public EhCacheBasedAclCache(Ehcache cache, PermissionGrantingStrategy permissionGrantingStrategy,
-            AclAuthorizationStrategy aclAuthorizationStrategy) {
-        Assert.notNull(cache, "Cache required");
-        Assert.notNull(permissionGrantingStrategy, "PermissionGrantingStrategy required");
-        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-        this.cache = cache;
-        this.permissionGrantingStrategy = permissionGrantingStrategy;
-        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-    }
+	public EhCacheBasedAclCache(Ehcache cache,
+			PermissionGrantingStrategy permissionGrantingStrategy,
+			AclAuthorizationStrategy aclAuthorizationStrategy) {
+		Assert.notNull(cache, "Cache required");
+		Assert.notNull(permissionGrantingStrategy, "PermissionGrantingStrategy required");
+		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+		this.cache = cache;
+		this.permissionGrantingStrategy = permissionGrantingStrategy;
+		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void evictFromCache(Serializable pk) {
-        Assert.notNull(pk, "Primary key (identifier) required");
+	public void evictFromCache(Serializable pk) {
+		Assert.notNull(pk, "Primary key (identifier) required");
 
-        MutableAcl acl = getFromCache(pk);
+		MutableAcl acl = getFromCache(pk);
 
-        if (acl != null) {
-            cache.remove(acl.getId());
-            cache.remove(acl.getObjectIdentity());
-        }
-    }
+		if (acl != null) {
+			cache.remove(acl.getId());
+			cache.remove(acl.getObjectIdentity());
+		}
+	}
 
-    public void evictFromCache(ObjectIdentity objectIdentity) {
-        Assert.notNull(objectIdentity, "ObjectIdentity required");
+	public void evictFromCache(ObjectIdentity objectIdentity) {
+		Assert.notNull(objectIdentity, "ObjectIdentity required");
 
-        MutableAcl acl = getFromCache(objectIdentity);
+		MutableAcl acl = getFromCache(objectIdentity);
 
-        if (acl != null) {
-            cache.remove(acl.getId());
-            cache.remove(acl.getObjectIdentity());
-        }
-    }
+		if (acl != null) {
+			cache.remove(acl.getId());
+			cache.remove(acl.getObjectIdentity());
+		}
+	}
 
-    public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
-        Assert.notNull(objectIdentity, "ObjectIdentity required");
+	public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
+		Assert.notNull(objectIdentity, "ObjectIdentity required");
 
-        Element element = null;
+		Element element = null;
 
-        try {
-            element = cache.get(objectIdentity);
-        } catch (CacheException ignored) {}
+		try {
+			element = cache.get(objectIdentity);
+		}
+		catch (CacheException ignored) {
+		}
 
-        if (element == null) {
-            return null;
-        }
+		if (element == null) {
+			return null;
+		}
 
-        return initializeTransientFields((MutableAcl)element.getValue());
-    }
+		return initializeTransientFields((MutableAcl) element.getValue());
+	}
 
-    public MutableAcl getFromCache(Serializable pk) {
-        Assert.notNull(pk, "Primary key (identifier) required");
+	public MutableAcl getFromCache(Serializable pk) {
+		Assert.notNull(pk, "Primary key (identifier) required");
 
-        Element element = null;
+		Element element = null;
 
-        try {
-            element = cache.get(pk);
-        } catch (CacheException ignored) {}
+		try {
+			element = cache.get(pk);
+		}
+		catch (CacheException ignored) {
+		}
 
-        if (element == null) {
-            return null;
-        }
+		if (element == null) {
+			return null;
+		}
 
-        return initializeTransientFields((MutableAcl) element.getValue());
-    }
+		return initializeTransientFields((MutableAcl) element.getValue());
+	}
 
-    public void putInCache(MutableAcl acl) {
-        Assert.notNull(acl, "Acl required");
-        Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
-        Assert.notNull(acl.getId(), "ID required");
+	public void putInCache(MutableAcl acl) {
+		Assert.notNull(acl, "Acl required");
+		Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
+		Assert.notNull(acl.getId(), "ID required");
 
-        if (this.aclAuthorizationStrategy == null) {
-            if (acl instanceof AclImpl) {
-                this.aclAuthorizationStrategy = (AclAuthorizationStrategy) FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy", acl);
-                this.permissionGrantingStrategy = (PermissionGrantingStrategy) FieldUtils.getProtectedFieldValue("permissionGrantingStrategy", acl);
-            }
-        }
+		if (this.aclAuthorizationStrategy == null) {
+			if (acl instanceof AclImpl) {
+				this.aclAuthorizationStrategy = (AclAuthorizationStrategy) FieldUtils
+						.getProtectedFieldValue("aclAuthorizationStrategy", acl);
+				this.permissionGrantingStrategy = (PermissionGrantingStrategy) FieldUtils
+						.getProtectedFieldValue("permissionGrantingStrategy", acl);
+			}
+		}
 
-        if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
-            putInCache((MutableAcl) acl.getParentAcl());
-        }
+		if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
+			putInCache((MutableAcl) acl.getParentAcl());
+		}
 
-        cache.put(new Element(acl.getObjectIdentity(), acl));
-        cache.put(new Element(acl.getId(), acl));
-    }
+		cache.put(new Element(acl.getObjectIdentity(), acl));
+		cache.put(new Element(acl.getId(), acl));
+	}
 
-    private MutableAcl initializeTransientFields(MutableAcl value) {
-        if (value instanceof AclImpl) {
-            FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value, this.aclAuthorizationStrategy);
-            FieldUtils.setProtectedFieldValue("permissionGrantingStrategy", value, this.permissionGrantingStrategy);
-        }
+	private MutableAcl initializeTransientFields(MutableAcl value) {
+		if (value instanceof AclImpl) {
+			FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value,
+					this.aclAuthorizationStrategy);
+			FieldUtils.setProtectedFieldValue("permissionGrantingStrategy", value,
+					this.permissionGrantingStrategy);
+		}
 
-        if (value.getParentAcl() != null) {
-            initializeTransientFields((MutableAcl) value.getParentAcl());
-        }
-        return value;
-    }
+		if (value.getParentAcl() != null) {
+			initializeTransientFields((MutableAcl) value.getParentAcl());
+		}
+		return value;
+	}
 
-    public void clearCache() {
-        cache.removeAll();
-    }
+	public void clearCache() {
+		cache.removeAll();
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
index e31f265c93..ecaaf68133 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java
@@ -19,53 +19,61 @@ import org.springframework.security.core.GrantedAuthority;
 
 import org.springframework.util.Assert;
 
-
 /**
- * Represents a <code>GrantedAuthority</code> as a <code>Sid</code>.<p>This is a basic implementation that simply
- * uses the <code>String</code>-based principal for <code>Sid</code> comparison. More complex principal objects may
- * wish to provide an alternative <code>Sid</code> implementation that uses some other identifier.</p>
+ * Represents a <code>GrantedAuthority</code> as a <code>Sid</code>.
+ * <p>
+ * This is a basic implementation that simply uses the <code>String</code>-based principal
+ * for <code>Sid</code> comparison. More complex principal objects may wish to provide an
+ * alternative <code>Sid</code> implementation that uses some other identifier.
+ * </p>
  *
  * @author Ben Alex
  */
 public class GrantedAuthoritySid implements Sid {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String grantedAuthority;
+	private final String grantedAuthority;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public GrantedAuthoritySid(String grantedAuthority) {
-        Assert.hasText(grantedAuthority, "GrantedAuthority required");
-        this.grantedAuthority = grantedAuthority;
-    }
+	public GrantedAuthoritySid(String grantedAuthority) {
+		Assert.hasText(grantedAuthority, "GrantedAuthority required");
+		this.grantedAuthority = grantedAuthority;
+	}
 
-    public GrantedAuthoritySid(GrantedAuthority grantedAuthority) {
-        Assert.notNull(grantedAuthority, "GrantedAuthority required");
-        Assert.notNull(grantedAuthority.getAuthority(),
-            "This Sid is only compatible with GrantedAuthoritys that provide a non-null getAuthority()");
-        this.grantedAuthority = grantedAuthority.getAuthority();
-    }
+	public GrantedAuthoritySid(GrantedAuthority grantedAuthority) {
+		Assert.notNull(grantedAuthority, "GrantedAuthority required");
+		Assert.notNull(
+				grantedAuthority.getAuthority(),
+				"This Sid is only compatible with GrantedAuthoritys that provide a non-null getAuthority()");
+		this.grantedAuthority = grantedAuthority.getAuthority();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object object) {
-        if ((object == null) || !(object instanceof GrantedAuthoritySid)) {
-            return false;
-        }
+	public boolean equals(Object object) {
+		if ((object == null) || !(object instanceof GrantedAuthoritySid)) {
+			return false;
+		}
 
-        // Delegate to getGrantedAuthority() to perform actual comparison (both should be identical)
-        return ((GrantedAuthoritySid) object).getGrantedAuthority().equals(this.getGrantedAuthority());
-    }
+		// Delegate to getGrantedAuthority() to perform actual comparison (both should be
+		// identical)
+		return ((GrantedAuthoritySid) object).getGrantedAuthority().equals(
+				this.getGrantedAuthority());
+	}
 
-    public int hashCode() {
-        return this.getGrantedAuthority().hashCode();
-    }
+	public int hashCode() {
+		return this.getGrantedAuthority().hashCode();
+	}
 
-    public String getGrantedAuthority() {
-        return grantedAuthority;
-    }
+	public String getGrantedAuthority() {
+		return grantedAuthority;
+	}
 
-    public String toString() {
-        return "GrantedAuthoritySid[" + this.grantedAuthority + "]";
-    }
+	public String toString() {
+		return "GrantedAuthoritySid[" + this.grantedAuthority + "]";
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java
index 18e7383c42..9ede4f33aa 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java
@@ -20,25 +20,26 @@ package org.springframework.security.acls.domain;
  * @author Ben Alex
  */
 public class IdentityUnavailableException extends RuntimeException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>IdentityUnavailableException</code> with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public IdentityUnavailableException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>IdentityUnavailableException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public IdentityUnavailableException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>IdentityUnavailableException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public IdentityUnavailableException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>IdentityUnavailableException</code> with the specified message
+	 * and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public IdentityUnavailableException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
index 9026696325..2e485a670e 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java
@@ -21,137 +21,145 @@ import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-
 /**
  * Simple implementation of {@link ObjectIdentity}.
  * <p>
- * Uses <code>String</code>s to store the identity of the domain object instance. Also offers a constructor that uses
- * reflection to build the identity information.
+ * Uses <code>String</code>s to store the identity of the domain object instance. Also
+ * offers a constructor that uses reflection to build the identity information.
  *
  * @author Ben Alex
  */
 public class ObjectIdentityImpl implements ObjectIdentity {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String type;
-    private Serializable identifier;
+	private final String type;
+	private Serializable identifier;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public ObjectIdentityImpl(String type, Serializable identifier) {
-        Assert.hasText(type, "Type required");
-        Assert.notNull(identifier, "identifier required");
+	public ObjectIdentityImpl(String type, Serializable identifier) {
+		Assert.hasText(type, "Type required");
+		Assert.notNull(identifier, "identifier required");
 
-        this.identifier = identifier;
-        this.type = type;
-    }
+		this.identifier = identifier;
+		this.type = type;
+	}
 
-    /**
-     * Constructor which uses the name of the supplied class as the <tt>type</tt> property.
-     */
-    public ObjectIdentityImpl(Class<?> javaType, Serializable identifier) {
-        Assert.notNull(javaType, "Java Type required");
-        Assert.notNull(identifier, "identifier required");
-        this.type = javaType.getName();
-        this.identifier = identifier;
-    }
+	/**
+	 * Constructor which uses the name of the supplied class as the <tt>type</tt>
+	 * property.
+	 */
+	public ObjectIdentityImpl(Class<?> javaType, Serializable identifier) {
+		Assert.notNull(javaType, "Java Type required");
+		Assert.notNull(identifier, "identifier required");
+		this.type = javaType.getName();
+		this.identifier = identifier;
+	}
 
-    /**
-     * Creates the <code>ObjectIdentityImpl</code> based on the passed
-     * object instance. The passed object must provide a <code>getId()</code>
-     * method, otherwise an exception will be thrown.
-     * <p>
-     * The class name of the object passed will be considered the {@link #type}, so if more control is required,
-     * a different constructor should be used.
-     *
-     * @param object the domain object instance to create an identity for.
-     *
-     * @throws IdentityUnavailableException if identity could not be extracted
-     */
-    public ObjectIdentityImpl(Object object) throws IdentityUnavailableException {
-        Assert.notNull(object, "object cannot be null");
+	/**
+	 * Creates the <code>ObjectIdentityImpl</code> based on the passed object instance.
+	 * The passed object must provide a <code>getId()</code> method, otherwise an
+	 * exception will be thrown.
+	 * <p>
+	 * The class name of the object passed will be considered the {@link #type}, so if
+	 * more control is required, a different constructor should be used.
+	 *
+	 * @param object the domain object instance to create an identity for.
+	 *
+	 * @throws IdentityUnavailableException if identity could not be extracted
+	 */
+	public ObjectIdentityImpl(Object object) throws IdentityUnavailableException {
+		Assert.notNull(object, "object cannot be null");
 
-        Class<?> typeClass = ClassUtils.getUserClass(object.getClass());
-        type = typeClass.getName();
+		Class<?> typeClass = ClassUtils.getUserClass(object.getClass());
+		type = typeClass.getName();
 
-        Object result;
+		Object result;
 
-        try {
-            Method method = typeClass.getMethod("getId", new Class[] {});
-            result = method.invoke(object);
-        } catch (Exception e) {
-            throw new IdentityUnavailableException("Could not extract identity from object " + object, e);
-        }
+		try {
+			Method method = typeClass.getMethod("getId", new Class[] {});
+			result = method.invoke(object);
+		}
+		catch (Exception e) {
+			throw new IdentityUnavailableException(
+					"Could not extract identity from object " + object, e);
+		}
 
-        Assert.notNull(result, "getId() is required to return a non-null value");
-        Assert.isInstanceOf(Serializable.class, result, "Getter must provide a return value of type Serializable");
-        this.identifier = (Serializable) result;
-    }
+		Assert.notNull(result, "getId() is required to return a non-null value");
+		Assert.isInstanceOf(Serializable.class, result,
+				"Getter must provide a return value of type Serializable");
+		this.identifier = (Serializable) result;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Important so caching operates properly.
-     * <p>
-     * Considers an object of the same class equal if it has the same <code>classname</code> and
-     * <code>id</code> properties.
-     * <p>
-     * Numeric identities (Integer and Long values) are considered equal if they are numerically equal. Other
-     * serializable types are evaluated using a simple equality.
-     *
-     * @param arg0 object to compare
-     *
-     * @return <code>true</code> if the presented object matches this object
-     */
-    public boolean equals(Object arg0) {
-        if (arg0 == null || !(arg0 instanceof ObjectIdentityImpl)) {
-            return false;
-        }
+	/**
+	 * Important so caching operates properly.
+	 * <p>
+	 * Considers an object of the same class equal if it has the same
+	 * <code>classname</code> and <code>id</code> properties.
+	 * <p>
+	 * Numeric identities (Integer and Long values) are considered equal if they are
+	 * numerically equal. Other serializable types are evaluated using a simple equality.
+	 *
+	 * @param arg0 object to compare
+	 *
+	 * @return <code>true</code> if the presented object matches this object
+	 */
+	public boolean equals(Object arg0) {
+		if (arg0 == null || !(arg0 instanceof ObjectIdentityImpl)) {
+			return false;
+		}
 
-        ObjectIdentityImpl other = (ObjectIdentityImpl) arg0;
+		ObjectIdentityImpl other = (ObjectIdentityImpl) arg0;
 
-        if (identifier instanceof Number && other.identifier instanceof Number) {
-            // Integers and Longs with same value should be considered equal
-            if (((Number)identifier).longValue() != ((Number)other.identifier).longValue()) {
-                return false;
-            }
-        } else {
-            // Use plain equality for other serializable types
-            if (!identifier.equals(other.identifier)) {
-                return false;
-            }
-        }
+		if (identifier instanceof Number && other.identifier instanceof Number) {
+			// Integers and Longs with same value should be considered equal
+			if (((Number) identifier).longValue() != ((Number) other.identifier)
+					.longValue()) {
+				return false;
+			}
+		}
+		else {
+			// Use plain equality for other serializable types
+			if (!identifier.equals(other.identifier)) {
+				return false;
+			}
+		}
 
-        return type.equals(other.type);
-    }
+		return type.equals(other.type);
+	}
 
-    public Serializable getIdentifier() {
-        return identifier;
-    }
+	public Serializable getIdentifier() {
+		return identifier;
+	}
 
-    public String getType() {
-        return type;
-    }
+	public String getType() {
+		return type;
+	}
 
-    /**
-     * Important so caching operates properly.
-     *
-     * @return the hash
-     */
-    public int hashCode() {
-        int code = 31;
-        code ^= this.type.hashCode();
-        code ^= this.identifier.hashCode();
+	/**
+	 * Important so caching operates properly.
+	 *
+	 * @return the hash
+	 */
+	public int hashCode() {
+		int code = 31;
+		code ^= this.type.hashCode();
+		code ^= this.identifier.hashCode();
 
-        return code;
-    }
+		return code;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(this.getClass().getName()).append("[");
-        sb.append("Type: ").append(this.type);
-        sb.append("; Identifier: ").append(this.identifier).append("]");
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(this.getClass().getName()).append("[");
+		sb.append("Type: ").append(this.type);
+		sb.append("; Identifier: ").append(this.identifier).append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java
index 8854f2c65c..e4345547c6 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java
@@ -22,19 +22,22 @@ import org.springframework.security.acls.model.ObjectIdentityGenerator;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
 
 /**
- * Basic implementation of {@link ObjectIdentityRetrievalStrategy} and <tt>ObjectIdentityGenerator</tt>
- * that uses the constructors of {@link ObjectIdentityImpl} to create the {@link ObjectIdentity}.
+ * Basic implementation of {@link ObjectIdentityRetrievalStrategy} and
+ * <tt>ObjectIdentityGenerator</tt> that uses the constructors of
+ * {@link ObjectIdentityImpl} to create the {@link ObjectIdentity}.
  *
  * @author Ben Alex
  */
-public class ObjectIdentityRetrievalStrategyImpl implements ObjectIdentityRetrievalStrategy, ObjectIdentityGenerator {
-    //~ Methods ========================================================================================================
+public class ObjectIdentityRetrievalStrategyImpl implements
+		ObjectIdentityRetrievalStrategy, ObjectIdentityGenerator {
+	// ~ Methods
+	// ========================================================================================================
 
-    public ObjectIdentity getObjectIdentity(Object domainObject) {
-        return new ObjectIdentityImpl(domainObject);
-    }
+	public ObjectIdentity getObjectIdentity(Object domainObject) {
+		return new ObjectIdentityImpl(domainObject);
+	}
 
-    public ObjectIdentity createObjectIdentity(Serializable id, String type) {
-        return new ObjectIdentityImpl(type, id);
-    }
+	public ObjectIdentity createObjectIdentity(Serializable id, String type) {
+		return new ObjectIdentityImpl(type, id);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java
index 92797f66f5..2d98a85f34 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java
@@ -5,7 +5,8 @@ import java.util.List;
 import org.springframework.security.acls.model.Permission;
 
 /**
- * Provides a simple mechanism to retrieve {@link Permission} instances from integer masks.
+ * Provides a simple mechanism to retrieve {@link Permission} instances from integer
+ * masks.
  *
  * @author Ben Alex
  * @since 2.0.3
@@ -13,19 +14,17 @@ import org.springframework.security.acls.model.Permission;
  */
 public interface PermissionFactory {
 
-    /**
-     * Dynamically creates a <code>CumulativePermission</code> or <code>BasePermission</code> representing the
-     * active bits in the passed mask.
-     *
-     * @param mask to build
-     *
-     * @return a Permission representing the requested object
-     */
-    Permission buildFromMask(int mask);
+	/**
+	 * Dynamically creates a <code>CumulativePermission</code> or
+	 * <code>BasePermission</code> representing the active bits in the passed mask.
+	 *
+	 * @param mask to build
+	 *
+	 * @return a Permission representing the requested object
+	 */
+	Permission buildFromMask(int mask);
 
+	Permission buildFromName(String name);
 
-    Permission buildFromName(String name);
-
-
-    List<Permission> buildFromNames(List<String> names);
+	List<Permission> buildFromNames(List<String> names);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
index d9253c7302..2708162139 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java
@@ -14,64 +14,70 @@
  */
 package org.springframework.security.acls.domain;
 
-
 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.util.Assert;
 
-
 /**
- * Represents an <code>Authentication.getPrincipal()</code> as a <code>Sid</code>.<p>This is a basic implementation
- * that simply uses the <code>String</code>-based principal for <code>Sid</code> comparison. More complex principal
- * objects may wish to provide an alternative <code>Sid</code> implementation that uses some other identifier.</p>
+ * Represents an <code>Authentication.getPrincipal()</code> as a <code>Sid</code>.
+ * <p>
+ * This is a basic implementation that simply uses the <code>String</code>-based principal
+ * for <code>Sid</code> comparison. More complex principal objects may wish to provide an
+ * alternative <code>Sid</code> implementation that uses some other identifier.
+ * </p>
  *
  * @author Ben Alex
  */
 public class PrincipalSid implements Sid {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String principal;
+	private final String principal;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public PrincipalSid(String principal) {
-        Assert.hasText(principal, "Principal required");
-        this.principal = principal;
-    }
+	public PrincipalSid(String principal) {
+		Assert.hasText(principal, "Principal required");
+		this.principal = principal;
+	}
 
-    public PrincipalSid(Authentication authentication) {
-        Assert.notNull(authentication, "Authentication required");
-        Assert.notNull(authentication.getPrincipal(), "Principal required");
+	public PrincipalSid(Authentication authentication) {
+		Assert.notNull(authentication, "Authentication required");
+		Assert.notNull(authentication.getPrincipal(), "Principal required");
 
-        if (authentication.getPrincipal() instanceof UserDetails) {
-            this.principal = ((UserDetails) authentication.getPrincipal()).getUsername();
-        } else {
-            this.principal = authentication.getPrincipal().toString();
-        }
-    }
+		if (authentication.getPrincipal() instanceof UserDetails) {
+			this.principal = ((UserDetails) authentication.getPrincipal()).getUsername();
+		}
+		else {
+			this.principal = authentication.getPrincipal().toString();
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object object) {
-        if ((object == null) || !(object instanceof PrincipalSid)) {
-            return false;
-        }
+	public boolean equals(Object object) {
+		if ((object == null) || !(object instanceof PrincipalSid)) {
+			return false;
+		}
 
-        // Delegate to getPrincipal() to perform actual comparison (both should be identical)
-        return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal());
-    }
+		// Delegate to getPrincipal() to perform actual comparison (both should be
+		// identical)
+		return ((PrincipalSid) object).getPrincipal().equals(this.getPrincipal());
+	}
 
-    public int hashCode() {
-        return this.getPrincipal().hashCode();
-    }
+	public int hashCode() {
+		return this.getPrincipal().hashCode();
+	}
 
-    public String getPrincipal() {
-        return principal;
-    }
+	public String getPrincipal() {
+		return principal;
+	}
 
-    public String toString() {
-        return "PrincipalSid[" + this.principal + "]";
-    }
+	public String toString() {
+		return "PrincipalSid[" + this.principal + "]";
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java
index 4c0c0d6a81..b5621257e2 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java
@@ -28,38 +28,42 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
 /**
- * Basic implementation of {@link SidRetrievalStrategy} that creates a {@link Sid} for the principal, as well as
- * every granted authority the principal holds. Can optionally have a <tt>RoleHierarchy</tt> injected in order to
- * determine the extended list of authorities that the principal is assigned.
+ * Basic implementation of {@link SidRetrievalStrategy} that creates a {@link Sid} for the
+ * principal, as well as every granted authority the principal holds. Can optionally have
+ * a <tt>RoleHierarchy</tt> injected in order to determine the extended list of
+ * authorities that the principal is assigned.
  * <p>
- * The returned array will always contain the {@link PrincipalSid} before any {@link GrantedAuthoritySid} elements.
+ * The returned array will always contain the {@link PrincipalSid} before any
+ * {@link GrantedAuthoritySid} elements.
  *
  * @author Ben Alex
  */
 public class SidRetrievalStrategyImpl implements SidRetrievalStrategy {
 
-    private RoleHierarchy roleHierarchy = new NullRoleHierarchy();
+	private RoleHierarchy roleHierarchy = new NullRoleHierarchy();
 
-    public SidRetrievalStrategyImpl() {
-    }
+	public SidRetrievalStrategyImpl() {
+	}
 
-    public SidRetrievalStrategyImpl(RoleHierarchy roleHierarchy) {
-        Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
-        this.roleHierarchy = roleHierarchy;
-    }
+	public SidRetrievalStrategyImpl(RoleHierarchy roleHierarchy) {
+		Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
+		this.roleHierarchy = roleHierarchy;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public List<Sid> getSids(Authentication authentication) {
-        Collection<? extends GrantedAuthority> authorities = roleHierarchy.getReachableGrantedAuthorities(authentication.getAuthorities());
-        List<Sid> sids = new ArrayList<Sid>(authorities.size() + 1);
+	public List<Sid> getSids(Authentication authentication) {
+		Collection<? extends GrantedAuthority> authorities = roleHierarchy
+				.getReachableGrantedAuthorities(authentication.getAuthorities());
+		List<Sid> sids = new ArrayList<Sid>(authorities.size() + 1);
 
-        sids.add(new PrincipalSid(authentication));
+		sids.add(new PrincipalSid(authentication));
 
-        for (GrantedAuthority authority : authorities) {
-            sids.add(new GrantedAuthoritySid(authority));
-        }
+		for (GrantedAuthority authority : authorities) {
+			sids.add(new GrantedAuthoritySid(authority));
+		}
 
-        return sids;
-    }
+		return sids;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java
index b266ab9142..900409ddda 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/SpringCacheBasedAclCache.java
@@ -25,106 +25,114 @@ import org.springframework.util.Assert;
 
 import java.io.Serializable;
 
-
 /**
- * Simple implementation of {@link org.springframework.security.acls.model.AclCache} that delegates to {@link Cache} implementation.
+ * Simple implementation of {@link org.springframework.security.acls.model.AclCache} that
+ * delegates to {@link Cache} implementation.
  * <p>
- * Designed to handle the transient fields in {@link org.springframework.security.acls.domain.AclImpl}. Note that this implementation assumes all
- * {@link org.springframework.security.acls.domain.AclImpl} instances share the same {@link org.springframework.security.acls.model.PermissionGrantingStrategy} and {@link org.springframework.security.acls.domain.AclAuthorizationStrategy}
- * instances.
+ * Designed to handle the transient fields in
+ * {@link org.springframework.security.acls.domain.AclImpl}. Note that this implementation
+ * assumes all {@link org.springframework.security.acls.domain.AclImpl} instances share
+ * the same {@link org.springframework.security.acls.model.PermissionGrantingStrategy} and
+ * {@link org.springframework.security.acls.domain.AclAuthorizationStrategy} instances.
  *
  * @author Marten Deinum
  * @since 3.2
  */
 public class SpringCacheBasedAclCache implements AclCache {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Cache cache;
-    private PermissionGrantingStrategy permissionGrantingStrategy;
-    private AclAuthorizationStrategy aclAuthorizationStrategy;
+	private final Cache cache;
+	private PermissionGrantingStrategy permissionGrantingStrategy;
+	private AclAuthorizationStrategy aclAuthorizationStrategy;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SpringCacheBasedAclCache(Cache cache, PermissionGrantingStrategy permissionGrantingStrategy,
-                                    AclAuthorizationStrategy aclAuthorizationStrategy) {
-        Assert.notNull(cache, "Cache required");
-        Assert.notNull(permissionGrantingStrategy, "PermissionGrantingStrategy required");
-        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-        this.cache = cache;
-        this.permissionGrantingStrategy = permissionGrantingStrategy;
-        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-    }
+	public SpringCacheBasedAclCache(Cache cache,
+			PermissionGrantingStrategy permissionGrantingStrategy,
+			AclAuthorizationStrategy aclAuthorizationStrategy) {
+		Assert.notNull(cache, "Cache required");
+		Assert.notNull(permissionGrantingStrategy, "PermissionGrantingStrategy required");
+		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+		this.cache = cache;
+		this.permissionGrantingStrategy = permissionGrantingStrategy;
+		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void evictFromCache(Serializable pk) {
-        Assert.notNull(pk, "Primary key (identifier) required");
+	public void evictFromCache(Serializable pk) {
+		Assert.notNull(pk, "Primary key (identifier) required");
 
-        MutableAcl acl = getFromCache(pk);
+		MutableAcl acl = getFromCache(pk);
 
-        if (acl != null) {
-            cache.evict(acl.getId());
-            cache.evict(acl.getObjectIdentity());
-        }
-    }
+		if (acl != null) {
+			cache.evict(acl.getId());
+			cache.evict(acl.getObjectIdentity());
+		}
+	}
 
-    public void evictFromCache(ObjectIdentity objectIdentity) {
-        Assert.notNull(objectIdentity, "ObjectIdentity required");
+	public void evictFromCache(ObjectIdentity objectIdentity) {
+		Assert.notNull(objectIdentity, "ObjectIdentity required");
 
-        MutableAcl acl = getFromCache(objectIdentity);
+		MutableAcl acl = getFromCache(objectIdentity);
 
-        if (acl != null) {
-            cache.evict(acl.getId());
-            cache.evict(acl.getObjectIdentity());
-        }
-    }
+		if (acl != null) {
+			cache.evict(acl.getId());
+			cache.evict(acl.getObjectIdentity());
+		}
+	}
 
-    public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
-        Assert.notNull(objectIdentity, "ObjectIdentity required");
-        return getFromCache((Object)objectIdentity);
-    }
+	public MutableAcl getFromCache(ObjectIdentity objectIdentity) {
+		Assert.notNull(objectIdentity, "ObjectIdentity required");
+		return getFromCache((Object) objectIdentity);
+	}
 
-    public MutableAcl getFromCache(Serializable pk) {
-        Assert.notNull(pk, "Primary key (identifier) required");
-        return getFromCache((Object)pk);
-    }
+	public MutableAcl getFromCache(Serializable pk) {
+		Assert.notNull(pk, "Primary key (identifier) required");
+		return getFromCache((Object) pk);
+	}
 
-    public void putInCache(MutableAcl acl) {
-        Assert.notNull(acl, "Acl required");
-        Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
-        Assert.notNull(acl.getId(), "ID required");
+	public void putInCache(MutableAcl acl) {
+		Assert.notNull(acl, "Acl required");
+		Assert.notNull(acl.getObjectIdentity(), "ObjectIdentity required");
+		Assert.notNull(acl.getId(), "ID required");
 
-        if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
-            putInCache((MutableAcl) acl.getParentAcl());
-        }
+		if ((acl.getParentAcl() != null) && (acl.getParentAcl() instanceof MutableAcl)) {
+			putInCache((MutableAcl) acl.getParentAcl());
+		}
 
-        cache.put(acl.getObjectIdentity(), acl);
-        cache.put(acl.getId(), acl);
-    }
+		cache.put(acl.getObjectIdentity(), acl);
+		cache.put(acl.getId(), acl);
+	}
 
-    private MutableAcl getFromCache(Object key) {
-        Cache.ValueWrapper element = cache.get(key);
+	private MutableAcl getFromCache(Object key) {
+		Cache.ValueWrapper element = cache.get(key);
 
-        if (element == null) {
-            return null;
-        }
+		if (element == null) {
+			return null;
+		}
 
-        return initializeTransientFields((MutableAcl) element.get());
-    }
+		return initializeTransientFields((MutableAcl) element.get());
+	}
 
-    private MutableAcl initializeTransientFields(MutableAcl value) {
-        if (value instanceof AclImpl) {
-            FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value, this.aclAuthorizationStrategy);
-            FieldUtils.setProtectedFieldValue("permissionGrantingStrategy", value, this.permissionGrantingStrategy);
-        }
+	private MutableAcl initializeTransientFields(MutableAcl value) {
+		if (value instanceof AclImpl) {
+			FieldUtils.setProtectedFieldValue("aclAuthorizationStrategy", value,
+					this.aclAuthorizationStrategy);
+			FieldUtils.setProtectedFieldValue("permissionGrantingStrategy", value,
+					this.permissionGrantingStrategy);
+		}
 
-        if (value.getParentAcl() != null) {
-            initializeTransientFields((MutableAcl) value.getParentAcl());
-        }
-        return value;
-    }
+		if (value.getParentAcl() != null) {
+			initializeTransientFields((MutableAcl) value.getParentAcl());
+		}
+		return value;
+	}
 
-    public void clearCache() {
-        cache.clear();
-    }
+	public void clearCache() {
+		cache.clear();
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
index aaf742cb41..ce8178f6e6 100644
--- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
@@ -55,600 +55,650 @@ import org.springframework.security.acls.model.UnloadedSidException;
 import org.springframework.security.util.FieldUtils;
 import org.springframework.util.Assert;
 
-
 /**
  * Performs lookups in a manner that is compatible with ANSI SQL.
  * <p>
- * NB: This implementation does attempt to provide reasonably optimised lookups - within the constraints of a normalised
- * database and standard ANSI SQL features. If you are willing to sacrifice either of these constraints
- * (e.g. use a particular database feature such as hierarchical queries or materalized views, or reduce normalisation)
- * you are likely to achieve better performance. In such situations you will need to provide your own custom
- * <code>LookupStrategy</code>. This class does not support subclassing, as it is likely to change in future releases
- * and therefore subclassing is unsupported.
+ * NB: This implementation does attempt to provide reasonably optimised lookups - within
+ * the constraints of a normalised database and standard ANSI SQL features. If you are
+ * willing to sacrifice either of these constraints (e.g. use a particular database
+ * feature such as hierarchical queries or materalized views, or reduce normalisation) you
+ * are likely to achieve better performance. In such situations you will need to provide
+ * your own custom <code>LookupStrategy</code>. This class does not support subclassing,
+ * as it is likely to change in future releases and therefore subclassing is unsupported.
  * <p>
- * There are two SQL queries executed, one in the <tt>lookupPrimaryKeys</tt> method and one in
- * <tt>lookupObjectIdentities</tt>. These are built from the same select and "order by" clause, using a different
- * where clause in each case. In order to use custom schema or column names, each of these SQL clauses can be
- * customized, but they must be consistent with each other and with the expected result set
- * generated by the the default values.
+ * There are two SQL queries executed, one in the <tt>lookupPrimaryKeys</tt> method and
+ * one in <tt>lookupObjectIdentities</tt>. These are built from the same select and
+ * "order by" clause, using a different where clause in each case. In order to use custom
+ * schema or column names, each of these SQL clauses can be customized, but they must be
+ * consistent with each other and with the expected result set generated by the the
+ * default values.
  *
  * @author Ben Alex
  */
 public class BasicLookupStrategy implements LookupStrategy {
 
-    public final static String DEFAULT_SELECT_CLAUSE = "select acl_object_identity.object_id_identity, "
-        + "acl_entry.ace_order,  "
-        + "acl_object_identity.id as acl_id, "
-        + "acl_object_identity.parent_object, "
-        + "acl_object_identity.entries_inheriting, "
-        + "acl_entry.id as ace_id, "
-        + "acl_entry.mask,  "
-        + "acl_entry.granting,  "
-        + "acl_entry.audit_success, "
-        + "acl_entry.audit_failure,  "
-        + "acl_sid.principal as ace_principal, "
-        + "acl_sid.sid as ace_sid,  "
-        + "acli_sid.principal as acl_principal, "
-        + "acli_sid.sid as acl_sid, "
-        + "acl_class.class "
-        + "from acl_object_identity "
-        + "left join acl_sid acli_sid on acli_sid.id = acl_object_identity.owner_sid "
-        + "left join acl_class on acl_class.id = acl_object_identity.object_id_class   "
-        + "left join acl_entry on acl_object_identity.id = acl_entry.acl_object_identity "
-        + "left join acl_sid on acl_entry.sid = acl_sid.id  "
-        + "where ( ";
-
-    private final static String DEFAULT_LOOKUP_KEYS_WHERE_CLAUSE = "(acl_object_identity.id = ?)";
-
-    private final static String DEFAULT_LOOKUP_IDENTITIES_WHERE_CLAUSE = "(acl_object_identity.object_id_identity = ? and acl_class.class = ?)";
-
-    public final static String DEFAULT_ORDER_BY_CLAUSE = ") order by acl_object_identity.object_id_identity"
-        + " asc, acl_entry.ace_order asc";
-
-    //~ Instance fields ================================================================================================
-
-    private final AclAuthorizationStrategy aclAuthorizationStrategy;
-    private PermissionFactory permissionFactory = new DefaultPermissionFactory();
-    private final AclCache aclCache;
-    private final PermissionGrantingStrategy grantingStrategy;
-    private final JdbcTemplate jdbcTemplate;
-    private int batchSize = 50;
-
-    private final Field fieldAces = FieldUtils.getField(AclImpl.class, "aces");
-    private final Field fieldAcl = FieldUtils.getField(AccessControlEntryImpl.class, "acl");
-
-    // SQL Customization fields
-    private String selectClause = DEFAULT_SELECT_CLAUSE;
-    private String lookupPrimaryKeysWhereClause = DEFAULT_LOOKUP_KEYS_WHERE_CLAUSE;
-    private String lookupObjectIdentitiesWhereClause = DEFAULT_LOOKUP_IDENTITIES_WHERE_CLAUSE;
-    private String orderByClause = DEFAULT_ORDER_BY_CLAUSE;
-
-    //~ Constructors ===================================================================================================
-
-    /**
-     * Constructor accepting mandatory arguments
-     *
-     * @param dataSource to access the database
-     * @param aclCache the cache where fully-loaded elements can be stored
-     * @param aclAuthorizationStrategy authorization strategy (required)
-     */
-    public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
-            AclAuthorizationStrategy aclAuthorizationStrategy, AuditLogger auditLogger) {
-        this(dataSource, aclCache, aclAuthorizationStrategy, new DefaultPermissionGrantingStrategy(auditLogger));
-    }
-
-    /**
-     * Creates a new instance
-     *
-     * @param dataSource to access the database
-     * @param aclCache the cache where fully-loaded elements can be stored
-     * @param aclAuthorizationStrategy authorization strategy (required)
-     * @param grantingStrategy the PermissionGrantingStrategy
-     */
-    public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
-            AclAuthorizationStrategy aclAuthorizationStrategy, PermissionGrantingStrategy grantingStrategy) {
-        Assert.notNull(dataSource, "DataSource required");
-        Assert.notNull(aclCache, "AclCache required");
-        Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
-        Assert.notNull(grantingStrategy, "grantingStrategy required");
-        jdbcTemplate = new JdbcTemplate(dataSource);
-        this.aclCache = aclCache;
-        this.aclAuthorizationStrategy = aclAuthorizationStrategy;
-        this.grantingStrategy = grantingStrategy;
-        fieldAces.setAccessible(true);
-        fieldAcl.setAccessible(true);
-
-    }
-
-    //~ Methods ========================================================================================================
-
-    private String computeRepeatingSql(String repeatingSql, int requiredRepetitions) {
-        assert requiredRepetitions > 0 : "requiredRepetitions must be > 0";
-
-        final String startSql = selectClause;
-
-        final String endSql = orderByClause;
-
-        StringBuilder sqlStringBldr =
-            new StringBuilder(startSql.length() + endSql.length() + requiredRepetitions * (repeatingSql.length() + 4));
-        sqlStringBldr.append(startSql);
-
-        for (int i = 1; i <= requiredRepetitions; i++) {
-            sqlStringBldr.append(repeatingSql);
-
-            if (i != requiredRepetitions) {
-                sqlStringBldr.append(" or ");
-            }
-        }
-
-        sqlStringBldr.append(endSql);
-
-        return sqlStringBldr.toString();
-    }
-
-    @SuppressWarnings("unchecked")
-    private List<AccessControlEntryImpl> readAces(AclImpl acl) {
-        try {
-            return (List<AccessControlEntryImpl>) fieldAces.get(acl);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException("Could not obtain AclImpl.aces field", e);
-        }
-    }
-
-    private void setAclOnAce(AccessControlEntryImpl ace, AclImpl acl) {
-        try {
-            fieldAcl.set(ace, acl);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException("Could not or set AclImpl on AccessControlEntryImpl fields", e);
-        }
-    }
-
-    private void setAces(AclImpl acl, List<AccessControlEntryImpl> aces) {
-        try {
-            fieldAces.set(acl, aces);
-        } catch (IllegalAccessException e) {
-            throw new IllegalStateException("Could not set AclImpl entries", e);
-        }
-    }
-
-    /**
-     * Locates the primary key IDs specified in "findNow", adding AclImpl instances with StubAclParents to the
-     * "acls" Map.
-     *
-     * @param acls the AclImpls (with StubAclParents)
-     * @param findNow Long-based primary keys to retrieve
-     * @param sids
-     */
-    private void lookupPrimaryKeys(final Map<Serializable, Acl> acls, final Set<Long> findNow, final List<Sid> sids) {
-        Assert.notNull(acls, "ACLs are required");
-        Assert.notEmpty(findNow, "Items to find now required");
-
-        String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size());
-
-        Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-            new PreparedStatementSetter() {
-                public void setValues(PreparedStatement ps) throws SQLException {
-                    int i = 0;
-
-                    for (Long toFind : findNow) {
-                        i++;
-                        ps.setLong(i, toFind);
-                    }
-                }
-            }, new ProcessResultSet(acls, sids));
-
-        // Lookup the parents, now that our JdbcTemplate has released the database connection (SEC-547)
-        if (parentsToLookup.size() > 0) {
-            lookupPrimaryKeys(acls, parentsToLookup, sids);
-        }
-    }
-
-    /**
-     * The main method.
-     * <p>
-     * WARNING: This implementation completely disregards the "sids" argument! Every item in the cache is expected to
-     * contain all SIDs. If you have serious performance needs (e.g. a very large number of
-     * SIDs per object identity), you'll probably want to develop a custom {@link LookupStrategy} implementation
-     * instead.
-     * <p>
-     * The implementation works in batch sizes specified by {@link #batchSize}.
-     *
-     * @param objects the identities to lookup (required)
-     * @param sids the SIDs for which identities are required (ignored by this implementation)
-     *
-     * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the located {@link Acl} and values
-     *         are the located {@link Acl} (never <tt>null</tt> although some entries may be missing; this method
-     *         should not throw {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used
-     *         to automatically create entries if required)
-     */
-    public final Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) {
-        Assert.isTrue(batchSize >= 1, "BatchSize must be >= 1");
-        Assert.notEmpty(objects, "Objects to lookup required");
-
-        // Map<ObjectIdentity,Acl>
-        Map<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>(); // contains FULLY loaded Acl objects
-
-        Set<ObjectIdentity> currentBatchToLoad = new HashSet<ObjectIdentity>();
-
-        for (int i = 0; i < objects.size(); i++) {
-            final ObjectIdentity oid = objects.get(i);
-            boolean aclFound = false;
-
-            // Check we don't already have this ACL in the results
-            if (result.containsKey(oid)) {
-                aclFound = true;
-            }
-
-            // Check cache for the present ACL entry
-            if (!aclFound) {
-                Acl acl = aclCache.getFromCache(oid);
-
-                // Ensure any cached element supports all the requested SIDs
-                // (they should always, as our base impl doesn't filter on SID)
-                if (acl != null) {
-                    if (acl.isSidLoaded(sids)) {
-                        result.put(acl.getObjectIdentity(), acl);
-                        aclFound = true;
-                    } else {
-                        throw new IllegalStateException(
-                            "Error: SID-filtered element detected when implementation does not perform SID filtering "
-                                    + "- have you added something to the cache manually?");
-                    }
-                }
-            }
-
-            // Load the ACL from the database
-            if (!aclFound) {
-                currentBatchToLoad.add(oid);
-            }
-
-            // Is it time to load from JDBC the currentBatchToLoad?
-            if ((currentBatchToLoad.size() == this.batchSize) || ((i + 1) == objects.size())) {
-                if (currentBatchToLoad.size() > 0) {
-                    Map<ObjectIdentity, Acl> loadedBatch = lookupObjectIdentities(currentBatchToLoad, sids);
-
-                    // Add loaded batch (all elements 100% initialized) to results
-                    result.putAll(loadedBatch);
-
-                    // Add the loaded batch to the cache
-
-                    for (Acl loadedAcl : loadedBatch.values()) {
-                        aclCache.putInCache((AclImpl) loadedAcl);
-                    }
-
-                    currentBatchToLoad.clear();
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Looks up a batch of <code>ObjectIdentity</code>s directly from the database.
-     * <p>
-     * The caller is responsible for optimization issues, such as selecting the identities to lookup, ensuring the
-     * cache doesn't contain them already, and adding the returned elements to the cache etc.
-     * <p>
-     * This subclass is required to return fully valid <code>Acl</code>s, including properly-configured
-     * parent ACLs.
-     *
-     */
-    private Map<ObjectIdentity, Acl> lookupObjectIdentities(final Collection<ObjectIdentity> objectIdentities, List<Sid> sids) {
-        Assert.notEmpty(objectIdentities, "Must provide identities to lookup");
-
-        final Map<Serializable, Acl> acls = new HashMap<Serializable, Acl>(); // contains Acls with StubAclParents
-
-        // Make the "acls" map contain all requested objectIdentities
-        // (including markers to each parent in the hierarchy)
-        String sql = computeRepeatingSql(lookupObjectIdentitiesWhereClause, objectIdentities.size());
-
-        Set<Long> parentsToLookup = jdbcTemplate.query(sql,
-            new PreparedStatementSetter() {
-                public void setValues(PreparedStatement ps) throws SQLException {
-                    int i = 0;
-                    for (ObjectIdentity oid : objectIdentities) {
-                        // Determine prepared statement values for this iteration
-                        String type = oid.getType();
-
-                        // No need to check for nulls, as guaranteed non-null by ObjectIdentity.getIdentifier() interface contract
-                        String identifier = oid.getIdentifier().toString();
-                        long id = (Long.valueOf(identifier)).longValue();
-
-                        // Inject values
-                        ps.setLong((2 * i) + 1, id);
-                        ps.setString((2 * i) + 2, type);
-                        i++;
-                    }
-                }
-            }, new ProcessResultSet(acls, sids));
-
-        // Lookup the parents, now that our JdbcTemplate has released the database connection (SEC-547)
-        if (parentsToLookup.size() > 0) {
-            lookupPrimaryKeys(acls, parentsToLookup, sids);
-        }
-
-        // Finally, convert our "acls" containing StubAclParents into true Acls
-        Map<ObjectIdentity, Acl> resultMap = new HashMap<ObjectIdentity, Acl>();
-
-        for (Acl inputAcl : acls.values()) {
-            Assert.isInstanceOf(AclImpl.class, inputAcl, "Map should have contained an AclImpl");
-            Assert.isInstanceOf(Long.class, ((AclImpl) inputAcl).getId(), "Acl.getId() must be Long");
-
-            Acl result = convert(acls, (Long) ((AclImpl) inputAcl).getId());
-            resultMap.put(result.getObjectIdentity(), result);
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * The final phase of converting the <code>Map</code> of <code>AclImpl</code> instances which contain
-     * <code>StubAclParent</code>s into proper, valid <code>AclImpl</code>s with correct ACL parents.
-     *
-     * @param inputMap the unconverted <code>AclImpl</code>s
-     * @param currentIdentity the current<code>Acl</code> that we wish to convert (this may be
-     *
-     */
-    private AclImpl convert(Map<Serializable, Acl> inputMap, Long currentIdentity) {
-        Assert.notEmpty(inputMap, "InputMap required");
-        Assert.notNull(currentIdentity, "CurrentIdentity required");
-
-        // Retrieve this Acl from the InputMap
-        Acl uncastAcl = inputMap.get(currentIdentity);
-        Assert.isInstanceOf(AclImpl.class, uncastAcl, "The inputMap contained a non-AclImpl");
-
-        AclImpl inputAcl = (AclImpl) uncastAcl;
-
-        Acl parent = inputAcl.getParentAcl();
-
-        if ((parent != null) && parent instanceof StubAclParent) {
-            // Lookup the parent
-            StubAclParent stubAclParent = (StubAclParent) parent;
-            parent = convert(inputMap, stubAclParent.getId());
-        }
-
-        // Now we have the parent (if there is one), create the true AclImpl
-        AclImpl result = new AclImpl(inputAcl.getObjectIdentity(), (Long) inputAcl.getId(), aclAuthorizationStrategy,
-                grantingStrategy, parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner());
-
-        // Copy the "aces" from the input to the destination
-
-        // Obtain the "aces" from the input ACL
-        List<AccessControlEntryImpl> aces = readAces(inputAcl);
-
-        // Create a list in which to store the "aces" for the "result" AclImpl instance
-        List<AccessControlEntryImpl> acesNew = new ArrayList<AccessControlEntryImpl>();
-
-        // Iterate over the "aces" input and replace each nested AccessControlEntryImpl.getAcl() with the new "result" AclImpl instance
-        // This ensures StubAclParent instances are removed, as per SEC-951
-        for (AccessControlEntryImpl ace : aces) {
-            setAclOnAce(ace, result);
-            acesNew.add(ace);
-        }
-
-        // Finally, now that the "aces" have been converted to have the "result" AclImpl instance, modify the "result" AclImpl instance
-        setAces(result, acesNew);
-
-        return result;
-    }
-
-    /**
-     * Creates a particular implementation of {@link Sid} depending on the arguments.
-     *
-     * @param sid   the name of the sid representing its unique identifier. In typical ACL database schema it's
-     *                  located in table {@code acl_sid} table, {@code sid} column.
-     * @param isPrincipal whether it's a user or granted authority like role
-     * @return the instance of Sid with the {@code sidName} as an identifier
-     */
-    protected Sid createSid(boolean isPrincipal, String sid) {
-        if (isPrincipal) {
-            return new PrincipalSid(sid);
-        } else {
-            return new GrantedAuthoritySid(sid);
-        }
-    }
-
-    /**
-     * Sets the {@code PermissionFactory} instance which will be used to convert loaded permission
-     * data values to {@code Permission}s. A {@code DefaultPermissionFactory} will be used by default.
-     *
-     * @param permissionFactory
-     */
-    public final void setPermissionFactory(PermissionFactory permissionFactory) {
-        this.permissionFactory = permissionFactory;
-    }
-
-    public final void setBatchSize(int batchSize) {
-        this.batchSize = batchSize;
-    }
-
-    /**
-     * The SQL for the select clause. If customizing in order to modify
-     * column names, schema etc, the other SQL customization fields must also be set to match.
-     *
-     * @param selectClause the select clause, which defaults to {@link #DEFAULT_SELECT_CLAUSE}.
-     */
-    public final void setSelectClause(String selectClause) {
-        this.selectClause = selectClause;
-    }
-
-    /**
-     * The SQL for the where clause used in the <tt>lookupPrimaryKey</tt> method.
-     */
-    public final void setLookupPrimaryKeysWhereClause(String lookupPrimaryKeysWhereClause) {
-        this.lookupPrimaryKeysWhereClause = lookupPrimaryKeysWhereClause;
-    }
-
-    /**
-     * The SQL for the where clause used in the <tt>lookupObjectIdentities</tt> method.
-     */
-    public final void setLookupObjectIdentitiesWhereClause(String lookupObjectIdentitiesWhereClause) {
-        this.lookupObjectIdentitiesWhereClause = lookupObjectIdentitiesWhereClause;
-    }
-
-    /**
-     * The SQL for the "order by" clause used in both queries.
-     */
-    public final void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class ProcessResultSet implements ResultSetExtractor<Set<Long>> {
-        private final Map<Serializable, Acl> acls;
-        private final List<Sid> sids;
-
-        public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
-            Assert.notNull(acls, "ACLs cannot be null");
-            this.acls = acls;
-            this.sids = sids; // can be null
-        }
-
-        /**
-         * Implementation of {@link ResultSetExtractor#extractData(ResultSet)}.
-         * Creates an {@link Acl} for each row in the {@link ResultSet} and
-         * ensures it is in member field <tt>acls</tt>.  Any {@link Acl} with
-         * a parent will have the parents id returned in a set.  The returned
-         * set of ids may requires further processing.
-         * @param rs The {@link ResultSet} to be processed
-         * @return a list of parent IDs remaining to be looked up (may be empty, but never <tt>null</tt>)
-         * @throws SQLException
-         */
-        public Set<Long> extractData(ResultSet rs) throws SQLException {
-            Set<Long> parentIdsToLookup = new HashSet<Long>(); // Set of parent_id Longs
-
-            while (rs.next()) {
-                // Convert current row into an Acl (albeit with a StubAclParent)
-                convertCurrentResultIntoObject(acls, rs);
-
-                // Figure out if this row means we need to lookup another parent
-                long parentId = rs.getLong("parent_object");
-
-                if (parentId != 0) {
-                    // See if it's already in the "acls"
-                    if (acls.containsKey(new Long(parentId))) {
-                        continue; // skip this while iteration
-                    }
-
-                    // Now try to find it in the cache
-                    MutableAcl cached = aclCache.getFromCache(new Long(parentId));
-
-                    if ((cached == null) || !cached.isSidLoaded(sids)) {
-                        parentIdsToLookup.add(new Long(parentId));
-                    } else {
-                        // Pop into the acls map, so our convert method doesn't
-                        // need to deal with an unsynchronized AclCache
-                        acls.put(cached.getId(), cached);
-                    }
-                }
-            }
-
-            // Return the parents left to lookup to the caller
-            return parentIdsToLookup;
-        }
-
-        /**
-         * Accepts the current <code>ResultSet</code> row, and converts it into an <code>AclImpl</code> that
-         * contains a <code>StubAclParent</code>
-         *
-         * @param acls the Map we should add the converted Acl to
-         * @param rs the ResultSet focused on a current row
-         *
-         * @throws SQLException if something goes wrong converting values
-         */
-        private void convertCurrentResultIntoObject(Map<Serializable, Acl> acls, ResultSet rs) throws SQLException {
-            Long id = new Long(rs.getLong("acl_id"));
-
-            // If we already have an ACL for this ID, just create the ACE
-            Acl acl = acls.get(id);
-
-            if (acl == null) {
-                // Make an AclImpl and pop it into the Map
-                ObjectIdentity objectIdentity = new ObjectIdentityImpl(rs.getString("class"),
-                        Long.valueOf(rs.getLong("object_id_identity")));
-
-                Acl parentAcl = null;
-                long parentAclId = rs.getLong("parent_object");
-
-                if (parentAclId != 0) {
-                    parentAcl = new StubAclParent(Long.valueOf(parentAclId));
-                }
-
-                boolean entriesInheriting = rs.getBoolean("entries_inheriting");
-                Sid owner = createSid(rs.getBoolean("acl_principal"), rs.getString("acl_sid"));
-
-                acl = new AclImpl(objectIdentity, id, aclAuthorizationStrategy, grantingStrategy, parentAcl, null,
-                        entriesInheriting, owner);
-
-                acls.put(id, acl);
-            }
-
-            // Add an extra ACE to the ACL (ORDER BY maintains the ACE list order)
-            // It is permissible to have no ACEs in an ACL (which is detected by a null ACE_SID)
-            if (rs.getString("ace_sid") != null) {
-                Long aceId = new Long(rs.getLong("ace_id"));
-                Sid recipient = createSid(rs.getBoolean("ace_principal"), rs.getString("ace_sid"));
-
-                int mask = rs.getInt("mask");
-                Permission permission = permissionFactory.buildFromMask(mask);
-                boolean granting = rs.getBoolean("granting");
-                boolean auditSuccess = rs.getBoolean("audit_success");
-                boolean auditFailure = rs.getBoolean("audit_failure");
-
-                AccessControlEntryImpl ace = new AccessControlEntryImpl(aceId, acl, recipient, permission, granting,
-                        auditSuccess, auditFailure);
-
-                //Field acesField = FieldUtils.getField(AclImpl.class, "aces");
-                List<AccessControlEntryImpl> aces = readAces((AclImpl)acl);
-
-                // Add the ACE if it doesn't already exist in the ACL.aces field
-                if (!aces.contains(ace)) {
-                    aces.add(ace);
-                }
-            }
-        }
-    }
-
-    private class StubAclParent implements Acl {
-        private final Long id;
-
-        public StubAclParent(Long id) {
-            this.id = id;
-        }
-
-        public List<AccessControlEntry> getEntries() {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public Long getId() {
-            return id;
-        }
-
-        public ObjectIdentity getObjectIdentity() {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public Sid getOwner() {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public Acl getParentAcl() {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public boolean isEntriesInheriting() {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-            throws NotFoundException, UnloadedSidException {
-            throw new UnsupportedOperationException("Stub only");
-        }
-
-        public boolean isSidLoaded(List<Sid> sids) {
-            throw new UnsupportedOperationException("Stub only");
-        }
-    }
+	public final static String DEFAULT_SELECT_CLAUSE = "select acl_object_identity.object_id_identity, "
+			+ "acl_entry.ace_order,  "
+			+ "acl_object_identity.id as acl_id, "
+			+ "acl_object_identity.parent_object, "
+			+ "acl_object_identity.entries_inheriting, "
+			+ "acl_entry.id as ace_id, "
+			+ "acl_entry.mask,  "
+			+ "acl_entry.granting,  "
+			+ "acl_entry.audit_success, "
+			+ "acl_entry.audit_failure,  "
+			+ "acl_sid.principal as ace_principal, "
+			+ "acl_sid.sid as ace_sid,  "
+			+ "acli_sid.principal as acl_principal, "
+			+ "acli_sid.sid as acl_sid, "
+			+ "acl_class.class "
+			+ "from acl_object_identity "
+			+ "left join acl_sid acli_sid on acli_sid.id = acl_object_identity.owner_sid "
+			+ "left join acl_class on acl_class.id = acl_object_identity.object_id_class   "
+			+ "left join acl_entry on acl_object_identity.id = acl_entry.acl_object_identity "
+			+ "left join acl_sid on acl_entry.sid = acl_sid.id  " + "where ( ";
+
+	private final static String DEFAULT_LOOKUP_KEYS_WHERE_CLAUSE = "(acl_object_identity.id = ?)";
+
+	private final static String DEFAULT_LOOKUP_IDENTITIES_WHERE_CLAUSE = "(acl_object_identity.object_id_identity = ? and acl_class.class = ?)";
+
+	public final static String DEFAULT_ORDER_BY_CLAUSE = ") order by acl_object_identity.object_id_identity"
+			+ " asc, acl_entry.ace_order asc";
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	private final AclAuthorizationStrategy aclAuthorizationStrategy;
+	private PermissionFactory permissionFactory = new DefaultPermissionFactory();
+	private final AclCache aclCache;
+	private final PermissionGrantingStrategy grantingStrategy;
+	private final JdbcTemplate jdbcTemplate;
+	private int batchSize = 50;
+
+	private final Field fieldAces = FieldUtils.getField(AclImpl.class, "aces");
+	private final Field fieldAcl = FieldUtils.getField(AccessControlEntryImpl.class,
+			"acl");
+
+	// SQL Customization fields
+	private String selectClause = DEFAULT_SELECT_CLAUSE;
+	private String lookupPrimaryKeysWhereClause = DEFAULT_LOOKUP_KEYS_WHERE_CLAUSE;
+	private String lookupObjectIdentitiesWhereClause = DEFAULT_LOOKUP_IDENTITIES_WHERE_CLAUSE;
+	private String orderByClause = DEFAULT_ORDER_BY_CLAUSE;
+
+	// ~ Constructors
+	// ===================================================================================================
+
+	/**
+	 * Constructor accepting mandatory arguments
+	 *
+	 * @param dataSource to access the database
+	 * @param aclCache the cache where fully-loaded elements can be stored
+	 * @param aclAuthorizationStrategy authorization strategy (required)
+	 */
+	public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
+			AclAuthorizationStrategy aclAuthorizationStrategy, AuditLogger auditLogger) {
+		this(dataSource, aclCache, aclAuthorizationStrategy,
+				new DefaultPermissionGrantingStrategy(auditLogger));
+	}
+
+	/**
+	 * Creates a new instance
+	 *
+	 * @param dataSource to access the database
+	 * @param aclCache the cache where fully-loaded elements can be stored
+	 * @param aclAuthorizationStrategy authorization strategy (required)
+	 * @param grantingStrategy the PermissionGrantingStrategy
+	 */
+	public BasicLookupStrategy(DataSource dataSource, AclCache aclCache,
+			AclAuthorizationStrategy aclAuthorizationStrategy,
+			PermissionGrantingStrategy grantingStrategy) {
+		Assert.notNull(dataSource, "DataSource required");
+		Assert.notNull(aclCache, "AclCache required");
+		Assert.notNull(aclAuthorizationStrategy, "AclAuthorizationStrategy required");
+		Assert.notNull(grantingStrategy, "grantingStrategy required");
+		jdbcTemplate = new JdbcTemplate(dataSource);
+		this.aclCache = aclCache;
+		this.aclAuthorizationStrategy = aclAuthorizationStrategy;
+		this.grantingStrategy = grantingStrategy;
+		fieldAces.setAccessible(true);
+		fieldAcl.setAccessible(true);
+
+	}
+
+	// ~ Methods
+	// ========================================================================================================
+
+	private String computeRepeatingSql(String repeatingSql, int requiredRepetitions) {
+		assert requiredRepetitions > 0 : "requiredRepetitions must be > 0";
+
+		final String startSql = selectClause;
+
+		final String endSql = orderByClause;
+
+		StringBuilder sqlStringBldr = new StringBuilder(startSql.length()
+				+ endSql.length() + requiredRepetitions * (repeatingSql.length() + 4));
+		sqlStringBldr.append(startSql);
+
+		for (int i = 1; i <= requiredRepetitions; i++) {
+			sqlStringBldr.append(repeatingSql);
+
+			if (i != requiredRepetitions) {
+				sqlStringBldr.append(" or ");
+			}
+		}
+
+		sqlStringBldr.append(endSql);
+
+		return sqlStringBldr.toString();
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<AccessControlEntryImpl> readAces(AclImpl acl) {
+		try {
+			return (List<AccessControlEntryImpl>) fieldAces.get(acl);
+		}
+		catch (IllegalAccessException e) {
+			throw new IllegalStateException("Could not obtain AclImpl.aces field", e);
+		}
+	}
+
+	private void setAclOnAce(AccessControlEntryImpl ace, AclImpl acl) {
+		try {
+			fieldAcl.set(ace, acl);
+		}
+		catch (IllegalAccessException e) {
+			throw new IllegalStateException(
+					"Could not or set AclImpl on AccessControlEntryImpl fields", e);
+		}
+	}
+
+	private void setAces(AclImpl acl, List<AccessControlEntryImpl> aces) {
+		try {
+			fieldAces.set(acl, aces);
+		}
+		catch (IllegalAccessException e) {
+			throw new IllegalStateException("Could not set AclImpl entries", e);
+		}
+	}
+
+	/**
+	 * Locates the primary key IDs specified in "findNow", adding AclImpl instances with
+	 * StubAclParents to the "acls" Map.
+	 *
+	 * @param acls the AclImpls (with StubAclParents)
+	 * @param findNow Long-based primary keys to retrieve
+	 * @param sids
+	 */
+	private void lookupPrimaryKeys(final Map<Serializable, Acl> acls,
+			final Set<Long> findNow, final List<Sid> sids) {
+		Assert.notNull(acls, "ACLs are required");
+		Assert.notEmpty(findNow, "Items to find now required");
+
+		String sql = computeRepeatingSql(lookupPrimaryKeysWhereClause, findNow.size());
+
+		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;
+
+						for (Long toFind : findNow) {
+							i++;
+							ps.setLong(i, toFind);
+						}
+					}
+				}, new ProcessResultSet(acls, sids));
+
+		// Lookup the parents, now that our JdbcTemplate has released the database
+		// connection (SEC-547)
+		if (parentsToLookup.size() > 0) {
+			lookupPrimaryKeys(acls, parentsToLookup, sids);
+		}
+	}
+
+	/**
+	 * The main method.
+	 * <p>
+	 * WARNING: This implementation completely disregards the "sids" argument! Every item
+	 * in the cache is expected to contain all SIDs. If you have serious performance needs
+	 * (e.g. a very large number of SIDs per object identity), you'll probably want to
+	 * develop a custom {@link LookupStrategy} implementation instead.
+	 * <p>
+	 * The implementation works in batch sizes specified by {@link #batchSize}.
+	 *
+	 * @param objects the identities to lookup (required)
+	 * @param sids the SIDs for which identities are required (ignored by this
+	 * implementation)
+	 *
+	 * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the
+	 * located {@link Acl} and values are the located {@link Acl} (never <tt>null</tt>
+	 * although some entries may be missing; this method should not throw
+	 * {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used to
+	 * automatically create entries if required)
+	 */
+	public final Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects,
+			List<Sid> sids) {
+		Assert.isTrue(batchSize >= 1, "BatchSize must be >= 1");
+		Assert.notEmpty(objects, "Objects to lookup required");
+
+		// Map<ObjectIdentity,Acl>
+		Map<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>(); // contains
+																				// FULLY
+																				// loaded
+																				// Acl
+																				// objects
+
+		Set<ObjectIdentity> currentBatchToLoad = new HashSet<ObjectIdentity>();
+
+		for (int i = 0; i < objects.size(); i++) {
+			final ObjectIdentity oid = objects.get(i);
+			boolean aclFound = false;
+
+			// Check we don't already have this ACL in the results
+			if (result.containsKey(oid)) {
+				aclFound = true;
+			}
+
+			// Check cache for the present ACL entry
+			if (!aclFound) {
+				Acl acl = aclCache.getFromCache(oid);
+
+				// Ensure any cached element supports all the requested SIDs
+				// (they should always, as our base impl doesn't filter on SID)
+				if (acl != null) {
+					if (acl.isSidLoaded(sids)) {
+						result.put(acl.getObjectIdentity(), acl);
+						aclFound = true;
+					}
+					else {
+						throw new IllegalStateException(
+								"Error: SID-filtered element detected when implementation does not perform SID filtering "
+										+ "- have you added something to the cache manually?");
+					}
+				}
+			}
+
+			// Load the ACL from the database
+			if (!aclFound) {
+				currentBatchToLoad.add(oid);
+			}
+
+			// Is it time to load from JDBC the currentBatchToLoad?
+			if ((currentBatchToLoad.size() == this.batchSize)
+					|| ((i + 1) == objects.size())) {
+				if (currentBatchToLoad.size() > 0) {
+					Map<ObjectIdentity, Acl> loadedBatch = lookupObjectIdentities(
+							currentBatchToLoad, sids);
+
+					// Add loaded batch (all elements 100% initialized) to results
+					result.putAll(loadedBatch);
+
+					// Add the loaded batch to the cache
+
+					for (Acl loadedAcl : loadedBatch.values()) {
+						aclCache.putInCache((AclImpl) loadedAcl);
+					}
+
+					currentBatchToLoad.clear();
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Looks up a batch of <code>ObjectIdentity</code>s directly from the database.
+	 * <p>
+	 * The caller is responsible for optimization issues, such as selecting the identities
+	 * to lookup, ensuring the cache doesn't contain them already, and adding the returned
+	 * elements to the cache etc.
+	 * <p>
+	 * This subclass is required to return fully valid <code>Acl</code>s, including
+	 * properly-configured parent ACLs.
+	 *
+	 */
+	private Map<ObjectIdentity, Acl> lookupObjectIdentities(
+			final Collection<ObjectIdentity> objectIdentities, List<Sid> sids) {
+		Assert.notEmpty(objectIdentities, "Must provide identities to lookup");
+
+		final Map<Serializable, Acl> acls = new HashMap<Serializable, Acl>(); // contains
+																				// Acls
+																				// with
+																				// StubAclParents
+
+		// Make the "acls" map contain all requested objectIdentities
+		// (including markers to each parent in the hierarchy)
+		String sql = computeRepeatingSql(lookupObjectIdentitiesWhereClause,
+				objectIdentities.size());
+
+		Set<Long> parentsToLookup = jdbcTemplate.query(sql,
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						int i = 0;
+						for (ObjectIdentity oid : objectIdentities) {
+							// Determine prepared statement values for this iteration
+							String type = oid.getType();
+
+							// No need to check for nulls, as guaranteed non-null by
+							// ObjectIdentity.getIdentifier() interface contract
+							String identifier = oid.getIdentifier().toString();
+							long id = (Long.valueOf(identifier)).longValue();
+
+							// Inject values
+							ps.setLong((2 * i) + 1, id);
+							ps.setString((2 * i) + 2, type);
+							i++;
+						}
+					}
+				}, new ProcessResultSet(acls, sids));
+
+		// Lookup the parents, now that our JdbcTemplate has released the database
+		// connection (SEC-547)
+		if (parentsToLookup.size() > 0) {
+			lookupPrimaryKeys(acls, parentsToLookup, sids);
+		}
+
+		// Finally, convert our "acls" containing StubAclParents into true Acls
+		Map<ObjectIdentity, Acl> resultMap = new HashMap<ObjectIdentity, Acl>();
+
+		for (Acl inputAcl : acls.values()) {
+			Assert.isInstanceOf(AclImpl.class, inputAcl,
+					"Map should have contained an AclImpl");
+			Assert.isInstanceOf(Long.class, ((AclImpl) inputAcl).getId(),
+					"Acl.getId() must be Long");
+
+			Acl result = convert(acls, (Long) ((AclImpl) inputAcl).getId());
+			resultMap.put(result.getObjectIdentity(), result);
+		}
+
+		return resultMap;
+	}
+
+	/**
+	 * The final phase of converting the <code>Map</code> of <code>AclImpl</code>
+	 * instances which contain <code>StubAclParent</code>s into proper, valid
+	 * <code>AclImpl</code>s with correct ACL parents.
+	 *
+	 * @param inputMap the unconverted <code>AclImpl</code>s
+	 * @param currentIdentity the current<code>Acl</code> that we wish to convert (this
+	 * may be
+	 *
+	 */
+	private AclImpl convert(Map<Serializable, Acl> inputMap, Long currentIdentity) {
+		Assert.notEmpty(inputMap, "InputMap required");
+		Assert.notNull(currentIdentity, "CurrentIdentity required");
+
+		// Retrieve this Acl from the InputMap
+		Acl uncastAcl = inputMap.get(currentIdentity);
+		Assert.isInstanceOf(AclImpl.class, uncastAcl,
+				"The inputMap contained a non-AclImpl");
+
+		AclImpl inputAcl = (AclImpl) uncastAcl;
+
+		Acl parent = inputAcl.getParentAcl();
+
+		if ((parent != null) && parent instanceof StubAclParent) {
+			// Lookup the parent
+			StubAclParent stubAclParent = (StubAclParent) parent;
+			parent = convert(inputMap, stubAclParent.getId());
+		}
+
+		// Now we have the parent (if there is one), create the true AclImpl
+		AclImpl result = new AclImpl(inputAcl.getObjectIdentity(),
+				(Long) inputAcl.getId(), aclAuthorizationStrategy, grantingStrategy,
+				parent, null, inputAcl.isEntriesInheriting(), inputAcl.getOwner());
+
+		// Copy the "aces" from the input to the destination
+
+		// Obtain the "aces" from the input ACL
+		List<AccessControlEntryImpl> aces = readAces(inputAcl);
+
+		// Create a list in which to store the "aces" for the "result" AclImpl instance
+		List<AccessControlEntryImpl> acesNew = new ArrayList<AccessControlEntryImpl>();
+
+		// Iterate over the "aces" input and replace each nested
+		// AccessControlEntryImpl.getAcl() with the new "result" AclImpl instance
+		// This ensures StubAclParent instances are removed, as per SEC-951
+		for (AccessControlEntryImpl ace : aces) {
+			setAclOnAce(ace, result);
+			acesNew.add(ace);
+		}
+
+		// Finally, now that the "aces" have been converted to have the "result" AclImpl
+		// instance, modify the "result" AclImpl instance
+		setAces(result, acesNew);
+
+		return result;
+	}
+
+	/**
+	 * Creates a particular implementation of {@link Sid} depending on the arguments.
+	 *
+	 * @param sid the name of the sid representing its unique identifier. In typical ACL
+	 * database schema it's located in table {@code acl_sid} table, {@code sid} column.
+	 * @param isPrincipal whether it's a user or granted authority like role
+	 * @return the instance of Sid with the {@code sidName} as an identifier
+	 */
+	protected Sid createSid(boolean isPrincipal, String sid) {
+		if (isPrincipal) {
+			return new PrincipalSid(sid);
+		}
+		else {
+			return new GrantedAuthoritySid(sid);
+		}
+	}
+
+	/**
+	 * Sets the {@code PermissionFactory} instance which will be used to convert loaded
+	 * permission data values to {@code Permission}s. A {@code DefaultPermissionFactory}
+	 * will be used by default.
+	 *
+	 * @param permissionFactory
+	 */
+	public final void setPermissionFactory(PermissionFactory permissionFactory) {
+		this.permissionFactory = permissionFactory;
+	}
+
+	public final void setBatchSize(int batchSize) {
+		this.batchSize = batchSize;
+	}
+
+	/**
+	 * The SQL for the select clause. If customizing in order to modify column names,
+	 * schema etc, the other SQL customization fields must also be set to match.
+	 *
+	 * @param selectClause the select clause, which defaults to
+	 * {@link #DEFAULT_SELECT_CLAUSE}.
+	 */
+	public final void setSelectClause(String selectClause) {
+		this.selectClause = selectClause;
+	}
+
+	/**
+	 * The SQL for the where clause used in the <tt>lookupPrimaryKey</tt> method.
+	 */
+	public final void setLookupPrimaryKeysWhereClause(String lookupPrimaryKeysWhereClause) {
+		this.lookupPrimaryKeysWhereClause = lookupPrimaryKeysWhereClause;
+	}
+
+	/**
+	 * The SQL for the where clause used in the <tt>lookupObjectIdentities</tt> method.
+	 */
+	public final void setLookupObjectIdentitiesWhereClause(
+			String lookupObjectIdentitiesWhereClause) {
+		this.lookupObjectIdentitiesWhereClause = lookupObjectIdentitiesWhereClause;
+	}
+
+	/**
+	 * The SQL for the "order by" clause used in both queries.
+	 */
+	public final void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class ProcessResultSet implements ResultSetExtractor<Set<Long>> {
+		private final Map<Serializable, Acl> acls;
+		private final List<Sid> sids;
+
+		public ProcessResultSet(Map<Serializable, Acl> acls, List<Sid> sids) {
+			Assert.notNull(acls, "ACLs cannot be null");
+			this.acls = acls;
+			this.sids = sids; // can be null
+		}
+
+		/**
+		 * Implementation of {@link ResultSetExtractor#extractData(ResultSet)}. Creates an
+		 * {@link Acl} for each row in the {@link ResultSet} and ensures it is in member
+		 * field <tt>acls</tt>. Any {@link Acl} with a parent will have the parents id
+		 * returned in a set. The returned set of ids may requires further processing.
+		 * @param rs The {@link ResultSet} to be processed
+		 * @return a list of parent IDs remaining to be looked up (may be empty, but never
+		 * <tt>null</tt>)
+		 * @throws SQLException
+		 */
+		public Set<Long> extractData(ResultSet rs) throws SQLException {
+			Set<Long> parentIdsToLookup = new HashSet<Long>(); // Set of parent_id Longs
+
+			while (rs.next()) {
+				// Convert current row into an Acl (albeit with a StubAclParent)
+				convertCurrentResultIntoObject(acls, rs);
+
+				// Figure out if this row means we need to lookup another parent
+				long parentId = rs.getLong("parent_object");
+
+				if (parentId != 0) {
+					// See if it's already in the "acls"
+					if (acls.containsKey(new Long(parentId))) {
+						continue; // skip this while iteration
+					}
+
+					// Now try to find it in the cache
+					MutableAcl cached = aclCache.getFromCache(new Long(parentId));
+
+					if ((cached == null) || !cached.isSidLoaded(sids)) {
+						parentIdsToLookup.add(new Long(parentId));
+					}
+					else {
+						// Pop into the acls map, so our convert method doesn't
+						// need to deal with an unsynchronized AclCache
+						acls.put(cached.getId(), cached);
+					}
+				}
+			}
+
+			// Return the parents left to lookup to the caller
+			return parentIdsToLookup;
+		}
+
+		/**
+		 * Accepts the current <code>ResultSet</code> row, and converts it into an
+		 * <code>AclImpl</code> that contains a <code>StubAclParent</code>
+		 *
+		 * @param acls the Map we should add the converted Acl to
+		 * @param rs the ResultSet focused on a current row
+		 *
+		 * @throws SQLException if something goes wrong converting values
+		 */
+		private void convertCurrentResultIntoObject(Map<Serializable, Acl> acls,
+				ResultSet rs) throws SQLException {
+			Long id = new Long(rs.getLong("acl_id"));
+
+			// If we already have an ACL for this ID, just create the ACE
+			Acl acl = acls.get(id);
+
+			if (acl == null) {
+				// Make an AclImpl and pop it into the Map
+				ObjectIdentity objectIdentity = new ObjectIdentityImpl(
+						rs.getString("class"), Long.valueOf(rs
+								.getLong("object_id_identity")));
+
+				Acl parentAcl = null;
+				long parentAclId = rs.getLong("parent_object");
+
+				if (parentAclId != 0) {
+					parentAcl = new StubAclParent(Long.valueOf(parentAclId));
+				}
+
+				boolean entriesInheriting = rs.getBoolean("entries_inheriting");
+				Sid owner = createSid(rs.getBoolean("acl_principal"),
+						rs.getString("acl_sid"));
+
+				acl = new AclImpl(objectIdentity, id, aclAuthorizationStrategy,
+						grantingStrategy, parentAcl, null, entriesInheriting, owner);
+
+				acls.put(id, acl);
+			}
+
+			// Add an extra ACE to the ACL (ORDER BY maintains the ACE list order)
+			// It is permissible to have no ACEs in an ACL (which is detected by a null
+			// ACE_SID)
+			if (rs.getString("ace_sid") != null) {
+				Long aceId = new Long(rs.getLong("ace_id"));
+				Sid recipient = createSid(rs.getBoolean("ace_principal"),
+						rs.getString("ace_sid"));
+
+				int mask = rs.getInt("mask");
+				Permission permission = permissionFactory.buildFromMask(mask);
+				boolean granting = rs.getBoolean("granting");
+				boolean auditSuccess = rs.getBoolean("audit_success");
+				boolean auditFailure = rs.getBoolean("audit_failure");
+
+				AccessControlEntryImpl ace = new AccessControlEntryImpl(aceId, acl,
+						recipient, permission, granting, auditSuccess, auditFailure);
+
+				// Field acesField = FieldUtils.getField(AclImpl.class, "aces");
+				List<AccessControlEntryImpl> aces = readAces((AclImpl) acl);
+
+				// Add the ACE if it doesn't already exist in the ACL.aces field
+				if (!aces.contains(ace)) {
+					aces.add(ace);
+				}
+			}
+		}
+	}
+
+	private class StubAclParent implements Acl {
+		private final Long id;
+
+		public StubAclParent(Long id) {
+			this.id = id;
+		}
+
+		public List<AccessControlEntry> getEntries() {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public ObjectIdentity getObjectIdentity() {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public Sid getOwner() {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public Acl getParentAcl() {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public boolean isEntriesInheriting() {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public boolean isGranted(List<Permission> permission, List<Sid> sids,
+				boolean administrativeMode) throws NotFoundException,
+				UnloadedSidException {
+			throw new UnsupportedOperationException("Stub only");
+		}
+
+		public boolean isSidLoaded(List<Sid> sids) {
+			throw new UnsupportedOperationException("Stub only");
+		}
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
index b94ca9e5ff..413332d2da 100644
--- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
+++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
@@ -34,96 +34,107 @@ import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.util.Assert;
 
-
 /**
  * Simple JDBC-based implementation of <code>AclService</code>.
  * <p>
- * Requires the "dirty" flags in {@link org.springframework.security.acls.domain.AclImpl} and
- * {@link org.springframework.security.acls.domain.AccessControlEntryImpl} to be set, so that the implementation can
- * detect changed parameters easily.
+ * Requires the "dirty" flags in {@link org.springframework.security.acls.domain.AclImpl}
+ * and {@link org.springframework.security.acls.domain.AccessControlEntryImpl} to be set,
+ * so that the implementation can detect changed parameters easily.
  *
  * @author Ben Alex
  */
 public class JdbcAclService implements AclService {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log log = LogFactory.getLog(JdbcAclService.class);
-    private static final String DEFAULT_SELECT_ACL_WITH_PARENT_SQL = "select obj.object_id_identity as obj_id, class.class as class "
-        + "from acl_object_identity obj, acl_object_identity parent, acl_class class "
-        + "where obj.parent_object = parent.id and obj.object_id_class = class.id "
-        + "and parent.object_id_identity = ? and parent.object_id_class = ("
-        + "select id FROM acl_class where acl_class.class = ?)";
+	protected static final Log log = LogFactory.getLog(JdbcAclService.class);
+	private static final String DEFAULT_SELECT_ACL_WITH_PARENT_SQL = "select obj.object_id_identity as obj_id, class.class as class "
+			+ "from acl_object_identity obj, acl_object_identity parent, acl_class class "
+			+ "where obj.parent_object = parent.id and obj.object_id_class = class.id "
+			+ "and parent.object_id_identity = ? and parent.object_id_class = ("
+			+ "select id FROM acl_class where acl_class.class = ?)";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final JdbcTemplate jdbcTemplate;
-    private final LookupStrategy lookupStrategy;
-    private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
+	protected final JdbcTemplate jdbcTemplate;
+	private final LookupStrategy lookupStrategy;
+	private String findChildrenSql = DEFAULT_SELECT_ACL_WITH_PARENT_SQL;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
-        Assert.notNull(dataSource, "DataSource required");
-        Assert.notNull(lookupStrategy, "LookupStrategy required");
-        this.jdbcTemplate = new JdbcTemplate(dataSource);
-        this.lookupStrategy = lookupStrategy;
-    }
+	public JdbcAclService(DataSource dataSource, LookupStrategy lookupStrategy) {
+		Assert.notNull(dataSource, "DataSource required");
+		Assert.notNull(lookupStrategy, "LookupStrategy required");
+		this.jdbcTemplate = new JdbcTemplate(dataSource);
+		this.lookupStrategy = lookupStrategy;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
-        Object[] args = {parentIdentity.getIdentifier(), parentIdentity.getType()};
-        List<ObjectIdentity> objects = jdbcTemplate.query(findChildrenSql, args,
-                new RowMapper<ObjectIdentity>() {
-                    public ObjectIdentity mapRow(ResultSet rs, int rowNum) throws SQLException {
-                        String javaType = rs.getString("class");
-                        Long identifier = new Long(rs.getLong("obj_id"));
+	public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
+		Object[] args = { parentIdentity.getIdentifier(), parentIdentity.getType() };
+		List<ObjectIdentity> objects = jdbcTemplate.query(findChildrenSql, args,
+				new RowMapper<ObjectIdentity>() {
+					public ObjectIdentity mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String javaType = rs.getString("class");
+						Long identifier = new Long(rs.getLong("obj_id"));
 
-                        return new ObjectIdentityImpl(javaType, identifier);
-                    }
-                });
+						return new ObjectIdentityImpl(javaType, identifier);
+					}
+				});
 
-        if (objects.size() == 0) {
-            return null;
-        }
+		if (objects.size() == 0) {
+			return null;
+		}
 
-        return objects;
-    }
+		return objects;
+	}
 
-    public Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException {
-        Map<ObjectIdentity, Acl> map = readAclsById(Arrays.asList(object), sids);
-        Assert.isTrue(map.containsKey(object), "There should have been an Acl entry for ObjectIdentity " + object);
+	public Acl readAclById(ObjectIdentity object, List<Sid> sids)
+			throws NotFoundException {
+		Map<ObjectIdentity, Acl> map = readAclsById(Arrays.asList(object), sids);
+		Assert.isTrue(map.containsKey(object),
+				"There should have been an Acl entry for ObjectIdentity " + object);
 
-        return (Acl) map.get(object);
-    }
+		return (Acl) map.get(object);
+	}
 
-    public Acl readAclById(ObjectIdentity object) throws NotFoundException {
-        return readAclById(object, null);
-    }
+	public Acl readAclById(ObjectIdentity object) throws NotFoundException {
+		return readAclById(object, null);
+	}
 
-    public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException {
-        return readAclsById(objects, null);
-    }
+	public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects)
+			throws NotFoundException {
+		return readAclsById(objects, null);
+	}
 
-    public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException {
-        Map<ObjectIdentity, Acl> result = lookupStrategy.readAclsById(objects, sids);
+	public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects,
+			List<Sid> sids) throws NotFoundException {
+		Map<ObjectIdentity, Acl> result = lookupStrategy.readAclsById(objects, sids);
 
-        // Check every requested object identity was found (throw NotFoundException if needed)
-        for (ObjectIdentity oid : objects) {
-            if (!result.containsKey(oid)) {
-                throw new NotFoundException("Unable to find ACL information for object identity '" + oid + "'");
-            }
-        }
+		// Check every requested object identity was found (throw NotFoundException if
+		// needed)
+		for (ObjectIdentity oid : objects) {
+			if (!result.containsKey(oid)) {
+				throw new NotFoundException(
+						"Unable to find ACL information for object identity '" + oid
+								+ "'");
+			}
+		}
 
-        return result;
-    }
+		return result;
+	}
 
-    /**
-     * Allows customization of the SQL query used to find child object identities.
-     *
-     * @param findChildrenSql
-     */
-    public void setFindChildrenQuery(String findChildrenSql) {
-        this.findChildrenSql = findChildrenSql;
-    }
+	/**
+	 * Allows customization of the SQL query used to find child object identities.
+	 *
+	 * @param findChildrenSql
+	 */
+	public void setFindChildrenQuery(String findChildrenSql) {
+		this.findChildrenSql = findChildrenSql;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
index e12b2c3b4d..7ca8ba3f90 100644
--- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
+++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
@@ -41,409 +41,447 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
-
 /**
  * Provides a base JDBC implementation of {@link MutableAclService}.
  * <p>
- * The default settings are for HSQLDB. If you are using a different database you
- * will probably need to set the {@link #setSidIdentityQuery(String) sidIdentityQuery} and
- * {@link #setClassIdentityQuery(String) classIdentityQuery} properties appropriately. The other queries,
- * SQL inserts and updates can also be customized to accomodate schema variations, but must produce results
- * consistent with those expected by the defaults.
+ * The default settings are for HSQLDB. If you are using a different database you will
+ * probably need to set the {@link #setSidIdentityQuery(String) sidIdentityQuery} and
+ * {@link #setClassIdentityQuery(String) classIdentityQuery} properties appropriately. The
+ * other queries, SQL inserts and updates can also be customized to accomodate schema
+ * variations, but must produce results consistent with those expected by the defaults.
  * <p>
- * See the appendix of the Spring Security reference manual for more information on the expected schema
- * and how it is used. Information on using PostgreSQL is also included.
+ * See the appendix of the Spring Security reference manual for more information on the
+ * expected schema and how it is used. Information on using PostgreSQL is also included.
  *
  * @author Ben Alex
  * @author Johannes Zlattinger
  */
 public class JdbcMutableAclService extends JdbcAclService implements MutableAclService {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private boolean foreignKeysInDatabase = true;
-    private final AclCache aclCache;
-    private String deleteEntryByObjectIdentityForeignKey = "delete from acl_entry where acl_object_identity=?";
-    private String deleteObjectIdentityByPrimaryKey = "delete from acl_object_identity where id=?";
-    private String classIdentityQuery = "call identity()";
-    private String sidIdentityQuery = "call identity()";
-    private String insertClass = "insert into acl_class (class) values (?)";
-    private String insertEntry = "insert into acl_entry "
-        + "(acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure)"
-        + "values (?, ?, ?, ?, ?, ?, ?)";
-    private String insertObjectIdentity = "insert into acl_object_identity "
-        + "(object_id_class, object_id_identity, owner_sid, entries_inheriting) " + "values (?, ?, ?, ?)";
-    private String insertSid = "insert into acl_sid (principal, sid) values (?, ?)";
-    private String selectClassPrimaryKey = "select id from acl_class where class=?";
-    private String selectObjectIdentityPrimaryKey = "select acl_object_identity.id from acl_object_identity, acl_class "
-        + "where acl_object_identity.object_id_class = acl_class.id and acl_class.class=? "
-        + "and acl_object_identity.object_id_identity = ?";
-    private String selectSidPrimaryKey = "select id from acl_sid where principal=? and sid=?";
-    private String updateObjectIdentity = "update acl_object_identity set "
-        + "parent_object = ?, owner_sid = ?, entries_inheriting = ?" + " where id = ?";
+	private boolean foreignKeysInDatabase = true;
+	private final AclCache aclCache;
+	private String deleteEntryByObjectIdentityForeignKey = "delete from acl_entry where acl_object_identity=?";
+	private String deleteObjectIdentityByPrimaryKey = "delete from acl_object_identity where id=?";
+	private String classIdentityQuery = "call identity()";
+	private String sidIdentityQuery = "call identity()";
+	private String insertClass = "insert into acl_class (class) values (?)";
+	private String insertEntry = "insert into acl_entry "
+			+ "(acl_object_identity, ace_order, sid, mask, granting, audit_success, audit_failure)"
+			+ "values (?, ?, ?, ?, ?, ?, ?)";
+	private String insertObjectIdentity = "insert into acl_object_identity "
+			+ "(object_id_class, object_id_identity, owner_sid, entries_inheriting) "
+			+ "values (?, ?, ?, ?)";
+	private String insertSid = "insert into acl_sid (principal, sid) values (?, ?)";
+	private String selectClassPrimaryKey = "select id from acl_class where class=?";
+	private String selectObjectIdentityPrimaryKey = "select acl_object_identity.id from acl_object_identity, acl_class "
+			+ "where acl_object_identity.object_id_class = acl_class.id and acl_class.class=? "
+			+ "and acl_object_identity.object_id_identity = ?";
+	private String selectSidPrimaryKey = "select id from acl_sid where principal=? and sid=?";
+	private String updateObjectIdentity = "update acl_object_identity set "
+			+ "parent_object = ?, owner_sid = ?, entries_inheriting = ?"
+			+ " where id = ?";
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy, AclCache aclCache) {
-        super(dataSource, lookupStrategy);
-        Assert.notNull(aclCache, "AclCache required");
-        this.aclCache = aclCache;
-    }
+	public JdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy,
+			AclCache aclCache) {
+		super(dataSource, lookupStrategy);
+		Assert.notNull(aclCache, "AclCache required");
+		this.aclCache = aclCache;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException {
-        Assert.notNull(objectIdentity, "Object Identity required");
+	public MutableAcl createAcl(ObjectIdentity objectIdentity)
+			throws AlreadyExistsException {
+		Assert.notNull(objectIdentity, "Object Identity required");
 
-        // Check this object identity hasn't already been persisted
-        if (retrieveObjectIdentityPrimaryKey(objectIdentity) != null) {
-            throw new AlreadyExistsException("Object identity '" + objectIdentity + "' already exists");
-        }
+		// Check this object identity hasn't already been persisted
+		if (retrieveObjectIdentityPrimaryKey(objectIdentity) != null) {
+			throw new AlreadyExistsException("Object identity '" + objectIdentity
+					+ "' already exists");
+		}
 
-        // Need to retrieve the current principal, in order to know who "owns" this ACL (can be changed later on)
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        PrincipalSid sid = new PrincipalSid(auth);
+		// Need to retrieve the current principal, in order to know who "owns" this ACL
+		// (can be changed later on)
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		PrincipalSid sid = new PrincipalSid(auth);
 
-        // Create the acl_object_identity row
-        createObjectIdentity(objectIdentity, sid);
+		// Create the acl_object_identity row
+		createObjectIdentity(objectIdentity, sid);
 
-        // Retrieve the ACL via superclass (ensures cache registration, proper retrieval etc)
-        Acl acl = readAclById(objectIdentity);
-        Assert.isInstanceOf(MutableAcl.class, acl, "MutableAcl should be been returned");
+		// Retrieve the ACL via superclass (ensures cache registration, proper retrieval
+		// etc)
+		Acl acl = readAclById(objectIdentity);
+		Assert.isInstanceOf(MutableAcl.class, acl, "MutableAcl should be been returned");
 
-        return (MutableAcl) acl;
-    }
+		return (MutableAcl) acl;
+	}
 
-    /**
-     * Creates a new row in acl_entry for every ACE defined in the passed MutableAcl object.
-     *
-     * @param acl containing the ACEs to insert
-     */
-    protected void createEntries(final MutableAcl acl) {
-        if(acl.getEntries().isEmpty()) {
-            return;
-        }
-        jdbcTemplate.batchUpdate(insertEntry,
-            new BatchPreparedStatementSetter() {
-                public int getBatchSize() {
-                    return acl.getEntries().size();
-                }
+	/**
+	 * Creates a new row in acl_entry for every ACE defined in the passed MutableAcl
+	 * object.
+	 *
+	 * @param acl containing the ACEs to insert
+	 */
+	protected void createEntries(final MutableAcl acl) {
+		if (acl.getEntries().isEmpty()) {
+			return;
+		}
+		jdbcTemplate.batchUpdate(insertEntry, new BatchPreparedStatementSetter() {
+			public int getBatchSize() {
+				return acl.getEntries().size();
+			}
 
-                public void setValues(PreparedStatement stmt, int i) throws SQLException {
-                    AccessControlEntry entry_ = acl.getEntries().get(i);
-                    Assert.isTrue(entry_ instanceof AccessControlEntryImpl, "Unknown ACE class");
-                    AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;
+			public void setValues(PreparedStatement stmt, int i) throws SQLException {
+				AccessControlEntry entry_ = acl.getEntries().get(i);
+				Assert.isTrue(entry_ instanceof AccessControlEntryImpl,
+						"Unknown ACE class");
+				AccessControlEntryImpl entry = (AccessControlEntryImpl) entry_;
 
-                    stmt.setLong(1, ((Long) acl.getId()).longValue());
-                    stmt.setInt(2, i);
-                    stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true).longValue());
-                    stmt.setInt(4, entry.getPermission().getMask());
-                    stmt.setBoolean(5, entry.isGranting());
-                    stmt.setBoolean(6, entry.isAuditSuccess());
-                    stmt.setBoolean(7, entry.isAuditFailure());
-                }
-            });
-    }
+				stmt.setLong(1, ((Long) acl.getId()).longValue());
+				stmt.setInt(2, i);
+				stmt.setLong(3, createOrRetrieveSidPrimaryKey(entry.getSid(), true)
+						.longValue());
+				stmt.setInt(4, entry.getPermission().getMask());
+				stmt.setBoolean(5, entry.isGranting());
+				stmt.setBoolean(6, entry.isAuditSuccess());
+				stmt.setBoolean(7, entry.isAuditFailure());
+			}
+		});
+	}
 
-    /**
-     * Creates an entry in the acl_object_identity table for the passed ObjectIdentity. The Sid is also
-     * necessary, as acl_object_identity has defined the sid column as non-null.
-     *
-     * @param object to represent an acl_object_identity for
-     * @param owner for the SID column (will be created if there is no acl_sid entry for this particular Sid already)
-     */
-    protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
-        Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
-        Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true);
-        jdbcTemplate.update(insertObjectIdentity, classId, object.getIdentifier(), sidId, Boolean.TRUE);
-    }
+	/**
+	 * Creates an entry in the acl_object_identity table for the passed ObjectIdentity.
+	 * The Sid is also necessary, as acl_object_identity has defined the sid column as
+	 * non-null.
+	 *
+	 * @param object to represent an acl_object_identity for
+	 * @param owner for the SID column (will be created if there is no acl_sid entry for
+	 * this particular Sid already)
+	 */
+	protected void createObjectIdentity(ObjectIdentity object, Sid owner) {
+		Long sidId = createOrRetrieveSidPrimaryKey(owner, true);
+		Long classId = createOrRetrieveClassPrimaryKey(object.getType(), true);
+		jdbcTemplate.update(insertObjectIdentity, classId, object.getIdentifier(), sidId,
+				Boolean.TRUE);
+	}
 
-    /**
-     * Retrieves the primary key from {@code acl_class}, creating a new row if needed and the
-     * {@code allowCreate} property is {@code true}.
-     *
-     * @param type to find or create an entry for (often the fully-qualified class name)
-     * @param allowCreate true if creation is permitted if not found
-     *
-     * @return the primary key or null if not found
-     */
-    protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate) {
-        List<Long> classIds = jdbcTemplate.queryForList(selectClassPrimaryKey, new Object[] {type}, Long.class);
+	/**
+	 * Retrieves the primary key from {@code acl_class}, creating a new row if needed and
+	 * the {@code allowCreate} property is {@code true}.
+	 *
+	 * @param type to find or create an entry for (often the fully-qualified class name)
+	 * @param allowCreate true if creation is permitted if not found
+	 *
+	 * @return the primary key or null if not found
+	 */
+	protected Long createOrRetrieveClassPrimaryKey(String type, boolean allowCreate) {
+		List<Long> classIds = jdbcTemplate.queryForList(selectClassPrimaryKey,
+				new Object[] { type }, Long.class);
 
-        if (!classIds.isEmpty()) {
-            return classIds.get(0);
-        }
+		if (!classIds.isEmpty()) {
+			return classIds.get(0);
+		}
 
-        if (allowCreate) {
-            jdbcTemplate.update(insertClass, type);
-            Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
-                    "Transaction must be running");
-            return new Long(jdbcTemplate.queryForLong(classIdentityQuery));
-        }
+		if (allowCreate) {
+			jdbcTemplate.update(insertClass, type);
+			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
+					"Transaction must be running");
+			return new Long(jdbcTemplate.queryForLong(classIdentityQuery));
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Retrieves the primary key from acl_sid, creating a new row if needed and the allowCreate property is
-     * true.
-     *
-     * @param sid to find or create
-     * @param allowCreate true if creation is permitted if not found
-     *
-     * @return the primary key or null if not found
-     *
-     * @throws IllegalArgumentException if the <tt>Sid</tt> is not a recognized implementation.
-     */
-    protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
-        Assert.notNull(sid, "Sid required");
+	/**
+	 * Retrieves the primary key from acl_sid, creating a new row if needed and the
+	 * allowCreate property is true.
+	 *
+	 * @param sid to find or create
+	 * @param allowCreate true if creation is permitted if not found
+	 *
+	 * @return the primary key or null if not found
+	 *
+	 * @throws IllegalArgumentException if the <tt>Sid</tt> is not a recognized
+	 * implementation.
+	 */
+	protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
+		Assert.notNull(sid, "Sid required");
 
-        String sidName;
-        boolean sidIsPrincipal = true;
+		String sidName;
+		boolean sidIsPrincipal = true;
 
-        if (sid instanceof PrincipalSid) {
-            sidName = ((PrincipalSid) sid).getPrincipal();
-        } else if (sid instanceof GrantedAuthoritySid) {
-            sidName = ((GrantedAuthoritySid) sid).getGrantedAuthority();
-            sidIsPrincipal = false;
-        } else {
-            throw new IllegalArgumentException("Unsupported implementation of Sid");
-        }
+		if (sid instanceof PrincipalSid) {
+			sidName = ((PrincipalSid) sid).getPrincipal();
+		}
+		else if (sid instanceof GrantedAuthoritySid) {
+			sidName = ((GrantedAuthoritySid) sid).getGrantedAuthority();
+			sidIsPrincipal = false;
+		}
+		else {
+			throw new IllegalArgumentException("Unsupported implementation of Sid");
+		}
 
-        return createOrRetrieveSidPrimaryKey(sidName, sidIsPrincipal, allowCreate);
-    }
+		return createOrRetrieveSidPrimaryKey(sidName, sidIsPrincipal, allowCreate);
+	}
 
-    /**
-     * Retrieves the primary key from acl_sid, creating a new row if needed and the allowCreate property is
-     * true.
-     * @param sidName name of Sid to find or to create
-     * @param sidIsPrincipal whether it's a user or granted authority like role
-     * @param allowCreate true if creation is permitted if not found
-     * @return the primary key or null if not found
-     */
-    protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal, boolean allowCreate) {
+	/**
+	 * Retrieves the primary key from acl_sid, creating a new row if needed and the
+	 * allowCreate property is true.
+	 * @param sidName name of Sid to find or to create
+	 * @param sidIsPrincipal whether it's a user or granted authority like role
+	 * @param allowCreate true if creation is permitted if not found
+	 * @return the primary key or null if not found
+	 */
+	protected Long createOrRetrieveSidPrimaryKey(String sidName, boolean sidIsPrincipal,
+			boolean allowCreate) {
 
-        List<Long> sidIds = jdbcTemplate.queryForList(selectSidPrimaryKey,
-                new Object[] {Boolean.valueOf(sidIsPrincipal), sidName},  Long.class);
+		List<Long> sidIds = jdbcTemplate.queryForList(selectSidPrimaryKey, new Object[] {
+				Boolean.valueOf(sidIsPrincipal), sidName }, Long.class);
 
-        if (!sidIds.isEmpty()) {
-            return sidIds.get(0);
-        }
+		if (!sidIds.isEmpty()) {
+			return sidIds.get(0);
+		}
 
-        if (allowCreate) {
-            jdbcTemplate.update(insertSid, Boolean.valueOf(sidIsPrincipal), sidName);
-            Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
-            return new Long(jdbcTemplate.queryForLong(sidIdentityQuery));
-        }
+		if (allowCreate) {
+			jdbcTemplate.update(insertSid, Boolean.valueOf(sidIsPrincipal), sidName);
+			Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
+					"Transaction must be running");
+			return new Long(jdbcTemplate.queryForLong(sidIdentityQuery));
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren) throws ChildrenExistException {
-        Assert.notNull(objectIdentity, "Object Identity required");
-        Assert.notNull(objectIdentity.getIdentifier(), "Object Identity doesn't provide an identifier");
+	public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren)
+			throws ChildrenExistException {
+		Assert.notNull(objectIdentity, "Object Identity required");
+		Assert.notNull(objectIdentity.getIdentifier(),
+				"Object Identity doesn't provide an identifier");
 
-        if (deleteChildren) {
-            List<ObjectIdentity> children = findChildren(objectIdentity);
-            if (children != null) {
-                for (ObjectIdentity child : children) {
-                    deleteAcl(child, true);
-                }
-            }
-        } else {
-            if (!foreignKeysInDatabase) {
-                // We need to perform a manual verification for what a FK would normally do
-                // We generally don't do this, in the interests of deadlock management
-                List<ObjectIdentity> children = findChildren(objectIdentity);
-                if (children != null) {
-                    throw new ChildrenExistException("Cannot delete '" + objectIdentity + "' (has " + children.size()
-                            + " children)");
-                }
-            }
-        }
+		if (deleteChildren) {
+			List<ObjectIdentity> children = findChildren(objectIdentity);
+			if (children != null) {
+				for (ObjectIdentity child : children) {
+					deleteAcl(child, true);
+				}
+			}
+		}
+		else {
+			if (!foreignKeysInDatabase) {
+				// We need to perform a manual verification for what a FK would normally
+				// do
+				// We generally don't do this, in the interests of deadlock management
+				List<ObjectIdentity> children = findChildren(objectIdentity);
+				if (children != null) {
+					throw new ChildrenExistException("Cannot delete '" + objectIdentity
+							+ "' (has " + children.size() + " children)");
+				}
+			}
+		}
 
-        Long oidPrimaryKey = retrieveObjectIdentityPrimaryKey(objectIdentity);
+		Long oidPrimaryKey = retrieveObjectIdentityPrimaryKey(objectIdentity);
 
-        // Delete this ACL's ACEs in the acl_entry table
-        deleteEntries(oidPrimaryKey);
+		// Delete this ACL's ACEs in the acl_entry table
+		deleteEntries(oidPrimaryKey);
 
-        // Delete this ACL's acl_object_identity row
-        deleteObjectIdentity(oidPrimaryKey);
+		// Delete this ACL's acl_object_identity row
+		deleteObjectIdentity(oidPrimaryKey);
 
-        // Clear the cache
-        aclCache.evictFromCache(objectIdentity);
-    }
+		// Clear the cache
+		aclCache.evictFromCache(objectIdentity);
+	}
 
-    /**
-     * Deletes all ACEs defined in the acl_entry table belonging to the presented ObjectIdentity primary key.
-     *
-     * @param oidPrimaryKey the rows in acl_entry to delete
-     */
-    protected void deleteEntries(Long oidPrimaryKey) {
-        jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
-    }
+	/**
+	 * Deletes all ACEs defined in the acl_entry table belonging to the presented
+	 * ObjectIdentity primary key.
+	 *
+	 * @param oidPrimaryKey the rows in acl_entry to delete
+	 */
+	protected void deleteEntries(Long oidPrimaryKey) {
+		jdbcTemplate.update(deleteEntryByObjectIdentityForeignKey, oidPrimaryKey);
+	}
 
-    /**
-     * Deletes a single row from acl_object_identity that is associated with the presented ObjectIdentity primary key.
-     * <p>
-     * We do not delete any entries from acl_class, even if no classes are using that class any longer. This is a
-     * deadlock avoidance approach.
-     *
-     * @param oidPrimaryKey to delete the acl_object_identity
-     */
-    protected void deleteObjectIdentity(Long oidPrimaryKey) {
-        // Delete the acl_object_identity row
-        jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
-    }
+	/**
+	 * Deletes a single row from acl_object_identity that is associated with the presented
+	 * ObjectIdentity primary key.
+	 * <p>
+	 * We do not delete any entries from acl_class, even if no classes are using that
+	 * class any longer. This is a deadlock avoidance approach.
+	 *
+	 * @param oidPrimaryKey to delete the acl_object_identity
+	 */
+	protected void deleteObjectIdentity(Long oidPrimaryKey) {
+		// Delete the acl_object_identity row
+		jdbcTemplate.update(deleteObjectIdentityByPrimaryKey, oidPrimaryKey);
+	}
 
-    /**
-     * Retrieves the primary key from the acl_object_identity table for the passed ObjectIdentity. Unlike some
-     * other methods in this implementation, this method will NOT create a row (use {@link
-     * #createObjectIdentity(ObjectIdentity, Sid)} instead).
-     *
-     * @param oid to find
-     *
-     * @return the object identity or null if not found
-     */
-    protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
-        try {
-            return new Long(jdbcTemplate.queryForLong(selectObjectIdentityPrimaryKey, oid.getType(), oid.getIdentifier()));
-        } catch (DataAccessException notFound) {
-            return null;
-        }
-    }
+	/**
+	 * Retrieves the primary key from the acl_object_identity table for the passed
+	 * ObjectIdentity. Unlike some other methods in this implementation, this method will
+	 * NOT create a row (use {@link #createObjectIdentity(ObjectIdentity, Sid)} instead).
+	 *
+	 * @param oid to find
+	 *
+	 * @return the object identity or null if not found
+	 */
+	protected Long retrieveObjectIdentityPrimaryKey(ObjectIdentity oid) {
+		try {
+			return new Long(jdbcTemplate.queryForLong(selectObjectIdentityPrimaryKey,
+					oid.getType(), oid.getIdentifier()));
+		}
+		catch (DataAccessException notFound) {
+			return null;
+		}
+	}
 
-    /**
-     * This implementation will simply delete all ACEs in the database and recreate them on each invocation of
-     * this method. A more comprehensive implementation might use dirty state checking, or more likely use ORM
-     * capabilities for create, update and delete operations of {@link MutableAcl}.
-     */
-    public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
-        Assert.notNull(acl.getId(), "Object Identity doesn't provide an identifier");
+	/**
+	 * This implementation will simply delete all ACEs in the database and recreate them
+	 * on each invocation of this method. A more comprehensive implementation might use
+	 * dirty state checking, or more likely use ORM capabilities for create, update and
+	 * delete operations of {@link MutableAcl}.
+	 */
+	public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
+		Assert.notNull(acl.getId(), "Object Identity doesn't provide an identifier");
 
-        // Delete this ACL's ACEs in the acl_entry table
-        deleteEntries(retrieveObjectIdentityPrimaryKey(acl.getObjectIdentity()));
+		// Delete this ACL's ACEs in the acl_entry table
+		deleteEntries(retrieveObjectIdentityPrimaryKey(acl.getObjectIdentity()));
 
-        // Create this ACL's ACEs in the acl_entry table
-        createEntries(acl);
+		// Create this ACL's ACEs in the acl_entry table
+		createEntries(acl);
 
-        // Change the mutable columns in acl_object_identity
-        updateObjectIdentity(acl);
+		// Change the mutable columns in acl_object_identity
+		updateObjectIdentity(acl);
 
-        // Clear the cache, including children
-        clearCacheIncludingChildren(acl.getObjectIdentity());
+		// Clear the cache, including children
+		clearCacheIncludingChildren(acl.getObjectIdentity());
 
-        // Retrieve the ACL via superclass (ensures cache registration, proper retrieval etc)
-        return (MutableAcl) super.readAclById(acl.getObjectIdentity());
-    }
+		// Retrieve the ACL via superclass (ensures cache registration, proper retrieval
+		// etc)
+		return (MutableAcl) super.readAclById(acl.getObjectIdentity());
+	}
 
-    private void clearCacheIncludingChildren(ObjectIdentity objectIdentity) {
-        Assert.notNull(objectIdentity, "ObjectIdentity required");
-        List<ObjectIdentity> children = findChildren(objectIdentity);
-        if (children != null) {
-            for (ObjectIdentity child : children) {
-                clearCacheIncludingChildren(child);
-            }
-        }
-        aclCache.evictFromCache(objectIdentity);
-    }
+	private void clearCacheIncludingChildren(ObjectIdentity objectIdentity) {
+		Assert.notNull(objectIdentity, "ObjectIdentity required");
+		List<ObjectIdentity> children = findChildren(objectIdentity);
+		if (children != null) {
+			for (ObjectIdentity child : children) {
+				clearCacheIncludingChildren(child);
+			}
+		}
+		aclCache.evictFromCache(objectIdentity);
+	}
 
-    /**
-     * Updates an existing acl_object_identity row, with new information presented in the passed MutableAcl
-     * object. Also will create an acl_sid entry if needed for the Sid that owns the MutableAcl.
-     *
-     * @param acl to modify (a row must already exist in acl_object_identity)
-     *
-     * @throws NotFoundException if the ACL could not be found to update.
-     */
-    protected void updateObjectIdentity(MutableAcl acl) {
-        Long parentId = null;
+	/**
+	 * Updates an existing acl_object_identity row, with new information presented in the
+	 * passed MutableAcl object. Also will create an acl_sid entry if needed for the Sid
+	 * that owns the MutableAcl.
+	 *
+	 * @param acl to modify (a row must already exist in acl_object_identity)
+	 *
+	 * @throws NotFoundException if the ACL could not be found to update.
+	 */
+	protected void updateObjectIdentity(MutableAcl acl) {
+		Long parentId = null;
 
-        if (acl.getParentAcl() != null) {
-            Assert.isInstanceOf(ObjectIdentityImpl.class, acl.getParentAcl().getObjectIdentity(),
-                "Implementation only supports ObjectIdentityImpl");
+		if (acl.getParentAcl() != null) {
+			Assert.isInstanceOf(ObjectIdentityImpl.class, acl.getParentAcl()
+					.getObjectIdentity(),
+					"Implementation only supports ObjectIdentityImpl");
 
-            ObjectIdentityImpl oii = (ObjectIdentityImpl) acl.getParentAcl().getObjectIdentity();
-            parentId = retrieveObjectIdentityPrimaryKey(oii);
-        }
+			ObjectIdentityImpl oii = (ObjectIdentityImpl) acl.getParentAcl()
+					.getObjectIdentity();
+			parentId = retrieveObjectIdentityPrimaryKey(oii);
+		}
 
-        Assert.notNull(acl.getOwner(), "Owner is required in this implementation");
+		Assert.notNull(acl.getOwner(), "Owner is required in this implementation");
 
-        Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
-        int count = jdbcTemplate.update(updateObjectIdentity,
-                parentId, ownerSid, Boolean.valueOf(acl.isEntriesInheriting()), acl.getId());
+		Long ownerSid = createOrRetrieveSidPrimaryKey(acl.getOwner(), true);
+		int count = jdbcTemplate.update(updateObjectIdentity, parentId, ownerSid,
+				Boolean.valueOf(acl.isEntriesInheriting()), acl.getId());
 
-        if (count != 1) {
-            throw new NotFoundException("Unable to locate ACL to update");
-        }
-    }
+		if (count != 1) {
+			throw new NotFoundException("Unable to locate ACL to update");
+		}
+	}
 
-    /**
-     * Sets the query that will be used to retrieve the identity of a newly created row in the <tt>acl_class</tt>
-     * table.
-     *
-     * @param classIdentityQuery the query, which should return the identifier. Defaults to <tt>call identity()</tt>
-     */
-    public void setClassIdentityQuery(String classIdentityQuery) {
-        Assert.hasText(classIdentityQuery, "New classIdentityQuery query is required");
-        this.classIdentityQuery = classIdentityQuery;
-    }
+	/**
+	 * Sets the query that will be used to retrieve the identity of a newly created row in
+	 * the <tt>acl_class</tt> table.
+	 *
+	 * @param classIdentityQuery the query, which should return the identifier. Defaults
+	 * to <tt>call identity()</tt>
+	 */
+	public void setClassIdentityQuery(String classIdentityQuery) {
+		Assert.hasText(classIdentityQuery, "New classIdentityQuery query is required");
+		this.classIdentityQuery = classIdentityQuery;
+	}
 
-    /**
-     * Sets the query that will be used to retrieve the identity of a newly created row in the <tt>acl_sid</tt>
-     * table.
-     *
-     * @param sidIdentityQuery the query, which should return the identifier. Defaults to <tt>call identity()</tt>
-     */
-    public void setSidIdentityQuery(String sidIdentityQuery) {
-        Assert.hasText(sidIdentityQuery, "New sidIdentityQuery query is required");
-        this.sidIdentityQuery = sidIdentityQuery;
-    }
+	/**
+	 * Sets the query that will be used to retrieve the identity of a newly created row in
+	 * the <tt>acl_sid</tt> table.
+	 *
+	 * @param sidIdentityQuery the query, which should return the identifier. Defaults to
+	 * <tt>call identity()</tt>
+	 */
+	public void setSidIdentityQuery(String sidIdentityQuery) {
+		Assert.hasText(sidIdentityQuery, "New sidIdentityQuery query is required");
+		this.sidIdentityQuery = sidIdentityQuery;
+	}
 
-    public void setDeleteEntryByObjectIdentityForeignKeySql(String deleteEntryByObjectIdentityForeignKey) {
-        this.deleteEntryByObjectIdentityForeignKey = deleteEntryByObjectIdentityForeignKey;
-    }
+	public void setDeleteEntryByObjectIdentityForeignKeySql(
+			String deleteEntryByObjectIdentityForeignKey) {
+		this.deleteEntryByObjectIdentityForeignKey = deleteEntryByObjectIdentityForeignKey;
+	}
 
-    public void setDeleteObjectIdentityByPrimaryKeySql(String deleteObjectIdentityByPrimaryKey) {
-        this.deleteObjectIdentityByPrimaryKey = deleteObjectIdentityByPrimaryKey;
-    }
+	public void setDeleteObjectIdentityByPrimaryKeySql(
+			String deleteObjectIdentityByPrimaryKey) {
+		this.deleteObjectIdentityByPrimaryKey = deleteObjectIdentityByPrimaryKey;
+	}
 
-    public void setInsertClassSql(String insertClass) {
-        this.insertClass = insertClass;
-    }
+	public void setInsertClassSql(String insertClass) {
+		this.insertClass = insertClass;
+	}
 
-    public void setInsertEntrySql(String insertEntry) {
-        this.insertEntry = insertEntry;
-    }
+	public void setInsertEntrySql(String insertEntry) {
+		this.insertEntry = insertEntry;
+	}
 
-    public void setInsertObjectIdentitySql(String insertObjectIdentity) {
-        this.insertObjectIdentity = insertObjectIdentity;
-    }
+	public void setInsertObjectIdentitySql(String insertObjectIdentity) {
+		this.insertObjectIdentity = insertObjectIdentity;
+	}
 
-    public void setInsertSidSql(String insertSid) {
-        this.insertSid = insertSid;
-    }
+	public void setInsertSidSql(String insertSid) {
+		this.insertSid = insertSid;
+	}
 
-    public void setClassPrimaryKeyQuery(String selectClassPrimaryKey) {
-        this.selectClassPrimaryKey = selectClassPrimaryKey;
-    }
+	public void setClassPrimaryKeyQuery(String selectClassPrimaryKey) {
+		this.selectClassPrimaryKey = selectClassPrimaryKey;
+	}
 
-    public void setObjectIdentityPrimaryKeyQuery(String selectObjectIdentityPrimaryKey) {
-        this.selectObjectIdentityPrimaryKey = selectObjectIdentityPrimaryKey;
-    }
+	public void setObjectIdentityPrimaryKeyQuery(String selectObjectIdentityPrimaryKey) {
+		this.selectObjectIdentityPrimaryKey = selectObjectIdentityPrimaryKey;
+	}
 
-    public void setSidPrimaryKeyQuery(String selectSidPrimaryKey) {
-        this.selectSidPrimaryKey = selectSidPrimaryKey;
-    }
+	public void setSidPrimaryKeyQuery(String selectSidPrimaryKey) {
+		this.selectSidPrimaryKey = selectSidPrimaryKey;
+	}
 
-    public void setUpdateObjectIdentity(String updateObjectIdentity) {
-        this.updateObjectIdentity = updateObjectIdentity;
-    }
+	public void setUpdateObjectIdentity(String updateObjectIdentity) {
+		this.updateObjectIdentity = updateObjectIdentity;
+	}
 
-    /**
-     * @param foreignKeysInDatabase if false this class will perform additional FK constrain checking, which may
-     * cause deadlocks (the default is true, so deadlocks are avoided but the database is expected to enforce FKs)
-     */
-    public void setForeignKeysInDatabase(boolean foreignKeysInDatabase) {
-        this.foreignKeysInDatabase = foreignKeysInDatabase;
-    }
+	/**
+	 * @param foreignKeysInDatabase if false this class will perform additional FK
+	 * constrain checking, which may cause deadlocks (the default is true, so deadlocks
+	 * are avoided but the database is expected to enforce FKs)
+	 */
+	public void setForeignKeysInDatabase(boolean foreignKeysInDatabase) {
+		this.foreignKeysInDatabase = foreignKeysInDatabase;
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java
index 9a11599627..61f7d59a1d 100644
--- a/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java
@@ -22,26 +22,27 @@ import org.springframework.security.acls.model.Sid;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * Performs lookups for {@link org.springframework.security.acls.model.AclService}.
  *
  * @author Ben Alex
  */
 public interface LookupStrategy {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Perform database-specific optimized lookup.
-     *
-     * @param objects the identities to lookup (required)
-     * @param sids the SIDs for which identities are required (may be <tt>null</tt> - implementations may elect not
-     *        to provide SID optimisations)
-     *
-     * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the located {@link Acl} and values
-     *         are the located {@link Acl} (never <tt>null</tt> although some entries may be missing; this method
-     *         should not throw {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used
-     *         to automatically create entries if required)
-     */
-    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids);
+	/**
+	 * Perform database-specific optimized lookup.
+	 *
+	 * @param objects the identities to lookup (required)
+	 * @param sids the SIDs for which identities are required (may be <tt>null</tt> -
+	 * implementations may elect not to provide SID optimisations)
+	 *
+	 * @return a <tt>Map</tt> where keys represent the {@link ObjectIdentity} of the
+	 * located {@link Acl} and values are the located {@link Acl} (never <tt>null</tt>
+	 * although some entries may be missing; this method should not throw
+	 * {@link NotFoundException}, as a chain of {@link LookupStrategy}s may be used to
+	 * automatically create entries if required)
+	 */
+	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java
index 5c157d46a5..c8c3ee4796 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java
@@ -14,42 +14,41 @@
  */
 package org.springframework.security.acls.model;
 
-
 import java.io.Serializable;
 
-
 /**
  * Represents an individual permission assignment within an {@link Acl}.
  *
  * <p>
- * Instances MUST be immutable, as they are returned by <code>Acl</code>
- * and should not allow client modification.
+ * Instances MUST be immutable, as they are returned by <code>Acl</code> and should not
+ * allow client modification.
  * </p>
  *
  * @author Ben Alex
  *
  */
 public interface AccessControlEntry extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    Acl getAcl();
+	Acl getAcl();
 
-    /**
-     * Obtains an identifier that represents this ACE.
-     *
-     * @return the identifier, or <code>null</code> if unsaved
-     */
-    Serializable getId();
+	/**
+	 * Obtains an identifier that represents this ACE.
+	 *
+	 * @return the identifier, or <code>null</code> if unsaved
+	 */
+	Serializable getId();
 
-    Permission getPermission();
+	Permission getPermission();
 
-    Sid getSid();
+	Sid getSid();
 
-    /**
-     * Indicates the a Permission is being granted to the relevant Sid. If false, indicates the permission is
-     * being revoked/blocked.
-     *
-     * @return true if being granted, false otherwise
-     */
-    boolean isGranting();
+	/**
+	 * Indicates the a Permission is being granted to the relevant Sid. If false,
+	 * indicates the permission is being revoked/blocked.
+	 *
+	 * @return true if being granted, false otherwise
+	 */
+	boolean isGranting();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/Acl.java b/acl/src/main/java/org/springframework/security/acls/model/Acl.java
index 7946e0b388..98cbe300c8 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/Acl.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/Acl.java
@@ -14,155 +14,188 @@
  */
 package org.springframework.security.acls.model;
 
-
 import java.io.Serializable;
 import java.util.List;
 
-
 /**
  * Represents an access control list (ACL) for a domain object.
  *
  * <p>
- * An <tt>Acl</tt> represents all ACL entries for a given domain object. In
- * order to avoid needing references to the domain object itself, this
- * interface handles indirection between a domain object and an ACL object
- * identity via the {@link
- * org.springframework.security.acls.model.ObjectIdentity} interface.
+ * An <tt>Acl</tt> represents all ACL entries for a given domain object. In order to avoid
+ * needing references to the domain object itself, this interface handles indirection
+ * between a domain object and an ACL object identity via the
+ * {@link org.springframework.security.acls.model.ObjectIdentity} interface.
  * </p>
  *
  * <p>
  * Implementing classes may elect to return instances that represent
- * {@link org.springframework.security.acls.model.Permission} information for either
- * some OR all {@link org.springframework.security.acls.model.Sid}
- * instances. Therefore, an instance may NOT necessarily contain ALL <tt>Sid</tt>s
- * for a given domain object.
+ * {@link org.springframework.security.acls.model.Permission} information for either some
+ * OR all {@link org.springframework.security.acls.model.Sid} instances. Therefore, an
+ * instance may NOT necessarily contain ALL <tt>Sid</tt>s for a given domain object.
  * </p>
  *
  * @author Ben Alex
  */
 public interface Acl extends Serializable {
 
-    /**
-     * Returns all of the entries represented by the present <tt>Acl</tt>. Entries associated with
-     * the <tt>Acl</tt> parents are not returned.
-     *
-     * <p>This method is typically used for administrative purposes.</p>
-     *
-     * <p>The order that entries appear in the array is important for methods declared in the
-     * {@link MutableAcl} interface. Furthermore, some implementations MAY use ordering as
-     * part of advanced permission checking.</p>
-     *
-     * <p>Do <em>NOT</em> use this method for making authorization decisions. Instead use {@link
-     * #isGranted(List, List, boolean)}.</p>
-     *
-     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of
-     * <tt>Sid</tt>s. The caller is responsible for correctly handling the result if only a subset of
-     * <tt>Sid</tt>s is represented.</p>
-     *
-     * @return the list of entries represented by the <tt>Acl</tt>, or <tt>null</tt> if there are
-     * no entries presently associated with this <tt>Acl</tt>.
-     */
-    List<AccessControlEntry> getEntries();
+	/**
+	 * Returns all of the entries represented by the present <tt>Acl</tt>. Entries
+	 * associated with the <tt>Acl</tt> parents are not returned.
+	 *
+	 * <p>
+	 * This method is typically used for administrative purposes.
+	 * </p>
+	 *
+	 * <p>
+	 * The order that entries appear in the array is important for methods declared in the
+	 * {@link MutableAcl} interface. Furthermore, some implementations MAY use ordering as
+	 * part of advanced permission checking.
+	 * </p>
+	 *
+	 * <p>
+	 * Do <em>NOT</em> use this method for making authorization decisions. Instead use
+	 * {@link #isGranted(List, List, boolean)}.
+	 * </p>
+	 *
+	 * <p>
+	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
+	 * subset of <tt>Sid</tt>s. The caller is responsible for correctly handling the
+	 * result if only a subset of <tt>Sid</tt>s is represented.
+	 * </p>
+	 *
+	 * @return the list of entries represented by the <tt>Acl</tt>, or <tt>null</tt> if
+	 * there are no entries presently associated with this <tt>Acl</tt>.
+	 */
+	List<AccessControlEntry> getEntries();
 
-    /**
-     * Obtains the domain object this <tt>Acl</tt> provides entries for. This is immutable once an
-     * <tt>Acl</tt> is created.
-     *
-     * @return the object identity (never <tt>null</tt>)
-     */
-    ObjectIdentity getObjectIdentity();
+	/**
+	 * Obtains the domain object this <tt>Acl</tt> provides entries for. This is immutable
+	 * once an <tt>Acl</tt> is created.
+	 *
+	 * @return the object identity (never <tt>null</tt>)
+	 */
+	ObjectIdentity getObjectIdentity();
 
-    /**
-     * Determines the owner of the <tt>Acl</tt>. The meaning of ownership varies by implementation and is
-     * unspecified.
-     *
-     * @return the owner (may be <tt>null</tt> if the implementation does not use ownership concepts)
-     */
-    Sid getOwner();
+	/**
+	 * Determines the owner of the <tt>Acl</tt>. The meaning of ownership varies by
+	 * implementation and is unspecified.
+	 *
+	 * @return the owner (may be <tt>null</tt> if the implementation does not use
+	 * ownership concepts)
+	 */
+	Sid getOwner();
 
-    /**
-     * A domain object may have a parent for the purpose of ACL inheritance. If there is a parent, its ACL can
-     * be accessed via this method. In turn, the parent's parent (grandparent) can be accessed and so on.
-     *
-     * <p>This method solely represents the presence of a navigation hierarchy between the parent <tt>Acl</tt> and this
-     * <tt>Acl</tt>. For actual inheritance to take place, the {@link #isEntriesInheriting()} must also be
-     * <tt>true</tt>.</p>
-     *
-     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of
-     * <tt>Sid</tt>s. The caller is responsible for correctly handling the result if only a subset of
-     * <tt>Sid</tt>s is represented.</p>
-     *
-     * @return the parent <tt>Acl</tt> (may be <tt>null</tt> if this <tt>Acl</tt> does not have a parent)
-     */
-    Acl getParentAcl();
+	/**
+	 * A domain object may have a parent for the purpose of ACL inheritance. If there is a
+	 * parent, its ACL can be accessed via this method. In turn, the parent's parent
+	 * (grandparent) can be accessed and so on.
+	 *
+	 * <p>
+	 * This method solely represents the presence of a navigation hierarchy between the
+	 * parent <tt>Acl</tt> and this <tt>Acl</tt>. For actual inheritance to take place,
+	 * the {@link #isEntriesInheriting()} must also be <tt>true</tt>.
+	 * </p>
+	 *
+	 * <p>
+	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
+	 * subset of <tt>Sid</tt>s. The caller is responsible for correctly handling the
+	 * result if only a subset of <tt>Sid</tt>s is represented.
+	 * </p>
+	 *
+	 * @return the parent <tt>Acl</tt> (may be <tt>null</tt> if this <tt>Acl</tt> does not
+	 * have a parent)
+	 */
+	Acl getParentAcl();
 
-    /**
-     * Indicates whether the ACL entries from the {@link #getParentAcl()} should flow down into the current
-     * <tt>Acl</tt>.<p>The mere link between an <tt>Acl</tt> and a parent <tt>Acl</tt> on its own
-     * is insufficient to cause ACL entries to inherit down. This is because a domain object may wish to have entirely
-     * independent entries, but maintain the link with the parent for navigation purposes. Thus, this method denotes
-     * whether or not the navigation relationship also extends to the actual inheritance of entries.</p>
-     *
-     * @return <tt>true</tt> if parent ACL entries inherit into the current <tt>Acl</tt>
-     */
-    boolean isEntriesInheriting();
+	/**
+	 * Indicates whether the ACL entries from the {@link #getParentAcl()} should flow down
+	 * into the current <tt>Acl</tt>.
+	 * <p>
+	 * The mere link between an <tt>Acl</tt> and a parent <tt>Acl</tt> on its own is
+	 * insufficient to cause ACL entries to inherit down. This is because a domain object
+	 * may wish to have entirely independent entries, but maintain the link with the
+	 * parent for navigation purposes. Thus, this method denotes whether or not the
+	 * navigation relationship also extends to the actual inheritance of entries.
+	 * </p>
+	 *
+	 * @return <tt>true</tt> if parent ACL entries inherit into the current <tt>Acl</tt>
+	 */
+	boolean isEntriesInheriting();
 
-    /**
-     * This is the actual authorization logic method, and must be used whenever ACL authorization decisions are
-     * required.
-     *
-     * <p>An array of <tt>Sid</tt>s are presented, representing security identifies of the current
-     * principal. In addition, an array of <tt>Permission</tt>s is presented which will have one or more bits set
-     * in order to indicate the permissions needed for an affirmative authorization decision. An array is presented
-     * because holding <em>any</em> of the <tt>Permission</tt>s inside the array will be sufficient for an
-     * affirmative authorization.</p>
-     *
-     * <p>The actual approach used to make authorization decisions is left to the implementation and is not
-     * specified by this interface. For example, an implementation <em>MAY</em> search the current ACL in the order
-     * the ACL entries have been stored. If a single entry is found that has the same active bits as are shown in a
-     * passed <tt>Permission</tt>, that entry's grant or deny state may determine the authorization decision. If
-     * the case of a deny state, the deny decision will only be relevant if all other <tt>Permission</tt>s passed
-     * in the array have also been unsuccessfully searched. If no entry is found that match the bits in the current
-     * ACL, provided that {@link #isEntriesInheriting()} is <tt>true</tt>, the authorization decision may be
-     * passed to the parent ACL. If there is no matching entry, the implementation MAY throw an exception, or make a
-     * predefined authorization decision.</p>
-     *
-     * <p>This method must operate correctly even if the <tt>Acl</tt> only represents a subset of <tt>Sid</tt>s,
-     * although the implementation is permitted to throw one of the signature-defined exceptions if the method
-     * is called requesting an authorization decision for a {@link Sid} that was never loaded in this <tt>Acl</tt>.
-     * </p>
-     *
-     * @param permission the permission or permissions required (at least one entry required)
-     * @param sids the security identities held by the principal (at least one entry required)
-     * @param administrativeMode if <tt>true</tt> denotes the query is for administrative purposes and no logging
-     *        or auditing (if supported by the implementation) should be undertaken
-     *
-     * @return <tt>true</tt> if authorization is granted
-     *
-     * @throws NotFoundException MUST be thrown if an implementation cannot make an authoritative authorization
-     *         decision, usually because there is no ACL information for this particular permission and/or SID
-     * @throws UnloadedSidException thrown if the <tt>Acl</tt> does not have details for one or more of the
-     *         <tt>Sid</tt>s passed as arguments
-     */
-    boolean isGranted(List<Permission> permission, List<Sid> sids, boolean administrativeMode)
-        throws NotFoundException, UnloadedSidException;
+	/**
+	 * This is the actual authorization logic method, and must be used whenever ACL
+	 * authorization decisions are required.
+	 *
+	 * <p>
+	 * An array of <tt>Sid</tt>s are presented, representing security identifies of the
+	 * current principal. In addition, an array of <tt>Permission</tt>s is presented which
+	 * will have one or more bits set in order to indicate the permissions needed for an
+	 * affirmative authorization decision. An array is presented because holding
+	 * <em>any</em> of the <tt>Permission</tt>s inside the array will be sufficient for an
+	 * affirmative authorization.
+	 * </p>
+	 *
+	 * <p>
+	 * The actual approach used to make authorization decisions is left to the
+	 * implementation and is not specified by this interface. For example, an
+	 * implementation <em>MAY</em> search the current ACL in the order the ACL entries
+	 * have been stored. If a single entry is found that has the same active bits as are
+	 * shown in a passed <tt>Permission</tt>, that entry's grant or deny state may
+	 * determine the authorization decision. If the case of a deny state, the deny
+	 * decision will only be relevant if all other <tt>Permission</tt>s passed in the
+	 * array have also been unsuccessfully searched. If no entry is found that match the
+	 * bits in the current ACL, provided that {@link #isEntriesInheriting()} is
+	 * <tt>true</tt>, the authorization decision may be passed to the parent ACL. If there
+	 * is no matching entry, the implementation MAY throw an exception, or make a
+	 * predefined authorization decision.
+	 * </p>
+	 *
+	 * <p>
+	 * This method must operate correctly even if the <tt>Acl</tt> only represents a
+	 * subset of <tt>Sid</tt>s, although the implementation is permitted to throw one of
+	 * the signature-defined exceptions if the method is called requesting an
+	 * authorization decision for a {@link Sid} that was never loaded in this <tt>Acl</tt>
+	 * .
+	 * </p>
+	 *
+	 * @param permission the permission or permissions required (at least one entry
+	 * required)
+	 * @param sids the security identities held by the principal (at least one entry
+	 * required)
+	 * @param administrativeMode if <tt>true</tt> denotes the query is for administrative
+	 * purposes and no logging or auditing (if supported by the implementation) should be
+	 * undertaken
+	 *
+	 * @return <tt>true</tt> if authorization is granted
+	 *
+	 * @throws NotFoundException MUST be thrown if an implementation cannot make an
+	 * authoritative authorization decision, usually because there is no ACL information
+	 * for this particular permission and/or SID
+	 * @throws UnloadedSidException thrown if the <tt>Acl</tt> does not have details for
+	 * one or more of the <tt>Sid</tt>s passed as arguments
+	 */
+	boolean isGranted(List<Permission> permission, List<Sid> sids,
+			boolean administrativeMode) throws NotFoundException, UnloadedSidException;
 
-    /**
-     * For efficiency reasons an <tt>Acl</tt> may be loaded and <em>not</em> contain entries for every
-     * <tt>Sid</tt> in the system. If an <tt>Acl</tt> has been loaded and does not represent every
-     * <tt>Sid</tt>, all methods of the <tt>Acl</tt> can only be used within the limited scope of the
-     * <tt>Sid</tt> instances it actually represents.
-     * <p>
-     * It is normal to load an <tt>Acl</tt> for only particular <tt>Sid</tt>s if read-only authorization
-     * decisions are being made. However, if user interface reporting or modification of <tt>Acl</tt>s are
-     * desired, an <tt>Acl</tt> should be loaded with all <tt>Sid</tt>s. This method denotes whether or
-     * not the specified <tt>Sid</tt>s have been loaded or not.
-     * </p>
-     *
-     * @param sids one or more security identities the caller is interest in knowing whether this <tt>Sid</tt>
-     *        supports
-     *
-     * @return <tt>true</tt> if every passed <tt>Sid</tt> is represented by this <tt>Acl</tt> instance
-     */
-    boolean isSidLoaded(List<Sid> sids);
+	/**
+	 * For efficiency reasons an <tt>Acl</tt> may be loaded and <em>not</em> contain
+	 * entries for every <tt>Sid</tt> in the system. If an <tt>Acl</tt> has been loaded
+	 * and does not represent every <tt>Sid</tt>, all methods of the <tt>Acl</tt> can only
+	 * be used within the limited scope of the <tt>Sid</tt> instances it actually
+	 * represents.
+	 * <p>
+	 * It is normal to load an <tt>Acl</tt> for only particular <tt>Sid</tt>s if read-only
+	 * authorization decisions are being made. However, if user interface reporting or
+	 * modification of <tt>Acl</tt>s are desired, an <tt>Acl</tt> should be loaded with
+	 * all <tt>Sid</tt>s. This method denotes whether or not the specified <tt>Sid</tt>s
+	 * have been loaded or not.
+	 * </p>
+	 *
+	 * @param sids one or more security identities the caller is interest in knowing
+	 * whether this <tt>Sid</tt> supports
+	 *
+	 * @return <tt>true</tt> if every passed <tt>Sid</tt> is represented by this
+	 * <tt>Acl</tt> instance
+	 */
+	boolean isSidLoaded(List<Sid> sids);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java
index f8ef303838..b3bdef81fd 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AclCache.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AclCache.java
@@ -18,7 +18,6 @@ import org.springframework.security.acls.jdbc.JdbcAclService;
 
 import java.io.Serializable;
 
-
 /**
  * A caching layer for {@link JdbcAclService}.
  *
@@ -26,17 +25,18 @@ import java.io.Serializable;
  *
  */
 public interface AclCache {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void evictFromCache(Serializable pk);
+	void evictFromCache(Serializable pk);
 
-    void evictFromCache(ObjectIdentity objectIdentity);
+	void evictFromCache(ObjectIdentity objectIdentity);
 
-    MutableAcl getFromCache(ObjectIdentity objectIdentity);
+	MutableAcl getFromCache(ObjectIdentity objectIdentity);
 
-    MutableAcl getFromCache(Serializable pk);
+	MutableAcl getFromCache(Serializable pk);
 
-    void putInCache(MutableAcl acl);
+	void putInCache(MutableAcl acl);
 
-    void clearCache();
+	void clearCache();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java b/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java
index 9ae2b4fd79..10b4bae1e2 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java
@@ -8,24 +8,24 @@ package org.springframework.security.acls.model;
  */
 public abstract class AclDataAccessException extends RuntimeException {
 
-    /**
-     * Constructs an <code>AclDataAccessException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param cause the root cause
-     */
-    public AclDataAccessException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
+	/**
+	 * Constructs an <code>AclDataAccessException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param cause the root cause
+	 */
+	public AclDataAccessException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 
-    /**
-     * Constructs an <code>AclDataAccessException</code> with the specified
-     * message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public AclDataAccessException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AclDataAccessException</code> with the specified message and no
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 */
+	public AclDataAccessException(String msg) {
+		super(msg);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AclService.java b/acl/src/main/java/org/springframework/security/acls/model/AclService.java
index a54d05c171..c7f11ff84c 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AclService.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AclService.java
@@ -14,85 +14,105 @@
  */
 package org.springframework.security.acls.model;
 
-
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * Provides retrieval of {@link Acl} instances.
  *
  * @author Ben Alex
  */
 public interface AclService {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Locates all object identities that use the specified parent.  This is useful for administration tools.
-     *
-     * @param parentIdentity to locate children of
-     *
-     * @return the children (or <tt>null</tt> if none were found)
-     */
-    List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity);
+	/**
+	 * Locates all object identities that use the specified parent. This is useful for
+	 * administration tools.
+	 *
+	 * @param parentIdentity to locate children of
+	 *
+	 * @return the children (or <tt>null</tt> if none were found)
+	 */
+	List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity);
 
-    /**
-     * Same as {@link #readAclsById(List)} except it returns only a single Acl.
-     * <p>
-     * This method should not be called as it does not leverage the underlying implementation's potential ability to
-     * filter <tt>Acl</tt> entries based on a {@link Sid} parameter.</p>
-     *
-     * @param object to locate an {@link Acl} for
-     *
-     * @return the {@link Acl} for the requested {@link ObjectIdentity} (never <tt>null</tt>)
-     *
-     * @throws NotFoundException if an {@link Acl} was not found for the requested {@link ObjectIdentity}
-     */
-    Acl readAclById(ObjectIdentity object) throws NotFoundException;
+	/**
+	 * Same as {@link #readAclsById(List)} except it returns only a single Acl.
+	 * <p>
+	 * This method should not be called as it does not leverage the underlying
+	 * implementation's potential ability to filter <tt>Acl</tt> entries based on a
+	 * {@link Sid} parameter.
+	 * </p>
+	 *
+	 * @param object to locate an {@link Acl} for
+	 *
+	 * @return the {@link Acl} for the requested {@link ObjectIdentity} (never
+	 * <tt>null</tt>)
+	 *
+	 * @throws NotFoundException if an {@link Acl} was not found for the requested
+	 * {@link ObjectIdentity}
+	 */
+	Acl readAclById(ObjectIdentity object) throws NotFoundException;
 
-    /**
-     * Same as {@link #readAclsById(List, List)} except it returns only a single Acl.
-     *
-     * @param object to locate an {@link Acl} for
-     * @param sids the security identities for which  {@link Acl} information is required
-     *        (may be <tt>null</tt> to denote all entries)
-     *
-     * @return the {@link Acl} for the requested {@link ObjectIdentity} (never <tt>null</tt>)
-     *
-     * @throws NotFoundException if an {@link Acl} was not found for the requested {@link ObjectIdentity}
-     */
-    Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException;
+	/**
+	 * Same as {@link #readAclsById(List, List)} except it returns only a single Acl.
+	 *
+	 * @param object to locate an {@link Acl} for
+	 * @param sids the security identities for which {@link Acl} information is required
+	 * (may be <tt>null</tt> to denote all entries)
+	 *
+	 * @return the {@link Acl} for the requested {@link ObjectIdentity} (never
+	 * <tt>null</tt>)
+	 *
+	 * @throws NotFoundException if an {@link Acl} was not found for the requested
+	 * {@link ObjectIdentity}
+	 */
+	Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException;
 
-    /**
-     * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s.<p>The returned map is
-     * keyed on the passed objects, with the values being the <tt>Acl</tt> instances. Any unknown objects will not
-     * have a map key.</p>
-     *
-     * @param objects the objects to find {@link Acl} information for
-     *
-     * @return a map with exactly one element for each {@link ObjectIdentity} passed as an argument (never <tt>null</tt>)
-     *
-     * @throws NotFoundException if an {@link Acl} was not found for each requested {@link ObjectIdentity}
-     */
-    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException;
+	/**
+	 * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s.
+	 * <p>
+	 * The returned map is keyed on the passed objects, with the values being the
+	 * <tt>Acl</tt> instances. Any unknown objects will not have a map key.
+	 * </p>
+	 *
+	 * @param objects the objects to find {@link Acl} information for
+	 *
+	 * @return a map with exactly one element for each {@link ObjectIdentity} passed as an
+	 * argument (never <tt>null</tt>)
+	 *
+	 * @throws NotFoundException if an {@link Acl} was not found for each requested
+	 * {@link ObjectIdentity}
+	 */
+	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects)
+			throws NotFoundException;
 
-    /**
-     * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s, but only for the
-     * security identifies passed.<p>Implementations <em>MAY</em> provide a subset of the ACLs via this method
-     * although this is NOT a requirement. This is intended to allow performance optimisations within implementations.
-     * Callers should therefore use this method in preference to the alternative overloaded version which does not
-     * have performance optimisation opportunities.</p>
-     *  <p>The returned map is keyed on the passed objects, with the values being the <tt>Acl</tt>
-     * instances. Any unknown objects (or objects for which the interested <tt>Sid</tt>s do not have entries) will
-     * not have a map key.</p>
-     *
-     * @param objects the objects to find {@link Acl} information for
-     * @param sids the security identities for which  {@link Acl} information is required
-     *        (may be <tt>null</tt> to denote all entries)
-     *
-     * @return a map with exactly one element for each {@link ObjectIdentity} passed as an argument (never <tt>null</tt>)
-     *
-     * @throws NotFoundException if an {@link Acl} was not found for each requested {@link ObjectIdentity}
-     */
-    Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException;
+	/**
+	 * Obtains all the <tt>Acl</tt>s that apply for the passed <tt>Object</tt>s, but only
+	 * for the security identifies passed.
+	 * <p>
+	 * Implementations <em>MAY</em> provide a subset of the ACLs via this method although
+	 * this is NOT a requirement. This is intended to allow performance optimisations
+	 * within implementations. Callers should therefore use this method in preference to
+	 * the alternative overloaded version which does not have performance optimisation
+	 * opportunities.
+	 * </p>
+	 * <p>
+	 * The returned map is keyed on the passed objects, with the values being the
+	 * <tt>Acl</tt> instances. Any unknown objects (or objects for which the interested
+	 * <tt>Sid</tt>s do not have entries) will not have a map key.
+	 * </p>
+	 *
+	 * @param objects the objects to find {@link Acl} information for
+	 * @param sids the security identities for which {@link Acl} information is required
+	 * (may be <tt>null</tt> to denote all entries)
+	 *
+	 * @return a map with exactly one element for each {@link ObjectIdentity} passed as an
+	 * argument (never <tt>null</tt>)
+	 *
+	 * @throws NotFoundException if an {@link Acl} was not found for each requested
+	 * {@link ObjectIdentity}
+	 */
+	Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids)
+			throws NotFoundException;
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java
index a61b1b564a..059d080983 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java
@@ -14,32 +14,32 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
  * Thrown if an <code>Acl</code> entry already exists for the object.
  *
  * @author Ben Alex
  */
 public class AlreadyExistsException extends AclDataAccessException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>AlreadyExistsException</code> with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public AlreadyExistsException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AlreadyExistsException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AlreadyExistsException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>AlreadyExistsException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AlreadyExistsException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>AlreadyExistsException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AlreadyExistsException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java
index e03607ae44..84d353eb9e 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java
@@ -14,7 +14,6 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
  * Represents an ACE that provides auditing information.
  *
@@ -22,9 +21,10 @@ package org.springframework.security.acls.model;
  *
  */
 public interface AuditableAccessControlEntry extends AccessControlEntry {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    boolean isAuditFailure();
+	boolean isAuditFailure();
 
-    boolean isAuditSuccess();
+	boolean isAuditSuccess();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java
index c256278c12..5d573419c5 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java
@@ -14,7 +14,6 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
  * A mutable ACL that provides audit capabilities.
  *
@@ -22,7 +21,8 @@ package org.springframework.security.acls.model;
  *
  */
 public interface AuditableAcl extends MutableAcl {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure);
+	void updateAuditing(int aceIndex, boolean auditSuccess, boolean auditFailure);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java
index 2b05c53c47..9f15c8b9e1 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java
@@ -14,33 +14,32 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
  * Thrown if an {@link Acl} cannot be deleted because children <code>Acl</code>s exist.
  *
  * @author Ben Alex
  */
 public class ChildrenExistException extends AclDataAccessException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>ChildrenExistException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public ChildrenExistException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>ChildrenExistException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public ChildrenExistException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>ChildrenExistException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public ChildrenExistException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>ChildrenExistException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public ChildrenExistException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java
index 5fdf98ae92..ad98cb19f6 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java
@@ -16,52 +16,50 @@ package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
-
-
 /**
  * A mutable <tt>Acl</tt>.
  * <p>
- * A mutable ACL must ensure that appropriate security checks are performed
- * before allowing access to its methods.
+ * A mutable ACL must ensure that appropriate security checks are performed before
+ * allowing access to its methods.
  *
  * @author Ben Alex
  */
 public interface MutableAcl extends Acl {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void deleteAce(int aceIndex) throws NotFoundException;
+	void deleteAce(int aceIndex) throws NotFoundException;
 
-    /**
-     * Obtains an identifier that represents this <tt>MutableAcl</tt>.
-     *
-     * @return the identifier, or <tt>null</tt> if unsaved
-     */
-    Serializable getId();
+	/**
+	 * Obtains an identifier that represents this <tt>MutableAcl</tt>.
+	 *
+	 * @return the identifier, or <tt>null</tt> if unsaved
+	 */
+	Serializable getId();
 
-    void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting)
-        throws NotFoundException;
+	void insertAce(int atIndexLocation, Permission permission, Sid sid, boolean granting)
+			throws NotFoundException;
 
-    /**
-     * Changes the present owner to a different owner.
-     *
-     * @param newOwner the new owner (mandatory; cannot be null)
-     */
-    void setOwner(Sid newOwner);
+	/**
+	 * Changes the present owner to a different owner.
+	 *
+	 * @param newOwner the new owner (mandatory; cannot be null)
+	 */
+	void setOwner(Sid newOwner);
 
-    /**
-     * Change the value returned by {@link Acl#isEntriesInheriting()}.
-     *
-     * @param entriesInheriting the new value
-     */
-    void setEntriesInheriting(boolean entriesInheriting);
+	/**
+	 * Change the value returned by {@link Acl#isEntriesInheriting()}.
+	 *
+	 * @param entriesInheriting the new value
+	 */
+	void setEntriesInheriting(boolean entriesInheriting);
 
-    /**
-     * Changes the parent of this ACL.
-     *
-     * @param newParent the new parent
-     */
-    void setParent(Acl newParent);
+	/**
+	 * Changes the parent of this ACL.
+	 *
+	 * @param newParent the new parent
+	 */
+	void setParent(Acl newParent);
 
-    void updateAce(int aceIndex, Permission permission)
-        throws NotFoundException;
+	void updateAce(int aceIndex, Permission permission) throws NotFoundException;
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java
index 323979814d..949bcb53b2 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java
@@ -14,48 +14,47 @@
  */
 package org.springframework.security.acls.model;
 
-
-
 /**
  * Provides support for creating and storing <code>Acl</code> instances.
  *
  * @author Ben Alex
  */
 public interface MutableAclService extends AclService {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Creates an empty <code>Acl</code> object in the database. It will have no entries. The returned object
-     * will then be used to add entries.
-     *
-     * @param objectIdentity the object identity to create
-     *
-     * @return an ACL object with its ID set
-     *
-     * @throws AlreadyExistsException if the passed object identity already has a record
-     */
-    MutableAcl createAcl(ObjectIdentity objectIdentity)
-        throws AlreadyExistsException;
+	/**
+	 * Creates an empty <code>Acl</code> object in the database. It will have no entries.
+	 * The returned object will then be used to add entries.
+	 *
+	 * @param objectIdentity the object identity to create
+	 *
+	 * @return an ACL object with its ID set
+	 *
+	 * @throws AlreadyExistsException if the passed object identity already has a record
+	 */
+	MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException;
 
-    /**
-     * Removes the specified entry from the database.
-     *
-     * @param objectIdentity the object identity to remove
-     * @param deleteChildren whether to cascade the delete to children
-     *
-     * @throws ChildrenExistException if the deleteChildren argument was <code>false</code> but children exist
-     */
-    void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren)
-        throws ChildrenExistException;
+	/**
+	 * Removes the specified entry from the database.
+	 *
+	 * @param objectIdentity the object identity to remove
+	 * @param deleteChildren whether to cascade the delete to children
+	 *
+	 * @throws ChildrenExistException if the deleteChildren argument was
+	 * <code>false</code> but children exist
+	 */
+	void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren)
+			throws ChildrenExistException;
 
-    /**
-     * Changes an existing <code>Acl</code> in the database.
-     *
-     * @param acl to modify
-     *
-     * @throws NotFoundException if the relevant record could not be found (did you remember to use {@link
-     *         #createAcl(ObjectIdentity)} to create the object, rather than creating it with the <code>new</code>
-     *         keyword?)
-     */
-    MutableAcl updateAcl(MutableAcl acl) throws NotFoundException;
+	/**
+	 * Changes an existing <code>Acl</code> in the database.
+	 *
+	 * @param acl to modify
+	 *
+	 * @throws NotFoundException if the relevant record could not be found (did you
+	 * remember to use {@link #createAcl(ObjectIdentity)} to create the object, rather
+	 * than creating it with the <code>new</code> keyword?)
+	 */
+	MutableAcl updateAcl(MutableAcl acl) throws NotFoundException;
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java
index a2f3323698..d96c1e7c50 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java
@@ -14,32 +14,32 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
  * Thrown if an ACL-related object cannot be found.
  *
  * @author Ben Alex
  */
 public class NotFoundException extends AclDataAccessException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>NotFoundException</code> with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public NotFoundException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>NotFoundException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public NotFoundException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>NotFoundException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public NotFoundException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>NotFoundException</code> with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public NotFoundException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java
index 97003b11a5..855ae6883b 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java
@@ -16,56 +16,59 @@ package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
-
 /**
  * Represents the identity of an individual domain object instance.
  *
  * <p>
- * As implementations of <tt>ObjectIdentity</tt> are used as the key to represent
- * domain objects in the ACL subsystem, it is essential that implementations provide
- * methods so that object-equality rather than reference-equality can be relied upon
- * reliably. In other words, the ACL subsystem can consider two
- * <tt>ObjectIdentity</tt>s equal if <tt>identity1.equals(identity2)</tt>, rather than
- * reference-equality of <tt>identity1==identity2</tt>.
+ * As implementations of <tt>ObjectIdentity</tt> are used as the key to represent domain
+ * objects in the ACL subsystem, it is essential that implementations provide methods so
+ * that object-equality rather than reference-equality can be relied upon reliably. In
+ * other words, the ACL subsystem can consider two <tt>ObjectIdentity</tt>s equal if
+ * <tt>identity1.equals(identity2)</tt>, rather than reference-equality of
+ * <tt>identity1==identity2</tt>.
  * </p>
  *
  * @author Ben Alex
  */
 public interface ObjectIdentity extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * @param obj to be compared
-     *
-     * @return <tt>true</tt> if the objects are equal, <tt>false</tt> otherwise
-     * @see Object#equals(Object)
-     */
-    boolean equals(Object obj);
+	/**
+	 * @param obj to be compared
+	 *
+	 * @return <tt>true</tt> if the objects are equal, <tt>false</tt> otherwise
+	 * @see Object#equals(Object)
+	 */
+	boolean equals(Object obj);
 
-    /**
-     * Obtains the actual identifier. This identifier must not be reused to represent other domain objects with
-     * the same <tt>javaType</tt>.
-     *
-     * <p>Because ACLs are largely immutable, it is strongly recommended to use
-     * a synthetic identifier (such as a database sequence number for the primary key). Do not use an identifier with
-     * business meaning, as that business meaning may change in the future such change will cascade to the ACL
-     * subsystem data.</p>
-     *
-     * @return the identifier (unique within this <tt>type</tt>; never <tt>null</tt>)
-     */
-    Serializable getIdentifier();
+	/**
+	 * Obtains the actual identifier. This identifier must not be reused to represent
+	 * other domain objects with the same <tt>javaType</tt>.
+	 *
+	 * <p>
+	 * Because ACLs are largely immutable, it is strongly recommended to use a synthetic
+	 * identifier (such as a database sequence number for the primary key). Do not use an
+	 * identifier with business meaning, as that business meaning may change in the future
+	 * such change will cascade to the ACL subsystem data.
+	 * </p>
+	 *
+	 * @return the identifier (unique within this <tt>type</tt>; never <tt>null</tt>)
+	 */
+	Serializable getIdentifier();
 
-    /**
-     * Obtains the "type" metadata for the domain object. This will often be a Java type name (an interface or a class)
-     * &ndash; traditionally it is the name of the domain object implementation class.
-     *
-     * @return the "type" of the domain object (never <tt>null</tt>).
-     */
-    String getType();
+	/**
+	 * Obtains the "type" metadata for the domain object. This will often be a Java type
+	 * name (an interface or a class) &ndash; traditionally it is the name of the domain
+	 * object implementation class.
+	 *
+	 * @return the "type" of the domain object (never <tt>null</tt>).
+	 */
+	String getType();
 
-    /**
-     * @return a hash code representation of the <tt>ObjectIdentity</tt>
-     * @see Object#hashCode()
-     */
-    int hashCode();
+	/**
+	 * @return a hash code representation of the <tt>ObjectIdentity</tt>
+	 * @see Object#hashCode()
+	 */
+	int hashCode();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java
index e6609c52a8..cb9330d30f 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java
@@ -2,25 +2,25 @@ package org.springframework.security.acls.model;
 
 import java.io.Serializable;
 
-
 /**
- * Strategy which creates an {@link ObjectIdentity} from an object identifier (such as a primary key)
- * and type information.
+ * Strategy which creates an {@link ObjectIdentity} from an object identifier (such as a
+ * primary key) and type information.
  * <p>
- * Differs from {@link ObjectIdentityRetrievalStrategy} in that it is used in situations when the actual object
- * instance isn't available.
+ * Differs from {@link ObjectIdentityRetrievalStrategy} in that it is used in situations
+ * when the actual object instance isn't available.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface ObjectIdentityGenerator {
 
-    /**
-     *
-     * @param id the identifier of the domain object, not null
-     * @param type the type of the object (often a class name), not null
-     * @return the identity constructed using the supplied identifier and type information.
-     */
-    ObjectIdentity createObjectIdentity(Serializable id, String type);
+	/**
+	 *
+	 * @param id the identifier of the domain object, not null
+	 * @param type the type of the object (often a class name), not null
+	 * @return the identity constructed using the supplied identifier and type
+	 * information.
+	 */
+	ObjectIdentity createObjectIdentity(Serializable id, String type);
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java
index 3e2e7353a6..395c7e3d6a 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.acls.model;
 
-
 /**
  * Strategy interface that provides the ability to determine which {@link ObjectIdentity}
  * will be returned for a particular domain object
@@ -24,7 +23,8 @@ package org.springframework.security.acls.model;
  *
  */
 public interface ObjectIdentityRetrievalStrategy {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    ObjectIdentity getObjectIdentity(Object domainObject);
+	ObjectIdentity getObjectIdentity(Object domainObject);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java
index a0953c18db..ecd79a65bc 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java
@@ -14,19 +14,18 @@
  */
 package org.springframework.security.acls.model;
 
-
-
 /**
  * A mutable ACL that provides ownership capabilities.
  *
  * <p>
- * Generally the owner of an ACL is able to call any ACL mutator method, as
- * well as assign a new owner.
+ * Generally the owner of an ACL is able to call any ACL mutator method, as well as assign
+ * a new owner.
  *
  * @author Ben Alex
  */
 public interface OwnershipAcl extends MutableAcl {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void setOwner(Sid newOwner);
+	void setOwner(Sid newOwner);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/Permission.java b/acl/src/main/java/org/springframework/security/acls/model/Permission.java
index 15426b43c1..625f5aeb6d 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/Permission.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/Permission.java
@@ -22,36 +22,41 @@ import java.io.Serializable;
  * @author Ben Alex
  */
 public interface Permission extends Serializable {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    char RESERVED_ON = '~';
-    char RESERVED_OFF = '.';
-    String THIRTY_TWO_RESERVED_OFF = "................................";
+	char RESERVED_ON = '~';
+	char RESERVED_OFF = '.';
+	String THIRTY_TWO_RESERVED_OFF = "................................";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the bits that represents the permission.
-     *
-     * @return the bits that represent the permission
-     */
-    int getMask();
+	/**
+	 * Returns the bits that represents the permission.
+	 *
+	 * @return the bits that represent the permission
+	 */
+	int getMask();
 
-    /**
-     * Returns a 32-character long bit pattern <code>String</code> representing this permission.
-     * <p>
-     * Implementations are free to format the pattern as they see fit, although under no circumstances may
-     * {@link #RESERVED_OFF} or {@link #RESERVED_ON} be used within the pattern. An exemption is in the case of
-     * {@link #RESERVED_OFF} which is used to denote a bit that is off (clear).
-     * Implementations may also elect to use {@link #RESERVED_ON} internally for computation purposes,
-     * although this method may not return any <code>String</code> containing {@link #RESERVED_ON}.
-     * <p>
-     * The returned String must be 32 characters in length.
-     * <p>
-     * This method is only used for user interface and logging purposes. It is not used in any permission
-     * calculations. Therefore, duplication of characters within the output is permitted.
-     *
-     * @return a 32-character bit pattern
-     */
-    String getPattern();
+	/**
+	 * Returns a 32-character long bit pattern <code>String</code> representing this
+	 * permission.
+	 * <p>
+	 * Implementations are free to format the pattern as they see fit, although under no
+	 * circumstances may {@link #RESERVED_OFF} or {@link #RESERVED_ON} be used within the
+	 * pattern. An exemption is in the case of {@link #RESERVED_OFF} which is used to
+	 * denote a bit that is off (clear). Implementations may also elect to use
+	 * {@link #RESERVED_ON} internally for computation purposes, although this method may
+	 * not return any <code>String</code> containing {@link #RESERVED_ON}.
+	 * <p>
+	 * The returned String must be 32 characters in length.
+	 * <p>
+	 * This method is only used for user interface and logging purposes. It is not used in
+	 * any permission calculations. Therefore, duplication of characters within the output
+	 * is permitted.
+	 *
+	 * @return a 32-character bit pattern
+	 */
+	String getPattern();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java
index c2be569fe0..9ea73cccbf 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java
@@ -3,18 +3,19 @@ package org.springframework.security.acls.model;
 import java.util.List;
 
 /**
- * Allow customization of the logic for determining whether a permission or permissions are granted to a particular
- * sid or sids by an {@link Acl}.
+ * Allow customization of the logic for determining whether a permission or permissions
+ * are granted to a particular sid or sids by an {@link Acl}.
  *
  * @author Luke Taylor
  * @since 3.0.2
  */
 public interface PermissionGrantingStrategy {
 
-    /**
-     * Returns true if the the supplied strategy decides that the supplied {@code Acl} grants access
-     * based on the supplied list of permissions and sids.
-     */
-    boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids, boolean administrativeMode);
+	/**
+	 * Returns true if the the supplied strategy decides that the supplied {@code Acl}
+	 * grants access based on the supplied list of permissions and sids.
+	 */
+	boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids,
+			boolean administrativeMode);
 
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/Sid.java b/acl/src/main/java/org/springframework/security/acls/model/Sid.java
index 2fb0633235..be18753a9e 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/Sid.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/Sid.java
@@ -20,32 +20,34 @@ import java.io.Serializable;
  * A security identity recognised by the ACL system.
  *
  * <p>
- * This interface provides indirection between actual security objects (eg
- * principals, roles, groups etc) and what is stored inside an
- * <code>Acl</code>. This is because an <code>Acl</code> will not store an
- * entire security object, but only an abstraction of it. This interface
- * therefore provides a simple way to compare these abstracted security
+ * This interface provides indirection between actual security objects (eg principals,
+ * roles, groups etc) and what is stored inside an <code>Acl</code>. This is because an
+ * <code>Acl</code> will not store an entire security object, but only an abstraction of
+ * it. This interface therefore provides a simple way to compare these abstracted security
  * identities with other security identities and actual security objects.
  * </p>
  *
  * @author Ben Alex
  */
 public interface Sid extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Refer to the <code>java.lang.Object</code> documentation for the interface contract.
-     *
-     * @param obj to be compared
-     *
-     * @return <code>true</code> if the objects are equal, <code>false</code> otherwise
-     */
-    boolean equals(Object obj);
+	/**
+	 * Refer to the <code>java.lang.Object</code> documentation for the interface
+	 * contract.
+	 *
+	 * @param obj to be compared
+	 *
+	 * @return <code>true</code> if the objects are equal, <code>false</code> otherwise
+	 */
+	boolean equals(Object obj);
 
-    /**
-     * Refer to the <code>java.lang.Object</code> documentation for the interface contract.
-     *
-     * @return a hash code representation of this object
-     */
-    int hashCode();
+	/**
+	 * Refer to the <code>java.lang.Object</code> documentation for the interface
+	 * contract.
+	 *
+	 * @return a hash code representation of this object
+	 */
+	int hashCode();
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java
index 310935cbb0..fc48bfdb7d 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java
@@ -19,15 +19,15 @@ import java.util.List;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Strategy interface that provides an ability to determine the {@link Sid} instances applicable
- * for an {@link Authentication}.
+ * Strategy interface that provides an ability to determine the {@link Sid} instances
+ * applicable for an {@link Authentication}.
  *
  * @author Ben Alex
  */
 public interface SidRetrievalStrategy {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    List<Sid> getSids(Authentication authentication);
+	List<Sid> getSids(Authentication authentication);
 }
diff --git a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java
index 6e49ad962c..e92f1e8710 100644
--- a/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java
+++ b/acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java
@@ -14,33 +14,34 @@
  */
 package org.springframework.security.acls.model;
 
-
 /**
- * Thrown if an {@link Acl} cannot perform an operation because it only loaded a subset of <code>Sid</code>s and
- * the caller has requested details for an unloaded <code>Sid</code>.
+ * Thrown if an {@link Acl} cannot perform an operation because it only loaded a subset of
+ * <code>Sid</code>s and the caller has requested details for an unloaded <code>Sid</code>
+ * .
  *
  * @author Ben Alex
  */
 public class UnloadedSidException extends AclDataAccessException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>NotFoundException</code> with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public UnloadedSidException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>NotFoundException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public UnloadedSidException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>NotFoundException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public UnloadedSidException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>NotFoundException</code> with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public UnloadedSidException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java
index a72ea09605..15389e7359 100644
--- a/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java
@@ -13,123 +13,132 @@ import junit.framework.TestCase;
  */
 public class AclFormattingUtilsTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final void testDemergePatternsParametersConstraints() throws Exception {
-        try {
-            AclFormattingUtils.demergePatterns(null, "SOME STRING");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+	public final void testDemergePatternsParametersConstraints() throws Exception {
+		try {
+			AclFormattingUtils.demergePatterns(null, "SOME STRING");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.demergePatterns("SOME STRING", null);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.demergePatterns("SOME STRING", null);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH");
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
-    }
+		try {
+			AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH");
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
+	}
 
-    public final void testDemergePatterns() throws Exception {
-        String original = "...........................A...R";
-        String removeBits = "...............................R";
-        Assert.assertEquals("...........................A....", AclFormattingUtils
-                .demergePatterns(original, removeBits));
+	public final void testDemergePatterns() throws Exception {
+		String original = "...........................A...R";
+		String removeBits = "...............................R";
+		Assert.assertEquals("...........................A....",
+				AclFormattingUtils.demergePatterns(original, removeBits));
 
-        Assert.assertEquals("ABCDEF", AclFormattingUtils.demergePatterns("ABCDEF", "......"));
-        Assert.assertEquals("......", AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL"));
-    }
+		Assert.assertEquals("ABCDEF",
+				AclFormattingUtils.demergePatterns("ABCDEF", "......"));
+		Assert.assertEquals("......",
+				AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL"));
+	}
 
-    public final void testMergePatternsParametersConstraints() throws Exception {
-        try {
-            AclFormattingUtils.mergePatterns(null, "SOME STRING");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+	public final void testMergePatternsParametersConstraints() throws Exception {
+		try {
+			AclFormattingUtils.mergePatterns(null, "SOME STRING");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.mergePatterns("SOME STRING", null);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.mergePatterns("SOME STRING", null);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH");
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
-    }
+		try {
+			AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH");
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
+	}
 
-    public final void testMergePatterns() throws Exception {
-        String original = "...............................R";
-        String extraBits = "...........................A....";
-        Assert.assertEquals("...........................A...R", AclFormattingUtils
-                .mergePatterns(original, extraBits));
+	public final void testMergePatterns() throws Exception {
+		String original = "...............................R";
+		String extraBits = "...........................A....";
+		Assert.assertEquals("...........................A...R",
+				AclFormattingUtils.mergePatterns(original, extraBits));
 
-        Assert.assertEquals("ABCDEF", AclFormattingUtils.mergePatterns("ABCDEF", "......"));
-        Assert.assertEquals("GHIJKL", AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL"));
-    }
+		Assert.assertEquals("ABCDEF",
+				AclFormattingUtils.mergePatterns("ABCDEF", "......"));
+		Assert.assertEquals("GHIJKL",
+				AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL"));
+	}
 
-    public final void testBinaryPrints() throws Exception {
-        Assert.assertEquals("............................****", AclFormattingUtils.printBinary(15));
+	public final void testBinaryPrints() throws Exception {
+		Assert.assertEquals("............................****",
+				AclFormattingUtils.printBinary(15));
 
-        try {
-            AclFormattingUtils.printBinary(15, Permission.RESERVED_ON);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.printBinary(15, Permission.RESERVED_ON);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.assertTrue(true);
+		}
 
-        Assert.assertEquals("............................xxxx", AclFormattingUtils.printBinary(15, 'x'));
-    }
+		Assert.assertEquals("............................xxxx",
+				AclFormattingUtils.printBinary(15, 'x'));
+	}
 
-    public void testPrintBinaryNegative() {
-        Assert.assertEquals("*...............................", AclFormattingUtils.printBinary(0x80000000));
-    }
+	public void testPrintBinaryNegative() {
+		Assert.assertEquals("*...............................",
+				AclFormattingUtils.printBinary(0x80000000));
+	}
 
-    public void testPrintBinaryMinusOne() {
-        Assert.assertEquals("********************************", AclFormattingUtils.printBinary(0xffffffff));
-    }
+	public void testPrintBinaryMinusOne() {
+		Assert.assertEquals("********************************",
+				AclFormattingUtils.printBinary(0xffffffff));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java
index a9f987ab3d..aad5162a6f 100644
--- a/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java
@@ -17,40 +17,41 @@ import java.util.List;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
 public class AclPermissionCacheOptimizerTests {
 
-    @Test
-    public void eagerlyLoadsRequiredAcls() throws Exception {
-        AclService service = mock(AclService.class);
-        AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
-        ObjectIdentityRetrievalStrategy oidStrat = mock(ObjectIdentityRetrievalStrategy.class);
-        SidRetrievalStrategy sidStrat = mock(SidRetrievalStrategy.class);
-        pco.setObjectIdentityRetrievalStrategy(oidStrat);
-        pco.setSidRetrievalStrategy(sidStrat);
-        Object[] dos = {new Object(), null, new Object()};
-        ObjectIdentity[] oids = {new ObjectIdentityImpl("A", "1"), new ObjectIdentityImpl("A", "2")};
-        when(oidStrat.getObjectIdentity(dos[0])).thenReturn(oids[0]);
-        when(oidStrat.getObjectIdentity(dos[2])).thenReturn(oids[1]);
+	@Test
+	public void eagerlyLoadsRequiredAcls() throws Exception {
+		AclService service = mock(AclService.class);
+		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
+		ObjectIdentityRetrievalStrategy oidStrat = mock(ObjectIdentityRetrievalStrategy.class);
+		SidRetrievalStrategy sidStrat = mock(SidRetrievalStrategy.class);
+		pco.setObjectIdentityRetrievalStrategy(oidStrat);
+		pco.setSidRetrievalStrategy(sidStrat);
+		Object[] dos = { new Object(), null, new Object() };
+		ObjectIdentity[] oids = { new ObjectIdentityImpl("A", "1"),
+				new ObjectIdentityImpl("A", "2") };
+		when(oidStrat.getObjectIdentity(dos[0])).thenReturn(oids[0]);
+		when(oidStrat.getObjectIdentity(dos[2])).thenReturn(oids[1]);
 
-        pco.cachePermissionsFor(mock(Authentication.class), Arrays.asList(dos));
+		pco.cachePermissionsFor(mock(Authentication.class), Arrays.asList(dos));
 
-        // AclService should be invoked with the list of required Oids
-        verify(service).readAclsById(eq(Arrays.asList(oids)), any(List.class));
-    }
+		// AclService should be invoked with the list of required Oids
+		verify(service).readAclsById(eq(Arrays.asList(oids)), any(List.class));
+	}
 
-    @Test
-    public void ignoresEmptyCollection() {
-        AclService service = mock(AclService.class);
-        AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
-        ObjectIdentityRetrievalStrategy oids = mock(ObjectIdentityRetrievalStrategy.class);
-        SidRetrievalStrategy sids = mock(SidRetrievalStrategy.class);
-        pco.setObjectIdentityRetrievalStrategy(oids);
-        pco.setSidRetrievalStrategy(sids);
+	@Test
+	public void ignoresEmptyCollection() {
+		AclService service = mock(AclService.class);
+		AclPermissionCacheOptimizer pco = new AclPermissionCacheOptimizer(service);
+		ObjectIdentityRetrievalStrategy oids = mock(ObjectIdentityRetrievalStrategy.class);
+		SidRetrievalStrategy sids = mock(SidRetrievalStrategy.class);
+		pco.setObjectIdentityRetrievalStrategy(oids);
+		pco.setSidRetrievalStrategy(sids);
 
-        pco.cachePermissionsFor(mock(Authentication.class), Collections.emptyList());
+		pco.cachePermissionsFor(mock(Authentication.class), Collections.emptyList());
 
-        verifyZeroInteractions(service, sids, oids);
-    }
+		verifyZeroInteractions(service, sids, oids);
+	}
 
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java
index d07db14622..e6d0ffdfd5 100644
--- a/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java
@@ -19,21 +19,21 @@ import org.springframework.security.core.Authentication;
  */
 public class AclPermissionEvaluatorTests {
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
-        AclService service = mock(AclService.class);
-        AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
-        ObjectIdentity oid = mock(ObjectIdentity.class);
-        ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
-        when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
-        pe.setObjectIdentityRetrievalStrategy(oidStrategy);
-        pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
-        Acl acl = mock(Acl.class);
+	@Test
+	@SuppressWarnings("unchecked")
+	public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
+		AclService service = mock(AclService.class);
+		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
+		ObjectIdentity oid = mock(ObjectIdentity.class);
+		ObjectIdentityRetrievalStrategy oidStrategy = mock(ObjectIdentityRetrievalStrategy.class);
+		when(oidStrategy.getObjectIdentity(anyObject())).thenReturn(oid);
+		pe.setObjectIdentityRetrievalStrategy(oidStrategy);
+		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+		Acl acl = mock(Acl.class);
 
-        when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
-        when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
+		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
 
-        assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ"));
-    }
+		assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ"));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java
index 4a53134feb..7d1297f34e 100644
--- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java
@@ -23,42 +23,55 @@ import java.util.List;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
 public class AclEntryAfterInvocationCollectionFilteringProviderTests {
-    @Test
-    public void objectsAreRemovedIfPermissionDenied() throws Exception {
-        AclService service = mock(AclService.class);
-        Acl acl = mock(Acl.class);
-        when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(false);
-        when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(acl);
-        AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(service, Arrays.asList(mock(Permission.class)));
-        provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
-        provider.setProcessDomainObjectClass(Object.class);
-        provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+	@Test
+	public void objectsAreRemovedIfPermissionDenied() throws Exception {
+		AclService service = mock(AclService.class);
+		Acl acl = mock(Acl.class);
+		when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(
+				false);
+		when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(
+				acl);
+		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
+				service, Arrays.asList(mock(Permission.class)));
+		provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
+		provider.setProcessDomainObjectClass(Object.class);
+		provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 
-        Object returned = provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), new ArrayList(Arrays.asList(new Object(), new Object())));
-        assertTrue(returned instanceof List);
-        assertTrue(((List)returned).isEmpty());
-        returned = provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("UNSUPPORTED", "AFTER_ACL_COLLECTION_READ"), new Object[] {new Object(), new Object()});
-        assertTrue(returned instanceof Object[]);
-        assertTrue(((Object[])returned).length == 0);
-    }
+		Object returned = provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), new ArrayList(
+						Arrays.asList(new Object(), new Object())));
+		assertTrue(returned instanceof List);
+		assertTrue(((List) returned).isEmpty());
+		returned = provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("UNSUPPORTED", "AFTER_ACL_COLLECTION_READ"),
+				new Object[] { new Object(), new Object() });
+		assertTrue(returned instanceof Object[]);
+		assertTrue(((Object[]) returned).length == 0);
+	}
 
-    @Test
-    public void accessIsGrantedIfNoAttributesDefined() throws Exception {
-        AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(mock(AclService.class), Arrays.asList(mock(Permission.class)));
-        Object returned = new Object();
+	@Test
+	public void accessIsGrantedIfNoAttributesDefined() throws Exception {
+		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
+				mock(AclService.class), Arrays.asList(mock(Permission.class)));
+		Object returned = new Object();
 
-        assertSame(returned, provider.decide(mock(Authentication.class), new Object(), Collections.<ConfigAttribute>emptyList(), returned));
-    }
+		assertSame(
+				returned,
+				provider.decide(mock(Authentication.class), new Object(),
+						Collections.<ConfigAttribute> emptyList(), returned));
+	}
 
-    @Test
-    public void nullReturnObjectIsIgnored() throws Exception {
-        AclService service = mock(AclService.class);
-        AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(service, Arrays.asList(mock(Permission.class)));
+	@Test
+	public void nullReturnObjectIsIgnored() throws Exception {
+		AclService service = mock(AclService.class);
+		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
+				service, Arrays.asList(mock(Permission.class)));
 
-        assertNull(provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
-        verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
-    }
+		assertNull(provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
+		verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
+	}
 
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java
index 53a99f395f..6cb6f438a6 100644
--- a/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java
@@ -19,83 +19,108 @@ import java.util.List;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
 public class AclEntryAfterInvocationProviderTests {
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsMissingPermissions() throws Exception {
-        try {
-            new AclEntryAfterInvocationProvider(mock(AclService.class), null);
-            fail("Exception expected");
-        } catch (IllegalArgumentException expected) {
-        }
-        new AclEntryAfterInvocationProvider(mock(AclService.class), Collections.<Permission>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsMissingPermissions() throws Exception {
+		try {
+			new AclEntryAfterInvocationProvider(mock(AclService.class), null);
+			fail("Exception expected");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		new AclEntryAfterInvocationProvider(mock(AclService.class),
+				Collections.<Permission> emptyList());
+	}
 
-    @Test
-    public void accessIsAllowedIfPermissionIsGranted() {
-        AclService service = mock(AclService.class);
-        Acl acl = mock(Acl.class);
-        when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(true);
-        when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(acl);
-        AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(service, Arrays.asList(mock(Permission.class)));
-        provider.setMessageSource(new SpringSecurityMessageSource());
-        provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
-        provider.setProcessDomainObjectClass(Object.class);
-        provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
-        Object returned = new Object();
+	@Test
+	public void accessIsAllowedIfPermissionIsGranted() {
+		AclService service = mock(AclService.class);
+		Acl acl = mock(Acl.class);
+		when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(
+				true);
+		when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(
+				acl);
+		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
+				service, Arrays.asList(mock(Permission.class)));
+		provider.setMessageSource(new SpringSecurityMessageSource());
+		provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
+		provider.setProcessDomainObjectClass(Object.class);
+		provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+		Object returned = new Object();
 
-        assertSame(returned, provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_READ"), returned));
-    }
+		assertSame(
+				returned,
+				provider.decide(mock(Authentication.class), new Object(),
+						SecurityConfig.createList("AFTER_ACL_READ"), returned));
+	}
 
-    @Test
-    public void accessIsGrantedIfNoAttributesDefined() throws Exception {
-        AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(mock(AclService.class), Arrays.asList(mock(Permission.class)));
-        Object returned = new Object();
+	@Test
+	public void accessIsGrantedIfNoAttributesDefined() throws Exception {
+		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
+				mock(AclService.class), Arrays.asList(mock(Permission.class)));
+		Object returned = new Object();
 
-        assertSame(returned, provider.decide(mock(Authentication.class), new Object(), Collections.<ConfigAttribute>emptyList(), returned));
-    }
+		assertSame(
+				returned,
+				provider.decide(mock(Authentication.class), new Object(),
+						Collections.<ConfigAttribute> emptyList(), returned));
+	}
 
-    @Test
-    public void accessIsGrantedIfObjectTypeNotSupported() throws Exception {
-        AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(mock(AclService.class), Arrays.asList(mock(Permission.class)));
-        provider.setProcessDomainObjectClass(String.class);
-        // Not a String
-        Object returned = new Object();
+	@Test
+	public void accessIsGrantedIfObjectTypeNotSupported() throws Exception {
+		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
+				mock(AclService.class), Arrays.asList(mock(Permission.class)));
+		provider.setProcessDomainObjectClass(String.class);
+		// Not a String
+		Object returned = new Object();
 
-        assertSame(returned, provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_READ"), returned));
-    }
+		assertSame(
+				returned,
+				provider.decide(mock(Authentication.class), new Object(),
+						SecurityConfig.createList("AFTER_ACL_READ"), returned));
+	}
 
+	@Test(expected = AccessDeniedException.class)
+	public void accessIsDeniedIfPermissionIsNotGranted() {
+		AclService service = mock(AclService.class);
+		Acl acl = mock(Acl.class);
+		when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(
+				false);
+		// Try a second time with no permissions found
+		when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenThrow(
+				new NotFoundException(""));
+		when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(
+				acl);
+		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
+				service, Arrays.asList(mock(Permission.class)));
+		provider.setProcessConfigAttribute("MY_ATTRIBUTE");
+		provider.setMessageSource(new SpringSecurityMessageSource());
+		provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
+		provider.setProcessDomainObjectClass(Object.class);
+		provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
+		try {
+			provider.decide(mock(Authentication.class), new Object(),
+					SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"),
+					new Object());
+			fail();
+		}
+		catch (AccessDeniedException expected) {
+		}
+		// Second scenario with no acls found
+		provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"), new Object());
+	}
 
-    @Test(expected= AccessDeniedException.class)
-    public void accessIsDeniedIfPermissionIsNotGranted() {
-        AclService service = mock(AclService.class);
-        Acl acl = mock(Acl.class);
-        when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenReturn(false);
-        // Try a second time with no permissions found
-        when(acl.isGranted(any(List.class), any(List.class), anyBoolean())).thenThrow(new NotFoundException(""));
-        when(service.readAclById(any(ObjectIdentity.class), any(List.class))).thenReturn(acl);
-        AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(service, Arrays.asList(mock(Permission.class)));
-        provider.setProcessConfigAttribute("MY_ATTRIBUTE");
-        provider.setMessageSource(new SpringSecurityMessageSource());
-        provider.setObjectIdentityRetrievalStrategy(mock(ObjectIdentityRetrievalStrategy.class));
-        provider.setProcessDomainObjectClass(Object.class);
-        provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
-        try {
-            provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"), new Object());
-            fail();
-        } catch (AccessDeniedException expected) {
-        }
-        // Second scenario with no acls found
-        provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"), new Object());
-    }
+	@Test
+	public void nullReturnObjectIsIgnored() throws Exception {
+		AclService service = mock(AclService.class);
+		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
+				service, Arrays.asList(mock(Permission.class)));
 
-    @Test
-    public void nullReturnObjectIsIgnored() throws Exception {
-        AclService service = mock(AclService.class);
-        AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(service, Arrays.asList(mock(Permission.class)));
-
-        assertNull(provider.decide(mock(Authentication.class), new Object(), SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
-        verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
-    }
+		assertNull(provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
+		verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java
index 830e090d00..9fdc262450 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java
@@ -17,84 +17,86 @@ import org.springframework.security.acls.model.Sid;
  */
 public class AccessControlImplEntryTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testConstructorRequiredFields() {
-        // Check Acl field is present
-        try {
-            new AccessControlEntryImpl(null, null, new PrincipalSid("johndoe"),
-                    BasePermission.ADMINISTRATION, true, true, true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
+	@Test
+	public void testConstructorRequiredFields() {
+		// Check Acl field is present
+		try {
+			new AccessControlEntryImpl(null, null, new PrincipalSid("johndoe"),
+					BasePermission.ADMINISTRATION, true, true, true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // Check Sid field is present
-        try {
-            new AccessControlEntryImpl(null, mock(Acl.class), null,
-                    BasePermission.ADMINISTRATION, true, true, true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
+		// Check Sid field is present
+		try {
+			new AccessControlEntryImpl(null, mock(Acl.class), null,
+					BasePermission.ADMINISTRATION, true, true, true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // Check Permission field is present
-        try {
-            new AccessControlEntryImpl(null, mock(Acl.class), new PrincipalSid("johndoe"), null,
-                    true, true, true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
+		// Check Permission field is present
+		try {
+			new AccessControlEntryImpl(null, mock(Acl.class),
+					new PrincipalSid("johndoe"), null, true, true, true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void testAccessControlEntryImplGetters() {
-        Acl mockAcl = mock(Acl.class);
-        Sid sid = new PrincipalSid("johndoe");
+	@Test
+	public void testAccessControlEntryImplGetters() {
+		Acl mockAcl = mock(Acl.class);
+		Sid sid = new PrincipalSid("johndoe");
 
-        // Create a sample entry
-        AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, BasePermission.ADMINISTRATION,
-                true, true, true);
+		// Create a sample entry
+		AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
+				sid, BasePermission.ADMINISTRATION, true, true, true);
 
-        // and check every get() method
-        assertEquals(new Long(1), ace.getId());
-        assertEquals(mockAcl, ace.getAcl());
-        assertEquals(sid, ace.getSid());
-        assertTrue(ace.isGranting());
-        assertEquals(BasePermission.ADMINISTRATION, ace.getPermission());
-        assertTrue(((AuditableAccessControlEntry) ace).isAuditFailure());
-        assertTrue(((AuditableAccessControlEntry) ace).isAuditSuccess());
-    }
+		// and check every get() method
+		assertEquals(new Long(1), ace.getId());
+		assertEquals(mockAcl, ace.getAcl());
+		assertEquals(sid, ace.getSid());
+		assertTrue(ace.isGranting());
+		assertEquals(BasePermission.ADMINISTRATION, ace.getPermission());
+		assertTrue(((AuditableAccessControlEntry) ace).isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) ace).isAuditSuccess());
+	}
 
-    @Test
-    public void testEquals() {
-        final Acl mockAcl = mock(Acl.class);
-        final ObjectIdentity oid = mock(ObjectIdentity.class);
+	@Test
+	public void testEquals() {
+		final Acl mockAcl = mock(Acl.class);
+		final ObjectIdentity oid = mock(ObjectIdentity.class);
 
-        when(mockAcl.getObjectIdentity()).thenReturn(oid);
-        Sid sid = new PrincipalSid("johndoe");
+		when(mockAcl.getObjectIdentity()).thenReturn(oid);
+		Sid sid = new PrincipalSid("johndoe");
 
-        AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, BasePermission.ADMINISTRATION,
-                true, true, true);
+		AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
+				sid, BasePermission.ADMINISTRATION, true, true, true);
 
-        assertFalse(ace.equals(null));
-        assertFalse(ace.equals(Long.valueOf(100)));
-        assertTrue(ace.equals(ace));
-        assertTrue(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-                BasePermission.ADMINISTRATION, true, true, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid,
-                BasePermission.ADMINISTRATION, true, true, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, new PrincipalSid("scott"),
-                BasePermission.ADMINISTRATION, true, true, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid, BasePermission.WRITE, true,
-                true, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-                BasePermission.ADMINISTRATION, false, true, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-                BasePermission.ADMINISTRATION, true, false, true)));
-        assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-                BasePermission.ADMINISTRATION, true, true, false)));
-    }
+		assertFalse(ace.equals(null));
+		assertFalse(ace.equals(Long.valueOf(100)));
+		assertTrue(ace.equals(ace));
+		assertTrue(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
+				new PrincipalSid("scott"), BasePermission.ADMINISTRATION, true, true,
+				true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.WRITE, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, false, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, false, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, false)));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java
index a3fa1f0976..0d3f8a3f7e 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java
@@ -14,519 +14,603 @@ import org.springframework.security.util.FieldUtils;
 import java.lang.reflect.Field;
 import java.util.*;
 
-
 /**
  * Tests for {@link AclImpl}.
  *
  * @author Andrei Stefan
  */
 public class AclImplTests {
-    private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
-    private static final List<Permission> READ = Arrays.asList(BasePermission.READ );
-    private static final List<Permission> WRITE = Arrays.asList(BasePermission.WRITE);
-    private static final List<Permission> CREATE = Arrays.asList(BasePermission.CREATE );
-    private static final List<Permission> DELETE = Arrays.asList(BasePermission.DELETE );
-    private static final List<Sid> SCOTT = Arrays.asList((Sid)new PrincipalSid("scott"));
-    private static final List<Sid> BEN = Arrays.asList((Sid)new PrincipalSid("ben"));
-
-    Authentication auth = new TestingAuthenticationToken("joe", "ignored", "ROLE_ADMINISTRATOR");
-    AclAuthorizationStrategy authzStrategy;
-    PermissionGrantingStrategy pgs;
-    AuditLogger mockAuditLogger;
-    ObjectIdentity objectIdentity = new ObjectIdentityImpl(TARGET_CLASS, 100);
-
-    // ~ Methods ========================================================================================================
-
-    @Before
-    public void setUp() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        authzStrategy = mock(AclAuthorizationStrategy.class);
-        mockAuditLogger = mock(AuditLogger.class);
-        pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger);
-        auth.setAuthenticated(true);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorsRejectNullObjectIdentity() throws Exception {
-        try {
-            new AclImpl(null, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-            fail("Should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-        new AclImpl(null, 1, authzStrategy, mockAuditLogger);
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorsRejectNullId() throws Exception {
-        try {
-            new AclImpl(objectIdentity, null, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-            fail("Should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-        new AclImpl(objectIdentity, null, authzStrategy, mockAuditLogger);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorsRejectNullAclAuthzStrategy() throws Exception {
-        try {
-            new AclImpl(objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(mockAuditLogger), null, null, true, new PrincipalSid("joe"));
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-        new AclImpl(objectIdentity, 1, null, mockAuditLogger);
-    }
-
-    @Test
-    public void insertAceRejectsNullParameters() throws Exception {
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid(
-                "joe"));
-        try {
-            acl.insertAce(0, null, new GrantedAuthoritySid("ROLE_IGNORED"), true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-        try {
-            acl.insertAce(0, BasePermission.READ, null, true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    public void insertAceAddsElementAtCorrectIndex() throws Exception {
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        MockAclService service = new MockAclService();
-
-        // Insert one permission
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
-        service.updateAcl(acl);
-        // Check it was successfully added
-        assertEquals(1, acl.getEntries().size());
-        assertEquals(acl.getEntries().get(0).getAcl(), acl);
-        assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
-        assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid("ROLE_TEST1"));
-
-        // Add a second permission
-        acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
-        service.updateAcl(acl);
-        // Check it was added on the last position
-        assertEquals(2, acl.getEntries().size());
-        assertEquals(acl.getEntries().get(1).getAcl(), acl);
-        assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.READ);
-        assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid("ROLE_TEST2"));
-
-        // Add a third permission, after the first one
-        acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_TEST3"), false);
-        service.updateAcl(acl);
-        assertEquals(3, acl.getEntries().size());
-        // Check the third entry was added between the two existent ones
-        assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
-        assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid("ROLE_TEST1"));
-        assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
-        assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid("ROLE_TEST3"));
-        assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
-        assertEquals(acl.getEntries().get(2).getSid(), new GrantedAuthoritySid("ROLE_TEST2"));
-    }
-
-    @Test(expected=NotFoundException.class)
-    public void insertAceFailsForNonExistentElement() throws Exception {
-        MutableAcl acl = new AclImpl(objectIdentity,1, authzStrategy, pgs, null, null, true, new PrincipalSid(
-                "joe"));
-        MockAclService service = new MockAclService();
-
-        // Insert one permission
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
-        service.updateAcl(acl);
-
-        acl.insertAce(55, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
-    }
-
-    @Test
-    public void deleteAceKeepsInitialOrdering() throws Exception {
-        MutableAcl acl = new AclImpl(objectIdentity,1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        MockAclService service = new MockAclService();
-
-        // Add several permissions
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
-        acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
-        acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST3"), true);
-        service.updateAcl(acl);
-
-        // Delete first permission and check the order of the remaining permissions is kept
-        acl.deleteAce(0);
-        assertEquals(2, acl.getEntries().size());
-        assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid("ROLE_TEST2"));
-        assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid("ROLE_TEST3"));
-
-        // Add one more permission and remove the permission in the middle
-        acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST4"), true);
-        service.updateAcl(acl);
-        acl.deleteAce(1);
-        assertEquals(2, acl.getEntries().size());
-        assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid("ROLE_TEST2"));
-        assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid("ROLE_TEST4"));
-
-        // Remove remaining permissions
-        acl.deleteAce(1);
-        acl.deleteAce(0);
-        assertEquals(0, acl.getEntries().size());
-    }
-
-    @Test
-    public void deleteAceFailsForNonExistentElement() throws Exception {
-        AclAuthorizationStrategyImpl strategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
-        MutableAcl acl = new AclImpl(objectIdentity, (1), strategy, pgs, null, null, true, new PrincipalSid(
-                "joe"));
-        try {
-            acl.deleteAce(99);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-    }
-
-    @Test
-    public void isGrantingRejectsEmptyParameters() throws Exception {
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        Sid ben = new PrincipalSid("ben");
-        try {
-            acl.isGranted(new ArrayList<Permission>(0), Arrays.asList(ben) , false);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-        try {
-            acl.isGranted(READ, new ArrayList<Sid>(0), false);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    public void isGrantingGrantsAccessForAclWithNoParent() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_GENERAL","ROLE_GUEST");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentity rootOid = new ObjectIdentityImpl(TARGET_CLASS, 100);
-
-        // Create an ACL which owner is not the authenticated principal
-        MutableAcl rootAcl = new AclImpl(rootOid, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe"));
-
-        // Grant some permissions
-        rootAcl.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), false);
-        rootAcl.insertAce(1, BasePermission.WRITE, new PrincipalSid("scott"), true);
-        rootAcl.insertAce(2, BasePermission.WRITE, new PrincipalSid("rod"), false);
-        rootAcl.insertAce(3, BasePermission.WRITE, new GrantedAuthoritySid("WRITE_ACCESS_ROLE"), true);
-
-        // Check permissions granting
-        List<Permission> permissions = Arrays.asList(BasePermission.READ, BasePermission.CREATE);
-        List<Sid> sids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid("ROLE_GUEST"));
-        assertFalse(rootAcl.isGranted(permissions, sids, false));
-        try {
-            rootAcl.isGranted(permissions, SCOTT, false);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-        assertTrue(rootAcl.isGranted(WRITE, SCOTT, false));
-        assertFalse(rootAcl.isGranted(WRITE,
-                Arrays.asList(new PrincipalSid("rod"), new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false));
-        assertTrue(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid("WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false));
-        try {
-            // Change the type of the Sid and check the granting process
-            rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid("rod"), new PrincipalSid("WRITE_ACCESS_ROLE")), false);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-    }
-
-    @Test
-    public void isGrantingGrantsAccessForInheritableAcls() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored","ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100);
-        ObjectIdentity parentOid1 = new ObjectIdentityImpl(TARGET_CLASS, 101);
-        ObjectIdentity parentOid2 = new ObjectIdentityImpl(TARGET_CLASS, 102);
-        ObjectIdentity childOid1 = new ObjectIdentityImpl(TARGET_CLASS, 103);
-        ObjectIdentity childOid2 = new ObjectIdentityImpl(TARGET_CLASS, 104);
-
-        // Create ACLs
-        PrincipalSid joe = new PrincipalSid("joe");
-        MutableAcl grandParentAcl = new AclImpl(grandParentOid, 1, authzStrategy, pgs, null, null, false, joe);
-        MutableAcl parentAcl1 = new AclImpl(parentOid1, 2, authzStrategy, pgs, null, null, true, joe);
-        MutableAcl parentAcl2 = new AclImpl(parentOid2, 3, authzStrategy, pgs, null, null, true, joe);
-        MutableAcl childAcl1 = new AclImpl(childOid1, 4, authzStrategy, pgs, null, null, true, joe);
-        MutableAcl childAcl2 = new AclImpl(childOid2, 4, authzStrategy, pgs, null, null, false, joe);
-
-        // Create hierarchies
-        childAcl2.setParent(childAcl1);
-        childAcl1.setParent(parentAcl1);
-        parentAcl2.setParent(grandParentAcl);
-        parentAcl1.setParent(grandParentAcl);
-
-        // Add some permissions
-        grandParentAcl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        grandParentAcl.insertAce(1, BasePermission.WRITE, new PrincipalSid("ben"), true);
-        grandParentAcl.insertAce(2, BasePermission.DELETE, new PrincipalSid("ben"), false);
-        grandParentAcl.insertAce(3, BasePermission.DELETE, new PrincipalSid("scott"), true);
-        parentAcl1.insertAce(0, BasePermission.READ, new PrincipalSid("scott"), true);
-        parentAcl1.insertAce(1, BasePermission.DELETE, new PrincipalSid("scott"), false);
-        parentAcl2.insertAce(0, BasePermission.CREATE, new PrincipalSid("ben"), true);
-        childAcl1.insertAce(0, BasePermission.CREATE, new PrincipalSid("scott"), true);
-
-        // Check granting process for parent1
-        assertTrue(parentAcl1.isGranted(READ, SCOTT, false));
-        assertTrue(parentAcl1.isGranted(READ, Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_USER_READ")), false));
-        assertTrue(parentAcl1.isGranted(WRITE, BEN, false));
-        assertFalse(parentAcl1.isGranted(DELETE, BEN, false));
-        assertFalse(parentAcl1.isGranted(DELETE, SCOTT, false));
-
-        // Check granting process for parent2
-        assertTrue(parentAcl2.isGranted(CREATE, BEN, false));
-        assertTrue(parentAcl2.isGranted(WRITE, BEN, false));
-        assertFalse(parentAcl2.isGranted(DELETE, BEN, false));
-
-        // Check granting process for child1
-        assertTrue(childAcl1.isGranted(CREATE, SCOTT,
-                false));
-        assertTrue(childAcl1.isGranted(READ, Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_USER_READ")), false));
-        assertFalse(childAcl1.isGranted(DELETE, BEN, false));
-
-        // Check granting process for child2 (doesn't inherit the permissions from its parent)
-        try {
-            assertTrue(childAcl2.isGranted(CREATE, SCOTT, false));
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-        try {
-            assertTrue(childAcl2.isGranted(CREATE, Arrays.asList((Sid)new PrincipalSid("joe")), false));
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-    }
-
-    @Test
-    public void updatedAceValuesAreCorrectlyReflectedInAcl() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored","ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe"));
-        MockAclService service = new MockAclService();
-
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        acl.insertAce(2, BasePermission.CREATE, new PrincipalSid("ben"), true);
-        service.updateAcl(acl);
-
-        assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
-        assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
-        assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.CREATE);
-
-        // Change each permission
-        acl.updateAce(0, BasePermission.CREATE);
-        acl.updateAce(1, BasePermission.DELETE);
-        acl.updateAce(2, BasePermission.READ);
-
-        // Check the change was successfully made
-        assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.CREATE);
-        assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.DELETE);
-        assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
-    }
-
-    @Test
-    public void auditableEntryFlagsAreUpdatedCorrectly() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_AUDITING", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, false, new PrincipalSid("joe"));
-        MockAclService service = new MockAclService();
-
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        service.updateAcl(acl);
-
-        assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0)).isAuditFailure());
-        assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1)).isAuditFailure());
-        assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0)).isAuditSuccess());
-        assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1)).isAuditSuccess());
-
-        // Change each permission
-        ((AuditableAcl) acl).updateAuditing(0, true, true);
-        ((AuditableAcl) acl).updateAuditing(1, true, true);
-
-        // Check the change was successfuly made
-        assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0)).isAuditFailure());
-        assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1)).isAuditFailure());
-        assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0)).isAuditSuccess());
-        assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1)).isAuditSuccess());
-    }
-
-    @Test
-    public void gettersAndSettersAreConsistent() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, (100));
-        ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, (101));
-        MutableAcl acl = new AclImpl(identity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        MutableAcl parentAcl = new AclImpl(identity2, 2, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        MockAclService service = new MockAclService();
-        acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"), true);
-        service.updateAcl(acl);
-
-        assertEquals(acl.getId(), 1);
-        assertEquals(acl.getObjectIdentity(), identity);
-        assertEquals(acl.getOwner(), new PrincipalSid("joe"));
-        assertNull(acl.getParentAcl());
-        assertTrue(acl.isEntriesInheriting());
-        assertEquals(2, acl.getEntries().size());
-
-        acl.setParent(parentAcl);
-        assertEquals(acl.getParentAcl(), parentAcl);
-
-        acl.setEntriesInheriting(false);
-        assertFalse(acl.isEntriesInheriting());
-
-        acl.setOwner(new PrincipalSid("ben"));
-        assertEquals(acl.getOwner(), new PrincipalSid("ben"));
-    }
-
-    @Test
-    public void isSidLoadedBehavesAsExpected() throws Exception {
-        List<Sid> loadedSids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid("ROLE_IGNORED"));
-        MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, loadedSids, true,
-                new PrincipalSid("joe"));
-
-        assertTrue(acl.isSidLoaded(loadedSids));
-        assertTrue(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"), new PrincipalSid("ben"))));
-        assertTrue(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_IGNORED"))));
-        assertTrue(acl.isSidLoaded(BEN));
-        assertTrue(acl.isSidLoaded(null));
-        assertTrue(acl.isSidLoaded(new ArrayList<Sid>(0)));
-        assertTrue(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))));
-        assertFalse(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))));
-        assertFalse(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid("ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))));
-    }
-
-    @Test(expected=NotFoundException.class)
-    public void insertAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
-        AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        acl.insertAce(-1, mock(Permission.class), mock(Sid.class), true);
-    }
-
-    @Test(expected=NotFoundException.class)
-    public void deleteAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
-        AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        acl.deleteAce(-1);
-    }
-
-    @Test(expected=NotFoundException.class)
-    public void insertAceRaisesNotFoundExceptionForIndexGreaterThanSize() throws Exception {
-        AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        // Insert at zero, OK.
-        acl.insertAce(0, mock(Permission.class), mock(Sid.class), true);
-        // Size is now 1
-        acl.insertAce(2, mock(Permission.class), mock(Sid.class), true);
-    }
-
-    // SEC-1151
-    @Test(expected=NotFoundException.class)
-    public void deleteAceRaisesNotFoundExceptionForIndexEqualToSize() throws Exception {
-        AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null, true, new PrincipalSid("joe"));
-        acl.insertAce(0, mock(Permission.class), mock(Sid.class), true);
-        // Size is now 1
-        acl.deleteAce(1);
-    }
-
-    // SEC-1795
-    @Test
-    public void changingParentIsSuccessful() throws Exception {
-        AclImpl parentAcl = new AclImpl(objectIdentity, 1L, authzStrategy, mockAuditLogger);
-        AclImpl childAcl = new AclImpl(objectIdentity, 2L, authzStrategy, mockAuditLogger);
-        AclImpl changeParentAcl = new AclImpl(objectIdentity, 3L, authzStrategy, mockAuditLogger);
-
-        childAcl.setParent(parentAcl);
-        childAcl.setParent(changeParentAcl);
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockAclService implements MutableAclService {
-        public MutableAcl createAcl(ObjectIdentity objectIdentity) throws AlreadyExistsException {
-            return null;
-        }
-
-        public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren) throws ChildrenExistException {
-        }
-
-        /*
-         * Mock implementation that populates the aces list with fully initialized AccessControlEntries
-         * @see org.springframework.security.acls.MutableAclService#updateAcl(org.springframework.security.acls.MutableAcl)
-         */
-        @SuppressWarnings("unchecked")
-        public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
-            List<AccessControlEntry> oldAces = acl.getEntries();
-            Field acesField = FieldUtils.getField(AclImpl.class, "aces");
-            acesField.setAccessible(true);
-            List newAces;
-            try {
-                newAces = (List) acesField.get(acl);
-                newAces.clear();
-
-                for (int i = 0; i < oldAces.size(); i++) {
-                    AccessControlEntry ac = oldAces.get(i);
-                    // Just give an ID to all this acl's aces, rest of the fields are just copied
-                    newAces.add(new AccessControlEntryImpl((i + 1), ac.getAcl(), ac.getSid(), ac.getPermission(), ac
-                            .isGranting(), ((AuditableAccessControlEntry) ac).isAuditSuccess(),
-                            ((AuditableAccessControlEntry) ac).isAuditFailure()));
-                }
-            }
-            catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-
-            return acl;
-        }
-
-        public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
-            return null;
-        }
-
-        public Acl readAclById(ObjectIdentity object) throws NotFoundException {
-            return null;
-        }
-
-        public Acl readAclById(ObjectIdentity object, List<Sid> sids) throws NotFoundException {
-            return null;
-        }
-
-        public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects) throws NotFoundException {
-            return null;
-        }
-
-        public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects, List<Sid> sids) throws NotFoundException {
-            return null;
-        }
-    }
+	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
+	private static final List<Permission> READ = Arrays.asList(BasePermission.READ);
+	private static final List<Permission> WRITE = Arrays.asList(BasePermission.WRITE);
+	private static final List<Permission> CREATE = Arrays.asList(BasePermission.CREATE);
+	private static final List<Permission> DELETE = Arrays.asList(BasePermission.DELETE);
+	private static final List<Sid> SCOTT = Arrays.asList((Sid) new PrincipalSid("scott"));
+	private static final List<Sid> BEN = Arrays.asList((Sid) new PrincipalSid("ben"));
+
+	Authentication auth = new TestingAuthenticationToken("joe", "ignored",
+			"ROLE_ADMINISTRATOR");
+	AclAuthorizationStrategy authzStrategy;
+	PermissionGrantingStrategy pgs;
+	AuditLogger mockAuditLogger;
+	ObjectIdentity objectIdentity = new ObjectIdentityImpl(TARGET_CLASS, 100);
+
+	// ~ Methods
+	// ========================================================================================================
+
+	@Before
+	public void setUp() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		authzStrategy = mock(AclAuthorizationStrategy.class);
+		mockAuditLogger = mock(AuditLogger.class);
+		pgs = new DefaultPermissionGrantingStrategy(mockAuditLogger);
+		auth.setAuthenticated(true);
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorsRejectNullObjectIdentity() throws Exception {
+		try {
+			new AclImpl(null, 1, authzStrategy, pgs, null, null, true, new PrincipalSid(
+					"joe"));
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		new AclImpl(null, 1, authzStrategy, mockAuditLogger);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorsRejectNullId() throws Exception {
+		try {
+			new AclImpl(objectIdentity, null, authzStrategy, pgs, null, null, true,
+					new PrincipalSid("joe"));
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		new AclImpl(objectIdentity, null, authzStrategy, mockAuditLogger);
+	}
+
+	@SuppressWarnings("deprecation")
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorsRejectNullAclAuthzStrategy() throws Exception {
+		try {
+			new AclImpl(objectIdentity, 1, null, new DefaultPermissionGrantingStrategy(
+					mockAuditLogger), null, null, true, new PrincipalSid("joe"));
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		new AclImpl(objectIdentity, 1, null, mockAuditLogger);
+	}
+
+	@Test
+	public void insertAceRejectsNullParameters() throws Exception {
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		try {
+			acl.insertAce(0, null, new GrantedAuthoritySid("ROLE_IGNORED"), true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		try {
+			acl.insertAce(0, BasePermission.READ, null, true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	public void insertAceAddsElementAtCorrectIndex() throws Exception {
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+
+		// Insert one permission
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
+		service.updateAcl(acl);
+		// Check it was successfully added
+		assertEquals(1, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getAcl(), acl);
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST1"));
+
+		// Add a second permission
+		acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
+		service.updateAcl(acl);
+		// Check it was added on the last position
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(1).getAcl(), acl);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST2"));
+
+		// Add a third permission, after the first one
+		acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_TEST3"),
+				false);
+		service.updateAcl(acl);
+		assertEquals(3, acl.getEntries().size());
+		// Check the third entry was added between the two existent ones
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST1"));
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST3"));
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(2).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST2"));
+	}
+
+	@Test(expected = NotFoundException.class)
+	public void insertAceFailsForNonExistentElement() throws Exception {
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+
+		// Insert one permission
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
+		service.updateAcl(acl);
+
+		acl.insertAce(55, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"),
+				true);
+	}
+
+	@Test
+	public void deleteAceKeepsInitialOrdering() throws Exception {
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+
+		// Add several permissions
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
+		acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
+		acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST3"), true);
+		service.updateAcl(acl);
+
+		// Delete first permission and check the order of the remaining permissions is
+		// kept
+		acl.deleteAce(0);
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST2"));
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST3"));
+
+		// Add one more permission and remove the permission in the middle
+		acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST4"), true);
+		service.updateAcl(acl);
+		acl.deleteAce(1);
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST2"));
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
+				"ROLE_TEST4"));
+
+		// Remove remaining permissions
+		acl.deleteAce(1);
+		acl.deleteAce(0);
+		assertEquals(0, acl.getEntries().size());
+	}
+
+	@Test
+	public void deleteAceFailsForNonExistentElement() throws Exception {
+		AclAuthorizationStrategyImpl strategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
+		MutableAcl acl = new AclImpl(objectIdentity, (1), strategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		try {
+			acl.deleteAce(99);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+	}
+
+	@Test
+	public void isGrantingRejectsEmptyParameters() throws Exception {
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		Sid ben = new PrincipalSid("ben");
+		try {
+			acl.isGranted(new ArrayList<Permission>(0), Arrays.asList(ben), false);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		try {
+			acl.isGranted(READ, new ArrayList<Sid>(0), false);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	public void isGrantingGrantsAccessForAclWithNoParent() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_GENERAL", "ROLE_GUEST");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentity rootOid = new ObjectIdentityImpl(TARGET_CLASS, 100);
+
+		// Create an ACL which owner is not the authenticated principal
+		MutableAcl rootAcl = new AclImpl(rootOid, 1, authzStrategy, pgs, null, null,
+				false, new PrincipalSid("joe"));
+
+		// Grant some permissions
+		rootAcl.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), false);
+		rootAcl.insertAce(1, BasePermission.WRITE, new PrincipalSid("scott"), true);
+		rootAcl.insertAce(2, BasePermission.WRITE, new PrincipalSid("rod"), false);
+		rootAcl.insertAce(3, BasePermission.WRITE, new GrantedAuthoritySid(
+				"WRITE_ACCESS_ROLE"), true);
+
+		// Check permissions granting
+		List<Permission> permissions = Arrays.asList(BasePermission.READ,
+				BasePermission.CREATE);
+		List<Sid> sids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid(
+				"ROLE_GUEST"));
+		assertFalse(rootAcl.isGranted(permissions, sids, false));
+		try {
+			rootAcl.isGranted(permissions, SCOTT, false);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+		assertTrue(rootAcl.isGranted(WRITE, SCOTT, false));
+		assertFalse(rootAcl.isGranted(WRITE, Arrays.asList(new PrincipalSid("rod"),
+				new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false));
+		assertTrue(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid(
+				"WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false));
+		try {
+			// Change the type of the Sid and check the granting process
+			rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid("rod"),
+					new PrincipalSid("WRITE_ACCESS_ROLE")), false);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+	}
+
+	@Test
+	public void isGrantingGrantsAccessForInheritableAcls() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, 100);
+		ObjectIdentity parentOid1 = new ObjectIdentityImpl(TARGET_CLASS, 101);
+		ObjectIdentity parentOid2 = new ObjectIdentityImpl(TARGET_CLASS, 102);
+		ObjectIdentity childOid1 = new ObjectIdentityImpl(TARGET_CLASS, 103);
+		ObjectIdentity childOid2 = new ObjectIdentityImpl(TARGET_CLASS, 104);
+
+		// Create ACLs
+		PrincipalSid joe = new PrincipalSid("joe");
+		MutableAcl grandParentAcl = new AclImpl(grandParentOid, 1, authzStrategy, pgs,
+				null, null, false, joe);
+		MutableAcl parentAcl1 = new AclImpl(parentOid1, 2, authzStrategy, pgs, null,
+				null, true, joe);
+		MutableAcl parentAcl2 = new AclImpl(parentOid2, 3, authzStrategy, pgs, null,
+				null, true, joe);
+		MutableAcl childAcl1 = new AclImpl(childOid1, 4, authzStrategy, pgs, null, null,
+				true, joe);
+		MutableAcl childAcl2 = new AclImpl(childOid2, 4, authzStrategy, pgs, null, null,
+				false, joe);
+
+		// Create hierarchies
+		childAcl2.setParent(childAcl1);
+		childAcl1.setParent(parentAcl1);
+		parentAcl2.setParent(grandParentAcl);
+		parentAcl1.setParent(grandParentAcl);
+
+		// Add some permissions
+		grandParentAcl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid(
+				"ROLE_USER_READ"), true);
+		grandParentAcl.insertAce(1, BasePermission.WRITE, new PrincipalSid("ben"), true);
+		grandParentAcl
+				.insertAce(2, BasePermission.DELETE, new PrincipalSid("ben"), false);
+		grandParentAcl.insertAce(3, BasePermission.DELETE, new PrincipalSid("scott"),
+				true);
+		parentAcl1.insertAce(0, BasePermission.READ, new PrincipalSid("scott"), true);
+		parentAcl1.insertAce(1, BasePermission.DELETE, new PrincipalSid("scott"), false);
+		parentAcl2.insertAce(0, BasePermission.CREATE, new PrincipalSid("ben"), true);
+		childAcl1.insertAce(0, BasePermission.CREATE, new PrincipalSid("scott"), true);
+
+		// Check granting process for parent1
+		assertTrue(parentAcl1.isGranted(READ, SCOTT, false));
+		assertTrue(parentAcl1.isGranted(READ,
+				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false));
+		assertTrue(parentAcl1.isGranted(WRITE, BEN, false));
+		assertFalse(parentAcl1.isGranted(DELETE, BEN, false));
+		assertFalse(parentAcl1.isGranted(DELETE, SCOTT, false));
+
+		// Check granting process for parent2
+		assertTrue(parentAcl2.isGranted(CREATE, BEN, false));
+		assertTrue(parentAcl2.isGranted(WRITE, BEN, false));
+		assertFalse(parentAcl2.isGranted(DELETE, BEN, false));
+
+		// Check granting process for child1
+		assertTrue(childAcl1.isGranted(CREATE, SCOTT, false));
+		assertTrue(childAcl1.isGranted(READ,
+				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false));
+		assertFalse(childAcl1.isGranted(DELETE, BEN, false));
+
+		// Check granting process for child2 (doesn't inherit the permissions from its
+		// parent)
+		try {
+			assertTrue(childAcl2.isGranted(CREATE, SCOTT, false));
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+		try {
+			assertTrue(childAcl2.isGranted(CREATE,
+					Arrays.asList((Sid) new PrincipalSid("joe")), false));
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+	}
+
+	@Test
+	public void updatedAceValuesAreCorrectlyReflectedInAcl() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				false, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		acl.insertAce(2, BasePermission.CREATE, new PrincipalSid("ben"), true);
+		service.updateAcl(acl);
+
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.CREATE);
+
+		// Change each permission
+		acl.updateAce(0, BasePermission.CREATE);
+		acl.updateAce(1, BasePermission.DELETE);
+		acl.updateAce(2, BasePermission.READ);
+
+		// Check the change was successfully made
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.CREATE);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.DELETE);
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
+	}
+
+	@Test
+	public void auditableEntryFlagsAreUpdatedCorrectly() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_AUDITING", "ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				false, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		service.updateAcl(acl);
+
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditFailure());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditFailure());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditSuccess());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditSuccess());
+
+		// Change each permission
+		((AuditableAcl) acl).updateAuditing(0, true, true);
+		((AuditableAcl) acl).updateAuditing(1, true, true);
+
+		// Check the change was successfuly made
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditSuccess());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditSuccess());
+	}
+
+	@Test
+	public void gettersAndSettersAreConsistent() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, (100));
+		ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, (101));
+		MutableAcl acl = new AclImpl(identity, 1, authzStrategy, pgs, null, null, true,
+				new PrincipalSid("joe"));
+		MutableAcl parentAcl = new AclImpl(identity2, 2, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		MockAclService service = new MockAclService();
+		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_USER_READ"),
+				true);
+		service.updateAcl(acl);
+
+		assertEquals(acl.getId(), 1);
+		assertEquals(acl.getObjectIdentity(), identity);
+		assertEquals(acl.getOwner(), new PrincipalSid("joe"));
+		assertNull(acl.getParentAcl());
+		assertTrue(acl.isEntriesInheriting());
+		assertEquals(2, acl.getEntries().size());
+
+		acl.setParent(parentAcl);
+		assertEquals(acl.getParentAcl(), parentAcl);
+
+		acl.setEntriesInheriting(false);
+		assertFalse(acl.isEntriesInheriting());
+
+		acl.setOwner(new PrincipalSid("ben"));
+		assertEquals(acl.getOwner(), new PrincipalSid("ben"));
+	}
+
+	@Test
+	public void isSidLoadedBehavesAsExpected() throws Exception {
+		List<Sid> loadedSids = Arrays.asList(new PrincipalSid("ben"),
+				new GrantedAuthoritySid("ROLE_IGNORED"));
+		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null,
+				loadedSids, true, new PrincipalSid("joe"));
+
+		assertTrue(acl.isSidLoaded(loadedSids));
+		assertTrue(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"),
+				new PrincipalSid("ben"))));
+		assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"))));
+		assertTrue(acl.isSidLoaded(BEN));
+		assertTrue(acl.isSidLoaded(null));
+		assertTrue(acl.isSidLoaded(new ArrayList<Sid>(0)));
+		assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))));
+		assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))));
+		assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))));
+	}
+
+	@Test(expected = NotFoundException.class)
+	public void insertAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
+		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		acl.insertAce(-1, mock(Permission.class), mock(Sid.class), true);
+	}
+
+	@Test(expected = NotFoundException.class)
+	public void deleteAceRaisesNotFoundExceptionForIndexLessThanZero() throws Exception {
+		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		acl.deleteAce(-1);
+	}
+
+	@Test(expected = NotFoundException.class)
+	public void insertAceRaisesNotFoundExceptionForIndexGreaterThanSize()
+			throws Exception {
+		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		// Insert at zero, OK.
+		acl.insertAce(0, mock(Permission.class), mock(Sid.class), true);
+		// Size is now 1
+		acl.insertAce(2, mock(Permission.class), mock(Sid.class), true);
+	}
+
+	// SEC-1151
+	@Test(expected = NotFoundException.class)
+	public void deleteAceRaisesNotFoundExceptionForIndexEqualToSize() throws Exception {
+		AclImpl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null, null,
+				true, new PrincipalSid("joe"));
+		acl.insertAce(0, mock(Permission.class), mock(Sid.class), true);
+		// Size is now 1
+		acl.deleteAce(1);
+	}
+
+	// SEC-1795
+	@Test
+	public void changingParentIsSuccessful() throws Exception {
+		AclImpl parentAcl = new AclImpl(objectIdentity, 1L, authzStrategy,
+				mockAuditLogger);
+		AclImpl childAcl = new AclImpl(objectIdentity, 2L, authzStrategy, mockAuditLogger);
+		AclImpl changeParentAcl = new AclImpl(objectIdentity, 3L, authzStrategy,
+				mockAuditLogger);
+
+		childAcl.setParent(parentAcl);
+		childAcl.setParent(changeParentAcl);
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class MockAclService implements MutableAclService {
+		public MutableAcl createAcl(ObjectIdentity objectIdentity)
+				throws AlreadyExistsException {
+			return null;
+		}
+
+		public void deleteAcl(ObjectIdentity objectIdentity, boolean deleteChildren)
+				throws ChildrenExistException {
+		}
+
+		/*
+		 * Mock implementation that populates the aces list with fully initialized
+		 * AccessControlEntries
+		 * 
+		 * @see
+		 * org.springframework.security.acls.MutableAclService#updateAcl(org.springframework
+		 * .security.acls.MutableAcl)
+		 */
+		@SuppressWarnings("unchecked")
+		public MutableAcl updateAcl(MutableAcl acl) throws NotFoundException {
+			List<AccessControlEntry> oldAces = acl.getEntries();
+			Field acesField = FieldUtils.getField(AclImpl.class, "aces");
+			acesField.setAccessible(true);
+			List newAces;
+			try {
+				newAces = (List) acesField.get(acl);
+				newAces.clear();
+
+				for (int i = 0; i < oldAces.size(); i++) {
+					AccessControlEntry ac = oldAces.get(i);
+					// Just give an ID to all this acl's aces, rest of the fields are just
+					// copied
+					newAces.add(new AccessControlEntryImpl((i + 1), ac.getAcl(), ac
+							.getSid(), ac.getPermission(), ac.isGranting(),
+							((AuditableAccessControlEntry) ac).isAuditSuccess(),
+							((AuditableAccessControlEntry) ac).isAuditFailure()));
+				}
+			}
+			catch (IllegalAccessException e) {
+				e.printStackTrace();
+			}
+
+			return acl;
+		}
+
+		public List<ObjectIdentity> findChildren(ObjectIdentity parentIdentity) {
+			return null;
+		}
+
+		public Acl readAclById(ObjectIdentity object) throws NotFoundException {
+			return null;
+		}
+
+		public Acl readAclById(ObjectIdentity object, List<Sid> sids)
+				throws NotFoundException {
+			return null;
+		}
+
+		public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects)
+				throws NotFoundException {
+			return null;
+		}
+
+		public Map<ObjectIdentity, Acl> readAclsById(List<ObjectIdentity> objects,
+				List<Sid> sids) throws NotFoundException {
+			return null;
+		}
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java
index 4b7b540ac0..b25f391a72 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java
@@ -14,245 +14,284 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Test class for {@link AclAuthorizationStrategyImpl} and {@link AclImpl}
- * security checks.
+ * Test class for {@link AclAuthorizationStrategyImpl} and {@link AclImpl} security
+ * checks.
  *
  * @author Andrei Stefan
  */
 public class AclImplementationSecurityCheckTests {
-    private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
+	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public void setUp() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testSecurityCheckNoACEs() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("user", "password","ROLE_GENERAL","ROLE_AUDITING","ROLE_OWNERSHIP");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testSecurityCheckNoACEs() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_GENERAL", "ROLE_AUDITING", "ROLE_OWNERSHIP");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-        Acl acl = new AclImpl(identity, new Long(1), aclAuthorizationStrategy, new ConsoleAuditLogger());
+		Acl acl = new AclImpl(identity, new Long(1), aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
 
-        aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_GENERAL);
-        aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_AUDITING);
-        aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+		aclAuthorizationStrategy.securityCheck(acl,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
+		aclAuthorizationStrategy.securityCheck(acl,
+				AclAuthorizationStrategy.CHANGE_AUDITING);
+		aclAuthorizationStrategy.securityCheck(acl,
+				AclAuthorizationStrategy.CHANGE_OWNERSHIP);
 
-        // Create another authorization strategy
-        AclAuthorizationStrategy aclAuthorizationStrategy2 = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_ONE"), new SimpleGrantedAuthority("ROLE_TWO"),
-                new SimpleGrantedAuthority("ROLE_THREE"));
-        Acl acl2 = new AclImpl(identity, new Long(1), aclAuthorizationStrategy2, new ConsoleAuditLogger());
-        // Check access in case the principal has no authorization rights
-        try {
-            aclAuthorizationStrategy2.securityCheck(acl2, AclAuthorizationStrategy.CHANGE_GENERAL);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-        try {
-            aclAuthorizationStrategy2.securityCheck(acl2, AclAuthorizationStrategy.CHANGE_AUDITING);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-        try {
-            aclAuthorizationStrategy2.securityCheck(acl2, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-        }
-    }
+		// Create another authorization strategy
+		AclAuthorizationStrategy aclAuthorizationStrategy2 = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_ONE"), new SimpleGrantedAuthority(
+						"ROLE_TWO"), new SimpleGrantedAuthority("ROLE_THREE"));
+		Acl acl2 = new AclImpl(identity, new Long(1), aclAuthorizationStrategy2,
+				new ConsoleAuditLogger());
+		// Check access in case the principal has no authorization rights
+		try {
+			aclAuthorizationStrategy2.securityCheck(acl2,
+					AclAuthorizationStrategy.CHANGE_GENERAL);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+		try {
+			aclAuthorizationStrategy2.securityCheck(acl2,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+		try {
+			aclAuthorizationStrategy2.securityCheck(acl2,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+		}
+	}
 
-    @Test
-    public void testSecurityCheckWithMultipleACEs() throws Exception {
-        // Create a simple authentication with ROLE_GENERAL
-        Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testSecurityCheckWithMultipleACEs() throws Exception {
+		// Create a simple authentication with ROLE_GENERAL
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-        // Authorization strategy will require a different role for each access
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		// Authorization strategy will require a different role for each access
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-        // Let's give the principal the ADMINISTRATION permission, without
-        // granting access
-        MutableAcl aclFirstDeny = new AclImpl(identity, new Long(1), aclAuthorizationStrategy, new ConsoleAuditLogger());
-        aclFirstDeny.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth), false);
+		// Let's give the principal the ADMINISTRATION permission, without
+		// granting access
+		MutableAcl aclFirstDeny = new AclImpl(identity, new Long(1),
+				aclAuthorizationStrategy, new ConsoleAuditLogger());
+		aclFirstDeny.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				false);
 
-        // The CHANGE_GENERAL test should pass as the principal has ROLE_GENERAL
-        aclAuthorizationStrategy.securityCheck(aclFirstDeny, AclAuthorizationStrategy.CHANGE_GENERAL);
+		// The CHANGE_GENERAL test should pass as the principal has ROLE_GENERAL
+		aclAuthorizationStrategy.securityCheck(aclFirstDeny,
+				AclAuthorizationStrategy.CHANGE_GENERAL);
 
-        // The CHANGE_AUDITING and CHANGE_OWNERSHIP should fail since the
-        // principal doesn't have these authorities,
-        // nor granting access
-        try {
-            aclAuthorizationStrategy.securityCheck(aclFirstDeny, AclAuthorizationStrategy.CHANGE_AUDITING);
-            fail("It should have thrown AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
-        try {
-            aclAuthorizationStrategy.securityCheck(aclFirstDeny, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-            fail("It should have thrown AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+		// The CHANGE_AUDITING and CHANGE_OWNERSHIP should fail since the
+		// principal doesn't have these authorities,
+		// nor granting access
+		try {
+			aclAuthorizationStrategy.securityCheck(aclFirstDeny,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			fail("It should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
+		try {
+			aclAuthorizationStrategy.securityCheck(aclFirstDeny,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+			fail("It should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
 
-        // Add granting access to this principal
-        aclFirstDeny.insertAce(1, BasePermission.ADMINISTRATION, new PrincipalSid(auth), true);
-        // and try again for CHANGE_AUDITING - the first ACE's granting flag
-        // (false) will deny this access
-        try {
-            aclAuthorizationStrategy.securityCheck(aclFirstDeny, AclAuthorizationStrategy.CHANGE_AUDITING);
-            fail("It should have thrown AccessDeniedException");
-        }
-        catch (AccessDeniedException expected) {
-        }
+		// Add granting access to this principal
+		aclFirstDeny.insertAce(1, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				true);
+		// and try again for CHANGE_AUDITING - the first ACE's granting flag
+		// (false) will deny this access
+		try {
+			aclAuthorizationStrategy.securityCheck(aclFirstDeny,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			fail("It should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
 
-        // Create another ACL and give the principal the ADMINISTRATION
-        // permission, with granting access
-        MutableAcl aclFirstAllow = new AclImpl(identity, new Long(1), aclAuthorizationStrategy,
-                new ConsoleAuditLogger());
-        aclFirstAllow.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth), true);
+		// Create another ACL and give the principal the ADMINISTRATION
+		// permission, with granting access
+		MutableAcl aclFirstAllow = new AclImpl(identity, new Long(1),
+				aclAuthorizationStrategy, new ConsoleAuditLogger());
+		aclFirstAllow.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				true);
 
-        // The CHANGE_AUDITING test should pass as there is one ACE with
-        // granting access
+		// The CHANGE_AUDITING test should pass as there is one ACE with
+		// granting access
 
-        aclAuthorizationStrategy.securityCheck(aclFirstAllow, AclAuthorizationStrategy.CHANGE_AUDITING);
+		aclAuthorizationStrategy.securityCheck(aclFirstAllow,
+				AclAuthorizationStrategy.CHANGE_AUDITING);
 
-        // Add a deny ACE and test again for CHANGE_AUDITING
-        aclFirstAllow.insertAce(1, BasePermission.ADMINISTRATION, new PrincipalSid(auth), false);
-        try {
-            aclAuthorizationStrategy.securityCheck(aclFirstAllow, AclAuthorizationStrategy.CHANGE_AUDITING);
-            assertTrue(true);
-        }
-        catch (AccessDeniedException notExpected) {
-            fail("It shouldn't have thrown AccessDeniedException");
-        }
+		// Add a deny ACE and test again for CHANGE_AUDITING
+		aclFirstAllow.insertAce(1, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				false);
+		try {
+			aclAuthorizationStrategy.securityCheck(aclFirstAllow,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			assertTrue(true);
+		}
+		catch (AccessDeniedException notExpected) {
+			fail("It shouldn't have thrown AccessDeniedException");
+		}
 
-        // Create an ACL with no ACE
-        MutableAcl aclNoACE = new AclImpl(identity, new Long(1), aclAuthorizationStrategy, new ConsoleAuditLogger());
-        try {
-            aclAuthorizationStrategy.securityCheck(aclNoACE, AclAuthorizationStrategy.CHANGE_AUDITING);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-        // and still grant access for CHANGE_GENERAL
-        try {
-            aclAuthorizationStrategy.securityCheck(aclNoACE, AclAuthorizationStrategy.CHANGE_GENERAL);
-            assertTrue(true);
-        }
-        catch (NotFoundException expected) {
-            fail("It shouldn't have thrown NotFoundException");
-        }
-    }
+		// Create an ACL with no ACE
+		MutableAcl aclNoACE = new AclImpl(identity, new Long(1),
+				aclAuthorizationStrategy, new ConsoleAuditLogger());
+		try {
+			aclAuthorizationStrategy.securityCheck(aclNoACE,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+		// and still grant access for CHANGE_GENERAL
+		try {
+			aclAuthorizationStrategy.securityCheck(aclNoACE,
+					AclAuthorizationStrategy.CHANGE_GENERAL);
+			assertTrue(true);
+		}
+		catch (NotFoundException expected) {
+			fail("It shouldn't have thrown NotFoundException");
+		}
+	}
 
-    @Test
-    public void testSecurityCheckWithInheritableACEs() throws Exception {
-        // Create a simple authentication with ROLE_GENERAL
-        Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testSecurityCheckWithInheritableACEs() throws Exception {
+		// Create a simple authentication with ROLE_GENERAL
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100);
-        // Authorization strategy will require a different role for each access
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_ONE"), new SimpleGrantedAuthority("ROLE_TWO"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100);
+		// Authorization strategy will require a different role for each access
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_ONE"), new SimpleGrantedAuthority(
+						"ROLE_TWO"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-        // Let's give the principal an ADMINISTRATION permission, with granting
-        // access
-        MutableAcl parentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy, new ConsoleAuditLogger());
-        parentAcl.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth), true);
-        MutableAcl childAcl = new AclImpl(identity, 2, aclAuthorizationStrategy, new ConsoleAuditLogger());
+		// Let's give the principal an ADMINISTRATION permission, with granting
+		// access
+		MutableAcl parentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
+		parentAcl.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				true);
+		MutableAcl childAcl = new AclImpl(identity, 2, aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
 
-        // Check against the 'child' acl, which doesn't offer any authorization
-        // rights on CHANGE_OWNERSHIP
-        try {
-            aclAuthorizationStrategy.securityCheck(childAcl, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
+		// Check against the 'child' acl, which doesn't offer any authorization
+		// rights on CHANGE_OWNERSHIP
+		try {
+			aclAuthorizationStrategy.securityCheck(childAcl,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
 
-        // Link the child with its parent and test again against the
-        // CHANGE_OWNERSHIP right
-        childAcl.setParent(parentAcl);
-        childAcl.setEntriesInheriting(true);
-        try {
-            aclAuthorizationStrategy.securityCheck(childAcl, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-            assertTrue(true);
-        }
-        catch (NotFoundException expected) {
-            fail("It shouldn't have thrown NotFoundException");
-        }
+		// Link the child with its parent and test again against the
+		// CHANGE_OWNERSHIP right
+		childAcl.setParent(parentAcl);
+		childAcl.setEntriesInheriting(true);
+		try {
+			aclAuthorizationStrategy.securityCheck(childAcl,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+			assertTrue(true);
+		}
+		catch (NotFoundException expected) {
+			fail("It shouldn't have thrown NotFoundException");
+		}
 
-        // Create a root parent and link it to the middle parent
-        MutableAcl rootParentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy,
-                new ConsoleAuditLogger());
-        parentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy, new ConsoleAuditLogger());
-        rootParentAcl.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth), true);
-        parentAcl.setEntriesInheriting(true);
-        parentAcl.setParent(rootParentAcl);
-        childAcl.setParent(parentAcl);
-        try {
-            aclAuthorizationStrategy.securityCheck(childAcl, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-            assertTrue(true);
-        }
-        catch (NotFoundException expected) {
-            fail("It shouldn't have thrown NotFoundException");
-        }
-    }
+		// Create a root parent and link it to the middle parent
+		MutableAcl rootParentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
+		parentAcl = new AclImpl(identity, 1, aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
+		rootParentAcl.insertAce(0, BasePermission.ADMINISTRATION, new PrincipalSid(auth),
+				true);
+		parentAcl.setEntriesInheriting(true);
+		parentAcl.setParent(rootParentAcl);
+		childAcl.setParent(parentAcl);
+		try {
+			aclAuthorizationStrategy.securityCheck(childAcl,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+			assertTrue(true);
+		}
+		catch (NotFoundException expected) {
+			fail("It shouldn't have thrown NotFoundException");
+		}
+	}
 
-    @Test
-    public void testSecurityCheckPrincipalOwner() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_ONE");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testSecurityCheckPrincipalOwner() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_ONE");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100);
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, 100);
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-        Acl acl = new AclImpl(identity, 1, aclAuthorizationStrategy, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), null, null,
-                false, new PrincipalSid(auth));
-        try {
-            aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_GENERAL);
-        }
-        catch (AccessDeniedException notExpected) {
-            fail("It shouldn't have thrown AccessDeniedException");
-        }
-        try {
-            aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_AUDITING);
-            fail("It shouldn't have thrown AccessDeniedException");
-        }
-        catch (NotFoundException expected) {
-        }
-        try {
-            aclAuthorizationStrategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-        }
-        catch (AccessDeniedException notExpected) {
-            fail("It shouldn't have thrown AccessDeniedException");
-        }
-    }
+		Acl acl = new AclImpl(identity, 1, aclAuthorizationStrategy,
+				new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), null,
+				null, false, new PrincipalSid(auth));
+		try {
+			aclAuthorizationStrategy.securityCheck(acl,
+					AclAuthorizationStrategy.CHANGE_GENERAL);
+		}
+		catch (AccessDeniedException notExpected) {
+			fail("It shouldn't have thrown AccessDeniedException");
+		}
+		try {
+			aclAuthorizationStrategy.securityCheck(acl,
+					AclAuthorizationStrategy.CHANGE_AUDITING);
+			fail("It shouldn't have thrown AccessDeniedException");
+		}
+		catch (NotFoundException expected) {
+		}
+		try {
+			aclAuthorizationStrategy.securityCheck(acl,
+					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
+		}
+		catch (AccessDeniedException notExpected) {
+			fail("It shouldn't have thrown AccessDeniedException");
+		}
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java
index b2abb2ed4b..2a4fb9904e 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java
@@ -18,61 +18,63 @@ import org.springframework.security.acls.model.AuditableAccessControlEntry;
  * @author Andrei Stefan
  */
 public class AuditLoggerTests {
-    //~ Instance fields ================================================================================================
-    private PrintStream console;
-    private ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-    private ConsoleAuditLogger logger;
-    private AuditableAccessControlEntry ace;
+	// ~ Instance fields
+	// ================================================================================================
+	private PrintStream console;
+	private ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+	private ConsoleAuditLogger logger;
+	private AuditableAccessControlEntry ace;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        logger = new ConsoleAuditLogger();
-        ace = mock(AuditableAccessControlEntry.class);
-        console = System.out;
-        System.setOut(new PrintStream(bytes));
-    }
+	@Before
+	public void setUp() throws Exception {
+		logger = new ConsoleAuditLogger();
+		ace = mock(AuditableAccessControlEntry.class);
+		console = System.out;
+		System.setOut(new PrintStream(bytes));
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        System.setOut(console);
-        bytes.reset();
-    }
+	@After
+	public void tearDown() throws Exception {
+		System.setOut(console);
+		bytes.reset();
+	}
 
-    @Test
-    public void nonAuditableAceIsIgnored() {
-        AccessControlEntry ace = mock(AccessControlEntry.class);
-        logger.logIfNeeded(true, ace);
-        assertEquals(0, bytes.size());
-    }
+	@Test
+	public void nonAuditableAceIsIgnored() {
+		AccessControlEntry ace = mock(AccessControlEntry.class);
+		logger.logIfNeeded(true, ace);
+		assertEquals(0, bytes.size());
+	}
 
-    @Test
-    public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() throws Exception {
-        when(ace.isAuditSuccess()).thenReturn(false);
-        logger.logIfNeeded(true, ace);
-        assertEquals(0, bytes.size());
-    }
+	@Test
+	public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() throws Exception {
+		when(ace.isAuditSuccess()).thenReturn(false);
+		logger.logIfNeeded(true, ace);
+		assertEquals(0, bytes.size());
+	}
 
-    @Test
-    public void successIsLoggedIfAceRequiresSuccessAudit() throws Exception {
-        when(ace.isAuditSuccess()).thenReturn(true);
+	@Test
+	public void successIsLoggedIfAceRequiresSuccessAudit() throws Exception {
+		when(ace.isAuditSuccess()).thenReturn(true);
 
-        logger.logIfNeeded(true, ace);
-        assertTrue(bytes.toString().startsWith("GRANTED due to ACE"));
-    }
+		logger.logIfNeeded(true, ace);
+		assertTrue(bytes.toString().startsWith("GRANTED due to ACE"));
+	}
 
-    @Test
-    public void failureIsntLoggedIfAceDoesntRequireFailureAudit() throws Exception {
-        when(ace.isAuditFailure()).thenReturn(false);
-        logger.logIfNeeded(false, ace);
-        assertEquals(0, bytes.size());
-    }
+	@Test
+	public void failureIsntLoggedIfAceDoesntRequireFailureAudit() throws Exception {
+		when(ace.isAuditFailure()).thenReturn(false);
+		logger.logIfNeeded(false, ace);
+		assertEquals(0, bytes.size());
+	}
 
-    @Test
-    public void failureIsLoggedIfAceRequiresFailureAudit() throws Exception {
-        when(ace.isAuditFailure()).thenReturn(true);
-        logger.logIfNeeded(false, ace);
-        assertTrue(bytes.toString().startsWith("DENIED due to ACE"));
-    }
+	@Test
+	public void failureIsLoggedIfAceRequiresFailureAudit() throws Exception {
+		when(ace.isAuditFailure()).thenReturn(true);
+		logger.logIfNeeded(false, ace);
+		assertTrue(bytes.toString().startsWith("DENIED due to ACE"));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java
index 042fba7bee..17c13afcd3 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java
@@ -15,175 +15,179 @@ import org.springframework.security.acls.model.ObjectIdentity;
 @SuppressWarnings("unused")
 public class ObjectIdentityImplTests {
 
-    private static final String DOMAIN_CLASS =
-        "org.springframework.security.acls.domain.ObjectIdentityImplTests$MockIdDomainObject";
+	private static final String DOMAIN_CLASS = "org.springframework.security.acls.domain.ObjectIdentityImplTests$MockIdDomainObject";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void constructorsRespectRequiredFields() throws Exception {
-        // Check one-argument constructor required field
-        try {
-            new ObjectIdentityImpl(null);
-            fail("It should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+	@Test
+	public void constructorsRespectRequiredFields() throws Exception {
+		// Check one-argument constructor required field
+		try {
+			new ObjectIdentityImpl(null);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // Check String-Serializable constructor required field
-        try {
-            new ObjectIdentityImpl("", Long.valueOf(1));
-            fail("It should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		// Check String-Serializable constructor required field
+		try {
+			new ObjectIdentityImpl("", Long.valueOf(1));
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // Check Serializable parameter is not null
-        try {
-            new ObjectIdentityImpl(DOMAIN_CLASS, null);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
+		// Check Serializable parameter is not null
+		try {
+			new ObjectIdentityImpl(DOMAIN_CLASS, null);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // The correct way of using String-Serializable constructor
-        try {
-            new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
-        }
-        catch (IllegalArgumentException notExpected) {
-            fail("It shouldn't have thrown IllegalArgumentException");
-        }
+		// The correct way of using String-Serializable constructor
+		try {
+			new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
+		}
+		catch (IllegalArgumentException notExpected) {
+			fail("It shouldn't have thrown IllegalArgumentException");
+		}
 
-        // Check the Class-Serializable constructor
-        try {
-            new ObjectIdentityImpl(MockIdDomainObject.class, null);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
+		// Check the Class-Serializable constructor
+		try {
+			new ObjectIdentityImpl(MockIdDomainObject.class, null);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void gettersReturnExpectedValues() throws Exception {
-        ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
-        assertEquals(Long.valueOf(1), obj.getIdentifier());
-        assertEquals(MockIdDomainObject.class.getName(), obj.getType());
-    }
+	@Test
+	public void gettersReturnExpectedValues() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
+		assertEquals(Long.valueOf(1), obj.getIdentifier());
+		assertEquals(MockIdDomainObject.class.getName(), obj.getType());
+	}
 
-    @Test
-    public void testGetIdMethodConstraints() throws Exception {
-        // Check the getId() method is present
-        try {
-            new ObjectIdentityImpl("A_STRING_OBJECT");
-            fail("It should have thrown IdentityUnavailableException");
-        }
-        catch (IdentityUnavailableException expected) {
+	@Test
+	public void testGetIdMethodConstraints() throws Exception {
+		// Check the getId() method is present
+		try {
+			new ObjectIdentityImpl("A_STRING_OBJECT");
+			fail("It should have thrown IdentityUnavailableException");
+		}
+		catch (IdentityUnavailableException expected) {
 
-        }
+		}
 
-        // getId() should return a non-null value
-        MockIdDomainObject mockId = new MockIdDomainObject();
-        try {
-            new ObjectIdentityImpl(mockId);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
+		// getId() should return a non-null value
+		MockIdDomainObject mockId = new MockIdDomainObject();
+		try {
+			new ObjectIdentityImpl(mockId);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
 
-        }
+		}
 
-        // getId() should return a Serializable object
-        mockId.setId(new MockIdDomainObject());
-        try {
-            new ObjectIdentityImpl(mockId);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
+		// getId() should return a Serializable object
+		mockId.setId(new MockIdDomainObject());
+		try {
+			new ObjectIdentityImpl(mockId);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        // getId() should return a Serializable object
-        mockId.setId(new Long(100));
-        try {
-            new ObjectIdentityImpl(mockId);
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
+		// getId() should return a Serializable object
+		mockId.setId(new Long(100));
+		try {
+			new ObjectIdentityImpl(mockId);
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorRejectsInvalidTypeParameter() throws Exception {
-        new ObjectIdentityImpl("", Long.valueOf(1));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorRejectsInvalidTypeParameter() throws Exception {
+		new ObjectIdentityImpl("", Long.valueOf(1));
+	}
 
-    @Test
-    public void testEquals() throws Exception {
-        ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
-        MockIdDomainObject mockObj = new MockIdDomainObject();
-        mockObj.setId(Long.valueOf(1));
+	@Test
+	public void testEquals() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
+		MockIdDomainObject mockObj = new MockIdDomainObject();
+		mockObj.setId(Long.valueOf(1));
 
-        String string = "SOME_STRING";
-        assertNotSame(obj, string);
-        assertFalse(obj.equals(null));
-        assertFalse(obj.equals("DIFFERENT_OBJECT_TYPE"));
-        assertFalse(obj.equals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2))));
-        assertFalse(obj.equals(new ObjectIdentityImpl(
-                "org.springframework.security.acls.domain.ObjectIdentityImplTests$MockOtherIdDomainObject",
-                Long.valueOf(1))));
-        assertEquals(new ObjectIdentityImpl(DOMAIN_CLASS,Long.valueOf(1)), obj);
-        assertEquals(obj, new ObjectIdentityImpl(mockObj));
-    }
+		String string = "SOME_STRING";
+		assertNotSame(obj, string);
+		assertFalse(obj.equals(null));
+		assertFalse(obj.equals("DIFFERENT_OBJECT_TYPE"));
+		assertFalse(obj.equals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2))));
+		assertFalse(obj
+				.equals(new ObjectIdentityImpl(
+						"org.springframework.security.acls.domain.ObjectIdentityImplTests$MockOtherIdDomainObject",
+						Long.valueOf(1))));
+		assertEquals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1)), obj);
+		assertEquals(obj, new ObjectIdentityImpl(mockObj));
+	}
 
-    @Test
-    public void hashcodeIsDifferentForDifferentJavaTypes() throws Exception {
-        ObjectIdentity obj = new ObjectIdentityImpl(Object.class, Long.valueOf(1));
-        ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, Long.valueOf(1));
-        assertFalse(obj.hashCode() == obj2.hashCode());
-    }
+	@Test
+	public void hashcodeIsDifferentForDifferentJavaTypes() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, Long.valueOf(1));
+		ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, Long.valueOf(1));
+		assertFalse(obj.hashCode() == obj2.hashCode());
+	}
 
-    @Test
-    public void longAndIntegerIdsWithSameValueAreEqualAndHaveSameHashcode() {
-        ObjectIdentity obj = new ObjectIdentityImpl(Object.class, new Long(5));
-        ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Integer.valueOf(5));
+	@Test
+	public void longAndIntegerIdsWithSameValueAreEqualAndHaveSameHashcode() {
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, new Long(5));
+		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Integer.valueOf(5));
 
-        assertEquals(obj, obj2);
-        assertEquals(obj.hashCode(), obj2.hashCode());
-    }
+		assertEquals(obj, obj2);
+		assertEquals(obj.hashCode(), obj2.hashCode());
+	}
 
-    @Test
-    public void equalStringIdsAreEqualAndHaveSameHashcode() throws Exception {
-        ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
-        ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, "1000");
-        assertEquals(obj, obj2);
-        assertEquals(obj.hashCode(), obj2.hashCode());
-    }
+	@Test
+	public void equalStringIdsAreEqualAndHaveSameHashcode() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
+		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, "1000");
+		assertEquals(obj, obj2);
+		assertEquals(obj.hashCode(), obj2.hashCode());
+	}
 
-    @Test
-    public void stringAndNumericIdsAreNotEqual() throws Exception {
-        ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
-        ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Long.valueOf(1000));
-        assertFalse(obj.equals(obj2));
-    }
+	@Test
+	public void stringAndNumericIdsAreNotEqual() throws Exception {
+		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
+		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Long.valueOf(1000));
+		assertFalse(obj.equals(obj2));
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockIdDomainObject {
-        private Object id;
+	private class MockIdDomainObject {
+		private Object id;
 
-        public Object getId() {
-            return id;
-        }
+		public Object getId() {
+			return id;
+		}
 
-        public void setId(Object id) {
-            this.id = id;
-        }
-    }
+		public void setId(Object id) {
+			this.id = id;
+		}
+	}
 
-    private class MockOtherIdDomainObject {
-        private Object id;
+	private class MockOtherIdDomainObject {
+		private Object id;
 
-        public Object getId() {
-            return id;
-        }
+		public Object getId() {
+			return id;
+		}
 
-        public void setId(Object id) {
-            this.id = id;
-        }
-    }
+		public void setId(Object id) {
+			this.id = id;
+		}
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java
index bf05d10953..c2eba731cc 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java
@@ -13,30 +13,32 @@ import junit.framework.TestCase;
  * @author Andrei Stefan
  */
 public class ObjectIdentityRetrievalStrategyImplTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testObjectIdentityCreation() throws Exception {
-        MockIdDomainObject domain = new MockIdDomainObject();
-        domain.setId(Integer.valueOf(1));
+	public void testObjectIdentityCreation() throws Exception {
+		MockIdDomainObject domain = new MockIdDomainObject();
+		domain.setId(Integer.valueOf(1));
 
-        ObjectIdentityRetrievalStrategy retStrategy = new ObjectIdentityRetrievalStrategyImpl();
-        ObjectIdentity identity = retStrategy.getObjectIdentity(domain);
+		ObjectIdentityRetrievalStrategy retStrategy = new ObjectIdentityRetrievalStrategyImpl();
+		ObjectIdentity identity = retStrategy.getObjectIdentity(domain);
 
-        assertNotNull(identity);
-        assertEquals(identity, new ObjectIdentityImpl(domain));
-    }
+		assertNotNull(identity);
+		assertEquals(identity, new ObjectIdentityImpl(domain));
+	}
 
-    //~ Inner Classes ==================================================================================================
-    @SuppressWarnings("unused")
-    private class MockIdDomainObject {
-        private Object id;
+	// ~ Inner Classes
+	// ==================================================================================================
+	@SuppressWarnings("unused")
+	private class MockIdDomainObject {
+		private Object id;
 
-        public Object getId() {
-            return id;
-        }
+		public Object getId() {
+			return id;
+		}
 
-        public void setId(Object id) {
-            this.id = id;
-        }
-    }
+		public void setId(Object id) {
+			this.id = id;
+		}
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
index c9c383c721..74e957b528 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java
@@ -20,7 +20,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.acls.model.Permission;
 
-
 /**
  * Tests classes associated with Permission.
  *
@@ -28,73 +27,92 @@ import org.springframework.security.acls.model.Permission;
  */
 public class PermissionTests {
 
-    private DefaultPermissionFactory permissionFactory;
+	private DefaultPermissionFactory permissionFactory;
 
-    @Before
-    public void createPermissionfactory() {
-        permissionFactory = new DefaultPermissionFactory();
-    }
+	@Before
+	public void createPermissionfactory() {
+		permissionFactory = new DefaultPermissionFactory();
+	}
 
-    @Test
-    public void basePermissionTest() {
-        Permission p = permissionFactory.buildFromName("WRITE");
-        assertNotNull(p);
-    }
+	@Test
+	public void basePermissionTest() {
+		Permission p = permissionFactory.buildFromName("WRITE");
+		assertNotNull(p);
+	}
 
-    @Test
-    public void expectedIntegerValues() {
-        assertEquals(1, BasePermission.READ.getMask());
-        assertEquals(16, BasePermission.ADMINISTRATION.getMask());
-        assertEquals(7,
-                new CumulativePermission().set(BasePermission.READ).set(BasePermission.WRITE).set(BasePermission.CREATE)
-                        .getMask());
-        assertEquals(17,
-                new CumulativePermission().set(BasePermission.READ).set(BasePermission.ADMINISTRATION).getMask());
-    }
+	@Test
+	public void expectedIntegerValues() {
+		assertEquals(1, BasePermission.READ.getMask());
+		assertEquals(16, BasePermission.ADMINISTRATION.getMask());
+		assertEquals(
+				7,
+				new CumulativePermission().set(BasePermission.READ)
+						.set(BasePermission.WRITE).set(BasePermission.CREATE).getMask());
+		assertEquals(
+				17,
+				new CumulativePermission().set(BasePermission.READ)
+						.set(BasePermission.ADMINISTRATION).getMask());
+	}
 
-    @Test
-    public void fromInteger() {
-        Permission permission = permissionFactory.buildFromMask(7);
-        System.out.println("7 =  " + permission.toString());
-        permission = permissionFactory.buildFromMask(4);
-        System.out.println("4 =  " + permission.toString());
-    }
+	@Test
+	public void fromInteger() {
+		Permission permission = permissionFactory.buildFromMask(7);
+		System.out.println("7 =  " + permission.toString());
+		permission = permissionFactory.buildFromMask(4);
+		System.out.println("4 =  " + permission.toString());
+	}
 
-    @Test
-    public void stringConversion() {
-        permissionFactory.registerPublicPermissions(SpecialPermission.class);
+	@Test
+	public void stringConversion() {
+		permissionFactory.registerPublicPermissions(SpecialPermission.class);
 
-        System.out.println("R =  " + BasePermission.READ.toString());
-        assertEquals("BasePermission[...............................R=1]", BasePermission.READ.toString());
+		System.out.println("R =  " + BasePermission.READ.toString());
+		assertEquals("BasePermission[...............................R=1]",
+				BasePermission.READ.toString());
 
-        System.out.println("A =  " + BasePermission.ADMINISTRATION.toString());
-        assertEquals("BasePermission[...........................A....=16]", BasePermission.ADMINISTRATION.toString());
+		System.out.println("A =  " + BasePermission.ADMINISTRATION.toString());
+		assertEquals("BasePermission[...........................A....=16]",
+				BasePermission.ADMINISTRATION.toString());
 
-        System.out.println("R =  " + new CumulativePermission().set(BasePermission.READ).toString());
-        assertEquals("CumulativePermission[...............................R=1]",
-                new CumulativePermission().set(BasePermission.READ).toString());
+		System.out.println("R =  "
+				+ new CumulativePermission().set(BasePermission.READ).toString());
+		assertEquals("CumulativePermission[...............................R=1]",
+				new CumulativePermission().set(BasePermission.READ).toString());
 
-        System.out.println("A =  " + new CumulativePermission().set(SpecialPermission.ENTER).set(BasePermission.ADMINISTRATION).toString());
-        assertEquals("CumulativePermission[..........................EA....=48]",
-                new CumulativePermission().set(SpecialPermission.ENTER).set(BasePermission.ADMINISTRATION).toString());
+		System.out.println("A =  "
+				+ new CumulativePermission().set(SpecialPermission.ENTER)
+						.set(BasePermission.ADMINISTRATION).toString());
+		assertEquals(
+				"CumulativePermission[..........................EA....=48]",
+				new CumulativePermission().set(SpecialPermission.ENTER)
+						.set(BasePermission.ADMINISTRATION).toString());
 
-        System.out.println("RA = "
-                + new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ).toString());
-        assertEquals("CumulativePermission[...........................A...R=17]",
-                new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ).toString());
+		System.out.println("RA = "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).toString());
+		assertEquals(
+				"CumulativePermission[...........................A...R=17]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).toString());
 
-        System.out.println("R =  "
-                + new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ)
-                .clear(BasePermission.ADMINISTRATION).toString());
-        assertEquals("CumulativePermission[...............................R=1]",
-                new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ)
-                        .clear(BasePermission.ADMINISTRATION).toString());
+		System.out.println("R =  "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.toString());
+		assertEquals(
+				"CumulativePermission[...............................R=1]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.toString());
 
-        System.out.println("0 =  "
-                + new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ)
-                .clear(BasePermission.ADMINISTRATION).clear(BasePermission.READ).toString());
-        assertEquals("CumulativePermission[................................=0]",
-                new CumulativePermission().set(BasePermission.ADMINISTRATION).set(BasePermission.READ)
-                        .clear(BasePermission.ADMINISTRATION).clear(BasePermission.READ).toString());
-    }
+		System.out.println("0 =  "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.clear(BasePermission.READ).toString());
+		assertEquals(
+				"CumulativePermission[................................=0]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.clear(BasePermission.READ).toString());
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java b/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java
index 2582e76495..1c16fdab7f 100644
--- a/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java
+++ b/acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java
@@ -16,17 +16,16 @@ package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;
 
-
 /**
  * A test permission.
  *
  * @author Ben Alex
  */
 public class SpecialPermission extends BasePermission {
-    public static final Permission ENTER = new SpecialPermission(1 << 5, 'E'); // 32
-    public static final Permission LEAVE = new SpecialPermission(1 << 6, 'L');
+	public static final Permission ENTER = new SpecialPermission(1 << 5, 'E'); // 32
+	public static final Permission LEAVE = new SpecialPermission(1 << 6, 'L');
 
-    protected SpecialPermission(int mask, char code) {
-        super(mask, code);
-    }
+	protected SpecialPermission(int mask, char code) {
+		super(mask, code);
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java
index ba7696ec43..b483640ff1 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java
@@ -29,284 +29,335 @@ import java.util.*;
  */
 public class BasicLookupStrategyTests {
 
-    private static final Sid BEN_SID = new PrincipalSid("ben");
-    private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
+	private static final Sid BEN_SID = new PrincipalSid("ben");
+	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private static JdbcTemplate jdbcTemplate;
-    private BasicLookupStrategy strategy;
-    private static SingleConnectionDataSource dataSource;
-    private static CacheManager cacheManager;
+	private static JdbcTemplate jdbcTemplate;
+	private BasicLookupStrategy strategy;
+	private static SingleConnectionDataSource dataSource;
+	private static CacheManager cacheManager;
 
-    //~ Methods ========================================================================================================
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = CacheManager.create();
-        cacheManager.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30));
-    }
+	// ~ Methods
+	// ========================================================================================================
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = CacheManager.create();
+		cacheManager
+				.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30));
+	}
 
-    @BeforeClass
-    public static void createDatabase() throws Exception {
-        dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest", "sa", "", true);
-        dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
-        jdbcTemplate = new JdbcTemplate(dataSource);
+	@BeforeClass
+	public static void createDatabase() throws Exception {
+		dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest",
+				"sa", "", true);
+		dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+		jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Resource resource = new ClassPathResource("createAclSchema.sql");
-        String sql = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
-        jdbcTemplate.execute(sql);
-    }
+		Resource resource = new ClassPathResource("createAclSchema.sql");
+		String sql = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
+		jdbcTemplate.execute(sql);
+	}
 
-    @AfterClass
-    public static void dropDatabase() throws Exception {
-        dataSource.destroy();
-    }
+	@AfterClass
+	public static void dropDatabase() throws Exception {
+		dataSource.destroy();
+	}
 
-    @AfterClass
-    public static void shutdownCacheManager() {
-        cacheManager.removalAll();
-        cacheManager.shutdown();
-    }
+	@AfterClass
+	public static void shutdownCacheManager() {
+		cacheManager.removalAll();
+		cacheManager.shutdown();
+	}
 
-    @Before
-    public void populateDatabase() {
-        String query = "INSERT INTO acl_sid(ID,PRINCIPAL,SID) VALUES (1,1,'ben');"
-                + "INSERT INTO acl_class(ID,CLASS) VALUES (2,'" + TARGET_CLASS + "');"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (1,2,100,null,1,1);"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (2,2,101,1,1,1);"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (3,2,102,2,1,1);"
-                + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (1,1,0,1,1,1,0,0);"
-                + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (2,1,1,1,2,0,0,0);"
-                + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (3,2,0,1,8,1,0,0);"
-                + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (4,3,0,1,8,0,0,0);";
-        jdbcTemplate.execute(query);
-    }
+	@Before
+	public void populateDatabase() {
+		String query = "INSERT INTO acl_sid(ID,PRINCIPAL,SID) VALUES (1,1,'ben');"
+				+ "INSERT INTO acl_class(ID,CLASS) VALUES (2,'"
+				+ TARGET_CLASS
+				+ "');"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (1,2,100,null,1,1);"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (2,2,101,1,1,1);"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (3,2,102,2,1,1);"
+				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (1,1,0,1,1,1,0,0);"
+				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (2,1,1,1,2,0,0,0);"
+				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (3,2,0,1,8,1,0,0);"
+				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (4,3,0,1,8,0,0,0);";
+		jdbcTemplate.execute(query);
+	}
 
-    @Before
-    public void initializeBeans() {
-        EhCacheBasedAclCache cache = new EhCacheBasedAclCache(getCache(), new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
-        AclAuthorizationStrategy authorizationStrategy = new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_ADMINISTRATOR"));
-        strategy = new BasicLookupStrategy(dataSource, cache, authorizationStrategy,
-                new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));
-        strategy.setPermissionFactory(new DefaultPermissionFactory());
-    }
+	@Before
+	public void initializeBeans() {
+		EhCacheBasedAclCache cache = new EhCacheBasedAclCache(getCache(),
+				new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()),
+				new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
+		AclAuthorizationStrategy authorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_ADMINISTRATOR"));
+		strategy = new BasicLookupStrategy(dataSource, cache, authorizationStrategy,
+				new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));
+		strategy.setPermissionFactory(new DefaultPermissionFactory());
+	}
 
-    @After
-    public void emptyDatabase() {
-        String query = "DELETE FROM acl_entry;" + "DELETE FROM acl_object_identity WHERE ID = 7;"
-                + "DELETE FROM acl_object_identity WHERE ID = 6;" + "DELETE FROM acl_object_identity WHERE ID = 5;"
-                + "DELETE FROM acl_object_identity WHERE ID = 4;" + "DELETE FROM acl_object_identity WHERE ID = 3;"
-                + "DELETE FROM acl_object_identity WHERE ID = 2;" + "DELETE FROM acl_object_identity WHERE ID = 1;"
-                + "DELETE FROM acl_class;" + "DELETE FROM acl_sid;";
-        jdbcTemplate.execute(query);
-    }
+	@After
+	public void emptyDatabase() {
+		String query = "DELETE FROM acl_entry;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 7;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 6;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 5;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 4;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 3;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 2;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 1;"
+				+ "DELETE FROM acl_class;" + "DELETE FROM acl_sid;";
+		jdbcTemplate.execute(query);
+	}
 
-    private Ehcache getCache() {
-        Ehcache cache = cacheManager.getCache("basiclookuptestcache");
-        cache.removeAll();
-        return cache;
-    }
+	private Ehcache getCache() {
+		Ehcache cache = cacheManager.getCache("basiclookuptestcache");
+		cache.removeAll();
+		return cache;
+	}
 
-    @Test
-    public void testAclsRetrievalWithDefaultBatchSize() throws Exception {
-        ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-        ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
-        // Deliberately use an integer for the child, to reproduce bug report in SEC-819
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(102));
+	@Test
+	public void testAclsRetrievalWithDefaultBatchSize() throws Exception {
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(
+				101));
+		// Deliberately use an integer for the child, to reproduce bug report in SEC-819
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(102));
 
-        Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
-        checkEntries(topParentOid, middleParentOid, childOid, map);
-    }
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		checkEntries(topParentOid, middleParentOid, childOid, map);
+	}
 
-    @Test
-    public void testAclsRetrievalFromCacheOnly() throws Exception {
-        ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(100));
-        ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
+	@Test
+	public void testAclsRetrievalFromCacheOnly() throws Exception {
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(
+				101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
-        // Objects were put in cache
-        strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		// Objects were put in cache
+		strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid),
+				null);
 
-        // Let's empty the database to force acls retrieval from cache
-        emptyDatabase();
-        Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		// Let's empty the database to force acls retrieval from cache
+		emptyDatabase();
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
 
-        checkEntries(topParentOid, middleParentOid, childOid, map);
-    }
+		checkEntries(topParentOid, middleParentOid, childOid, map);
+	}
 
-    @Test
-    public void testAclsRetrievalWithCustomBatchSize() throws Exception {
-        ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-        ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
+	@Test
+	public void testAclsRetrievalWithCustomBatchSize() throws Exception {
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
-        // Set a batch size to allow multiple database queries in order to retrieve all acls
-        this.strategy.setBatchSize(1);
-        Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
-        checkEntries(topParentOid, middleParentOid, childOid, map);
-    }
+		// Set a batch size to allow multiple database queries in order to retrieve all
+		// acls
+		this.strategy.setBatchSize(1);
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		checkEntries(topParentOid, middleParentOid, childOid, map);
+	}
 
-    private void checkEntries(ObjectIdentity topParentOid, ObjectIdentity middleParentOid, ObjectIdentity childOid,
-            Map<ObjectIdentity, Acl> map) throws Exception {
-        Assert.assertEquals(3, map.size());
+	private void checkEntries(ObjectIdentity topParentOid,
+			ObjectIdentity middleParentOid, ObjectIdentity childOid,
+			Map<ObjectIdentity, Acl> map) throws Exception {
+		Assert.assertEquals(3, map.size());
 
-        MutableAcl topParent = (MutableAcl) map.get(topParentOid);
-        MutableAcl middleParent = (MutableAcl) map.get(middleParentOid);
-        MutableAcl child = (MutableAcl) map.get(childOid);
+		MutableAcl topParent = (MutableAcl) map.get(topParentOid);
+		MutableAcl middleParent = (MutableAcl) map.get(middleParentOid);
+		MutableAcl child = (MutableAcl) map.get(childOid);
 
-        // Check the retrieved versions has IDs
-        Assert.assertNotNull(topParent.getId());
-        Assert.assertNotNull(middleParent.getId());
-        Assert.assertNotNull(child.getId());
+		// Check the retrieved versions has IDs
+		Assert.assertNotNull(topParent.getId());
+		Assert.assertNotNull(middleParent.getId());
+		Assert.assertNotNull(child.getId());
 
-        // Check their parents were correctly retrieved
-        Assert.assertNull(topParent.getParentAcl());
-        Assert.assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
-        Assert.assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
+		// Check their parents were correctly retrieved
+		Assert.assertNull(topParent.getParentAcl());
+		Assert.assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
+		Assert.assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
 
-        // Check their ACEs were correctly retrieved
-        Assert.assertEquals(2, topParent.getEntries().size());
-        Assert.assertEquals(1, middleParent.getEntries().size());
-        Assert.assertEquals(1, child.getEntries().size());
+		// Check their ACEs were correctly retrieved
+		Assert.assertEquals(2, topParent.getEntries().size());
+		Assert.assertEquals(1, middleParent.getEntries().size());
+		Assert.assertEquals(1, child.getEntries().size());
 
-        // Check object identities were correctly retrieved
-        Assert.assertEquals(topParentOid, topParent.getObjectIdentity());
-        Assert.assertEquals(middleParentOid, middleParent.getObjectIdentity());
-        Assert.assertEquals(childOid, child.getObjectIdentity());
+		// Check object identities were correctly retrieved
+		Assert.assertEquals(topParentOid, topParent.getObjectIdentity());
+		Assert.assertEquals(middleParentOid, middleParent.getObjectIdentity());
+		Assert.assertEquals(childOid, child.getObjectIdentity());
 
-        // Check each entry
-        Assert.assertTrue(topParent.isEntriesInheriting());
-        Assert.assertEquals(topParent.getId(), Long.valueOf(1));
-        Assert.assertEquals(topParent.getOwner(), new PrincipalSid("ben"));
-        Assert.assertEquals(topParent.getEntries().get(0).getId(), Long.valueOf(1));
-        Assert.assertEquals(topParent.getEntries().get(0).getPermission(), BasePermission.READ);
-        Assert.assertEquals(topParent.getEntries().get(0).getSid(), new PrincipalSid("ben"));
-        Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditFailure());
-        Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditSuccess());
-        Assert.assertTrue((topParent.getEntries().get(0)).isGranting());
+		// Check each entry
+		Assert.assertTrue(topParent.isEntriesInheriting());
+		Assert.assertEquals(topParent.getId(), Long.valueOf(1));
+		Assert.assertEquals(topParent.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(topParent.getEntries().get(0).getId(), Long.valueOf(1));
+		Assert.assertEquals(topParent.getEntries().get(0).getPermission(),
+				BasePermission.READ);
+		Assert.assertEquals(topParent.getEntries().get(0).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0))
+				.isAuditSuccess());
+		Assert.assertTrue((topParent.getEntries().get(0)).isGranting());
 
-        Assert.assertEquals(topParent.getEntries().get(1).getId(), Long.valueOf(2));
-        Assert.assertEquals(topParent.getEntries().get(1).getPermission(), BasePermission.WRITE);
-        Assert.assertEquals(topParent.getEntries().get(1).getSid(), new PrincipalSid("ben"));
-        Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditFailure());
-        Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditSuccess());
-        Assert.assertFalse(topParent.getEntries().get(1).isGranting());
+		Assert.assertEquals(topParent.getEntries().get(1).getId(), Long.valueOf(2));
+		Assert.assertEquals(topParent.getEntries().get(1).getPermission(),
+				BasePermission.WRITE);
+		Assert.assertEquals(topParent.getEntries().get(1).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1))
+				.isAuditSuccess());
+		Assert.assertFalse(topParent.getEntries().get(1).isGranting());
 
-        Assert.assertTrue(middleParent.isEntriesInheriting());
-        Assert.assertEquals(middleParent.getId(), Long.valueOf(2));
-        Assert.assertEquals(middleParent.getOwner(), new PrincipalSid("ben"));
-        Assert.assertEquals(middleParent.getEntries().get(0).getId(), Long.valueOf(3));
-        Assert.assertEquals(middleParent.getEntries().get(0).getPermission(), BasePermission.DELETE);
-        Assert.assertEquals(middleParent.getEntries().get(0).getSid(), new PrincipalSid("ben"));
-        Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditFailure());
-        Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditSuccess());
-        Assert.assertTrue(middleParent.getEntries().get(0).isGranting());
+		Assert.assertTrue(middleParent.isEntriesInheriting());
+		Assert.assertEquals(middleParent.getId(), Long.valueOf(2));
+		Assert.assertEquals(middleParent.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(middleParent.getEntries().get(0).getId(), Long.valueOf(3));
+		Assert.assertEquals(middleParent.getEntries().get(0).getPermission(),
+				BasePermission.DELETE);
+		Assert.assertEquals(middleParent.getEntries().get(0).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries()
+				.get(0)).isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries()
+				.get(0)).isAuditSuccess());
+		Assert.assertTrue(middleParent.getEntries().get(0).isGranting());
 
-        Assert.assertTrue(child.isEntriesInheriting());
-        Assert.assertEquals(child.getId(), Long.valueOf(3));
-        Assert.assertEquals(child.getOwner(), new PrincipalSid("ben"));
-        Assert.assertEquals(child.getEntries().get(0).getId(), Long.valueOf(4));
-        Assert.assertEquals(child.getEntries().get(0).getPermission(), BasePermission.DELETE);
-        Assert.assertEquals(child.getEntries().get(0).getSid(), new PrincipalSid("ben"));
-        Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditFailure());
-        Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditSuccess());
-        Assert.assertFalse((child.getEntries().get(0)).isGranting());
-    }
+		Assert.assertTrue(child.isEntriesInheriting());
+		Assert.assertEquals(child.getId(), Long.valueOf(3));
+		Assert.assertEquals(child.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(child.getEntries().get(0).getId(), Long.valueOf(4));
+		Assert.assertEquals(child.getEntries().get(0).getPermission(),
+				BasePermission.DELETE);
+		Assert.assertEquals(child.getEntries().get(0).getSid(), new PrincipalSid("ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0))
+				.isAuditSuccess());
+		Assert.assertFalse((child.getEntries().get(0)).isGranting());
+	}
 
-    @Test
-    public void testAllParentsAreRetrievedWhenChildIsLoaded() throws Exception {
-        String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,103,1,1,1);";
-        jdbcTemplate.execute(query);
+	@Test
+	public void testAllParentsAreRetrievedWhenChildIsLoaded() throws Exception {
+		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,103,1,1,1);";
+		jdbcTemplate.execute(query);
 
-        ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-        ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102));
-        ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(103));
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(101));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102));
+		ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(103));
 
-        // Retrieve the child
-        Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(childOid), null);
+		// Retrieve the child
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(childOid), null);
 
-        // Check that the child and all its parents were retrieved
-        Assert.assertNotNull(map.get(childOid));
-        Assert.assertEquals(childOid, map.get(childOid).getObjectIdentity());
-        Assert.assertNotNull(map.get(middleParentOid));
-        Assert.assertEquals(middleParentOid, map.get(middleParentOid).getObjectIdentity());
-        Assert.assertNotNull(map.get(topParentOid));
-        Assert.assertEquals(topParentOid, map.get(topParentOid).getObjectIdentity());
+		// Check that the child and all its parents were retrieved
+		Assert.assertNotNull(map.get(childOid));
+		Assert.assertEquals(childOid, map.get(childOid).getObjectIdentity());
+		Assert.assertNotNull(map.get(middleParentOid));
+		Assert.assertEquals(middleParentOid, map.get(middleParentOid).getObjectIdentity());
+		Assert.assertNotNull(map.get(topParentOid));
+		Assert.assertEquals(topParentOid, map.get(topParentOid).getObjectIdentity());
 
-        // The second parent shouldn't have been retrieved
-        Assert.assertNull(map.get(middleParent2Oid));
-    }
+		// The second parent shouldn't have been retrieved
+		Assert.assertNull(map.get(middleParent2Oid));
+	}
 
-    /**
-     * Test created from SEC-590.
-     */
-    @Test
-    public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() throws Exception {
-        String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,1,1);"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (5,2,105,4,1,1);"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,106,4,1,1);"
-                + "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (7,2,107,5,1,1);"
-                + "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (5,4,0,1,1,1,0,0)";
-        jdbcTemplate.execute(query);
+	/**
+	 * Test created from SEC-590.
+	 */
+	@Test
+	public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached()
+			throws Exception {
+		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,1,1);"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (5,2,105,4,1,1);"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,106,4,1,1);"
+				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (7,2,107,5,1,1);"
+				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (5,4,0,1,1,1,0,0)";
+		jdbcTemplate.execute(query);
 
-        ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
-        ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(105));
-        ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(106));
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(107));
+		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				new Long(104));
+		ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(105));
+		ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(106));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(107));
 
-        // First lookup only child, thus populating the cache with grandParent, parent1 and child
-        List<Permission> checkPermission = Arrays.asList(BasePermission.READ);
-        List<Sid> sids = Arrays.asList(BEN_SID);
-        List<ObjectIdentity> childOids = Arrays.asList(childOid);
+		// First lookup only child, thus populating the cache with grandParent, parent1
+		// and child
+		List<Permission> checkPermission = Arrays.asList(BasePermission.READ);
+		List<Sid> sids = Arrays.asList(BEN_SID);
+		List<ObjectIdentity> childOids = Arrays.asList(childOid);
 
-        strategy.setBatchSize(6);
-        Map<ObjectIdentity, Acl> foundAcls = strategy.readAclsById(childOids, sids);
+		strategy.setBatchSize(6);
+		Map<ObjectIdentity, Acl> foundAcls = strategy.readAclsById(childOids, sids);
 
-        Acl foundChildAcl = foundAcls.get(childOid);
-        Assert.assertNotNull(foundChildAcl);
-        Assert.assertTrue(foundChildAcl.isGranted(checkPermission, sids, false));
+		Acl foundChildAcl = foundAcls.get(childOid);
+		Assert.assertNotNull(foundChildAcl);
+		Assert.assertTrue(foundChildAcl.isGranted(checkPermission, sids, false));
 
-        // Search for object identities has to be done in the following order: last element have to be one which
-        // is already in cache and the element before it must not be stored in cache
-        List<ObjectIdentity> allOids = Arrays.asList(grandParentOid, parent1Oid, parent2Oid, childOid);
-        try {
-            foundAcls = strategy.readAclsById(allOids, sids);
-            Assert.assertTrue(true);
-        } catch (NotFoundException notExpected) {
-            Assert.fail("It shouldn't have thrown NotFoundException");
-        }
+		// Search for object identities has to be done in the following order: last
+		// element have to be one which
+		// is already in cache and the element before it must not be stored in cache
+		List<ObjectIdentity> allOids = Arrays.asList(grandParentOid, parent1Oid,
+				parent2Oid, childOid);
+		try {
+			foundAcls = strategy.readAclsById(allOids, sids);
+			Assert.assertTrue(true);
+		}
+		catch (NotFoundException notExpected) {
+			Assert.fail("It shouldn't have thrown NotFoundException");
+		}
 
-        Acl foundParent2Acl = foundAcls.get(parent2Oid);
-        Assert.assertNotNull(foundParent2Acl);
-        Assert.assertTrue(foundParent2Acl.isGranted(checkPermission, sids, false));
-    }
+		Acl foundParent2Acl = foundAcls.get(parent2Oid);
+		Assert.assertNotNull(foundParent2Acl);
+		Assert.assertTrue(foundParent2Acl.isGranted(checkPermission, sids, false));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void nullOwnerIsNotSupported() {
-        String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,null,1);";
+	@Test(expected = IllegalArgumentException.class)
+	public void nullOwnerIsNotSupported() {
+		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,null,1);";
 
-        jdbcTemplate.execute(query);
+		jdbcTemplate.execute(query);
 
-        ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
+		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
 
-        strategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID));
-    }
+		strategy.readAclsById(Arrays.asList(oid), Arrays.asList(BEN_SID));
+	}
 
-    @Test
-    public void testCreatePrincipalSid() {
-        Sid result = strategy.createSid(true, "sid");
+	@Test
+	public void testCreatePrincipalSid() {
+		Sid result = strategy.createSid(true, "sid");
 
-        Assert.assertEquals(PrincipalSid.class, result.getClass());
-        Assert.assertEquals("sid", ((PrincipalSid)result).getPrincipal());
-    }
+		Assert.assertEquals(PrincipalSid.class, result.getClass());
+		Assert.assertEquals("sid", ((PrincipalSid) result).getPrincipal());
+	}
 
-    @Test
-    public void testCreateGrantedAuthority() {
-        Sid result = strategy.createSid(false, "sid");
+	@Test
+	public void testCreateGrantedAuthority() {
+		Sid result = strategy.createSid(false, "sid");
 
-        Assert.assertEquals(GrantedAuthoritySid.class, result.getClass());
-        Assert.assertEquals("sid", ((GrantedAuthoritySid)result).getGrantedAuthority());
-    }
+		Assert.assertEquals(GrantedAuthoritySid.class, result.getClass());
+		Assert.assertEquals("sid", ((GrantedAuthoritySid) result).getGrantedAuthority());
+	}
 
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
index 058aee7be9..41f9958b46 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java
@@ -25,21 +25,21 @@ import java.io.IOException;
 
 import javax.sql.DataSource;
 
-
 /**
  * Seeds the database for {@link JdbcMutableAclServiceTests}.
  *
  * @author Ben Alex
  */
 public class DatabaseSeeder {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public DatabaseSeeder(DataSource dataSource, Resource resource) throws IOException {
-        Assert.notNull(dataSource, "dataSource required");
-        Assert.notNull(resource, "resource required");
+	public DatabaseSeeder(DataSource dataSource, Resource resource) throws IOException {
+		Assert.notNull(dataSource, "dataSource required");
+		Assert.notNull(resource, "resource required");
 
-        JdbcTemplate template = new JdbcTemplate(dataSource);
-        String sql = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
-        template.execute(sql);
-    }
+		JdbcTemplate template = new JdbcTemplate(dataSource);
+		String sql = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
+		template.execute(sql);
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
index 4fe908b61a..baf3d9e99e 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java
@@ -48,223 +48,239 @@ import org.springframework.util.ReflectionUtils;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class EhCacheBasedAclCacheTests {
-    private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
+	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
 
-    @Mock
-    private Ehcache cache;
-    @Captor
-    private ArgumentCaptor<Element> element;
+	@Mock
+	private Ehcache cache;
+	@Captor
+	private ArgumentCaptor<Element> element;
 
-    private EhCacheBasedAclCache myCache;
+	private EhCacheBasedAclCache myCache;
 
-    private MutableAcl acl;
+	private MutableAcl acl;
 
-    @Before
-    public void setup() {
-        myCache = new EhCacheBasedAclCache(cache, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
+	@Before
+	public void setup() {
+		myCache = new EhCacheBasedAclCache(cache, new DefaultPermissionGrantingStrategy(
+				new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_USER")));
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
 
-        acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy, new ConsoleAuditLogger());
-    }
+		acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
+				new ConsoleAuditLogger());
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorRejectsNullParameters() throws Exception {
-        new EhCacheBasedAclCache(null, new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(new SimpleGrantedAuthority("ROLE_USER")));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorRejectsNullParameters() throws Exception {
+		new EhCacheBasedAclCache(null, new DefaultPermissionGrantingStrategy(
+				new ConsoleAuditLogger()), new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_USER")));
+	}
 
-    @Test
-    public void methodsRejectNullParameters() throws Exception {
-        try {
-            Serializable id = null;
-            myCache.evictFromCache(id);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+	@Test
+	public void methodsRejectNullParameters() throws Exception {
+		try {
+			Serializable id = null;
+			myCache.evictFromCache(id);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            ObjectIdentity obj = null;
-            myCache.evictFromCache(obj);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			ObjectIdentity obj = null;
+			myCache.evictFromCache(obj);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            Serializable id = null;
-            myCache.getFromCache(id);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			Serializable id = null;
+			myCache.getFromCache(id);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            ObjectIdentity obj = null;
-            myCache.getFromCache(obj);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			ObjectIdentity obj = null;
+			myCache.getFromCache(obj);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            MutableAcl acl = null;
-            myCache.putInCache(acl);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			MutableAcl acl = null;
+			myCache.putInCache(acl);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    // SEC-527
-    @Test
-    public void testDiskSerializationOfMutableAclObjectInstance() throws Exception {
-        // Serialization test
-        File file = File.createTempFile("SEC_TEST", ".object");
-        FileOutputStream fos = new FileOutputStream(file);
-        ObjectOutputStream oos = new ObjectOutputStream(fos);
-        oos.writeObject(acl);
-        oos.close();
+	// SEC-527
+	@Test
+	public void testDiskSerializationOfMutableAclObjectInstance() throws Exception {
+		// Serialization test
+		File file = File.createTempFile("SEC_TEST", ".object");
+		FileOutputStream fos = new FileOutputStream(file);
+		ObjectOutputStream oos = new ObjectOutputStream(fos);
+		oos.writeObject(acl);
+		oos.close();
 
-        FileInputStream fis = new FileInputStream(file);
-        ObjectInputStream ois = new ObjectInputStream(fis);
-        MutableAcl retrieved = (MutableAcl) ois.readObject();
-        ois.close();
+		FileInputStream fis = new FileInputStream(file);
+		ObjectInputStream ois = new ObjectInputStream(fis);
+		MutableAcl retrieved = (MutableAcl) ois.readObject();
+		ois.close();
 
-        assertEquals(acl, retrieved);
+		assertEquals(acl, retrieved);
 
-        Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy", retrieved);
-        assertEquals(null, retrieved1);
+		Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy",
+				retrieved);
+		assertEquals(null, retrieved1);
 
-        Object retrieved2 = FieldUtils.getProtectedFieldValue("permissionGrantingStrategy", retrieved);
-        assertEquals(null, retrieved2);
-    }
+		Object retrieved2 = FieldUtils.getProtectedFieldValue(
+				"permissionGrantingStrategy", retrieved);
+		assertEquals(null, retrieved2);
+	}
 
-    @Test
-    public void clearCache() throws Exception {
-        myCache.clearCache();
+	@Test
+	public void clearCache() throws Exception {
+		myCache.clearCache();
 
-        verify(cache).removeAll();
-    }
+		verify(cache).removeAll();
+	}
 
-    @Test
-    public void putInCache() throws Exception {
-        myCache.putInCache(acl);
+	@Test
+	public void putInCache() throws Exception {
+		myCache.putInCache(acl);
 
-        verify(cache, times(2)).put(element.capture());
-        assertThat(element.getValue().getKey()).isEqualTo(acl.getId());
-        assertThat(element.getValue().getObjectValue()).isEqualTo(acl);
-        assertThat(element.getAllValues().get(0).getKey()).isEqualTo(acl.getObjectIdentity());
-        assertThat(element.getAllValues().get(0).getObjectValue()).isEqualTo(acl);
-    }
+		verify(cache, times(2)).put(element.capture());
+		assertThat(element.getValue().getKey()).isEqualTo(acl.getId());
+		assertThat(element.getValue().getObjectValue()).isEqualTo(acl);
+		assertThat(element.getAllValues().get(0).getKey()).isEqualTo(
+				acl.getObjectIdentity());
+		assertThat(element.getAllValues().get(0).getObjectValue()).isEqualTo(acl);
+	}
 
-    @Test
-    public void putInCacheAclWithParent() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void putInCacheAclWithParent() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(2));
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
-        MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2), aclAuthorizationStrategy, new ConsoleAuditLogger());
-        acl.setParent(parentAcl);
+		ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(2));
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
+		MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2),
+				aclAuthorizationStrategy, new ConsoleAuditLogger());
+		acl.setParent(parentAcl);
 
-        myCache.putInCache(acl);
+		myCache.putInCache(acl);
 
-        verify(cache, times(4)).put(element.capture());
+		verify(cache, times(4)).put(element.capture());
 
-        List<Element> allValues = element.getAllValues();
+		List<Element> allValues = element.getAllValues();
 
-        assertThat(allValues.get(0).getKey()).isEqualTo(parentAcl.getObjectIdentity());
-        assertThat(allValues.get(0).getObjectValue()).isEqualTo(parentAcl);
+		assertThat(allValues.get(0).getKey()).isEqualTo(parentAcl.getObjectIdentity());
+		assertThat(allValues.get(0).getObjectValue()).isEqualTo(parentAcl);
 
-        assertThat(allValues.get(1).getKey()).isEqualTo(parentAcl.getId());
-        assertThat(allValues.get(1).getObjectValue()).isEqualTo(parentAcl);
+		assertThat(allValues.get(1).getKey()).isEqualTo(parentAcl.getId());
+		assertThat(allValues.get(1).getObjectValue()).isEqualTo(parentAcl);
 
+		assertThat(allValues.get(2).getKey()).isEqualTo(acl.getObjectIdentity());
+		assertThat(allValues.get(2).getObjectValue()).isEqualTo(acl);
 
-        assertThat(allValues.get(2).getKey()).isEqualTo(acl.getObjectIdentity());
-        assertThat(allValues.get(2).getObjectValue()).isEqualTo(acl);
+		assertThat(allValues.get(3).getKey()).isEqualTo(acl.getId());
+		assertThat(allValues.get(3).getObjectValue()).isEqualTo(acl);
+	}
 
-        assertThat(allValues.get(3).getKey()).isEqualTo(acl.getId());
-        assertThat(allValues.get(3).getObjectValue()).isEqualTo(acl);
-    }
+	@Test
+	public void getFromCacheSerializable() throws Exception {
+		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void getFromCacheSerializable() throws Exception {
-        when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(),acl));
+		assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
+	}
 
-        assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
-    }
+	@Test
+	public void getFromCacheSerializablePopulatesTransient() throws Exception {
+		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void getFromCacheSerializablePopulatesTransient() throws Exception {
-        when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(),acl));
+		myCache.putInCache(acl);
 
-        myCache.putInCache(acl);
+		ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null);
+		ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null);
 
-        ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null);
-        ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null);
+		MutableAcl fromCache = myCache.getFromCache(acl.getId());
 
-        MutableAcl fromCache = myCache.getFromCache(acl.getId());
+		assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy"))
+				.isNotNull();
+		assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy"))
+				.isNotNull();
+	}
 
-        assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy")).isNotNull();
-        assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy")).isNotNull();
-    }
+	@Test
+	public void getFromCacheObjectIdentity() throws Exception {
+		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void getFromCacheObjectIdentity() throws Exception {
-        when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(),acl));
+		assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
+	}
 
-        assertThat(myCache.getFromCache(acl.getId())).isEqualTo(acl);
-    }
+	@Test
+	public void getFromCacheObjectIdentityPopulatesTransient() throws Exception {
+		when(cache.get(acl.getObjectIdentity()))
+				.thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void getFromCacheObjectIdentityPopulatesTransient() throws Exception {
-        when(cache.get(acl.getObjectIdentity())).thenReturn(new Element(acl.getId(),acl));
+		myCache.putInCache(acl);
 
-        myCache.putInCache(acl);
+		ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null);
+		ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null);
 
-        ReflectionTestUtils.setField(acl, "permissionGrantingStrategy", null);
-        ReflectionTestUtils.setField(acl, "aclAuthorizationStrategy", null);
+		MutableAcl fromCache = myCache.getFromCache(acl.getObjectIdentity());
 
-        MutableAcl fromCache = myCache.getFromCache(acl.getObjectIdentity());
+		assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy"))
+				.isNotNull();
+		assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy"))
+				.isNotNull();
+	}
 
-        assertThat(ReflectionTestUtils.getField(fromCache, "aclAuthorizationStrategy")).isNotNull();
-        assertThat(ReflectionTestUtils.getField(fromCache, "permissionGrantingStrategy")).isNotNull();
-    }
+	@Test
+	public void evictCacheSerializable() throws Exception {
+		when(cache.get(acl.getObjectIdentity()))
+				.thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void evictCacheSerializable() throws Exception {
-        when(cache.get(acl.getObjectIdentity())).thenReturn(new Element(acl.getId(),acl));
+		myCache.evictFromCache(acl.getObjectIdentity());
 
-        myCache.evictFromCache(acl.getObjectIdentity());
+		verify(cache).remove(acl.getId());
+		verify(cache).remove(acl.getObjectIdentity());
+	}
 
-        verify(cache).remove(acl.getId());
-        verify(cache).remove(acl.getObjectIdentity());
-    }
+	@Test
+	public void evictCacheObjectIdentity() throws Exception {
+		when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(), acl));
 
-    @Test
-    public void evictCacheObjectIdentity() throws Exception {
-        when(cache.get(acl.getId())).thenReturn(new Element(acl.getId(),acl));
+		myCache.evictFromCache(acl.getId());
 
-        myCache.evictFromCache(acl.getId());
-
-        verify(cache).remove(acl.getId());
-        verify(cache).remove(acl.getObjectIdentity());
-    }
+		verify(cache).remove(acl.getId());
+		verify(cache).remove(acl.getObjectIdentity());
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
index afa5f011a9..f7cd040a56 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java
@@ -24,27 +24,29 @@ import org.springframework.security.acls.model.Sid;
 
 @RunWith(MockitoJUnitRunner.class)
 public class JdbcAclServiceTests {
-    @Mock
-    private DataSource dataSource;
+	@Mock
+	private DataSource dataSource;
 
-    @Mock
-    private LookupStrategy lookupStrategy;
+	@Mock
+	private LookupStrategy lookupStrategy;
 
-    private JdbcAclService aclService;
+	private JdbcAclService aclService;
 
-    @Before
-    public void setUp() {
-        aclService = new JdbcAclService(dataSource, lookupStrategy);
-    }
+	@Before
+	public void setUp() {
+		aclService = new JdbcAclService(dataSource, lookupStrategy);
+	}
 
-    // SEC-1898
-    @Test(expected = NotFoundException.class)
-    public void readAclByIdMissingAcl() {
-        Map<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>();
-        when(lookupStrategy.readAclsById(anyListOf(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(result);
-        ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 1);
-        List<Sid> sids = Arrays.<Sid> asList(new PrincipalSid("user"));
+	// SEC-1898
+	@Test(expected = NotFoundException.class)
+	public void readAclByIdMissingAcl() {
+		Map<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>();
+		when(
+				lookupStrategy.readAclsById(anyListOf(ObjectIdentity.class),
+						anyListOf(Sid.class))).thenReturn(result);
+		ObjectIdentity objectIdentity = new ObjectIdentityImpl(Object.class, 1);
+		List<Sid> sids = Arrays.<Sid> asList(new PrincipalSid("user"));
 
-        aclService.readAclById(objectIdentity, sids);
-    }
+		aclService.readAclById(objectIdentity, sids);
+	}
 }
\ No newline at end of file
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java
index 16348f3ac3..09d80760b5 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java
@@ -60,474 +60,518 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Ben Alex
  * @author Andrei Stefan
  */
-@ContextConfiguration(locations={"/jdbcMutableAclServiceTests-context.xml"})
-public class JdbcMutableAclServiceTests extends AbstractTransactionalJUnit4SpringContextTests {
-    //~ Constant fields ================================================================================================
-
-    private static final String TARGET_CLASS = TargetObject.class.getName();
-
-    private final Authentication auth = new TestingAuthenticationToken("ben", "ignored","ROLE_ADMINISTRATOR");
-
-    public static final String SELECT_ALL_CLASSES = "SELECT * FROM acl_class WHERE class = ?";
-
-    //~ Instance fields ================================================================================================
-
-    private final ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-    private final ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
-    private final ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102));
-
-    @Autowired
-    private JdbcMutableAclService jdbcMutableAclService;
-    @Autowired
-    private AclCache aclCache;
-    @Autowired
-    private LookupStrategy lookupStrategy;
-    @Autowired
-    private DataSource dataSource;
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    //~ Methods ========================================================================================================
-
-    @BeforeTransaction
-    public void createTables() throws Exception {
-        try {
-            new DatabaseSeeder(dataSource, new ClassPathResource("createAclSchema.sql"));
-//            new DatabaseSeeder(dataSource, new ClassPathResource("createAclSchemaPostgres.sql"));
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        }
-    }
-
-    @AfterTransaction
-    public void clearContextAndData() throws Exception {
-        SecurityContextHolder.clearContext();
-        jdbcTemplate.execute("drop table acl_entry");
-        jdbcTemplate.execute("drop table acl_object_identity");
-        jdbcTemplate.execute("drop table acl_class");
-        jdbcTemplate.execute("drop table acl_sid");
-        aclCache.clearCache();
-    }
-
-    @Test
-    @Transactional
-    public void testLifecycle() {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
-        MutableAcl middleParent = jdbcMutableAclService.createAcl(middleParentOid);
-        MutableAcl child = jdbcMutableAclService.createAcl(childOid);
-
-        // Specify the inheritance hierarchy
-        middleParent.setParent(topParent);
-        child.setParent(middleParent);
-
-        // Now let's add a couple of permissions
-        topParent.insertAce(0, BasePermission.READ, new PrincipalSid(auth), true);
-        topParent.insertAce(1, BasePermission.WRITE, new PrincipalSid(auth), false);
-        middleParent.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), true);
-        child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false);
-
-        // Explicitly save the changed ACL
-        jdbcMutableAclService.updateAcl(topParent);
-        jdbcMutableAclService.updateAcl(middleParent);
-        jdbcMutableAclService.updateAcl(child);
-
-        // Let's check if we can read them back correctly
-        Map<ObjectIdentity, Acl> map = jdbcMutableAclService.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid));
-        assertEquals(3, map.size());
-
-        // Replace our current objects with their retrieved versions
-        topParent = (MutableAcl) map.get(topParentOid);
-        middleParent = (MutableAcl) map.get(middleParentOid);
-        child = (MutableAcl) map.get(childOid);
-
-        // Check the retrieved versions has IDs
-        assertNotNull(topParent.getId());
-        assertNotNull(middleParent.getId());
-        assertNotNull(child.getId());
-
-        // Check their parents were correctly persisted
-        assertNull(topParent.getParentAcl());
-        assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
-        assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
-
-        // Check their ACEs were correctly persisted
-        assertEquals(2, topParent.getEntries().size());
-        assertEquals(1, middleParent.getEntries().size());
-        assertEquals(1, child.getEntries().size());
-
-        // Check the retrieved rights are correct
-        List<Permission> read = Arrays.asList(BasePermission.READ);
-        List<Permission> write = Arrays.asList(BasePermission.WRITE);
-        List<Permission> delete = Arrays.asList(BasePermission.DELETE);
-        List<Sid> pSid = Arrays.asList((Sid)new PrincipalSid(auth));
-
-
-        assertTrue(topParent.isGranted(read, pSid, false));
-        assertFalse(topParent.isGranted(write, pSid, false));
-        assertTrue(middleParent.isGranted(delete, pSid, false));
-        assertFalse(child.isGranted(delete, pSid, false));
-
-        try {
-            child.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), pSid, false);
-            fail("Should have thrown NotFoundException");
-        } catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-
-        // Now check the inherited rights (when not explicitly overridden) also look OK
-        assertTrue(child.isGranted(read, pSid, false));
-        assertFalse(child.isGranted(write, pSid, false));
-        assertFalse(child.isGranted(delete, pSid, false));
-
-        // Next change the child so it doesn't inherit permissions from above
-        child.setEntriesInheriting(false);
-        jdbcMutableAclService.updateAcl(child);
-        child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
-        assertFalse(child.isEntriesInheriting());
-
-        // Check the child permissions no longer inherit
-        assertFalse(child.isGranted(delete, pSid, true));
-
-        try {
-            child.isGranted(read, pSid, true);
-            fail("Should have thrown NotFoundException");
-        } catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-
-        try {
-            child.isGranted(write, pSid, true);
-            fail("Should have thrown NotFoundException");
-        } catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-
-        // Let's add an identical permission to the child, but it'll appear AFTER the current permission, so has no impact
-        child.insertAce(1, BasePermission.DELETE, new PrincipalSid(auth), true);
-
-        // Let's also add another permission to the child
-        child.insertAce(2, BasePermission.CREATE, new PrincipalSid(auth), true);
-
-        // Save the changed child
-        jdbcMutableAclService.updateAcl(child);
-        child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
-        assertEquals(3, child.getEntries().size());
-
-        // Output permissions
-        for (int i = 0; i < child.getEntries().size(); i++) {
-            System.out.println(child.getEntries().get(i));
-        }
-
-        // Check the permissions are as they should be
-        assertFalse(child.isGranted(delete, pSid, true)); // as earlier permission overrode
-        assertTrue(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true));
-
-        // Now check the first ACE (index 0) really is DELETE for our Sid and is non-granting
-        AccessControlEntry entry = child.getEntries().get(0);
-        assertEquals(BasePermission.DELETE.getMask(), entry.getPermission().getMask());
-        assertEquals(new PrincipalSid(auth), entry.getSid());
-        assertFalse(entry.isGranting());
-        assertNotNull(entry.getId());
-
-        // Now delete that first ACE
-        child.deleteAce(0);
-
-        // Save and check it worked
-        child = jdbcMutableAclService.updateAcl(child);
-        assertEquals(2, child.getEntries().size());
-        assertTrue(child.isGranted(delete, pSid, false));
-
-        SecurityContextHolder.clearContext();
-    }
-
-    /**
-     * Test method that demonstrates eviction failure from cache - SEC-676
-     */
-    @Test
-    @Transactional
-    public void deleteAclAlsoDeletesChildren() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        jdbcMutableAclService.createAcl(topParentOid);
-        MutableAcl middleParent = jdbcMutableAclService.createAcl(middleParentOid);
-        MutableAcl child = jdbcMutableAclService.createAcl(childOid);
-        child.setParent(middleParent);
-        jdbcMutableAclService.updateAcl(middleParent);
-        jdbcMutableAclService.updateAcl(child);
-        // Check the childOid really is a child of middleParentOid
-        Acl childAcl = jdbcMutableAclService.readAclById(childOid);
-
-        assertEquals(middleParentOid, childAcl.getParentAcl().getObjectIdentity());
-
-        // Delete the mid-parent and test if the child was deleted, as well
-        jdbcMutableAclService.deleteAcl(middleParentOid, true);
-
-        try {
-            jdbcMutableAclService.readAclById(middleParentOid);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-        try {
-            jdbcMutableAclService.readAclById(childOid);
-            fail("It should have thrown NotFoundException");
-        }
-        catch (NotFoundException expected) {
-            assertTrue(true);
-        }
-
-        Acl acl = jdbcMutableAclService.readAclById(topParentOid);
-        assertNotNull(acl);
-        assertEquals(((MutableAcl) acl).getObjectIdentity(), topParentOid);
-    }
-
-    @Test
-    public void constructorRejectsNullParameters() throws Exception {
-        try {
-            new JdbcMutableAclService(null, lookupStrategy, aclCache);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-
-        try {
-            new JdbcMutableAclService(dataSource, null, aclCache);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-
-        try {
-            new JdbcMutableAclService(dataSource, lookupStrategy, null);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    public void createAclRejectsNullParameter() throws Exception {
-        try {
-            jdbcMutableAclService.createAcl(null);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    @Transactional
-    public void createAclForADuplicateDomainObject() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentity duplicateOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-        jdbcMutableAclService.createAcl(duplicateOid);
-        // Try to add the same object second time
-        try {
-            jdbcMutableAclService.createAcl(duplicateOid);
-            fail("It should have thrown AlreadyExistsException");
-        }
-        catch (AlreadyExistsException expected) {
-        }
-    }
-
-    @Test
-    @Transactional
-    public void deleteAclRejectsNullParameters() throws Exception {
-        try {
-            jdbcMutableAclService.deleteAcl(null, true);
-            fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-        }
-    }
-
-    @Test
-    @Transactional
-    public void deleteAclWithChildrenThrowsException() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        MutableAcl parent = jdbcMutableAclService.createAcl(topParentOid);
-        MutableAcl child = jdbcMutableAclService.createAcl(middleParentOid);
-
-        // Specify the inheritance hierarchy
-        child.setParent(parent);
-        jdbcMutableAclService.updateAcl(child);
-
-        try {
-            jdbcMutableAclService.setForeignKeysInDatabase(false); // switch on FK checking in the class, not database
-            jdbcMutableAclService.deleteAcl(topParentOid, false);
-            fail("It should have thrown ChildrenExistException");
-        }
-        catch (ChildrenExistException expected) {
-        } finally {
-            jdbcMutableAclService.setForeignKeysInDatabase(true); // restore to the default
-        }
-    }
-
-    @Test
-    @Transactional
-    public void deleteAclRemovesRowsFromDatabase() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        MutableAcl child = jdbcMutableAclService.createAcl(childOid);
-        child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false);
-        jdbcMutableAclService.updateAcl(child);
-
-        // Remove the child and check all related database rows were removed accordingly
-        jdbcMutableAclService.deleteAcl(childOid, false);
-        assertEquals(1, jdbcTemplate.queryForList(SELECT_ALL_CLASSES, new Object[] {TARGET_CLASS} ).size());
-        assertEquals(0, jdbcTemplate.queryForList("select * from acl_object_identity").size());
-        assertEquals(0, jdbcTemplate.queryForList("select * from acl_entry").size());
-
-        // Check the cache
-        assertNull(aclCache.getFromCache(childOid));
-        assertNull(aclCache.getFromCache(Long.valueOf(102)));
-    }
-
-    /** SEC-1107 */
-    @Test
-    @Transactional
-    public void identityWithIntegerIdIsSupportedByCreateAcl() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
-        jdbcMutableAclService.createAcl(oid);
-
-        assertNotNull(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101))));
-    }
-
-    /**
-     * SEC-655
-     */
-    @Test
-    @Transactional
-    public void childrenAreClearedFromCacheWhenParentIsUpdated() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("ben", "ignored","ROLE_ADMINISTRATOR");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        ObjectIdentity parentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(104));
-        ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(105));
-
-        MutableAcl parent = jdbcMutableAclService.createAcl(parentOid);
-        MutableAcl child = jdbcMutableAclService.createAcl(childOid);
-
-        child.setParent(parent);
-        jdbcMutableAclService.updateAcl(child);
-
-        parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid);
-        parent.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), true);
-        jdbcMutableAclService.updateAcl(parent);
-
-        parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid);
-        parent.insertAce(1, BasePermission.READ, new PrincipalSid("scott"), true);
-        jdbcMutableAclService.updateAcl(parent);
-
-        child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
-        parent = (MutableAcl) child.getParentAcl();
-
-        assertEquals("Fails because child has a stale reference to its parent", 2, parent.getEntries().size());
-        assertEquals(1, parent.getEntries().get(0).getPermission().getMask());
-        assertEquals(new PrincipalSid("ben"), parent.getEntries().get(0).getSid());
-        assertEquals(1, parent.getEntries().get(1).getPermission().getMask());
-        assertEquals(new PrincipalSid("scott"), parent.getEntries().get(1).getSid());
-    }
-
-    /**
-     * SEC-655
-     */
-    @Test
-    @Transactional
-    public void childrenAreClearedFromCacheWhenParentisUpdated2() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("system", "secret","ROLE_IGNORED");
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        ObjectIdentityImpl rootObject = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(1));
-
-        MutableAcl parent = jdbcMutableAclService.createAcl(rootObject);
-        MutableAcl child = jdbcMutableAclService.createAcl(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(2)));
-        child.setParent(parent);
-        jdbcMutableAclService.updateAcl(child);
-
-        parent.insertAce(0, BasePermission.ADMINISTRATION, new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), true);
-        jdbcMutableAclService.updateAcl(parent);
-
-        parent.insertAce(1, BasePermission.DELETE, new PrincipalSid("terry"), true);
-        jdbcMutableAclService.updateAcl(parent);
-
-        child = (MutableAcl) jdbcMutableAclService.readAclById(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(2)));
-
-        parent = (MutableAcl) child.getParentAcl();
-
-        assertEquals(2, parent.getEntries().size());
-        assertEquals(16, parent.getEntries().get(0).getPermission().getMask());
-        assertEquals(new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), parent.getEntries().get(0).getSid());
-        assertEquals(8, parent.getEntries().get(1).getPermission().getMask());
-        assertEquals(new PrincipalSid("terry"), parent.getEntries().get(1).getSid());
-    }
-
-    @Test
-    @Transactional
-    public void cumulativePermissions() {
-       Authentication auth = new TestingAuthenticationToken("ben", "ignored", "ROLE_ADMINISTRATOR");
-       auth.setAuthenticated(true);
-       SecurityContextHolder.getContext().setAuthentication(auth);
-
-       ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(110));
-       MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
-
-       // Add an ACE permission entry
-       Permission cm = new CumulativePermission().set(BasePermission.READ).set(BasePermission.ADMINISTRATION);
-       assertEquals(17, cm.getMask());
-       Sid benSid = new PrincipalSid(auth);
-       topParent.insertAce(0, cm, benSid, true);
-       assertEquals(1, topParent.getEntries().size());
-
-       // Explicitly save the changed ACL
-       topParent = jdbcMutableAclService.updateAcl(topParent);
-
-       // Check the mask was retrieved correctly
-       assertEquals(17, topParent.getEntries().get(0).getPermission().getMask());
-       assertTrue(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true));
-
-       SecurityContextHolder.clearContext();
-    }
-    @Test
-    public void testProcessingCustomSid() {
-        CustomJdbcMutableAclService customJdbcMutableAclService = spy(new CustomJdbcMutableAclService(dataSource,
-                lookupStrategy, aclCache));
-        CustomSid customSid = new CustomSid("Custom sid");
-        when(customJdbcMutableAclService.createOrRetrieveSidPrimaryKey("Custom sid", false, false)).thenReturn(1L);
-
-        Long result = customJdbcMutableAclService.createOrRetrieveSidPrimaryKey(customSid, false);
-
-        assertEquals(result, new Long(1L));
-    }
-
-    /**
-     * This class needed to show how to extend {@link JdbcMutableAclService} for processing
-     * custom {@link Sid} implementations
-     */
-    private class CustomJdbcMutableAclService extends JdbcMutableAclService {
-
-        private CustomJdbcMutableAclService(DataSource dataSource, LookupStrategy lookupStrategy, AclCache aclCache) {
-            super(dataSource, lookupStrategy, aclCache);
-        }
-
-        @Override
-        protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
-            String sidName;
-            boolean isPrincipal = false;
-            if (sid instanceof CustomSid) {
-                sidName = ((CustomSid)sid).getSid();
-            } else if (sid instanceof GrantedAuthoritySid) {
-                sidName = ((GrantedAuthoritySid)sid).getGrantedAuthority();
-            } else {
-                sidName = ((PrincipalSid)sid).getPrincipal();
-                isPrincipal = true;
-            }
-            return createOrRetrieveSidPrimaryKey(sidName, isPrincipal, allowCreate);
-        }
-    }
+@ContextConfiguration(locations = { "/jdbcMutableAclServiceTests-context.xml" })
+public class JdbcMutableAclServiceTests extends
+		AbstractTransactionalJUnit4SpringContextTests {
+	// ~ Constant fields
+	// ================================================================================================
+
+	private static final String TARGET_CLASS = TargetObject.class.getName();
+
+	private final Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+			"ROLE_ADMINISTRATOR");
+
+	public static final String SELECT_ALL_CLASSES = "SELECT * FROM acl_class WHERE class = ?";
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	private final ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+			Long.valueOf(100));
+	private final ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+			Long.valueOf(101));
+	private final ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
+			Long.valueOf(102));
+
+	@Autowired
+	private JdbcMutableAclService jdbcMutableAclService;
+	@Autowired
+	private AclCache aclCache;
+	@Autowired
+	private LookupStrategy lookupStrategy;
+	@Autowired
+	private DataSource dataSource;
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	@BeforeTransaction
+	public void createTables() throws Exception {
+		try {
+			new DatabaseSeeder(dataSource, new ClassPathResource("createAclSchema.sql"));
+			// new DatabaseSeeder(dataSource, new
+			// ClassPathResource("createAclSchemaPostgres.sql"));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		}
+	}
+
+	@AfterTransaction
+	public void clearContextAndData() throws Exception {
+		SecurityContextHolder.clearContext();
+		jdbcTemplate.execute("drop table acl_entry");
+		jdbcTemplate.execute("drop table acl_object_identity");
+		jdbcTemplate.execute("drop table acl_class");
+		jdbcTemplate.execute("drop table acl_sid");
+		aclCache.clearCache();
+	}
+
+	@Test
+	@Transactional
+	public void testLifecycle() {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
+		MutableAcl middleParent = jdbcMutableAclService.createAcl(middleParentOid);
+		MutableAcl child = jdbcMutableAclService.createAcl(childOid);
+
+		// Specify the inheritance hierarchy
+		middleParent.setParent(topParent);
+		child.setParent(middleParent);
+
+		// Now let's add a couple of permissions
+		topParent.insertAce(0, BasePermission.READ, new PrincipalSid(auth), true);
+		topParent.insertAce(1, BasePermission.WRITE, new PrincipalSid(auth), false);
+		middleParent.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), true);
+		child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false);
+
+		// Explicitly save the changed ACL
+		jdbcMutableAclService.updateAcl(topParent);
+		jdbcMutableAclService.updateAcl(middleParent);
+		jdbcMutableAclService.updateAcl(child);
+
+		// Let's check if we can read them back correctly
+		Map<ObjectIdentity, Acl> map = jdbcMutableAclService.readAclsById(Arrays.asList(
+				topParentOid, middleParentOid, childOid));
+		assertEquals(3, map.size());
+
+		// Replace our current objects with their retrieved versions
+		topParent = (MutableAcl) map.get(topParentOid);
+		middleParent = (MutableAcl) map.get(middleParentOid);
+		child = (MutableAcl) map.get(childOid);
+
+		// Check the retrieved versions has IDs
+		assertNotNull(topParent.getId());
+		assertNotNull(middleParent.getId());
+		assertNotNull(child.getId());
+
+		// Check their parents were correctly persisted
+		assertNull(topParent.getParentAcl());
+		assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
+		assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
+
+		// Check their ACEs were correctly persisted
+		assertEquals(2, topParent.getEntries().size());
+		assertEquals(1, middleParent.getEntries().size());
+		assertEquals(1, child.getEntries().size());
+
+		// Check the retrieved rights are correct
+		List<Permission> read = Arrays.asList(BasePermission.READ);
+		List<Permission> write = Arrays.asList(BasePermission.WRITE);
+		List<Permission> delete = Arrays.asList(BasePermission.DELETE);
+		List<Sid> pSid = Arrays.asList((Sid) new PrincipalSid(auth));
+
+		assertTrue(topParent.isGranted(read, pSid, false));
+		assertFalse(topParent.isGranted(write, pSid, false));
+		assertTrue(middleParent.isGranted(delete, pSid, false));
+		assertFalse(child.isGranted(delete, pSid, false));
+
+		try {
+			child.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), pSid, false);
+			fail("Should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+
+		// Now check the inherited rights (when not explicitly overridden) also look OK
+		assertTrue(child.isGranted(read, pSid, false));
+		assertFalse(child.isGranted(write, pSid, false));
+		assertFalse(child.isGranted(delete, pSid, false));
+
+		// Next change the child so it doesn't inherit permissions from above
+		child.setEntriesInheriting(false);
+		jdbcMutableAclService.updateAcl(child);
+		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
+		assertFalse(child.isEntriesInheriting());
+
+		// Check the child permissions no longer inherit
+		assertFalse(child.isGranted(delete, pSid, true));
+
+		try {
+			child.isGranted(read, pSid, true);
+			fail("Should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+
+		try {
+			child.isGranted(write, pSid, true);
+			fail("Should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+
+		// Let's add an identical permission to the child, but it'll appear AFTER the
+		// current permission, so has no impact
+		child.insertAce(1, BasePermission.DELETE, new PrincipalSid(auth), true);
+
+		// Let's also add another permission to the child
+		child.insertAce(2, BasePermission.CREATE, new PrincipalSid(auth), true);
+
+		// Save the changed child
+		jdbcMutableAclService.updateAcl(child);
+		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
+		assertEquals(3, child.getEntries().size());
+
+		// Output permissions
+		for (int i = 0; i < child.getEntries().size(); i++) {
+			System.out.println(child.getEntries().get(i));
+		}
+
+		// Check the permissions are as they should be
+		assertFalse(child.isGranted(delete, pSid, true)); // as earlier permission
+															// overrode
+		assertTrue(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true));
+
+		// Now check the first ACE (index 0) really is DELETE for our Sid and is
+		// non-granting
+		AccessControlEntry entry = child.getEntries().get(0);
+		assertEquals(BasePermission.DELETE.getMask(), entry.getPermission().getMask());
+		assertEquals(new PrincipalSid(auth), entry.getSid());
+		assertFalse(entry.isGranting());
+		assertNotNull(entry.getId());
+
+		// Now delete that first ACE
+		child.deleteAce(0);
+
+		// Save and check it worked
+		child = jdbcMutableAclService.updateAcl(child);
+		assertEquals(2, child.getEntries().size());
+		assertTrue(child.isGranted(delete, pSid, false));
+
+		SecurityContextHolder.clearContext();
+	}
+
+	/**
+	 * Test method that demonstrates eviction failure from cache - SEC-676
+	 */
+	@Test
+	@Transactional
+	public void deleteAclAlsoDeletesChildren() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		jdbcMutableAclService.createAcl(topParentOid);
+		MutableAcl middleParent = jdbcMutableAclService.createAcl(middleParentOid);
+		MutableAcl child = jdbcMutableAclService.createAcl(childOid);
+		child.setParent(middleParent);
+		jdbcMutableAclService.updateAcl(middleParent);
+		jdbcMutableAclService.updateAcl(child);
+		// Check the childOid really is a child of middleParentOid
+		Acl childAcl = jdbcMutableAclService.readAclById(childOid);
+
+		assertEquals(middleParentOid, childAcl.getParentAcl().getObjectIdentity());
+
+		// Delete the mid-parent and test if the child was deleted, as well
+		jdbcMutableAclService.deleteAcl(middleParentOid, true);
+
+		try {
+			jdbcMutableAclService.readAclById(middleParentOid);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+		try {
+			jdbcMutableAclService.readAclById(childOid);
+			fail("It should have thrown NotFoundException");
+		}
+		catch (NotFoundException expected) {
+			assertTrue(true);
+		}
+
+		Acl acl = jdbcMutableAclService.readAclById(topParentOid);
+		assertNotNull(acl);
+		assertEquals(((MutableAcl) acl).getObjectIdentity(), topParentOid);
+	}
+
+	@Test
+	public void constructorRejectsNullParameters() throws Exception {
+		try {
+			new JdbcMutableAclService(null, lookupStrategy, aclCache);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+
+		try {
+			new JdbcMutableAclService(dataSource, null, aclCache);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+
+		try {
+			new JdbcMutableAclService(dataSource, lookupStrategy, null);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	public void createAclRejectsNullParameter() throws Exception {
+		try {
+			jdbcMutableAclService.createAcl(null);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	@Transactional
+	public void createAclForADuplicateDomainObject() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentity duplicateOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(100));
+		jdbcMutableAclService.createAcl(duplicateOid);
+		// Try to add the same object second time
+		try {
+			jdbcMutableAclService.createAcl(duplicateOid);
+			fail("It should have thrown AlreadyExistsException");
+		}
+		catch (AlreadyExistsException expected) {
+		}
+	}
+
+	@Test
+	@Transactional
+	public void deleteAclRejectsNullParameters() throws Exception {
+		try {
+			jdbcMutableAclService.deleteAcl(null, true);
+			fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
+
+	@Test
+	@Transactional
+	public void deleteAclWithChildrenThrowsException() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		MutableAcl parent = jdbcMutableAclService.createAcl(topParentOid);
+		MutableAcl child = jdbcMutableAclService.createAcl(middleParentOid);
+
+		// Specify the inheritance hierarchy
+		child.setParent(parent);
+		jdbcMutableAclService.updateAcl(child);
+
+		try {
+			jdbcMutableAclService.setForeignKeysInDatabase(false); // switch on FK
+																	// checking in the
+																	// class, not database
+			jdbcMutableAclService.deleteAcl(topParentOid, false);
+			fail("It should have thrown ChildrenExistException");
+		}
+		catch (ChildrenExistException expected) {
+		}
+		finally {
+			jdbcMutableAclService.setForeignKeysInDatabase(true); // restore to the
+																	// default
+		}
+	}
+
+	@Test
+	@Transactional
+	public void deleteAclRemovesRowsFromDatabase() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		MutableAcl child = jdbcMutableAclService.createAcl(childOid);
+		child.insertAce(0, BasePermission.DELETE, new PrincipalSid(auth), false);
+		jdbcMutableAclService.updateAcl(child);
+
+		// Remove the child and check all related database rows were removed accordingly
+		jdbcMutableAclService.deleteAcl(childOid, false);
+		assertEquals(
+				1,
+				jdbcTemplate.queryForList(SELECT_ALL_CLASSES,
+						new Object[] { TARGET_CLASS }).size());
+		assertEquals(0, jdbcTemplate.queryForList("select * from acl_object_identity")
+				.size());
+		assertEquals(0, jdbcTemplate.queryForList("select * from acl_entry").size());
+
+		// Check the cache
+		assertNull(aclCache.getFromCache(childOid));
+		assertNull(aclCache.getFromCache(Long.valueOf(102)));
+	}
+
+	/** SEC-1107 */
+	@Test
+	@Transactional
+	public void identityWithIntegerIdIsSupportedByCreateAcl() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
+		jdbcMutableAclService.createAcl(oid);
+
+		assertNotNull(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
+				TARGET_CLASS, Long.valueOf(101))));
+	}
+
+	/**
+	 * SEC-655
+	 */
+	@Test
+	@Transactional
+	public void childrenAreClearedFromCacheWhenParentIsUpdated() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_ADMINISTRATOR");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		ObjectIdentity parentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(104));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(105));
+
+		MutableAcl parent = jdbcMutableAclService.createAcl(parentOid);
+		MutableAcl child = jdbcMutableAclService.createAcl(childOid);
+
+		child.setParent(parent);
+		jdbcMutableAclService.updateAcl(child);
+
+		parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid);
+		parent.insertAce(0, BasePermission.READ, new PrincipalSid("ben"), true);
+		jdbcMutableAclService.updateAcl(parent);
+
+		parent = (AclImpl) jdbcMutableAclService.readAclById(parentOid);
+		parent.insertAce(1, BasePermission.READ, new PrincipalSid("scott"), true);
+		jdbcMutableAclService.updateAcl(parent);
+
+		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
+		parent = (MutableAcl) child.getParentAcl();
+
+		assertEquals("Fails because child has a stale reference to its parent", 2, parent
+				.getEntries().size());
+		assertEquals(1, parent.getEntries().get(0).getPermission().getMask());
+		assertEquals(new PrincipalSid("ben"), parent.getEntries().get(0).getSid());
+		assertEquals(1, parent.getEntries().get(1).getPermission().getMask());
+		assertEquals(new PrincipalSid("scott"), parent.getEntries().get(1).getSid());
+	}
+
+	/**
+	 * SEC-655
+	 */
+	@Test
+	@Transactional
+	public void childrenAreClearedFromCacheWhenParentisUpdated2() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("system", "secret",
+				"ROLE_IGNORED");
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		ObjectIdentityImpl rootObject = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(1));
+
+		MutableAcl parent = jdbcMutableAclService.createAcl(rootObject);
+		MutableAcl child = jdbcMutableAclService.createAcl(new ObjectIdentityImpl(
+				TARGET_CLASS, Long.valueOf(2)));
+		child.setParent(parent);
+		jdbcMutableAclService.updateAcl(child);
+
+		parent.insertAce(0, BasePermission.ADMINISTRATION, new GrantedAuthoritySid(
+				"ROLE_ADMINISTRATOR"), true);
+		jdbcMutableAclService.updateAcl(parent);
+
+		parent.insertAce(1, BasePermission.DELETE, new PrincipalSid("terry"), true);
+		jdbcMutableAclService.updateAcl(parent);
+
+		child = (MutableAcl) jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
+				TARGET_CLASS, Long.valueOf(2)));
+
+		parent = (MutableAcl) child.getParentAcl();
+
+		assertEquals(2, parent.getEntries().size());
+		assertEquals(16, parent.getEntries().get(0).getPermission().getMask());
+		assertEquals(new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), parent.getEntries()
+				.get(0).getSid());
+		assertEquals(8, parent.getEntries().get(1).getPermission().getMask());
+		assertEquals(new PrincipalSid("terry"), parent.getEntries().get(1).getSid());
+	}
+
+	@Test
+	@Transactional
+	public void cumulativePermissions() {
+		Authentication auth = new TestingAuthenticationToken("ben", "ignored",
+				"ROLE_ADMINISTRATOR");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(110));
+		MutableAcl topParent = jdbcMutableAclService.createAcl(topParentOid);
+
+		// Add an ACE permission entry
+		Permission cm = new CumulativePermission().set(BasePermission.READ).set(
+				BasePermission.ADMINISTRATION);
+		assertEquals(17, cm.getMask());
+		Sid benSid = new PrincipalSid(auth);
+		topParent.insertAce(0, cm, benSid, true);
+		assertEquals(1, topParent.getEntries().size());
+
+		// Explicitly save the changed ACL
+		topParent = jdbcMutableAclService.updateAcl(topParent);
+
+		// Check the mask was retrieved correctly
+		assertEquals(17, topParent.getEntries().get(0).getPermission().getMask());
+		assertTrue(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true));
+
+		SecurityContextHolder.clearContext();
+	}
+
+	@Test
+	public void testProcessingCustomSid() {
+		CustomJdbcMutableAclService customJdbcMutableAclService = spy(new CustomJdbcMutableAclService(
+				dataSource, lookupStrategy, aclCache));
+		CustomSid customSid = new CustomSid("Custom sid");
+		when(
+				customJdbcMutableAclService.createOrRetrieveSidPrimaryKey("Custom sid",
+						false, false)).thenReturn(1L);
+
+		Long result = customJdbcMutableAclService.createOrRetrieveSidPrimaryKey(
+				customSid, false);
+
+		assertEquals(result, new Long(1L));
+	}
+
+	/**
+	 * This class needed to show how to extend {@link JdbcMutableAclService} for
+	 * processing custom {@link Sid} implementations
+	 */
+	private class CustomJdbcMutableAclService extends JdbcMutableAclService {
+
+		private CustomJdbcMutableAclService(DataSource dataSource,
+				LookupStrategy lookupStrategy, AclCache aclCache) {
+			super(dataSource, lookupStrategy, aclCache);
+		}
+
+		@Override
+		protected Long createOrRetrieveSidPrimaryKey(Sid sid, boolean allowCreate) {
+			String sidName;
+			boolean isPrincipal = false;
+			if (sid instanceof CustomSid) {
+				sidName = ((CustomSid) sid).getSid();
+			}
+			else if (sid instanceof GrantedAuthoritySid) {
+				sidName = ((GrantedAuthoritySid) sid).getGrantedAuthority();
+			}
+			else {
+				sidName = ((PrincipalSid) sid).getPrincipal();
+				isPrincipal = true;
+			}
+			return createOrRetrieveSidPrimaryKey(sidName, isPrincipal, allowCreate);
+		}
+	}
 
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java
index 5b4338b5bb..9342cdfa6b 100644
--- a/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java
@@ -26,117 +26,131 @@ import static org.junit.Assert.*;
  * @author Marten Deinum
  */
 public class SpringCacheBasedAclCacheTests {
-    private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
+	private static final String TARGET_CLASS = "org.springframework.security.acls.TargetObject";
 
-    private static CacheManager cacheManager;
+	private static CacheManager cacheManager;
 
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = new ConcurrentMapCacheManager();
-        // Use disk caching immediately (to test for serialization issue reported in SEC-527)
-        cacheManager.getCache("springcasebasedacltests");
-    }
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = new ConcurrentMapCacheManager();
+		// Use disk caching immediately (to test for serialization issue reported in
+		// SEC-527)
+		cacheManager.getCache("springcasebasedacltests");
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    private Cache getCache() {
-        Cache cache = cacheManager.getCache("springcasebasedacltests");
-        cache.clear();
-        return cache;
-    }
+	private Cache getCache() {
+		Cache cache = cacheManager.getCache("springcasebasedacltests");
+		cache.clear();
+		return cache;
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorRejectsNullParameters() throws Exception {
-        new SpringCacheBasedAclCache(null, null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorRejectsNullParameters() throws Exception {
+		new SpringCacheBasedAclCache(null, null, null);
+	}
 
-    @SuppressWarnings("rawtypes")
-    @Test
-    public void cacheOperationsAclWithoutParent() throws Exception {
-        Cache cache = getCache();
-        Map realCache = (Map) cache.getNativeCache();
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
-        AuditLogger auditLogger = new ConsoleAuditLogger();
+	@SuppressWarnings("rawtypes")
+	@Test
+	public void cacheOperationsAclWithoutParent() throws Exception {
+		Cache cache = getCache();
+		Map realCache = (Map) cache.getNativeCache();
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
+		AuditLogger auditLogger = new ConsoleAuditLogger();
 
-        PermissionGrantingStrategy permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(auditLogger);
-        SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache, permissionGrantingStrategy, aclAuthorizationStrategy);
-        MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy, auditLogger);
+		PermissionGrantingStrategy permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(
+				auditLogger);
+		SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache,
+				permissionGrantingStrategy, aclAuthorizationStrategy);
+		MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
+				auditLogger);
 
-        assertEquals(0, realCache.size());
-        myCache.putInCache(acl);
+		assertEquals(0, realCache.size());
+		myCache.putInCache(acl);
 
-        // Check we can get from cache the same objects we put in
-        assertEquals(myCache.getFromCache(Long.valueOf(1)), acl);
-        assertEquals(myCache.getFromCache(identity), acl);
+		// Check we can get from cache the same objects we put in
+		assertEquals(myCache.getFromCache(Long.valueOf(1)), acl);
+		assertEquals(myCache.getFromCache(identity), acl);
 
-        // Put another object in cache
-        ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
-        MutableAcl acl2 = new AclImpl(identity2, Long.valueOf(2), aclAuthorizationStrategy, new ConsoleAuditLogger());
+		// Put another object in cache
+		ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
+		MutableAcl acl2 = new AclImpl(identity2, Long.valueOf(2),
+				aclAuthorizationStrategy, new ConsoleAuditLogger());
 
-        myCache.putInCache(acl2);
+		myCache.putInCache(acl2);
 
-        // Try to evict an entry that doesn't exist
-        myCache.evictFromCache(Long.valueOf(3));
-        myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102)));
-        assertEquals(realCache.size(), 4);
+		// Try to evict an entry that doesn't exist
+		myCache.evictFromCache(Long.valueOf(3));
+		myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102)));
+		assertEquals(realCache.size(), 4);
 
-        myCache.evictFromCache(Long.valueOf(1));
-        assertEquals(realCache.size(), 2);
+		myCache.evictFromCache(Long.valueOf(1));
+		assertEquals(realCache.size(), 2);
 
-        // Check the second object inserted
-        assertEquals(myCache.getFromCache(Long.valueOf(2)), acl2);
-        assertEquals(myCache.getFromCache(identity2), acl2);
+		// Check the second object inserted
+		assertEquals(myCache.getFromCache(Long.valueOf(2)), acl2);
+		assertEquals(myCache.getFromCache(identity2), acl2);
 
-        myCache.evictFromCache(identity2);
-        assertEquals(realCache.size(), 0);
-    }
+		myCache.evictFromCache(identity2);
+		assertEquals(realCache.size(), 0);
+	}
 
-    @SuppressWarnings("rawtypes")
-    @Test
-    public void cacheOperationsAclWithParent() throws Exception {
-        Cache cache = getCache();
-        Map realCache = (Map) cache.getNativeCache();
+	@SuppressWarnings("rawtypes")
+	@Test
+	public void cacheOperationsAclWithParent() throws Exception {
+		Cache cache = getCache();
+		Map realCache = (Map) cache.getNativeCache();
 
-        Authentication auth = new TestingAuthenticationToken("user", "password", "ROLE_GENERAL");
-        auth.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(auth);
+		Authentication auth = new TestingAuthenticationToken("user", "password",
+				"ROLE_GENERAL");
+		auth.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(1));
-        ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(2));
-        AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
-                new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority("ROLE_AUDITING"),
-                new SimpleGrantedAuthority("ROLE_GENERAL"));
-        AuditLogger auditLogger = new ConsoleAuditLogger();
+		ObjectIdentity identity = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(1));
+		ObjectIdentity identityParent = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(2));
+		AclAuthorizationStrategy aclAuthorizationStrategy = new AclAuthorizationStrategyImpl(
+				new SimpleGrantedAuthority("ROLE_OWNERSHIP"), new SimpleGrantedAuthority(
+						"ROLE_AUDITING"), new SimpleGrantedAuthority("ROLE_GENERAL"));
+		AuditLogger auditLogger = new ConsoleAuditLogger();
 
-        PermissionGrantingStrategy permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(auditLogger);
-        SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache, permissionGrantingStrategy, aclAuthorizationStrategy);
+		PermissionGrantingStrategy permissionGrantingStrategy = new DefaultPermissionGrantingStrategy(
+				auditLogger);
+		SpringCacheBasedAclCache myCache = new SpringCacheBasedAclCache(cache,
+				permissionGrantingStrategy, aclAuthorizationStrategy);
 
-        MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy, auditLogger);
-        MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2), aclAuthorizationStrategy, auditLogger);
+		MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
+				auditLogger);
+		MutableAcl parentAcl = new AclImpl(identityParent, Long.valueOf(2),
+				aclAuthorizationStrategy, auditLogger);
 
-        acl.setParent(parentAcl);
+		acl.setParent(parentAcl);
 
-        assertEquals(0, realCache.size());
-        myCache.putInCache(acl);
-        assertEquals(realCache.size(), 4);
+		assertEquals(0, realCache.size());
+		myCache.putInCache(acl);
+		assertEquals(realCache.size(), 4);
 
-        // Check we can get from cache the same objects we put in
-        AclImpl aclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(1));
-        assertEquals(acl, aclFromCache);
-        // SEC-951 check transient fields are set on parent
-        assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), "aclAuthorizationStrategy"));
-        assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(), "permissionGrantingStrategy"));
-        assertEquals(acl, myCache.getFromCache(identity));
-        assertNotNull(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy"));
-        AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(2));
-        assertEquals(parentAcl, parentAclFromCache);
-        assertNotNull(FieldUtils.getFieldValue(parentAclFromCache, "aclAuthorizationStrategy"));
-        assertEquals(parentAcl, myCache.getFromCache(identityParent));
-    }
+		// Check we can get from cache the same objects we put in
+		AclImpl aclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(1));
+		assertEquals(acl, aclFromCache);
+		// SEC-951 check transient fields are set on parent
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
+				"aclAuthorizationStrategy"));
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
+				"permissionGrantingStrategy"));
+		assertEquals(acl, myCache.getFromCache(identity));
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy"));
+		AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(2));
+		assertEquals(parentAcl, parentAclFromCache);
+		assertNotNull(FieldUtils.getFieldValue(parentAclFromCache,
+				"aclAuthorizationStrategy"));
+		assertEquals(parentAcl, myCache.getFromCache(identityParent));
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java
index 938f0c7d53..905e161a2e 100644
--- a/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java
+++ b/acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java
@@ -8,17 +8,17 @@ import org.springframework.security.acls.model.Sid;
  */
 public class CustomSid implements Sid {
 
-    private String sid;
+	private String sid;
 
-    public CustomSid(String sid) {
-        this.sid = sid;
-    }
+	public CustomSid(String sid) {
+		this.sid = sid;
+	}
 
-    public String getSid() {
-        return sid;
-    }
+	public String getSid() {
+		return sid;
+	}
 
-    public void setSid(String sid) {
-        this.sid = sid;
-    }
+	public void setSid(String sid) {
+		this.sid = sid;
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java
index d4776f0a8d..dcd37e97fa 100644
--- a/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java
@@ -27,41 +27,44 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 @SuppressWarnings("unchecked")
 public class SidRetrievalStrategyTests {
-    Authentication authentication = new TestingAuthenticationToken("scott", "password", "A", "B", "C");
+	Authentication authentication = new TestingAuthenticationToken("scott", "password",
+			"A", "B", "C");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void correctSidsAreRetrieved() throws Exception {
-        SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl();
-        List<Sid> sids = retrStrategy.getSids(authentication);
+	@Test
+	public void correctSidsAreRetrieved() throws Exception {
+		SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl();
+		List<Sid> sids = retrStrategy.getSids(authentication);
 
-        assertNotNull(sids);
-        assertEquals(4, sids.size());
-        assertNotNull(sids.get(0));
-        assertTrue(sids.get(0) instanceof PrincipalSid);
+		assertNotNull(sids);
+		assertEquals(4, sids.size());
+		assertNotNull(sids.get(0));
+		assertTrue(sids.get(0) instanceof PrincipalSid);
 
-        for (int i = 1; i < sids.size(); i++) {
-            assertTrue(sids.get(i) instanceof GrantedAuthoritySid);
-        }
+		for (int i = 1; i < sids.size(); i++) {
+			assertTrue(sids.get(i) instanceof GrantedAuthoritySid);
+		}
 
-        assertEquals("scott", ((PrincipalSid) sids.get(0)).getPrincipal());
-        assertEquals("A", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
-        assertEquals("B", ((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority());
-        assertEquals("C", ((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority());
-    }
+		assertEquals("scott", ((PrincipalSid) sids.get(0)).getPrincipal());
+		assertEquals("A", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
+		assertEquals("B", ((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority());
+		assertEquals("C", ((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority());
+	}
 
-    @Test
-    public void roleHierarchyIsUsedWhenSet() throws Exception {
-        RoleHierarchy rh =  mock(RoleHierarchy.class);
-        List rhAuthorities = AuthorityUtils.createAuthorityList("D");
-        when(rh.getReachableGrantedAuthorities(anyCollection())).thenReturn(rhAuthorities);
-        SidRetrievalStrategy strat = new SidRetrievalStrategyImpl(rh);
+	@Test
+	public void roleHierarchyIsUsedWhenSet() throws Exception {
+		RoleHierarchy rh = mock(RoleHierarchy.class);
+		List rhAuthorities = AuthorityUtils.createAuthorityList("D");
+		when(rh.getReachableGrantedAuthorities(anyCollection()))
+				.thenReturn(rhAuthorities);
+		SidRetrievalStrategy strat = new SidRetrievalStrategyImpl(rh);
 
-        List<Sid> sids = strat.getSids(authentication);
-        assertEquals(2, sids.size());
-        assertNotNull(sids.get(0));
-        assertTrue(sids.get(0) instanceof PrincipalSid);
-        assertEquals("D", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
-    }
+		List<Sid> sids = strat.getSids(authentication);
+		assertEquals(2, sids.size());
+		assertNotNull(sids.get(0));
+		assertTrue(sids.get(0) instanceof PrincipalSid);
+		assertEquals("D", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
+	}
 }
diff --git a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java
index 7872d237c1..d0e7c0d233 100644
--- a/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java
+++ b/acl/src/test/java/org/springframework/security/acls/sid/SidTests.java
@@ -12,178 +12,193 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 public class SidTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testPrincipalSidConstructorsRequiredFields() throws Exception {
-        // Check one String-argument constructor
-        try {
-            String string = null;
-            new PrincipalSid(string);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+	public void testPrincipalSidConstructorsRequiredFields() throws Exception {
+		// Check one String-argument constructor
+		try {
+			String string = null;
+			new PrincipalSid(string);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            new PrincipalSid("");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			new PrincipalSid("");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            new PrincipalSid("johndoe");
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
+		try {
+			new PrincipalSid("johndoe");
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
 
-        // Check one Authentication-argument constructor
-        try {
-            Authentication authentication = null;
-            new PrincipalSid(authentication);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		// Check one Authentication-argument constructor
+		try {
+			Authentication authentication = null;
+			new PrincipalSid(authentication);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            Authentication authentication = new TestingAuthenticationToken(null, "password");
-            new PrincipalSid(authentication);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			Authentication authentication = new TestingAuthenticationToken(null,
+					"password");
+			new PrincipalSid(authentication);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            Authentication authentication = new TestingAuthenticationToken("johndoe", "password");
-            new PrincipalSid(authentication);
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
-    }
+		try {
+			Authentication authentication = new TestingAuthenticationToken("johndoe",
+					"password");
+			new PrincipalSid(authentication);
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
+	}
 
-    public void testGrantedAuthoritySidConstructorsRequiredFields() throws Exception {
-        // Check one String-argument constructor
-        try {
-            String string = null;
-            new GrantedAuthoritySid(string);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+	public void testGrantedAuthoritySidConstructorsRequiredFields() throws Exception {
+		// Check one String-argument constructor
+		try {
+			String string = null;
+			new GrantedAuthoritySid(string);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            new GrantedAuthoritySid("");
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			new GrantedAuthoritySid("");
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            new GrantedAuthoritySid("ROLE_TEST");
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
+		try {
+			new GrantedAuthoritySid("ROLE_TEST");
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
 
-        // Check one GrantedAuthority-argument constructor
-        try {
-            GrantedAuthority ga = null;
-            new GrantedAuthoritySid(ga);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		// Check one GrantedAuthority-argument constructor
+		try {
+			GrantedAuthority ga = null;
+			new GrantedAuthoritySid(ga);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            GrantedAuthority ga = new SimpleGrantedAuthority(null);
-            new GrantedAuthoritySid(ga);
-            Assert.fail("It should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException expected) {
-            Assert.assertTrue(true);
-        }
+		try {
+			GrantedAuthority ga = new SimpleGrantedAuthority(null);
+			new GrantedAuthoritySid(ga);
+			Assert.fail("It should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
+		}
 
-        try {
-            GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
-            new GrantedAuthoritySid(ga);
-            Assert.assertTrue(true);
-        }
-        catch (IllegalArgumentException notExpected) {
-            Assert.fail("It shouldn't have thrown IllegalArgumentException");
-        }
-    }
+		try {
+			GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
+			new GrantedAuthoritySid(ga);
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
+	}
 
-    public void testPrincipalSidEquals() throws Exception {
-        Authentication authentication = new TestingAuthenticationToken("johndoe", "password");
-        Sid principalSid = new PrincipalSid(authentication);
+	public void testPrincipalSidEquals() throws Exception {
+		Authentication authentication = new TestingAuthenticationToken("johndoe",
+				"password");
+		Sid principalSid = new PrincipalSid(authentication);
 
-        Assert.assertFalse(principalSid.equals(null));
-        Assert.assertFalse(principalSid.equals("DIFFERENT_TYPE_OBJECT"));
-        Assert.assertTrue(principalSid.equals(principalSid));
-        Assert.assertTrue(principalSid.equals(new PrincipalSid(authentication)));
-        Assert.assertTrue(principalSid.equals(new PrincipalSid(new TestingAuthenticationToken("johndoe", null))));
-        Assert.assertFalse(principalSid.equals(new PrincipalSid(new TestingAuthenticationToken("scott", null))));
-        Assert.assertTrue(principalSid.equals(new PrincipalSid("johndoe")));
-        Assert.assertFalse(principalSid.equals(new PrincipalSid("scott")));
-    }
+		Assert.assertFalse(principalSid.equals(null));
+		Assert.assertFalse(principalSid.equals("DIFFERENT_TYPE_OBJECT"));
+		Assert.assertTrue(principalSid.equals(principalSid));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid(authentication)));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid(
+				new TestingAuthenticationToken("johndoe", null))));
+		Assert.assertFalse(principalSid.equals(new PrincipalSid(
+				new TestingAuthenticationToken("scott", null))));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid("johndoe")));
+		Assert.assertFalse(principalSid.equals(new PrincipalSid("scott")));
+	}
 
-    public void testGrantedAuthoritySidEquals() throws Exception {
-        GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
-        Sid gaSid = new GrantedAuthoritySid(ga);
+	public void testGrantedAuthoritySidEquals() throws Exception {
+		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
+		Sid gaSid = new GrantedAuthoritySid(ga);
 
-        Assert.assertFalse(gaSid.equals(null));
-        Assert.assertFalse(gaSid.equals("DIFFERENT_TYPE_OBJECT"));
-        Assert.assertTrue(gaSid.equals(gaSid));
-        Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(ga)));
-        Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(new SimpleGrantedAuthority("ROLE_TEST"))));
-        Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid(new SimpleGrantedAuthority("ROLE_NOT_EQUAL"))));
-        Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST")));
-        Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL")));
-    }
+		Assert.assertFalse(gaSid.equals(null));
+		Assert.assertFalse(gaSid.equals("DIFFERENT_TYPE_OBJECT"));
+		Assert.assertTrue(gaSid.equals(gaSid));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(ga)));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(
+				new SimpleGrantedAuthority("ROLE_TEST"))));
+		Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid(
+				new SimpleGrantedAuthority("ROLE_NOT_EQUAL"))));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST")));
+		Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL")));
+	}
 
-    public void testPrincipalSidHashCode() throws Exception {
-        Authentication authentication = new TestingAuthenticationToken("johndoe", "password");
-        Sid principalSid = new PrincipalSid(authentication);
+	public void testPrincipalSidHashCode() throws Exception {
+		Authentication authentication = new TestingAuthenticationToken("johndoe",
+				"password");
+		Sid principalSid = new PrincipalSid(authentication);
 
-        Assert.assertTrue(principalSid.hashCode() == "johndoe".hashCode());
-        Assert.assertTrue(principalSid.hashCode() == new PrincipalSid("johndoe").hashCode());
-        Assert.assertTrue(principalSid.hashCode() != new PrincipalSid("scott").hashCode());
-        Assert.assertTrue(principalSid.hashCode() != new PrincipalSid(new TestingAuthenticationToken("scott", "password")).hashCode());
-    }
+		Assert.assertTrue(principalSid.hashCode() == "johndoe".hashCode());
+		Assert.assertTrue(principalSid.hashCode() == new PrincipalSid("johndoe")
+				.hashCode());
+		Assert.assertTrue(principalSid.hashCode() != new PrincipalSid("scott").hashCode());
+		Assert.assertTrue(principalSid.hashCode() != new PrincipalSid(
+				new TestingAuthenticationToken("scott", "password")).hashCode());
+	}
 
-    public void testGrantedAuthoritySidHashCode() throws Exception {
-        GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
-        Sid gaSid = new GrantedAuthoritySid(ga);
+	public void testGrantedAuthoritySidHashCode() throws Exception {
+		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
+		Sid gaSid = new GrantedAuthoritySid(ga);
 
-        Assert.assertTrue(gaSid.hashCode() == "ROLE_TEST".hashCode());
-        Assert.assertTrue(gaSid.hashCode() == new GrantedAuthoritySid("ROLE_TEST").hashCode());
-        Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid("ROLE_TEST_2").hashCode());
-        Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid(new SimpleGrantedAuthority("ROLE_TEST_2")).hashCode());
-    }
+		Assert.assertTrue(gaSid.hashCode() == "ROLE_TEST".hashCode());
+		Assert.assertTrue(gaSid.hashCode() == new GrantedAuthoritySid("ROLE_TEST")
+				.hashCode());
+		Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid("ROLE_TEST_2")
+				.hashCode());
+		Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid(
+				new SimpleGrantedAuthority("ROLE_TEST_2")).hashCode());
+	}
 
-    public void testGetters() throws Exception {
-        Authentication authentication = new TestingAuthenticationToken("johndoe", "password");
-        PrincipalSid principalSid = new PrincipalSid(authentication);
-        GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
-        GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga);
+	public void testGetters() throws Exception {
+		Authentication authentication = new TestingAuthenticationToken("johndoe",
+				"password");
+		PrincipalSid principalSid = new PrincipalSid(authentication);
+		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
+		GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga);
 
-        Assert.assertTrue("johndoe".equals(principalSid.getPrincipal()));
-        Assert.assertFalse("scott".equals(principalSid.getPrincipal()));
+		Assert.assertTrue("johndoe".equals(principalSid.getPrincipal()));
+		Assert.assertFalse("scott".equals(principalSid.getPrincipal()));
 
-        Assert.assertTrue("ROLE_TEST".equals(gaSid.getGrantedAuthority()));
-        Assert.assertFalse("ROLE_TEST2".equals(gaSid.getGrantedAuthority()));
-    }
+		Assert.assertTrue("ROLE_TEST".equals(gaSid.getGrantedAuthority()));
+		Assert.assertFalse("ROLE_TEST2".equals(gaSid.getGrantedAuthority()));
+	}
 }
diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java
index 552e1c48dc..bce258a5f0 100644
--- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java
+++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java
@@ -40,150 +40,160 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @since 3.0.3
  */
 public class AnnotationSecurityAspectTests {
-    private AffirmativeBased adm;
-    private @Mock AuthenticationManager authman;
-    private TestingAuthenticationToken anne = new TestingAuthenticationToken("anne", "", "ROLE_A");
-//    private TestingAuthenticationToken bob = new TestingAuthenticationToken("bob", "", "ROLE_B");
-    private AspectJMethodSecurityInterceptor interceptor;
-    private SecuredImpl secured = new SecuredImpl();
-    private SecuredImplSubclass securedSub = new SecuredImplSubclass();
-    private PrePostSecured prePostSecured = new PrePostSecured();
+	private AffirmativeBased adm;
+	private @Mock AuthenticationManager authman;
+	private TestingAuthenticationToken anne = new TestingAuthenticationToken("anne", "",
+			"ROLE_A");
+	// private TestingAuthenticationToken bob = new TestingAuthenticationToken("bob", "",
+	// "ROLE_B");
+	private AspectJMethodSecurityInterceptor interceptor;
+	private SecuredImpl secured = new SecuredImpl();
+	private SecuredImplSubclass securedSub = new SecuredImplSubclass();
+	private PrePostSecured prePostSecured = new PrePostSecured();
 
-    @Before
-    public final void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        interceptor = new AspectJMethodSecurityInterceptor();
-        AccessDecisionVoter[] voters = new AccessDecisionVoter[]
-                {new RoleVoter(), new PreInvocationAuthorizationAdviceVoter(new ExpressionBasedPreInvocationAdvice())};
-        adm = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(voters));
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setAuthenticationManager(authman);
-        interceptor.setSecurityMetadataSource(new SecuredAnnotationSecurityMetadataSource());
-        AnnotationSecurityAspect secAspect = AnnotationSecurityAspect.aspectOf();
-        secAspect.setSecurityInterceptor(interceptor);
-    }
+	@Before
+	public final void setUp() throws Exception {
+		MockitoAnnotations.initMocks(this);
+		interceptor = new AspectJMethodSecurityInterceptor();
+		AccessDecisionVoter[] voters = new AccessDecisionVoter[] {
+				new RoleVoter(),
+				new PreInvocationAuthorizationAdviceVoter(
+						new ExpressionBasedPreInvocationAdvice()) };
+		adm = new AffirmativeBased(
+				Arrays.<AccessDecisionVoter<? extends Object>> asList(voters));
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setAuthenticationManager(authman);
+		interceptor
+				.setSecurityMetadataSource(new SecuredAnnotationSecurityMetadataSource());
+		AnnotationSecurityAspect secAspect = AnnotationSecurityAspect.aspectOf();
+		secAspect.setSecurityInterceptor(interceptor);
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void securedInterfaceMethodAllowsAllAccess() throws Exception {
-        secured.securedMethod();
-    }
+	@Test
+	public void securedInterfaceMethodAllowsAllAccess() throws Exception {
+		secured.securedMethod();
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void securedClassMethodDeniesUnauthenticatedAccess() throws Exception {
-        secured.securedClassMethod();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void securedClassMethodDeniesUnauthenticatedAccess() throws Exception {
+		secured.securedClassMethod();
+	}
 
-    @Test
-    public void securedClassMethodAllowsAccessToRoleA() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(anne);
-        secured.securedClassMethod();
-    }
+	@Test
+	public void securedClassMethodAllowsAccessToRoleA() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(anne);
+		secured.securedClassMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void internalPrivateCallIsIntercepted() {
-        SecurityContextHolder.getContext().setAuthentication(anne);
+	@Test(expected = AccessDeniedException.class)
+	public void internalPrivateCallIsIntercepted() {
+		SecurityContextHolder.getContext().setAuthentication(anne);
 
-        try {
-            secured.publicCallsPrivate();
-            fail("Expected AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-        }
-        securedSub.publicCallsPrivate();
-    }
+		try {
+			secured.publicCallsPrivate();
+			fail("Expected AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
+		securedSub.publicCallsPrivate();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void protectedMethodIsIntercepted() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(anne);
+	@Test(expected = AccessDeniedException.class)
+	public void protectedMethodIsIntercepted() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(anne);
 
-        secured.protectedMethod();
-    }
+		secured.protectedMethod();
+	}
 
-    @Test
-    public void overriddenProtectedMethodIsNotIntercepted() throws Exception {
-        // AspectJ doesn't inherit annotations
-        securedSub.protectedMethod();
-    }
+	@Test
+	public void overriddenProtectedMethodIsNotIntercepted() throws Exception {
+		// AspectJ doesn't inherit annotations
+		securedSub.protectedMethod();
+	}
 
-    // SEC-1262
-    @Test(expected=AccessDeniedException.class)
-    public void denyAllPreAuthorizeDeniesAccess() throws Exception {
-        configureForElAnnotations();
-        SecurityContextHolder.getContext().setAuthentication(anne);
-        prePostSecured.denyAllMethod();
-    }
+	// SEC-1262
+	@Test(expected = AccessDeniedException.class)
+	public void denyAllPreAuthorizeDeniesAccess() throws Exception {
+		configureForElAnnotations();
+		SecurityContextHolder.getContext().setAuthentication(anne);
+		prePostSecured.denyAllMethod();
+	}
 
-    @Test
-    public void postFilterIsApplied() throws Exception {
-        configureForElAnnotations();
-        SecurityContextHolder.getContext().setAuthentication(anne);
-        List<String> objects = prePostSecured.postFilterMethod();
-        assertEquals(2, objects.size());
-        assertTrue(objects.contains("apple"));
-        assertTrue(objects.contains("aubergine"));
-    }
+	@Test
+	public void postFilterIsApplied() throws Exception {
+		configureForElAnnotations();
+		SecurityContextHolder.getContext().setAuthentication(anne);
+		List<String> objects = prePostSecured.postFilterMethod();
+		assertEquals(2, objects.size());
+		assertTrue(objects.contains("apple"));
+		assertTrue(objects.contains("aubergine"));
+	}
 
-    private void configureForElAnnotations() {
-        DefaultMethodSecurityExpressionHandler eh = new DefaultMethodSecurityExpressionHandler();
-        interceptor.setSecurityMetadataSource(new PrePostAnnotationSecurityMetadataSource(
-                new ExpressionBasedAnnotationAttributeFactory(eh)));
-        interceptor.setAccessDecisionManager(adm);
-        AfterInvocationProviderManager aim = new AfterInvocationProviderManager();
-        aim.setProviders(Arrays.asList(new PostInvocationAdviceProvider(new ExpressionBasedPostInvocationAdvice(eh))));
-        interceptor.setAfterInvocationManager(aim);
-    }
+	private void configureForElAnnotations() {
+		DefaultMethodSecurityExpressionHandler eh = new DefaultMethodSecurityExpressionHandler();
+		interceptor
+				.setSecurityMetadataSource(new PrePostAnnotationSecurityMetadataSource(
+						new ExpressionBasedAnnotationAttributeFactory(eh)));
+		interceptor.setAccessDecisionManager(adm);
+		AfterInvocationProviderManager aim = new AfterInvocationProviderManager();
+		aim.setProviders(Arrays.asList(new PostInvocationAdviceProvider(
+				new ExpressionBasedPostInvocationAdvice(eh))));
+		interceptor.setAfterInvocationManager(aim);
+	}
 }
 
 interface SecuredInterface {
-    @Secured("ROLE_X")
-    void securedMethod();
+	@Secured("ROLE_X")
+	void securedMethod();
 }
 
 class SecuredImpl implements SecuredInterface {
-    // Not really secured because AspectJ doesn't inherit annotations from interfaces
-    public void securedMethod() {
-    }
+	// Not really secured because AspectJ doesn't inherit annotations from interfaces
+	public void securedMethod() {
+	}
 
-    @Secured("ROLE_A")
-    public void securedClassMethod() {
-    }
+	@Secured("ROLE_A")
+	public void securedClassMethod() {
+	}
 
-    @Secured("ROLE_X")
-    private void privateMethod() {
-    }
+	@Secured("ROLE_X")
+	private void privateMethod() {
+	}
 
-    @Secured("ROLE_X")
-    protected void protectedMethod() {
-    }
+	@Secured("ROLE_X")
+	protected void protectedMethod() {
+	}
 
-    @Secured("ROLE_X")
-    public void publicCallsPrivate() {
-        privateMethod();
-    }
+	@Secured("ROLE_X")
+	public void publicCallsPrivate() {
+		privateMethod();
+	}
 }
 
 class SecuredImplSubclass extends SecuredImpl {
-    protected void protectedMethod() {
-    }
+	protected void protectedMethod() {
+	}
 
-    public void publicCallsPrivate() {
-        super.publicCallsPrivate();
-    }
+	public void publicCallsPrivate() {
+		super.publicCallsPrivate();
+	}
 }
 
 class PrePostSecured {
-    @PreAuthorize("denyAll")
-    public void denyAllMethod() {
-    }
+	@PreAuthorize("denyAll")
+	public void denyAllMethod() {
+	}
 
-    @PostFilter("filterObject.startsWith('a')")
-    public List<String> postFilterMethod() {
-        ArrayList<String> objects = new ArrayList<String>();
-        objects.addAll(Arrays.asList(new String[] {"apple", "banana", "aubergine", "orange"}));
-        return objects;
-    }
+	@PostFilter("filterObject.startsWith('a')")
+	public List<String> postFilterMethod() {
+		ArrayList<String> objects = new ArrayList<String>();
+		objects.addAll(Arrays.asList(new String[] { "apple", "banana", "aubergine",
+				"orange" }));
+		return objects;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java b/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java
index 15ead68d8d..e3e9599201 100644
--- a/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java
+++ b/cas/src/main/java/org/springframework/security/cas/SamlServiceProperties.java
@@ -15,19 +15,20 @@
 package org.springframework.security.cas;
 
 /**
- * Sets the appropriate parameters for CAS's implementation of SAML (which is not guaranteed to be actually SAML compliant).
+ * Sets the appropriate parameters for CAS's implementation of SAML (which is not
+ * guaranteed to be actually SAML compliant).
  *
  * @author Scott Battaglia
  * @since 3.0
  */
 public final class SamlServiceProperties extends ServiceProperties {
 
-    public static final String DEFAULT_SAML_ARTIFACT_PARAMETER = "SAMLart";
+	public static final String DEFAULT_SAML_ARTIFACT_PARAMETER = "SAMLart";
 
-    public static final String DEFAULT_SAML_SERVICE_PARAMETER = "TARGET";
+	public static final String DEFAULT_SAML_SERVICE_PARAMETER = "TARGET";
 
-    public SamlServiceProperties() {
-        super.setArtifactParameter(DEFAULT_SAML_ARTIFACT_PARAMETER);
-        super.setServiceParameter(DEFAULT_SAML_SERVICE_PARAMETER);
-    }
+	public SamlServiceProperties() {
+		super.setArtifactParameter(DEFAULT_SAML_ARTIFACT_PARAMETER);
+		super.setServiceParameter(DEFAULT_SAML_SERVICE_PARAMETER);
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java
index 13e706b477..bb0de24393 100644
--- a/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java
+++ b/cas/src/main/java/org/springframework/security/cas/ServiceProperties.java
@@ -18,118 +18,123 @@ package org.springframework.security.cas;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-
 /**
  * Stores properties related to this CAS service.
  * <p>
- * Each web application capable of processing CAS tickets is known as a service.
- * This class stores the properties that are relevant to the local CAS service, being the application
- * that is being secured by Spring Security.
+ * Each web application capable of processing CAS tickets is known as a service. This
+ * class stores the properties that are relevant to the local CAS service, being the
+ * application that is being secured by Spring Security.
  *
  * @author Ben Alex
  */
 public class ServiceProperties implements InitializingBean {
 
-    public static final String DEFAULT_CAS_ARTIFACT_PARAMETER = "ticket";
+	public static final String DEFAULT_CAS_ARTIFACT_PARAMETER = "ticket";
 
-    public static final String DEFAULT_CAS_SERVICE_PARAMETER = "service";
+	public static final String DEFAULT_CAS_SERVICE_PARAMETER = "service";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String service;
+	private String service;
 
-    private boolean authenticateAllArtifacts;
+	private boolean authenticateAllArtifacts;
 
-    private boolean sendRenew = false;
+	private boolean sendRenew = false;
 
-    private String artifactParameter = DEFAULT_CAS_ARTIFACT_PARAMETER;
+	private String artifactParameter = DEFAULT_CAS_ARTIFACT_PARAMETER;
 
-    private String serviceParameter = DEFAULT_CAS_SERVICE_PARAMETER;
+	private String serviceParameter = DEFAULT_CAS_SERVICE_PARAMETER;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(this.service, "service cannot be empty.");
-        Assert.hasLength(this.artifactParameter, "artifactParameter cannot be empty.");
-        Assert.hasLength(this.serviceParameter, "serviceParameter cannot be empty.");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(this.service, "service cannot be empty.");
+		Assert.hasLength(this.artifactParameter, "artifactParameter cannot be empty.");
+		Assert.hasLength(this.serviceParameter, "serviceParameter cannot be empty.");
+	}
 
-    /**
-     * Represents the service the user is authenticating to.
-     * <p>
-     * This service is the callback URL belonging to the local Spring Security System for Spring secured application.
-     * For example,
-     * <pre>
-     * https://www.mycompany.com/application/login/cas
-     * </pre>
-     *
-     * @return the URL of the service the user is authenticating to
-     */
-    public final String getService() {
-        return this.service;
-    }
+	/**
+	 * Represents the service the user is authenticating to.
+	 * <p>
+	 * This service is the callback URL belonging to the local Spring Security System for
+	 * Spring secured application. For example,
+	 * 
+	 * <pre>
+	 * https://www.mycompany.com/application/login/cas
+	 * </pre>
+	 *
+	 * @return the URL of the service the user is authenticating to
+	 */
+	public final String getService() {
+		return this.service;
+	}
 
-    /**
-     * Indicates whether the <code>renew</code> parameter should be sent to the CAS login URL and CAS
-     * validation URL.
-     * <p>
-     * If <code>true</code>, it will force CAS to authenticate the user again (even if the
-     * user has previously authenticated). During ticket validation it will require the ticket was generated as a
-     * consequence of an explicit login. High security applications would probably set this to <code>true</code>.
-     * Defaults to <code>false</code>, providing automated single sign on.
-     *
-     * @return whether to send the <code>renew</code> parameter to CAS
-     */
-    public final boolean isSendRenew() {
-        return this.sendRenew;
-    }
+	/**
+	 * Indicates whether the <code>renew</code> parameter should be sent to the CAS login
+	 * URL and CAS validation URL.
+	 * <p>
+	 * If <code>true</code>, it will force CAS to authenticate the user again (even if the
+	 * user has previously authenticated). During ticket validation it will require the
+	 * ticket was generated as a consequence of an explicit login. High security
+	 * applications would probably set this to <code>true</code>. Defaults to
+	 * <code>false</code>, providing automated single sign on.
+	 *
+	 * @return whether to send the <code>renew</code> parameter to CAS
+	 */
+	public final boolean isSendRenew() {
+		return this.sendRenew;
+	}
 
-    public final void setSendRenew(final boolean sendRenew) {
-        this.sendRenew = sendRenew;
-    }
+	public final void setSendRenew(final boolean sendRenew) {
+		this.sendRenew = sendRenew;
+	}
 
-    public final void setService(final String service) {
-        this.service = service;
-    }
+	public final void setService(final String service) {
+		this.service = service;
+	}
 
-    public final String getArtifactParameter() {
-        return this.artifactParameter;
-    }
+	public final String getArtifactParameter() {
+		return this.artifactParameter;
+	}
 
-    /**
-     * Configures the Request Parameter to look for when attempting to see if a CAS ticket was sent from the server.
-     *
-     * @param artifactParameter the id to use.  Default is "ticket".
-     */
-    public final void setArtifactParameter(final String artifactParameter) {
-        this.artifactParameter = artifactParameter;
-    }
+	/**
+	 * Configures the Request Parameter to look for when attempting to see if a CAS ticket
+	 * was sent from the server.
+	 *
+	 * @param artifactParameter the id to use. Default is "ticket".
+	 */
+	public final void setArtifactParameter(final String artifactParameter) {
+		this.artifactParameter = artifactParameter;
+	}
 
-    /**
-     * Configures the Request parameter to look for when attempting to send a request to CAS.
-     *
-     * @return the service parameter to use.  Default is "service".
-     */
-    public final String getServiceParameter() {
-        return serviceParameter;
-    }
+	/**
+	 * Configures the Request parameter to look for when attempting to send a request to
+	 * CAS.
+	 *
+	 * @return the service parameter to use. Default is "service".
+	 */
+	public final String getServiceParameter() {
+		return serviceParameter;
+	}
 
-    public final void setServiceParameter(final String serviceParameter) {
-        this.serviceParameter = serviceParameter;
-    }
+	public final void setServiceParameter(final String serviceParameter) {
+		this.serviceParameter = serviceParameter;
+	}
 
-    public final boolean isAuthenticateAllArtifacts() {
-        return authenticateAllArtifacts;
-    }
+	public final boolean isAuthenticateAllArtifacts() {
+		return authenticateAllArtifacts;
+	}
 
-    /**
-     * If true, then any non-null artifact (ticket) should be authenticated.
-     * Additionally, the service will be determined dynamically in order to
-     * ensure the service matches the expected value for this artifact.
-     *
-     * @param authenticateAllArtifacts
-     */
-    public final void setAuthenticateAllArtifacts(final boolean authenticateAllArtifacts) {
-        this.authenticateAllArtifacts = authenticateAllArtifacts;
-    }
+	/**
+	 * If true, then any non-null artifact (ticket) should be authenticated. Additionally,
+	 * the service will be determined dynamically in order to ensure the service matches
+	 * the expected value for this artifact.
+	 *
+	 * @param authenticateAllArtifacts
+	 */
+	public final void setAuthenticateAllArtifacts(final boolean authenticateAllArtifacts) {
+		this.authenticateAllArtifacts = authenticateAllArtifacts;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java
index 37eb15c2ba..57b9b41f43 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java
@@ -29,28 +29,28 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
  */
 public final class CasAssertionAuthenticationToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private final Assertion assertion;
+	private final Assertion assertion;
 
-    private final String ticket;
+	private final String ticket;
 
-    public CasAssertionAuthenticationToken(final Assertion assertion, final String ticket) {
-        super(new ArrayList<GrantedAuthority>());
+	public CasAssertionAuthenticationToken(final Assertion assertion, final String ticket) {
+		super(new ArrayList<GrantedAuthority>());
 
-        this.assertion = assertion;
-        this.ticket = ticket;
-    }
+		this.assertion = assertion;
+		this.ticket = ticket;
+	}
 
-    public Object getPrincipal() {
-        return this.assertion.getPrincipal().getName();
-    }
+	public Object getPrincipal() {
+		return this.assertion.getPrincipal().getName();
+	}
 
-    public Object getCredentials() {
-        return this.ticket;
-    }
+	public Object getCredentials() {
+		return this.ticket;
+	}
 
-    public Assertion getAssertion() {
-        return this.assertion;
-    }
+	public Assertion getAssertion() {
+		return this.assertion;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
index b166fc582e..9e498763b8 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationProvider.java
@@ -39,204 +39,236 @@ import org.springframework.security.core.authority.mapping.NullAuthoritiesMapper
 import org.springframework.security.core.userdetails.*;
 import org.springframework.util.Assert;
 
-
 /**
- * An {@link AuthenticationProvider} implementation that integrates with JA-SIG Central Authentication Service
- * (CAS).
+ * An {@link AuthenticationProvider} implementation that integrates with JA-SIG Central
+ * Authentication Service (CAS).
  * <p>
- * This <code>AuthenticationProvider</code> is capable of validating  {@link UsernamePasswordAuthenticationToken}
- * requests which contain a <code>principal</code> name equal to either
- * {@link CasAuthenticationFilter#CAS_STATEFUL_IDENTIFIER} or {@link CasAuthenticationFilter#CAS_STATELESS_IDENTIFIER}.
- * It can also validate a previously created {@link CasAuthenticationToken}.
+ * This <code>AuthenticationProvider</code> is capable of validating
+ * {@link UsernamePasswordAuthenticationToken} requests which contain a
+ * <code>principal</code> name equal to either
+ * {@link CasAuthenticationFilter#CAS_STATEFUL_IDENTIFIER} or
+ * {@link CasAuthenticationFilter#CAS_STATELESS_IDENTIFIER}. It can also validate a
+ * previously created {@link CasAuthenticationToken}.
  *
  * @author Ben Alex
  * @author Scott Battaglia
  */
-public class CasAuthenticationProvider implements AuthenticationProvider, InitializingBean, MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
+public class CasAuthenticationProvider implements AuthenticationProvider,
+		InitializingBean, MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(CasAuthenticationProvider.class);
+	private static final Log logger = LogFactory.getLog(CasAuthenticationProvider.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationUserDetailsService<CasAssertionAuthenticationToken> authenticationUserDetailsService;
+	private AuthenticationUserDetailsService<CasAssertionAuthenticationToken> authenticationUserDetailsService;
 
-    private final UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private StatelessTicketCache statelessTicketCache = new NullStatelessTicketCache();
-    private String key;
-    private TicketValidator ticketValidator;
-    private ServiceProperties serviceProperties;
-    private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
+	private final UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private StatelessTicketCache statelessTicketCache = new NullStatelessTicketCache();
+	private String key;
+	private TicketValidator ticketValidator;
+	private ServiceProperties serviceProperties;
+	private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
 
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.authenticationUserDetailsService,
+				"An authenticationUserDetailsService must be set");
+		Assert.notNull(this.ticketValidator, "A ticketValidator must be set");
+		Assert.notNull(this.statelessTicketCache, "A statelessTicketCache must be set");
+		Assert.hasText(
+				this.key,
+				"A Key is required so CasAuthenticationProvider can identify tokens it previously authenticated");
+		Assert.notNull(this.messages, "A message source must be set");
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.authenticationUserDetailsService, "An authenticationUserDetailsService must be set");
-        Assert.notNull(this.ticketValidator, "A ticketValidator must be set");
-        Assert.notNull(this.statelessTicketCache, "A statelessTicketCache must be set");
-        Assert.hasText(this.key, "A Key is required so CasAuthenticationProvider can identify tokens it previously authenticated");
-        Assert.notNull(this.messages, "A message source must be set");
-    }
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		if (!supports(authentication.getClass())) {
+			return null;
+		}
 
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        if (!supports(authentication.getClass())) {
-            return null;
-        }
+		if (authentication instanceof UsernamePasswordAuthenticationToken
+				&& (!CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER
+						.equals(authentication.getPrincipal().toString()) && !CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER
+						.equals(authentication.getPrincipal().toString()))) {
+			// UsernamePasswordAuthenticationToken not CAS related
+			return null;
+		}
 
-        if (authentication instanceof UsernamePasswordAuthenticationToken
-            && (!CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER.equals(authentication.getPrincipal().toString())
-            && !CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER.equals(authentication.getPrincipal().toString()))) {
-            // UsernamePasswordAuthenticationToken not CAS related
-            return null;
-        }
+		// If an existing CasAuthenticationToken, just check we created it
+		if (authentication instanceof CasAuthenticationToken) {
+			if (this.key.hashCode() == ((CasAuthenticationToken) authentication)
+					.getKeyHash()) {
+				return authentication;
+			}
+			else {
+				throw new BadCredentialsException(
+						messages.getMessage("CasAuthenticationProvider.incorrectKey",
+								"The presented CasAuthenticationToken does not contain the expected key"));
+			}
+		}
 
-        // If an existing CasAuthenticationToken, just check we created it
-        if (authentication instanceof CasAuthenticationToken) {
-            if (this.key.hashCode() == ((CasAuthenticationToken) authentication).getKeyHash()) {
-                return authentication;
-            } else {
-                throw new BadCredentialsException(messages.getMessage("CasAuthenticationProvider.incorrectKey",
-                        "The presented CasAuthenticationToken does not contain the expected key"));
-            }
-        }
+		// Ensure credentials are presented
+		if ((authentication.getCredentials() == null)
+				|| "".equals(authentication.getCredentials())) {
+			throw new BadCredentialsException(messages.getMessage(
+					"CasAuthenticationProvider.noServiceTicket",
+					"Failed to provide a CAS service ticket to validate"));
+		}
 
-        // Ensure credentials are presented
-        if ((authentication.getCredentials() == null) || "".equals(authentication.getCredentials())) {
-            throw new BadCredentialsException(messages.getMessage("CasAuthenticationProvider.noServiceTicket",
-                    "Failed to provide a CAS service ticket to validate"));
-        }
+		boolean stateless = false;
 
-        boolean stateless = false;
+		if (authentication instanceof UsernamePasswordAuthenticationToken
+				&& CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER.equals(authentication
+						.getPrincipal())) {
+			stateless = true;
+		}
 
-        if (authentication instanceof UsernamePasswordAuthenticationToken
-            && CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER.equals(authentication.getPrincipal())) {
-            stateless = true;
-        }
+		CasAuthenticationToken result = null;
 
-        CasAuthenticationToken result = null;
+		if (stateless) {
+			// Try to obtain from cache
+			result = statelessTicketCache.getByTicketId(authentication.getCredentials()
+					.toString());
+		}
 
-        if (stateless) {
-            // Try to obtain from cache
-            result = statelessTicketCache.getByTicketId(authentication.getCredentials().toString());
-        }
+		if (result == null) {
+			result = this.authenticateNow(authentication);
+			result.setDetails(authentication.getDetails());
+		}
 
-        if (result == null) {
-            result = this.authenticateNow(authentication);
-            result.setDetails(authentication.getDetails());
-        }
+		if (stateless) {
+			// Add to cache
+			statelessTicketCache.putTicketInCache(result);
+		}
 
-        if (stateless) {
-            // Add to cache
-            statelessTicketCache.putTicketInCache(result);
-        }
+		return result;
+	}
 
-        return result;
-    }
+	private CasAuthenticationToken authenticateNow(final Authentication authentication)
+			throws AuthenticationException {
+		try {
+			final Assertion assertion = this.ticketValidator.validate(authentication
+					.getCredentials().toString(), getServiceUrl(authentication));
+			final UserDetails userDetails = loadUserByAssertion(assertion);
+			userDetailsChecker.check(userDetails);
+			return new CasAuthenticationToken(this.key, userDetails,
+					authentication.getCredentials(),
+					authoritiesMapper.mapAuthorities(userDetails.getAuthorities()),
+					userDetails, assertion);
+		}
+		catch (final TicketValidationException e) {
+			throw new BadCredentialsException(e.getMessage(), e);
+		}
+	}
 
-    private CasAuthenticationToken authenticateNow(final Authentication authentication) throws AuthenticationException {
-        try {
-            final Assertion assertion = this.ticketValidator.validate(authentication.getCredentials().toString(), getServiceUrl(authentication));
-            final UserDetails userDetails = loadUserByAssertion(assertion);
-            userDetailsChecker.check(userDetails);
-            return new CasAuthenticationToken(this.key, userDetails, authentication.getCredentials(),
-                    authoritiesMapper.mapAuthorities(userDetails.getAuthorities()), userDetails, assertion);
-        } catch (final TicketValidationException e) {
-            throw new BadCredentialsException(e.getMessage(), e);
-        }
-    }
+	/**
+	 * Gets the serviceUrl. If the {@link Authentication#getDetails()} is an instance of
+	 * {@link ServiceAuthenticationDetails}, then
+	 * {@link ServiceAuthenticationDetails#getServiceUrl()} is used. Otherwise, the
+	 * {@link ServiceProperties#getService()} is used.
+	 *
+	 * @param authentication
+	 * @return
+	 */
+	private String getServiceUrl(Authentication authentication) {
+		String serviceUrl;
+		if (authentication.getDetails() instanceof ServiceAuthenticationDetails) {
+			serviceUrl = ((ServiceAuthenticationDetails) authentication.getDetails())
+					.getServiceUrl();
+		}
+		else if (serviceProperties == null) {
+			throw new IllegalStateException(
+					"serviceProperties cannot be null unless Authentication.getDetails() implements ServiceAuthenticationDetails.");
+		}
+		else if (serviceProperties.getService() == null) {
+			throw new IllegalStateException(
+					"serviceProperties.getService() cannot be null unless Authentication.getDetails() implements ServiceAuthenticationDetails.");
+		}
+		else {
+			serviceUrl = serviceProperties.getService();
+		}
+		if (logger.isDebugEnabled()) {
+			logger.debug("serviceUrl = " + serviceUrl);
+		}
+		return serviceUrl;
+	}
 
-    /**
-     * Gets the serviceUrl. If the {@link Authentication#getDetails()} is an
-     * instance of {@link ServiceAuthenticationDetails}, then
-     * {@link ServiceAuthenticationDetails#getServiceUrl()} is used. Otherwise,
-     * the {@link ServiceProperties#getService()} is used.
-     *
-     * @param authentication
-     * @return
-     */
-    private String getServiceUrl(Authentication authentication) {
-        String serviceUrl;
-        if(authentication.getDetails() instanceof ServiceAuthenticationDetails) {
-            serviceUrl = ((ServiceAuthenticationDetails)authentication.getDetails()).getServiceUrl();
-        }else if(serviceProperties == null){
-            throw new IllegalStateException("serviceProperties cannot be null unless Authentication.getDetails() implements ServiceAuthenticationDetails.");
-        }else if(serviceProperties.getService() == null){
-            throw new IllegalStateException("serviceProperties.getService() cannot be null unless Authentication.getDetails() implements ServiceAuthenticationDetails.");
-        }else {
-            serviceUrl = serviceProperties.getService();
-        }
-        if(logger.isDebugEnabled()) {
-            logger.debug("serviceUrl = "+serviceUrl);
-        }
-        return serviceUrl;
-    }
+	/**
+	 * Template method for retrieving the UserDetails based on the assertion. Default is
+	 * to call configured userDetailsService and pass the username. Deployers can override
+	 * this method and retrieve the user based on any criteria they desire.
+	 *
+	 * @param assertion The CAS Assertion.
+	 * @return the UserDetails.
+	 */
+	protected UserDetails loadUserByAssertion(final Assertion assertion) {
+		final CasAssertionAuthenticationToken token = new CasAssertionAuthenticationToken(
+				assertion, "");
+		return this.authenticationUserDetailsService.loadUserDetails(token);
+	}
 
-    /**
-     * Template method for retrieving the UserDetails based on the assertion.  Default is to call configured userDetailsService and pass the username.  Deployers
-     * can override this method and retrieve the user based on any criteria they desire.
-     *
-     * @param assertion The CAS Assertion.
-     * @return the UserDetails.
-     */
-    protected UserDetails loadUserByAssertion(final Assertion assertion) {
-        final CasAssertionAuthenticationToken token = new CasAssertionAuthenticationToken(assertion, "");
-        return this.authenticationUserDetailsService.loadUserDetails(token);
-    }
+	@SuppressWarnings("unchecked")
+	/**
+	 * Sets the UserDetailsService to use. This is a convenience method to invoke
+	 */
+	public void setUserDetailsService(final UserDetailsService userDetailsService) {
+		this.authenticationUserDetailsService = new UserDetailsByNameServiceWrapper(
+				userDetailsService);
+	}
 
-    @SuppressWarnings("unchecked")
-    /**
-     * Sets the UserDetailsService to use. This is a convenience method to invoke
-     */
-    public void setUserDetailsService(final UserDetailsService userDetailsService) {
-        this.authenticationUserDetailsService = new UserDetailsByNameServiceWrapper(userDetailsService);
-    }
+	public void setAuthenticationUserDetailsService(
+			final AuthenticationUserDetailsService<CasAssertionAuthenticationToken> authenticationUserDetailsService) {
+		this.authenticationUserDetailsService = authenticationUserDetailsService;
+	}
 
+	public void setServiceProperties(final ServiceProperties serviceProperties) {
+		this.serviceProperties = serviceProperties;
+	}
 
-    public void setAuthenticationUserDetailsService(final AuthenticationUserDetailsService<CasAssertionAuthenticationToken> authenticationUserDetailsService) {
-        this.authenticationUserDetailsService = authenticationUserDetailsService;
-    }
+	protected String getKey() {
+		return key;
+	}
 
-    public void setServiceProperties(final ServiceProperties serviceProperties) {
-        this.serviceProperties = serviceProperties;
-    }
+	public void setKey(String key) {
+		this.key = key;
+	}
 
-    protected String getKey() {
-        return key;
-    }
+	public StatelessTicketCache getStatelessTicketCache() {
+		return statelessTicketCache;
+	}
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+	protected TicketValidator getTicketValidator() {
+		return ticketValidator;
+	}
 
-    public StatelessTicketCache getStatelessTicketCache() {
-        return statelessTicketCache;
-    }
+	public void setMessageSource(final MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    protected TicketValidator getTicketValidator() {
-        return ticketValidator;
-    }
+	public void setStatelessTicketCache(final StatelessTicketCache statelessTicketCache) {
+		this.statelessTicketCache = statelessTicketCache;
+	}
 
-    public void setMessageSource(final MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setTicketValidator(final TicketValidator ticketValidator) {
+		this.ticketValidator = ticketValidator;
+	}
 
-    public void setStatelessTicketCache(final StatelessTicketCache statelessTicketCache) {
-        this.statelessTicketCache = statelessTicketCache;
-    }
+	public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
+		this.authoritiesMapper = authoritiesMapper;
+	}
 
-    public void setTicketValidator(final TicketValidator ticketValidator) {
-        this.ticketValidator = ticketValidator;
-    }
-
-    public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
-        this.authoritiesMapper = authoritiesMapper;
-    }
-
-    public boolean supports(final Class<?> authentication) {
-        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication)) ||
-           (CasAuthenticationToken.class.isAssignableFrom(authentication)) ||
-           (CasAssertionAuthenticationToken.class.isAssignableFrom(authentication));
-    }
+	public boolean supports(final Class<?> authentication) {
+		return (UsernamePasswordAuthenticationToken.class
+				.isAssignableFrom(authentication))
+				|| (CasAuthenticationToken.class.isAssignableFrom(authentication))
+				|| (CasAssertionAuthenticationToken.class
+						.isAssignableFrom(authentication));
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
index ffa7897809..2aa93587bb 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
@@ -30,103 +30,114 @@ import org.springframework.security.core.userdetails.UserDetails;
  * @author Ben Alex
  * @author Scott Battaglia
  */
-public class CasAuthenticationToken extends AbstractAuthenticationToken implements Serializable {
+public class CasAuthenticationToken extends AbstractAuthenticationToken implements
+		Serializable {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
-    private final Object credentials;
-    private final Object principal;
-    private final UserDetails userDetails;
-    private final int keyHash;
-    private final Assertion assertion;
+	// ~ Instance fields
+	// ================================================================================================
+	private final Object credentials;
+	private final Object principal;
+	private final UserDetails userDetails;
+	private final int keyHash;
+	private final Assertion assertion;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor.
-     *
-     * @param key to identify if this object made by a given {@link
-     *        CasAuthenticationProvider}
-     * @param principal typically the UserDetails object (cannot  be <code>null</code>)
-     * @param credentials the service/proxy ticket ID from CAS (cannot be
-     *        <code>null</code>)
-     * @param authorities the authorities granted to the user (from the {@link
-     *        org.springframework.security.core.userdetails.UserDetailsService}) (cannot be <code>null</code>)
-     * @param userDetails the user details (from the {@link
-     *        org.springframework.security.core.userdetails.UserDetailsService}) (cannot be <code>null</code>)
-     * @param assertion the assertion returned from the CAS servers.  It contains the principal and how to obtain a
-     *        proxy ticket for the user.
-     *
-     * @throws IllegalArgumentException if a <code>null</code> was passed
-     */
-    public CasAuthenticationToken(final String key, final Object principal, final Object credentials,
-        final Collection<? extends GrantedAuthority> authorities, final UserDetails userDetails, final Assertion assertion) {
-        super(authorities);
+	/**
+	 * Constructor.
+	 *
+	 * @param key to identify if this object made by a given
+	 * {@link CasAuthenticationProvider}
+	 * @param principal typically the UserDetails object (cannot be <code>null</code>)
+	 * @param credentials the service/proxy ticket ID from CAS (cannot be
+	 * <code>null</code>)
+	 * @param authorities the authorities granted to the user (from the
+	 * {@link org.springframework.security.core.userdetails.UserDetailsService}) (cannot
+	 * be <code>null</code>)
+	 * @param userDetails the user details (from the
+	 * {@link org.springframework.security.core.userdetails.UserDetailsService}) (cannot
+	 * be <code>null</code>)
+	 * @param assertion the assertion returned from the CAS servers. It contains the
+	 * principal and how to obtain a proxy ticket for the user.
+	 *
+	 * @throws IllegalArgumentException if a <code>null</code> was passed
+	 */
+	public CasAuthenticationToken(final String key, final Object principal,
+			final Object credentials,
+			final Collection<? extends GrantedAuthority> authorities,
+			final UserDetails userDetails, final Assertion assertion) {
+		super(authorities);
 
-        if ((key == null) || ("".equals(key)) || (principal == null) || "".equals(principal) || (credentials == null)
-            || "".equals(credentials) || (authorities == null) || (userDetails == null) || (assertion == null)) {
-            throw new IllegalArgumentException("Cannot pass null or empty values to constructor");
-        }
+		if ((key == null) || ("".equals(key)) || (principal == null)
+				|| "".equals(principal) || (credentials == null)
+				|| "".equals(credentials) || (authorities == null)
+				|| (userDetails == null) || (assertion == null)) {
+			throw new IllegalArgumentException(
+					"Cannot pass null or empty values to constructor");
+		}
 
-        this.keyHash = key.hashCode();
-        this.principal = principal;
-        this.credentials = credentials;
-        this.userDetails = userDetails;
-        this.assertion = assertion;
-        setAuthenticated(true);
-    }
+		this.keyHash = key.hashCode();
+		this.principal = principal;
+		this.credentials = credentials;
+		this.userDetails = userDetails;
+		this.assertion = assertion;
+		setAuthenticated(true);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(final Object obj) {
-        if (!super.equals(obj)) {
-            return false;
-        }
+	public boolean equals(final Object obj) {
+		if (!super.equals(obj)) {
+			return false;
+		}
 
-        if (obj instanceof CasAuthenticationToken) {
-            CasAuthenticationToken test = (CasAuthenticationToken) obj;
+		if (obj instanceof CasAuthenticationToken) {
+			CasAuthenticationToken test = (CasAuthenticationToken) obj;
 
-            if (!this.assertion.equals(test.getAssertion())) {
-                return false;
-            }
+			if (!this.assertion.equals(test.getAssertion())) {
+				return false;
+			}
 
-            if (this.getKeyHash() != test.getKeyHash()) {
-                return false;
-            }
+			if (this.getKeyHash() != test.getKeyHash()) {
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public Object getCredentials() {
-        return this.credentials;
-    }
+	public Object getCredentials() {
+		return this.credentials;
+	}
 
-    public int getKeyHash() {
-        return this.keyHash;
-    }
+	public int getKeyHash() {
+		return this.keyHash;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 
-    public Assertion getAssertion() {
-        return this.assertion;
-    }
+	public Assertion getAssertion() {
+		return this.assertion;
+	}
 
-    public UserDetails getUserDetails() {
-        return userDetails;
-    }
+	public UserDetails getUserDetails() {
+		return userDetails;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString());
-        sb.append(" Assertion: ").append(this.assertion);
-        sb.append(" Credentials (Service/Proxy Ticket): ").append(this.credentials);
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString());
+		sb.append(" Assertion: ").append(this.assertion);
+		sb.append(" Credentials (Service/Proxy Ticket): ").append(this.credentials);
 
-        return (sb.toString());
-    }
+		return (sb.toString());
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
index 0d9cee19e2..8097fd7904 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
@@ -23,64 +23,68 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-
 /**
- * Caches tickets using a Spring IoC defined <a href="http://ehcache.sourceforge.net">EHCACHE</a>.
+ * Caches tickets using a Spring IoC defined <a
+ * href="http://ehcache.sourceforge.net">EHCACHE</a>.
  *
  * @author Ben Alex
  */
 public class EhCacheBasedTicketCache implements StatelessTicketCache, InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(EhCacheBasedTicketCache.class);
+	private static final Log logger = LogFactory.getLog(EhCacheBasedTicketCache.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Ehcache cache;
+	private Ehcache cache;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(cache, "cache mandatory");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(cache, "cache mandatory");
+	}
 
-    public CasAuthenticationToken getByTicketId(final String serviceTicket) {
-        final Element element = cache.get(serviceTicket);
+	public CasAuthenticationToken getByTicketId(final String serviceTicket) {
+		final Element element = cache.get(serviceTicket);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache hit: " + (element != null) + "; service ticket: "
+					+ serviceTicket);
+		}
 
-        return element == null ? null : (CasAuthenticationToken) element.getValue();
-    }
+		return element == null ? null : (CasAuthenticationToken) element.getValue();
+	}
 
-    public Ehcache getCache() {
-        return cache;
-    }
+	public Ehcache getCache() {
+		return cache;
+	}
 
-    public void putTicketInCache(final CasAuthenticationToken token) {
-        final Element element = new Element(token.getCredentials().toString(), token);
+	public void putTicketInCache(final CasAuthenticationToken token) {
+		final Element element = new Element(token.getCredentials().toString(), token);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache put: " + element.getKey());
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache put: " + element.getKey());
+		}
 
-        cache.put(element);
-    }
+		cache.put(element);
+	}
 
-    public void removeTicketFromCache(final CasAuthenticationToken token) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache remove: " + token.getCredentials().toString());
-        }
+	public void removeTicketFromCache(final CasAuthenticationToken token) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache remove: " + token.getCredentials().toString());
+		}
 
-        this.removeTicketFromCache(token.getCredentials().toString());
-    }
+		this.removeTicketFromCache(token.getCredentials().toString());
+	}
 
-    public void removeTicketFromCache(final String serviceTicket) {
-        cache.remove(serviceTicket);
-    }
+	public void removeTicketFromCache(final String serviceTicket) {
+		cache.remove(serviceTicket);
+	}
 
-    public void setCache(final Ehcache cache) {
-        this.cache = cache;
-    }
+	public void setCache(final Ehcache cache) {
+		this.cache = cache;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java
index 9f63863ef7..a268fc3bfe 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/NullStatelessTicketCache.java
@@ -14,46 +14,45 @@
  */
 package org.springframework.security.cas.authentication;
 
-
 /**
- * Implementation of @link {@link StatelessTicketCache} that has no backing cache.  Useful
+ * Implementation of @link {@link StatelessTicketCache} that has no backing cache. Useful
  * in instances where storing of tickets for stateless session management is not required.
  * <p>
- * This is the default StatelessTicketCache of the @link {@link CasAuthenticationProvider} to
- * eliminate the unnecessary dependency on EhCache that applications have even if they are not using
- * the stateless session management.
+ * This is the default StatelessTicketCache of the @link {@link CasAuthenticationProvider}
+ * to eliminate the unnecessary dependency on EhCache that applications have even if they
+ * are not using the stateless session management.
  *
  * @author Scott Battaglia
  *
- *@see CasAuthenticationProvider
+ * @see CasAuthenticationProvider
  */
 public final class NullStatelessTicketCache implements StatelessTicketCache {
 
-    /**
-     * @return null since we are not storing any tickets.
-     */
-    public CasAuthenticationToken getByTicketId(final String serviceTicket) {
-        return null;
-    }
+	/**
+	 * @return null since we are not storing any tickets.
+	 */
+	public CasAuthenticationToken getByTicketId(final String serviceTicket) {
+		return null;
+	}
 
-    /**
-     * This is a no-op since we are not storing tickets.
-     */
-    public void putTicketInCache(final CasAuthenticationToken token) {
-        // nothing to do
-    }
+	/**
+	 * This is a no-op since we are not storing tickets.
+	 */
+	public void putTicketInCache(final CasAuthenticationToken token) {
+		// nothing to do
+	}
 
-    /**
-     * This is a no-op since we are not storing tickets.
-     */
-    public void removeTicketFromCache(final CasAuthenticationToken token) {
-        // nothing to do
-    }
+	/**
+	 * This is a no-op since we are not storing tickets.
+	 */
+	public void removeTicketFromCache(final CasAuthenticationToken token) {
+		// nothing to do
+	}
 
-    /**
-     * This is a no-op since we are not storing tickets.
-     */
-    public void removeTicketFromCache(final String serviceTicket) {
-        // nothing to do
-    }
+	/**
+	 * This is a no-op since we are not storing tickets.
+	 */
+	public void removeTicketFromCache(final String serviceTicket) {
+		// nothing to do
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
index fb94bd32cc..b0961b3dd2 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
@@ -20,7 +20,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.cache.Cache;
 import org.springframework.util.Assert;
 
-
 /**
  * Caches tickets using a Spring IoC defined {@link Cache}.
  *
@@ -29,52 +28,59 @@ import org.springframework.util.Assert;
  *
  */
 public class SpringCacheBasedTicketCache implements StatelessTicketCache {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(SpringCacheBasedTicketCache.class);
+	private static final Log logger = LogFactory
+			.getLog(SpringCacheBasedTicketCache.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Cache cache;
+	private final Cache cache;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SpringCacheBasedTicketCache(Cache cache) throws Exception {
-        Assert.notNull(cache, "cache mandatory");
-        this.cache = cache;
-    }
+	public SpringCacheBasedTicketCache(Cache cache) throws Exception {
+		Assert.notNull(cache, "cache mandatory");
+		this.cache = cache;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public CasAuthenticationToken getByTicketId(final String serviceTicket) {
-        final Cache.ValueWrapper element = serviceTicket != null ? cache.get(serviceTicket) : null;
+	public CasAuthenticationToken getByTicketId(final String serviceTicket) {
+		final Cache.ValueWrapper element = serviceTicket != null ? cache
+				.get(serviceTicket) : null;
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache hit: " + (element != null) + "; service ticket: "
+					+ serviceTicket);
+		}
 
-        return element == null ? null : (CasAuthenticationToken) element.get();
-    }
+		return element == null ? null : (CasAuthenticationToken) element.get();
+	}
 
-    public void putTicketInCache(final CasAuthenticationToken token) {
-        String key = token.getCredentials().toString();
+	public void putTicketInCache(final CasAuthenticationToken token) {
+		String key = token.getCredentials().toString();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache put: " + key);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache put: " + key);
+		}
 
-        cache.put(key, token);
-    }
+		cache.put(key, token);
+	}
 
-    public void removeTicketFromCache(final CasAuthenticationToken token) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache remove: " + token.getCredentials().toString());
-        }
+	public void removeTicketFromCache(final CasAuthenticationToken token) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache remove: " + token.getCredentials().toString());
+		}
 
-        this.removeTicketFromCache(token.getCredentials().toString());
-    }
+		this.removeTicketFromCache(token.getCredentials().toString());
+	}
 
-    public void removeTicketFromCache(final String serviceTicket) {
-        cache.evict(serviceTicket);
-    }
+	public void removeTicketFromCache(final String serviceTicket) {
+		cache.evict(serviceTicket);
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java
index 6d9b22ec54..02f2094b08 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/StatelessTicketCache.java
@@ -19,97 +19,95 @@ package org.springframework.security.cas.authentication;
  * Caches CAS service tickets and CAS proxy tickets for stateless connections.
  *
  * <p>
- * When a service ticket or proxy ticket is validated against the CAS server,
- * it is unable to be used again. Most types of callers are stateful and are
- * associated with a given <code>HttpSession</code>. This allows the
- * affirmative CAS validation outcome to be stored in the
- * <code>HttpSession</code>, meaning the removal of the ticket from the CAS
+ * When a service ticket or proxy ticket is validated against the CAS server, it is unable
+ * to be used again. Most types of callers are stateful and are associated with a given
+ * <code>HttpSession</code>. This allows the affirmative CAS validation outcome to be
+ * stored in the <code>HttpSession</code>, meaning the removal of the ticket from the CAS
  * server is not an issue.
  * </p>
  *
  * <P>
  * Stateless callers, such as remoting protocols, cannot take advantage of
- * <code>HttpSession</code>. If the stateless caller is located a significant
- * network distance from the CAS server, acquiring a fresh service ticket or
- * proxy ticket for each invocation would be expensive.
+ * <code>HttpSession</code>. If the stateless caller is located a significant network
+ * distance from the CAS server, acquiring a fresh service ticket or proxy ticket for each
+ * invocation would be expensive.
  * </p>
  *
  * <P>
- * To avoid this issue with stateless callers, it is expected stateless callers
- * will obtain a single service ticket or proxy ticket, and then present this
- * same ticket to the Spring Security secured application on each
- * occasion. As no <code>HttpSession</code> is available for such callers, the
- * affirmative CAS validation outcome cannot be stored in this location.
+ * To avoid this issue with stateless callers, it is expected stateless callers will
+ * obtain a single service ticket or proxy ticket, and then present this same ticket to
+ * the Spring Security secured application on each occasion. As no
+ * <code>HttpSession</code> is available for such callers, the affirmative CAS validation
+ * outcome cannot be stored in this location.
  * </p>
  *
  * <P>
- * The <code>StatelessTicketCache</code> enables the service tickets and proxy
- * tickets belonging to stateless callers to be placed in a cache. This
- * in-memory cache stores the <code>CasAuthenticationToken</code>, effectively
- * providing the same capability as a <code>HttpSession</code> with the ticket
- * identifier being the key rather than a session identifier.
+ * The <code>StatelessTicketCache</code> enables the service tickets and proxy tickets
+ * belonging to stateless callers to be placed in a cache. This in-memory cache stores the
+ * <code>CasAuthenticationToken</code>, effectively providing the same capability as a
+ * <code>HttpSession</code> with the ticket identifier being the key rather than a session
+ * identifier.
  * </p>
  *
  * <P>
- * Implementations should provide a reasonable timeout on stored entries, such
- * that the stateless caller are not required to unnecessarily acquire fresh
- * CAS service tickets or proxy tickets.
+ * Implementations should provide a reasonable timeout on stored entries, such that the
+ * stateless caller are not required to unnecessarily acquire fresh CAS service tickets or
+ * proxy tickets.
  * </p>
  *
  * @author Ben Alex
  */
 public interface StatelessTicketCache {
-    //~ Methods ================================================================
+	// ~ Methods ================================================================
 
-    /**
-     * Retrieves the <code>CasAuthenticationToken</code> associated with the
-     * specified ticket.
-     *
-     * <P>
-     * If not found, returns a
-     * <code>null</code><code>CasAuthenticationToken</code>.
-     * </p>
-     *
-     * @return the fully populated authentication token
-     */
-    CasAuthenticationToken getByTicketId(String serviceTicket);
+	/**
+	 * Retrieves the <code>CasAuthenticationToken</code> associated with the specified
+	 * ticket.
+	 *
+	 * <P>
+	 * If not found, returns a <code>null</code><code>CasAuthenticationToken</code>.
+	 * </p>
+	 *
+	 * @return the fully populated authentication token
+	 */
+	CasAuthenticationToken getByTicketId(String serviceTicket);
 
-    /**
-     * Adds the specified <code>CasAuthenticationToken</code> to the cache.
-     *
-     * <P>
-     * The {@link CasAuthenticationToken#getCredentials()} method is used to
-     * retrieve the service ticket number.
-     * </p>
-     *
-     * @param token to be added to the cache
-     */
-    void putTicketInCache(CasAuthenticationToken token);
+	/**
+	 * Adds the specified <code>CasAuthenticationToken</code> to the cache.
+	 *
+	 * <P>
+	 * The {@link CasAuthenticationToken#getCredentials()} method is used to retrieve the
+	 * service ticket number.
+	 * </p>
+	 *
+	 * @param token to be added to the cache
+	 */
+	void putTicketInCache(CasAuthenticationToken token);
 
-    /**
-     * Removes the specified ticket from the cache, as per  {@link
-     * #removeTicketFromCache(String)}.
-     *
-     * <P>
-     * Implementations should use {@link
-     * CasAuthenticationToken#getCredentials()} to obtain the ticket and then
-     * delegate to to the  {@link #removeTicketFromCache(String)} method.
-     * </p>
-     *
-     * @param token to be removed
-     */
-    void removeTicketFromCache(CasAuthenticationToken token);
+	/**
+	 * Removes the specified ticket from the cache, as per
+	 * {@link #removeTicketFromCache(String)}.
+	 *
+	 * <P>
+	 * Implementations should use {@link CasAuthenticationToken#getCredentials()} to
+	 * obtain the ticket and then delegate to to the
+	 * {@link #removeTicketFromCache(String)} method.
+	 * </p>
+	 *
+	 * @param token to be removed
+	 */
+	void removeTicketFromCache(CasAuthenticationToken token);
 
-    /**
-     * Removes the specified ticket from the cache, meaning that future calls
-     * will require a new service ticket.
-     *
-     * <P>
-     * This is in case applications wish to provide a session termination
-     * capability for their stateless clients.
-     * </p>
-     *
-     * @param serviceTicket to be removed
-     */
-    void removeTicketFromCache(String serviceTicket);
+	/**
+	 * Removes the specified ticket from the cache, meaning that future calls will require
+	 * a new service ticket.
+	 *
+	 * <P>
+	 * This is in case applications wish to provide a session termination capability for
+	 * their stateless clients.
+	 * </p>
+	 *
+	 * @param serviceTicket to be removed
+	 */
+	void removeTicketFromCache(String serviceTicket);
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
index 0e19ef0e7d..939f21d895 100644
--- a/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
+++ b/cas/src/main/java/org/springframework/security/cas/userdetails/AbstractCasAssertionUserDetailsService.java
@@ -20,25 +20,28 @@ import org.springframework.security.core.userdetails.AuthenticationUserDetailsSe
 import org.springframework.security.core.userdetails.UserDetails;
 
 /**
- * Abstract class for using the provided CAS assertion to construct a new User object.  This generally is most
- * useful when combined with a SAML-based response from the CAS Server/client.
+ * Abstract class for using the provided CAS assertion to construct a new User object.
+ * This generally is most useful when combined with a SAML-based response from the CAS
+ * Server/client.
  *
  * @author Scott Battaglia
  * @since 3.0
  */
-public abstract class AbstractCasAssertionUserDetailsService
-        implements AuthenticationUserDetailsService<CasAssertionAuthenticationToken> {
+public abstract class AbstractCasAssertionUserDetailsService implements
+		AuthenticationUserDetailsService<CasAssertionAuthenticationToken> {
 
-    public final UserDetails loadUserDetails(final CasAssertionAuthenticationToken token) {
-        return loadUserDetails(token.getAssertion());
-    }
+	public final UserDetails loadUserDetails(final CasAssertionAuthenticationToken token) {
+		return loadUserDetails(token.getAssertion());
+	}
 
-    /**
-     * Protected template method for construct a {@link org.springframework.security.core.userdetails.UserDetails} via the supplied CAS
-     * assertion.
-     *
-     * @param assertion the assertion to use to construct the new UserDetails.  CANNOT be NULL.
-     * @return the newly constructed UserDetails.
-     */
-    protected abstract UserDetails loadUserDetails(Assertion assertion);
+	/**
+	 * Protected template method for construct a
+	 * {@link org.springframework.security.core.userdetails.UserDetails} via the supplied
+	 * CAS assertion.
+	 *
+	 * @param assertion the assertion to use to construct the new UserDetails. CANNOT be
+	 * NULL.
+	 * @return the newly constructed UserDetails.
+	 */
+	protected abstract UserDetails loadUserDetails(Assertion assertion);
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java
index 1f11037ba4..b44db23fea 100644
--- a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java
+++ b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java
@@ -25,61 +25,71 @@ import java.util.List;
 import java.util.ArrayList;
 
 /**
- * Populates the {@link org.springframework.security.core.GrantedAuthority}s for a user by reading a list of attributes that were returned as
- * part of the CAS response.  Each attribute is read and each value of the attribute is turned into a GrantedAuthority.  If the attribute has no
- * value then its not added.
+ * Populates the {@link org.springframework.security.core.GrantedAuthority}s for a user by
+ * reading a list of attributes that were returned as part of the CAS response. Each
+ * attribute is read and each value of the attribute is turned into a GrantedAuthority. If
+ * the attribute has no value then its not added.
  *
  * @author Scott Battaglia
  * @since 3.0
  */
-public final class GrantedAuthorityFromAssertionAttributesUserDetailsService extends AbstractCasAssertionUserDetailsService {
+public final class GrantedAuthorityFromAssertionAttributesUserDetailsService extends
+		AbstractCasAssertionUserDetailsService {
 
-    private static final String NON_EXISTENT_PASSWORD_VALUE = "NO_PASSWORD";
+	private static final String NON_EXISTENT_PASSWORD_VALUE = "NO_PASSWORD";
 
-    private final String[] attributes;
+	private final String[] attributes;
 
-    private boolean convertToUpperCase = true;
+	private boolean convertToUpperCase = true;
 
-    public GrantedAuthorityFromAssertionAttributesUserDetailsService(final String[] attributes) {
-        Assert.notNull(attributes, "attributes cannot be null.");
-        Assert.isTrue(attributes.length > 0, "At least one attribute is required to retrieve roles from.");
-        this.attributes = attributes;
-    }
+	public GrantedAuthorityFromAssertionAttributesUserDetailsService(
+			final String[] attributes) {
+		Assert.notNull(attributes, "attributes cannot be null.");
+		Assert.isTrue(attributes.length > 0,
+				"At least one attribute is required to retrieve roles from.");
+		this.attributes = attributes;
+	}
 
-    @SuppressWarnings("unchecked")
-    @Override
-    protected UserDetails loadUserDetails(final Assertion assertion) {
-        final List<GrantedAuthority> grantedAuthorities = new ArrayList<GrantedAuthority>();
+	@SuppressWarnings("unchecked")
+	@Override
+	protected UserDetails loadUserDetails(final Assertion assertion) {
+		final List<GrantedAuthority> grantedAuthorities = new ArrayList<GrantedAuthority>();
 
-        for (final String attribute : this.attributes) {
-            final Object value = assertion.getPrincipal().getAttributes().get(attribute);
+		for (final String attribute : this.attributes) {
+			final Object value = assertion.getPrincipal().getAttributes().get(attribute);
 
-            if (value == null) {
-                continue;
-            }
+			if (value == null) {
+				continue;
+			}
 
-            if (value instanceof List) {
-                final List list = (List) value;
+			if (value instanceof List) {
+				final List list = (List) value;
 
-                for (final Object o : list) {
-                    grantedAuthorities.add(new SimpleGrantedAuthority(this.convertToUpperCase ? o.toString().toUpperCase() : o.toString()));
-                }
+				for (final Object o : list) {
+					grantedAuthorities.add(new SimpleGrantedAuthority(
+							this.convertToUpperCase ? o.toString().toUpperCase() : o
+									.toString()));
+				}
 
-            } else {
-                grantedAuthorities.add(new SimpleGrantedAuthority(this.convertToUpperCase ? value.toString().toUpperCase() : value.toString()));
-            }
+			}
+			else {
+				grantedAuthorities.add(new SimpleGrantedAuthority(
+						this.convertToUpperCase ? value.toString().toUpperCase() : value
+								.toString()));
+			}
 
-        }
+		}
 
-        return new User(assertion.getPrincipal().getName(), NON_EXISTENT_PASSWORD_VALUE, true, true, true, true, grantedAuthorities);
-    }
+		return new User(assertion.getPrincipal().getName(), NON_EXISTENT_PASSWORD_VALUE,
+				true, true, true, true, grantedAuthorities);
+	}
 
-    /**
-     * Converts the returned attribute values to uppercase values.
-     *
-     * @param convertToUpperCase true if it should convert, false otherwise.
-     */
-    public void setConvertToUpperCase(final boolean convertToUpperCase) {
-        this.convertToUpperCase = convertToUpperCase;
-    }
+	/**
+	 * Converts the returned attribute values to uppercase values.
+	 *
+	 * @param convertToUpperCase true if it should convert, false otherwise.
+	 */
+	public void setConvertToUpperCase(final boolean convertToUpperCase) {
+		this.convertToUpperCase = convertToUpperCase;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java
index 1e56f9346d..f4011f8240 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationEntryPoint.java
@@ -28,122 +28,140 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-
 /**
- * Used by the <code>ExceptionTranslationFilter</code> to commence authentication via the JA-SIG Central
- * Authentication Service (CAS).
+ * Used by the <code>ExceptionTranslationFilter</code> to commence authentication via the
+ * JA-SIG Central Authentication Service (CAS).
  * <p>
  * The user's browser will be redirected to the JA-SIG CAS enterprise-wide login page.
- * This page is specified by the <code>loginUrl</code> property. Once login is complete, the CAS login page will
- * redirect to the page indicated by the <code>service</code> property. The <code>service</code> is a HTTP URL
- * belonging to the current application. The <code>service</code> URL is monitored by the {@link CasAuthenticationFilter},
- * which will validate the CAS login was successful.
+ * This page is specified by the <code>loginUrl</code> property. Once login is complete,
+ * the CAS login page will redirect to the page indicated by the <code>service</code>
+ * property. The <code>service</code> is a HTTP URL belonging to the current application.
+ * The <code>service</code> URL is monitored by the {@link CasAuthenticationFilter}, which
+ * will validate the CAS login was successful.
  *
  * @author Ben Alex
  * @author Scott Battaglia
  */
-public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean {
-    //~ Instance fields ================================================================================================
-    private ServiceProperties serviceProperties;
+public class CasAuthenticationEntryPoint implements AuthenticationEntryPoint,
+		InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
+	private ServiceProperties serviceProperties;
 
-    private String loginUrl;
+	private String loginUrl;
 
-    /**
-     * Determines whether the Service URL should include the session id for the specific user.  As of CAS 3.0.5, the
-     * session id will automatically be stripped.  However, older versions of CAS (i.e. CAS 2), do not automatically
-     * strip the session identifier (this is a bug on the part of the older server implementations), so an option to
-     * disable the session encoding is provided for backwards compatibility.
-     *
-     * By default, encoding is enabled.
-     */
-    private boolean encodeServiceUrlWithSessionId = true;
+	/**
+	 * Determines whether the Service URL should include the session id for the specific
+	 * user. As of CAS 3.0.5, the session id will automatically be stripped. However,
+	 * older versions of CAS (i.e. CAS 2), do not automatically strip the session
+	 * identifier (this is a bug on the part of the older server implementations), so an
+	 * option to disable the session encoding is provided for backwards compatibility.
+	 *
+	 * By default, encoding is enabled.
+	 */
+	private boolean encodeServiceUrlWithSessionId = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(this.loginUrl, "loginUrl must be specified");
-        Assert.notNull(this.serviceProperties, "serviceProperties must be specified");
-        Assert.notNull(this.serviceProperties.getService(),"serviceProperties.getService() cannot be null.");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(this.loginUrl, "loginUrl must be specified");
+		Assert.notNull(this.serviceProperties, "serviceProperties must be specified");
+		Assert.notNull(this.serviceProperties.getService(),
+				"serviceProperties.getService() cannot be null.");
+	}
 
-    public final void commence(final HttpServletRequest servletRequest, final HttpServletResponse response,
-            final AuthenticationException authenticationException) throws IOException, ServletException {
+	public final void commence(final HttpServletRequest servletRequest,
+			final HttpServletResponse response,
+			final AuthenticationException authenticationException) throws IOException,
+			ServletException {
 
-        final String urlEncodedService = createServiceUrl(servletRequest, response);
-        final String redirectUrl = createRedirectUrl(urlEncodedService);
+		final String urlEncodedService = createServiceUrl(servletRequest, response);
+		final String redirectUrl = createRedirectUrl(urlEncodedService);
 
-        preCommence(servletRequest, response);
+		preCommence(servletRequest, response);
 
-        response.sendRedirect(redirectUrl);
-    }
+		response.sendRedirect(redirectUrl);
+	}
 
-    /**
-     * Constructs a new Service Url.  The default implementation relies on the CAS client to do the bulk of the work.
-     * @param request the HttpServletRequest
-     * @param response the HttpServlet Response
-     * @return the constructed service url.  CANNOT be NULL.
-     */
-    protected String createServiceUrl(final HttpServletRequest request, final HttpServletResponse response) {
-        return CommonUtils.constructServiceUrl(null, response, this.serviceProperties.getService(), null, this.serviceProperties.getArtifactParameter(), this.encodeServiceUrlWithSessionId);
-    }
+	/**
+	 * Constructs a new Service Url. The default implementation relies on the CAS client
+	 * to do the bulk of the work.
+	 * @param request the HttpServletRequest
+	 * @param response the HttpServlet Response
+	 * @return the constructed service url. CANNOT be NULL.
+	 */
+	protected String createServiceUrl(final HttpServletRequest request,
+			final HttpServletResponse response) {
+		return CommonUtils.constructServiceUrl(null, response,
+				this.serviceProperties.getService(), null,
+				this.serviceProperties.getArtifactParameter(),
+				this.encodeServiceUrlWithSessionId);
+	}
 
-    /**
-     * Constructs the Url for Redirection to the CAS server.  Default implementation relies on the CAS client to do the bulk of the work.
-     *
-     * @param serviceUrl the service url that should be included.
-     * @return the redirect url.  CANNOT be NULL.
-     */
-    protected String createRedirectUrl(final String serviceUrl) {
-        return CommonUtils.constructRedirectUrl(this.loginUrl, this.serviceProperties.getServiceParameter(), serviceUrl, this.serviceProperties.isSendRenew(), false);
-    }
+	/**
+	 * Constructs the Url for Redirection to the CAS server. Default implementation relies
+	 * on the CAS client to do the bulk of the work.
+	 *
+	 * @param serviceUrl the service url that should be included.
+	 * @return the redirect url. CANNOT be NULL.
+	 */
+	protected String createRedirectUrl(final String serviceUrl) {
+		return CommonUtils.constructRedirectUrl(this.loginUrl,
+				this.serviceProperties.getServiceParameter(), serviceUrl,
+				this.serviceProperties.isSendRenew(), false);
+	}
 
-    /**
-     * Template method for you to do your own pre-processing before the redirect occurs.
-     *
-     * @param request the HttpServletRequest
-     * @param response the HttpServletResponse
-     */
-    protected void preCommence(final HttpServletRequest request, final HttpServletResponse response) {
+	/**
+	 * Template method for you to do your own pre-processing before the redirect occurs.
+	 *
+	 * @param request the HttpServletRequest
+	 * @param response the HttpServletResponse
+	 */
+	protected void preCommence(final HttpServletRequest request,
+			final HttpServletResponse response) {
 
-    }
+	}
 
-    /**
-     * The enterprise-wide CAS login URL. Usually something like
-     * <code>https://www.mycompany.com/cas/login</code>.
-     *
-     * @return the enterprise-wide CAS login URL
-     */
-    public final String getLoginUrl() {
-        return this.loginUrl;
-    }
+	/**
+	 * The enterprise-wide CAS login URL. Usually something like
+	 * <code>https://www.mycompany.com/cas/login</code>.
+	 *
+	 * @return the enterprise-wide CAS login URL
+	 */
+	public final String getLoginUrl() {
+		return this.loginUrl;
+	}
 
-    public final ServiceProperties getServiceProperties() {
-        return this.serviceProperties;
-    }
+	public final ServiceProperties getServiceProperties() {
+		return this.serviceProperties;
+	}
 
-    public final void setLoginUrl(final String loginUrl) {
-        this.loginUrl = loginUrl;
-    }
+	public final void setLoginUrl(final String loginUrl) {
+		this.loginUrl = loginUrl;
+	}
 
-    public final void setServiceProperties(final ServiceProperties serviceProperties) {
-        this.serviceProperties = serviceProperties;
-    }
+	public final void setServiceProperties(final ServiceProperties serviceProperties) {
+		this.serviceProperties = serviceProperties;
+	}
 
-    /**
-     * Sets whether to encode the service url with the session id or not.
-     *
-     * @param encodeServiceUrlWithSessionId whether to encode the service url with the session id or not.
-     */
-    public final void setEncodeServiceUrlWithSessionId(final boolean encodeServiceUrlWithSessionId) {
-        this.encodeServiceUrlWithSessionId = encodeServiceUrlWithSessionId;
-    }
+	/**
+	 * Sets whether to encode the service url with the session id or not.
+	 *
+	 * @param encodeServiceUrlWithSessionId whether to encode the service url with the
+	 * session id or not.
+	 */
+	public final void setEncodeServiceUrlWithSessionId(
+			final boolean encodeServiceUrlWithSessionId) {
+		this.encodeServiceUrlWithSessionId = encodeServiceUrlWithSessionId;
+	}
 
-    /**
-     * Sets whether to encode the service url with the session id or not.
-     * @return whether to encode the service url with the session id or not.
-     *
-     */
-    protected boolean getEncodeServiceUrlWithSessionId() {
-        return this.encodeServiceUrlWithSessionId;
-    }
+	/**
+	 * Sets whether to encode the service url with the session id or not.
+	 * @return whether to encode the service url with the session id or not.
+	 *
+	 */
+	protected boolean getEncodeServiceUrlWithSessionId() {
+		return this.encodeServiceUrlWithSessionId;
+	}
 }
diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java
index e374067e03..f7f094907b 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java
@@ -43,51 +43,64 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * Processes a CAS service ticket, obtains proxy granting tickets, and processes proxy tickets.
- * <h2>Service Tickets</h2>
+ * Processes a CAS service ticket, obtains proxy granting tickets, and processes proxy
+ * tickets. <h2>Service Tickets</h2>
  * <p>
- * A service ticket consists of an opaque ticket string. It arrives at this filter by the user's browser successfully
- * authenticating using CAS, and then receiving a HTTP redirect to a <code>service</code>. The opaque ticket string is
- * presented in the <code>ticket</code> request parameter.
+ * A service ticket consists of an opaque ticket string. It arrives at this filter by the
+ * user's browser successfully authenticating using CAS, and then receiving a HTTP
+ * redirect to a <code>service</code>. The opaque ticket string is presented in the
+ * <code>ticket</code> request parameter.
  * <p>
- * This filter monitors the <code>service</code> URL so it can
- * receive the service ticket and process it. By default this filter processes the URL <tt>/login/cas</tt>.
- * When processing this URL, the value of {@link ServiceProperties#getService()} is used as the <tt>service</tt> when validating
- * the <code>ticket</code>. This means that it is important that {@link ServiceProperties#getService()} specifies the same value
- * as the <tt>filterProcessesUrl</tt>.
+ * This filter monitors the <code>service</code> URL so it can receive the service ticket
+ * and process it. By default this filter processes the URL <tt>/login/cas</tt>. When
+ * processing this URL, the value of {@link ServiceProperties#getService()} is used as the
+ * <tt>service</tt> when validating the <code>ticket</code>. This means that it is
+ * important that {@link ServiceProperties#getService()} specifies the same value as the
+ * <tt>filterProcessesUrl</tt>.
  * <p>
- * Processing the service ticket involves creating a <code>UsernamePasswordAuthenticationToken</code> which
- * uses {@link #CAS_STATEFUL_IDENTIFIER} for the <code>principal</code> and the opaque ticket string as the
- * <code>credentials</code>.
+ * Processing the service ticket involves creating a
+ * <code>UsernamePasswordAuthenticationToken</code> which uses
+ * {@link #CAS_STATEFUL_IDENTIFIER} for the <code>principal</code> and the opaque ticket
+ * string as the <code>credentials</code>.
  * <h2>Obtaining Proxy Granting Tickets</h2>
  * <p>
- * If specified, the filter can also monitor the <code>proxyReceptorUrl</code>. The filter will respond to requests matching
- * this url so that the CAS Server can provide a PGT to the filter. Note that in addition to the <code>proxyReceptorUrl</code> a non-null
- * <code>proxyGrantingTicketStorage</code> must be provided in order for the filter to respond to proxy receptor requests. By configuring
- * a shared {@link ProxyGrantingTicketStorage} between the {@link TicketValidator} and the CasAuthenticationFilter one can have the
- * CasAuthenticationFilter handle the proxying requirements for CAS.
+ * If specified, the filter can also monitor the <code>proxyReceptorUrl</code>. The filter
+ * will respond to requests matching this url so that the CAS Server can provide a PGT to
+ * the filter. Note that in addition to the <code>proxyReceptorUrl</code> a non-null
+ * <code>proxyGrantingTicketStorage</code> must be provided in order for the filter to
+ * respond to proxy receptor requests. By configuring a shared
+ * {@link ProxyGrantingTicketStorage} between the {@link TicketValidator} and the
+ * CasAuthenticationFilter one can have the CasAuthenticationFilter handle the proxying
+ * requirements for CAS.
  * <h2>Proxy Tickets</h2>
  * <p>
- * The filter can process tickets present on any url. This is useful when wanting to process proxy tickets. In order for proxy
- * tickets to get processed {@link ServiceProperties#isAuthenticateAllArtifacts()} must return <code>true</code>. Additionally,
- * if the request is already authenticated, authentication will <b>not</b> occur. Last, {@link AuthenticationDetailsSource#buildDetails(Object)}
- * must return a {@link ServiceAuthenticationDetails}. This can be accomplished using the {@link ServiceAuthenticationDetailsSource}.
- * In this case {@link ServiceAuthenticationDetails#getServiceUrl()} will be used for the service url.
+ * The filter can process tickets present on any url. This is useful when wanting to
+ * process proxy tickets. In order for proxy tickets to get processed
+ * {@link ServiceProperties#isAuthenticateAllArtifacts()} must return <code>true</code>.
+ * Additionally, if the request is already authenticated, authentication will <b>not</b>
+ * occur. Last, {@link AuthenticationDetailsSource#buildDetails(Object)} must return a
+ * {@link ServiceAuthenticationDetails}. This can be accomplished using the
+ * {@link ServiceAuthenticationDetailsSource}. In this case
+ * {@link ServiceAuthenticationDetails#getServiceUrl()} will be used for the service url.
  * <p>
- * Processing the proxy ticket involves creating a <code>UsernamePasswordAuthenticationToken</code> which
- * uses {@link #CAS_STATELESS_IDENTIFIER} for the <code>principal</code> and the opaque ticket string as the
- * <code>credentials</code>. When a proxy ticket is successfully authenticated, the FilterChain continues and the
+ * Processing the proxy ticket involves creating a
+ * <code>UsernamePasswordAuthenticationToken</code> which uses
+ * {@link #CAS_STATELESS_IDENTIFIER} for the <code>principal</code> and the opaque ticket
+ * string as the <code>credentials</code>. When a proxy ticket is successfully
+ * authenticated, the FilterChain continues and the
  * <code>authenticationSuccessHandler</code> is not used.
  * <h2>Notes about the <code>AuthenticationManager</code></h2>
  * <p>
- * The configured <code>AuthenticationManager</code> is expected to provide a provider that can recognise
- * <code>UsernamePasswordAuthenticationToken</code>s containing this special <code>principal</code> name, and process
- * them accordingly by validation with the CAS server. Additionally, it should be capable of using the result of
- * {@link ServiceAuthenticationDetails#getServiceUrl()} as the service when validating the ticket.
+ * The configured <code>AuthenticationManager</code> is expected to provide a provider
+ * that can recognise <code>UsernamePasswordAuthenticationToken</code>s containing this
+ * special <code>principal</code> name, and process them accordingly by validation with
+ * the CAS server. Additionally, it should be capable of using the result of
+ * {@link ServiceAuthenticationDetails#getServiceUrl()} as the service when validating the
+ * ticket.
  * <h2>Example Configuration</h2>
  * <p>
- * An example configuration that supports service tickets, obtaining proxy granting tickets, and proxy tickets is
- * illustrated below:
+ * An example configuration that supports service tickets, obtaining proxy granting
+ * tickets, and proxy tickets is illustrated below:
  *
  * <pre>
  * &lt;b:bean id=&quot;serviceProperties&quot;
@@ -157,236 +170,265 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  */
 public class CasAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /** Used to identify a CAS request for a stateful user agent, such as a web browser. */
-    public static final String CAS_STATEFUL_IDENTIFIER = "_cas_stateful_";
+	/** Used to identify a CAS request for a stateful user agent, such as a web browser. */
+	public static final String CAS_STATEFUL_IDENTIFIER = "_cas_stateful_";
 
-    /**
-     * Used to identify a CAS request for a stateless user agent, such as a remoting protocol client (e.g.
-     * Hessian, Burlap, SOAP etc). Results in a more aggressive caching strategy being used, as the absence of a
-     * <code>HttpSession</code> will result in a new authentication attempt on every request.
-     */
-    public static final String CAS_STATELESS_IDENTIFIER = "_cas_stateless_";
+	/**
+	 * Used to identify a CAS request for a stateless user agent, such as a remoting
+	 * protocol client (e.g. Hessian, Burlap, SOAP etc). Results in a more aggressive
+	 * caching strategy being used, as the absence of a <code>HttpSession</code> will
+	 * result in a new authentication attempt on every request.
+	 */
+	public static final String CAS_STATELESS_IDENTIFIER = "_cas_stateless_";
 
-    /**
-     * The last portion of the receptor url, i.e. /proxy/receptor
-     */
-    private RequestMatcher proxyReceptorMatcher;
+	/**
+	 * The last portion of the receptor url, i.e. /proxy/receptor
+	 */
+	private RequestMatcher proxyReceptorMatcher;
 
-    /**
-     * The backing storage to store ProxyGrantingTicket requests.
-     */
-    private ProxyGrantingTicketStorage proxyGrantingTicketStorage;
+	/**
+	 * The backing storage to store ProxyGrantingTicket requests.
+	 */
+	private ProxyGrantingTicketStorage proxyGrantingTicketStorage;
 
-    private String artifactParameter = ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER;
+	private String artifactParameter = ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER;
 
-    private boolean authenticateAllArtifacts;
+	private boolean authenticateAllArtifacts;
 
-    private AuthenticationFailureHandler proxyFailureHandler = new SimpleUrlAuthenticationFailureHandler();
+	private AuthenticationFailureHandler proxyFailureHandler = new SimpleUrlAuthenticationFailureHandler();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public CasAuthenticationFilter() {
-        super("/login/cas");
-        setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler());
-    }
+	public CasAuthenticationFilter() {
+		super("/login/cas");
+		setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler());
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    protected final void successfulAuthentication(HttpServletRequest request,
-            HttpServletResponse response, FilterChain chain, Authentication authResult)
-            throws IOException, ServletException {
-        boolean continueFilterChain = proxyTicketRequest(serviceTicketRequest(request, response),request);
-        if(!continueFilterChain) {
-            super.successfulAuthentication(request, response, chain, authResult);
-            return;
-        }
+	@Override
+	protected final void successfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain, Authentication authResult)
+			throws IOException, ServletException {
+		boolean continueFilterChain = proxyTicketRequest(
+				serviceTicketRequest(request, response), request);
+		if (!continueFilterChain) {
+			super.successfulAuthentication(request, response, chain, authResult);
+			return;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication success. Updating SecurityContextHolder to contain: "
+					+ authResult);
+		}
 
-        SecurityContextHolder.getContext().setAuthentication(authResult);
+		SecurityContextHolder.getContext().setAuthentication(authResult);
 
-        // Fire event
-        if (this.eventPublisher != null) {
-            eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass()));
-        }
+		// Fire event
+		if (this.eventPublisher != null) {
+			eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(
+					authResult, this.getClass()));
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    @Override
-    public Authentication attemptAuthentication(final HttpServletRequest request, final HttpServletResponse response)
-            throws AuthenticationException, IOException {
-        // if the request is a proxy request process it and return null to indicate the request has been processed
-        if(proxyReceptorRequest(request)) {
-            logger.debug("Responding to proxy receptor request");
-            CommonUtils.readAndRespondToProxyReceptorRequest(request, response, this.proxyGrantingTicketStorage);
-            return null;
-        }
+	@Override
+	public Authentication attemptAuthentication(final HttpServletRequest request,
+			final HttpServletResponse response) throws AuthenticationException,
+			IOException {
+		// if the request is a proxy request process it and return null to indicate the
+		// request has been processed
+		if (proxyReceptorRequest(request)) {
+			logger.debug("Responding to proxy receptor request");
+			CommonUtils.readAndRespondToProxyReceptorRequest(request, response,
+					this.proxyGrantingTicketStorage);
+			return null;
+		}
 
-        final boolean serviceTicketRequest = serviceTicketRequest(request, response);
-        final String username = serviceTicketRequest ? CAS_STATEFUL_IDENTIFIER : CAS_STATELESS_IDENTIFIER;
-        String password = obtainArtifact(request);
+		final boolean serviceTicketRequest = serviceTicketRequest(request, response);
+		final String username = serviceTicketRequest ? CAS_STATEFUL_IDENTIFIER
+				: CAS_STATELESS_IDENTIFIER;
+		String password = obtainArtifact(request);
 
-        if (password == null) {
-            logger.debug("Failed to obtain an artifact (cas ticket)");
-            password = "";
-        }
+		if (password == null) {
+			logger.debug("Failed to obtain an artifact (cas ticket)");
+			password = "";
+		}
 
-        final UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(username, password);
+		final UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				username, password);
 
-        authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
+		authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
 
-        return this.getAuthenticationManager().authenticate(authRequest);
-    }
+		return this.getAuthenticationManager().authenticate(authRequest);
+	}
 
-    /**
-     * If present, gets the artifact (CAS ticket) from the {@link HttpServletRequest}.
-     * @param request
-     * @return if present the artifact from the {@link HttpServletRequest}, else null
-     */
-    protected String obtainArtifact(HttpServletRequest request) {
-        return request.getParameter(artifactParameter);
-    }
+	/**
+	 * If present, gets the artifact (CAS ticket) from the {@link HttpServletRequest}.
+	 * @param request
+	 * @return if present the artifact from the {@link HttpServletRequest}, else null
+	 */
+	protected String obtainArtifact(HttpServletRequest request) {
+		return request.getParameter(artifactParameter);
+	}
 
-    /**
-     * Overridden to provide proxying capabilities.
-     */
-    protected boolean requiresAuthentication(final HttpServletRequest request, final HttpServletResponse response) {
-        final boolean serviceTicketRequest = serviceTicketRequest(request, response);
-        final boolean result = serviceTicketRequest || proxyReceptorRequest(request) || (proxyTicketRequest(serviceTicketRequest, request));
-        if(logger.isDebugEnabled()) {
-            logger.debug("requiresAuthentication = "+result);
-        }
-        return result;
-    }
+	/**
+	 * Overridden to provide proxying capabilities.
+	 */
+	protected boolean requiresAuthentication(final HttpServletRequest request,
+			final HttpServletResponse response) {
+		final boolean serviceTicketRequest = serviceTicketRequest(request, response);
+		final boolean result = serviceTicketRequest || proxyReceptorRequest(request)
+				|| (proxyTicketRequest(serviceTicketRequest, request));
+		if (logger.isDebugEnabled()) {
+			logger.debug("requiresAuthentication = " + result);
+		}
+		return result;
+	}
 
-    /**
-     * Sets the {@link AuthenticationFailureHandler} for proxy requests.
-     * @param proxyFailureHandler
-     */
-    public final void setProxyAuthenticationFailureHandler(
-            AuthenticationFailureHandler proxyFailureHandler) {
-        Assert.notNull(proxyFailureHandler,"proxyFailureHandler cannot be null");
-        this.proxyFailureHandler = proxyFailureHandler;
-    }
+	/**
+	 * Sets the {@link AuthenticationFailureHandler} for proxy requests.
+	 * @param proxyFailureHandler
+	 */
+	public final void setProxyAuthenticationFailureHandler(
+			AuthenticationFailureHandler proxyFailureHandler) {
+		Assert.notNull(proxyFailureHandler, "proxyFailureHandler cannot be null");
+		this.proxyFailureHandler = proxyFailureHandler;
+	}
 
-    /**
-     * Wraps the {@link AuthenticationFailureHandler} to distinguish between
-     * handling proxy ticket authentication failures and service ticket
-     * failures.
-     */
-    @Override
-    public final void setAuthenticationFailureHandler(
-            AuthenticationFailureHandler failureHandler) {
-        super.setAuthenticationFailureHandler(new CasAuthenticationFailureHandler(failureHandler));
-    }
+	/**
+	 * Wraps the {@link AuthenticationFailureHandler} to distinguish between handling
+	 * proxy ticket authentication failures and service ticket failures.
+	 */
+	@Override
+	public final void setAuthenticationFailureHandler(
+			AuthenticationFailureHandler failureHandler) {
+		super.setAuthenticationFailureHandler(new CasAuthenticationFailureHandler(
+				failureHandler));
+	}
 
-    public final void setProxyReceptorUrl(final String proxyReceptorUrl) {
-        this.proxyReceptorMatcher = new AntPathRequestMatcher("/**" + proxyReceptorUrl);
-    }
+	public final void setProxyReceptorUrl(final String proxyReceptorUrl) {
+		this.proxyReceptorMatcher = new AntPathRequestMatcher("/**" + proxyReceptorUrl);
+	}
 
-    public final void setProxyGrantingTicketStorage(
-            final ProxyGrantingTicketStorage proxyGrantingTicketStorage) {
-        this.proxyGrantingTicketStorage = proxyGrantingTicketStorage;
-    }
+	public final void setProxyGrantingTicketStorage(
+			final ProxyGrantingTicketStorage proxyGrantingTicketStorage) {
+		this.proxyGrantingTicketStorage = proxyGrantingTicketStorage;
+	}
 
-    public final void setServiceProperties(final ServiceProperties serviceProperties) {
-        this.artifactParameter = serviceProperties.getArtifactParameter();
-        this.authenticateAllArtifacts = serviceProperties.isAuthenticateAllArtifacts();
-    }
+	public final void setServiceProperties(final ServiceProperties serviceProperties) {
+		this.artifactParameter = serviceProperties.getArtifactParameter();
+		this.authenticateAllArtifacts = serviceProperties.isAuthenticateAllArtifacts();
+	}
 
-    /**
-     * Indicates if the request is elgible to process a service ticket. This method exists for readability.
-     * @param request
-     * @param response
-     * @return
-     */
-    private boolean serviceTicketRequest(final HttpServletRequest request, final HttpServletResponse response) {
-        boolean result = super.requiresAuthentication(request, response);
-        if(logger.isDebugEnabled()) {
-            logger.debug("serviceTicketRequest = "+result);
-        }
-        return result;
-    }
+	/**
+	 * Indicates if the request is elgible to process a service ticket. This method exists
+	 * for readability.
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private boolean serviceTicketRequest(final HttpServletRequest request,
+			final HttpServletResponse response) {
+		boolean result = super.requiresAuthentication(request, response);
+		if (logger.isDebugEnabled()) {
+			logger.debug("serviceTicketRequest = " + result);
+		}
+		return result;
+	}
 
-    /**
-     * Indicates if the request is elgible to process a proxy ticket.
-     * @param request
-     * @return
-     */
-    private boolean proxyTicketRequest(final boolean serviceTicketRequest, final HttpServletRequest request) {
-        if(serviceTicketRequest) {
-            return false;
-        }
-        final boolean result = authenticateAllArtifacts && obtainArtifact(request) != null && !authenticated();
-        if(logger.isDebugEnabled()) {
-            logger.debug("proxyTicketRequest = "+result);
-        }
-        return result;
-    }
+	/**
+	 * Indicates if the request is elgible to process a proxy ticket.
+	 * @param request
+	 * @return
+	 */
+	private boolean proxyTicketRequest(final boolean serviceTicketRequest,
+			final HttpServletRequest request) {
+		if (serviceTicketRequest) {
+			return false;
+		}
+		final boolean result = authenticateAllArtifacts
+				&& obtainArtifact(request) != null && !authenticated();
+		if (logger.isDebugEnabled()) {
+			logger.debug("proxyTicketRequest = " + result);
+		}
+		return result;
+	}
 
-    /**
-     * Determines if a user is already authenticated.
-     * @return
-     */
-    private boolean authenticated() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        return authentication != null && authentication.isAuthenticated() && !(authentication instanceof AnonymousAuthenticationToken);
-    }
-    /**
-     * Indicates if the request is elgible to be processed as the proxy receptor.
-     * @param request
-     * @return
-     */
-    private boolean proxyReceptorRequest(final HttpServletRequest request) {
-        final boolean result = proxyReceptorConfigured() && proxyReceptorMatcher.matches(request);
-        if(logger.isDebugEnabled()) {
-            logger.debug("proxyReceptorRequest = "+result);
-        }
-        return result;
-    }
+	/**
+	 * Determines if a user is already authenticated.
+	 * @return
+	 */
+	private boolean authenticated() {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		return authentication != null && authentication.isAuthenticated()
+				&& !(authentication instanceof AnonymousAuthenticationToken);
+	}
 
-    /**
-     * Determines if the {@link CasAuthenticationFilter} is configured to handle the proxy receptor requests.
-     *
-     * @return
-     */
-    private boolean proxyReceptorConfigured() {
-        final boolean result = this.proxyGrantingTicketStorage != null && proxyReceptorMatcher != null;
-        if(logger.isDebugEnabled()) {
-            logger.debug("proxyReceptorConfigured = "+result);
-        }
-        return result;
-    }
+	/**
+	 * Indicates if the request is elgible to be processed as the proxy receptor.
+	 * @param request
+	 * @return
+	 */
+	private boolean proxyReceptorRequest(final HttpServletRequest request) {
+		final boolean result = proxyReceptorConfigured()
+				&& proxyReceptorMatcher.matches(request);
+		if (logger.isDebugEnabled()) {
+			logger.debug("proxyReceptorRequest = " + result);
+		}
+		return result;
+	}
 
-    /**
-     * A wrapper for the AuthenticationFailureHandler that will flex the {@link AuthenticationFailureHandler} that is used. The value
-     * {@link CasAuthenticationFilter#setProxyAuthenticationFailureHandler(AuthenticationFailureHandler) will be used for proxy requests
-     * that fail. The value {@link CasAuthenticationFilter#setAuthenticationFailureHandler(AuthenticationFailureHandler)} will be used for
-     * service tickets that fail.
-     *
-     * @author Rob Winch
-     */
-    private class CasAuthenticationFailureHandler implements AuthenticationFailureHandler {
-        private final AuthenticationFailureHandler serviceTicketFailureHandler;
-        public CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
-            Assert.notNull(failureHandler,"failureHandler");
-            this.serviceTicketFailureHandler = failureHandler;
-        }
-        public void onAuthenticationFailure(HttpServletRequest request,
-                HttpServletResponse response,
-                AuthenticationException exception) throws IOException,
-                ServletException {
-            if(serviceTicketRequest(request, response)) {
-                serviceTicketFailureHandler.onAuthenticationFailure(request, response, exception);
-            }else {
-                proxyFailureHandler.onAuthenticationFailure(request, response, exception);
-            }
-        }
-    }
+	/**
+	 * Determines if the {@link CasAuthenticationFilter} is configured to handle the proxy
+	 * receptor requests.
+	 *
+	 * @return
+	 */
+	private boolean proxyReceptorConfigured() {
+		final boolean result = this.proxyGrantingTicketStorage != null
+				&& proxyReceptorMatcher != null;
+		if (logger.isDebugEnabled()) {
+			logger.debug("proxyReceptorConfigured = " + result);
+		}
+		return result;
+	}
+
+	/**
+	 * A wrapper for the AuthenticationFailureHandler that will flex the
+	 * {@link AuthenticationFailureHandler} that is used. The value
+	 * {@link CasAuthenticationFilter#setProxyAuthenticationFailureHandler(AuthenticationFailureHandler)
+	 * will be used for proxy requests that fail. The value
+	 * {@link CasAuthenticationFilter#setAuthenticationFailureHandler(AuthenticationFailureHandler)}
+	 * will be used for service tickets that fail.
+	 *
+	 * @author Rob Winch
+	 */
+	private class CasAuthenticationFailureHandler implements AuthenticationFailureHandler {
+		private final AuthenticationFailureHandler serviceTicketFailureHandler;
+
+		public CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
+			Assert.notNull(failureHandler, "failureHandler");
+			this.serviceTicketFailureHandler = failureHandler;
+		}
+
+		public void onAuthenticationFailure(HttpServletRequest request,
+				HttpServletResponse response, AuthenticationException exception)
+				throws IOException, ServletException {
+			if (serviceTicketRequest(request, response)) {
+				serviceTicketFailureHandler.onAuthenticationFailure(request, response,
+						exception);
+			}
+			else {
+				proxyFailureHandler.onAuthenticationFailure(request, response, exception);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java
index 4dcec20df9..bb141f0bea 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java
@@ -26,123 +26,128 @@ import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 
 /**
- * A default implementation of {@link ServiceAuthenticationDetails} that figures
- * out the value for {@link #getServiceUrl()} by inspecting the current
- * {@link HttpServletRequest} and using the current URL minus the artifact and
- * the corresponding value.
+ * A default implementation of {@link ServiceAuthenticationDetails} that figures out the
+ * value for {@link #getServiceUrl()} by inspecting the current {@link HttpServletRequest}
+ * and using the current URL minus the artifact and the corresponding value.
  *
  * @author Rob Winch
  */
-final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails implements ServiceAuthenticationDetails {
-    private static final long serialVersionUID = 6192409090610517700L;
+final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails
+		implements ServiceAuthenticationDetails {
+	private static final long serialVersionUID = 6192409090610517700L;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String serviceUrl;
+	private final String serviceUrl;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates a new instance
-     * @param request
-     *            the current {@link HttpServletRequest} to obtain the
-     *            {@link #getServiceUrl()} from.
-     * @param artifactPattern
-     *            the {@link Pattern} that will be used to clean up the query
-     *            string from containing the artifact name and value. This can
-     *            be created using {@link #createArtifactPattern(String)}.
-     */
-    DefaultServiceAuthenticationDetails(String casService, HttpServletRequest request, Pattern artifactPattern) throws MalformedURLException {
-        super(request);
-        URL casServiceUrl = new URL(casService);
-        int port = getServicePort(casServiceUrl);
-        final String query = getQueryString(request,artifactPattern);
-        this.serviceUrl = UrlUtils.buildFullRequestUrl(casServiceUrl.getProtocol(),
-                casServiceUrl.getHost(), port,
-                request.getRequestURI(), query);
-    }
+	/**
+	 * Creates a new instance
+	 * @param request the current {@link HttpServletRequest} to obtain the
+	 * {@link #getServiceUrl()} from.
+	 * @param artifactPattern the {@link Pattern} that will be used to clean up the query
+	 * string from containing the artifact name and value. This can be created using
+	 * {@link #createArtifactPattern(String)}.
+	 */
+	DefaultServiceAuthenticationDetails(String casService, HttpServletRequest request,
+			Pattern artifactPattern) throws MalformedURLException {
+		super(request);
+		URL casServiceUrl = new URL(casService);
+		int port = getServicePort(casServiceUrl);
+		final String query = getQueryString(request, artifactPattern);
+		this.serviceUrl = UrlUtils.buildFullRequestUrl(casServiceUrl.getProtocol(),
+				casServiceUrl.getHost(), port, request.getRequestURI(), query);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the current URL minus the artifact parameter and its value, if present.
-     * @see org.springframework.security.cas.web.authentication.ServiceAuthenticationDetails#getServiceUrl()
-     */
-    public String getServiceUrl() {
-        return serviceUrl;
-    }
+	/**
+	 * Returns the current URL minus the artifact parameter and its value, if present.
+	 * @see org.springframework.security.cas.web.authentication.ServiceAuthenticationDetails#getServiceUrl()
+	 */
+	public String getServiceUrl() {
+		return serviceUrl;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = super.hashCode();
-        result = prime * result
-                + serviceUrl.hashCode();
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + serviceUrl.hashCode();
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!super.equals(obj) || !(obj instanceof DefaultServiceAuthenticationDetails)) {
-            return false;
-        }
-        ServiceAuthenticationDetails that = (ServiceAuthenticationDetails) obj;
-        return serviceUrl.equals(that.getServiceUrl());
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!super.equals(obj) || !(obj instanceof DefaultServiceAuthenticationDetails)) {
+			return false;
+		}
+		ServiceAuthenticationDetails that = (ServiceAuthenticationDetails) obj;
+		return serviceUrl.equals(that.getServiceUrl());
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder result = new StringBuilder();
-        result.append(super.toString());
-        result.append("ServiceUrl: ");
-        result.append(serviceUrl);
-        return result.toString();
-    }
+	@Override
+	public String toString() {
+		StringBuilder result = new StringBuilder();
+		result.append(super.toString());
+		result.append("ServiceUrl: ");
+		result.append(serviceUrl);
+		return result.toString();
+	}
 
-    /**
-     * If present, removes the artifactParameterName and the corresponding value from the query String.
-     * @param request
-     * @return the query String minus the artifactParameterName and the corresponding value.
-     */
-    private String getQueryString(final HttpServletRequest request, final Pattern artifactPattern) {
-        final String query = request.getQueryString();
-        if(query == null) {
-            return null;
-        }
-        final String result = artifactPattern.matcher(query).replaceFirst("");
-        if(result.length() == 0) {
-            return null;
-        }
-        // strip off the trailing & only if the artifact was the first query param
-        return result.startsWith("&") ? result.substring(1) : result;
-    }
+	/**
+	 * If present, removes the artifactParameterName and the corresponding value from the
+	 * query String.
+	 * @param request
+	 * @return the query String minus the artifactParameterName and the corresponding
+	 * value.
+	 */
+	private String getQueryString(final HttpServletRequest request,
+			final Pattern artifactPattern) {
+		final String query = request.getQueryString();
+		if (query == null) {
+			return null;
+		}
+		final String result = artifactPattern.matcher(query).replaceFirst("");
+		if (result.length() == 0) {
+			return null;
+		}
+		// strip off the trailing & only if the artifact was the first query param
+		return result.startsWith("&") ? result.substring(1) : result;
+	}
 
-    /**
-     * Creates a {@link Pattern} that can be passed into the constructor. This
-     * allows the {@link Pattern} to be reused for every instance of
-     * {@link DefaultServiceAuthenticationDetails}.
-     *
-     * @param artifactParameterName
-     * @return
-     */
-    static Pattern createArtifactPattern(String artifactParameterName) {
-        Assert.hasLength(artifactParameterName);
-        return Pattern.compile("&?"+Pattern.quote(artifactParameterName)+"=[^&]*");
-    }
+	/**
+	 * Creates a {@link Pattern} that can be passed into the constructor. This allows the
+	 * {@link Pattern} to be reused for every instance of
+	 * {@link DefaultServiceAuthenticationDetails}.
+	 *
+	 * @param artifactParameterName
+	 * @return
+	 */
+	static Pattern createArtifactPattern(String artifactParameterName) {
+		Assert.hasLength(artifactParameterName);
+		return Pattern.compile("&?" + Pattern.quote(artifactParameterName) + "=[^&]*");
+	}
 
-    /**
-     * Gets the port from the casServiceURL ensuring to return the proper value if the default port is being used.
-     * @param casServiceUrl the casServerUrl to be used (i.e. "https://example.com/context/login/cas")
-     * @return the port that is configured for the casServerUrl
-     */
-    private static int getServicePort(URL casServiceUrl) {
-        int port = casServiceUrl.getPort();
-        if(port == -1) {
-            port = casServiceUrl.getDefaultPort();
-        }
-        return port;
-    }
+	/**
+	 * Gets the port from the casServiceURL ensuring to return the proper value if the
+	 * default port is being used.
+	 * @param casServiceUrl the casServerUrl to be used (i.e.
+	 * "https://example.com/context/login/cas")
+	 * @return the port that is configured for the casServerUrl
+	 */
+	private static int getServicePort(URL casServiceUrl) {
+		int port = casServiceUrl.getPort();
+		if (port == -1) {
+			port = casServiceUrl.getDefaultPort();
+		}
+		return port;
+	}
 }
\ No newline at end of file
diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java
index b242023c01..631a6776e4 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetails.java
@@ -22,10 +22,9 @@ import org.springframework.security.cas.authentication.CasAuthenticationProvider
 import org.springframework.security.core.Authentication;
 
 /**
- * In order for the {@link CasAuthenticationProvider} to provide the correct
- * service url to authenticate the ticket, the returned value of
- * {@link Authentication#getDetails()} should implement this interface when
- * tickets can be sent to any URL rather than only
+ * In order for the {@link CasAuthenticationProvider} to provide the correct service url
+ * to authenticate the ticket, the returned value of {@link Authentication#getDetails()}
+ * should implement this interface when tickets can be sent to any URL rather than only
  * {@link ServiceProperties#getService()}.
  *
  * @author Rob Winch
@@ -34,10 +33,10 @@ import org.springframework.security.core.Authentication;
  */
 public interface ServiceAuthenticationDetails extends Serializable {
 
-    /**
-     * Gets the absolute service url (i.e. https://example.com/service/).
-     *
-     * @return the service url. Cannot be <code>null</code>.
-     */
-    String getServiceUrl();
+	/**
+	 * Gets the absolute service url (i.e. https://example.com/service/).
+	 *
+	 * @return the service url. Cannot be <code>null</code>.
+	 */
+	String getServiceUrl();
 }
\ No newline at end of file
diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java
index 813dab91fb..b032e58105 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/ServiceAuthenticationDetailsSource.java
@@ -27,58 +27,66 @@ import org.springframework.util.Assert;
 /**
  * The {@code AuthenticationDetailsSource} that is set on the
  * {@code CasAuthenticationFilter} should return a value that implements
- * {@code ServiceAuthenticationDetails} if the application needs to authenticate
- * dynamic service urls. The
- * {@code ServiceAuthenticationDetailsSource#buildDetails(HttpServletRequest)}
- * creates a default {@code ServiceAuthenticationDetails}.
+ * {@code ServiceAuthenticationDetails} if the application needs to authenticate dynamic
+ * service urls. The
+ * {@code ServiceAuthenticationDetailsSource#buildDetails(HttpServletRequest)} creates a
+ * default {@code ServiceAuthenticationDetails}.
  *
  * @author Rob Winch
  */
-public class ServiceAuthenticationDetailsSource implements AuthenticationDetailsSource<HttpServletRequest,
-        ServiceAuthenticationDetails> {
-    //~ Instance fields ================================================================================================
+public class ServiceAuthenticationDetailsSource implements
+		AuthenticationDetailsSource<HttpServletRequest, ServiceAuthenticationDetails> {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Pattern artifactPattern;
+	private final Pattern artifactPattern;
 
-    private ServiceProperties serviceProperties;
+	private ServiceProperties serviceProperties;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates an implementation that uses the specified ServiceProperites and the default CAS artifactParameterName.
-     *
-     * @param serviceProperties The ServiceProperties to use to construct the serviceUrl.
-     */
-    public ServiceAuthenticationDetailsSource(ServiceProperties serviceProperties) {
-        this(serviceProperties,ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER);
-    }
+	/**
+	 * Creates an implementation that uses the specified ServiceProperites and the default
+	 * CAS artifactParameterName.
+	 *
+	 * @param serviceProperties The ServiceProperties to use to construct the serviceUrl.
+	 */
+	public ServiceAuthenticationDetailsSource(ServiceProperties serviceProperties) {
+		this(serviceProperties, ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER);
+	}
 
-    /**
-     * Creates an implementation that uses the specified artifactParameterName
-     *
-     * @param serviceProperties The ServiceProperties to use to construct the serviceUrl.
-     * @param artifactParameterName
-     *            the artifactParameterName that is removed from the current
-     *            URL. The result becomes the service url. Cannot be null and
-     *            cannot be an empty String.
-     */
-    public ServiceAuthenticationDetailsSource(ServiceProperties serviceProperties, String artifactParameterName) {
-        Assert.notNull(serviceProperties, "serviceProperties cannot be null");
-        this.serviceProperties = serviceProperties;
-        this.artifactPattern = DefaultServiceAuthenticationDetails.createArtifactPattern(artifactParameterName);
-    }
+	/**
+	 * Creates an implementation that uses the specified artifactParameterName
+	 *
+	 * @param serviceProperties The ServiceProperties to use to construct the serviceUrl.
+	 * @param artifactParameterName the artifactParameterName that is removed from the
+	 * current URL. The result becomes the service url. Cannot be null and cannot be an
+	 * empty String.
+	 */
+	public ServiceAuthenticationDetailsSource(ServiceProperties serviceProperties,
+			String artifactParameterName) {
+		Assert.notNull(serviceProperties, "serviceProperties cannot be null");
+		this.serviceProperties = serviceProperties;
+		this.artifactPattern = DefaultServiceAuthenticationDetails
+				.createArtifactPattern(artifactParameterName);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * @param context the {@code HttpServletRequest} object.
-     * @return the {@code ServiceAuthenticationDetails} containing information about the current request
-     */
-    public ServiceAuthenticationDetails buildDetails(HttpServletRequest context) {
-        try {
-            return new DefaultServiceAuthenticationDetails(serviceProperties.getService(),context,artifactPattern);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-    }
+	/**
+	 * @param context the {@code HttpServletRequest} object.
+	 * @return the {@code ServiceAuthenticationDetails} containing information about the
+	 * current request
+	 */
+	public ServiceAuthenticationDetails buildDetails(HttpServletRequest context) {
+		try {
+			return new DefaultServiceAuthenticationDetails(
+					serviceProperties.getService(), context, artifactPattern);
+		}
+		catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		}
+	}
 }
\ No newline at end of file
diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java
index 6a26354bf0..1b58e97681 100644
--- a/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java
+++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/package-info.java
@@ -3,3 +3,4 @@
  * credentials using CAS.
  */
 package org.springframework.security.cas.web.authentication;
+
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java
index bce82dbd88..f0e8a741ab 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java
@@ -17,15 +17,17 @@ import org.springframework.security.core.userdetails.User;
  */
 public abstract class AbstractStatelessTicketCacheTests {
 
-    protected CasAuthenticationToken getToken() {
-        List<String> proxyList = new ArrayList<String>();
-        proxyList.add("https://localhost/newPortal/login/cas");
+	protected CasAuthenticationToken getToken() {
+		List<String> proxyList = new ArrayList<String>();
+		proxyList.add("https://localhost/newPortal/login/cas");
 
-        User user = new User("rod", "password", true, true, true, true, AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-        final Assertion assertion = new AssertionImpl("rod");
+		User user = new User("rod", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+		final Assertion assertion = new AssertionImpl("rod");
 
-        return new CasAuthenticationToken("key", user, "ST-0-ER94xMJmn6pha35CQRoZ",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), user, assertion);
-    }
+		return new CasAuthenticationToken("key", user, "ST-0-ER94xMJmn6pha35CQRoZ",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), user,
+				assertion);
+	}
 
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java
index 495ded74d8..387515f416 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java
@@ -41,7 +41,6 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails;
 
 import java.util.*;
 
-
 /**
  * Tests {@link CasAuthenticationProvider}.
  *
@@ -50,365 +49,380 @@ import java.util.*;
  */
 @SuppressWarnings("unchecked")
 public class CasAuthenticationProviderTests {
-    //~ Methods ========================================================================================================
-
-    private UserDetails makeUserDetails() {
-        return new User("user", "password", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-    }
-
-    private UserDetails makeUserDetailsFromAuthoritiesPopulator() {
-        return new User("user", "password", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B"));
-    }
-
-    private ServiceProperties makeServiceProperties() {
-        final ServiceProperties serviceProperties = new ServiceProperties();
-        serviceProperties.setSendRenew(false);
-        serviceProperties.setService("http://test.com");
-
-        return serviceProperties;
-    }
-
-    @Test
-    public void statefulAuthenticationIsSuccessful() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        StatelessTicketCache cache = new MockStatelessTicketCache();
-        cap.setStatelessTicketCache(cache);
-        cap.setServiceProperties(makeServiceProperties());
-
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.afterPropertiesSet();
-
-        UsernamePasswordAuthenticationToken token =
-            new UsernamePasswordAuthenticationToken(CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER, "ST-123");
-        token.setDetails("details");
-
-        Authentication result = cap.authenticate(token);
-
-        // Confirm ST-123 was NOT added to the cache
-        assertTrue(cache.getByTicketId("ST-456") == null);
-
-        if (!(result instanceof CasAuthenticationToken)) {
-            fail("Should have returned a CasAuthenticationToken");
-        }
-
-        CasAuthenticationToken casResult = (CasAuthenticationToken) result;
-        assertEquals(makeUserDetailsFromAuthoritiesPopulator(), casResult.getPrincipal());
-        assertEquals("ST-123", casResult.getCredentials());
-        assertTrue(casResult.getAuthorities().contains(new SimpleGrantedAuthority("ROLE_A")));
-        assertTrue(casResult.getAuthorities().contains(new SimpleGrantedAuthority("ROLE_B")));
-        assertEquals(cap.getKey().hashCode(), casResult.getKeyHash());
-        assertEquals("details", casResult.getDetails());
-
-        // Now confirm the CasAuthenticationToken is automatically re-accepted.
-        // To ensure TicketValidator not called again, set it to deliver an exception...
-        cap.setTicketValidator(new MockTicketValidator(false));
-
-        Authentication laterResult = cap.authenticate(result);
-        assertEquals(result, laterResult);
-    }
-
-    @Test
-    public void statelessAuthenticationIsSuccessful() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        StatelessTicketCache cache = new MockStatelessTicketCache();
-        cap.setStatelessTicketCache(cache);
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-        UsernamePasswordAuthenticationToken token =
-            new UsernamePasswordAuthenticationToken(CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, "ST-456");
-        token.setDetails("details");
-
-        Authentication result = cap.authenticate(token);
-
-        // Confirm ST-456 was added to the cache
-        assertTrue(cache.getByTicketId("ST-456") != null);
-
-        if (!(result instanceof CasAuthenticationToken)) {
-            fail("Should have returned a CasAuthenticationToken");
-        }
-
-        assertEquals(makeUserDetailsFromAuthoritiesPopulator(), result.getPrincipal());
-        assertEquals("ST-456", result.getCredentials());
-        assertEquals("details", result.getDetails());
-
-        // Now try to authenticate again. To ensure TicketValidator not
-        // called again, set it to deliver an exception...
-        cap.setTicketValidator(new MockTicketValidator(false));
-
-        // Previously created UsernamePasswordAuthenticationToken is OK
-        Authentication newResult = cap.authenticate(token);
-        assertEquals(makeUserDetailsFromAuthoritiesPopulator(), newResult.getPrincipal());
-        assertEquals("ST-456", newResult.getCredentials());
-    }
-
-    @Test
-    public void authenticateAllNullService() throws Exception {
-        String serviceUrl = "https://service/context";
-        ServiceAuthenticationDetails details = mock(ServiceAuthenticationDetails.class);
-        when(details.getServiceUrl()).thenReturn(serviceUrl);
-        TicketValidator validator = mock(TicketValidator.class);
-        when(validator.validate(any(String.class),any(String.class))).thenReturn(new AssertionImpl("rod"));
-
-        ServiceProperties serviceProperties = makeServiceProperties();
-        serviceProperties.setAuthenticateAllArtifacts(true);
-
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        cap.setTicketValidator(validator);
-        cap.setServiceProperties(serviceProperties);
-        cap.afterPropertiesSet();
-
-        String ticket = "ST-456";
-        UsernamePasswordAuthenticationToken token =
-            new UsernamePasswordAuthenticationToken(CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, ticket);
-
-        Authentication result = cap.authenticate(token);
-    }
-
-    @Test
-    public void authenticateAllAuthenticationIsSuccessful() throws Exception {
-        String serviceUrl = "https://service/context";
-        ServiceAuthenticationDetails details = mock(ServiceAuthenticationDetails.class);
-        when(details.getServiceUrl()).thenReturn(serviceUrl);
-        TicketValidator validator = mock(TicketValidator.class);
-        when(validator.validate(any(String.class),any(String.class))).thenReturn(new AssertionImpl("rod"));
-
-        ServiceProperties serviceProperties = makeServiceProperties();
-        serviceProperties.setAuthenticateAllArtifacts(true);
-
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        cap.setTicketValidator(validator);
-        cap.setServiceProperties(serviceProperties);
-        cap.afterPropertiesSet();
-
-        String ticket = "ST-456";
-        UsernamePasswordAuthenticationToken token =
-            new UsernamePasswordAuthenticationToken(CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, ticket);
-
-        Authentication result = cap.authenticate(token);
-        verify(validator).validate(ticket, serviceProperties.getService());
-
-        serviceProperties.setAuthenticateAllArtifacts(true);
-        result = cap.authenticate(token);
-        verify(validator,times(2)).validate(ticket, serviceProperties.getService());
-
-        token.setDetails(details);
-        result = cap.authenticate(token);
-        verify(validator).validate(ticket, serviceUrl);
-
-        serviceProperties.setAuthenticateAllArtifacts(false);
-        serviceProperties.setService(null);
-        cap.setServiceProperties(serviceProperties);
-        cap.afterPropertiesSet();
-        result = cap.authenticate(token);
-        verify(validator,times(2)).validate(ticket, serviceUrl);
-
-        token.setDetails(new WebAuthenticationDetails(new MockHttpServletRequest()));
-        try {
-            cap.authenticate(token);
-            fail("Expected Exception");
-        }catch(IllegalStateException success) {}
-
-        cap.setServiceProperties(null);
-        cap.afterPropertiesSet();
-        try {
-            cap.authenticate(token);
-            fail("Expected Exception");
-        }catch(IllegalStateException success) {}
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void missingTicketIdIsDetected() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        StatelessTicketCache cache = new MockStatelessTicketCache();
-        cap.setStatelessTicketCache(cache);
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-        UsernamePasswordAuthenticationToken token =
-                new UsernamePasswordAuthenticationToken(CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER, "");
-
-        cap.authenticate(token);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void invalidKeyIsDetected() throws Exception {
-        final Assertion assertion = new AssertionImpl("test");
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-
-        StatelessTicketCache cache = new MockStatelessTicketCache();
-        cap.setStatelessTicketCache(cache);
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-        CasAuthenticationToken token = new CasAuthenticationToken("WRONG_KEY", makeUserDetails(), "credentials",
-                AuthorityUtils.createAuthorityList("XX"), makeUserDetails(), assertion);
-
-        cap.authenticate(token);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void detectsMissingAuthoritiesPopulator() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setKey("qwerty");
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void detectsMissingKey() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void detectsMissingStatelessTicketCache() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        // set this explicitly to null to test failure
-        cap.setStatelessTicketCache(null);
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void detectsMissingTicketValidator() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-    }
-
-    @Test
-    public void gettersAndSettersMatch() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-// TODO disabled because why do we need to expose this?
-//        assertTrue(cap.getUserDetailsService() != null);
-        assertEquals("qwerty", cap.getKey());
-        assertTrue(cap.getStatelessTicketCache() != null);
-        assertTrue(cap.getTicketValidator() != null);
-    }
-
-    @Test
-    public void ignoresClassesItDoesNotSupport() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-        TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password", "ROLE_A");
-        assertFalse(cap.supports(TestingAuthenticationToken.class));
-
-        // Try it anyway
-        assertEquals(null, cap.authenticate(token));
-    }
-
-    @Test
-    public void ignoresUsernamePasswordAuthenticationTokensWithoutCasIdentifiersAsPrincipal() throws Exception {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
-        cap.setKey("qwerty");
-        cap.setStatelessTicketCache(new MockStatelessTicketCache());
-        cap.setTicketValidator(new MockTicketValidator(true));
-        cap.setServiceProperties(makeServiceProperties());
-        cap.afterPropertiesSet();
-
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("some_normal_user",
-                "password", AuthorityUtils.createAuthorityList("ROLE_A"));
-        assertEquals(null, cap.authenticate(token));
-    }
-
-    @Test
-    public void supportsRequiredTokens() {
-        CasAuthenticationProvider cap = new CasAuthenticationProvider();
-        assertTrue(cap.supports(UsernamePasswordAuthenticationToken.class));
-        assertTrue(cap.supports(CasAuthenticationToken.class));
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockAuthoritiesPopulator implements AuthenticationUserDetailsService {
-
-        public UserDetails loadUserDetails(final Authentication token) throws UsernameNotFoundException {
-            return makeUserDetailsFromAuthoritiesPopulator();
-        }
-    }
-
-    private class MockStatelessTicketCache implements StatelessTicketCache {
-        private Map<String, CasAuthenticationToken> cache = new HashMap<String, CasAuthenticationToken>();
-
-        public CasAuthenticationToken getByTicketId(String serviceTicket) {
-            return cache.get(serviceTicket);
-        }
-
-        public void putTicketInCache(CasAuthenticationToken token) {
-            cache.put(token.getCredentials().toString(), token);
-        }
-
-        public void removeTicketFromCache(CasAuthenticationToken token) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-
-        public void removeTicketFromCache(String serviceTicket) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-    }
-
-    private class MockTicketValidator implements TicketValidator {
-        private boolean returnTicket;
-
-        public MockTicketValidator(boolean returnTicket) {
-            this.returnTicket = returnTicket;
-        }
-
-        public Assertion validate(final String ticket, final String service)
-                throws TicketValidationException {
-            if (returnTicket) {
-                return new AssertionImpl("rod");
-            }
-            throw new BadCredentialsException("As requested from mock");
-        }
-    }
+	// ~ Methods
+	// ========================================================================================================
+
+	private UserDetails makeUserDetails() {
+		return new User("user", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	}
+
+	private UserDetails makeUserDetailsFromAuthoritiesPopulator() {
+		return new User("user", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B"));
+	}
+
+	private ServiceProperties makeServiceProperties() {
+		final ServiceProperties serviceProperties = new ServiceProperties();
+		serviceProperties.setSendRenew(false);
+		serviceProperties.setService("http://test.com");
+
+		return serviceProperties;
+	}
+
+	@Test
+	public void statefulAuthenticationIsSuccessful() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		StatelessTicketCache cache = new MockStatelessTicketCache();
+		cap.setStatelessTicketCache(cache);
+		cap.setServiceProperties(makeServiceProperties());
+
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.afterPropertiesSet();
+
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER, "ST-123");
+		token.setDetails("details");
+
+		Authentication result = cap.authenticate(token);
+
+		// Confirm ST-123 was NOT added to the cache
+		assertTrue(cache.getByTicketId("ST-456") == null);
+
+		if (!(result instanceof CasAuthenticationToken)) {
+			fail("Should have returned a CasAuthenticationToken");
+		}
+
+		CasAuthenticationToken casResult = (CasAuthenticationToken) result;
+		assertEquals(makeUserDetailsFromAuthoritiesPopulator(), casResult.getPrincipal());
+		assertEquals("ST-123", casResult.getCredentials());
+		assertTrue(casResult.getAuthorities().contains(
+				new SimpleGrantedAuthority("ROLE_A")));
+		assertTrue(casResult.getAuthorities().contains(
+				new SimpleGrantedAuthority("ROLE_B")));
+		assertEquals(cap.getKey().hashCode(), casResult.getKeyHash());
+		assertEquals("details", casResult.getDetails());
+
+		// Now confirm the CasAuthenticationToken is automatically re-accepted.
+		// To ensure TicketValidator not called again, set it to deliver an exception...
+		cap.setTicketValidator(new MockTicketValidator(false));
+
+		Authentication laterResult = cap.authenticate(result);
+		assertEquals(result, laterResult);
+	}
+
+	@Test
+	public void statelessAuthenticationIsSuccessful() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		StatelessTicketCache cache = new MockStatelessTicketCache();
+		cap.setStatelessTicketCache(cache);
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, "ST-456");
+		token.setDetails("details");
+
+		Authentication result = cap.authenticate(token);
+
+		// Confirm ST-456 was added to the cache
+		assertTrue(cache.getByTicketId("ST-456") != null);
+
+		if (!(result instanceof CasAuthenticationToken)) {
+			fail("Should have returned a CasAuthenticationToken");
+		}
+
+		assertEquals(makeUserDetailsFromAuthoritiesPopulator(), result.getPrincipal());
+		assertEquals("ST-456", result.getCredentials());
+		assertEquals("details", result.getDetails());
+
+		// Now try to authenticate again. To ensure TicketValidator not
+		// called again, set it to deliver an exception...
+		cap.setTicketValidator(new MockTicketValidator(false));
+
+		// Previously created UsernamePasswordAuthenticationToken is OK
+		Authentication newResult = cap.authenticate(token);
+		assertEquals(makeUserDetailsFromAuthoritiesPopulator(), newResult.getPrincipal());
+		assertEquals("ST-456", newResult.getCredentials());
+	}
+
+	@Test
+	public void authenticateAllNullService() throws Exception {
+		String serviceUrl = "https://service/context";
+		ServiceAuthenticationDetails details = mock(ServiceAuthenticationDetails.class);
+		when(details.getServiceUrl()).thenReturn(serviceUrl);
+		TicketValidator validator = mock(TicketValidator.class);
+		when(validator.validate(any(String.class), any(String.class))).thenReturn(
+				new AssertionImpl("rod"));
+
+		ServiceProperties serviceProperties = makeServiceProperties();
+		serviceProperties.setAuthenticateAllArtifacts(true);
+
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		cap.setTicketValidator(validator);
+		cap.setServiceProperties(serviceProperties);
+		cap.afterPropertiesSet();
+
+		String ticket = "ST-456";
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, ticket);
+
+		Authentication result = cap.authenticate(token);
+	}
+
+	@Test
+	public void authenticateAllAuthenticationIsSuccessful() throws Exception {
+		String serviceUrl = "https://service/context";
+		ServiceAuthenticationDetails details = mock(ServiceAuthenticationDetails.class);
+		when(details.getServiceUrl()).thenReturn(serviceUrl);
+		TicketValidator validator = mock(TicketValidator.class);
+		when(validator.validate(any(String.class), any(String.class))).thenReturn(
+				new AssertionImpl("rod"));
+
+		ServiceProperties serviceProperties = makeServiceProperties();
+		serviceProperties.setAuthenticateAllArtifacts(true);
+
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		cap.setTicketValidator(validator);
+		cap.setServiceProperties(serviceProperties);
+		cap.afterPropertiesSet();
+
+		String ticket = "ST-456";
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				CasAuthenticationFilter.CAS_STATELESS_IDENTIFIER, ticket);
+
+		Authentication result = cap.authenticate(token);
+		verify(validator).validate(ticket, serviceProperties.getService());
+
+		serviceProperties.setAuthenticateAllArtifacts(true);
+		result = cap.authenticate(token);
+		verify(validator, times(2)).validate(ticket, serviceProperties.getService());
+
+		token.setDetails(details);
+		result = cap.authenticate(token);
+		verify(validator).validate(ticket, serviceUrl);
+
+		serviceProperties.setAuthenticateAllArtifacts(false);
+		serviceProperties.setService(null);
+		cap.setServiceProperties(serviceProperties);
+		cap.afterPropertiesSet();
+		result = cap.authenticate(token);
+		verify(validator, times(2)).validate(ticket, serviceUrl);
+
+		token.setDetails(new WebAuthenticationDetails(new MockHttpServletRequest()));
+		try {
+			cap.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (IllegalStateException success) {
+		}
+
+		cap.setServiceProperties(null);
+		cap.afterPropertiesSet();
+		try {
+			cap.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (IllegalStateException success) {
+		}
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void missingTicketIdIsDetected() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		StatelessTicketCache cache = new MockStatelessTicketCache();
+		cap.setStatelessTicketCache(cache);
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				CasAuthenticationFilter.CAS_STATEFUL_IDENTIFIER, "");
+
+		cap.authenticate(token);
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void invalidKeyIsDetected() throws Exception {
+		final Assertion assertion = new AssertionImpl("test");
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+
+		StatelessTicketCache cache = new MockStatelessTicketCache();
+		cap.setStatelessTicketCache(cache);
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		CasAuthenticationToken token = new CasAuthenticationToken("WRONG_KEY",
+				makeUserDetails(), "credentials",
+				AuthorityUtils.createAuthorityList("XX"), makeUserDetails(), assertion);
+
+		cap.authenticate(token);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingAuthoritiesPopulator() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setKey("qwerty");
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingKey() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingStatelessTicketCache() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		// set this explicitly to null to test failure
+		cap.setStatelessTicketCache(null);
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingTicketValidator() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+	}
+
+	@Test
+	public void gettersAndSettersMatch() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		// TODO disabled because why do we need to expose this?
+		// assertTrue(cap.getUserDetailsService() != null);
+		assertEquals("qwerty", cap.getKey());
+		assertTrue(cap.getStatelessTicketCache() != null);
+		assertTrue(cap.getTicketValidator() != null);
+	}
+
+	@Test
+	public void ignoresClassesItDoesNotSupport() throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		TestingAuthenticationToken token = new TestingAuthenticationToken("user",
+				"password", "ROLE_A");
+		assertFalse(cap.supports(TestingAuthenticationToken.class));
+
+		// Try it anyway
+		assertEquals(null, cap.authenticate(token));
+	}
+
+	@Test
+	public void ignoresUsernamePasswordAuthenticationTokensWithoutCasIdentifiersAsPrincipal()
+			throws Exception {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		cap.setAuthenticationUserDetailsService(new MockAuthoritiesPopulator());
+		cap.setKey("qwerty");
+		cap.setStatelessTicketCache(new MockStatelessTicketCache());
+		cap.setTicketValidator(new MockTicketValidator(true));
+		cap.setServiceProperties(makeServiceProperties());
+		cap.afterPropertiesSet();
+
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"some_normal_user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_A"));
+		assertEquals(null, cap.authenticate(token));
+	}
+
+	@Test
+	public void supportsRequiredTokens() {
+		CasAuthenticationProvider cap = new CasAuthenticationProvider();
+		assertTrue(cap.supports(UsernamePasswordAuthenticationToken.class));
+		assertTrue(cap.supports(CasAuthenticationToken.class));
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class MockAuthoritiesPopulator implements AuthenticationUserDetailsService {
+
+		public UserDetails loadUserDetails(final Authentication token)
+				throws UsernameNotFoundException {
+			return makeUserDetailsFromAuthoritiesPopulator();
+		}
+	}
+
+	private class MockStatelessTicketCache implements StatelessTicketCache {
+		private Map<String, CasAuthenticationToken> cache = new HashMap<String, CasAuthenticationToken>();
+
+		public CasAuthenticationToken getByTicketId(String serviceTicket) {
+			return cache.get(serviceTicket);
+		}
+
+		public void putTicketInCache(CasAuthenticationToken token) {
+			cache.put(token.getCredentials().toString(), token);
+		}
+
+		public void removeTicketFromCache(CasAuthenticationToken token) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
+
+		public void removeTicketFromCache(String serviceTicket) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
+	}
+
+	private class MockTicketValidator implements TicketValidator {
+		private boolean returnTicket;
+
+		public MockTicketValidator(boolean returnTicket) {
+			this.returnTicket = returnTicket;
+		}
+
+		public Assertion validate(final String ticket, final String service)
+				throws TicketValidationException {
+			if (returnTicket) {
+				return new AssertionImpl("rod");
+			}
+			throw new BadCredentialsException("As requested from mock");
+		}
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java
index 16dc11f1d6..c392d6a7ce 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationTokenTests.java
@@ -33,156 +33,176 @@ import java.util.*;
  * @author Ben Alex
  */
 public class CasAuthenticationTokenTests extends TestCase {
-    private final List<GrantedAuthority> ROLES = AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO");
+	private final List<GrantedAuthority> ROLES = AuthorityUtils.createAuthorityList(
+			"ROLE_ONE", "ROLE_TWO");
 
-    private UserDetails makeUserDetails() {
-        return makeUserDetails("user");
-    }
+	private UserDetails makeUserDetails() {
+		return makeUserDetails("user");
+	}
 
-    private UserDetails makeUserDetails(final String name) {
-        return new User(name, "password", true, true, true, true, ROLES);
-    }
+	private UserDetails makeUserDetails(final String name) {
+		return new User(name, "password", true, true, true, true, ROLES);
+	}
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testConstructorRejectsNulls() {
-        final Assertion assertion = new AssertionImpl("test");
-        try {
-            new CasAuthenticationToken(null, makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+	public void testConstructorRejectsNulls() {
+		final Assertion assertion = new AssertionImpl("test");
+		try {
+			new CasAuthenticationToken(null, makeUserDetails(), "Password", ROLES,
+					makeUserDetails(), assertion);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new CasAuthenticationToken("key", null, "Password", ROLES, makeUserDetails(), assertion);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new CasAuthenticationToken("key", null, "Password", ROLES, makeUserDetails(),
+					assertion);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new CasAuthenticationToken("key", makeUserDetails(), null, ROLES, makeUserDetails(), assertion);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new CasAuthenticationToken("key", makeUserDetails(), null, ROLES,
+					makeUserDetails(), assertion);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, makeUserDetails(), null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
+					makeUserDetails(), null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, null, assertion);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES, null,
+					assertion);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new CasAuthenticationToken("key", makeUserDetails(), "Password", AuthorityUtils.createAuthorityList("ROLE_1", null), makeUserDetails(), assertion);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			new CasAuthenticationToken("key", makeUserDetails(), "Password",
+					AuthorityUtils.createAuthorityList("ROLE_1", null),
+					makeUserDetails(), assertion);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testEqualsWhenEqual() {
-        final Assertion assertion = new AssertionImpl("test");
+	public void testEqualsWhenEqual() {
+		final Assertion assertion = new AssertionImpl("test");
 
-        CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token1 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token2 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        assertEquals(token1, token2);
-    }
+		assertEquals(token1, token2);
+	}
 
-    public void testGetters() {
-        // Build the proxy list returned in the ticket from CAS
-        final Assertion assertion = new AssertionImpl("test");
-        CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
-        assertEquals("key".hashCode(), token.getKeyHash());
-        assertEquals(makeUserDetails(), token.getPrincipal());
-        assertEquals("Password", token.getCredentials());
-        assertTrue(token.getAuthorities().contains(new SimpleGrantedAuthority("ROLE_ONE")));
-        assertTrue(token.getAuthorities().contains(new SimpleGrantedAuthority("ROLE_TWO")));
-        assertEquals(assertion, token.getAssertion());
-        assertEquals(makeUserDetails().getUsername(), token.getUserDetails().getUsername());
-    }
+	public void testGetters() {
+		// Build the proxy list returned in the ticket from CAS
+		final Assertion assertion = new AssertionImpl("test");
+		CasAuthenticationToken token = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
+		assertEquals("key".hashCode(), token.getKeyHash());
+		assertEquals(makeUserDetails(), token.getPrincipal());
+		assertEquals("Password", token.getCredentials());
+		assertTrue(token.getAuthorities()
+				.contains(new SimpleGrantedAuthority("ROLE_ONE")));
+		assertTrue(token.getAuthorities()
+				.contains(new SimpleGrantedAuthority("ROLE_TWO")));
+		assertEquals(assertion, token.getAssertion());
+		assertEquals(makeUserDetails().getUsername(), token.getUserDetails()
+				.getUsername());
+	}
 
-    public void testNoArgConstructorDoesntExist() {
-        try {
-            CasAuthenticationToken.class.getDeclaredConstructor((Class[]) null);
-            fail("Should have thrown NoSuchMethodException");
-        } catch (NoSuchMethodException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testNoArgConstructorDoesntExist() {
+		try {
+			CasAuthenticationToken.class.getDeclaredConstructor((Class[]) null);
+			fail("Should have thrown NoSuchMethodException");
+		}
+		catch (NoSuchMethodException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testNotEqualsDueToAbstractParentEqualsCheck() {
-        final Assertion assertion = new AssertionImpl("test");
+	public void testNotEqualsDueToAbstractParentEqualsCheck() {
+		final Assertion assertion = new AssertionImpl("test");
 
-        CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token1 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails("OTHER_NAME"), "Password",
-                ROLES, makeUserDetails(), assertion);
+		CasAuthenticationToken token2 = new CasAuthenticationToken("key",
+				makeUserDetails("OTHER_NAME"), "Password", ROLES, makeUserDetails(),
+				assertion);
 
-        assertTrue(!token1.equals(token2));
-    }
+		assertTrue(!token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToDifferentAuthenticationClass() {
-        final Assertion assertion = new AssertionImpl("test");
+	public void testNotEqualsDueToDifferentAuthenticationClass() {
+		final Assertion assertion = new AssertionImpl("test");
 
-        CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token1 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password", ROLES);
-        assertTrue(!token1.equals(token2));
-    }
+		UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", ROLES);
+		assertTrue(!token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToKey() {
-        final Assertion assertion = new AssertionImpl("test");
+	public void testNotEqualsDueToKey() {
+		final Assertion assertion = new AssertionImpl("test");
 
-        CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token1 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        CasAuthenticationToken token2 = new CasAuthenticationToken("DIFFERENT_KEY", makeUserDetails(), "Password",
-                ROLES, makeUserDetails(), assertion);
+		CasAuthenticationToken token2 = new CasAuthenticationToken("DIFFERENT_KEY",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        assertTrue(!token1.equals(token2));
-    }
+		assertTrue(!token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToAssertion() {
-        final Assertion assertion = new AssertionImpl("test");
-        final Assertion assertion2 = new AssertionImpl("test");
+	public void testNotEqualsDueToAssertion() {
+		final Assertion assertion = new AssertionImpl("test");
+		final Assertion assertion2 = new AssertionImpl("test");
 
-        CasAuthenticationToken token1 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
+		CasAuthenticationToken token1 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
 
-        CasAuthenticationToken token2 = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion2);
+		CasAuthenticationToken token2 = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion2);
 
-        assertTrue(!token1.equals(token2));
-    }
+		assertTrue(!token1.equals(token2));
+	}
 
-    public void testSetAuthenticated() {
-        final Assertion assertion = new AssertionImpl("test");
-        CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password", ROLES,
-                makeUserDetails(), assertion);
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
-    }
+	public void testSetAuthenticated() {
+		final Assertion assertion = new AssertionImpl("test");
+		CasAuthenticationToken token = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
+		assertTrue(token.isAuthenticated());
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
+	}
 
-    public void testToString() {
-        final Assertion assertion = new AssertionImpl("test");
-        CasAuthenticationToken token = new CasAuthenticationToken("key", makeUserDetails(), "Password",ROLES,
-                makeUserDetails(), assertion);
-        String result = token.toString();
-        assertTrue(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1);
-    }
+	public void testToString() {
+		final Assertion assertion = new AssertionImpl("test");
+		CasAuthenticationToken token = new CasAuthenticationToken("key",
+				makeUserDetails(), "Password", ROLES, makeUserDetails(), assertion);
+		String result = token.toString();
+		assertTrue(result.lastIndexOf("Credentials (Service/Proxy Ticket):") != -1);
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java
index 01bf1d9a3f..0d542ae4b1 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCacheTests.java
@@ -27,62 +27,63 @@ import org.springframework.security.cas.authentication.EhCacheBasedTicketCache;
 
 import static org.junit.Assert.*;
 
-
 /**
  * Tests {@link EhCacheBasedTicketCache}.
  *
  * @author Ben Alex
  */
 public class EhCacheBasedTicketCacheTests extends AbstractStatelessTicketCacheTests {
-    private static CacheManager cacheManager;
+	private static CacheManager cacheManager;
 
-    //~ Methods ========================================================================================================
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = CacheManager.create();
-        cacheManager.addCache(new Cache("castickets", 500, false, false, 30, 30));
-    }
+	// ~ Methods
+	// ========================================================================================================
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = CacheManager.create();
+		cacheManager.addCache(new Cache("castickets", 500, false, false, 30, 30));
+	}
 
-    @AfterClass
-    public static void shutdownCacheManager() {
-        cacheManager.removalAll();
-        cacheManager.shutdown();
-    }
+	@AfterClass
+	public static void shutdownCacheManager() {
+		cacheManager.removalAll();
+		cacheManager.shutdown();
+	}
 
-    @Test
-    public void testCacheOperation() throws Exception {
-        EhCacheBasedTicketCache cache = new EhCacheBasedTicketCache();
-        cache.setCache(cacheManager.getCache("castickets"));
-        cache.afterPropertiesSet();
+	@Test
+	public void testCacheOperation() throws Exception {
+		EhCacheBasedTicketCache cache = new EhCacheBasedTicketCache();
+		cache.setCache(cacheManager.getCache("castickets"));
+		cache.afterPropertiesSet();
 
-        final CasAuthenticationToken token = getToken();
+		final CasAuthenticationToken token = getToken();
 
-        // Check it gets stored in the cache
-        cache.putTicketInCache(token);
-        assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
+		// Check it gets stored in the cache
+		cache.putTicketInCache(token);
+		assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
 
-        // Check it gets removed from the cache
-        cache.removeTicketFromCache(getToken());
-        assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
+		// Check it gets removed from the cache
+		cache.removeTicketFromCache(getToken());
+		assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
 
-        // Check it doesn't return values for null or unknown service tickets
-        assertNull(cache.getByTicketId(null));
-        assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET"));
-    }
+		// Check it doesn't return values for null or unknown service tickets
+		assertNull(cache.getByTicketId(null));
+		assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET"));
+	}
 
-    @Test
-    public void testStartupDetectsMissingCache() throws Exception {
-        EhCacheBasedTicketCache cache = new EhCacheBasedTicketCache();
+	@Test
+	public void testStartupDetectsMissingCache() throws Exception {
+		EhCacheBasedTicketCache cache = new EhCacheBasedTicketCache();
 
-        try {
-            cache.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			cache.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        Ehcache myCache = cacheManager.getCache("castickets");
-        cache.setCache(myCache);
-        assertEquals(myCache, cache.getCache());
-    }
+		Ehcache myCache = cacheManager.getCache("castickets");
+		cache.setCache(myCache);
+		assertEquals(myCache, cache.getCache());
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java
index abf0e0c72d..fb5fd88115 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/NullStatelessTicketCacheTests.java
@@ -14,7 +14,6 @@
  */
 package org.springframework.security.cas.authentication;
 
-
 import org.junit.Test;
 import org.springframework.security.cas.authentication.CasAuthenticationToken;
 import org.springframework.security.cas.authentication.NullStatelessTicketCache;
@@ -30,18 +29,18 @@ import static org.junit.Assert.*;
  */
 public class NullStatelessTicketCacheTests extends AbstractStatelessTicketCacheTests {
 
-    private StatelessTicketCache cache = new NullStatelessTicketCache();
+	private StatelessTicketCache cache = new NullStatelessTicketCache();
 
-    @Test
-    public void testGetter() {
-        assertNull(cache.getByTicketId(null));
-        assertNull(cache.getByTicketId("test"));
-    }
+	@Test
+	public void testGetter() {
+		assertNull(cache.getByTicketId(null));
+		assertNull(cache.getByTicketId("test"));
+	}
 
-    @Test
-    public void testInsertAndGet() {
-        final CasAuthenticationToken token = getToken();
-        cache.putTicketInCache(token);
-        assertNull(cache.getByTicketId((String) token.getCredentials()));
-    }
+	@Test
+	public void testInsertAndGet() {
+		final CasAuthenticationToken token = getToken();
+		cache.putTicketInCache(token);
+		assertNull(cache.getByTicketId((String) token.getCredentials()));
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java
index c8abf77f94..7072921247 100644
--- a/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCacheTests.java
@@ -22,45 +22,47 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 
 import static org.junit.Assert.*;
 
-
 /**
- * Tests {@link org.springframework.security.cas.authentication.SpringCacheBasedTicketCache}.
+ * Tests
+ * {@link org.springframework.security.cas.authentication.SpringCacheBasedTicketCache}.
  *
  * @author Marten Deinum
  * @since 3.2
  */
 public class SpringCacheBasedTicketCacheTests extends AbstractStatelessTicketCacheTests {
-    private static CacheManager cacheManager;
+	private static CacheManager cacheManager;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = new ConcurrentMapCacheManager();
-        cacheManager.getCache("castickets");
-    }
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = new ConcurrentMapCacheManager();
+		cacheManager.getCache("castickets");
+	}
 
-    @Test
-    public void testCacheOperation() throws Exception {
-        SpringCacheBasedTicketCache cache = new SpringCacheBasedTicketCache(cacheManager.getCache("castickets"));
+	@Test
+	public void testCacheOperation() throws Exception {
+		SpringCacheBasedTicketCache cache = new SpringCacheBasedTicketCache(
+				cacheManager.getCache("castickets"));
 
-        final CasAuthenticationToken token = getToken();
+		final CasAuthenticationToken token = getToken();
 
-        // Check it gets stored in the cache
-        cache.putTicketInCache(token);
-        assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
+		// Check it gets stored in the cache
+		cache.putTicketInCache(token);
+		assertEquals(token, cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
 
-        // Check it gets removed from the cache
-        cache.removeTicketFromCache(getToken());
-        assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
+		// Check it gets removed from the cache
+		cache.removeTicketFromCache(getToken());
+		assertNull(cache.getByTicketId("ST-0-ER94xMJmn6pha35CQRoZ"));
 
-        // Check it doesn't return values for null or unknown service tickets
-        assertNull(cache.getByTicketId(null));
-        assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET"));
-    }
+		// Check it doesn't return values for null or unknown service tickets
+		assertNull(cache.getByTicketId(null));
+		assertNull(cache.getByTicketId("UNKNOWN_SERVICE_TICKET"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testStartupDetectsMissingCache() throws Exception {
-        new SpringCacheBasedTicketCache(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testStartupDetectsMissingCache() throws Exception {
+		new SpringCacheBasedTicketCache(null);
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java
index 0dcc456a80..33ced63c80 100644
--- a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java
@@ -21,29 +21,30 @@ import java.util.Set;
  */
 public class GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests {
 
-    @Test
-    public void correctlyExtractsNamedAttributesFromAssertionAndConvertsThemToAuthorities() {
-        GrantedAuthorityFromAssertionAttributesUserDetailsService uds =
-                new GrantedAuthorityFromAssertionAttributesUserDetailsService(new String[] {"a", "b", "c", "d"});
-        uds.setConvertToUpperCase(false);
-        Assertion assertion = mock(Assertion.class);
-        AttributePrincipal principal = mock(AttributePrincipal.class);
-        Map<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put("a", Arrays.asList("role_a1", "role_a2"));
-        attributes.put("b", "role_b");
-        attributes.put("c", "role_c");
-        attributes.put("d", null);
-        attributes.put("someother", "unused");
-        when(assertion.getPrincipal()).thenReturn(principal);
-        when(principal.getAttributes()).thenReturn(attributes);
-        when(principal.getName()).thenReturn("somebody");
-        CasAssertionAuthenticationToken token = new CasAssertionAuthenticationToken(assertion, "ticket");
-        UserDetails user = uds.loadUserDetails(token);
-        Set<String> roles = AuthorityUtils.authorityListToSet(user.getAuthorities());
-        assertTrue(roles.size() == 4);
-        assertTrue(roles.contains("role_a1"));
-        assertTrue(roles.contains("role_a2"));
-        assertTrue(roles.contains("role_b"));
-        assertTrue(roles.contains("role_c"));
-    }
+	@Test
+	public void correctlyExtractsNamedAttributesFromAssertionAndConvertsThemToAuthorities() {
+		GrantedAuthorityFromAssertionAttributesUserDetailsService uds = new GrantedAuthorityFromAssertionAttributesUserDetailsService(
+				new String[] { "a", "b", "c", "d" });
+		uds.setConvertToUpperCase(false);
+		Assertion assertion = mock(Assertion.class);
+		AttributePrincipal principal = mock(AttributePrincipal.class);
+		Map<String, Object> attributes = new HashMap<String, Object>();
+		attributes.put("a", Arrays.asList("role_a1", "role_a2"));
+		attributes.put("b", "role_b");
+		attributes.put("c", "role_c");
+		attributes.put("d", null);
+		attributes.put("someother", "unused");
+		when(assertion.getPrincipal()).thenReturn(principal);
+		when(principal.getAttributes()).thenReturn(attributes);
+		when(principal.getName()).thenReturn("somebody");
+		CasAssertionAuthenticationToken token = new CasAssertionAuthenticationToken(
+				assertion, "ticket");
+		UserDetails user = uds.loadUserDetails(token);
+		Set<String> roles = AuthorityUtils.authorityListToSet(user.getAuthorities());
+		assertTrue(roles.size() == 4);
+		assertTrue(roles.contains("role_a1"));
+		assertTrue(roles.contains("role_a2"));
+		assertTrue(roles.contains("role_b"));
+		assertTrue(roles.contains("role_c"));
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java
index 9c0af7b2be..fb27a84abd 100644
--- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationEntryPointTests.java
@@ -24,88 +24,92 @@ import org.springframework.security.cas.web.CasAuthenticationEntryPoint;
 
 import java.net.URLEncoder;
 
-
 /**
  * Tests {@link CasAuthenticationEntryPoint}.
  *
  * @author Ben Alex
  */
 public class CasAuthenticationEntryPointTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDetectsMissingLoginFormUrl() throws Exception {
-        CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
-        ep.setServiceProperties(new ServiceProperties());
+	public void testDetectsMissingLoginFormUrl() throws Exception {
+		CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
+		ep.setServiceProperties(new ServiceProperties());
 
-        try {
-            ep.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("loginUrl must be specified", expected.getMessage());
-        }
-    }
+		try {
+			ep.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("loginUrl must be specified", expected.getMessage());
+		}
+	}
 
-    public void testDetectsMissingServiceProperties() throws Exception {
-        CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
-        ep.setLoginUrl("https://cas/login");
+	public void testDetectsMissingServiceProperties() throws Exception {
+		CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
+		ep.setLoginUrl("https://cas/login");
 
-        try {
-            ep.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("serviceProperties must be specified", expected.getMessage());
-        }
-    }
+		try {
+			ep.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("serviceProperties must be specified", expected.getMessage());
+		}
+	}
 
-    public void testGettersSetters() {
-        CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
-        ep.setLoginUrl("https://cas/login");
-        assertEquals("https://cas/login", ep.getLoginUrl());
+	public void testGettersSetters() {
+		CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
+		ep.setLoginUrl("https://cas/login");
+		assertEquals("https://cas/login", ep.getLoginUrl());
 
-        ep.setServiceProperties(new ServiceProperties());
-        assertTrue(ep.getServiceProperties() != null);
-    }
+		ep.setServiceProperties(new ServiceProperties());
+		assertTrue(ep.getServiceProperties() != null);
+	}
 
-    public void testNormalOperationWithRenewFalse() throws Exception {
-        ServiceProperties sp = new ServiceProperties();
-        sp.setSendRenew(false);
-        sp.setService("https://mycompany.com/bigWebApp/login/cas");
+	public void testNormalOperationWithRenewFalse() throws Exception {
+		ServiceProperties sp = new ServiceProperties();
+		sp.setSendRenew(false);
+		sp.setService("https://mycompany.com/bigWebApp/login/cas");
 
-        CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
-        ep.setLoginUrl("https://cas/login");
-        ep.setServiceProperties(sp);
+		CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
+		ep.setLoginUrl("https://cas/login");
+		ep.setServiceProperties(sp);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.afterPropertiesSet();
-        ep.commence(request, response, null);
+		ep.afterPropertiesSet();
+		ep.commence(request, response, null);
 
-        assertEquals("https://cas/login?service="
-            + URLEncoder.encode("https://mycompany.com/bigWebApp/login/cas", "UTF-8"),
-            response.getRedirectedUrl());
-    }
+		assertEquals(
+				"https://cas/login?service="
+						+ URLEncoder.encode("https://mycompany.com/bigWebApp/login/cas",
+								"UTF-8"), response.getRedirectedUrl());
+	}
 
-    public void testNormalOperationWithRenewTrue() throws Exception {
-        ServiceProperties sp = new ServiceProperties();
-        sp.setSendRenew(true);
-        sp.setService("https://mycompany.com/bigWebApp/login/cas");
+	public void testNormalOperationWithRenewTrue() throws Exception {
+		ServiceProperties sp = new ServiceProperties();
+		sp.setSendRenew(true);
+		sp.setService("https://mycompany.com/bigWebApp/login/cas");
 
-        CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
-        ep.setLoginUrl("https://cas/login");
-        ep.setServiceProperties(sp);
+		CasAuthenticationEntryPoint ep = new CasAuthenticationEntryPoint();
+		ep.setLoginUrl("https://cas/login");
+		ep.setServiceProperties(sp);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.afterPropertiesSet();
-        ep.commence(request, response, null);
-        assertEquals("https://cas/login?service="
-            + URLEncoder.encode("https://mycompany.com/bigWebApp/login/cas", "UTF-8") + "&renew=true",
-            response.getRedirectedUrl());
-    }
+		ep.afterPropertiesSet();
+		ep.commence(request, response, null);
+		assertEquals(
+				"https://cas/login?service="
+						+ URLEncoder.encode("https://mycompany.com/bigWebApp/login/cas",
+								"UTF-8") + "&renew=true", response.getRedirectedUrl());
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java
index 309d8159df..9ce03174f0 100644
--- a/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/web/CasAuthenticationFilterTests.java
@@ -45,7 +45,6 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand
 import org.springframework.security.web.authentication.NullRememberMeServices;
 import org.springframework.util.ReflectionUtils;
 
-
 /**
  * Tests {@link CasAuthenticationFilter}.
  *
@@ -53,166 +52,176 @@ import org.springframework.util.ReflectionUtils;
  * @author Rob Winch
  */
 public class CasAuthenticationFilterTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testGettersSetters() {
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
-        filter.setProxyReceptorUrl("/someurl");
-        filter.setServiceProperties(new ServiceProperties());
-    }
+	@Test
+	public void testGettersSetters() {
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+		filter.setProxyReceptorUrl("/someurl");
+		filter.setServiceProperties(new ServiceProperties());
+	}
 
-    @Test
-    public void testNormalOperation() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/login/cas");
-        request.addParameter("ticket", "ST-0-ER94xMJmn6pha35CQRoZ");
+	@Test
+	public void testNormalOperation() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/login/cas");
+		request.addParameter("ticket", "ST-0-ER94xMJmn6pha35CQRoZ");
 
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setAuthenticationManager(new AuthenticationManager() {
-            public Authentication authenticate(Authentication a) {
-                return a;
-            }
-        });
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setAuthenticationManager(new AuthenticationManager() {
+			public Authentication authenticate(Authentication a) {
+				return a;
+			}
+		});
 
-        assertTrue(filter.requiresAuthentication(request, new MockHttpServletResponse()));
+		assertTrue(filter.requiresAuthentication(request, new MockHttpServletResponse()));
 
-        Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
-        assertTrue(result != null);
-    }
+		Authentication result = filter.attemptAuthentication(request,
+				new MockHttpServletResponse());
+		assertTrue(result != null);
+	}
 
-    @Test(expected=AuthenticationException.class)
-    public void testNullServiceTicketHandledGracefully() throws Exception {
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setAuthenticationManager(new AuthenticationManager() {
-            public Authentication authenticate(Authentication a) {
-                throw new BadCredentialsException("Rejected");
-            }
-        });
+	@Test(expected = AuthenticationException.class)
+	public void testNullServiceTicketHandledGracefully() throws Exception {
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setAuthenticationManager(new AuthenticationManager() {
+			public Authentication authenticate(Authentication a) {
+				throw new BadCredentialsException("Rejected");
+			}
+		});
 
-        filter.attemptAuthentication(new MockHttpServletRequest(), new MockHttpServletResponse());
-    }
+		filter.attemptAuthentication(new MockHttpServletRequest(),
+				new MockHttpServletResponse());
+	}
 
-    @Test
-    public void testRequiresAuthenticationFilterProcessUrl() {
-        String url = "/login/cas";
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setFilterProcessesUrl(url);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testRequiresAuthenticationFilterProcessUrl() {
+		String url = "/login/cas";
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setFilterProcessesUrl(url);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setServletPath(url);
-        assertTrue(filter.requiresAuthentication(request, response));
-    }
+		request.setServletPath(url);
+		assertTrue(filter.requiresAuthentication(request, response));
+	}
 
-    @Test
-    public void testRequiresAuthenticationProxyRequest() {
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testRequiresAuthenticationProxyRequest() {
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setServletPath("/pgtCallback");
-        assertFalse(filter.requiresAuthentication(request, response));
-        filter.setProxyReceptorUrl(request.getServletPath());
-        assertFalse(filter.requiresAuthentication(request, response));
-        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
-        assertTrue(filter.requiresAuthentication(request, response));
-        request.setServletPath("/other");
-        assertFalse(filter.requiresAuthentication(request, response));
-    }
+		request.setServletPath("/pgtCallback");
+		assertFalse(filter.requiresAuthentication(request, response));
+		filter.setProxyReceptorUrl(request.getServletPath());
+		assertFalse(filter.requiresAuthentication(request, response));
+		filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+		assertTrue(filter.requiresAuthentication(request, response));
+		request.setServletPath("/other");
+		assertFalse(filter.requiresAuthentication(request, response));
+	}
 
-    @Test
-    public void testRequiresAuthenticationAuthAll() {
-        ServiceProperties properties = new ServiceProperties();
-        properties.setAuthenticateAllArtifacts(true);
+	@Test
+	public void testRequiresAuthenticationAuthAll() {
+		ServiceProperties properties = new ServiceProperties();
+		properties.setAuthenticateAllArtifacts(true);
 
-        String url = "/login/cas";
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setFilterProcessesUrl(url);
-        filter.setServiceProperties(properties);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		String url = "/login/cas";
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setFilterProcessesUrl(url);
+		filter.setServiceProperties(properties);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setServletPath(url);
-        assertTrue(filter.requiresAuthentication(request, response));
+		request.setServletPath(url);
+		assertTrue(filter.requiresAuthentication(request, response));
 
-        request.setServletPath("/other");
-        assertFalse(filter.requiresAuthentication(request, response));
-        request.setParameter(properties.getArtifactParameter(), "value");
-        assertTrue(filter.requiresAuthentication(request, response));
-        SecurityContextHolder.getContext().setAuthentication(new AnonymousAuthenticationToken("key", "principal", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")));
-        assertTrue(filter.requiresAuthentication(request, response));
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("un", "principal", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")));
-        assertTrue(filter.requiresAuthentication(request, response));
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("un", "principal", "ROLE_ANONYMOUS"));
-        assertFalse(filter.requiresAuthentication(request, response));
-    }
+		request.setServletPath("/other");
+		assertFalse(filter.requiresAuthentication(request, response));
+		request.setParameter(properties.getArtifactParameter(), "value");
+		assertTrue(filter.requiresAuthentication(request, response));
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("key", "principal", AuthorityUtils
+						.createAuthorityList("ROLE_ANONYMOUS")));
+		assertTrue(filter.requiresAuthentication(request, response));
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("un", "principal", AuthorityUtils
+						.createAuthorityList("ROLE_ANONYMOUS")));
+		assertTrue(filter.requiresAuthentication(request, response));
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("un", "principal", "ROLE_ANONYMOUS"));
+		assertFalse(filter.requiresAuthentication(request, response));
+	}
 
-    @Test
-    public void testAuthenticateProxyUrl() throws Exception {
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testAuthenticateProxyUrl() throws Exception {
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setServletPath("/pgtCallback");
-        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
-        filter.setProxyReceptorUrl(request.getServletPath());
-        assertNull(filter.attemptAuthentication(request, response));
-    }
+		request.setServletPath("/pgtCallback");
+		filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+		filter.setProxyReceptorUrl(request.getServletPath());
+		assertNull(filter.attemptAuthentication(request, response));
+	}
 
-    @Test
-    public void testDoFilterAuthenticateAll() throws Exception {
-        AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class);
-        AuthenticationManager manager = mock(AuthenticationManager.class);
-        Authentication authentication = new TestingAuthenticationToken("un", "pwd","ROLE_USER");
-        when(manager.authenticate(any(Authentication.class))).thenReturn(authentication);
-        ServiceProperties serviceProperties = new ServiceProperties();
-        serviceProperties.setAuthenticateAllArtifacts(true);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setParameter("ticket", "ST-1-123");
-        request.setServletPath("/authenticate");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain chain = mock(FilterChain.class);
+	@Test
+	public void testDoFilterAuthenticateAll() throws Exception {
+		AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class);
+		AuthenticationManager manager = mock(AuthenticationManager.class);
+		Authentication authentication = new TestingAuthenticationToken("un", "pwd",
+				"ROLE_USER");
+		when(manager.authenticate(any(Authentication.class))).thenReturn(authentication);
+		ServiceProperties serviceProperties = new ServiceProperties();
+		serviceProperties.setAuthenticateAllArtifacts(true);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setParameter("ticket", "ST-1-123");
+		request.setServletPath("/authenticate");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain chain = mock(FilterChain.class);
 
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        filter.setServiceProperties(serviceProperties);
-        filter.setAuthenticationSuccessHandler(successHandler);
-        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
-        filter.setAuthenticationManager(manager);
-        filter.afterPropertiesSet();
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		filter.setServiceProperties(serviceProperties);
+		filter.setAuthenticationSuccessHandler(successHandler);
+		filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+		filter.setAuthenticationManager(manager);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request,response,chain);
-        assertFalse("Authentication should not be null",SecurityContextHolder.getContext().getAuthentication() == null);
-        verify(chain).doFilter(request, response);
-        verifyZeroInteractions(successHandler);
+		filter.doFilter(request, response, chain);
+		assertFalse("Authentication should not be null", SecurityContextHolder
+				.getContext().getAuthentication() == null);
+		verify(chain).doFilter(request, response);
+		verifyZeroInteractions(successHandler);
 
-        // validate for when the filterProcessUrl matches
-        filter.setFilterProcessesUrl(request.getServletPath());
-        SecurityContextHolder.clearContext();
-        filter.doFilter(request,response,chain);
-        verifyNoMoreInteractions(chain);
-        verify(successHandler).onAuthenticationSuccess(request, response, authentication);
-    }
+		// validate for when the filterProcessUrl matches
+		filter.setFilterProcessesUrl(request.getServletPath());
+		SecurityContextHolder.clearContext();
+		filter.doFilter(request, response, chain);
+		verifyNoMoreInteractions(chain);
+		verify(successHandler).onAuthenticationSuccess(request, response, authentication);
+	}
 
-    // SEC-1592
-    @Test
-    public void testChainNotInvokedForProxyReceptor() throws Exception {
-        CasAuthenticationFilter filter = new CasAuthenticationFilter();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain chain = mock(FilterChain.class);
+	// SEC-1592
+	@Test
+	public void testChainNotInvokedForProxyReceptor() throws Exception {
+		CasAuthenticationFilter filter = new CasAuthenticationFilter();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain chain = mock(FilterChain.class);
 
-        request.setServletPath("/pgtCallback");
-        filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
-        filter.setProxyReceptorUrl(request.getServletPath());
+		request.setServletPath("/pgtCallback");
+		filter.setProxyGrantingTicketStorage(mock(ProxyGrantingTicketStorage.class));
+		filter.setProxyReceptorUrl(request.getServletPath());
 
-        filter.doFilter(request,response,chain);
-        verifyZeroInteractions(chain);
-    }
+		filter.doFilter(request, response, chain);
+		verifyZeroInteractions(chain);
+	}
 }
\ No newline at end of file
diff --git a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java
index ec327ff49b..1581725aca 100644
--- a/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/web/ServicePropertiesTests.java
@@ -27,46 +27,51 @@ import org.springframework.security.cas.ServiceProperties;
  * @author Ben Alex
  */
 public class ServicePropertiesTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsMissingService() throws Exception {
-        ServiceProperties sp = new ServiceProperties();
-        sp.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingService() throws Exception {
+		ServiceProperties sp = new ServiceProperties();
+		sp.afterPropertiesSet();
+	}
 
-    @Test
-    public void nullServiceWhenAuthenticateAllTokens() throws Exception {
-        ServiceProperties sp = new ServiceProperties();
-        sp.setAuthenticateAllArtifacts(true);
-        try {
-            sp.afterPropertiesSet();
-            fail("Expected Exception");
-        }catch(IllegalArgumentException success) {}
-        sp.setAuthenticateAllArtifacts(false);
-        try {
-            sp.afterPropertiesSet();
-            fail("Expected Exception");
-        }catch(IllegalArgumentException success) {}
-    }
+	@Test
+	public void nullServiceWhenAuthenticateAllTokens() throws Exception {
+		ServiceProperties sp = new ServiceProperties();
+		sp.setAuthenticateAllArtifacts(true);
+		try {
+			sp.afterPropertiesSet();
+			fail("Expected Exception");
+		}
+		catch (IllegalArgumentException success) {
+		}
+		sp.setAuthenticateAllArtifacts(false);
+		try {
+			sp.afterPropertiesSet();
+			fail("Expected Exception");
+		}
+		catch (IllegalArgumentException success) {
+		}
+	}
 
-    @Test
-    public void testGettersSetters() throws Exception {
-        ServiceProperties[] sps = {new ServiceProperties(), new SamlServiceProperties()};
-        for(ServiceProperties sp : sps) {
-            sp.setSendRenew(false);
-            assertFalse(sp.isSendRenew());
-            sp.setSendRenew(true);
-            assertTrue(sp.isSendRenew());
-            sp.setArtifactParameter("notticket");
-            assertEquals("notticket", sp.getArtifactParameter());
-            sp.setServiceParameter("notservice");
-            assertEquals("notservice", sp.getServiceParameter());
+	@Test
+	public void testGettersSetters() throws Exception {
+		ServiceProperties[] sps = { new ServiceProperties(), new SamlServiceProperties() };
+		for (ServiceProperties sp : sps) {
+			sp.setSendRenew(false);
+			assertFalse(sp.isSendRenew());
+			sp.setSendRenew(true);
+			assertTrue(sp.isSendRenew());
+			sp.setArtifactParameter("notticket");
+			assertEquals("notticket", sp.getArtifactParameter());
+			sp.setServiceParameter("notservice");
+			assertEquals("notservice", sp.getServiceParameter());
 
-            sp.setService("https://mycompany.com/service");
-            assertEquals("https://mycompany.com/service", sp.getService());
+			sp.setService("https://mycompany.com/service");
+			assertEquals("https://mycompany.com/service", sp.getService());
 
-            sp.afterPropertiesSet();
-        }
-    }
+			sp.afterPropertiesSet();
+		}
+	}
 }
diff --git a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java
index 2243c50956..432a39806c 100644
--- a/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java
+++ b/cas/src/test/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetailsTests.java
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 package org.springframework.security.cas.web.authentication;
+
 import static org.junit.Assert.assertEquals;
 
 import java.util.regex.Pattern;
@@ -39,93 +40,102 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Rob Winch
  */
 public class DefaultServiceAuthenticationDetailsTests {
-    private DefaultServiceAuthenticationDetails details;
-    private MockHttpServletRequest request;
-    private Pattern artifactPattern;
-    private String casServiceUrl;
+	private DefaultServiceAuthenticationDetails details;
+	private MockHttpServletRequest request;
+	private Pattern artifactPattern;
+	private String casServiceUrl;
 
-    private ConfigurableApplicationContext context;
+	private ConfigurableApplicationContext context;
 
-    @Before
-    public void setUp() {
-        casServiceUrl = "https://localhost:8443/j_spring_security_cas";
-        request = new MockHttpServletRequest();
-        request.setScheme("https");
-        request.setServerName("localhost");
-        request.setServerPort(8443);
-        request.setRequestURI("/cas-sample/secure/");
-        artifactPattern = DefaultServiceAuthenticationDetails.createArtifactPattern(ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER);
+	@Before
+	public void setUp() {
+		casServiceUrl = "https://localhost:8443/j_spring_security_cas";
+		request = new MockHttpServletRequest();
+		request.setScheme("https");
+		request.setServerName("localhost");
+		request.setServerPort(8443);
+		request.setRequestURI("/cas-sample/secure/");
+		artifactPattern = DefaultServiceAuthenticationDetails
+				.createArtifactPattern(ServiceProperties.DEFAULT_CAS_ARTIFACT_PARAMETER);
 
-    }
+	}
 
-    @After
-    public void cleanup() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void cleanup() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void getServiceUrlNullQuery() throws Exception {
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,artifactPattern);
-        assertEquals(UrlUtils.buildFullRequestUrl(request), details.getServiceUrl());
-    }
+	@Test
+	public void getServiceUrlNullQuery() throws Exception {
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		assertEquals(UrlUtils.buildFullRequestUrl(request), details.getServiceUrl());
+	}
 
-    @Test
-    public void getServiceUrlTicketOnlyParam() throws Exception {
-        request.setQueryString("ticket=123");
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl,request,artifactPattern);
-        String serviceUrl = details.getServiceUrl();
-        request.setQueryString(null);
-        assertEquals(UrlUtils.buildFullRequestUrl(request),serviceUrl);
-    }
+	@Test
+	public void getServiceUrlTicketOnlyParam() throws Exception {
+		request.setQueryString("ticket=123");
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		String serviceUrl = details.getServiceUrl();
+		request.setQueryString(null);
+		assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl);
+	}
 
-    @Test
-    public void getServiceUrlTicketFirstMultiParam() throws Exception {
-        request.setQueryString("ticket=123&other=value");
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,artifactPattern);
-        String serviceUrl = details.getServiceUrl();
-        request.setQueryString("other=value");
-        assertEquals(UrlUtils.buildFullRequestUrl(request),serviceUrl);
-    }
+	@Test
+	public void getServiceUrlTicketFirstMultiParam() throws Exception {
+		request.setQueryString("ticket=123&other=value");
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		String serviceUrl = details.getServiceUrl();
+		request.setQueryString("other=value");
+		assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl);
+	}
 
-    @Test
-    public void getServiceUrlTicketLastMultiParam() throws Exception {
-        request.setQueryString("other=value&ticket=123");
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl,request,artifactPattern);
-        String serviceUrl = details.getServiceUrl();
-        request.setQueryString("other=value");
-        assertEquals(UrlUtils.buildFullRequestUrl(request),serviceUrl);
-    }
+	@Test
+	public void getServiceUrlTicketLastMultiParam() throws Exception {
+		request.setQueryString("other=value&ticket=123");
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		String serviceUrl = details.getServiceUrl();
+		request.setQueryString("other=value");
+		assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl);
+	}
 
-    @Test
-    public void getServiceUrlTicketMiddleMultiParam() throws Exception {
-        request.setQueryString("other=value&ticket=123&last=this");
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl,request,artifactPattern);
-        String serviceUrl = details.getServiceUrl();
-        request.setQueryString("other=value&last=this");
-        assertEquals(UrlUtils.buildFullRequestUrl(request),serviceUrl);
-    }
+	@Test
+	public void getServiceUrlTicketMiddleMultiParam() throws Exception {
+		request.setQueryString("other=value&ticket=123&last=this");
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		String serviceUrl = details.getServiceUrl();
+		request.setQueryString("other=value&last=this");
+		assertEquals(UrlUtils.buildFullRequestUrl(request), serviceUrl);
+	}
 
-    @Test
-    public void getServiceUrlDoesNotUseHostHeader() throws Exception {
-        casServiceUrl = "https://example.com/j_spring_security_cas";
-        request.setServerName("evil.com");
-        details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,artifactPattern);
-        assertEquals("https://example.com/cas-sample/secure/",details.getServiceUrl());
-    }
+	@Test
+	public void getServiceUrlDoesNotUseHostHeader() throws Exception {
+		casServiceUrl = "https://example.com/j_spring_security_cas";
+		request.setServerName("evil.com");
+		details = new DefaultServiceAuthenticationDetails(casServiceUrl, request,
+				artifactPattern);
+		assertEquals("https://example.com/cas-sample/secure/", details.getServiceUrl());
+	}
 
-    @Test
-    public void getServiceUrlDoesNotUseHostHeaderExplicit() {
-        casServiceUrl = "https://example.com/j_spring_security_cas";
-        request.setServerName("evil.com");
-        ServiceAuthenticationDetails details = loadServiceAuthenticationDetails("defaultserviceauthenticationdetails-explicit.xml");
-        assertEquals("https://example.com/cas-sample/secure/", details.getServiceUrl());
-    }
+	@Test
+	public void getServiceUrlDoesNotUseHostHeaderExplicit() {
+		casServiceUrl = "https://example.com/j_spring_security_cas";
+		request.setServerName("evil.com");
+		ServiceAuthenticationDetails details = loadServiceAuthenticationDetails("defaultserviceauthenticationdetails-explicit.xml");
+		assertEquals("https://example.com/cas-sample/secure/", details.getServiceUrl());
+	}
 
-    private ServiceAuthenticationDetails loadServiceAuthenticationDetails(String resourceName) {
-        context = new GenericXmlApplicationContext(getClass(), resourceName);
-        ServiceAuthenticationDetailsSource source = context.getBean(ServiceAuthenticationDetailsSource.class);
-        return source.buildDetails(request);
-    }
+	private ServiceAuthenticationDetails loadServiceAuthenticationDetails(
+			String resourceName) {
+		context = new GenericXmlApplicationContext(getClass(), resourceName);
+		ServiceAuthenticationDetailsSource source = context
+				.getBean(ServiceAuthenticationDetailsSource.class);
+		return source.buildDetails(request);
+	}
 }
diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java
index 809c6cc4a3..a351745fe0 100644
--- a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java
+++ b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.config.annotation.authentication.ldap;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -28,18 +27,22 @@ import org.springframework.security.ldap.userdetails.PersonContextMapper;
  *
  */
 public class NamespaceLdapAuthenticationProviderTestsConfigs {
-    @EnableWebSecurity
-    static class LdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class LdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter {
+		filter-security-metadata-source
         protected void configure(AuthenticationManagerBuilder auth) throws Exception {
             auth
                 .ldapAuthentication()
                     .groupSearchBase("ou=groups")
                     .userDnPatterns("uid={0},ou=people"); // ldap-server@user-dn-pattern
         }
-    }
+        // @formatter:on
+	}
 
-    @EnableWebSecurity
-    static class CustomLdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class CustomLdapAuthenticationProviderConfig extends
+			WebSecurityConfigurerAdapter {
+		filter-security-metadata-source
         protected void configure(AuthenticationManagerBuilder auth) throws Exception {
             auth
                 .ldapAuthentication()
@@ -61,21 +64,26 @@ public class NamespaceLdapAuthenticationProviderTestsConfigs {
                         // .url("ldap://localhost:33389/dc-springframework,dc=org") this overrides root and port and is used for external
                         ;
         }
-    }
+        // @formatter:on
+	}
 
-    @EnableWebSecurity
-    static class CustomAuthoritiesPopulatorConfig extends WebSecurityConfigurerAdapter {
-        static LdapAuthoritiesPopulator LAP;
+	@EnableWebSecurity
+	static class CustomAuthoritiesPopulatorConfig extends WebSecurityConfigurerAdapter {
+		static LdapAuthoritiesPopulator LAP;
+
+		filter-security-metadata-source
         protected void configure(AuthenticationManagerBuilder auth) throws Exception {
             auth
                 .ldapAuthentication()
                     .userSearchFilter("(uid={0})")
                     .ldapAuthoritiesPopulator(LAP);
         }
-    }
+        // @formatter:on
+	}
 
-    @EnableWebSecurity
-    static class PasswordCompareLdapConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class PasswordCompareLdapConfig extends WebSecurityConfigurerAdapter {
+		filter-security-metadata-source
         protected void configure(AuthenticationManagerBuilder auth) throws Exception {
             auth
                 .ldapAuthentication()
@@ -85,5 +93,6 @@ public class NamespaceLdapAuthenticationProviderTestsConfigs {
                         .passwordEncoder(new PlaintextPasswordEncoder()) // ldap-authentication-provider/password-compare/password-encoder@ref
                         .passwordAttribute("userPassword"); // ldap-authentication-provider/password-compare@password-attribute
         }
-    }
+        // @formatter:on
+	}
 }
diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
index 52b9f216c4..520cba7d22 100644
--- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
+++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
@@ -31,72 +31,83 @@ import org.springframework.test.util.ReflectionTestUtils;
  * @author Rob Winch
  */
 public class LdapServerBeanDefinitionParserTests {
-    InMemoryXmlApplicationContext appCtx;
+	InMemoryXmlApplicationContext appCtx;
 
-    @After
-    public void closeAppContext() {
-        if (appCtx != null) {
-            appCtx.close();
-            appCtx = null;
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appCtx != null) {
+			appCtx.close();
+			appCtx = null;
+		}
+	}
 
-    @Test
-    public void embeddedServerCreationContainsExpectedContextSourceAndData() {
-        appCtx = new InMemoryXmlApplicationContext("<ldap-server ldif='classpath:test-server.ldif'/>");
+	@Test
+	public void embeddedServerCreationContainsExpectedContextSourceAndData() {
+		appCtx = new InMemoryXmlApplicationContext(
+				"<ldap-server ldif='classpath:test-server.ldif'/>");
 
-        DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx.getBean(BeanIds.CONTEXT_SOURCE);
+		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx
+				.getBean(BeanIds.CONTEXT_SOURCE);
 
-        // Check data is loaded
-        LdapTemplate template = new LdapTemplate(contextSource);
-        template.lookup("uid=ben,ou=people");
-    }
+		// Check data is loaded
+		LdapTemplate template = new LdapTemplate(contextSource);
+		template.lookup("uid=ben,ou=people");
+	}
 
-    @Test
-    public void useOfUrlAttributeCreatesCorrectContextSource() throws Exception {
-        int port = getDefaultPort();
-        // Create second "server" with a url pointing at embedded one
-        appCtx = new InMemoryXmlApplicationContext("<ldap-server ldif='classpath:test-server.ldif' port='" + port + "'/>" +
-                "<ldap-server ldif='classpath:test-server.ldif' id='blah' url='ldap://127.0.0.1:" + port + "/dc=springframework,dc=org' />");
+	@Test
+	public void useOfUrlAttributeCreatesCorrectContextSource() throws Exception {
+		int port = getDefaultPort();
+		// Create second "server" with a url pointing at embedded one
+		appCtx = new InMemoryXmlApplicationContext(
+				"<ldap-server ldif='classpath:test-server.ldif' port='"
+						+ port
+						+ "'/>"
+						+ "<ldap-server ldif='classpath:test-server.ldif' id='blah' url='ldap://127.0.0.1:"
+						+ port + "/dc=springframework,dc=org' />");
 
-        // Check the default context source is still there.
-        appCtx.getBean(BeanIds.CONTEXT_SOURCE);
+		// Check the default context source is still there.
+		appCtx.getBean(BeanIds.CONTEXT_SOURCE);
 
-        DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx.getBean("blah");
+		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx
+				.getBean("blah");
 
-        // Check data is loaded as before
-        LdapTemplate template = new LdapTemplate(contextSource);
-        template.lookup("uid=ben,ou=people");
-    }
+		// Check data is loaded as before
+		LdapTemplate template = new LdapTemplate(contextSource);
+		template.lookup("uid=ben,ou=people");
+	}
 
-    @Test
-    public void loadingSpecificLdifFileIsSuccessful() {
-        appCtx = new InMemoryXmlApplicationContext(
-                "<ldap-server ldif='classpath*:test-server2.xldif' root='dc=monkeymachine,dc=co,dc=uk' />");
-        DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx.getBean(BeanIds.CONTEXT_SOURCE);
+	@Test
+	public void loadingSpecificLdifFileIsSuccessful() {
+		appCtx = new InMemoryXmlApplicationContext(
+				"<ldap-server ldif='classpath*:test-server2.xldif' root='dc=monkeymachine,dc=co,dc=uk' />");
+		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) appCtx
+				.getBean(BeanIds.CONTEXT_SOURCE);
 
-        LdapTemplate template = new LdapTemplate(contextSource);
-        template.lookup("uid=pg,ou=gorillas");
-    }
+		LdapTemplate template = new LdapTemplate(contextSource);
+		template.lookup("uid=pg,ou=gorillas");
+	}
 
-    @Test
-    public void defaultLdifFileIsSuccessful() {
-        appCtx = new InMemoryXmlApplicationContext(
-                "<ldap-server/>");
-        ApacheDSContainer dsContainer = appCtx.getBean(ApacheDSContainer.class);
+	@Test
+	public void defaultLdifFileIsSuccessful() {
+		appCtx = new InMemoryXmlApplicationContext("<ldap-server/>");
+		ApacheDSContainer dsContainer = appCtx.getBean(ApacheDSContainer.class);
 
-        assertEquals("classpath*:*.ldif", ReflectionTestUtils.getField(dsContainer, "ldifResources"));
-    }
+		assertEquals("classpath*:*.ldif",
+				ReflectionTestUtils.getField(dsContainer, "ldifResources"));
+	}
 
-    private int getDefaultPort() throws IOException {
-        ServerSocket server = null;
-        try {
-            server = new ServerSocket(0);
-            return server.getLocalPort();
-        } finally {
-            try {
-                server.close();
-            } catch(IOException e) {}
-        }
-    }
+	private int getDefaultPort() throws IOException {
+		ServerSocket server = null;
+		try {
+			server = new ServerSocket(0);
+			return server.getLocalPort();
+		}
+		finally {
+			try {
+				server.close();
+			}
+			catch (IOException e) {
+			}
+		}
+	}
 }
diff --git a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
index d862ca4e9d..45af75f4d8 100644
--- a/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
+++ b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
@@ -38,135 +38,133 @@ import java.util.*;
  * @author Rob Winch
  */
 public class LdapUserServiceBeanDefinitionParserTests {
-    private InMemoryXmlApplicationContext appCtx;
+	private InMemoryXmlApplicationContext appCtx;
 
-    @After
-    public void closeAppContext() {
-        if (appCtx != null) {
-            appCtx.close();
-            appCtx = null;
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appCtx != null) {
+			appCtx.close();
+			appCtx = null;
+		}
+	}
 
-    @Test
-    public void beanClassNamesAreCorrect() throws Exception {
-        assertEquals(LDAP_SEARCH_CLASS, FilterBasedLdapUserSearch.class.getName());
-        assertEquals(PERSON_MAPPER_CLASS, PersonContextMapper.class.getName());
-        assertEquals(INET_ORG_PERSON_MAPPER_CLASS, InetOrgPersonContextMapper.class.getName());
-        assertEquals(LDAP_USER_MAPPER_CLASS, LdapUserDetailsMapper.class.getName());
-        assertEquals(LDAP_AUTHORITIES_POPULATOR_CLASS, DefaultLdapAuthoritiesPopulator.class.getName());
-        assertEquals(LdapUserDetailsService.class.getName(), new LdapUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class)));
-    }
+	@Test
+	public void beanClassNamesAreCorrect() throws Exception {
+		assertEquals(LDAP_SEARCH_CLASS, FilterBasedLdapUserSearch.class.getName());
+		assertEquals(PERSON_MAPPER_CLASS, PersonContextMapper.class.getName());
+		assertEquals(INET_ORG_PERSON_MAPPER_CLASS,
+				InetOrgPersonContextMapper.class.getName());
+		assertEquals(LDAP_USER_MAPPER_CLASS, LdapUserDetailsMapper.class.getName());
+		assertEquals(LDAP_AUTHORITIES_POPULATOR_CLASS,
+				DefaultLdapAuthoritiesPopulator.class.getName());
+		assertEquals(LdapUserDetailsService.class.getName(),
+				new LdapUserServiceBeanDefinitionParser()
+						.getBeanClassName(mock(Element.class)));
+	}
 
-    @Test
-    public void minimalConfigurationIsParsedOk() throws Exception {
-        setContext("<ldap-user-service user-search-filter='(uid={0})' /><ldap-server ldif='classpath:test-server.ldif' url='ldap://127.0.0.1:343/dc=springframework,dc=org' />");
-    }
+	@Test
+	public void minimalConfigurationIsParsedOk() throws Exception {
+		setContext("<ldap-user-service user-search-filter='(uid={0})' /><ldap-server ldif='classpath:test-server.ldif' url='ldap://127.0.0.1:343/dc=springframework,dc=org' />");
+	}
 
-    @Test
-    public void userServiceReturnsExpectedData() throws Exception {
-        setContext("<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
+	@Test
+	public void userServiceReturnsExpectedData() throws Exception {
+		setContext("<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
 
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
-        assertEquals(3, authorities.size());
-        assertTrue(authorities.contains("ROLE_DEVELOPERS"));
-    }
+		Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
+		assertEquals(3, authorities.size());
+		assertTrue(authorities.contains("ROLE_DEVELOPERS"));
+	}
 
-    @Test
-    public void differentUserSearchBaseWorksAsExpected() throws Exception {
-        setContext("<ldap-user-service id='ldapUDS' " +
-                "       user-search-base='ou=otherpeople' " +
-                "       user-search-filter='(cn={0})' " +
-                "       group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
+	@Test
+	public void differentUserSearchBaseWorksAsExpected() throws Exception {
+		setContext("<ldap-user-service id='ldapUDS' "
+				+ "       user-search-base='ou=otherpeople' "
+				+ "       user-search-filter='(cn={0})' "
+				+ "       group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
 
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails joe = uds.loadUserByUsername("Joe Smeth");
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails joe = uds.loadUserByUsername("Joe Smeth");
 
-        assertEquals("Joe Smeth", joe.getUsername());
-    }
+		assertEquals("Joe Smeth", joe.getUsername());
+	}
 
-    @Test
-    public void rolePrefixIsSupported() throws Exception {
-        setContext(
-                "<ldap-user-service id='ldapUDS' " +
-                "     user-search-filter='(uid={0})' " +
-                "     group-search-filter='member={0}' role-prefix='PREFIX_'/>" +
-                "<ldap-user-service id='ldapUDSNoPrefix' " +
-                "     user-search-filter='(uid={0})' " +
-                "     group-search-filter='member={0}' role-prefix='none'/><ldap-server ldif='classpath:test-server.ldif'/>");
+	@Test
+	public void rolePrefixIsSupported() throws Exception {
+		setContext("<ldap-user-service id='ldapUDS' "
+				+ "     user-search-filter='(uid={0})' "
+				+ "     group-search-filter='member={0}' role-prefix='PREFIX_'/>"
+				+ "<ldap-user-service id='ldapUDSNoPrefix' "
+				+ "     user-search-filter='(uid={0})' "
+				+ "     group-search-filter='member={0}' role-prefix='none'/><ldap-server ldif='classpath:test-server.ldif'/>");
 
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
-        assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains("PREFIX_DEVELOPERS"));
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
+		assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains(
+				"PREFIX_DEVELOPERS"));
 
-        uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix");
-        ben = uds.loadUserByUsername("ben");
-        assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains("DEVELOPERS"));
-    }
+		uds = (UserDetailsService) appCtx.getBean("ldapUDSNoPrefix");
+		ben = uds.loadUserByUsername("ben");
+		assertTrue(AuthorityUtils.authorityListToSet(ben.getAuthorities()).contains(
+				"DEVELOPERS"));
+	}
 
+	@Test
+	public void differentGroupRoleAttributeWorksAsExpected() throws Exception {
+		setContext("<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' group-role-attribute='ou' group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
 
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
 
-    @Test
-    public void differentGroupRoleAttributeWorksAsExpected() throws Exception {
-        setContext("<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' group-role-attribute='ou' group-search-filter='member={0}' /><ldap-server ldif='classpath:test-server.ldif'/>");
+		Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
+		assertEquals(3, authorities.size());
+		assertTrue(authorities.contains("ROLE_DEVELOPER"));
 
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
+	}
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(ben.getAuthorities());
-        assertEquals(3, authorities.size());
-        assertTrue(authorities.contains("ROLE_DEVELOPER"));
+	@Test
+	public void isSupportedByAuthenticationProviderElement() {
+		setContext("<ldap-server url='ldap://127.0.0.1:343/dc=springframework,dc=org' ldif='classpath:test-server.ldif'/>"
+				+ "<authentication-manager>"
+				+ "  <authentication-provider>"
+				+ "    <ldap-user-service user-search-filter='(uid={0})' />"
+				+ "  </authentication-provider>" + "</authentication-manager>");
+	}
 
-    }
+	@Test
+	public void personContextMapperIsSupported() {
+		setContext("<ldap-server ldif='classpath:test-server.ldif'/>"
+				+ "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-details-class='person'/>");
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
+		assertTrue(ben instanceof Person);
+	}
 
-    @Test
-    public void isSupportedByAuthenticationProviderElement() {
-        setContext(
-                "<ldap-server url='ldap://127.0.0.1:343/dc=springframework,dc=org' ldif='classpath:test-server.ldif'/>" +
-                "<authentication-manager>" +
-                "  <authentication-provider>" +
-                "    <ldap-user-service user-search-filter='(uid={0})' />" +
-                "  </authentication-provider>" +
-                "</authentication-manager>");
-    }
+	@Test
+	public void inetOrgContextMapperIsSupported() {
+		setContext("<ldap-server id='someServer' ldif='classpath:test-server.ldif'/>"
+				+ "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-details-class='inetOrgPerson'/>");
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
+		assertTrue(ben instanceof InetOrgPerson);
+	}
 
-    @Test
-    public void personContextMapperIsSupported() {
-        setContext(
-                "<ldap-server ldif='classpath:test-server.ldif'/>" +
-                "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-details-class='person'/>");
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
-        assertTrue(ben instanceof Person);
-    }
+	@Test
+	public void externalContextMapperIsSupported() {
+		setContext("<ldap-server id='someServer' ldif='classpath:test-server.ldif'/>"
+				+ "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-context-mapper-ref='mapper'/>"
+				+ "<b:bean id='mapper' class='"
+				+ InetOrgPersonContextMapper.class.getName() + "'/>");
 
-    @Test
-    public void inetOrgContextMapperIsSupported() {
-        setContext(
-                "<ldap-server id='someServer' ldif='classpath:test-server.ldif'/>" +
-                "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-details-class='inetOrgPerson'/>");
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
-        assertTrue(ben instanceof InetOrgPerson);
-    }
+		UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
+		UserDetails ben = uds.loadUserByUsername("ben");
+		assertTrue(ben instanceof InetOrgPerson);
+	}
 
-    @Test
-    public void externalContextMapperIsSupported() {
-        setContext(
-                "<ldap-server id='someServer' ldif='classpath:test-server.ldif'/>" +
-                "<ldap-user-service id='ldapUDS' user-search-filter='(uid={0})' user-context-mapper-ref='mapper'/>" +
-                "<b:bean id='mapper' class='"+ InetOrgPersonContextMapper.class.getName() +"'/>");
-
-        UserDetailsService uds = (UserDetailsService) appCtx.getBean("ldapUDS");
-        UserDetails ben = uds.loadUserByUsername("ben");
-        assertTrue(ben instanceof InetOrgPerson);
-    }
-
-
-    private void setContext(String context) {
-        appCtx = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appCtx = new InMemoryXmlApplicationContext(context);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/BeanIds.java b/config/src/main/java/org/springframework/security/config/BeanIds.java
index 996011af3b..c8d318e565 100644
--- a/config/src/main/java/org/springframework/security/config/BeanIds.java
+++ b/config/src/main/java/org/springframework/security/config/BeanIds.java
@@ -1,7 +1,8 @@
 package org.springframework.security.config;
 
 /**
- * Contains globally used default Bean IDs for beans created by the namespace support in Spring Security 2.
+ * Contains globally used default Bean IDs for beans created by the namespace support in
+ * Spring Security 2.
  * <p>
  * These are intended for internal use.
  *
@@ -9,27 +10,35 @@ package org.springframework.security.config;
  * @author Luke Taylor
  */
 public abstract class BeanIds {
-    private static final String PREFIX = "org.springframework.security.";
+	private static final String PREFIX = "org.springframework.security.";
 
-    /** The "global" AuthenticationManager instance, registered by the &lt;authentication-manager&gt; element */
-    public static final String AUTHENTICATION_MANAGER = PREFIX + "authenticationManager";
+	/**
+	 * The "global" AuthenticationManager instance, registered by the
+	 * &lt;authentication-manager&gt; element
+	 */
+	public static final String AUTHENTICATION_MANAGER = PREFIX + "authenticationManager";
 
-    /** External alias for FilterChainProxy bean, for use in web.xml files */
-    public static final String SPRING_SECURITY_FILTER_CHAIN = "springSecurityFilterChain";
+	/** External alias for FilterChainProxy bean, for use in web.xml files */
+	public static final String SPRING_SECURITY_FILTER_CHAIN = "springSecurityFilterChain";
 
-    public static final String CONTEXT_SOURCE_SETTING_POST_PROCESSOR = PREFIX + "contextSettingPostProcessor";
+	public static final String CONTEXT_SOURCE_SETTING_POST_PROCESSOR = PREFIX
+			+ "contextSettingPostProcessor";
 
-    public static final String USER_DETAILS_SERVICE = PREFIX + "userDetailsService";
-    public static final String USER_DETAILS_SERVICE_FACTORY = PREFIX + "userDetailsServiceFactory";
+	public static final String USER_DETAILS_SERVICE = PREFIX + "userDetailsService";
+	public static final String USER_DETAILS_SERVICE_FACTORY = PREFIX
+			+ "userDetailsServiceFactory";
 
-    public static final String METHOD_ACCESS_MANAGER = PREFIX + "defaultMethodAccessManager";
+	public static final String METHOD_ACCESS_MANAGER = PREFIX
+			+ "defaultMethodAccessManager";
 
-    public static final String FILTER_CHAIN_PROXY = PREFIX + "filterChainProxy";
-    public static final String FILTER_CHAINS = PREFIX + "filterChains";
+	public static final String FILTER_CHAIN_PROXY = PREFIX + "filterChainProxy";
+	public static final String FILTER_CHAINS = PREFIX + "filterChains";
 
-    public static final String METHOD_SECURITY_METADATA_SOURCE_ADVISOR = PREFIX + "methodSecurityMetadataSourceAdvisor";
-    public static final String EMBEDDED_APACHE_DS = PREFIX + "apacheDirectoryServerContainer";
-    public static final String CONTEXT_SOURCE = PREFIX + "securityContextSource";
+	public static final String METHOD_SECURITY_METADATA_SOURCE_ADVISOR = PREFIX
+			+ "methodSecurityMetadataSourceAdvisor";
+	public static final String EMBEDDED_APACHE_DS = PREFIX
+			+ "apacheDirectoryServerContainer";
+	public static final String CONTEXT_SOURCE = PREFIX + "securityContextSource";
 
-    public static final String DEBUG_FILTER = PREFIX + "debugFilter";
+	public static final String DEBUG_FILTER = PREFIX + "debugFilter";
 }
diff --git a/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java
index 8173770281..16cf1e5438 100644
--- a/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/DebugBeanDefinitionParser.java
@@ -11,10 +11,11 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  */
 public class DebugBeanDefinitionParser implements BeanDefinitionParser {
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        RootBeanDefinition debugPP = new RootBeanDefinition(SecurityDebugBeanFactoryPostProcessor.class);
-        parserContext.getReaderContext().registerWithGeneratedName(debugPP);
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		RootBeanDefinition debugPP = new RootBeanDefinition(
+				SecurityDebugBeanFactoryPostProcessor.class);
+		parserContext.getReaderContext().registerWithGeneratedName(debugPP);
 
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/Elements.java b/config/src/main/java/org/springframework/security/config/Elements.java
index 99bd1511b1..8b30c42d21 100644
--- a/config/src/main/java/org/springframework/security/config/Elements.java
+++ b/config/src/main/java/org/springframework/security/config/Elements.java
@@ -7,54 +7,54 @@ package org.springframework.security.config;
  */
 public abstract class Elements {
 
-    public static final String ACCESS_DENIED_HANDLER = "access-denied-handler";
-    public static final String AUTHENTICATION_MANAGER = "authentication-manager";
-    public static final String AFTER_INVOCATION_PROVIDER = "after-invocation-provider";
-    public static final String USER_SERVICE = "user-service";
-    public static final String JDBC_USER_SERVICE = "jdbc-user-service";
-    public static final String FILTER_CHAIN_MAP = "filter-chain-map";
-    public static final String INTERCEPT_METHODS = "intercept-methods";
-    public static final String INTERCEPT_URL = "intercept-url";
-    public static final String AUTHENTICATION_PROVIDER = "authentication-provider";
-    public static final String HTTP = "http";
-    public static final String LDAP_PROVIDER = "ldap-authentication-provider";
-    public static final String LDAP_SERVER = "ldap-server";
-    public static final String LDAP_USER_SERVICE = "ldap-user-service";
-    public static final String PROTECT_POINTCUT = "protect-pointcut";
-    public static final String EXPRESSION_HANDLER = "expression-handler";
-    public static final String INVOCATION_HANDLING = "pre-post-annotation-handling";
-    public static final String INVOCATION_ATTRIBUTE_FACTORY = "invocation-attribute-factory";
-    public static final String PRE_INVOCATION_ADVICE = "pre-invocation-advice";
-    public static final String POST_INVOCATION_ADVICE = "post-invocation-advice";
-    public static final String PROTECT = "protect";
-    public static final String SESSION_MANAGEMENT = "session-management";
-    public static final String CONCURRENT_SESSIONS = "concurrency-control";
-    public static final String LOGOUT = "logout";
-    public static final String FORM_LOGIN = "form-login";
-    public static final String OPENID_LOGIN = "openid-login";
-    public static final String OPENID_ATTRIBUTE_EXCHANGE = "attribute-exchange";
-    public static final String OPENID_ATTRIBUTE = "openid-attribute";
-    public static final String BASIC_AUTH = "http-basic";
-    public static final String REMEMBER_ME = "remember-me";
-    public static final String ANONYMOUS = "anonymous";
-    public static final String FILTER_CHAIN = "filter-chain";
-    public static final String GLOBAL_METHOD_SECURITY = "global-method-security";
-    public static final String PASSWORD_ENCODER = "password-encoder";
-    public static final String SALT_SOURCE = "salt-source";
-    public static final String PORT_MAPPINGS = "port-mappings";
-    public static final String PORT_MAPPING = "port-mapping";
-    public static final String CUSTOM_FILTER = "custom-filter";
-    public static final String REQUEST_CACHE = "request-cache";
-    public static final String X509 = "x509";
-    public static final String JEE = "jee";
-    public static final String FILTER_SECURITY_METADATA_SOURCE = "filter-security-metadata-source";
-    public static final String METHOD_SECURITY_METADATA_SOURCE = "method-security-metadata-source";
-    public static final String LDAP_PASSWORD_COMPARE = "password-compare";
-    public static final String DEBUG = "debug";
-    public static final String HTTP_FIREWALL = "http-firewall";
-    public static final String HEADERS = "headers";
-    public static final String CSRF = "csrf";
+	public static final String ACCESS_DENIED_HANDLER = "access-denied-handler";
+	public static final String AUTHENTICATION_MANAGER = "authentication-manager";
+	public static final String AFTER_INVOCATION_PROVIDER = "after-invocation-provider";
+	public static final String USER_SERVICE = "user-service";
+	public static final String JDBC_USER_SERVICE = "jdbc-user-service";
+	public static final String FILTER_CHAIN_MAP = "filter-chain-map";
+	public static final String INTERCEPT_METHODS = "intercept-methods";
+	public static final String INTERCEPT_URL = "intercept-url";
+	public static final String AUTHENTICATION_PROVIDER = "authentication-provider";
+	public static final String HTTP = "http";
+	public static final String LDAP_PROVIDER = "ldap-authentication-provider";
+	public static final String LDAP_SERVER = "ldap-server";
+	public static final String LDAP_USER_SERVICE = "ldap-user-service";
+	public static final String PROTECT_POINTCUT = "protect-pointcut";
+	public static final String EXPRESSION_HANDLER = "expression-handler";
+	public static final String INVOCATION_HANDLING = "pre-post-annotation-handling";
+	public static final String INVOCATION_ATTRIBUTE_FACTORY = "invocation-attribute-factory";
+	public static final String PRE_INVOCATION_ADVICE = "pre-invocation-advice";
+	public static final String POST_INVOCATION_ADVICE = "post-invocation-advice";
+	public static final String PROTECT = "protect";
+	public static final String SESSION_MANAGEMENT = "session-management";
+	public static final String CONCURRENT_SESSIONS = "concurrency-control";
+	public static final String LOGOUT = "logout";
+	public static final String FORM_LOGIN = "form-login";
+	public static final String OPENID_LOGIN = "openid-login";
+	public static final String OPENID_ATTRIBUTE_EXCHANGE = "attribute-exchange";
+	public static final String OPENID_ATTRIBUTE = "openid-attribute";
+	public static final String BASIC_AUTH = "http-basic";
+	public static final String REMEMBER_ME = "remember-me";
+	public static final String ANONYMOUS = "anonymous";
+	public static final String FILTER_CHAIN = "filter-chain";
+	public static final String GLOBAL_METHOD_SECURITY = "global-method-security";
+	public static final String PASSWORD_ENCODER = "password-encoder";
+	public static final String SALT_SOURCE = "salt-source";
+	public static final String PORT_MAPPINGS = "port-mappings";
+	public static final String PORT_MAPPING = "port-mapping";
+	public static final String CUSTOM_FILTER = "custom-filter";
+	public static final String REQUEST_CACHE = "request-cache";
+	public static final String X509 = "x509";
+	public static final String JEE = "jee";
+	public static final String FILTER_SECURITY_METADATA_SOURCE = "filter-security-metadata-source";
+	public static final String METHOD_SECURITY_METADATA_SOURCE = "method-security-metadata-source";
+	public static final String LDAP_PASSWORD_COMPARE = "password-compare";
+	public static final String DEBUG = "debug";
+	public static final String HTTP_FIREWALL = "http-firewall";
+	public static final String HEADERS = "headers";
+	public static final String CSRF = "csrf";
 
-    public static final String WEBSOCKET_MESSAGE_BROKER = "websocket-message-broker";
-    public static final String INTERCEPT_MESSAGE = "intercept-message";
+	public static final String WEBSOCKET_MESSAGE_BROKER = "websocket-message-broker";
+	public static final String INTERCEPT_MESSAGE = "intercept-message";
 }
diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
index da3a5c8105..65e83e26bc 100644
--- a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
+++ b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
@@ -48,7 +48,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 /**
- * Parses elements from the "security" namespace (http://www.springframework.org/schema/security).
+ * Parses elements from the "security" namespace
+ * (http://www.springframework.org/schema/security).
  *
  * @author Luke Taylor
  * @author Ben Alex
@@ -56,154 +57,174 @@ import org.w3c.dom.Node;
  * @since 2.0
  */
 public final class SecurityNamespaceHandler implements NamespaceHandler {
-    private static final String FILTER_CHAIN_PROXY_CLASSNAME = "org.springframework.security.web.FilterChainProxy";
-    private static final String MESSAGE_CLASSNAME = "org.springframework.messaging.Message";
-    private final Log logger = LogFactory.getLog(getClass());
-    private final Map<String, BeanDefinitionParser> parsers = new HashMap<String, BeanDefinitionParser>();
-    private final BeanDefinitionDecorator interceptMethodsBDD = new InterceptMethodsBeanDefinitionDecorator();
-    private BeanDefinitionDecorator filterChainMapBDD;
+	private static final String FILTER_CHAIN_PROXY_CLASSNAME = "org.springframework.security.web.FilterChainProxy";
+	private static final String MESSAGE_CLASSNAME = "org.springframework.messaging.Message";
+	private final Log logger = LogFactory.getLog(getClass());
+	private final Map<String, BeanDefinitionParser> parsers = new HashMap<String, BeanDefinitionParser>();
+	private final BeanDefinitionDecorator interceptMethodsBDD = new InterceptMethodsBeanDefinitionDecorator();
+	private BeanDefinitionDecorator filterChainMapBDD;
 
-    public SecurityNamespaceHandler() {
-        String coreVersion = SpringSecurityCoreVersion.getVersion();
+	public SecurityNamespaceHandler() {
+		String coreVersion = SpringSecurityCoreVersion.getVersion();
 
-        Package pkg = SpringSecurityCoreVersion.class.getPackage();
+		Package pkg = SpringSecurityCoreVersion.class.getPackage();
 
-        if (pkg == null || coreVersion == null) {
-            logger.info("Couldn't determine package version information.");
-            return;
-        }
+		if (pkg == null || coreVersion == null) {
+			logger.info("Couldn't determine package version information.");
+			return;
+		}
 
-        String version = pkg.getImplementationVersion();
-        logger.info("Spring Security 'config' module version is " + version);
+		String version = pkg.getImplementationVersion();
+		logger.info("Spring Security 'config' module version is " + version);
 
-        if (version.compareTo(coreVersion) != 0) {
-            logger.error("You are running with different versions of the Spring Security 'core' and 'config' modules");
-        }
-    }
+		if (version.compareTo(coreVersion) != 0) {
+			logger.error("You are running with different versions of the Spring Security 'core' and 'config' modules");
+		}
+	}
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        if (!namespaceMatchesVersion(element)) {
-            pc.getReaderContext().fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or spring-security-3.1.xsd schema " +
-                    "with Spring Security 3.2. Please update your schema declarations to the 3.2 schema.", element);
-        }
-        String name = pc.getDelegate().getLocalName(element);
-        BeanDefinitionParser parser = parsers.get(name);
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		if (!namespaceMatchesVersion(element)) {
+			pc.getReaderContext()
+					.fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or spring-security-3.1.xsd schema "
+							+ "with Spring Security 3.2. Please update your schema declarations to the 3.2 schema.",
+							element);
+		}
+		String name = pc.getDelegate().getLocalName(element);
+		BeanDefinitionParser parser = parsers.get(name);
 
-        if (parser == null) {
-            // SEC-1455. Load parsers when required, not just on init().
-            loadParsers();
-        }
+		if (parser == null) {
+			// SEC-1455. Load parsers when required, not just on init().
+			loadParsers();
+		}
 
-        if (parser == null) {
-            if (Elements.HTTP.equals(name) || Elements.FILTER_SECURITY_METADATA_SOURCE.equals(name) ||
-                    Elements.FILTER_CHAIN_MAP.equals(name) || Elements.FILTER_CHAIN.equals(name)) {
-                reportMissingWebClasses(name, pc, element);
-            } else {
-                reportUnsupportedNodeType(name, pc, element);
-            }
+		if (parser == null) {
+			if (Elements.HTTP.equals(name)
+					|| Elements.FILTER_SECURITY_METADATA_SOURCE.equals(name)
+					|| Elements.FILTER_CHAIN_MAP.equals(name)
+					|| Elements.FILTER_CHAIN.equals(name)) {
+				reportMissingWebClasses(name, pc, element);
+			}
+			else {
+				reportUnsupportedNodeType(name, pc, element);
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        return parser.parse(element, pc);
-    }
+		return parser.parse(element, pc);
+	}
 
-    public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext pc) {
-        String name = pc.getDelegate().getLocalName(node);
+	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
+			ParserContext pc) {
+		String name = pc.getDelegate().getLocalName(node);
 
-        // We only handle elements
-        if (node instanceof Element) {
-            if (Elements.INTERCEPT_METHODS.equals(name)) {
-                return interceptMethodsBDD.decorate(node, definition, pc);
-            }
+		// We only handle elements
+		if (node instanceof Element) {
+			if (Elements.INTERCEPT_METHODS.equals(name)) {
+				return interceptMethodsBDD.decorate(node, definition, pc);
+			}
 
-            if (Elements.FILTER_CHAIN_MAP.equals(name)) {
-                if (filterChainMapBDD == null) {
-                    loadParsers();
-                }
-                if (filterChainMapBDD == null) {
-                    reportMissingWebClasses(name, pc, node);
-                }
-                return filterChainMapBDD.decorate(node, definition, pc);
-            }
-        }
+			if (Elements.FILTER_CHAIN_MAP.equals(name)) {
+				if (filterChainMapBDD == null) {
+					loadParsers();
+				}
+				if (filterChainMapBDD == null) {
+					reportMissingWebClasses(name, pc, node);
+				}
+				return filterChainMapBDD.decorate(node, definition, pc);
+			}
+		}
 
-        reportUnsupportedNodeType(name, pc, node);
+		reportUnsupportedNodeType(name, pc, node);
 
-        return null;
-    }
+		return null;
+	}
 
-    private void reportUnsupportedNodeType(String name, ParserContext pc, Node node) {
-        pc.getReaderContext().fatal("Security namespace does not support decoration of " +
-                (node instanceof Element ? "element" : "attribute") + " [" + name + "]", node);
-    }
+	private void reportUnsupportedNodeType(String name, ParserContext pc, Node node) {
+		pc.getReaderContext().fatal(
+				"Security namespace does not support decoration of "
+						+ (node instanceof Element ? "element" : "attribute") + " ["
+						+ name + "]", node);
+	}
 
-    private void reportMissingWebClasses(String nodeName, ParserContext pc, Node node) {
-        String errorMessage = "The classes from the spring-security-web jar "
-                + "(or one of its dependencies) are not available. You need these to use <" + nodeName + ">";
-        try {
-            ClassUtils.forName(FILTER_CHAIN_PROXY_CLASSNAME, getClass().getClassLoader());
-            // no details available
-            pc.getReaderContext().fatal(errorMessage, node);
-        } catch (Throwable cause) {
-            // provide details on why it could not be loaded
-            pc.getReaderContext().fatal(errorMessage, node, cause);
-        }
-    }
+	private void reportMissingWebClasses(String nodeName, ParserContext pc, Node node) {
+		String errorMessage = "The classes from the spring-security-web jar "
+				+ "(or one of its dependencies) are not available. You need these to use <"
+				+ nodeName + ">";
+		try {
+			ClassUtils.forName(FILTER_CHAIN_PROXY_CLASSNAME, getClass().getClassLoader());
+			// no details available
+			pc.getReaderContext().fatal(errorMessage, node);
+		}
+		catch (Throwable cause) {
+			// provide details on why it could not be loaded
+			pc.getReaderContext().fatal(errorMessage, node, cause);
+		}
+	}
 
-    public void init() {
-        loadParsers();
-    }
+	public void init() {
+		loadParsers();
+	}
 
-    @SuppressWarnings("deprecation")
-    private void loadParsers() {
-        // Parsers
-        parsers.put(Elements.LDAP_PROVIDER, new LdapProviderBeanDefinitionParser());
-        parsers.put(Elements.LDAP_SERVER, new LdapServerBeanDefinitionParser());
-        parsers.put(Elements.LDAP_USER_SERVICE, new LdapUserServiceBeanDefinitionParser());
-        parsers.put(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser());
-        parsers.put(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser());
-        parsers.put(Elements.AUTHENTICATION_PROVIDER, new AuthenticationProviderBeanDefinitionParser());
-        parsers.put(Elements.GLOBAL_METHOD_SECURITY, new GlobalMethodSecurityBeanDefinitionParser());
-        parsers.put(Elements.AUTHENTICATION_MANAGER, new AuthenticationManagerBeanDefinitionParser());
-        parsers.put(Elements.METHOD_SECURITY_METADATA_SOURCE, new MethodSecurityMetadataSourceBeanDefinitionParser());
+	@SuppressWarnings("deprecation")
+	private void loadParsers() {
+		// Parsers
+		parsers.put(Elements.LDAP_PROVIDER, new LdapProviderBeanDefinitionParser());
+		parsers.put(Elements.LDAP_SERVER, new LdapServerBeanDefinitionParser());
+		parsers.put(Elements.LDAP_USER_SERVICE, new LdapUserServiceBeanDefinitionParser());
+		parsers.put(Elements.USER_SERVICE, new UserServiceBeanDefinitionParser());
+		parsers.put(Elements.JDBC_USER_SERVICE, new JdbcUserServiceBeanDefinitionParser());
+		parsers.put(Elements.AUTHENTICATION_PROVIDER,
+				new AuthenticationProviderBeanDefinitionParser());
+		parsers.put(Elements.GLOBAL_METHOD_SECURITY,
+				new GlobalMethodSecurityBeanDefinitionParser());
+		parsers.put(Elements.AUTHENTICATION_MANAGER,
+				new AuthenticationManagerBeanDefinitionParser());
+		parsers.put(Elements.METHOD_SECURITY_METADATA_SOURCE,
+				new MethodSecurityMetadataSourceBeanDefinitionParser());
 
-        // Only load the web-namespace parsers if the web classes are available
-        if(ClassUtils.isPresent(FILTER_CHAIN_PROXY_CLASSNAME, getClass().getClassLoader())) {
-            parsers.put(Elements.DEBUG, new DebugBeanDefinitionParser());
-            parsers.put(Elements.HTTP, new HttpSecurityBeanDefinitionParser());
-            parsers.put(Elements.HTTP_FIREWALL, new HttpFirewallBeanDefinitionParser());
-            parsers.put(Elements.FILTER_SECURITY_METADATA_SOURCE, new FilterInvocationSecurityMetadataSourceParser());
-            parsers.put(Elements.FILTER_CHAIN, new FilterChainBeanDefinitionParser());
-            filterChainMapBDD = new FilterChainMapBeanDefinitionDecorator();
-        }
+		// Only load the web-namespace parsers if the web classes are available
+		if (ClassUtils.isPresent(FILTER_CHAIN_PROXY_CLASSNAME, getClass()
+				.getClassLoader())) {
+			parsers.put(Elements.DEBUG, new DebugBeanDefinitionParser());
+			parsers.put(Elements.HTTP, new HttpSecurityBeanDefinitionParser());
+			parsers.put(Elements.HTTP_FIREWALL, new HttpFirewallBeanDefinitionParser());
+			parsers.put(Elements.FILTER_SECURITY_METADATA_SOURCE,
+					new FilterInvocationSecurityMetadataSourceParser());
+			parsers.put(Elements.FILTER_CHAIN, new FilterChainBeanDefinitionParser());
+			filterChainMapBDD = new FilterChainMapBeanDefinitionDecorator();
+		}
 
-        if(ClassUtils.isPresent(MESSAGE_CLASSNAME, getClass().getClassLoader())) {
-            parsers.put(Elements.WEBSOCKET_MESSAGE_BROKER, new WebSocketMessageBrokerSecurityBeanDefinitionParser());
-        }
-    }
+		if (ClassUtils.isPresent(MESSAGE_CLASSNAME, getClass().getClassLoader())) {
+			parsers.put(Elements.WEBSOCKET_MESSAGE_BROKER,
+					new WebSocketMessageBrokerSecurityBeanDefinitionParser());
+		}
+	}
 
-    /**
-     * Check that the schema location declared in the source file being parsed matches the Spring Security version.
-     * The old 2.0 schema is not compatible with the 3.1 parser, so it is an error to explicitly use
-     * 2.0.
-     * <p>
-     * There are also differences between 3.0 and 3.1 which are sufficient that we report using 3.0 as an error too.
-     * It might be an error to declare spring-security.xsd as an alias, but you are only going to find that out
-     * when one of the sub parsers breaks.
-     *
-     * @param element the element that is to be parsed next
-     * @return true if we find a schema declaration that matches
-     */
-    private boolean namespaceMatchesVersion(Element element) {
-        return matchesVersionInternal(element) && matchesVersionInternal(element.getOwnerDocument().getDocumentElement());
-    }
+	/**
+	 * Check that the schema location declared in the source file being parsed matches the
+	 * Spring Security version. The old 2.0 schema is not compatible with the 3.1 parser,
+	 * so it is an error to explicitly use 2.0.
+	 * <p>
+	 * There are also differences between 3.0 and 3.1 which are sufficient that we report
+	 * using 3.0 as an error too. It might be an error to declare spring-security.xsd as
+	 * an alias, but you are only going to find that out when one of the sub parsers
+	 * breaks.
+	 *
+	 * @param element the element that is to be parsed next
+	 * @return true if we find a schema declaration that matches
+	 */
+	private boolean namespaceMatchesVersion(Element element) {
+		return matchesVersionInternal(element)
+				&& matchesVersionInternal(element.getOwnerDocument().getDocumentElement());
+	}
 
-    private boolean matchesVersionInternal(Element element) {
-        String schemaLocation = element.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
-        return schemaLocation.matches("(?m).*spring-security-4\\.0.*.xsd.*")
-                 || schemaLocation.matches("(?m).*spring-security.xsd.*")
-                 || !schemaLocation.matches("(?m).*spring-security.*");
-    }
+	private boolean matchesVersionInternal(Element element) {
+		String schemaLocation = element.getAttributeNS(
+				"http://www.w3.org/2001/XMLSchema-instance", "schemaLocation");
+		return schemaLocation.matches("(?m).*spring-security-4\\.0.*.xsd.*")
+				|| schemaLocation.matches("(?m).*spring-security.xsd.*")
+				|| !schemaLocation.matches("(?m).*spring-security.*");
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
index 2102c74701..3926787e89 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
@@ -30,428 +30,427 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.DelegatingFilterProxy;
 
 /**
- * <p>A base {@link SecurityBuilder} that allows {@link SecurityConfigurer} to be
- * applied to it. This makes modifying the {@link SecurityBuilder} a strategy
- * that can be customized and broken up into a number of
- * {@link SecurityConfigurer} objects that have more specific goals than that
- * of the {@link SecurityBuilder}.</p>
+ * <p>
+ * A base {@link SecurityBuilder} that allows {@link SecurityConfigurer} to be applied to
+ * it. This makes modifying the {@link SecurityBuilder} a strategy that can be customized
+ * and broken up into a number of {@link SecurityConfigurer} objects that have more
+ * specific goals than that of the {@link SecurityBuilder}.
+ * </p>
  *
- * <p>For example, a {@link SecurityBuilder} may build an
- * {@link DelegatingFilterProxy}, but a {@link SecurityConfigurer} might
- * populate the {@link SecurityBuilder} with the filters necessary for session
- * management, form based login, authorization, etc.</p>
+ * <p>
+ * For example, a {@link SecurityBuilder} may build an {@link DelegatingFilterProxy}, but
+ * a {@link SecurityConfigurer} might populate the {@link SecurityBuilder} with the
+ * filters necessary for session management, form based login, authorization, etc.
+ * </p>
  *
  * @see WebSecurity
  *
  * @author Rob Winch
  *
- * @param <O>
- *            The object that this builder returns
- * @param <B>
- *            The type of this builder (that is returned by the base class)
+ * @param <O> The object that this builder returns
+ * @param <B> The type of this builder (that is returned by the base class)
  */
-public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBuilder<O>> extends AbstractSecurityBuilder<O> {
-    private final Log logger = LogFactory.getLog(getClass());
+public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBuilder<O>>
+		extends AbstractSecurityBuilder<O> {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers =
-            new LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>>();
+	private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>>();
 
-    private final Map<Class<Object>,Object> sharedObjects = new HashMap<Class<Object>,Object>();
+	private final Map<Class<Object>, Object> sharedObjects = new HashMap<Class<Object>, Object>();
 
-    private final boolean allowConfigurersOfSameType;
+	private final boolean allowConfigurersOfSameType;
 
-    private BuildState buildState = BuildState.UNBUILT;
+	private BuildState buildState = BuildState.UNBUILT;
 
-    private ObjectPostProcessor<Object> objectPostProcessor;
+	private ObjectPostProcessor<Object> objectPostProcessor;
 
-    /***
-     * Creates a new instance with the provided {@link ObjectPostProcessor}.
-     * This post processor must support Object since there are many types of
-     * objects that may be post processed.
-     *
-     * @param objectPostProcessor the {@link ObjectPostProcessor} to use
-     */
-    protected AbstractConfiguredSecurityBuilder(ObjectPostProcessor<Object> objectPostProcessor) {
-        this(objectPostProcessor,false);
-    }
+	/***
+	 * Creates a new instance with the provided {@link ObjectPostProcessor}. This post
+	 * processor must support Object since there are many types of objects that may be
+	 * post processed.
+	 *
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use
+	 */
+	protected AbstractConfiguredSecurityBuilder(
+			ObjectPostProcessor<Object> objectPostProcessor) {
+		this(objectPostProcessor, false);
+	}
 
-    /***
-     * Creates a new instance with the provided {@link ObjectPostProcessor}.
-     * This post processor must support Object since there are many types of
-     * objects that may be post processed.
-     *
-     * @param objectPostProcessor the {@link ObjectPostProcessor} to use
-     * @param allowConfigurersOfSameType if true, will not override other {@link SecurityConfigurer}'s when performing apply
-     */
-    protected AbstractConfiguredSecurityBuilder(ObjectPostProcessor<Object> objectPostProcessor, boolean allowConfigurersOfSameType) {
-        Assert.notNull(objectPostProcessor, "objectPostProcessor cannot be null");
-        this.objectPostProcessor = objectPostProcessor;
-        this.allowConfigurersOfSameType = allowConfigurersOfSameType;
-    }
+	/***
+	 * Creates a new instance with the provided {@link ObjectPostProcessor}. This post
+	 * processor must support Object since there are many types of objects that may be
+	 * post processed.
+	 *
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use
+	 * @param allowConfigurersOfSameType if true, will not override other
+	 * {@link SecurityConfigurer}'s when performing apply
+	 */
+	protected AbstractConfiguredSecurityBuilder(
+			ObjectPostProcessor<Object> objectPostProcessor,
+			boolean allowConfigurersOfSameType) {
+		Assert.notNull(objectPostProcessor, "objectPostProcessor cannot be null");
+		this.objectPostProcessor = objectPostProcessor;
+		this.allowConfigurersOfSameType = allowConfigurersOfSameType;
+	}
 
+	/**
+	 * Similar to {@link #build()} and {@link #getObject()} but checks the state to
+	 * determine if {@link #build()} needs to be called first.
+	 *
+	 * @return the result of {@link #build()} or {@link #getObject()}. If an error occurs
+	 * while building, returns null.
+	 */
+	public O getOrBuild() {
+		if (isUnbuilt()) {
+			try {
+				return build();
+			}
+			catch (Exception e) {
+				logger.debug("Failed to perform build. Returning null", e);
+				return null;
+			}
+		}
+		else {
+			return getObject();
+		}
+	}
 
-    /**
-     * Similar to {@link #build()} and {@link #getObject()} but checks the state
-     * to determine if {@link #build()} needs to be called first.
-     *
-     * @return the result of {@link #build()} or {@link #getObject()}. If an
-     *         error occurs while building, returns null.
-     */
-    public O getOrBuild() {
-        if(isUnbuilt()) {
-            try {
-                return build();
-            } catch(Exception e) {
-                logger.debug("Failed to perform build. Returning null", e);
-                return null;
-            }
-        } else {
-            return getObject();
-        }
-    }
+	/**
+	 * Applies a {@link SecurityConfigurerAdapter} to this {@link SecurityBuilder} and
+	 * invokes {@link SecurityConfigurerAdapter#setBuilder(SecurityBuilder)}.
+	 *
+	 * @param configurer
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public <C extends SecurityConfigurerAdapter<O, B>> C apply(C configurer)
+			throws Exception {
+		add(configurer);
+		configurer.addObjectPostProcessor(objectPostProcessor);
+		configurer.setBuilder((B) this);
+		return configurer;
+	}
 
-    /**
-     * Applies a {@link SecurityConfigurerAdapter} to this
-     * {@link SecurityBuilder} and invokes
-     * {@link SecurityConfigurerAdapter#setBuilder(SecurityBuilder)}.
-     *
-     * @param configurer
-     * @return
-     * @throws Exception
-     */
-    @SuppressWarnings("unchecked")
-    public <C extends SecurityConfigurerAdapter<O, B>> C apply(C configurer)
-            throws Exception {
-        add(configurer);
-        configurer.addObjectPostProcessor(objectPostProcessor);
-        configurer.setBuilder((B) this);
-        return configurer;
-    }
+	/**
+	 * Applies a {@link SecurityConfigurer} to this {@link SecurityBuilder} overriding any
+	 * {@link SecurityConfigurer} of the exact same class. Note that object hierarchies
+	 * are not considered.
+	 *
+	 * @param configurer
+	 * @return
+	 * @throws Exception
+	 */
+	public <C extends SecurityConfigurer<O, B>> C apply(C configurer) throws Exception {
+		add(configurer);
+		return configurer;
+	}
 
-    /**
-     * Applies a {@link SecurityConfigurer} to this {@link SecurityBuilder}
-     * overriding any {@link SecurityConfigurer} of the exact same class. Note
-     * that object hierarchies are not considered.
-     *
-     * @param configurer
-     * @return
-     * @throws Exception
-     */
-    public <C extends SecurityConfigurer<O, B>> C apply(C configurer)
-            throws Exception {
-        add(configurer);
-        return configurer;
-    }
+	/**
+	 * Sets an object that is shared by multiple {@link SecurityConfigurer}.
+	 *
+	 * @param sharedType the Class to key the shared object by.
+	 * @param object the Object to store
+	 */
+	@SuppressWarnings("unchecked")
+	public <C> void setSharedObject(Class<C> sharedType, C object) {
+		this.sharedObjects.put((Class<Object>) sharedType, object);
+	}
 
-    /**
-     * Sets an object that is shared by multiple {@link SecurityConfigurer}.
-     *
-     * @param sharedType the Class to key the shared object by.
-     * @param object the Object to store
-     */
-    @SuppressWarnings("unchecked")
-    public <C> void setSharedObject(Class<C> sharedType, C object) {
-        this.sharedObjects.put((Class<Object>) sharedType, object);
-    }
+	/**
+	 * Gets a shared Object. Note that object heirarchies are not considered.
+	 *
+	 * @param sharedType the type of the shared Object
+	 * @return the shared Object or null if it is not found
+	 */
+	@SuppressWarnings("unchecked")
+	public <C> C getSharedObject(Class<C> sharedType) {
+		return (C) this.sharedObjects.get(sharedType);
+	}
 
-    /**
-     * Gets a shared Object. Note that object heirarchies are not considered.
-     *
-     * @param sharedType the type of the shared Object
-     * @return the shared Object or null if it is not found
-     */
-    @SuppressWarnings("unchecked")
-    public <C> C getSharedObject(Class<C> sharedType) {
-        return (C) this.sharedObjects.get(sharedType);
-    }
+	/**
+	 * Gets the shared objects
+	 * @return
+	 */
+	public Map<Class<Object>, Object> getSharedObjects() {
+		return Collections.unmodifiableMap(this.sharedObjects);
+	}
 
-    /**
-     * Gets the shared objects
-     * @return
-     */
-    public Map<Class<Object>,Object> getSharedObjects() {
-        return Collections.unmodifiableMap(this.sharedObjects);
-    }
+	/**
+	 * Adds {@link SecurityConfigurer} ensuring that it is allowed and invoking
+	 * {@link SecurityConfigurer#init(SecurityBuilder)} immediately if necessary.
+	 *
+	 * @param configurer the {@link SecurityConfigurer} to add
+	 * @throws Exception if an error occurs
+	 */
+	@SuppressWarnings("unchecked")
+	private <C extends SecurityConfigurer<O, B>> void add(C configurer) throws Exception {
+		Assert.notNull(configurer, "configurer cannot be null");
 
-    /**
-     * Adds {@link SecurityConfigurer} ensuring that it is allowed and
-     * invoking {@link SecurityConfigurer#init(SecurityBuilder)} immediately
-     * if necessary.
-     *
-     * @param configurer the {@link SecurityConfigurer} to add
-     * @throws Exception if an error occurs
-     */
-    @SuppressWarnings("unchecked")
-    private <C extends SecurityConfigurer<O, B>> void add(C configurer) throws Exception {
-        Assert.notNull(configurer, "configurer cannot be null");
+		Class<? extends SecurityConfigurer<O, B>> clazz = (Class<? extends SecurityConfigurer<O, B>>) configurer
+				.getClass();
+		synchronized (configurers) {
+			if (buildState.isConfigured()) {
+				throw new IllegalStateException("Cannot apply " + configurer
+						+ " to already built object");
+			}
+			List<SecurityConfigurer<O, B>> configs = allowConfigurersOfSameType ? this.configurers
+					.get(clazz) : null;
+			if (configs == null) {
+				configs = new ArrayList<SecurityConfigurer<O, B>>(1);
+			}
+			configs.add(configurer);
+			this.configurers.put(clazz, configs);
+			if (buildState.isInitializing()) {
+				configurer.init((B) this);
+			}
+		}
+	}
 
-        Class<? extends SecurityConfigurer<O, B>> clazz = (Class<? extends SecurityConfigurer<O, B>>) configurer
-                .getClass();
-        synchronized(configurers) {
-            if(buildState.isConfigured()) {
-                throw new IllegalStateException("Cannot apply "+configurer+" to already built object");
-            }
-            List<SecurityConfigurer<O, B>> configs = allowConfigurersOfSameType ? this.configurers.get(clazz) : null;
-            if(configs == null) {
-                configs = new ArrayList<SecurityConfigurer<O,B>>(1);
-            }
-            configs.add(configurer);
-            this.configurers.put(clazz, configs);
-            if(buildState.isInitializing()) {
-                configurer.init((B)this);
-            }
-        }
-    }
+	/**
+	 * Gets all the {@link SecurityConfigurer} instances by its class name or an empty
+	 * List if not found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz the {@link SecurityConfigurer} class to look for
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public <C extends SecurityConfigurer<O, B>> List<C> getConfigurers(Class<C> clazz) {
+		List<C> configs = (List<C>) this.configurers.get(clazz);
+		if (configs == null) {
+			return new ArrayList<C>();
+		}
+		return new ArrayList<C>(configs);
+	}
 
-    /**
-     * Gets all the {@link SecurityConfigurer} instances by its class name or an
-     * empty List if not found. Note that object hierarchies are not considered.
-     *
-     * @param clazz the {@link SecurityConfigurer} class to look for
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <C extends SecurityConfigurer<O, B>> List<C> getConfigurers(
-            Class<C> clazz) {
-        List<C> configs = (List<C>) this.configurers.get(clazz);
-        if(configs == null) {
-            return new ArrayList<C>();
-        }
-        return new ArrayList<C>(configs);
-    }
+	/**
+	 * Removes all the {@link SecurityConfigurer} instances by its class name or an empty
+	 * List if not found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz the {@link SecurityConfigurer} class to look for
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public <C extends SecurityConfigurer<O, B>> List<C> removeConfigurers(Class<C> clazz) {
+		List<C> configs = (List<C>) this.configurers.remove(clazz);
+		if (configs == null) {
+			return new ArrayList<C>();
+		}
+		return new ArrayList<C>(configs);
+	}
 
-    /**
-     * Removes all the {@link SecurityConfigurer} instances by its class name or an
-     * empty List if not found. Note that object hierarchies are not considered.
-     *
-     * @param clazz the {@link SecurityConfigurer} class to look for
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <C extends SecurityConfigurer<O, B>> List<C> removeConfigurers(
-            Class<C> clazz) {
-        List<C> configs = (List<C>) this.configurers.remove(clazz);
-        if(configs == null) {
-            return new ArrayList<C>();
-        }
-        return new ArrayList<C>(configs);
-    }
+	/**
+	 * Gets the {@link SecurityConfigurer} by its class name or <code>null</code> if not
+	 * found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public <C extends SecurityConfigurer<O, B>> C getConfigurer(Class<C> clazz) {
+		List<SecurityConfigurer<O, B>> configs = this.configurers.get(clazz);
+		if (configs == null) {
+			return null;
+		}
+		if (configs.size() != 1) {
+			throw new IllegalStateException("Only one configurer expected for type "
+					+ clazz + ", but got " + configs);
+		}
+		return (C) configs.get(0);
+	}
 
-    /**
-     * Gets the {@link SecurityConfigurer} by its class name or
-     * <code>null</code> if not found. Note that object hierarchies are not
-     * considered.
-     *
-     * @param clazz
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <C extends SecurityConfigurer<O, B>> C getConfigurer(
-            Class<C> clazz) {
-        List<SecurityConfigurer<O,B>> configs = this.configurers.get(clazz);
-        if(configs == null) {
-            return null;
-        }
-        if(configs.size() != 1) {
-            throw new IllegalStateException("Only one configurer expected for type " + clazz + ", but got " + configs);
-        }
-        return (C) configs.get(0);
-    }
+	/**
+	 * Removes and returns the {@link SecurityConfigurer} by its class name or
+	 * <code>null</code> if not found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public <C extends SecurityConfigurer<O, B>> C removeConfigurer(Class<C> clazz) {
+		List<SecurityConfigurer<O, B>> configs = this.configurers.remove(clazz);
+		if (configs == null) {
+			return null;
+		}
+		if (configs.size() != 1) {
+			throw new IllegalStateException("Only one configurer expected for type "
+					+ clazz + ", but got " + configs);
+		}
+		return (C) configs.get(0);
+	}
 
-    /**
-     * Removes and returns the {@link SecurityConfigurer} by its class name or
-     * <code>null</code> if not found. Note that object hierarchies are not
-     * considered.
-     *
-     * @param clazz
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public <C extends SecurityConfigurer<O,B>> C removeConfigurer(Class<C> clazz) {
-        List<SecurityConfigurer<O,B>> configs = this.configurers.remove(clazz);
-        if(configs == null) {
-            return null;
-        }
-        if(configs.size() != 1) {
-            throw new IllegalStateException("Only one configurer expected for type " + clazz + ", but got " + configs);
-        }
-        return (C) configs.get(0);
-    }
+	/**
+	 * Specifies the {@link ObjectPostProcessor} to use.
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use. Cannot be null
+	 * @return the {@link SecurityBuilder} for further customizations
+	 */
+	@SuppressWarnings("unchecked")
+	public O objectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
+		Assert.notNull(objectPostProcessor, "objectPostProcessor cannot be null");
+		this.objectPostProcessor = objectPostProcessor;
+		return (O) this;
+	}
 
-    /**
-     * Specifies the {@link ObjectPostProcessor} to use.
-     * @param objectPostProcessor the {@link ObjectPostProcessor} to use. Cannot be null
-     * @return the {@link SecurityBuilder} for further customizations
-     */
-    @SuppressWarnings("unchecked")
-    public O objectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
-        Assert.notNull(objectPostProcessor,"objectPostProcessor cannot be null");
-        this.objectPostProcessor = objectPostProcessor;
-        return (O) this;
-    }
+	/**
+	 * Performs post processing of an object. The default is to delegate to the
+	 * {@link ObjectPostProcessor}.
+	 *
+	 * @param object the Object to post process
+	 * @return the possibly modified Object to use
+	 */
+	protected <P> P postProcess(P object) {
+		return (P) this.objectPostProcessor.postProcess(object);
+	}
 
-    /**
-     * Performs post processing of an object. The default is to delegate to the
-     * {@link ObjectPostProcessor}.
-     *
-     * @param object the Object to post process
-     * @return the possibly modified Object to use
-     */
-    protected <P> P postProcess(P object) {
-        return (P) this.objectPostProcessor.postProcess(object);
-    }
+	/**
+	 * Executes the build using the {@link SecurityConfigurer}'s that have been applied
+	 * using the following steps:
+	 *
+	 * <ul>
+	 * <li>Invokes {@link #beforeInit()} for any subclass to hook into</li>
+	 * <li>Invokes {@link SecurityConfigurer#init(SecurityBuilder)} for any
+	 * {@link SecurityConfigurer} that was applied to this builder.</li>
+	 * <li>Invokes {@link #beforeConfigure()} for any subclass to hook into</li>
+	 * <li>Invokes {@link #performBuild()} which actually builds the Object</li>
+	 * </ul>
+	 */
+	@Override
+	protected final O doBuild() throws Exception {
+		synchronized (configurers) {
+			buildState = BuildState.INITIALIZING;
 
-    /**
-     * Executes the build using the {@link SecurityConfigurer}'s that have been applied using the following steps:
-     *
-     * <ul>
-     * <li>Invokes {@link #beforeInit()} for any subclass to hook into</li>
-     * <li>Invokes {@link SecurityConfigurer#init(SecurityBuilder)} for any {@link SecurityConfigurer} that was applied to this builder.</li>
-     * <li>Invokes {@link #beforeConfigure()} for any subclass to hook into</li>
-     * <li>Invokes {@link #performBuild()} which actually builds the Object</li>
-     * </ul>
-     */
-    @Override
-    protected final O doBuild() throws Exception {
-        synchronized(configurers) {
-            buildState = BuildState.INITIALIZING;
+			beforeInit();
+			init();
 
-            beforeInit();
-            init();
+			buildState = BuildState.CONFIGURING;
 
-            buildState = BuildState.CONFIGURING;
+			beforeConfigure();
+			configure();
 
-            beforeConfigure();
-            configure();
+			buildState = BuildState.BUILDING;
 
-            buildState = BuildState.BUILDING;
+			O result = performBuild();
 
-            O result = performBuild();
+			buildState = BuildState.BUILT;
 
-            buildState = BuildState.BUILT;
+			return result;
+		}
+	}
 
-            return result;
-        }
-    }
+	/**
+	 * Invoked prior to invoking each {@link SecurityConfigurer#init(SecurityBuilder)}
+	 * method. Subclasses may override this method to hook into the lifecycle without
+	 * using a {@link SecurityConfigurer}.
+	 */
+	protected void beforeInit() throws Exception {
+	}
 
-    /**
-     * Invoked prior to invoking each
-     * {@link SecurityConfigurer#init(SecurityBuilder)} method. Subclasses may
-     * override this method to hook into the lifecycle without using a
-     * {@link SecurityConfigurer}.
-     */
-    protected void beforeInit() throws Exception {
-    }
+	/**
+	 * Invoked prior to invoking each
+	 * {@link SecurityConfigurer#configure(SecurityBuilder)} method. Subclasses may
+	 * override this method to hook into the lifecycle without using a
+	 * {@link SecurityConfigurer}.
+	 */
+	protected void beforeConfigure() throws Exception {
+	}
 
-    /**
-     * Invoked prior to invoking each
-     * {@link SecurityConfigurer#configure(SecurityBuilder)} method.
-     * Subclasses may override this method to hook into the lifecycle without
-     * using a {@link SecurityConfigurer}.
-     */
-    protected void beforeConfigure() throws Exception {
-    }
+	/**
+	 * Subclasses must implement this method to build the object that is being returned.
+	 *
+	 * @return
+	 */
+	protected abstract O performBuild() throws Exception;
 
-    /**
-     * Subclasses must implement this method to build the object that is being returned.
-     *
-     * @return
-     */
-    protected abstract O performBuild() throws Exception;
+	@SuppressWarnings("unchecked")
+	private void init() throws Exception {
+		Collection<SecurityConfigurer<O, B>> configurers = getConfigurers();
 
-    @SuppressWarnings("unchecked")
-    private void init() throws Exception {
-        Collection<SecurityConfigurer<O,B>> configurers = getConfigurers();
+		for (SecurityConfigurer<O, B> configurer : configurers) {
+			configurer.init((B) this);
+		}
+	}
 
-        for(SecurityConfigurer<O,B> configurer : configurers ) {
-            configurer.init((B) this);
-        }
-    }
+	@SuppressWarnings("unchecked")
+	private void configure() throws Exception {
+		Collection<SecurityConfigurer<O, B>> configurers = getConfigurers();
 
-    @SuppressWarnings("unchecked")
-    private void configure() throws Exception {
-        Collection<SecurityConfigurer<O,B>> configurers = getConfigurers();
+		for (SecurityConfigurer<O, B> configurer : configurers) {
+			configurer.configure((B) this);
+		}
+	}
 
-        for(SecurityConfigurer<O,B> configurer : configurers ) {
-            configurer.configure((B) this);
-        }
-    }
+	private Collection<SecurityConfigurer<O, B>> getConfigurers() {
+		List<SecurityConfigurer<O, B>> result = new ArrayList<SecurityConfigurer<O, B>>();
+		for (List<SecurityConfigurer<O, B>> configs : this.configurers.values()) {
+			result.addAll(configs);
+		}
+		return result;
+	}
 
-    private Collection<SecurityConfigurer<O, B>> getConfigurers() {
-        List<SecurityConfigurer<O,B>> result = new ArrayList<SecurityConfigurer<O,B>>();
-        for(List<SecurityConfigurer<O,B>> configs : this.configurers.values()) {
-            result.addAll(configs);
-        }
-        return result;
-    }
+	/**
+	 * Determines if the object is unbuilt.
+	 * @return true, if unbuilt else false
+	 */
+	private boolean isUnbuilt() {
+		synchronized (configurers) {
+			return buildState == BuildState.UNBUILT;
+		}
+	}
 
-    /**
-     * Determines if the object is unbuilt.
-     * @return true, if unbuilt else false
-     */
-    private boolean isUnbuilt() {
-        synchronized(configurers) {
-            return buildState == BuildState.UNBUILT;
-        }
-    }
+	/**
+	 * The build state for the application
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	private static enum BuildState {
+		/**
+		 * This is the state before the {@link Builder#build()} is invoked
+		 */
+		UNBUILT(0),
 
-    /**
-     * The build state for the application
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    private static enum BuildState {
-        /**
-         * This is the state before the {@link Builder#build()} is invoked
-         */
-        UNBUILT(0),
+		/**
+		 * The state from when {@link Builder#build()} is first invoked until all the
+		 * {@link SecurityConfigurer#init(SecurityBuilder)} methods have been invoked.
+		 */
+		INITIALIZING(1),
 
-        /**
-         * The state from when {@link Builder#build()} is first invoked until
-         * all the {@link SecurityConfigurer#init(SecurityBuilder)} methods
-         * have been invoked.
-         */
-        INITIALIZING(1),
+		/**
+		 * The state from after all {@link SecurityConfigurer#init(SecurityBuilder)} have
+		 * been invoked until after all the
+		 * {@link SecurityConfigurer#configure(SecurityBuilder)} methods have been
+		 * invoked.
+		 */
+		CONFIGURING(2),
 
-        /**
-         * The state from after all
-         * {@link SecurityConfigurer#init(SecurityBuilder)} have been invoked
-         * until after all the
-         * {@link SecurityConfigurer#configure(SecurityBuilder)} methods have
-         * been invoked.
-         */
-        CONFIGURING(2),
+		/**
+		 * From the point after all the
+		 * {@link SecurityConfigurer#configure(SecurityBuilder)} have completed to just
+		 * after {@link AbstractConfiguredSecurityBuilder#performBuild()}.
+		 */
+		BUILDING(3),
 
-        /**
-         * From the point after all the
-         * {@link SecurityConfigurer#configure(SecurityBuilder)} have
-         * completed to just after
-         * {@link AbstractConfiguredSecurityBuilder#performBuild()}.
-         */
-        BUILDING(3),
+		/**
+		 * After the object has been completely built.
+		 */
+		BUILT(4);
 
-        /**
-         * After the object has been completely built.
-         */
-        BUILT(4);
+		private final int order;
 
-        private final int order;
+		BuildState(int order) {
+			this.order = order;
+		}
 
-        BuildState(int order) {
-            this.order = order;
-        }
+		public boolean isInitializing() {
+			return INITIALIZING.order == order;
+		}
 
-        public boolean isInitializing() {
-            return INITIALIZING.order == order;
-        }
-
-        /**
-         * Determines if the state is CONFIGURING or later
-         * @return
-         */
-        public boolean isConfigured() {
-            return order >= CONFIGURING.order;
-        }
-    }
+		/**
+		 * Determines if the state is CONFIGURING or later
+		 * @return
+		 */
+		public boolean isConfigured() {
+			return order >= CONFIGURING.order;
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
index 7cc666dad4..892297e93d 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
@@ -18,8 +18,8 @@ package org.springframework.security.config.annotation;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A base {@link SecurityBuilder} that ensures the object being built is only
- * built one time.
+ * A base {@link SecurityBuilder} that ensures the object being built is only built one
+ * time.
  *
  * @param <O> the type of Object that is being built
  *
@@ -27,40 +27,42 @@ import java.util.concurrent.atomic.AtomicBoolean;
  *
  */
 public abstract class AbstractSecurityBuilder<O> implements SecurityBuilder<O> {
-    private AtomicBoolean building = new AtomicBoolean();
+	private AtomicBoolean building = new AtomicBoolean();
 
-    private O object;
+	private O object;
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.SecurityBuilder#build()
-     */
-    public final O build() throws Exception {
-        if(building.compareAndSet(false, true)) {
-            object = doBuild();
-            return object;
-        }
-        throw new AlreadyBuiltException("This object has already been built");
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.config.annotation.SecurityBuilder#build()
+	 */
+	public final O build() throws Exception {
+		if (building.compareAndSet(false, true)) {
+			object = doBuild();
+			return object;
+		}
+		throw new AlreadyBuiltException("This object has already been built");
+	}
 
-    /**
-     * Gets the object that was built. If it has not been built yet an Exception
-     * is thrown.
-     *
-     * @return the Object that was built
-     */
-    public final O getObject() {
-        if(!building.get()) {
-            throw new IllegalStateException("This object has not been built");
-        }
-        return object;
-    }
+	/**
+	 * Gets the object that was built. If it has not been built yet an Exception is
+	 * thrown.
+	 *
+	 * @return the Object that was built
+	 */
+	public final O getObject() {
+		if (!building.get()) {
+			throw new IllegalStateException("This object has not been built");
+		}
+		return object;
+	}
 
-    /**
-     * Subclasses should implement this to perform the build.
-     *
-     * @return the object that should be returned by {@link #build()}.
-     *
-     * @throws Exception if an error occurs
-     */
-    protected abstract O doBuild() throws Exception;
+	/**
+	 * Subclasses should implement this to perform the build.
+	 *
+	 * @return the object that should be returned by {@link #build()}.
+	 *
+	 * @throws Exception if an error occurs
+	 */
+	protected abstract O doBuild() throws Exception;
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java b/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java
index dd18467527..76637e1a3a 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java
@@ -23,9 +23,9 @@ package org.springframework.security.config.annotation;
  */
 public class AlreadyBuiltException extends IllegalStateException {
 
-    public AlreadyBuiltException(String message) {
-        super(message);
-    }
+	public AlreadyBuiltException(String message) {
+		super(message);
+	}
 
-    private static final long serialVersionUID = -5891004752785553015L;
+	private static final long serialVersionUID = -5891004752785553015L;
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java
index 02189fcac7..b3bece82da 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/ObjectPostProcessor.java
@@ -20,9 +20,9 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 
 /**
- * Allows initialization of Objects. Typically this is used to call the
- * {@link Aware} methods, {@link InitializingBean#afterPropertiesSet()}, and
- * ensure that {@link DisposableBean#destroy()} has been invoked.
+ * Allows initialization of Objects. Typically this is used to call the {@link Aware}
+ * methods, {@link InitializingBean#afterPropertiesSet()}, and ensure that
+ * {@link DisposableBean#destroy()} has been invoked.
  *
  * @param <T> the bound of the types of Objects this {@link ObjectPostProcessor} supports.
  *
@@ -31,12 +31,12 @@ import org.springframework.beans.factory.InitializingBean;
  */
 public interface ObjectPostProcessor<T> {
 
-    /**
-     * Initialize the object possibly returning a modified instance that should
-     * be used instead.
-     *
-     * @param object the object to initialize
-     * @return the initialized version of the object
-     */
-    <O extends T> O postProcess(O object);
+	/**
+	 * Initialize the object possibly returning a modified instance that should be used
+	 * instead.
+	 *
+	 * @param object the object to initialize
+	 * @return the initialized version of the object
+	 */
+	<O extends T> O postProcess(O object);
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java
index 277ef29e49..2a97d5a33f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java
@@ -25,11 +25,11 @@ package org.springframework.security.config.annotation;
  */
 public interface SecurityBuilder<O> {
 
-    /**
-     * Builds the object and returns it or null.
-     *
-     * @return the Object to be built or null if the implementation allows it.
-     * @throws Exception if an error occurred when building the Object
-     */
-    O build() throws Exception;
+	/**
+	 * Builds the object and returns it or null.
+	 *
+	 * @return the Object to be built or null if the implementation allows it.
+	 * @throws Exception if an error occurred when building the Object
+	 */
+	O build() throws Exception;
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java
index 365b9ba953..f1ab7f3f18 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java
@@ -16,40 +16,37 @@
 package org.springframework.security.config.annotation;
 
 /**
- * Allows for configuring a {@link SecurityBuilder}. All
- * {@link SecurityConfigurer} first have their {@link #init(SecurityBuilder)}
- * method invoked. After all {@link #init(SecurityBuilder)} methods have been
- * invoked, each {@link #configure(SecurityBuilder)} method is invoked.
+ * Allows for configuring a {@link SecurityBuilder}. All {@link SecurityConfigurer} first
+ * have their {@link #init(SecurityBuilder)} method invoked. After all
+ * {@link #init(SecurityBuilder)} methods have been invoked, each
+ * {@link #configure(SecurityBuilder)} method is invoked.
  *
  * @see AbstractConfiguredSecurityBuilder
  *
  * @author Rob Winch
  *
- * @param <O>
- *            The object being built by the {@link SecurityBuilder} B
- * @param <B>
- *            The {@link SecurityBuilder} that builds objects of type O. This is
- *            also the {@link SecurityBuilder} that is being configured.
+ * @param <O> The object being built by the {@link SecurityBuilder} B
+ * @param <B> The {@link SecurityBuilder} that builds objects of type O. This is also the
+ * {@link SecurityBuilder} that is being configured.
  */
 public interface SecurityConfigurer<O, B extends SecurityBuilder<O>> {
-    /**
-     * Initialize the {@link SecurityBuilder}. Here only shared state should be
-     * created and modified, but not properties on the {@link SecurityBuilder}
-     * used for building the object. This ensures that the
-     * {@link #configure(SecurityBuilder)} method uses the correct shared
-     * objects when building.
-     *
-     * @param builder
-     * @throws Exception
-     */
-    void init(B builder) throws Exception;
+	/**
+	 * Initialize the {@link SecurityBuilder}. Here only shared state should be created
+	 * and modified, but not properties on the {@link SecurityBuilder} used for building
+	 * the object. This ensures that the {@link #configure(SecurityBuilder)} method uses
+	 * the correct shared objects when building.
+	 *
+	 * @param builder
+	 * @throws Exception
+	 */
+	void init(B builder) throws Exception;
 
-    /**
-     * Configure the {@link SecurityBuilder} by setting the necessary properties
-     * on the {@link SecurityBuilder}.
-     *
-     * @param builder
-     * @throws Exception
-     */
-    void configure(B builder) throws Exception;
+	/**
+	 * Configure the {@link SecurityBuilder} by setting the necessary properties on the
+	 * {@link SecurityBuilder}.
+	 *
+	 * @param builder
+	 * @throws Exception
+	 */
+	void configure(B builder) throws Exception;
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
index 610b66927e..5aaf2e25de 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
@@ -21,112 +21,116 @@ import java.util.List;
 import org.springframework.core.GenericTypeResolver;
 
 /**
- * A base class for {@link SecurityConfigurer} that allows subclasses to only
- * implement the methods they are interested in. It also provides a mechanism
- * for using the {@link SecurityConfigurer} and when done gaining access to the
- * {@link SecurityBuilder} that is being configured.
+ * A base class for {@link SecurityConfigurer} that allows subclasses to only implement
+ * the methods they are interested in. It also provides a mechanism for using the
+ * {@link SecurityConfigurer} and when done gaining access to the {@link SecurityBuilder}
+ * that is being configured.
  *
  * @author Rob Winch
  *
- * @param <O>
- *            The Object being built by B
- * @param <B>
- *            The Builder that is building O and is configured by {@link SecurityConfigurerAdapter}
+ * @param <O> The Object being built by B
+ * @param <B> The Builder that is building O and is configured by
+ * {@link SecurityConfigurerAdapter}
  */
-public abstract class SecurityConfigurerAdapter<O,B extends SecurityBuilder<O>> implements SecurityConfigurer<O,B> {
-    private B securityBuilder;
+public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
+		implements SecurityConfigurer<O, B> {
+	private B securityBuilder;
 
-    private CompositeObjectPostProcessor objectPostProcessor = new CompositeObjectPostProcessor();
+	private CompositeObjectPostProcessor objectPostProcessor = new CompositeObjectPostProcessor();
 
-    public void init(B builder) throws Exception {}
+	public void init(B builder) throws Exception {
+	}
 
-    public void configure(B builder) throws Exception {}
+	public void configure(B builder) throws Exception {
+	}
 
-    /**
-     * Return the {@link SecurityBuilder} when done using the
-     * {@link SecurityConfigurer}. This is useful for method chaining.
-     *
-     * @return
-     */
-    public B and() {
-        return getBuilder();
-    }
+	/**
+	 * Return the {@link SecurityBuilder} when done using the {@link SecurityConfigurer}.
+	 * This is useful for method chaining.
+	 *
+	 * @return
+	 */
+	public B and() {
+		return getBuilder();
+	}
 
-    /**
-     * Gets the {@link SecurityBuilder}. Cannot be null.
-     *
-     * @return the {@link SecurityBuilder}
-     * @throw {@link IllegalStateException} if {@link SecurityBuilder} is null
-     */
-    protected final B getBuilder() {
-        if(securityBuilder == null) {
-            throw new IllegalStateException("securityBuilder cannot be null");
-        }
-        return securityBuilder;
-    }
+	/**
+	 * Gets the {@link SecurityBuilder}. Cannot be null.
+	 *
+	 * @return the {@link SecurityBuilder}
+	 * @throw {@link IllegalStateException} if {@link SecurityBuilder} is null
+	 */
+	protected final B getBuilder() {
+		if (securityBuilder == null) {
+			throw new IllegalStateException("securityBuilder cannot be null");
+		}
+		return securityBuilder;
+	}
 
-    /**
-     * Performs post processing of an object. The default is to delegate to the
-     * {@link ObjectPostProcessor}.
-     *
-     * @param object the Object to post process
-     * @return the possibly modified Object to use
-     */
-    @SuppressWarnings("unchecked")
-    protected <T> T postProcess(T object) {
-        return (T) this.objectPostProcessor.postProcess(object);
-    }
+	/**
+	 * Performs post processing of an object. The default is to delegate to the
+	 * {@link ObjectPostProcessor}.
+	 *
+	 * @param object the Object to post process
+	 * @return the possibly modified Object to use
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T> T postProcess(T object) {
+		return (T) this.objectPostProcessor.postProcess(object);
+	}
 
-    /**
-     * Adds an {@link ObjectPostProcessor} to be used for this
-     * {@link SecurityConfigurerAdapter}. The default implementation does
-     * nothing to the object.
-     *
-     * @param objectPostProcessor the {@link ObjectPostProcessor} to use
-     */
-    public void addObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-        this.objectPostProcessor.addObjectPostProcessor(objectPostProcessor);
-    }
+	/**
+	 * Adds an {@link ObjectPostProcessor} to be used for this
+	 * {@link SecurityConfigurerAdapter}. The default implementation does nothing to the
+	 * object.
+	 *
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use
+	 */
+	public void addObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
+		this.objectPostProcessor.addObjectPostProcessor(objectPostProcessor);
+	}
 
-    /**
-     * Sets the {@link SecurityBuilder} to be used. This is automatically set
-     * when using
-     * {@link AbstractConfiguredSecurityBuilder#apply(SecurityConfigurerAdapter)}
-     *
-     * @param builder the {@link SecurityBuilder} to set
-     */
-    public void setBuilder(B builder) {
-        this.securityBuilder = builder;
-    }
+	/**
+	 * Sets the {@link SecurityBuilder} to be used. This is automatically set when using
+	 * {@link AbstractConfiguredSecurityBuilder#apply(SecurityConfigurerAdapter)}
+	 *
+	 * @param builder the {@link SecurityBuilder} to set
+	 */
+	public void setBuilder(B builder) {
+		this.securityBuilder = builder;
+	}
 
-    /**
-     * An {@link ObjectPostProcessor} that delegates work to numerous
-     * {@link ObjectPostProcessor} implementations.
-     *
-     * @author Rob Winch
-     */
-    private static final class CompositeObjectPostProcessor implements ObjectPostProcessor<Object> {
-        private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<ObjectPostProcessor<?>>();
+	/**
+	 * An {@link ObjectPostProcessor} that delegates work to numerous
+	 * {@link ObjectPostProcessor} implementations.
+	 *
+	 * @author Rob Winch
+	 */
+	private static final class CompositeObjectPostProcessor implements
+			ObjectPostProcessor<Object> {
+		private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<ObjectPostProcessor<?>>();
 
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        public Object postProcess(Object object) {
-            for(ObjectPostProcessor opp : postProcessors) {
-                Class<?> oppClass = opp.getClass();
-                Class<?> oppType = GenericTypeResolver.resolveTypeArgument(oppClass,ObjectPostProcessor.class);
-                if(oppType == null || oppType.isAssignableFrom(object.getClass())) {
-                    object = opp.postProcess(object);
-                }
-            }
-            return object;
-        }
+		@SuppressWarnings({ "rawtypes", "unchecked" })
+		public Object postProcess(Object object) {
+			for (ObjectPostProcessor opp : postProcessors) {
+				Class<?> oppClass = opp.getClass();
+				Class<?> oppType = GenericTypeResolver.resolveTypeArgument(oppClass,
+						ObjectPostProcessor.class);
+				if (oppType == null || oppType.isAssignableFrom(object.getClass())) {
+					object = opp.postProcess(object);
+				}
+			}
+			return object;
+		}
 
-        /**
-         * Adds an {@link ObjectPostProcessor} to use
-         * @param objectPostProcessor the {@link ObjectPostProcessor} to add
-         * @return true if the {@link ObjectPostProcessor} was added, else false
-         */
-        private boolean addObjectPostProcessor(ObjectPostProcessor<?extends Object> objectPostProcessor) {
-            return this.postProcessors.add(objectPostProcessor);
-        }
-    }
+		/**
+		 * Adds an {@link ObjectPostProcessor} to use
+		 * @param objectPostProcessor the {@link ObjectPostProcessor} to add
+		 * @return true if the {@link ObjectPostProcessor} was added, else false
+		 */
+		private boolean addObjectPostProcessor(
+				ObjectPostProcessor<? extends Object> objectPostProcessor) {
+			return this.postProcessors.add(objectPostProcessor);
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java
index bf8c10012b..7db4b5edde 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java
@@ -27,18 +27,18 @@ import org.springframework.security.config.annotation.SecurityBuilder;
  *
  * @param <B> the type of the {@link SecurityBuilder}
  */
-public interface ProviderManagerBuilder<B extends ProviderManagerBuilder<B>> extends SecurityBuilder<AuthenticationManager> {
+public interface ProviderManagerBuilder<B extends ProviderManagerBuilder<B>> extends
+		SecurityBuilder<AuthenticationManager> {
 
-    /**
-     * Add authentication based upon the custom {@link AuthenticationProvider}
-     * that is passed in. Since the {@link AuthenticationProvider}
-     * implementation is unknown, all customizations must be done externally and
-     * the {@link ProviderManagerBuilder} is returned immediately.
-     *
-     * @return a {@link ProviderManagerBuilder} to allow further authentication
-     *         to be provided to the {@link ProviderManagerBuilder}
-     * @throws Exception
-     *             if an error occurs when adding the {@link AuthenticationProvider}
-     */
-    B authenticationProvider(AuthenticationProvider authenticationProvider);
+	/**
+	 * Add authentication based upon the custom {@link AuthenticationProvider} that is
+	 * passed in. Since the {@link AuthenticationProvider} implementation is unknown, all
+	 * customizations must be done externally and the {@link ProviderManagerBuilder} is
+	 * returned immediately.
+	 *
+	 * @return a {@link ProviderManagerBuilder} to allow further authentication to be
+	 * provided to the {@link ProviderManagerBuilder}
+	 * @throws Exception if an error occurs when adding the {@link AuthenticationProvider}
+	 */
+	B authenticationProvider(AuthenticationProvider authenticationProvider);
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java
index 1f5ee74b77..98139ffc61 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java
@@ -39,260 +39,255 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.util.Assert;
 
 /**
- * {@link SecurityBuilder} used to create an {@link AuthenticationManager}.
- * Allows for easily building in memory authentication, LDAP authentication,
- * JDBC based authentication, adding {@link UserDetailsService}, and adding
+ * {@link SecurityBuilder} used to create an {@link AuthenticationManager}. Allows for
+ * easily building in memory authentication, LDAP authentication, JDBC based
+ * authentication, adding {@link UserDetailsService}, and adding
  * {@link AuthenticationProvider}'s.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class AuthenticationManagerBuilder extends AbstractConfiguredSecurityBuilder<AuthenticationManager, AuthenticationManagerBuilder> implements ProviderManagerBuilder<AuthenticationManagerBuilder> {
-    private final Log logger = LogFactory.getLog(getClass());
+public class AuthenticationManagerBuilder
+		extends
+		AbstractConfiguredSecurityBuilder<AuthenticationManager, AuthenticationManagerBuilder>
+		implements ProviderManagerBuilder<AuthenticationManagerBuilder> {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private AuthenticationManager parentAuthenticationManager;
-    private List<AuthenticationProvider> authenticationProviders = new ArrayList<AuthenticationProvider>();
-    private UserDetailsService defaultUserDetailsService;
-    private Boolean eraseCredentials;
-    private AuthenticationEventPublisher eventPublisher;
+	private AuthenticationManager parentAuthenticationManager;
+	private List<AuthenticationProvider> authenticationProviders = new ArrayList<AuthenticationProvider>();
+	private UserDetailsService defaultUserDetailsService;
+	private Boolean eraseCredentials;
+	private AuthenticationEventPublisher eventPublisher;
 
-    /**
-     * Creates a new instance
-     * @param the {@link ObjectPostProcessor} instance to use.
-     */
-    public AuthenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor) {
-        super(objectPostProcessor,true);
-    }
+	/**
+	 * Creates a new instance
+	 * @param the {@link ObjectPostProcessor} instance to use.
+	 */
+	public AuthenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor) {
+		super(objectPostProcessor, true);
+	}
 
-    /**
-     * Allows providing a parent {@link AuthenticationManager} that will be
-     * tried if this {@link AuthenticationManager} was unable to attempt to
-     * authenticate the provided {@link Authentication}.
-     *
-     * @param authenticationManager
-     *            the {@link AuthenticationManager} that should be used if the
-     *            current {@link AuthenticationManager} was unable to attempt to
-     *            authenticate the provided {@link Authentication}.
-     * @return the {@link AuthenticationManagerBuilder} for further adding types
-     *         of authentication
-     */
-    public AuthenticationManagerBuilder parentAuthenticationManager(
-            AuthenticationManager authenticationManager) {
-        if(authenticationManager instanceof ProviderManager) {
-            eraseCredentials(((ProviderManager) authenticationManager).isEraseCredentialsAfterAuthentication());
-        }
-        this.parentAuthenticationManager = authenticationManager;
-        return this;
-    }
+	/**
+	 * Allows providing a parent {@link AuthenticationManager} that will be tried if this
+	 * {@link AuthenticationManager} was unable to attempt to authenticate the provided
+	 * {@link Authentication}.
+	 *
+	 * @param authenticationManager the {@link AuthenticationManager} that should be used
+	 * if the current {@link AuthenticationManager} was unable to attempt to authenticate
+	 * the provided {@link Authentication}.
+	 * @return the {@link AuthenticationManagerBuilder} for further adding types of
+	 * authentication
+	 */
+	public AuthenticationManagerBuilder parentAuthenticationManager(
+			AuthenticationManager authenticationManager) {
+		if (authenticationManager instanceof ProviderManager) {
+			eraseCredentials(((ProviderManager) authenticationManager)
+					.isEraseCredentialsAfterAuthentication());
+		}
+		this.parentAuthenticationManager = authenticationManager;
+		return this;
+	}
 
-    /**
-     * Sets the {@link AuthenticationEventPublisher}
-     *
-     * @param eventPublisher
-     *            the {@link AuthenticationEventPublisher} to use
-     * @return the {@link AuthenticationManagerBuilder} for further
-     *         customizations
-     */
-    public AuthenticationManagerBuilder authenticationEventPublisher(AuthenticationEventPublisher eventPublisher) {
-        Assert.notNull(eventPublisher, "AuthenticationEventPublisher cannot be null");
-        this.eventPublisher = eventPublisher;
-        return this;
-    }
+	/**
+	 * Sets the {@link AuthenticationEventPublisher}
+	 *
+	 * @param eventPublisher the {@link AuthenticationEventPublisher} to use
+	 * @return the {@link AuthenticationManagerBuilder} for further customizations
+	 */
+	public AuthenticationManagerBuilder authenticationEventPublisher(
+			AuthenticationEventPublisher eventPublisher) {
+		Assert.notNull(eventPublisher, "AuthenticationEventPublisher cannot be null");
+		this.eventPublisher = eventPublisher;
+		return this;
+	}
 
-    /**
-     *
-     *
-     * @param eraseCredentials
-     *            true if {@link AuthenticationManager} should clear the
-     *            credentials from the {@link Authentication} object after
-     *            authenticating
-     * @return the {@link AuthenticationManagerBuilder} for further customizations
-     */
-    public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) {
-        this.eraseCredentials = eraseCredentials;
-        return this;
-    }
+	/**
+	 *
+	 *
+	 * @param eraseCredentials true if {@link AuthenticationManager} should clear the
+	 * credentials from the {@link Authentication} object after authenticating
+	 * @return the {@link AuthenticationManagerBuilder} for further customizations
+	 */
+	public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) {
+		this.eraseCredentials = eraseCredentials;
+		return this;
+	}
 
+	/**
+	 * Add in memory authentication to the {@link AuthenticationManagerBuilder} and return
+	 * a {@link InMemoryUserDetailsManagerConfigurer} to allow customization of the in
+	 * memory authentication.
+	 *
+	 * <p>
+	 * This method also ensure that a {@link UserDetailsService} is available for the
+	 * {@link #getDefaultUserDetailsService()} method. Note that additional
+	 * {@link UserDetailsService}'s may override this {@link UserDetailsService} as the
+	 * default.
+	 * </p>
+	 *
+	 * @return a {@link InMemoryUserDetailsManagerConfigurer} to allow customization of
+	 * the in memory authentication
+	 * @throws Exception if an error occurs when adding the in memory authentication
+	 */
+	public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication()
+			throws Exception {
+		return apply(new InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder>());
+	}
 
-    /**
-     * Add in memory authentication to the {@link AuthenticationManagerBuilder}
-     * and return a {@link InMemoryUserDetailsManagerConfigurer} to
-     * allow customization of the in memory authentication.
-     *
-     * <p>
-     * This method also ensure that a {@link UserDetailsService} is available
-     * for the {@link #getDefaultUserDetailsService()} method. Note that
-     * additional {@link UserDetailsService}'s may override this
-     * {@link UserDetailsService} as the default.
-     * </p>
-     *
-     * @return a {@link InMemoryUserDetailsManagerConfigurer} to allow
-     *         customization of the in memory authentication
-     * @throws Exception
-     *             if an error occurs when adding the in memory authentication
-     */
-    public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication()
-            throws Exception {
-        return apply(new InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder>());
-    }
+	/**
+	 * Add JDBC authentication to the {@link AuthenticationManagerBuilder} and return a
+	 * {@link JdbcUserDetailsManagerConfigurer} to allow customization of the JDBC
+	 * authentication.
+	 *
+	 * <p>
+	 * When using with a persistent data store, it is best to add users external of
+	 * configuration using something like <a href="http://flywaydb.org/">Flyway</a> or <a
+	 * href="http://www.liquibase.org/">Liquibase</a> to create the schema and adding
+	 * users to ensure these steps are only done once and that the optimal SQL is used.
+	 * </p>
+	 *
+	 * <p>
+	 * This method also ensure that a {@link UserDetailsService} is available for the
+	 * {@link #getDefaultUserDetailsService()} method. Note that additional
+	 * {@link UserDetailsService}'s may override this {@link UserDetailsService} as the
+	 * default. See the <a href=
+	 * "http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#user-schema"
+	 * >User Schema</a> section of the reference for the default schema.
+	 * </p>
+	 *
+	 * @return a {@link JdbcUserDetailsManagerConfigurer} to allow customization of the
+	 * JDBC authentication
+	 * @throws Exception if an error occurs when adding the JDBC authentication
+	 */
+	public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication()
+			throws Exception {
+		return apply(new JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder>());
+	}
 
-    /**
-     * Add JDBC authentication to the {@link AuthenticationManagerBuilder} and
-     * return a {@link JdbcUserDetailsManagerConfigurer} to allow customization
-     * of the JDBC authentication.
-     *
-     * <p>
-     * When using with a persistent data store, it is best to add users external
-     * of configuration using something like <a
-     * href="http://flywaydb.org/">Flyway</a> or <a
-     * href="http://www.liquibase.org/">Liquibase</a> to create the schema and
-     * adding users to ensure these steps are only done once and that the
-     * optimal SQL is used.
-     * </p>
-     *
-     * <p>
-     * This method also ensure that a {@link UserDetailsService} is available
-     * for the {@link #getDefaultUserDetailsService()} method. Note that
-     * additional {@link UserDetailsService}'s may override this
-     * {@link UserDetailsService} as the default. See the <a href=
-     * "http://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#user-schema"
-     * >User Schema</a> section of the reference for the default schema.
-     * </p>
-     *
-     * @return a {@link JdbcUserDetailsManagerConfigurer} to allow customization
-     *         of the JDBC authentication
-     * @throws Exception
-     *             if an error occurs when adding the JDBC authentication
-     */
-    public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication()
-            throws Exception {
-        return apply(new JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder>());
-    }
+	/**
+	 * Add authentication based upon the custom {@link UserDetailsService} that is passed
+	 * in. It then returns a {@link DaoAuthenticationConfigurer} to allow customization of
+	 * the authentication.
+	 *
+	 * <p>
+	 * This method also ensure that the {@link UserDetailsService} is available for the
+	 * {@link #getDefaultUserDetailsService()} method. Note that additional
+	 * {@link UserDetailsService}'s may override this {@link UserDetailsService} as the
+	 * default.
+	 * </p>
+	 *
+	 * @return a {@link DaoAuthenticationConfigurer} to allow customization of the DAO
+	 * authentication
+	 * @throws Exception if an error occurs when adding the {@link UserDetailsService}
+	 * based authentication
+	 */
+	public <T extends UserDetailsService> DaoAuthenticationConfigurer<AuthenticationManagerBuilder, T> userDetailsService(
+			T userDetailsService) throws Exception {
+		this.defaultUserDetailsService = userDetailsService;
+		return apply(new DaoAuthenticationConfigurer<AuthenticationManagerBuilder, T>(
+				userDetailsService));
+	}
 
-    /**
-     * Add authentication based upon the custom {@link UserDetailsService} that
-     * is passed in. It then returns a {@link DaoAuthenticationConfigurer} to
-     * allow customization of the authentication.
-     *
-     * <p>
-     * This method also ensure that the {@link UserDetailsService} is available
-     * for the {@link #getDefaultUserDetailsService()} method. Note that
-     * additional {@link UserDetailsService}'s may override this
-     * {@link UserDetailsService} as the default.
-     * </p>
-     *
-     * @return a {@link DaoAuthenticationConfigurer} to allow customization
-     *         of the DAO authentication
-     * @throws Exception
-     *             if an error occurs when adding the {@link UserDetailsService}
-     *             based authentication
-     */
-    public <T extends UserDetailsService> DaoAuthenticationConfigurer<AuthenticationManagerBuilder,T> userDetailsService(
-            T userDetailsService) throws Exception {
-        this.defaultUserDetailsService = userDetailsService;
-        return apply(new DaoAuthenticationConfigurer<AuthenticationManagerBuilder,T>(userDetailsService));
-    }
+	/**
+	 * Add LDAP authentication to the {@link AuthenticationManagerBuilder} and return a
+	 * {@link LdapAuthenticationProviderConfigurer} to allow customization of the LDAP
+	 * authentication.
+	 *
+	 * <p>
+	 * This method <b>does NOT</b> ensure that a {@link UserDetailsService} is available
+	 * for the {@link #getDefaultUserDetailsService()} method.
+	 * </p>
+	 *
+	 * @return a {@link LdapAuthenticationProviderConfigurer} to allow customization of
+	 * the LDAP authentication
+	 * @throws Exception if an error occurs when adding the LDAP authentication
+	 */
+	public LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldapAuthentication()
+			throws Exception {
+		return apply(new LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>());
+	}
 
-    /**
-     * Add LDAP authentication to the {@link AuthenticationManagerBuilder} and
-     * return a {@link LdapAuthenticationProviderConfigurer} to allow
-     * customization of the LDAP authentication.
-     *
-     * <p>
-     * This method <b>does NOT</b> ensure that a {@link UserDetailsService} is
-     * available for the {@link #getDefaultUserDetailsService()} method.
-     * </p>
-     *
-     * @return a {@link LdapAuthenticationProviderConfigurer} to allow
-     *         customization of the LDAP authentication
-     * @throws Exception
-     *             if an error occurs when adding the LDAP authentication
-     */
-    public LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder> ldapAuthentication()
-            throws Exception {
-        return apply(new LdapAuthenticationProviderConfigurer<AuthenticationManagerBuilder>());
-    }
+	/**
+	 * Add authentication based upon the custom {@link AuthenticationProvider} that is
+	 * passed in. Since the {@link AuthenticationProvider} implementation is unknown, all
+	 * customizations must be done externally and the {@link AuthenticationManagerBuilder}
+	 * is returned immediately.
+	 *
+	 * <p>
+	 * This method <b>does NOT</b> ensure that the {@link UserDetailsService} is available
+	 * for the {@link #getDefaultUserDetailsService()} method.
+	 * </p>
+	 *
+	 * @return a {@link AuthenticationManagerBuilder} to allow further authentication to
+	 * be provided to the {@link AuthenticationManagerBuilder}
+	 * @throws Exception if an error occurs when adding the {@link AuthenticationProvider}
+	 */
+	public AuthenticationManagerBuilder authenticationProvider(
+			AuthenticationProvider authenticationProvider) {
+		this.authenticationProviders.add(authenticationProvider);
+		return this;
+	}
 
-    /**
-     * Add authentication based upon the custom {@link AuthenticationProvider}
-     * that is passed in. Since the {@link AuthenticationProvider}
-     * implementation is unknown, all customizations must be done externally and
-     * the {@link AuthenticationManagerBuilder} is returned immediately.
-     *
-     * <p>
-     * This method <b>does NOT</b> ensure that the {@link UserDetailsService} is
-     * available for the {@link #getDefaultUserDetailsService()} method.
-     * </p>
-     *
-     * @return a {@link AuthenticationManagerBuilder} to allow further authentication
-     *         to be provided to the {@link AuthenticationManagerBuilder}
-     * @throws Exception
-     *             if an error occurs when adding the {@link AuthenticationProvider}
-     */
-    public AuthenticationManagerBuilder authenticationProvider(
-            AuthenticationProvider authenticationProvider) {
-        this.authenticationProviders.add(authenticationProvider);
-        return this;
-    }
+	@Override
+	protected ProviderManager performBuild() throws Exception {
+		if (!isConfigured()) {
+			logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null.");
+			return null;
+		}
+		ProviderManager providerManager = new ProviderManager(authenticationProviders,
+				parentAuthenticationManager);
+		if (eraseCredentials != null) {
+			providerManager.setEraseCredentialsAfterAuthentication(eraseCredentials);
+		}
+		if (eventPublisher != null) {
+			providerManager.setAuthenticationEventPublisher(eventPublisher);
+		}
+		providerManager = postProcess(providerManager);
+		return providerManager;
+	}
 
-    @Override
-    protected ProviderManager performBuild() throws Exception {
-        if(!isConfigured()) {
-            logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null.");
-            return null;
-        }
-        ProviderManager providerManager = new ProviderManager(authenticationProviders, parentAuthenticationManager);
-        if(eraseCredentials != null) {
-            providerManager.setEraseCredentialsAfterAuthentication(eraseCredentials);
-        }
-        if(eventPublisher != null) {
-            providerManager.setAuthenticationEventPublisher(eventPublisher);
-        }
-        providerManager = postProcess(providerManager);
-        return providerManager;
-    }
+	/**
+	 * Determines if the {@link AuthenticationManagerBuilder} is configured to build a non
+	 * null {@link AuthenticationManager}. This means that either a non-null parent is
+	 * specified or at least one {@link AuthenticationProvider} has been specified.
+	 *
+	 * <p>
+	 * When using {@link SecurityConfigurer} instances, the
+	 * {@link AuthenticationManagerBuilder} will not be configured until the
+	 * {@link SecurityConfigurer#configure(SecurityBuilder)} methods. This means a
+	 * {@link SecurityConfigurer} that is last could check this method and provide a
+	 * default configuration in the {@link SecurityConfigurer#configure(SecurityBuilder)}
+	 * method.
+	 *
+	 * @return
+	 */
+	public boolean isConfigured() {
+		return !authenticationProviders.isEmpty() || parentAuthenticationManager != null;
+	}
 
-    /**
-     * Determines if the {@link AuthenticationManagerBuilder} is configured to
-     * build a non null {@link AuthenticationManager}. This means that either a
-     * non-null parent is specified or at least one
-     * {@link AuthenticationProvider} has been specified.
-     *
-     * <p>
-     * When using {@link SecurityConfigurer} instances, the
-     * {@link AuthenticationManagerBuilder} will not be configured until the
-     * {@link SecurityConfigurer#configure(SecurityBuilder)} methods. This means
-     * a {@link SecurityConfigurer} that is last could check this method and
-     * provide a default configuration in the
-     * {@link SecurityConfigurer#configure(SecurityBuilder)} method.
-     *
-     * @return
-     */
-    public boolean isConfigured() {
-        return !authenticationProviders.isEmpty() || parentAuthenticationManager != null;
-    }
+	/**
+	 * Gets the default {@link UserDetailsService} for the
+	 * {@link AuthenticationManagerBuilder}. The result may be null in some circumstances.
+	 *
+	 * @return the default {@link UserDetailsService} for the
+	 * {@link AuthenticationManagerBuilder}
+	 */
+	public UserDetailsService getDefaultUserDetailsService() {
+		return this.defaultUserDetailsService;
+	}
 
-    /**
-     * Gets the default {@link UserDetailsService} for the
-     * {@link AuthenticationManagerBuilder}. The result may be null in some
-     * circumstances.
-     *
-     * @return the default {@link UserDetailsService} for the
-     * {@link AuthenticationManagerBuilder}
-     */
-    public UserDetailsService getDefaultUserDetailsService() {
-        return this.defaultUserDetailsService;
-    }
-
-    /**
-     * Captures the {@link UserDetailsService} from any {@link UserDetailsAwareConfigurer}.
-     *
-     * @param configurer the {@link UserDetailsAwareConfigurer} to capture the {@link UserDetailsService} from.
-     * @return the {@link UserDetailsAwareConfigurer} for further customizations
-     * @throws Exception if an error occurs
-     */
-    private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder,? extends UserDetailsService>> C apply(C configurer) throws Exception {
-        this.defaultUserDetailsService = configurer.getUserDetailsService();
-        return (C) super.apply(configurer);
-    }
+	/**
+	 * Captures the {@link UserDetailsService} from any {@link UserDetailsAwareConfigurer}
+	 * .
+	 *
+	 * @param configurer the {@link UserDetailsAwareConfigurer} to capture the
+	 * {@link UserDetailsService} from.
+	 * @return the {@link UserDetailsAwareConfigurer} for further customizations
+	 * @throws Exception if an error occurs
+	 */
+	private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
+			C configurer) throws Exception {
+		this.defaultUserDetailsService = configurer.getUserDetailsService();
+		return (C) super.apply(configurer);
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
index 58c4e0eac6..c82469ee67 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
@@ -45,97 +45,106 @@ import org.springframework.util.Assert;
  */
 @Configuration
 public class AuthenticationConfiguration {
-    private ApplicationContext applicationContext;
+	private ApplicationContext applicationContext;
 
-    private AuthenticationManager authenticationManager;
+	private AuthenticationManager authenticationManager;
 
-    private boolean authenticationManagerInitialized;
+	private boolean authenticationManagerInitialized;
 
-    private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigures = Collections.emptyList();
+	private List<GlobalAuthenticationConfigurerAdapter> globalAuthConfigures = Collections
+			.emptyList();
 
-    private ObjectPostProcessor<Object> objectPostProcessor;
+	private ObjectPostProcessor<Object> objectPostProcessor;
 
-    @Bean
-    public AuthenticationManagerBuilder authenticationManagerBuilder(ObjectPostProcessor<Object> objectPostProcessor) {
-        return new AuthenticationManagerBuilder(objectPostProcessor);
-    }
+	@Bean
+	public AuthenticationManagerBuilder authenticationManagerBuilder(
+			ObjectPostProcessor<Object> objectPostProcessor) {
+		return new AuthenticationManagerBuilder(objectPostProcessor);
+	}
 
-    @Bean
-    public static GlobalAuthenticationConfigurerAdapter enableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
-        return new EnableGlobalAuthenticationAutowiredConfigurer(context);
-    }
+	@Bean
+	public static GlobalAuthenticationConfigurerAdapter enableGlobalAuthenticationAutowiredConfigurer(
+			ApplicationContext context) {
+		return new EnableGlobalAuthenticationAutowiredConfigurer(context);
+	}
 
-    public AuthenticationManager getAuthenticationManager() throws Exception {
-        if(authenticationManagerInitialized) {
-            return authenticationManager;
-        }
+	public AuthenticationManager getAuthenticationManager() throws Exception {
+		if (authenticationManagerInitialized) {
+			return authenticationManager;
+		}
 
-        AuthenticationManagerBuilder authBuilder = authenticationManagerBuilder(objectPostProcessor);
-        for(GlobalAuthenticationConfigurerAdapter config : globalAuthConfigures) {
-            authBuilder.apply(config);
-        }
+		AuthenticationManagerBuilder authBuilder = authenticationManagerBuilder(objectPostProcessor);
+		for (GlobalAuthenticationConfigurerAdapter config : globalAuthConfigures) {
+			authBuilder.apply(config);
+		}
 
-        authenticationManager = authBuilder.build();
+		authenticationManager = authBuilder.build();
 
-        if(authenticationManager == null) {
-            authenticationManager = getAuthenticationMangerBean();
-        }
+		if (authenticationManager == null) {
+			authenticationManager = getAuthenticationMangerBean();
+		}
 
-        this.authenticationManagerInitialized = true;
-        return authenticationManager;
-    }
+		this.authenticationManagerInitialized = true;
+		return authenticationManager;
+	}
 
-    @Autowired(required = false)
-    public void setGlobalAuthenticationConfigurers(List<GlobalAuthenticationConfigurerAdapter> configurers) throws Exception {
-        Collections.sort(configurers, AnnotationAwareOrderComparator.INSTANCE);
-        this.globalAuthConfigures = configurers;
-    }
+	@Autowired(required = false)
+	public void setGlobalAuthenticationConfigurers(
+			List<GlobalAuthenticationConfigurerAdapter> configurers) throws Exception {
+		Collections.sort(configurers, AnnotationAwareOrderComparator.INSTANCE);
+		this.globalAuthConfigures = configurers;
+	}
 
-    @Autowired
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        this.applicationContext = applicationContext;
-    }
+	@Autowired
+	public void setApplicationContext(ApplicationContext applicationContext) {
+		this.applicationContext = applicationContext;
+	}
 
-    @Autowired
-    public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
-        this.objectPostProcessor = objectPostProcessor;
-    }
+	@Autowired
+	public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
+		this.objectPostProcessor = objectPostProcessor;
+	}
 
+	@SuppressWarnings("unchecked")
+	private <T> T lazyBean(Class<T> interfaceName) {
+		LazyInitTargetSource lazyTargetSource = new LazyInitTargetSource();
+		String[] beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
+				applicationContext, interfaceName);
+		if (beanNamesForType.length == 0) {
+			return null;
+		}
+		Assert.isTrue(beanNamesForType.length == 1,
+				"Expecting to only find a single bean for type " + interfaceName
+						+ ", but found " + Arrays.asList(beanNamesForType));
+		lazyTargetSource.setTargetBeanName(beanNamesForType[0]);
+		lazyTargetSource.setBeanFactory(applicationContext);
+		ProxyFactoryBean proxyFactory = new ProxyFactoryBean();
+		proxyFactory = objectPostProcessor.postProcess(proxyFactory);
+		proxyFactory.setTargetSource(lazyTargetSource);
+		return (T) proxyFactory.getObject();
+	}
 
-    @SuppressWarnings("unchecked")
-    private <T> T lazyBean(Class<T> interfaceName) {
-        LazyInitTargetSource lazyTargetSource = new LazyInitTargetSource();
-        String[] beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(applicationContext, interfaceName);
-        if(beanNamesForType.length == 0) {
-            return null;
-        }
-        Assert.isTrue(beanNamesForType.length == 1 , "Expecting to only find a single bean for type " + interfaceName + ", but found " + Arrays.asList(beanNamesForType));
-        lazyTargetSource.setTargetBeanName(beanNamesForType[0]);
-        lazyTargetSource.setBeanFactory(applicationContext);
-        ProxyFactoryBean proxyFactory = new ProxyFactoryBean();
-        proxyFactory = objectPostProcessor.postProcess(proxyFactory);
-        proxyFactory.setTargetSource(lazyTargetSource);
-        return (T) proxyFactory.getObject();
-    }
+	private AuthenticationManager getAuthenticationMangerBean() {
+		return lazyBean(AuthenticationManager.class);
+	}
 
-    private AuthenticationManager getAuthenticationMangerBean() {
-        return lazyBean(AuthenticationManager.class);
-    }
+	private static class EnableGlobalAuthenticationAutowiredConfigurer extends
+			GlobalAuthenticationConfigurerAdapter {
+		private final ApplicationContext context;
+		private static final Log logger = LogFactory
+				.getLog(EnableGlobalAuthenticationAutowiredConfigurer.class);
 
-    private static class EnableGlobalAuthenticationAutowiredConfigurer extends GlobalAuthenticationConfigurerAdapter {
-        private final ApplicationContext context;
-        private static final Log logger = LogFactory.getLog(EnableGlobalAuthenticationAutowiredConfigurer.class);
+		public EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
+			this.context = context;
+		}
 
-        public EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
-            this.context = context;
-        }
-
-        @Override
-        public void init(AuthenticationManagerBuilder auth) {
-            Map<String, Object> beansWithAnnotation = context.getBeansWithAnnotation(EnableGlobalAuthentication.class);
-            if(logger.isDebugEnabled()) {
-                logger.debug("Eagerly initializing " + beansWithAnnotation);
-            }
-        }
-    }
+		@Override
+		public void init(AuthenticationManagerBuilder auth) {
+			Map<String, Object> beansWithAnnotation = context
+					.getBeansWithAnnotation(EnableGlobalAuthentication.class);
+			if (logger.isDebugEnabled()) {
+				logger.debug("Eagerly initializing " + beansWithAnnotation);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java
index 0412e56d48..95a693b7b1 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java
@@ -27,56 +27,52 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.servlet.configuration.EnableWebMvcSecurity;
 
 /**
- * The {@link EnableGlobalAuthentication} annotation signals that the annotated
- * class can be used to configure a global instance of
- * {@link AuthenticationManagerBuilder}. For example:
+ * The {@link EnableGlobalAuthentication} annotation signals that the annotated class can
+ * be used to configure a global instance of {@link AuthenticationManagerBuilder}. For
+ * example:
  *
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableGlobalAuthentication
  * public class MyGlobalAuthenticationConfiguration {
- *
- *     &#064;Autowired
- *     public void configureGlobal(AuthenticationManagerBuilder auth) {
- *        auth
- *            .inMemoryAuthentication()
- *                .withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;).and()
- *                .withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
- *     }
+ * 
+ * 	&#064;Autowired
+ * 	public void configureGlobal(AuthenticationManagerBuilder auth) {
+ * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;)
+ * 				.and().withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
+ * 	}
  * }
  * </pre>
  *
- * Annotations that are annotated with {@link EnableGlobalAuthentication} also
- * signal that the annotated class can be used to configure a global instance of
+ * Annotations that are annotated with {@link EnableGlobalAuthentication} also signal that
+ * the annotated class can be used to configure a global instance of
  * {@link AuthenticationManagerBuilder}. For example:
  *
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableWebSecurity
  * public class MyWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
- *
- *    &#064;Autowired
- *    public void configureGlobal(AuthenticationManagerBuilder auth) {
- *        auth
- *            .inMemoryAuthentication()
- *                .withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;).and()
- *                .withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
- *    }
- *
- *    // Possibly overridden methods ...
+ * 
+ * 	&#064;Autowired
+ * 	public void configureGlobal(AuthenticationManagerBuilder auth) {
+ * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;)
+ * 				.and().withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
+ * 	}
+ * 
+ * 	// Possibly overridden methods ...
  * }
  * </pre>
  *
  * The following annotations are annotated with {@link EnableGlobalAuthentication}
  *
  * <ul>
- *   <li> {@link EnableWebSecurity} </li>
- *   <li> {@link EnableWebMvcSecurity} </li>
- *   <li> {@link EnableGlobalMethodSecurity} </li>
+ * <li> {@link EnableWebSecurity}</li>
+ * <li> {@link EnableWebMvcSecurity}</li>
+ * <li> {@link EnableGlobalMethodSecurity}</li>
  * </ul>
  *
- * Configuring {@link AuthenticationManagerBuilder} in a class without the {@link EnableGlobalAuthentication} annotation has
- * unpredictable results.
+ * Configuring {@link AuthenticationManagerBuilder} in a class without the
+ * {@link EnableGlobalAuthentication} annotation has unpredictable results.
  *
  * @see EnableWebMvcSecurity
  * @see EnableWebSecurity
@@ -85,9 +81,10 @@ import org.springframework.security.config.annotation.web.servlet.configuration.
  * @author Rob Winch
  *
  */
-@Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target(value={java.lang.annotation.ElementType.TYPE})
+@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(value = { java.lang.annotation.ElementType.TYPE })
 @Documented
 @Import(AuthenticationConfiguration.class)
 @Configuration
-public @interface EnableGlobalAuthentication {}
+public @interface EnableGlobalAuthentication {
+}
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/GlobalAuthenticationConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/GlobalAuthenticationConfigurerAdapter.java
index 2bc1e13cd2..2957b19641 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/GlobalAuthenticationConfigurerAdapter.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/GlobalAuthenticationConfigurerAdapter.java
@@ -22,18 +22,21 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 
 /**
- * A {@link SecurityConfigurer} that can be exposed as a bean to configure the
- * global {@link AuthenticationManagerBuilder}. Beans of this type are
- * automatically used by {@link AuthenticationConfiguration} to configure the
- * global {@link AuthenticationManagerBuilder}.
+ * A {@link SecurityConfigurer} that can be exposed as a bean to configure the global
+ * {@link AuthenticationManagerBuilder}. Beans of this type are automatically used by
+ * {@link AuthenticationConfiguration} to configure the global
+ * {@link AuthenticationManagerBuilder}.
  *
  * @since 3.2.1
  * @author Rob Winch
  */
 @Order(100)
-public abstract class GlobalAuthenticationConfigurerAdapter implements SecurityConfigurer<AuthenticationManager, AuthenticationManagerBuilder> {
+public abstract class GlobalAuthenticationConfigurerAdapter implements
+		SecurityConfigurer<AuthenticationManager, AuthenticationManagerBuilder> {
 
-    public void init(AuthenticationManagerBuilder auth) throws Exception {}
+	public void init(AuthenticationManagerBuilder auth) throws Exception {
+	}
 
-    public void configure(AuthenticationManagerBuilder auth) throws Exception {}
+	public void configure(AuthenticationManagerBuilder auth) throws Exception {
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
index 045d9c97c1..eb7d555fc5 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
@@ -53,509 +53,532 @@ import java.net.ServerSocket;
  * @author Rob Winch
  * @since 3.2
  */
-public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuilder<B>> extends SecurityConfigurerAdapter<AuthenticationManager,B> {
-    private String groupRoleAttribute = "cn";
-    private String groupSearchBase = "";
-    private String groupSearchFilter = "(uniqueMember={0})";
-    private String rolePrefix = "ROLE_";
-    private String userSearchBase = ""; // only for search
-    private String userSearchFilter = null;//"uid={0}"; // only for search
-    private String[] userDnPatterns;
-    private BaseLdapPathContextSource contextSource;
-    private ContextSourceBuilder contextSourceBuilder = new ContextSourceBuilder();
-    private UserDetailsContextMapper userDetailsContextMapper;
-    private Object passwordEncoder;
-    private String passwordAttribute;
-    private LdapAuthoritiesPopulator ldapAuthoritiesPopulator;
+public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuilder<B>>
+		extends SecurityConfigurerAdapter<AuthenticationManager, B> {
+	private String groupRoleAttribute = "cn";
+	private String groupSearchBase = "";
+	private String groupSearchFilter = "(uniqueMember={0})";
+	private String rolePrefix = "ROLE_";
+	private String userSearchBase = ""; // only for search
+	private String userSearchFilter = null;// "uid={0}"; // only for search
+	private String[] userDnPatterns;
+	private BaseLdapPathContextSource contextSource;
+	private ContextSourceBuilder contextSourceBuilder = new ContextSourceBuilder();
+	private UserDetailsContextMapper userDetailsContextMapper;
+	private Object passwordEncoder;
+	private String passwordAttribute;
+	private LdapAuthoritiesPopulator ldapAuthoritiesPopulator;
 
-    private LdapAuthenticationProvider build() throws Exception {
-        BaseLdapPathContextSource contextSource = getContextSource();
-        LdapAuthenticator ldapAuthenticator = createLdapAuthenticator(contextSource);
+	private LdapAuthenticationProvider build() throws Exception {
+		BaseLdapPathContextSource contextSource = getContextSource();
+		LdapAuthenticator ldapAuthenticator = createLdapAuthenticator(contextSource);
 
-        LdapAuthoritiesPopulator authoritiesPopulator = getLdapAuthoritiesPopulator();
+		LdapAuthoritiesPopulator authoritiesPopulator = getLdapAuthoritiesPopulator();
 
-        LdapAuthenticationProvider ldapAuthenticationProvider = new LdapAuthenticationProvider(
-                ldapAuthenticator, authoritiesPopulator);
-        SimpleAuthorityMapper simpleAuthorityMapper = new SimpleAuthorityMapper();
-        simpleAuthorityMapper.setPrefix(rolePrefix);
-        simpleAuthorityMapper.afterPropertiesSet();
-        ldapAuthenticationProvider.setAuthoritiesMapper(simpleAuthorityMapper);
-        if(userDetailsContextMapper != null) {
-            ldapAuthenticationProvider.setUserDetailsContextMapper(userDetailsContextMapper);
-        }
-        return ldapAuthenticationProvider;
-    }
+		LdapAuthenticationProvider ldapAuthenticationProvider = new LdapAuthenticationProvider(
+				ldapAuthenticator, authoritiesPopulator);
+		SimpleAuthorityMapper simpleAuthorityMapper = new SimpleAuthorityMapper();
+		simpleAuthorityMapper.setPrefix(rolePrefix);
+		simpleAuthorityMapper.afterPropertiesSet();
+		ldapAuthenticationProvider.setAuthoritiesMapper(simpleAuthorityMapper);
+		if (userDetailsContextMapper != null) {
+			ldapAuthenticationProvider
+					.setUserDetailsContextMapper(userDetailsContextMapper);
+		}
+		return ldapAuthenticationProvider;
+	}
 
-    /**
-     * Specifies the {@link LdapAuthoritiesPopulator}.
-     *
-     * @param ldapAuthoritiesPopulator the {@link LdapAuthoritiesPopulator} the default is {@link DefaultLdapAuthoritiesPopulator}
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> ldapAuthoritiesPopulator(LdapAuthoritiesPopulator ldapAuthoritiesPopulator) {
-        this.ldapAuthoritiesPopulator = ldapAuthoritiesPopulator;
-        return this;
-    }
+	/**
+	 * Specifies the {@link LdapAuthoritiesPopulator}.
+	 *
+	 * @param ldapAuthoritiesPopulator the {@link LdapAuthoritiesPopulator} the default is
+	 * {@link DefaultLdapAuthoritiesPopulator}
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> ldapAuthoritiesPopulator(
+			LdapAuthoritiesPopulator ldapAuthoritiesPopulator) {
+		this.ldapAuthoritiesPopulator = ldapAuthoritiesPopulator;
+		return this;
+	}
 
-    /**
-     * Adds an {@link ObjectPostProcessor} for this class.
-     *
-     * @param objectPostProcessor
-     * @return the {@link ChannelSecurityConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-        addObjectPostProcessor(objectPostProcessor);
-        return this;
-    }
+	/**
+	 * Adds an {@link ObjectPostProcessor} for this class.
+	 *
+	 * @param objectPostProcessor
+	 * @return the {@link ChannelSecurityConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> withObjectPostProcessor(
+			ObjectPostProcessor<?> objectPostProcessor) {
+		addObjectPostProcessor(objectPostProcessor);
+		return this;
+	}
 
-    /**
-     * Gets the {@link LdapAuthoritiesPopulator} and defaults to {@link DefaultLdapAuthoritiesPopulator}
-     *
-     * @return the {@link LdapAuthoritiesPopulator}
-     */
-    private LdapAuthoritiesPopulator getLdapAuthoritiesPopulator() {
-        if(ldapAuthoritiesPopulator != null) {
-            return ldapAuthoritiesPopulator;
-        }
+	/**
+	 * Gets the {@link LdapAuthoritiesPopulator} and defaults to
+	 * {@link DefaultLdapAuthoritiesPopulator}
+	 *
+	 * @return the {@link LdapAuthoritiesPopulator}
+	 */
+	private LdapAuthoritiesPopulator getLdapAuthoritiesPopulator() {
+		if (ldapAuthoritiesPopulator != null) {
+			return ldapAuthoritiesPopulator;
+		}
 
-        DefaultLdapAuthoritiesPopulator defaultAuthoritiesPopulator = new DefaultLdapAuthoritiesPopulator(
-                contextSource, groupSearchBase);
-        defaultAuthoritiesPopulator.setGroupRoleAttribute(groupRoleAttribute);
-        defaultAuthoritiesPopulator.setGroupSearchFilter(groupSearchFilter);
+		DefaultLdapAuthoritiesPopulator defaultAuthoritiesPopulator = new DefaultLdapAuthoritiesPopulator(
+				contextSource, groupSearchBase);
+		defaultAuthoritiesPopulator.setGroupRoleAttribute(groupRoleAttribute);
+		defaultAuthoritiesPopulator.setGroupSearchFilter(groupSearchFilter);
 
-        this.ldapAuthoritiesPopulator = defaultAuthoritiesPopulator;
-        return defaultAuthoritiesPopulator;
-    }
+		this.ldapAuthoritiesPopulator = defaultAuthoritiesPopulator;
+		return defaultAuthoritiesPopulator;
+	}
 
-    /**
-     * Creates the {@link LdapAuthenticator} to use
-     *
-     * @param contextSource the {@link BaseLdapPathContextSource} to use
-     * @return the {@link LdapAuthenticator} to use
-     */
-    private LdapAuthenticator createLdapAuthenticator(BaseLdapPathContextSource contextSource) {
-        AbstractLdapAuthenticator ldapAuthenticator = passwordEncoder == null ? createBindAuthenticator(contextSource) : createPasswordCompareAuthenticator(contextSource);
-        LdapUserSearch userSearch = createUserSearch();
-        if(userSearch != null) {
-            ldapAuthenticator.setUserSearch(userSearch);
-        }
-        if(userDnPatterns != null && userDnPatterns.length > 0) {
-            ldapAuthenticator.setUserDnPatterns(userDnPatterns);
-        }
-        return postProcess(ldapAuthenticator);
-    }
+	/**
+	 * Creates the {@link LdapAuthenticator} to use
+	 *
+	 * @param contextSource the {@link BaseLdapPathContextSource} to use
+	 * @return the {@link LdapAuthenticator} to use
+	 */
+	private LdapAuthenticator createLdapAuthenticator(
+			BaseLdapPathContextSource contextSource) {
+		AbstractLdapAuthenticator ldapAuthenticator = passwordEncoder == null ? createBindAuthenticator(contextSource)
+				: createPasswordCompareAuthenticator(contextSource);
+		LdapUserSearch userSearch = createUserSearch();
+		if (userSearch != null) {
+			ldapAuthenticator.setUserSearch(userSearch);
+		}
+		if (userDnPatterns != null && userDnPatterns.length > 0) {
+			ldapAuthenticator.setUserDnPatterns(userDnPatterns);
+		}
+		return postProcess(ldapAuthenticator);
+	}
 
-    /**
-     * Creates {@link PasswordComparisonAuthenticator}
-     *
-     * @param contextSource the {@link BaseLdapPathContextSource} to use
-     * @return
-     */
-    private PasswordComparisonAuthenticator createPasswordCompareAuthenticator(BaseLdapPathContextSource contextSource) {
-        PasswordComparisonAuthenticator ldapAuthenticator = new PasswordComparisonAuthenticator(contextSource);
-        if(passwordAttribute != null) {
-            ldapAuthenticator.setPasswordAttributeName(passwordAttribute);
-        }
-        ldapAuthenticator.setPasswordEncoder(passwordEncoder);
-        return ldapAuthenticator;
-    }
+	/**
+	 * Creates {@link PasswordComparisonAuthenticator}
+	 *
+	 * @param contextSource the {@link BaseLdapPathContextSource} to use
+	 * @return
+	 */
+	private PasswordComparisonAuthenticator createPasswordCompareAuthenticator(
+			BaseLdapPathContextSource contextSource) {
+		PasswordComparisonAuthenticator ldapAuthenticator = new PasswordComparisonAuthenticator(
+				contextSource);
+		if (passwordAttribute != null) {
+			ldapAuthenticator.setPasswordAttributeName(passwordAttribute);
+		}
+		ldapAuthenticator.setPasswordEncoder(passwordEncoder);
+		return ldapAuthenticator;
+	}
 
-    /**
-     * Creates a {@link BindAuthenticator}
-     *
-     * @param contextSource the {@link BaseLdapPathContextSource} to use
-     * @return the {@link BindAuthenticator} to use
-     */
-    private BindAuthenticator createBindAuthenticator(
-            BaseLdapPathContextSource contextSource) {
-        return new BindAuthenticator(contextSource);
-    }
+	/**
+	 * Creates a {@link BindAuthenticator}
+	 *
+	 * @param contextSource the {@link BaseLdapPathContextSource} to use
+	 * @return the {@link BindAuthenticator} to use
+	 */
+	private BindAuthenticator createBindAuthenticator(
+			BaseLdapPathContextSource contextSource) {
+		return new BindAuthenticator(contextSource);
+	}
 
-    private LdapUserSearch createUserSearch() {
-        if(userSearchFilter == null) {
-            return null;
-        }
-        return new FilterBasedLdapUserSearch(userSearchBase, userSearchFilter, contextSource);
-    }
+	private LdapUserSearch createUserSearch() {
+		if (userSearchFilter == null) {
+			return null;
+		}
+		return new FilterBasedLdapUserSearch(userSearchBase, userSearchFilter,
+				contextSource);
+	}
 
-    /**
-     * Specifies the {@link BaseLdapPathContextSource} to be used. If not
-     * specified, an embedded LDAP server will be created using
-     * {@link #contextSource()}.
-     *
-     * @param contextSource
-     *            the {@link BaseLdapPathContextSource} to use
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further
-     *         customizations
-     * @see #contextSource()
-     */
-    public LdapAuthenticationProviderConfigurer<B> contextSource(BaseLdapPathContextSource contextSource) {
-        this.contextSource = contextSource;
-        return this;
-    }
+	/**
+	 * Specifies the {@link BaseLdapPathContextSource} to be used. If not specified, an
+	 * embedded LDAP server will be created using {@link #contextSource()}.
+	 *
+	 * @param contextSource the {@link BaseLdapPathContextSource} to use
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 * @see #contextSource()
+	 */
+	public LdapAuthenticationProviderConfigurer<B> contextSource(
+			BaseLdapPathContextSource contextSource) {
+		this.contextSource = contextSource;
+		return this;
+	}
 
-    /**
-     * Allows easily configuring of a {@link BaseLdapPathContextSource} with
-     * defaults pointing to an embedded LDAP server that is created.
-     *
-     * @return the {@link ContextSourceBuilder} for further customizations
-     */
-    public ContextSourceBuilder contextSource() {
-        return contextSourceBuilder;
-    }
+	/**
+	 * Allows easily configuring of a {@link BaseLdapPathContextSource} with defaults
+	 * pointing to an embedded LDAP server that is created.
+	 *
+	 * @return the {@link ContextSourceBuilder} for further customizations
+	 */
+	public ContextSourceBuilder contextSource() {
+		return contextSourceBuilder;
+	}
 
-    /**
-     * Specifies the {@link PasswordEncoder} to be used when authenticating with
-     * password comparison.
-     *
-     * @param passwordEncoder the {@link PasswordEncoder} to use
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customization
-     * @deprecated Use {@link #passwordEncoder(org.springframework.security.crypto.password.PasswordEncoder)} instead
-     */
-    public LdapAuthenticationProviderConfigurer<B> passwordEncoder(PasswordEncoder passwordEncoder) {
-        this.passwordEncoder = passwordEncoder;
-        return this;
-    }
+	/**
+	 * Specifies the {@link PasswordEncoder} to be used when authenticating with password
+	 * comparison.
+	 *
+	 * @param passwordEncoder the {@link PasswordEncoder} to use
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customization
+	 * @deprecated Use
+	 * {@link #passwordEncoder(org.springframework.security.crypto.password.PasswordEncoder)}
+	 * instead
+	 */
+	public LdapAuthenticationProviderConfigurer<B> passwordEncoder(
+			PasswordEncoder passwordEncoder) {
+		this.passwordEncoder = passwordEncoder;
+		return this;
+	}
 
-    /**
-     * Specifies the {@link org.springframework.security.crypto.password.PasswordEncoder} to be used when authenticating with
-     * password comparison.
-     *
-     * @param passwordEncoder the {@link org.springframework.security.crypto.password.PasswordEncoder} to use
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customization
-     */
-    public LdapAuthenticationProviderConfigurer<B> passwordEncoder(final org.springframework.security.crypto.password.PasswordEncoder passwordEncoder) {
-        Assert.notNull(passwordEncoder, "passwordEncoder must not be null.");
-        this.passwordEncoder = passwordEncoder;
-        return this;
-    }
+	/**
+	 * Specifies the {@link org.springframework.security.crypto.password.PasswordEncoder}
+	 * to be used when authenticating with password comparison.
+	 *
+	 * @param passwordEncoder the
+	 * {@link org.springframework.security.crypto.password.PasswordEncoder} to use
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customization
+	 */
+	public LdapAuthenticationProviderConfigurer<B> passwordEncoder(
+			final org.springframework.security.crypto.password.PasswordEncoder passwordEncoder) {
+		Assert.notNull(passwordEncoder, "passwordEncoder must not be null.");
+		this.passwordEncoder = passwordEncoder;
+		return this;
+	}
 
-    /**
-     * If your users are at a fixed location in the directory (i.e. you can work
-     * out the DN directly from the username without doing a directory search),
-     * you can use this attribute to map directly to the DN. It maps directly to
-     * the userDnPatterns property of AbstractLdapAuthenticator. The value is a
-     * specific pattern used to build the user's DN, for example
-     * "uid={0},ou=people". The key "{0}" must be present and will be
-     * substituted with the username.
-     *
-     * @param userDnPatterns the LDAP patterns for finding the usernames
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> userDnPatterns(String...userDnPatterns) {
-        this.userDnPatterns = userDnPatterns;
-        return this;
-    }
+	/**
+	 * If your users are at a fixed location in the directory (i.e. you can work out the
+	 * DN directly from the username without doing a directory search), you can use this
+	 * attribute to map directly to the DN. It maps directly to the userDnPatterns
+	 * property of AbstractLdapAuthenticator. The value is a specific pattern used to
+	 * build the user's DN, for example "uid={0},ou=people". The key "{0}" must be present
+	 * and will be substituted with the username.
+	 *
+	 * @param userDnPatterns the LDAP patterns for finding the usernames
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> userDnPatterns(
+			String... userDnPatterns) {
+		this.userDnPatterns = userDnPatterns;
+		return this;
+	}
 
-    /**
-     * Allows explicit customization of the loaded user object by specifying a
-     * UserDetailsContextMapper bean which will be called with the context
-     * information from the user's directory entry.
-     *
-     * @param userDetailsContextMapper the {@link UserDetailsContextMapper} to use
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further
-     *         customizations
-     *
-     * @see PersonContextMapper
-     * @see InetOrgPersonContextMapper
-     * @see LdapUserDetailsMapper
-     */
-    public LdapAuthenticationProviderConfigurer<B> userDetailsContextMapper(UserDetailsContextMapper userDetailsContextMapper) {
-        this.userDetailsContextMapper = userDetailsContextMapper;
-        return this;
-    }
+	/**
+	 * Allows explicit customization of the loaded user object by specifying a
+	 * UserDetailsContextMapper bean which will be called with the context information
+	 * from the user's directory entry.
+	 *
+	 * @param userDetailsContextMapper the {@link UserDetailsContextMapper} to use
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 *
+	 * @see PersonContextMapper
+	 * @see InetOrgPersonContextMapper
+	 * @see LdapUserDetailsMapper
+	 */
+	public LdapAuthenticationProviderConfigurer<B> userDetailsContextMapper(
+			UserDetailsContextMapper userDetailsContextMapper) {
+		this.userDetailsContextMapper = userDetailsContextMapper;
+		return this;
+	}
 
-    /**
-     * Specifies the attribute name which contains the role name. Default is "cn".
-     * @param groupRoleAttribute the attribute name that maps a group to a role.
-     * @return
-     */
-    public LdapAuthenticationProviderConfigurer<B> groupRoleAttribute(String groupRoleAttribute) {
-        this.groupRoleAttribute = groupRoleAttribute;
-        return this;
-    }
+	/**
+	 * Specifies the attribute name which contains the role name. Default is "cn".
+	 * @param groupRoleAttribute the attribute name that maps a group to a role.
+	 * @return
+	 */
+	public LdapAuthenticationProviderConfigurer<B> groupRoleAttribute(
+			String groupRoleAttribute) {
+		this.groupRoleAttribute = groupRoleAttribute;
+		return this;
+	}
 
-    /**
-     * The search base for group membership searches. Defaults to "".
-     * @param groupSearchBase
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> groupSearchBase(String groupSearchBase) {
-        this.groupSearchBase = groupSearchBase;
-        return this;
-    }
+	/**
+	 * The search base for group membership searches. Defaults to "".
+	 * @param groupSearchBase
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> groupSearchBase(String groupSearchBase) {
+		this.groupSearchBase = groupSearchBase;
+		return this;
+	}
 
-    /**
-     * The LDAP filter to search for groups. Defaults to "(uniqueMember={0})".
-     * The substituted parameter is the DN of the user.
-     *
-     * @param groupSearchFilter the LDAP filter to search for groups
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> groupSearchFilter(String groupSearchFilter) {
-        this.groupSearchFilter = groupSearchFilter;
-        return this;
-    }
+	/**
+	 * The LDAP filter to search for groups. Defaults to "(uniqueMember={0})". The
+	 * substituted parameter is the DN of the user.
+	 *
+	 * @param groupSearchFilter the LDAP filter to search for groups
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> groupSearchFilter(
+			String groupSearchFilter) {
+		this.groupSearchFilter = groupSearchFilter;
+		return this;
+	}
 
-    /**
-     * A non-empty string prefix that will be added as a prefix to the existing
-     * roles. The default is "ROLE_".
-     *
-     * @param rolePrefix the prefix to be added to the roles that are loaded.
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     * @see SimpleAuthorityMapper#setPrefix(String)
-     */
-    public LdapAuthenticationProviderConfigurer<B> rolePrefix(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-        return this;
-    }
-    /**
-     * Search base for user searches. Defaults to "". Only used with {@link #userSearchFilter(String)}.
-     *
-     * @param userSearchBase search base for user searches
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> userSearchBase(String userSearchBase) {
-        this.userSearchBase = userSearchBase;
-        return this;
-    }
+	/**
+	 * A non-empty string prefix that will be added as a prefix to the existing roles. The
+	 * default is "ROLE_".
+	 *
+	 * @param rolePrefix the prefix to be added to the roles that are loaded.
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 * @see SimpleAuthorityMapper#setPrefix(String)
+	 */
+	public LdapAuthenticationProviderConfigurer<B> rolePrefix(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+		return this;
+	}
 
-    /**
-     * The LDAP filter used to search for users (optional). For example
-     * "(uid={0})". The substituted parameter is the user's login name.
-     *
-     * @param userSearchFilter
-     *            the LDAP filter used to search for users
-     * @return the {@link LdapAuthenticationProviderConfigurer} for further
-     *         customizations
-     */
-    public LdapAuthenticationProviderConfigurer<B> userSearchFilter(String userSearchFilter) {
-        this.userSearchFilter = userSearchFilter;
-        return this;
-    }
+	/**
+	 * Search base for user searches. Defaults to "". Only used with
+	 * {@link #userSearchFilter(String)}.
+	 *
+	 * @param userSearchBase search base for user searches
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> userSearchBase(String userSearchBase) {
+		this.userSearchBase = userSearchBase;
+		return this;
+	}
 
-    @Override
-    public void configure(B builder) throws Exception {
-        LdapAuthenticationProvider provider = postProcess(build());
-        builder.authenticationProvider(provider);
-    }
+	/**
+	 * The LDAP filter used to search for users (optional). For example "(uid={0})". The
+	 * substituted parameter is the user's login name.
+	 *
+	 * @param userSearchFilter the LDAP filter used to search for users
+	 * @return the {@link LdapAuthenticationProviderConfigurer} for further customizations
+	 */
+	public LdapAuthenticationProviderConfigurer<B> userSearchFilter(
+			String userSearchFilter) {
+		this.userSearchFilter = userSearchFilter;
+		return this;
+	}
 
-    /**
-     * Sets up Password based comparison
-     *
-     * @author Rob Winch
-     */
-    public final class PasswordCompareConfigurer {
+	@Override
+	public void configure(B builder) throws Exception {
+		LdapAuthenticationProvider provider = postProcess(build());
+		builder.authenticationProvider(provider);
+	}
 
-        /**
-         * Allows specifying the {@link PasswordEncoder} to use. The default is {@link PlaintextPasswordEncoder}.
-         * @param passwordEncoder the {@link PasswordEncoder} to use
-         * @return the {@link PasswordEncoder} to use
-         */
-        public PasswordCompareConfigurer passwordEncoder(PasswordEncoder passwordEncoder) {
-            LdapAuthenticationProviderConfigurer.this.passwordEncoder = passwordEncoder;
-            return this;
-        }
+	/**
+	 * Sets up Password based comparison
+	 *
+	 * @author Rob Winch
+	 */
+	public final class PasswordCompareConfigurer {
 
-        /**
-         * The attribute in the directory which contains the user password. Defaults to "userPassword".
-         *
-         * @param passwordAttribute the attribute in the directory which contains the user password
-         * @return the {@link PasswordCompareConfigurer} for further customizations
-         */
-        public PasswordCompareConfigurer passwordAttribute(String passwordAttribute) {
-            LdapAuthenticationProviderConfigurer.this.passwordAttribute = passwordAttribute;
-            return this;
-        }
+		/**
+		 * Allows specifying the {@link PasswordEncoder} to use. The default is
+		 * {@link PlaintextPasswordEncoder}.
+		 * @param passwordEncoder the {@link PasswordEncoder} to use
+		 * @return the {@link PasswordEncoder} to use
+		 */
+		public PasswordCompareConfigurer passwordEncoder(PasswordEncoder passwordEncoder) {
+			LdapAuthenticationProviderConfigurer.this.passwordEncoder = passwordEncoder;
+			return this;
+		}
 
-        /**
-         * Allows obtaining a reference to the
-         * {@link LdapAuthenticationProviderConfigurer} for further
-         * customizations
-         *
-         * @return attribute in the directory which contains the user password
-         */
-        public LdapAuthenticationProviderConfigurer<B> and() {
-            return LdapAuthenticationProviderConfigurer.this;
-        }
+		/**
+		 * The attribute in the directory which contains the user password. Defaults to
+		 * "userPassword".
+		 *
+		 * @param passwordAttribute the attribute in the directory which contains the user
+		 * password
+		 * @return the {@link PasswordCompareConfigurer} for further customizations
+		 */
+		public PasswordCompareConfigurer passwordAttribute(String passwordAttribute) {
+			LdapAuthenticationProviderConfigurer.this.passwordAttribute = passwordAttribute;
+			return this;
+		}
 
-        private PasswordCompareConfigurer() {}
-    }
+		/**
+		 * Allows obtaining a reference to the
+		 * {@link LdapAuthenticationProviderConfigurer} for further customizations
+		 *
+		 * @return attribute in the directory which contains the user password
+		 */
+		public LdapAuthenticationProviderConfigurer<B> and() {
+			return LdapAuthenticationProviderConfigurer.this;
+		}
 
-    /**
-     * Allows building a {@link BaseLdapPathContextSource} and optionally
-     * creating an embedded LDAP instance.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public final class ContextSourceBuilder {
-        private String ldif = "classpath*:*.ldif";
-        private String managerPassword;
-        private String managerDn;
-        private Integer port;
-        private static final int DEFAULT_PORT = 33389;
-        private String root = "dc=springframework,dc=org";
-        private String url;
+		private PasswordCompareConfigurer() {
+		}
+	}
 
-        /**
-         * Specifies an ldif to load at startup for an embedded LDAP server.
-         * This only loads if using an embedded instance. The default is
-         * "classpath*:*.ldif".
-         *
-         * @param ldif
-         *            the ldif to load at startup for an embedded LDAP server.
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder ldif(String ldif) {
-            this.ldif = ldif;
-            return this;
-        }
+	/**
+	 * Allows building a {@link BaseLdapPathContextSource} and optionally creating an
+	 * embedded LDAP instance.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public final class ContextSourceBuilder {
+		private String ldif = "classpath*:*.ldif";
+		private String managerPassword;
+		private String managerDn;
+		private Integer port;
+		private static final int DEFAULT_PORT = 33389;
+		private String root = "dc=springframework,dc=org";
+		private String url;
 
-        /**
-         * Username (DN) of the "manager" user identity (i.e.
-         * "uid=admin,ou=system") which will be used to authenticate to a
-         * (non-embedded) LDAP server. If omitted, anonymous access will be
-         * used.
-         *
-         * @param managerDn
-         *            the username (DN) of the "manager" user identity used to
-         *            authenticate to a LDAP server.
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder managerDn(String managerDn) {
-            this.managerDn = managerDn;
-            return this;
-        }
+		/**
+		 * Specifies an ldif to load at startup for an embedded LDAP server. This only
+		 * loads if using an embedded instance. The default is "classpath*:*.ldif".
+		 *
+		 * @param ldif the ldif to load at startup for an embedded LDAP server.
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder ldif(String ldif) {
+			this.ldif = ldif;
+			return this;
+		}
 
-        /**
-         * The password for the manager DN. This is required if the manager-dn is specified.
-         * @param managerPassword password for the manager DN
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder managerPassword(String managerPassword) {
-            this.managerPassword  = managerPassword;
-            return this;
-        }
+		/**
+		 * Username (DN) of the "manager" user identity (i.e. "uid=admin,ou=system") which
+		 * will be used to authenticate to a (non-embedded) LDAP server. If omitted,
+		 * anonymous access will be used.
+		 *
+		 * @param managerDn the username (DN) of the "manager" user identity used to
+		 * authenticate to a LDAP server.
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder managerDn(String managerDn) {
+			this.managerDn = managerDn;
+			return this;
+		}
 
-        /**
-         * The port to connect to LDAP to (the default is 33389 or random available port if unavailable).
-         * @param port the port to connect to
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder port(int port) {
-            this.port = port;
-            return this;
-        }
+		/**
+		 * The password for the manager DN. This is required if the manager-dn is
+		 * specified.
+		 * @param managerPassword password for the manager DN
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder managerPassword(String managerPassword) {
+			this.managerPassword = managerPassword;
+			return this;
+		}
 
-        /**
-         * Optional root suffix for the embedded LDAP server. Default is
-         * "dc=springframework,dc=org"
-         *
-         * @param root
-         *            root suffix for the embedded LDAP server
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder root(String root) {
-            this.root  = root;
-            return this;
-        }
+		/**
+		 * The port to connect to LDAP to (the default is 33389 or random available port
+		 * if unavailable).
+		 * @param port the port to connect to
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder port(int port) {
+			this.port = port;
+			return this;
+		}
 
-        /**
-         * Specifies the ldap server URL when not using the embedded LDAP
-         * server. For example, "ldaps://ldap.example.com:33389/dc=myco,dc=org".
-         *
-         * @param url
-         *            the ldap server URL
-         * @return the {@link ContextSourceBuilder} for further customization
-         */
-        public ContextSourceBuilder url(String url) {
-            this.url  = url;
-            return this;
-        }
+		/**
+		 * Optional root suffix for the embedded LDAP server. Default is
+		 * "dc=springframework,dc=org"
+		 *
+		 * @param root root suffix for the embedded LDAP server
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder root(String root) {
+			this.root = root;
+			return this;
+		}
 
-        /**
-         * Gets the {@link LdapAuthenticationProviderConfigurer} for further
-         * customizations
-         *
-         * @return the {@link LdapAuthenticationProviderConfigurer} for further
-         *         customizations
-         */
-        public LdapAuthenticationProviderConfigurer<B> and() {
-            return LdapAuthenticationProviderConfigurer.this;
-        }
+		/**
+		 * Specifies the ldap server URL when not using the embedded LDAP server. For
+		 * example, "ldaps://ldap.example.com:33389/dc=myco,dc=org".
+		 *
+		 * @param url the ldap server URL
+		 * @return the {@link ContextSourceBuilder} for further customization
+		 */
+		public ContextSourceBuilder url(String url) {
+			this.url = url;
+			return this;
+		}
 
-        private DefaultSpringSecurityContextSource build() throws Exception {
-            DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(getProviderUrl());
-            if(managerDn != null) {
-                contextSource.setUserDn(managerDn);
-                if(managerPassword == null) {
-                    throw new IllegalStateException("managerPassword is required if managerDn is supplied");
-                }
-                contextSource.setPassword(managerPassword);
-            }
-            contextSource = postProcess(contextSource);
-            if(url != null) {
-                return contextSource;
-            }
-            ApacheDSContainer apacheDsContainer = new ApacheDSContainer(root, ldif);
-            apacheDsContainer.setPort(getPort());
-            postProcess(apacheDsContainer);
-            return contextSource;
-        }
+		/**
+		 * Gets the {@link LdapAuthenticationProviderConfigurer} for further
+		 * customizations
+		 *
+		 * @return the {@link LdapAuthenticationProviderConfigurer} for further
+		 * customizations
+		 */
+		public LdapAuthenticationProviderConfigurer<B> and() {
+			return LdapAuthenticationProviderConfigurer.this;
+		}
 
-        private int getPort() {
-            if(port == null) {
-                port = getDefaultPort();
-            }
-            return port;
-        }
+		private DefaultSpringSecurityContextSource build() throws Exception {
+			DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
+					getProviderUrl());
+			if (managerDn != null) {
+				contextSource.setUserDn(managerDn);
+				if (managerPassword == null) {
+					throw new IllegalStateException(
+							"managerPassword is required if managerDn is supplied");
+				}
+				contextSource.setPassword(managerPassword);
+			}
+			contextSource = postProcess(contextSource);
+			if (url != null) {
+				return contextSource;
+			}
+			ApacheDSContainer apacheDsContainer = new ApacheDSContainer(root, ldif);
+			apacheDsContainer.setPort(getPort());
+			postProcess(apacheDsContainer);
+			return contextSource;
+		}
 
-        private int getDefaultPort() {
-            ServerSocket serverSocket = null;
-            try {
-                try {
-                    serverSocket = new ServerSocket(DEFAULT_PORT);
-                } catch (IOException e) {
-                    try {
-                        serverSocket = new ServerSocket(0);
-                    } catch(IOException e2) {
-                        return DEFAULT_PORT;
-                    }
-                }
-                return serverSocket.getLocalPort();
-            } finally {
-                if(serverSocket != null) {
-                    try {
-                        serverSocket.close();
-                    } catch (IOException e) {}
-                }
-            }
-        }
+		private int getPort() {
+			if (port == null) {
+				port = getDefaultPort();
+			}
+			return port;
+		}
 
-        private String getProviderUrl() {
-            if(url == null) {
-                return "ldap://127.0.0.1:" + getPort() + "/" + root;
-            }
-            return url;
-        }
+		private int getDefaultPort() {
+			ServerSocket serverSocket = null;
+			try {
+				try {
+					serverSocket = new ServerSocket(DEFAULT_PORT);
+				}
+				catch (IOException e) {
+					try {
+						serverSocket = new ServerSocket(0);
+					}
+					catch (IOException e2) {
+						return DEFAULT_PORT;
+					}
+				}
+				return serverSocket.getLocalPort();
+			}
+			finally {
+				if (serverSocket != null) {
+					try {
+						serverSocket.close();
+					}
+					catch (IOException e) {
+					}
+				}
+			}
+		}
 
-        private ContextSourceBuilder() {}
-    }
+		private String getProviderUrl() {
+			if (url == null) {
+				return "ldap://127.0.0.1:" + getPort() + "/" + root;
+			}
+			return url;
+		}
 
-    private BaseLdapPathContextSource getContextSource() throws Exception {
-        if(contextSource == null) {
-            contextSource = contextSourceBuilder.build();
-        }
-        return contextSource;
-    }
+		private ContextSourceBuilder() {
+		}
+	}
 
-    /**
-     * @return
-     */
-    public PasswordCompareConfigurer passwordCompare() {
-        return new PasswordCompareConfigurer()
-            .passwordAttribute("password")
-            .passwordEncoder(new PlaintextPasswordEncoder());
-    }
+	private BaseLdapPathContextSource getContextSource() throws Exception {
+		if (contextSource == null) {
+			contextSource = contextSourceBuilder.build();
+		}
+		return contextSource;
+	}
+
+	/**
+	 * @return
+	 */
+	public PasswordCompareConfigurer passwordCompare() {
+		return new PasswordCompareConfigurer().passwordAttribute("password")
+				.passwordEncoder(new PlaintextPasswordEncoder());
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java
index f35804a27d..2aa384e206 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java
@@ -22,21 +22,23 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 /**
- * Configures an {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder} to
- * have in memory authentication. It also allows easily adding users to the in memory authentication.
+ * Configures an
+ * {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder}
+ * to have in memory authentication. It also allows easily adding users to the in memory
+ * authentication.
  *
  * @param <B> the type of the {@link SecurityBuilder} that is being configured
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class InMemoryUserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>> extends
-        UserDetailsManagerConfigurer<B,InMemoryUserDetailsManagerConfigurer<B>> {
+public class InMemoryUserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>>
+		extends UserDetailsManagerConfigurer<B, InMemoryUserDetailsManagerConfigurer<B>> {
 
-    /**
-     * Creates a new instance
-     */
-    public InMemoryUserDetailsManagerConfigurer() {
-        super(new InMemoryUserDetailsManager(new ArrayList<UserDetails>()));
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public InMemoryUserDetailsManagerConfigurer() {
+		super(new InMemoryUserDetailsManager(new ArrayList<UserDetails>()));
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java
index 181317fb96..b47fc8e082 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java
@@ -30,12 +30,14 @@ import org.springframework.security.core.userdetails.UserCache;
 import org.springframework.security.provisioning.JdbcUserDetailsManager;
 
 /**
- * Configures an {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder} to
- * have JDBC authentication. It also allows easily adding users to the database used for authentication and setting up
- * the schema.
+ * Configures an
+ * {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder}
+ * to have JDBC authentication. It also allows easily adding users to the database used
+ * for authentication and setting up the schema.
  *
  * <p>
- * The only required method is the {@link #dataSource(javax.sql.DataSource)} all other methods have reasonable defaults.
+ * The only required method is the {@link #dataSource(javax.sql.DataSource)} all other
+ * methods have reasonable defaults.
  * </p>
  *
  * @param <B> the type of the {@link ProviderManagerBuilder} that is being configured
@@ -43,150 +45,161 @@ import org.springframework.security.provisioning.JdbcUserDetailsManager;
  * @author Rob Winch
  * @since 3.2
  */
-public class JdbcUserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>> extends
-        UserDetailsManagerConfigurer<B,JdbcUserDetailsManagerConfigurer<B>> {
+public class JdbcUserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>>
+		extends UserDetailsManagerConfigurer<B, JdbcUserDetailsManagerConfigurer<B>> {
 
-    private DataSource dataSource;
+	private DataSource dataSource;
 
-    private List<Resource> initScripts = new ArrayList<Resource>();
+	private List<Resource> initScripts = new ArrayList<Resource>();
 
-    public JdbcUserDetailsManagerConfigurer(JdbcUserDetailsManager manager) {
-        super(manager);
-    }
+	public JdbcUserDetailsManagerConfigurer(JdbcUserDetailsManager manager) {
+		super(manager);
+	}
 
-    public JdbcUserDetailsManagerConfigurer() {
-        this(new JdbcUserDetailsManager());
-    }
+	public JdbcUserDetailsManagerConfigurer() {
+		this(new JdbcUserDetailsManager());
+	}
 
+	/**
+	 * Populates the {@link DataSource} to be used. This is the only required attribute.
+	 *
+	 * @param dataSource the {@link DataSource} to be used. Cannot be null.
+	 * @return
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> dataSource(DataSource dataSource)
+			throws Exception {
+		this.dataSource = dataSource;
+		getUserDetailsService().setDataSource(dataSource);
+		return this;
+	}
 
-    /**
-     * Populates the {@link DataSource} to be used. This is the only required attribute.
-     *
-     * @param dataSource the {@link DataSource} to be used. Cannot be null.
-     * @return
-     * @throws Exception
-     */
-    public JdbcUserDetailsManagerConfigurer<B> dataSource(DataSource dataSource) throws Exception {
-        this.dataSource = dataSource;
-        getUserDetailsService().setDataSource(dataSource);
-        return this;
-    }
+	/**
+	 * Sets the query to be used for finding a user by their username. For example:
+	 *
+	 * <code>
+	 *     select username,password,enabled from users where username = ?
+	 * </code>
+	 * @param query The query to use for selecting the username, password, and if the user
+	 * is enabled by username. Must contain a single parameter for the username.
+	 * @return The {@link JdbcUserDetailsManagerRegistry} used for additional
+	 * customizations
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> usersByUsernameQuery(String query)
+			throws Exception {
+		getUserDetailsService().setUsersByUsernameQuery(query);
+		return this;
+	}
 
-    /**
-    * Sets the query to be used for finding a user by their username. For example:
-    *
-    * <code>
-    *     select username,password,enabled from users where username = ?
-    * </code>
-    * @param query  The query to use for selecting the username, password, and if the user is enabled by username.
-    *               Must contain a single parameter for the username.
-    * @return The {@link JdbcUserDetailsManagerRegistry} used for additional customizations
-    * @throws Exception
-    */
-    public JdbcUserDetailsManagerConfigurer<B> usersByUsernameQuery(String query) throws Exception {
-        getUserDetailsService().setUsersByUsernameQuery(query);
-        return this;
-    }
+	/**
+	 * Sets the query to be used for finding a user's authorities by their username. For
+	 * example:
+	 *
+	 * <code>
+	 *     select username,authority from authorities where username = ?
+	 * </code>
+	 *
+	 * @param query The query to use for selecting the username, authority by username.
+	 * Must contain a single parameter for the username.
+	 * @return The {@link JdbcUserDetailsManagerRegistry} used for additional
+	 * customizations
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> authoritiesByUsernameQuery(String query)
+			throws Exception {
+		getUserDetailsService().setAuthoritiesByUsernameQuery(query);
+		return this;
+	}
 
-    /**
-     * Sets the query to be used for finding a user's authorities by their username. For example:
-     *
-     * <code>
-     *     select username,authority from authorities where username = ?
-     * </code>
-     *
-     * @param query  The query to use for selecting the username, authority  by username.
-     *               Must contain a single parameter for the username.
-     * @return The {@link JdbcUserDetailsManagerRegistry} used for additional customizations
-     * @throws Exception
-     */
-    public JdbcUserDetailsManagerConfigurer<B> authoritiesByUsernameQuery(String query) throws Exception {
-        getUserDetailsService().setAuthoritiesByUsernameQuery(query);
-        return this;
-    }
+	/**
+	 * An SQL statement to query user's group authorities given a username. For example:
+	 *
+	 * <code>
+	 *     select
+	 *         g.id, g.group_name, ga.authority
+	 *     from
+	 *         groups g, group_members gm, group_authorities ga
+	 *     where
+	 *         gm.username = ? and g.id = ga.group_id and g.id = gm.group_id
+	 * </code>
+	 *
+	 * @param query The query to use for selecting the authorities by group. Must contain
+	 * a single parameter for the username.
+	 * @return The {@link JdbcUserDetailsManagerRegistry} used for additional
+	 * customizations
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> groupAuthoritiesByUsername(String query)
+			throws Exception {
+		JdbcUserDetailsManager userDetailsService = getUserDetailsService();
+		userDetailsService.setEnableGroups(true);
+		userDetailsService.setGroupAuthoritiesByUsernameQuery(query);
+		return this;
+	}
 
-    /**
-     * An SQL statement to query user's group authorities given a username. For example:
-     *
-     * <code>
-     *     select
-     *         g.id, g.group_name, ga.authority
-     *     from
-     *         groups g, group_members gm, group_authorities ga
-     *     where
-     *         gm.username = ? and g.id = ga.group_id and g.id = gm.group_id
-     * </code>
-     *
-     * @param query  The query to use for selecting the authorities by group.
-     *               Must contain a single parameter for the username.
-     * @return The {@link JdbcUserDetailsManagerRegistry} used for additional customizations
-     * @throws Exception
-     */
-    public JdbcUserDetailsManagerConfigurer<B> groupAuthoritiesByUsername(String query) throws Exception {
-        JdbcUserDetailsManager userDetailsService = getUserDetailsService();
-        userDetailsService.setEnableGroups(true);
-        userDetailsService.setGroupAuthoritiesByUsernameQuery(query);
-        return this;
-    }
+	/**
+	 * A non-empty string prefix that will be added to role strings loaded from persistent
+	 * storage (default is "").
+	 *
+	 * @param rolePrefix
+	 * @return
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> rolePrefix(String rolePrefix)
+			throws Exception {
+		getUserDetailsService().setRolePrefix(rolePrefix);
+		return this;
+	}
 
-    /**
-     * A non-empty string prefix that will be added to role strings loaded from persistent storage (default is "").
-     *
-     * @param rolePrefix
-     * @return
-     * @throws Exception
-     */
-    public JdbcUserDetailsManagerConfigurer<B> rolePrefix(String rolePrefix) throws Exception {
-        getUserDetailsService().setRolePrefix(rolePrefix);
-        return this;
-    }
+	/**
+	 * Defines the {@link UserCache} to use
+	 *
+	 * @param userCache the {@link UserCache} to use
+	 * @return the {@link JdbcUserDetailsManagerConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> userCache(UserCache userCache)
+			throws Exception {
+		getUserDetailsService().setUserCache(userCache);
+		return this;
+	}
 
+	@Override
+	protected void initUserDetailsService() throws Exception {
+		if (!initScripts.isEmpty()) {
+			getDataSourceInit().afterPropertiesSet();
+		}
+		super.initUserDetailsService();
+	}
 
-    /**
-     * Defines the {@link UserCache} to use
-     *
-     * @param userCache the {@link UserCache} to use
-     * @return the {@link JdbcUserDetailsManagerConfigurer} for further customizations
-     * @throws Exception
-     */
-    public JdbcUserDetailsManagerConfigurer<B> userCache(UserCache userCache) throws Exception {
-        getUserDetailsService().setUserCache(userCache);
-        return this;
-    }
+	@Override
+	public JdbcUserDetailsManager getUserDetailsService() {
+		return (JdbcUserDetailsManager) super.getUserDetailsService();
+	}
 
-    @Override
-    protected void initUserDetailsService() throws Exception {
-        if(!initScripts.isEmpty()) {
-            getDataSourceInit().afterPropertiesSet();
-        }
-        super.initUserDetailsService();
-    }
+	/**
+	 * Populates the default schema that allows users and authorities to be stored.
+	 *
+	 * @return The {@link JdbcUserDetailsManagerRegistry} used for additional
+	 * customizations
+	 */
+	public JdbcUserDetailsManagerConfigurer<B> withDefaultSchema() {
+		this.initScripts.add(new ClassPathResource(
+				"org/springframework/security/core/userdetails/jdbc/users.ddl"));
+		return this;
+	}
 
-    @Override
-    public JdbcUserDetailsManager getUserDetailsService() {
-        return (JdbcUserDetailsManager) super.getUserDetailsService();
-    }
+	protected DatabasePopulator getDatabasePopulator() {
+		ResourceDatabasePopulator dbp = new ResourceDatabasePopulator();
+		dbp.setScripts(initScripts.toArray(new Resource[initScripts.size()]));
+		return dbp;
+	}
 
-    /**
-     * Populates the default schema that allows users and authorities to be stored.
-     *
-     * @return The {@link JdbcUserDetailsManagerRegistry} used for additional customizations
-     */
-    public JdbcUserDetailsManagerConfigurer<B> withDefaultSchema() {
-        this.initScripts.add(new ClassPathResource("org/springframework/security/core/userdetails/jdbc/users.ddl"));
-        return this;
-    }
-
-    protected DatabasePopulator getDatabasePopulator() {
-        ResourceDatabasePopulator dbp = new ResourceDatabasePopulator();
-        dbp.setScripts(initScripts.toArray(new Resource[initScripts.size()]));
-        return dbp;
-    }
-
-    private DataSourceInitializer getDataSourceInit() {
-        DataSourceInitializer dsi = new DataSourceInitializer();
-        dsi.setDatabasePopulator(getDatabasePopulator());
-        dsi.setDataSource(dataSource);
-        return dsi;
-    }
+	private DataSourceInitializer getDataSourceInit() {
+		DataSourceInitializer dsi = new DataSourceInitializer();
+		dsi.setDatabasePopulator(getDatabasePopulator());
+		dsi.setDataSource(dataSource);
+		return dsi;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java
index 88be60e62d..92c02291de 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java
@@ -32,8 +32,8 @@ import org.springframework.util.Assert;
 
 /**
  * Base class for populating an
- * {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder} with a
- * {@link UserDetailsManager}.
+ * {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder}
+ * with a {@link UserDetailsManager}.
  *
  * @param <B> the type of the {@link SecurityBuilder} that is being configured
  * @param <C> the type of {@link UserDetailsManagerConfigurer}
@@ -41,223 +41,231 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  * @since 3.2
  */
-public class UserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>, C extends UserDetailsManagerConfigurer<B,C>> extends
-        UserDetailsServiceConfigurer<B,C,UserDetailsManager> {
+public class UserDetailsManagerConfigurer<B extends ProviderManagerBuilder<B>, C extends UserDetailsManagerConfigurer<B, C>>
+		extends UserDetailsServiceConfigurer<B, C, UserDetailsManager> {
 
-    private final List<UserDetailsBuilder> userBuilders = new ArrayList<UserDetailsBuilder>();
+	private final List<UserDetailsBuilder> userBuilders = new ArrayList<UserDetailsBuilder>();
 
-    protected UserDetailsManagerConfigurer(UserDetailsManager userDetailsManager) {
-        super(userDetailsManager);
-    }
+	protected UserDetailsManagerConfigurer(UserDetailsManager userDetailsManager) {
+		super(userDetailsManager);
+	}
 
-    /**
-     * Populates the users that have been added.
-     *
-     * @throws Exception
-     */
-    @Override
-    protected void initUserDetailsService() throws Exception {
-        for(UserDetailsBuilder userBuilder : userBuilders) {
-            getUserDetailsService().createUser(userBuilder.build());
-        }
-    }
+	/**
+	 * Populates the users that have been added.
+	 *
+	 * @throws Exception
+	 */
+	@Override
+	protected void initUserDetailsService() throws Exception {
+		for (UserDetailsBuilder userBuilder : userBuilders) {
+			getUserDetailsService().createUser(userBuilder.build());
+		}
+	}
 
-    /**
-     * Allows adding a user to the {@link UserDetailsManager} that is being created. This method can be invoked
-     * multiple times to add multiple users.
-     *
-     * @param username the username for the user being added. Cannot be null.
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public final UserDetailsBuilder withUser(String username) {
-        UserDetailsBuilder userBuilder = new UserDetailsBuilder((C)this);
-        userBuilder.username(username);
-        this.userBuilders.add(userBuilder);
-        return userBuilder;
-    }
+	/**
+	 * Allows adding a user to the {@link UserDetailsManager} that is being created. This
+	 * method can be invoked multiple times to add multiple users.
+	 *
+	 * @param username the username for the user being added. Cannot be null.
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public final UserDetailsBuilder withUser(String username) {
+		UserDetailsBuilder userBuilder = new UserDetailsBuilder((C) this);
+		userBuilder.username(username);
+		this.userBuilders.add(userBuilder);
+		return userBuilder;
+	}
 
-    /**
-     * Builds the user to be added. At minimum the username, password, and authorities should provided. The remaining
-     * attributes have reasonable defaults.
-     *
-     * @param <T> the type of {@link UserDetailsManagerConfigurer} to return for chaining methods.
-     */
-    public class UserDetailsBuilder {
-        private String username;
-        private String password;
-        private List<GrantedAuthority> authorities;
-        private boolean accountExpired;
-        private boolean accountLocked;
-        private boolean credentialsExpired;
-        private boolean disabled;
-        private final C builder;
+	/**
+	 * Builds the user to be added. At minimum the username, password, and authorities
+	 * should provided. The remaining attributes have reasonable defaults.
+	 *
+	 * @param <T> the type of {@link UserDetailsManagerConfigurer} to return for chaining
+	 * methods.
+	 */
+	public class UserDetailsBuilder {
+		private String username;
+		private String password;
+		private List<GrantedAuthority> authorities;
+		private boolean accountExpired;
+		private boolean accountLocked;
+		private boolean credentialsExpired;
+		private boolean disabled;
+		private final C builder;
 
-        /**
-         * Creates a new instance
-         * @param builder the builder to return
-         */
-        private UserDetailsBuilder(C builder) {
-            this.builder = builder;
-        }
+		/**
+		 * Creates a new instance
+		 * @param builder the builder to return
+		 */
+		private UserDetailsBuilder(C builder) {
+			this.builder = builder;
+		}
 
-        /**
-         * Returns the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add another user)
-         *
-         * @return the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add another user)
-         */
-        public C and() {
-            return builder;
-        }
+		/**
+		 * Returns the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add
+		 * another user)
+		 *
+		 * @return the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add
+		 * another user)
+		 */
+		public C and() {
+			return builder;
+		}
 
-        /**
-         * Populates the username. This attribute is required.
-         *
-         * @param username the username. Cannot be null.
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        private UserDetailsBuilder username(String username) {
-            Assert.notNull(username, "username cannot be null");
-            this.username = username;
-            return this;
-        }
+		/**
+		 * Populates the username. This attribute is required.
+		 *
+		 * @param username the username. Cannot be null.
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		private UserDetailsBuilder username(String username) {
+			Assert.notNull(username, "username cannot be null");
+			this.username = username;
+			return this;
+		}
 
-        /**
-         * Populates the password. This attribute is required.
-         *
-         * @param password the password. Cannot be null.
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder password(String password) {
-            Assert.notNull(password, "password cannot be null");
-            this.password = password;
-            return this;
-        }
+		/**
+		 * Populates the password. This attribute is required.
+		 *
+		 * @param password the password. Cannot be null.
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder password(String password) {
+			Assert.notNull(password, "password cannot be null");
+			this.password = password;
+			return this;
+		}
 
-        /**
-         * Populates the roles. This method is a shortcut for calling {@link #authorities(String...)}, but automatically
-         * prefixes each entry with "ROLE_". This means the following:
-         *
-         * <code>
-         *     builder.roles("USER","ADMIN");
-         * </code>
-         *
-         * is equivalent to
-         *
-         * <code>
-         *     builder.authorities("ROLE_USER","ROLE_ADMIN");
-         * </code>
-         *
-         * <p>This attribute is required, but can also be populated with {@link #authorities(String...)}.</p>
-         *
-         * @param roles the roles for this user (i.e. USER, ADMIN, etc). Cannot be null, contain null values or start
-         *              with "ROLE_"
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder roles(String... roles) {
-            List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
-            for(String role : roles) {
-                Assert.isTrue(!role.startsWith("ROLE_"), role + " cannot start with ROLE_ (it is automatically added)");
-                authorities.add(new SimpleGrantedAuthority("ROLE_"+role));
-            }
-            return authorities(authorities);
-        }
+		/**
+		 * Populates the roles. This method is a shortcut for calling
+		 * {@link #authorities(String...)}, but automatically prefixes each entry with
+		 * "ROLE_". This means the following:
+		 *
+		 * <code>
+		 *     builder.roles("USER","ADMIN");
+		 * </code>
+		 *
+		 * is equivalent to
+		 *
+		 * <code>
+		 *     builder.authorities("ROLE_USER","ROLE_ADMIN");
+		 * </code>
+		 *
+		 * <p>
+		 * This attribute is required, but can also be populated with
+		 * {@link #authorities(String...)}.
+		 * </p>
+		 *
+		 * @param roles the roles for this user (i.e. USER, ADMIN, etc). Cannot be null,
+		 * contain null values or start with "ROLE_"
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder roles(String... roles) {
+			List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(
+					roles.length);
+			for (String role : roles) {
+				Assert.isTrue(!role.startsWith("ROLE_"), role
+						+ " cannot start with ROLE_ (it is automatically added)");
+				authorities.add(new SimpleGrantedAuthority("ROLE_" + role));
+			}
+			return authorities(authorities);
+		}
 
-        /**
-         * Populates the authorities. This attribute is required.
-         *
-         * @param authorities the authorities for this user. Cannot be null, or contain null
-         *                    values
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         * @see #roles(String...)
-         */
-        public UserDetailsBuilder authorities(GrantedAuthority...authorities) {
-            return authorities(Arrays.asList(authorities));
-        }
+		/**
+		 * Populates the authorities. This attribute is required.
+		 *
+		 * @param authorities the authorities for this user. Cannot be null, or contain
+		 * null values
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 * @see #roles(String...)
+		 */
+		public UserDetailsBuilder authorities(GrantedAuthority... authorities) {
+			return authorities(Arrays.asList(authorities));
+		}
 
-        /**
-         * Populates the authorities. This attribute is required.
-         *
-         * @param authorities the authorities for this user. Cannot be null, or contain null
-         *                    values
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         * @see #roles(String...)
-         */
-        public UserDetailsBuilder authorities(List<? extends GrantedAuthority> authorities) {
-            this.authorities = new ArrayList<GrantedAuthority>(authorities);
-            return this;
-        }
+		/**
+		 * Populates the authorities. This attribute is required.
+		 *
+		 * @param authorities the authorities for this user. Cannot be null, or contain
+		 * null values
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 * @see #roles(String...)
+		 */
+		public UserDetailsBuilder authorities(List<? extends GrantedAuthority> authorities) {
+			this.authorities = new ArrayList<GrantedAuthority>(authorities);
+			return this;
+		}
 
-        /**
-         * Populates the authorities. This attribute is required.
-         *
-         * @param authorities the authorities for this user (i.e. ROLE_USER, ROLE_ADMIN, etc). Cannot be null, or contain null
-         *                    values
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         * @see #roles(String...)
-         */
-        public UserDetailsBuilder authorities(String... authorities) {
-            return authorities(AuthorityUtils.createAuthorityList(authorities));
-        }
+		/**
+		 * Populates the authorities. This attribute is required.
+		 *
+		 * @param authorities the authorities for this user (i.e. ROLE_USER, ROLE_ADMIN,
+		 * etc). Cannot be null, or contain null values
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 * @see #roles(String...)
+		 */
+		public UserDetailsBuilder authorities(String... authorities) {
+			return authorities(AuthorityUtils.createAuthorityList(authorities));
+		}
 
-        /**
-         * Defines if the account is expired or not. Default is false.
-         *
-         * @param accountExpired true if the account is expired, false otherwise
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder accountExpired(boolean accountExpired) {
-            this.accountExpired = accountExpired;
-            return this;
-        }
+		/**
+		 * Defines if the account is expired or not. Default is false.
+		 *
+		 * @param accountExpired true if the account is expired, false otherwise
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder accountExpired(boolean accountExpired) {
+			this.accountExpired = accountExpired;
+			return this;
+		}
 
-        /**
-         * Defines if the account is locked or not. Default is false.
-         *
-         * @param accountLocked true if the account is locked, false otherwise
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder accountLocked(boolean accountLocked) {
-            this.accountLocked = accountLocked;
-            return this;
-        }
+		/**
+		 * Defines if the account is locked or not. Default is false.
+		 *
+		 * @param accountLocked true if the account is locked, false otherwise
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder accountLocked(boolean accountLocked) {
+			this.accountLocked = accountLocked;
+			return this;
+		}
 
-        /**
-         * Defines if the credentials are expired or not. Default is false.
-         *
-         * @param credentialsExpired true if the credentials are expired, false otherwise
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder credentialsExpired(boolean credentialsExpired) {
-            this.credentialsExpired = credentialsExpired;
-            return this;
-        }
+		/**
+		 * Defines if the credentials are expired or not. Default is false.
+		 *
+		 * @param credentialsExpired true if the credentials are expired, false otherwise
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder credentialsExpired(boolean credentialsExpired) {
+			this.credentialsExpired = credentialsExpired;
+			return this;
+		}
 
+		/**
+		 * Defines if the account is disabled or not. Default is false.
+		 *
+		 * @param disabled true if the account is disabled, false otherwise
+		 * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate
+		 * additional attributes for this user)
+		 */
+		public UserDetailsBuilder disabled(boolean disabled) {
+			this.disabled = disabled;
+			return this;
+		}
 
-        /**
-         * Defines if the account is disabled or not. Default is false.
-         *
-         * @param disabled true if the account is disabled, false otherwise
-         * @return the {@link UserDetailsBuilder} for method chaining (i.e. to populate additional attributes for this
-         *         user)
-         */
-        public UserDetailsBuilder disabled(boolean disabled) {
-            this.disabled = disabled;
-            return this;
-        }
-
-        private UserDetails build() {
-            return new User(username, password, !disabled, !accountExpired,
-                    !credentialsExpired, !accountLocked, authorities);
-        }
-    }
+		private UserDetails build() {
+			return new User(username, password, !disabled, !accountExpired,
+					!credentialsExpired, !accountLocked, authorities);
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java
index cc30dd96a2..218042465c 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java
@@ -34,75 +34,77 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  * @param <U> The type of {@link UserDetailsService} that is being used
  *
  */
-abstract class AbstractDaoAuthenticationConfigurer<B extends ProviderManagerBuilder<B>, C extends AbstractDaoAuthenticationConfigurer<B,C,U>,U extends UserDetailsService> extends UserDetailsAwareConfigurer<B,U> {
-    private DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-    private final U userDetailsService;
+abstract class AbstractDaoAuthenticationConfigurer<B extends ProviderManagerBuilder<B>, C extends AbstractDaoAuthenticationConfigurer<B, C, U>, U extends UserDetailsService>
+		extends UserDetailsAwareConfigurer<B, U> {
+	private DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+	private final U userDetailsService;
 
-    /**
-     * Creates a new instance
-     *
-     * @param userDetailsService
-     */
-    protected AbstractDaoAuthenticationConfigurer(U userDetailsService) {
-        this.userDetailsService = userDetailsService;
-        provider.setUserDetailsService(userDetailsService);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param userDetailsService
+	 */
+	protected AbstractDaoAuthenticationConfigurer(U userDetailsService) {
+		this.userDetailsService = userDetailsService;
+		provider.setUserDetailsService(userDetailsService);
+	}
 
-    /**
-     * Adds an {@link ObjectPostProcessor} for this class.
-     *
-     * @param objectPostProcessor
-     * @return the {@link AbstractDaoAuthenticationConfigurer} for further customizations
-     */
-    @SuppressWarnings("unchecked")
-    public C withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-        addObjectPostProcessor(objectPostProcessor);
-        return (C) this;
-    }
+	/**
+	 * Adds an {@link ObjectPostProcessor} for this class.
+	 *
+	 * @param objectPostProcessor
+	 * @return the {@link AbstractDaoAuthenticationConfigurer} for further customizations
+	 */
+	@SuppressWarnings("unchecked")
+	public C withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
+		addObjectPostProcessor(objectPostProcessor);
+		return (C) this;
+	}
 
-    /**
-     * Allows specifying the {@link PasswordEncoder} to use with the {@link DaoAuthenticationProvider}. The default is
-     * is to use plain text.
-     *
-     * @param passwordEncoder The {@link PasswordEncoder} to use.
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public C passwordEncoder(PasswordEncoder passwordEncoder) {
-        provider.setPasswordEncoder(passwordEncoder);
-        return (C) this;
-    }
+	/**
+	 * Allows specifying the {@link PasswordEncoder} to use with the
+	 * {@link DaoAuthenticationProvider}. The default is is to use plain text.
+	 *
+	 * @param passwordEncoder The {@link PasswordEncoder} to use.
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public C passwordEncoder(PasswordEncoder passwordEncoder) {
+		provider.setPasswordEncoder(passwordEncoder);
+		return (C) this;
+	}
 
-    /**
-     * Allows specifying the
-     * {@link org.springframework.security.authentication.encoding.PasswordEncoder}
-     * to use with the {@link DaoAuthenticationProvider}. The default is is to
-     * use plain text.
-     *
-     * @param passwordEncoder
-     *            The
-     *            {@link org.springframework.security.authentication.encoding.PasswordEncoder}
-     *            to use.
-     * @return the {@link SecurityConfigurer} for further customizations
-     */
-    @SuppressWarnings("unchecked")
-    public C passwordEncoder(org.springframework.security.authentication.encoding.PasswordEncoder passwordEncoder) {
-        provider.setPasswordEncoder(passwordEncoder);
-        return (C) this;
-    }
+	/**
+	 * Allows specifying the
+	 * {@link org.springframework.security.authentication.encoding.PasswordEncoder} to use
+	 * with the {@link DaoAuthenticationProvider}. The default is is to use plain text.
+	 *
+	 * @param passwordEncoder The
+	 * {@link org.springframework.security.authentication.encoding.PasswordEncoder} to
+	 * use.
+	 * @return the {@link SecurityConfigurer} for further customizations
+	 */
+	@SuppressWarnings("unchecked")
+	public C passwordEncoder(
+			org.springframework.security.authentication.encoding.PasswordEncoder passwordEncoder) {
+		provider.setPasswordEncoder(passwordEncoder);
+		return (C) this;
+	}
 
-    @Override
-    public void configure(B builder) throws Exception {
-        provider = postProcess(provider);
-        builder.authenticationProvider(provider);
-    }
+	@Override
+	public void configure(B builder) throws Exception {
+		provider = postProcess(provider);
+		builder.authenticationProvider(provider);
+	}
 
-    /**
-     * Gets the {@link UserDetailsService} that is used with the {@link DaoAuthenticationProvider}
-     *
-     * @return the {@link UserDetailsService} that is used with the {@link DaoAuthenticationProvider}
-     */
-    public U getUserDetailsService() {
-        return userDetailsService;
-    }
+	/**
+	 * Gets the {@link UserDetailsService} that is used with the
+	 * {@link DaoAuthenticationProvider}
+	 *
+	 * @return the {@link UserDetailsService} that is used with the
+	 * {@link DaoAuthenticationProvider}
+	 */
+	public U getUserDetailsService() {
+		return userDetailsService;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/DaoAuthenticationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/DaoAuthenticationConfigurer.java
index 241d7545b3..1ec228b430 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/DaoAuthenticationConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/DaoAuthenticationConfigurer.java
@@ -20,22 +20,24 @@ import org.springframework.security.config.annotation.authentication.ProviderMan
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 /**
-* Allows configuring a {@link DaoAuthenticationProvider}
-*
-* @author Rob Winch
-* @since 3.2
-*
-* @param <B> The type of {@link ProviderManagerBuilder} this is
-* @param <U> The type of {@link UserDetailsService} that is being used
-*
-*/
-public class DaoAuthenticationConfigurer<B extends ProviderManagerBuilder<B>, U extends UserDetailsService> extends AbstractDaoAuthenticationConfigurer<B,DaoAuthenticationConfigurer<B,U>, U>{
+ * Allows configuring a {@link DaoAuthenticationProvider}
+ *
+ * @author Rob Winch
+ * @since 3.2
+ *
+ * @param <B> The type of {@link ProviderManagerBuilder} this is
+ * @param <U> The type of {@link UserDetailsService} that is being used
+ *
+ */
+public class DaoAuthenticationConfigurer<B extends ProviderManagerBuilder<B>, U extends UserDetailsService>
+		extends
+		AbstractDaoAuthenticationConfigurer<B, DaoAuthenticationConfigurer<B, U>, U> {
 
-    /**
-     * Creates a new instance
-     * @param userDetailsService
-     */
-    public DaoAuthenticationConfigurer(U userDetailsService) {
-        super(userDetailsService);
-    }
+	/**
+	 * Creates a new instance
+	 * @param userDetailsService
+	 */
+	public DaoAuthenticationConfigurer(U userDetailsService) {
+		super(userDetailsService);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsAwareConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsAwareConfigurer.java
index df19842056..8cd1852336 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsAwareConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsAwareConfigurer.java
@@ -22,18 +22,20 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 /**
- * Base class that allows access to the {@link UserDetailsService} for using as a default value with {@link AuthenticationManagerBuilder}.
+ * Base class that allows access to the {@link UserDetailsService} for using as a default
+ * value with {@link AuthenticationManagerBuilder}.
  *
  * @author Rob Winch
  *
  * @param <B> the type of the {@link ProviderManagerBuilder}
  * @param <U> the type of {@link UserDetailsService}
  */
-public abstract class UserDetailsAwareConfigurer<B extends ProviderManagerBuilder<B>, U extends UserDetailsService> extends SecurityConfigurerAdapter<AuthenticationManager,B> {
+public abstract class UserDetailsAwareConfigurer<B extends ProviderManagerBuilder<B>, U extends UserDetailsService>
+		extends SecurityConfigurerAdapter<AuthenticationManager, B> {
 
-    /**
-     * Gets the {@link UserDetailsService} or null if it is not available
-     * @return the {@link UserDetailsService} or null if it is not available
-     */
-    public abstract U getUserDetailsService();
+	/**
+	 * Gets the {@link UserDetailsService} or null if it is not available
+	 * @return the {@link UserDetailsService} or null if it is not available
+	 */
+	public abstract U getUserDetailsService();
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java
index c37c49bd03..f29174b59a 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java
@@ -21,38 +21,39 @@ import org.springframework.security.config.annotation.authentication.builders.Au
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 /**
- * Allows configuring a {@link UserDetailsService} within a {@link AuthenticationManagerBuilder}.
+ * Allows configuring a {@link UserDetailsService} within a
+ * {@link AuthenticationManagerBuilder}.
  *
  * @author Rob Winch
  * @since 3.2
  *
  * @param <B> the type of the {@link SecurityBuilder}
  * @param <C> the {@link SecurityConfigurer} (or this)
- * @param <U> the type of UserDetailsService being used to allow for returning the concrete UserDetailsService.
+ * @param <U> the type of UserDetailsService being used to allow for returning the
+ * concrete UserDetailsService.
  */
-public class UserDetailsServiceConfigurer<B extends ProviderManagerBuilder<B>,
-        C extends UserDetailsServiceConfigurer<B, C, U>,
-        U extends UserDetailsService>
-            extends AbstractDaoAuthenticationConfigurer<B, C, U> {
+public class UserDetailsServiceConfigurer<B extends ProviderManagerBuilder<B>, C extends UserDetailsServiceConfigurer<B, C, U>, U extends UserDetailsService>
+		extends AbstractDaoAuthenticationConfigurer<B, C, U> {
 
-    /**
-     * Creates a new instance
-     * @param userDetailsService the {@link UserDetailsService} that should be used
-     */
-    public UserDetailsServiceConfigurer(U userDetailsService) {
-        super(userDetailsService);
-    }
+	/**
+	 * Creates a new instance
+	 * @param userDetailsService the {@link UserDetailsService} that should be used
+	 */
+	public UserDetailsServiceConfigurer(U userDetailsService) {
+		super(userDetailsService);
+	}
 
-    @Override
-    public void configure(B builder) throws Exception {
-        initUserDetailsService();
+	@Override
+	public void configure(B builder) throws Exception {
+		initUserDetailsService();
 
-        super.configure(builder);
-    }
+		super.configure(builder);
+	}
 
-    /**
-     * Allows subclasses to initialize the {@link UserDetailsService}. For example, it might add users, initialize
-     * schema, etc.
-     */
-    protected void initUserDetailsService() throws Exception {}
+	/**
+	 * Allows subclasses to initialize the {@link UserDetailsService}. For example, it
+	 * might add users, initialize schema, etc.
+	 */
+	protected void initUserDetailsService() throws Exception {
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java
index df520f3578..218d4d6853 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java
@@ -28,58 +28,67 @@ import org.springframework.security.config.annotation.ObjectPostProcessor;
 import org.springframework.util.Assert;
 
 /**
- * Allows registering Objects to participate with an
- * {@link AutowireCapableBeanFactory}'s post processing of {@link Aware}
- * methods, {@link InitializingBean#afterPropertiesSet()}, and
- * {@link DisposableBean#destroy()}.
+ * Allows registering Objects to participate with an {@link AutowireCapableBeanFactory}'s
+ * post processing of {@link Aware} methods, {@link InitializingBean#afterPropertiesSet()}
+ * , and {@link DisposableBean#destroy()}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-final class AutowireBeanFactoryObjectPostProcessor implements ObjectPostProcessor<Object>, DisposableBean {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final AutowireCapableBeanFactory autowireBeanFactory;
-    private final List<DisposableBean> disposableBeans = new ArrayList<DisposableBean>();
+final class AutowireBeanFactoryObjectPostProcessor implements
+		ObjectPostProcessor<Object>, DisposableBean {
+	private final Log logger = LogFactory.getLog(getClass());
+	private final AutowireCapableBeanFactory autowireBeanFactory;
+	private final List<DisposableBean> disposableBeans = new ArrayList<DisposableBean>();
 
-    public AutowireBeanFactoryObjectPostProcessor(
-            AutowireCapableBeanFactory autowireBeanFactory) {
-        Assert.notNull(autowireBeanFactory, "autowireBeanFactory cannot be null");
-        this.autowireBeanFactory = autowireBeanFactory;
-    }
+	public AutowireBeanFactoryObjectPostProcessor(
+			AutowireCapableBeanFactory autowireBeanFactory) {
+		Assert.notNull(autowireBeanFactory, "autowireBeanFactory cannot be null");
+		this.autowireBeanFactory = autowireBeanFactory;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.Initializer#initialize(java.lang.Object)
-     */
-    @SuppressWarnings("unchecked")
-    public <T> T postProcess(T object) {
-        if(object == null) {
-            return null;
-        }
-        T result = null;
-        try {
-            result = (T) autowireBeanFactory.initializeBean(object, object.toString());
-        } catch (RuntimeException e) {
-            Class<?> type = object.getClass();
-            throw new RuntimeException("Could not postProcess " + object + " of type " + type, e);
-        }
-        autowireBeanFactory.autowireBean(object);
-        if(result instanceof DisposableBean) {
-            disposableBeans.add((DisposableBean) result);
-        }
-        return result;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.Initializer#initialize(java.
+	 * lang.Object)
+	 */
+	@SuppressWarnings("unchecked")
+	public <T> T postProcess(T object) {
+		if (object == null) {
+			return null;
+		}
+		T result = null;
+		try {
+			result = (T) autowireBeanFactory.initializeBean(object, object.toString());
+		}
+		catch (RuntimeException e) {
+			Class<?> type = object.getClass();
+			throw new RuntimeException("Could not postProcess " + object + " of type "
+					+ type, e);
+		}
+		autowireBeanFactory.autowireBean(object);
+		if (result instanceof DisposableBean) {
+			disposableBeans.add((DisposableBean) result);
+		}
+		return result;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.beans.factory.DisposableBean#destroy()
-     */
-    public void destroy() throws Exception {
-        for(DisposableBean disposable : disposableBeans) {
-            try {
-                disposable.destroy();
-            } catch(Exception error) {
-                logger.error(error);
-            }
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.beans.factory.DisposableBean#destroy()
+	 */
+	public void destroy() throws Exception {
+		for (DisposableBean disposable : disposableBeans) {
+			try {
+				disposable.destroy();
+			}
+			catch (Exception error) {
+				logger.error(error);
+			}
+		}
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java
index ee3f200e9c..745dd9e8d0 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/ObjectPostProcessorConfiguration.java
@@ -23,10 +23,9 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 /**
- * Spring {@link Configuration} that exports the default
- * {@link ObjectPostProcessor}. This class is not intended to be imported
- * manually rather it is imported automatically when using
- * {@link EnableWebSecurity} or {@link EnableGlobalMethodSecurity}.
+ * Spring {@link Configuration} that exports the default {@link ObjectPostProcessor}. This
+ * class is not intended to be imported manually rather it is imported automatically when
+ * using {@link EnableWebSecurity} or {@link EnableGlobalMethodSecurity}.
  *
  * @see EnableWebSecurity
  * @see EnableGlobalMethodSecurity
@@ -37,8 +36,9 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 @Configuration
 public class ObjectPostProcessorConfiguration {
 
-    @Bean
-    public ObjectPostProcessor<Object> objectPostProcessor(AutowireCapableBeanFactory beanFactory) {
-        return new AutowireBeanFactoryObjectPostProcessor(beanFactory);
-    }
+	@Bean
+	public ObjectPostProcessor<Object> objectPostProcessor(
+			AutowireCapableBeanFactory beanFactory) {
+		return new AutowireBeanFactoryObjectPostProcessor(beanFactory);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java
index e22327ab7b..d76d289497 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java
@@ -28,78 +28,83 @@ import org.springframework.security.config.annotation.authentication.configurati
 import org.springframework.security.config.annotation.configuration.ObjectPostProcessorConfiguration;
 
 /**
- * <p>Enables Spring Security global method security similar to the
- * <global-method-security> xml support.</p>
+ * <p>
+ * Enables Spring Security global method security similar to the <global-method-security>
+ * xml support.
+ * </p>
  *
  * <p>
  * More advanced configurations may wish to extend
- * {@link GlobalMethodSecurityConfiguration} and override the protected methods
- * to provide custom implementations. Note that
- * {@link EnableGlobalMethodSecurity} still must be included on the class
- * extending {@link GlobalMethodSecurityConfiguration} to determine the
- * settings.
+ * {@link GlobalMethodSecurityConfiguration} and override the protected methods to provide
+ * custom implementations. Note that {@link EnableGlobalMethodSecurity} still must be
+ * included on the class extending {@link GlobalMethodSecurityConfiguration} to determine
+ * the settings.
  *
  * @author Rob Winch
  * @since 3.2
  */
-@Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target(value={java.lang.annotation.ElementType.TYPE})
+@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(value = { java.lang.annotation.ElementType.TYPE })
 @Documented
-@Import({GlobalMethodSecuritySelector.class,ObjectPostProcessorConfiguration.class})
+@Import({ GlobalMethodSecuritySelector.class, ObjectPostProcessorConfiguration.class })
 @EnableGlobalAuthentication
 @Configuration
 public @interface EnableGlobalMethodSecurity {
 
-    /**
-     * Determines if Spring Security's pre post annotations should be enabled. Default is false.
-     * @return true if pre post annotations should be enabled false otherwise.
-     */
-    boolean prePostEnabled() default false;
+	/**
+	 * Determines if Spring Security's pre post annotations should be enabled. Default is
+	 * false.
+	 * @return true if pre post annotations should be enabled false otherwise.
+	 */
+	boolean prePostEnabled() default false;
 
-    /**
-     * Determines if Spring Security's {@link Secured} annotations should be enabled.
-     * @return true if {@link Secured} annotations should be enabled false otherwise. Default is false.
-     */
-    boolean securedEnabled() default false;
+	/**
+	 * Determines if Spring Security's {@link Secured} annotations should be enabled.
+	 * @return true if {@link Secured} annotations should be enabled false otherwise.
+	 * Default is false.
+	 */
+	boolean securedEnabled() default false;
 
-    /**
-     * Determines if JSR-250 annotations should be enabled. Default is false.
-     * @return true if JSR-250 should be enabled false otherwise.
-     */
-    boolean jsr250Enabled() default false;
+	/**
+	 * Determines if JSR-250 annotations should be enabled. Default is false.
+	 * @return true if JSR-250 should be enabled false otherwise.
+	 */
+	boolean jsr250Enabled() default false;
 
-    /**
-     * Indicate whether subclass-based (CGLIB) proxies are to be created ({@code true}) as
-     * opposed to standard Java interface-based proxies ({@code false}). The default is
-     * {@code false}. <strong>Applicable only if {@link #mode()} is set to
-     * {@link AdviceMode#PROXY}</strong>.
-     *
-     * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
-     * Spring-managed beans requiring proxying, not just those marked with
-     * the Security annotations. For example, other beans marked with Spring's
-     * {@code @Transactional} annotation will be upgraded to subclass proxying at the same
-     * time. This approach has no negative impact in practice unless one is explicitly
-     * expecting one type of proxy vs another, e.g. in tests.
-     *
-     * @return true if CGILIB proxies should be created instead of interface based proxies, else false
-     */
-    boolean proxyTargetClass() default false;
+	/**
+	 * Indicate whether subclass-based (CGLIB) proxies are to be created ({@code true}) as
+	 * opposed to standard Java interface-based proxies ({@code false}). The default is
+	 * {@code false}. <strong>Applicable only if {@link #mode()} is set to
+	 * {@link AdviceMode#PROXY}</strong>.
+	 *
+	 * <p>
+	 * Note that setting this attribute to {@code true} will affect <em>all</em>
+	 * Spring-managed beans requiring proxying, not just those marked with the Security
+	 * annotations. For example, other beans marked with Spring's {@code @Transactional}
+	 * annotation will be upgraded to subclass proxying at the same time. This approach
+	 * has no negative impact in practice unless one is explicitly expecting one type of
+	 * proxy vs another, e.g. in tests.
+	 *
+	 * @return true if CGILIB proxies should be created instead of interface based
+	 * proxies, else false
+	 */
+	boolean proxyTargetClass() default false;
 
-    /**
-     * Indicate how security advice should be applied. The default is
-     * {@link AdviceMode#PROXY}.
-     * @see AdviceMode
-     *
-     * @return the {@link AdviceMode} to use
-     */
-    AdviceMode mode() default AdviceMode.PROXY;
+	/**
+	 * Indicate how security advice should be applied. The default is
+	 * {@link AdviceMode#PROXY}.
+	 * @see AdviceMode
+	 *
+	 * @return the {@link AdviceMode} to use
+	 */
+	AdviceMode mode() default AdviceMode.PROXY;
 
-    /**
-     * Indicate the ordering of the execution of the security advisor
-     * when multiple advices are applied at a specific joinpoint.
-     * The default is {@link Ordered#LOWEST_PRECEDENCE}.
-     *
-     * @return the order the security advisor should be applied
-     */
-    int order() default Ordered.LOWEST_PRECEDENCE;
+	/**
+	 * Indicate the ordering of the execution of the security advisor when multiple
+	 * advices are applied at a specific joinpoint. The default is
+	 * {@link Ordered#LOWEST_PRECEDENCE}.
+	 *
+	 * @return the order the security advisor should be applied
+	 */
+	int order() default Ordered.LOWEST_PRECEDENCE;
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java
index 811c452e6f..f1a7cbae9c 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityAspectJAutoProxyRegistrar.java
@@ -41,26 +41,27 @@ import org.springframework.core.type.AnnotationMetadata;
  * @since 3.2
  */
 class GlobalMethodSecurityAspectJAutoProxyRegistrar implements
-        ImportBeanDefinitionRegistrar {
+		ImportBeanDefinitionRegistrar {
 
-    /**
-     * Register, escalate, and configure the AspectJ auto proxy creator based on
-     * the value of the @{@link EnableGlobalMethodSecurity#proxyTargetClass()}
-     * attribute on the importing {@code @Configuration} class.
-     */
-    public void registerBeanDefinitions(
-            AnnotationMetadata importingClassMetadata,
-            BeanDefinitionRegistry registry) {
+	/**
+	 * Register, escalate, and configure the AspectJ auto proxy creator based on the value
+	 * of the @{@link EnableGlobalMethodSecurity#proxyTargetClass()} attribute on the
+	 * importing {@code @Configuration} class.
+	 */
+	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
+			BeanDefinitionRegistry registry) {
 
-        BeanDefinition interceptor = registry.getBeanDefinition("methodSecurityInterceptor");
+		BeanDefinition interceptor = registry
+				.getBeanDefinition("methodSecurityInterceptor");
 
-        BeanDefinitionBuilder aspect =
-                BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.access.intercept.aspectj.aspect.AnnotationSecurityAspect");
-        aspect.setFactoryMethod("aspectOf");
-        aspect.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        aspect.addPropertyValue("securityInterceptor", interceptor);
+		BeanDefinitionBuilder aspect = BeanDefinitionBuilder
+				.rootBeanDefinition("org.springframework.security.access.intercept.aspectj.aspect.AnnotationSecurityAspect");
+		aspect.setFactoryMethod("aspectOf");
+		aspect.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		aspect.addPropertyValue("securityInterceptor", interceptor);
 
-        registry.registerBeanDefinition("annotationSecurityAspect$0", aspect.getBeanDefinition());
-    }
+		registry.registerBeanDefinition("annotationSecurityAspect$0",
+				aspect.getBeanDefinition());
+	}
 
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
index b4892e6da5..f417fd99c4 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
@@ -65,8 +65,8 @@ import org.springframework.security.config.annotation.authentication.configurati
 import org.springframework.util.Assert;
 
 /**
- * Base {@link Configuration} for enabling global method security. Classes may
- * extend this class to customize the defaults, but must be sure to specify the
+ * Base {@link Configuration} for enabling global method security. Classes may extend this
+ * class to customize the defaults, but must be sure to specify the
  * {@link EnableGlobalMethodSecurity} annotation on the subclass.
  *
  * @author Rob Winch
@@ -75,339 +75,352 @@ import org.springframework.util.Assert;
  */
 @Configuration
 public class GlobalMethodSecurityConfiguration implements ImportAware {
-    private static final Log logger = LogFactory.getLog(GlobalMethodSecurityConfiguration.class);
-    private ObjectPostProcessor<Object> objectPostProcessor = new ObjectPostProcessor<Object>() {
-        public <T> T postProcess(T object) {
-            throw new IllegalStateException(ObjectPostProcessor.class.getName()+ " is a required bean. Ensure you have used @"+EnableGlobalMethodSecurity.class.getName());
-        }
-    };
-    private DefaultMethodSecurityExpressionHandler defaultMethodExpressionHandler = new DefaultMethodSecurityExpressionHandler();
-    private AuthenticationManager authenticationManager;
-    private AuthenticationManagerBuilder auth;
-    private boolean disableAuthenticationRegistry;
-    private AnnotationAttributes enableMethodSecurity;
-    private ApplicationContext context;
-    private MethodSecurityExpressionHandler expressionHandler;
-    private Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource;
+	private static final Log logger = LogFactory
+			.getLog(GlobalMethodSecurityConfiguration.class);
+	private ObjectPostProcessor<Object> objectPostProcessor = new ObjectPostProcessor<Object>() {
+		public <T> T postProcess(T object) {
+			throw new IllegalStateException(ObjectPostProcessor.class.getName()
+					+ " is a required bean. Ensure you have used @"
+					+ EnableGlobalMethodSecurity.class.getName());
+		}
+	};
+	private DefaultMethodSecurityExpressionHandler defaultMethodExpressionHandler = new DefaultMethodSecurityExpressionHandler();
+	private AuthenticationManager authenticationManager;
+	private AuthenticationManagerBuilder auth;
+	private boolean disableAuthenticationRegistry;
+	private AnnotationAttributes enableMethodSecurity;
+	private ApplicationContext context;
+	private MethodSecurityExpressionHandler expressionHandler;
+	private Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource;
 
-    /**
-     * Creates the default MethodInterceptor which is a MethodSecurityInterceptor using the following methods to
-     * construct it.
-     * <ul>
-     *     <li>{@link #accessDecisionManager()}</li>
-     *     <li>{@link #afterInvocationManager()}</li>
-     *     <li>{@link #authenticationManager()}</li>
-     *     <li>{@link #methodSecurityMetadataSource()}</li>
-     *     <li>{@link #runAsManager()}</li>
-     *
-     * </ul>
-     *
-     * <p>
-     *     Subclasses can override this method to provide a different {@link MethodInterceptor}.
-     * </p>
-     *
-     * @return
-     * @throws Exception
-     */
-    @Bean
-    public MethodInterceptor methodSecurityInterceptor() throws Exception {
-        MethodSecurityInterceptor methodSecurityInterceptor = isAspectJ() ? new AspectJMethodSecurityInterceptor() : new MethodSecurityInterceptor();
-        methodSecurityInterceptor
-                .setAccessDecisionManager(accessDecisionManager());
-        methodSecurityInterceptor
-                .setAfterInvocationManager(afterInvocationManager());
-        methodSecurityInterceptor
-                .setAuthenticationManager(authenticationManager());
-        methodSecurityInterceptor
-                .setSecurityMetadataSource(methodSecurityMetadataSource());
-        RunAsManager runAsManager = runAsManager();
-        if (runAsManager != null) {
-            methodSecurityInterceptor.setRunAsManager(runAsManager);
-        }
-        return methodSecurityInterceptor;
-    }
+	/**
+	 * Creates the default MethodInterceptor which is a MethodSecurityInterceptor using
+	 * the following methods to construct it.
+	 * <ul>
+	 * <li>{@link #accessDecisionManager()}</li>
+	 * <li>{@link #afterInvocationManager()}</li>
+	 * <li>{@link #authenticationManager()}</li>
+	 * <li>{@link #methodSecurityMetadataSource()}</li>
+	 * <li>{@link #runAsManager()}</li>
+	 *
+	 * </ul>
+	 *
+	 * <p>
+	 * Subclasses can override this method to provide a different
+	 * {@link MethodInterceptor}.
+	 * </p>
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public MethodInterceptor methodSecurityInterceptor() throws Exception {
+		MethodSecurityInterceptor methodSecurityInterceptor = isAspectJ() ? new AspectJMethodSecurityInterceptor()
+				: new MethodSecurityInterceptor();
+		methodSecurityInterceptor.setAccessDecisionManager(accessDecisionManager());
+		methodSecurityInterceptor.setAfterInvocationManager(afterInvocationManager());
+		methodSecurityInterceptor.setAuthenticationManager(authenticationManager());
+		methodSecurityInterceptor
+				.setSecurityMetadataSource(methodSecurityMetadataSource());
+		RunAsManager runAsManager = runAsManager();
+		if (runAsManager != null) {
+			methodSecurityInterceptor.setRunAsManager(runAsManager);
+		}
+		return methodSecurityInterceptor;
+	}
 
-    /**
-     * Provide a custom {@link AfterInvocationManager} for the default
-     * implementation of {@link #methodSecurityInterceptor()}. The default is
-     * null if pre post is not enabled. Otherwise, it returns a {@link AfterInvocationProviderManager}.
-     *
-     * <p>
-     * Subclasses should override this method to provide a custom {@link AfterInvocationManager}
-     * </p>
-     *
-     * @return
-     */
-    protected AfterInvocationManager afterInvocationManager() {
-        if(prePostEnabled()) {
-            AfterInvocationProviderManager invocationProviderManager = new AfterInvocationProviderManager();
-            ExpressionBasedPostInvocationAdvice postAdvice = new ExpressionBasedPostInvocationAdvice(getExpressionHandler());
-            PostInvocationAdviceProvider postInvocationAdviceProvider = new PostInvocationAdviceProvider(postAdvice);
-            List<AfterInvocationProvider> afterInvocationProviders = new ArrayList<AfterInvocationProvider>();
-            afterInvocationProviders.add(postInvocationAdviceProvider);
-            invocationProviderManager.setProviders(afterInvocationProviders);
-            return invocationProviderManager;
-        }
-        return null;
-    }
+	/**
+	 * Provide a custom {@link AfterInvocationManager} for the default implementation of
+	 * {@link #methodSecurityInterceptor()}. The default is null if pre post is not
+	 * enabled. Otherwise, it returns a {@link AfterInvocationProviderManager}.
+	 *
+	 * <p>
+	 * Subclasses should override this method to provide a custom
+	 * {@link AfterInvocationManager}
+	 * </p>
+	 *
+	 * @return
+	 */
+	protected AfterInvocationManager afterInvocationManager() {
+		if (prePostEnabled()) {
+			AfterInvocationProviderManager invocationProviderManager = new AfterInvocationProviderManager();
+			ExpressionBasedPostInvocationAdvice postAdvice = new ExpressionBasedPostInvocationAdvice(
+					getExpressionHandler());
+			PostInvocationAdviceProvider postInvocationAdviceProvider = new PostInvocationAdviceProvider(
+					postAdvice);
+			List<AfterInvocationProvider> afterInvocationProviders = new ArrayList<AfterInvocationProvider>();
+			afterInvocationProviders.add(postInvocationAdviceProvider);
+			invocationProviderManager.setProviders(afterInvocationProviders);
+			return invocationProviderManager;
+		}
+		return null;
+	}
 
-    /**
-     * Provide a custom {@link RunAsManager} for the default implementation of
-     * {@link #methodSecurityInterceptor()}. The default is null.
-     *
-     * @return
-     */
-    protected RunAsManager runAsManager() {
-        return null;
-    }
+	/**
+	 * Provide a custom {@link RunAsManager} for the default implementation of
+	 * {@link #methodSecurityInterceptor()}. The default is null.
+	 *
+	 * @return
+	 */
+	protected RunAsManager runAsManager() {
+		return null;
+	}
 
-    /**
-     * Allows subclasses to provide a custom {@link AccessDecisionManager}. The default is a {@link AffirmativeBased}
-     * with the following voters:
-     *
-     * <ul>
-     *     <li>{@link PreInvocationAuthorizationAdviceVoter}</li>
-     *     <li>{@link RoleVoter} </li>
-     *     <li>{@link AuthenticatedVoter} </li>
-     * </ul>
-     *
-     * @return
-     */
-    protected AccessDecisionManager accessDecisionManager() {
-        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
-        ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
-        expressionAdvice.setExpressionHandler(getExpressionHandler());
-        if(prePostEnabled()) {
-            decisionVoters.add(new PreInvocationAuthorizationAdviceVoter(
-                expressionAdvice));
-        }
-        if(jsr250Enabled()) {
-            decisionVoters.add(new Jsr250Voter());
-        }
-        decisionVoters.add(new RoleVoter());
-        decisionVoters.add(new AuthenticatedVoter());
-        return new AffirmativeBased(decisionVoters);
-    }
+	/**
+	 * Allows subclasses to provide a custom {@link AccessDecisionManager}. The default is
+	 * a {@link AffirmativeBased} with the following voters:
+	 *
+	 * <ul>
+	 * <li>{@link PreInvocationAuthorizationAdviceVoter}</li>
+	 * <li>{@link RoleVoter}</li>
+	 * <li>{@link AuthenticatedVoter}</li>
+	 * </ul>
+	 *
+	 * @return
+	 */
+	protected AccessDecisionManager accessDecisionManager() {
+		List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+		ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
+		expressionAdvice.setExpressionHandler(getExpressionHandler());
+		if (prePostEnabled()) {
+			decisionVoters
+					.add(new PreInvocationAuthorizationAdviceVoter(expressionAdvice));
+		}
+		if (jsr250Enabled()) {
+			decisionVoters.add(new Jsr250Voter());
+		}
+		decisionVoters.add(new RoleVoter());
+		decisionVoters.add(new AuthenticatedVoter());
+		return new AffirmativeBased(decisionVoters);
+	}
 
-    /**
-     * Provide a {@link MethodSecurityExpressionHandler} that is registered with
-     * the {@link ExpressionBasedPreInvocationAdvice}. The default is
-     * {@link DefaultMethodSecurityExpressionHandler} which optionally will
-     * Autowire an {@link AuthenticationTrustResolver}.
-     *
-     * <p>
-     * Subclasses may override this method to provide a custom
-     * {@link MethodSecurityExpressionHandler}
-     * </p>
-     *
-     * @return
-     */
-    protected MethodSecurityExpressionHandler createExpressionHandler() {
-        return defaultMethodExpressionHandler;
-    }
+	/**
+	 * Provide a {@link MethodSecurityExpressionHandler} that is registered with the
+	 * {@link ExpressionBasedPreInvocationAdvice}. The default is
+	 * {@link DefaultMethodSecurityExpressionHandler} which optionally will Autowire an
+	 * {@link AuthenticationTrustResolver}.
+	 *
+	 * <p>
+	 * Subclasses may override this method to provide a custom
+	 * {@link MethodSecurityExpressionHandler}
+	 * </p>
+	 *
+	 * @return
+	 */
+	protected MethodSecurityExpressionHandler createExpressionHandler() {
+		return defaultMethodExpressionHandler;
+	}
 
-    /**
-     * Gets the {@link MethodSecurityExpressionHandler} or creates it using {@link #expressionHandler}.
-     *
-     * @return a non {@code null} {@link MethodSecurityExpressionHandler}
-     */
-    protected final MethodSecurityExpressionHandler getExpressionHandler() {
-        if(expressionHandler == null) {
-            expressionHandler = createExpressionHandler();
-        }
-        return expressionHandler;
-    }
+	/**
+	 * Gets the {@link MethodSecurityExpressionHandler} or creates it using
+	 * {@link #expressionHandler}.
+	 *
+	 * @return a non {@code null} {@link MethodSecurityExpressionHandler}
+	 */
+	protected final MethodSecurityExpressionHandler getExpressionHandler() {
+		if (expressionHandler == null) {
+			expressionHandler = createExpressionHandler();
+		}
+		return expressionHandler;
+	}
 
-    /**
-     * Provides a custom {@link MethodSecurityMetadataSource} that is registered
-     * with the {@link #methodSecurityMetadataSource()}. Default is null.
-     *
-     * @return a custom {@link MethodSecurityMetadataSource} that is registered
-     * with the {@link #methodSecurityMetadataSource()}
-     */
-    protected MethodSecurityMetadataSource customMethodSecurityMetadataSource() {
-        return null;
-    }
+	/**
+	 * Provides a custom {@link MethodSecurityMetadataSource} that is registered with the
+	 * {@link #methodSecurityMetadataSource()}. Default is null.
+	 *
+	 * @return a custom {@link MethodSecurityMetadataSource} that is registered with the
+	 * {@link #methodSecurityMetadataSource()}
+	 */
+	protected MethodSecurityMetadataSource customMethodSecurityMetadataSource() {
+		return null;
+	}
 
-    /**
-     * Allows providing a custom {@link AuthenticationManager}. The default is
-     * to use any authentication mechanisms registered by {@link #configure(AuthenticationManagerBuilder)}. If
-     * {@link #configure(AuthenticationManagerBuilder)} was not overridden, then an {@link AuthenticationManager}
-     * is attempted to be autowired by type.
-     *
-     * @return
-     */
-    protected AuthenticationManager authenticationManager() throws Exception {
-        if(authenticationManager == null) {
-            DefaultAuthenticationEventPublisher eventPublisher = objectPostProcessor.postProcess(new DefaultAuthenticationEventPublisher());
-            auth = new AuthenticationManagerBuilder(objectPostProcessor);
-            auth.authenticationEventPublisher(eventPublisher);
-            configure(auth);
-            if(disableAuthenticationRegistry) {
-                authenticationManager = getAuthenticationConfiguration().getAuthenticationManager();
-            } else {
-                authenticationManager = auth.build();
-            }
-        }
-        return authenticationManager;
-    }
+	/**
+	 * Allows providing a custom {@link AuthenticationManager}. The default is to use any
+	 * authentication mechanisms registered by
+	 * {@link #configure(AuthenticationManagerBuilder)}. If
+	 * {@link #configure(AuthenticationManagerBuilder)} was not overridden, then an
+	 * {@link AuthenticationManager} is attempted to be autowired by type.
+	 *
+	 * @return
+	 */
+	protected AuthenticationManager authenticationManager() throws Exception {
+		if (authenticationManager == null) {
+			DefaultAuthenticationEventPublisher eventPublisher = objectPostProcessor
+					.postProcess(new DefaultAuthenticationEventPublisher());
+			auth = new AuthenticationManagerBuilder(objectPostProcessor);
+			auth.authenticationEventPublisher(eventPublisher);
+			configure(auth);
+			if (disableAuthenticationRegistry) {
+				authenticationManager = getAuthenticationConfiguration()
+						.getAuthenticationManager();
+			}
+			else {
+				authenticationManager = auth.build();
+			}
+		}
+		return authenticationManager;
+	}
 
-    /**
-     * Sub classes can override this method to register different types of authentication. If not overridden,
-     * {@link #configure(AuthenticationManagerBuilder)} will attempt to autowire by type.
-     *
-     * @param auth the {@link AuthenticationManagerBuilder} used to register different authentication mechanisms for the
-     *                 global method security.
-     * @throws Exception
-     */
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        this.disableAuthenticationRegistry = true;
-    }
+	/**
+	 * Sub classes can override this method to register different types of authentication.
+	 * If not overridden, {@link #configure(AuthenticationManagerBuilder)} will attempt to
+	 * autowire by type.
+	 *
+	 * @param auth the {@link AuthenticationManagerBuilder} used to register different
+	 * authentication mechanisms for the global method security.
+	 * @throws Exception
+	 */
+	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+		this.disableAuthenticationRegistry = true;
+	}
 
-    /**
-     * Provides the default {@link MethodSecurityMetadataSource} that will be
-     * used. It creates a {@link DelegatingMethodSecurityMetadataSource} based
-     * upon {@link #customMethodSecurityMetadataSource()} and the attributes on
-     * {@link EnableGlobalMethodSecurity}.
-     *
-     * @return
-     */
-    @Bean
-    public MethodSecurityMetadataSource methodSecurityMetadataSource() {
-        List<MethodSecurityMetadataSource> sources = new ArrayList<MethodSecurityMetadataSource>();
-        ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(
-                getExpressionHandler());
-        MethodSecurityMetadataSource customMethodSecurityMetadataSource = customMethodSecurityMetadataSource();
-        if (customMethodSecurityMetadataSource != null) {
-            sources.add(customMethodSecurityMetadataSource);
-        }
-        if (prePostEnabled()) {
-            sources.add(new PrePostAnnotationSecurityMetadataSource(attributeFactory));
-        }
-        if (securedEnabled()) {
-            sources.add(new SecuredAnnotationSecurityMetadataSource());
-        }
-        if (jsr250Enabled()) {
-            sources.add(jsr250MethodSecurityMetadataSource);
-        }
-        return new DelegatingMethodSecurityMetadataSource(sources);
-    }
+	/**
+	 * Provides the default {@link MethodSecurityMetadataSource} that will be used. It
+	 * creates a {@link DelegatingMethodSecurityMetadataSource} based upon
+	 * {@link #customMethodSecurityMetadataSource()} and the attributes on
+	 * {@link EnableGlobalMethodSecurity}.
+	 *
+	 * @return
+	 */
+	@Bean
+	public MethodSecurityMetadataSource methodSecurityMetadataSource() {
+		List<MethodSecurityMetadataSource> sources = new ArrayList<MethodSecurityMetadataSource>();
+		ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(
+				getExpressionHandler());
+		MethodSecurityMetadataSource customMethodSecurityMetadataSource = customMethodSecurityMetadataSource();
+		if (customMethodSecurityMetadataSource != null) {
+			sources.add(customMethodSecurityMetadataSource);
+		}
+		if (prePostEnabled()) {
+			sources.add(new PrePostAnnotationSecurityMetadataSource(attributeFactory));
+		}
+		if (securedEnabled()) {
+			sources.add(new SecuredAnnotationSecurityMetadataSource());
+		}
+		if (jsr250Enabled()) {
+			sources.add(jsr250MethodSecurityMetadataSource);
+		}
+		return new DelegatingMethodSecurityMetadataSource(sources);
+	}
 
-    /**
-     * Creates the {@link PreInvocationAuthorizationAdvice} to be used. The
-     * default is {@link ExpressionBasedPreInvocationAdvice}.
-     *
-     * @return
-     */
-    @Bean
-    public PreInvocationAuthorizationAdvice preInvocationAuthorizationAdvice() {
-        ExpressionBasedPreInvocationAdvice preInvocationAdvice = new ExpressionBasedPreInvocationAdvice();
-        preInvocationAdvice.setExpressionHandler(getExpressionHandler());
-        return preInvocationAdvice;
-    }
+	/**
+	 * Creates the {@link PreInvocationAuthorizationAdvice} to be used. The default is
+	 * {@link ExpressionBasedPreInvocationAdvice}.
+	 *
+	 * @return
+	 */
+	@Bean
+	public PreInvocationAuthorizationAdvice preInvocationAuthorizationAdvice() {
+		ExpressionBasedPreInvocationAdvice preInvocationAdvice = new ExpressionBasedPreInvocationAdvice();
+		preInvocationAdvice.setExpressionHandler(getExpressionHandler());
+		return preInvocationAdvice;
+	}
 
-    /**
-     * Obtains the {@link MethodSecurityMetadataSourceAdvisor} to be used.
-     *
-     * @return
-     */
-    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
-    @Bean
-    public MethodSecurityMetadataSourceAdvisor metaDataSourceAdvisor() {
-        MethodSecurityMetadataSourceAdvisor methodAdvisor = new MethodSecurityMetadataSourceAdvisor(
-                "methodSecurityInterceptor", methodSecurityMetadataSource(),
-                "methodSecurityMetadataSource");
-        methodAdvisor.setOrder(order());
-        return methodAdvisor;
-    }
+	/**
+	 * Obtains the {@link MethodSecurityMetadataSourceAdvisor} to be used.
+	 *
+	 * @return
+	 */
+	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+	@Bean
+	public MethodSecurityMetadataSourceAdvisor metaDataSourceAdvisor() {
+		MethodSecurityMetadataSourceAdvisor methodAdvisor = new MethodSecurityMetadataSourceAdvisor(
+				"methodSecurityInterceptor", methodSecurityMetadataSource(),
+				"methodSecurityMetadataSource");
+		methodAdvisor.setOrder(order());
+		return methodAdvisor;
+	}
 
-    /**
-     * Obtains the attributes from {@link EnableGlobalMethodSecurity} if this class was imported using the {@link EnableGlobalMethodSecurity} annotation.
-     */
-    public final void setImportMetadata(AnnotationMetadata importMetadata) {
-        Map<String, Object> annotationAttributes = importMetadata
-                .getAnnotationAttributes(EnableGlobalMethodSecurity.class
-                        .getName());
-        enableMethodSecurity = AnnotationAttributes
-                .fromMap(annotationAttributes);
-    }
+	/**
+	 * Obtains the attributes from {@link EnableGlobalMethodSecurity} if this class was
+	 * imported using the {@link EnableGlobalMethodSecurity} annotation.
+	 */
+	public final void setImportMetadata(AnnotationMetadata importMetadata) {
+		Map<String, Object> annotationAttributes = importMetadata
+				.getAnnotationAttributes(EnableGlobalMethodSecurity.class.getName());
+		enableMethodSecurity = AnnotationAttributes.fromMap(annotationAttributes);
+	}
 
-    @Autowired(required = false)
-    public void setAuthenticationTrustResolver(AuthenticationTrustResolver trustResolver) {
-        this.defaultMethodExpressionHandler.setTrustResolver(trustResolver);
-    }
+	@Autowired(required = false)
+	public void setAuthenticationTrustResolver(AuthenticationTrustResolver trustResolver) {
+		this.defaultMethodExpressionHandler.setTrustResolver(trustResolver);
+	}
 
-    @Autowired(required=false)
-    public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
-        this.objectPostProcessor = objectPostProcessor;
-        this.defaultMethodExpressionHandler = objectPostProcessor.postProcess(defaultMethodExpressionHandler);
-    }
+	@Autowired(required = false)
+	public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
+		this.objectPostProcessor = objectPostProcessor;
+		this.defaultMethodExpressionHandler = objectPostProcessor
+				.postProcess(defaultMethodExpressionHandler);
+	}
 
-    @Autowired(required = false)
-    public void setJsr250MethodSecurityMetadataSource(
-            Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource) {
-        this.jsr250MethodSecurityMetadataSource = jsr250MethodSecurityMetadataSource;
-    }
+	@Autowired(required = false)
+	public void setJsr250MethodSecurityMetadataSource(
+			Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource) {
+		this.jsr250MethodSecurityMetadataSource = jsr250MethodSecurityMetadataSource;
+	}
 
-    @Autowired(required = false)
-    public void setPermissionEvaluator(List<PermissionEvaluator> permissionEvaluators) {
-        if(permissionEvaluators.size() != 1) {
-            logger.debug("Not autwiring PermissionEvaluator since size != 1. Got " + permissionEvaluators);
-        }
-        this.defaultMethodExpressionHandler.setPermissionEvaluator(permissionEvaluators.get(0));
-    }
+	@Autowired(required = false)
+	public void setPermissionEvaluator(List<PermissionEvaluator> permissionEvaluators) {
+		if (permissionEvaluators.size() != 1) {
+			logger.debug("Not autwiring PermissionEvaluator since size != 1. Got "
+					+ permissionEvaluators);
+		}
+		this.defaultMethodExpressionHandler.setPermissionEvaluator(permissionEvaluators
+				.get(0));
+	}
 
-    @Autowired(required = false)
-    public void setMethodSecurityExpressionHandler(List<MethodSecurityExpressionHandler> handlers) {
-        if(handlers.size() != 1) {
-            logger.debug("Not autwiring PermissionEvaluator since size != 1. Got " + handlers);
-            return;
-        }
-        this.expressionHandler = handlers.get(0);
-    }
+	@Autowired(required = false)
+	public void setMethodSecurityExpressionHandler(
+			List<MethodSecurityExpressionHandler> handlers) {
+		if (handlers.size() != 1) {
+			logger.debug("Not autwiring PermissionEvaluator since size != 1. Got "
+					+ handlers);
+			return;
+		}
+		this.expressionHandler = handlers.get(0);
+	}
 
-    @Autowired
-    public void setApplicationContext(ApplicationContext context) {
-        this.context = context;
-    }
+	@Autowired
+	public void setApplicationContext(ApplicationContext context) {
+		this.context = context;
+	}
 
-    private AuthenticationConfiguration getAuthenticationConfiguration() {
-        return context.getBean(AuthenticationConfiguration.class);
-    }
+	private AuthenticationConfiguration getAuthenticationConfiguration() {
+		return context.getBean(AuthenticationConfiguration.class);
+	}
 
-    private boolean prePostEnabled() {
-        return enableMethodSecurity().getBoolean("prePostEnabled");
-    }
+	private boolean prePostEnabled() {
+		return enableMethodSecurity().getBoolean("prePostEnabled");
+	}
 
-    private boolean securedEnabled() {
-        return enableMethodSecurity().getBoolean("securedEnabled");
-    }
+	private boolean securedEnabled() {
+		return enableMethodSecurity().getBoolean("securedEnabled");
+	}
 
-    private boolean jsr250Enabled() {
-        return enableMethodSecurity().getBoolean("jsr250Enabled");
-    }
+	private boolean jsr250Enabled() {
+		return enableMethodSecurity().getBoolean("jsr250Enabled");
+	}
 
-    private int order() {
-        return (Integer) enableMethodSecurity().get("order");
-    }
+	private int order() {
+		return (Integer) enableMethodSecurity().get("order");
+	}
 
-    private boolean isAspectJ() {
-        return enableMethodSecurity().getEnum("mode") == AdviceMode.ASPECTJ;
-    }
+	private boolean isAspectJ() {
+		return enableMethodSecurity().getEnum("mode") == AdviceMode.ASPECTJ;
+	}
 
-    private AnnotationAttributes enableMethodSecurity() {
-        if (enableMethodSecurity == null) {
-            // if it is null look at this instance (i.e. a subclass was used)
-            EnableGlobalMethodSecurity methodSecurityAnnotation = AnnotationUtils
-                    .findAnnotation(getClass(),
-                            EnableGlobalMethodSecurity.class);
-            Assert.notNull(methodSecurityAnnotation,
-                    EnableGlobalMethodSecurity.class.getName() + " is required");
-            Map<String, Object> methodSecurityAttrs = AnnotationUtils
-                    .getAnnotationAttributes(methodSecurityAnnotation);
-            this.enableMethodSecurity = AnnotationAttributes
-                    .fromMap(methodSecurityAttrs);
-        }
-        return this.enableMethodSecurity;
-    }
+	private AnnotationAttributes enableMethodSecurity() {
+		if (enableMethodSecurity == null) {
+			// if it is null look at this instance (i.e. a subclass was used)
+			EnableGlobalMethodSecurity methodSecurityAnnotation = AnnotationUtils
+					.findAnnotation(getClass(), EnableGlobalMethodSecurity.class);
+			Assert.notNull(methodSecurityAnnotation,
+					EnableGlobalMethodSecurity.class.getName() + " is required");
+			Map<String, Object> methodSecurityAttrs = AnnotationUtils
+					.getAnnotationAttributes(methodSecurityAnnotation);
+			this.enableMethodSecurity = AnnotationAttributes.fromMap(methodSecurityAttrs);
+		}
+		return this.enableMethodSecurity;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java
index 8ad1b00bf7..02b5b4cb6c 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java
@@ -36,35 +36,41 @@ import org.springframework.util.ClassUtils;
  */
 final class GlobalMethodSecuritySelector implements ImportSelector {
 
-    public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
-        Class<EnableGlobalMethodSecurity> annoType = EnableGlobalMethodSecurity.class;
-        Map<String, Object> annotationAttributes = importingClassMetadata.getAnnotationAttributes(annoType.getName(), false);
-        AnnotationAttributes attributes = AnnotationAttributes.fromMap(annotationAttributes);
-        Assert.notNull(attributes, String.format(
-                "@%s is not present on importing class '%s' as expected",
-                annoType.getSimpleName(), importingClassMetadata.getClassName()));
+	public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
+		Class<EnableGlobalMethodSecurity> annoType = EnableGlobalMethodSecurity.class;
+		Map<String, Object> annotationAttributes = importingClassMetadata
+				.getAnnotationAttributes(annoType.getName(), false);
+		AnnotationAttributes attributes = AnnotationAttributes
+				.fromMap(annotationAttributes);
+		Assert.notNull(attributes, String.format(
+				"@%s is not present on importing class '%s' as expected",
+				annoType.getSimpleName(), importingClassMetadata.getClassName()));
 
-        // TODO would be nice if could use BeanClassLoaderAware (does not work)
-        Class<?> importingClass = ClassUtils.resolveClassName(importingClassMetadata.getClassName(), ClassUtils.getDefaultClassLoader());
-        boolean skipMethodSecurityConfiguration = GlobalMethodSecurityConfiguration.class.isAssignableFrom(importingClass);
+		// TODO would be nice if could use BeanClassLoaderAware (does not work)
+		Class<?> importingClass = ClassUtils
+				.resolveClassName(importingClassMetadata.getClassName(),
+						ClassUtils.getDefaultClassLoader());
+		boolean skipMethodSecurityConfiguration = GlobalMethodSecurityConfiguration.class
+				.isAssignableFrom(importingClass);
 
-        AdviceMode mode = attributes.getEnum("mode");
-        String autoProxyClassName = AdviceMode.PROXY == mode ? AutoProxyRegistrar.class.getName()
-                : GlobalMethodSecurityAspectJAutoProxyRegistrar.class.getName();
+		AdviceMode mode = attributes.getEnum("mode");
+		String autoProxyClassName = AdviceMode.PROXY == mode ? AutoProxyRegistrar.class
+				.getName() : GlobalMethodSecurityAspectJAutoProxyRegistrar.class
+				.getName();
 
-        boolean jsr250Enabled = attributes.getBoolean("jsr250Enabled");
+		boolean jsr250Enabled = attributes.getBoolean("jsr250Enabled");
 
-        List<String> classNames = new ArrayList<String>(4);
-        classNames.add(autoProxyClassName);
+		List<String> classNames = new ArrayList<String>(4);
+		classNames.add(autoProxyClassName);
 
-        if(!skipMethodSecurityConfiguration) {
-            classNames.add(GlobalMethodSecurityConfiguration.class.getName());
-        }
+		if (!skipMethodSecurityConfiguration) {
+			classNames.add(GlobalMethodSecurityConfiguration.class.getName());
+		}
 
-        if(jsr250Enabled) {
-            classNames.add(Jsr250MetadataSourceConfiguration.class.getName());
-        }
+		if (jsr250Enabled) {
+			classNames.add(Jsr250MetadataSourceConfiguration.class.getName());
+		}
 
-        return classNames.toArray(new String[0]);
-    }
+		return classNames.toArray(new String[0]);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java
index 3a6faaa76b..4f1f5980cd 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MetadataSourceConfiguration.java
@@ -7,8 +7,8 @@ import org.springframework.security.access.annotation.Jsr250MethodSecurityMetada
 @Configuration
 class Jsr250MetadataSourceConfiguration {
 
-    @Bean
-    public Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource() {
-        return new Jsr250MethodSecurityMetadataSource();
-    }
+	@Bean
+	public Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource() {
+		return new Jsr250MethodSecurityMetadataSource();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
index b595bf1f1c..e97d137f95 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
@@ -27,8 +27,8 @@ import org.springframework.security.web.util.matcher.RegexRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
- * A base class for registering {@link RequestMatcher}'s. For example, it might allow for specifying which
- * {@link RequestMatcher} require a certain level of authorization.
+ * A base class for registering {@link RequestMatcher}'s. For example, it might allow for
+ * specifying which {@link RequestMatcher} require a certain level of authorization.
  *
  *
  * @param <C> The object that is returned or Chained after creating the RequestMatcher
@@ -37,154 +37,174 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @since 3.2
  */
 public abstract class AbstractRequestMatcherRegistry<C> {
-    private static final RequestMatcher ANY_REQUEST = AnyRequestMatcher.INSTANCE;
-    /**
-     * Maps any request.
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C anyRequest() {
-        return requestMatchers(ANY_REQUEST);
-    }
+	private static final RequestMatcher ANY_REQUEST = AnyRequestMatcher.INSTANCE;
 
-    /**
-     * Maps a {@link List} of {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher} instances.
-     *
-     * @param method the {@link HttpMethod} to use or {@code null} for any {@link HttpMethod}.
-     * @param antPatterns the ant patterns to create {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher}
-     *                    from
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C antMatchers(HttpMethod method, String... antPatterns) {
-        return chainRequestMatchers(RequestMatchers.antMatchers(method, antPatterns));
-    }
+	/**
+	 * Maps any request.
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C anyRequest() {
+		return requestMatchers(ANY_REQUEST);
+	}
 
-    /**
-     * Maps a {@link List} of {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher} instances that do
-     * not care which {@link HttpMethod} is used.
-     *
-     * @param antPatterns the ant patterns to create {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher}
-     *                    from
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C antMatchers(String... antPatterns) {
-        return chainRequestMatchers(RequestMatchers.antMatchers(antPatterns));
-    }
+	/**
+	 * Maps a {@link List} of
+	 * {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher}
+	 * instances.
+	 *
+	 * @param method the {@link HttpMethod} to use or {@code null} for any
+	 * {@link HttpMethod}.
+	 * @param antPatterns the ant patterns to create
+	 * {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher} from
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C antMatchers(HttpMethod method, String... antPatterns) {
+		return chainRequestMatchers(RequestMatchers.antMatchers(method, antPatterns));
+	}
 
-    /**
-     * Maps a {@link List} of {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} instances.
-     *
-     * @param method the {@link HttpMethod} to use or {@code null} for any {@link HttpMethod}.
-     * @param regexPatterns the regular expressions to create
-     *                      {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} from
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C regexMatchers(HttpMethod method, String... regexPatterns) {
-        return chainRequestMatchers(RequestMatchers.regexMatchers(method,
-                regexPatterns));
-    }
+	/**
+	 * Maps a {@link List} of
+	 * {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher}
+	 * instances that do not care which {@link HttpMethod} is used.
+	 *
+	 * @param antPatterns the ant patterns to create
+	 * {@link org.springframework.security.web.util.matcher.AntPathRequestMatcher} from
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C antMatchers(String... antPatterns) {
+		return chainRequestMatchers(RequestMatchers.antMatchers(antPatterns));
+	}
 
-    /**
-     * Create a {@link List} of {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} instances that do not
-     * specify an {@link HttpMethod}.
-     *
-     * @param regexPatterns the regular expressions to create
-     *                      {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} from
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C regexMatchers(String... regexPatterns) {
-        return chainRequestMatchers(RequestMatchers.regexMatchers(regexPatterns));
-    }
+	/**
+	 * Maps a {@link List} of
+	 * {@link org.springframework.security.web.util.matcher.RegexRequestMatcher}
+	 * instances.
+	 *
+	 * @param method the {@link HttpMethod} to use or {@code null} for any
+	 * {@link HttpMethod}.
+	 * @param regexPatterns the regular expressions to create
+	 * {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} from
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C regexMatchers(HttpMethod method, String... regexPatterns) {
+		return chainRequestMatchers(RequestMatchers.regexMatchers(method, regexPatterns));
+	}
 
-    /**
-     * Associates a list of {@link RequestMatcher} instances with the {@link AbstractConfigAttributeRequestMatcherRegistry}
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances
-     *
-     * @return the object that is chained after creating the {@link RequestMatcher}
-     */
-    public C requestMatchers(RequestMatcher... requestMatchers) {
-        return chainRequestMatchers(Arrays.asList(requestMatchers));
-    }
+	/**
+	 * Create a {@link List} of
+	 * {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} instances
+	 * that do not specify an {@link HttpMethod}.
+	 *
+	 * @param regexPatterns the regular expressions to create
+	 * {@link org.springframework.security.web.util.matcher.RegexRequestMatcher} from
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C regexMatchers(String... regexPatterns) {
+		return chainRequestMatchers(RequestMatchers.regexMatchers(regexPatterns));
+	}
 
-    /**
-     * Subclasses should implement this method for returning the object that is chained to the creation of the
-     * {@link RequestMatcher} instances.
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances that were created
-     * @return the chained Object for the subclass which allows association of something else to the
-     *         {@link RequestMatcher}
-     */
-    protected abstract C chainRequestMatchers(List<RequestMatcher> requestMatchers);
+	/**
+	 * Associates a list of {@link RequestMatcher} instances with the
+	 * {@link AbstractConfigAttributeRequestMatcherRegistry}
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances
+	 *
+	 * @return the object that is chained after creating the {@link RequestMatcher}
+	 */
+	public C requestMatchers(RequestMatcher... requestMatchers) {
+		return chainRequestMatchers(Arrays.asList(requestMatchers));
+	}
 
-    /**
-     * Utilities for creating {@link RequestMatcher} instances.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    private static final class RequestMatchers {
+	/**
+	 * Subclasses should implement this method for returning the object that is chained to
+	 * the creation of the {@link RequestMatcher} instances.
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances that were created
+	 * @return the chained Object for the subclass which allows association of something
+	 * else to the {@link RequestMatcher}
+	 */
+	protected abstract C chainRequestMatchers(List<RequestMatcher> requestMatchers);
 
-        /**
-         * Create a {@link List} of {@link AntPathRequestMatcher} instances.
-         *
-         * @param httpMethod the {@link HttpMethod} to use or {@code null} for any {@link HttpMethod}.
-         * @param antPatterns the ant patterns to create {@link AntPathRequestMatcher} from
-         *
-         * @return a {@link List} of {@link AntPathRequestMatcher} instances
-         */
-        public static List<RequestMatcher> antMatchers(HttpMethod httpMethod, String...antPatterns) {
-            String method = httpMethod == null ? null : httpMethod.toString();
-            List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
-            for(String pattern : antPatterns) {
-                matchers.add(new AntPathRequestMatcher(pattern, method));
-            }
-            return matchers;
-        }
+	/**
+	 * Utilities for creating {@link RequestMatcher} instances.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	private static final class RequestMatchers {
 
-        /**
-         * Create a {@link List} of {@link AntPathRequestMatcher} instances that do not specify an {@link HttpMethod}.
-         *
-         * @param antPatterns the ant patterns to create {@link AntPathRequestMatcher} from
-         *
-         * @return a {@link List} of {@link AntPathRequestMatcher} instances
-         */
-        public static List<RequestMatcher> antMatchers(String...antPatterns) {
-            return antMatchers(null, antPatterns);
-        }
+		/**
+		 * Create a {@link List} of {@link AntPathRequestMatcher} instances.
+		 *
+		 * @param httpMethod the {@link HttpMethod} to use or {@code null} for any
+		 * {@link HttpMethod}.
+		 * @param antPatterns the ant patterns to create {@link AntPathRequestMatcher}
+		 * from
+		 *
+		 * @return a {@link List} of {@link AntPathRequestMatcher} instances
+		 */
+		public static List<RequestMatcher> antMatchers(HttpMethod httpMethod,
+				String... antPatterns) {
+			String method = httpMethod == null ? null : httpMethod.toString();
+			List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+			for (String pattern : antPatterns) {
+				matchers.add(new AntPathRequestMatcher(pattern, method));
+			}
+			return matchers;
+		}
 
-        /**
-         * Create a {@link List} of {@link RegexRequestMatcher} instances.
-         *
-         * @param httpMethod the {@link HttpMethod} to use or {@code null} for any {@link HttpMethod}.
-         * @param regexPatterns the regular expressions to create {@link RegexRequestMatcher} from
-         *
-         * @return a {@link List} of {@link RegexRequestMatcher} instances
-         */
-        public static List<RequestMatcher> regexMatchers(HttpMethod httpMethod, String...regexPatterns) {
-            String method = httpMethod == null ? null : httpMethod.toString();
-            List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
-            for(String pattern : regexPatterns) {
-                matchers.add(new RegexRequestMatcher(pattern, method));
-            }
-            return matchers;
-        }
+		/**
+		 * Create a {@link List} of {@link AntPathRequestMatcher} instances that do not
+		 * specify an {@link HttpMethod}.
+		 *
+		 * @param antPatterns the ant patterns to create {@link AntPathRequestMatcher}
+		 * from
+		 *
+		 * @return a {@link List} of {@link AntPathRequestMatcher} instances
+		 */
+		public static List<RequestMatcher> antMatchers(String... antPatterns) {
+			return antMatchers(null, antPatterns);
+		}
 
-        /**
-         * Create a {@link List} of {@link RegexRequestMatcher} instances that do not specify an {@link HttpMethod}.
-         *
-         * @param regexPatterns the regular expressions to create {@link RegexRequestMatcher} from
-         *
-         * @return a {@link List} of {@link RegexRequestMatcher} instances
-         */
-        public static List<RequestMatcher> regexMatchers(String...regexPatterns) {
-            return regexMatchers(null, regexPatterns);
-        }
+		/**
+		 * Create a {@link List} of {@link RegexRequestMatcher} instances.
+		 *
+		 * @param httpMethod the {@link HttpMethod} to use or {@code null} for any
+		 * {@link HttpMethod}.
+		 * @param regexPatterns the regular expressions to create
+		 * {@link RegexRequestMatcher} from
+		 *
+		 * @return a {@link List} of {@link RegexRequestMatcher} instances
+		 */
+		public static List<RequestMatcher> regexMatchers(HttpMethod httpMethod,
+				String... regexPatterns) {
+			String method = httpMethod == null ? null : httpMethod.toString();
+			List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+			for (String pattern : regexPatterns) {
+				matchers.add(new RegexRequestMatcher(pattern, method));
+			}
+			return matchers;
+		}
 
-        private RequestMatchers() {}
-    }
+		/**
+		 * Create a {@link List} of {@link RegexRequestMatcher} instances that do not
+		 * specify an {@link HttpMethod}.
+		 *
+		 * @param regexPatterns the regular expressions to create
+		 * {@link RegexRequestMatcher} from
+		 *
+		 * @return a {@link List} of {@link RegexRequestMatcher} instances
+		 */
+		public static List<RequestMatcher> regexMatchers(String... regexPatterns) {
+			return regexMatchers(null, regexPatterns);
+		}
+
+		private RequestMatchers() {
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
index 3208628fd2..b36e3379ef 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
@@ -50,125 +50,119 @@ import org.springframework.security.web.session.SessionManagementFilter;
  *
  * @param <H>
  */
-public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>> extends SecurityBuilder<DefaultSecurityFilterChain> {
+public interface HttpSecurityBuilder<H extends HttpSecurityBuilder<H>> extends
+		SecurityBuilder<DefaultSecurityFilterChain> {
 
-    /**
-     * Gets the {@link SecurityConfigurer} by its class name or
-     * <code>null</code> if not found. Note that object hierarchies are not
-     * considered.
-     *
-     * @param clazz the Class of the {@link SecurityConfigurer} to attempt to get.
-     */
-    <C extends SecurityConfigurer<DefaultSecurityFilterChain, H>> C getConfigurer(
-            Class<C> clazz);
+	/**
+	 * Gets the {@link SecurityConfigurer} by its class name or <code>null</code> if not
+	 * found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz the Class of the {@link SecurityConfigurer} to attempt to get.
+	 */
+	<C extends SecurityConfigurer<DefaultSecurityFilterChain, H>> C getConfigurer(
+			Class<C> clazz);
 
-    /**
-     * Removes the {@link SecurityConfigurer} by its class name or
-     * <code>null</code> if not found. Note that object hierarchies are not
-     * considered.
-     *
-     * @param clazz the Class of the {@link SecurityConfigurer} to attempt to remove.
-     * @return the {@link SecurityConfigurer} that was removed or null if not found
-     */
-    <C extends SecurityConfigurer<DefaultSecurityFilterChain, H>> C removeConfigurer(Class<C> clazz);
+	/**
+	 * Removes the {@link SecurityConfigurer} by its class name or <code>null</code> if
+	 * not found. Note that object hierarchies are not considered.
+	 *
+	 * @param clazz the Class of the {@link SecurityConfigurer} to attempt to remove.
+	 * @return the {@link SecurityConfigurer} that was removed or null if not found
+	 */
+	<C extends SecurityConfigurer<DefaultSecurityFilterChain, H>> C removeConfigurer(
+			Class<C> clazz);
 
-    /**
-     * Sets an object that is shared by multiple {@link SecurityConfigurer}.
-     *
-     * @param sharedType the Class to key the shared object by.
-     * @param object the Object to store
-     */
-    <C> void setSharedObject(Class<C> sharedType, C object);
+	/**
+	 * Sets an object that is shared by multiple {@link SecurityConfigurer}.
+	 *
+	 * @param sharedType the Class to key the shared object by.
+	 * @param object the Object to store
+	 */
+	<C> void setSharedObject(Class<C> sharedType, C object);
 
-    /**
-     * Gets a shared Object. Note that object heirarchies are not considered.
-     *
-     * @param sharedType the type of the shared Object
-     * @return the shared Object or null if it is not found
-     */
-    <C> C getSharedObject(Class<C> sharedType);
+	/**
+	 * Gets a shared Object. Note that object heirarchies are not considered.
+	 *
+	 * @param sharedType the type of the shared Object
+	 * @return the shared Object or null if it is not found
+	 */
+	<C> C getSharedObject(Class<C> sharedType);
 
-    /**
-     * Allows adding an additional {@link AuthenticationProvider} to be used
-     *
-     * @param authenticationProvider the {@link AuthenticationProvider} to be added
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    H authenticationProvider(
-            AuthenticationProvider authenticationProvider);
+	/**
+	 * Allows adding an additional {@link AuthenticationProvider} to be used
+	 *
+	 * @param authenticationProvider the {@link AuthenticationProvider} to be added
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	H authenticationProvider(AuthenticationProvider authenticationProvider);
 
-    /**
-     * Allows adding an additional {@link UserDetailsService} to be used
-     *
-     * @param userDetailsService the {@link UserDetailsService} to be added
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    H userDetailsService(
-            UserDetailsService userDetailsService) throws Exception;
+	/**
+	 * Allows adding an additional {@link UserDetailsService} to be used
+	 *
+	 * @param userDetailsService the {@link UserDetailsService} to be added
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	H userDetailsService(UserDetailsService userDetailsService) throws Exception;
 
-    /**
-     * Allows adding a {@link Filter} after one of the known {@link Filter}
-     * classes. The known {@link Filter} instances are either a {@link Filter}
-     * listed in {@link #addFilter(Filter)} or a {@link Filter} that has already
-     * been added using {@link #addFilterAfter(Filter, Class)} or
-     * {@link #addFilterBefore(Filter, Class)}.
-     *
-     * @param filter the {@link Filter} to register after the type {@code afterFilter}
-     * @param afterFilter the Class of the known {@link Filter}.
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    H addFilterAfter(Filter filter,
-            Class<? extends Filter> afterFilter);
+	/**
+	 * Allows adding a {@link Filter} after one of the known {@link Filter} classes. The
+	 * known {@link Filter} instances are either a {@link Filter} listed in
+	 * {@link #addFilter(Filter)} or a {@link Filter} that has already been added using
+	 * {@link #addFilterAfter(Filter, Class)} or {@link #addFilterBefore(Filter, Class)}.
+	 *
+	 * @param filter the {@link Filter} to register after the type {@code afterFilter}
+	 * @param afterFilter the Class of the known {@link Filter}.
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	H addFilterAfter(Filter filter, Class<? extends Filter> afterFilter);
 
-    /**
-     * Allows adding a {@link Filter} before one of the known {@link Filter}
-     * classes. The known {@link Filter} instances are either a {@link Filter}
-     * listed in {@link #addFilter(Filter)} or a {@link Filter} that has already
-     * been added using {@link #addFilterAfter(Filter, Class)} or
-     * {@link #addFilterBefore(Filter, Class)}.
-     *
-     * @param filter the {@link Filter} to register before the type {@code beforeFilter}
-     * @param beforeFilter the Class of the known {@link Filter}.
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    H addFilterBefore(Filter filter,
-            Class<? extends Filter> beforeFilter);
+	/**
+	 * Allows adding a {@link Filter} before one of the known {@link Filter} classes. The
+	 * known {@link Filter} instances are either a {@link Filter} listed in
+	 * {@link #addFilter(Filter)} or a {@link Filter} that has already been added using
+	 * {@link #addFilterAfter(Filter, Class)} or {@link #addFilterBefore(Filter, Class)}.
+	 *
+	 * @param filter the {@link Filter} to register before the type {@code beforeFilter}
+	 * @param beforeFilter the Class of the known {@link Filter}.
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	H addFilterBefore(Filter filter, Class<? extends Filter> beforeFilter);
 
-    /**
-     * Adds a {@link Filter} that must be an instance of or extend one of the
-     * Filters provided within the Security framework. The method ensures that
-     * the ordering of the Filters is automatically taken care of.
-     *
-     * The ordering of the Filters is:
-     *
-     * <ul>
-     * <li>{@link ChannelProcessingFilter}</li>
-     * <li>{@link ConcurrentSessionFilter}</li>
-     * <li>{@link SecurityContextPersistenceFilter}</li>
-     * <li>{@link LogoutFilter}</li>
-     * <li>{@link X509AuthenticationFilter}</li>
-     * <li>{@link AbstractPreAuthenticatedProcessingFilter}</li>
-     * <li>{@link org.springframework.security.cas.web.CasAuthenticationFilter}</li>
-     * <li>{@link UsernamePasswordAuthenticationFilter}</li>
-     * <li>{@link ConcurrentSessionFilter}</li>
-     * <li>{@link OpenIDAuthenticationFilter}</li>
-     * <li>{@link DefaultLoginPageGeneratingFilter}</li>
-     * <li>{@link ConcurrentSessionFilter}</li>
-     * <li>{@link DigestAuthenticationFilter}</li>
-     * <li>{@link BasicAuthenticationFilter}</li>
-     * <li>{@link RequestCacheAwareFilter}</li>
-     * <li>{@link SecurityContextHolderAwareRequestFilter}</li>
-     * <li>{@link JaasApiIntegrationFilter}</li>
-     * <li>{@link RememberMeAuthenticationFilter}</li>
-     * <li>{@link AnonymousAuthenticationFilter}</li>
-     * <li>{@link SessionManagementFilter}</li>
-     * <li>{@link ExceptionTranslationFilter}</li>
-     * <li>{@link FilterSecurityInterceptor}</li>
-     * <li>{@link SwitchUserFilter}</li>
-     * </ul>
-     *
-     * @param filter the {@link Filter} to add
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    H addFilter(Filter filter);
+	/**
+	 * Adds a {@link Filter} that must be an instance of or extend one of the Filters
+	 * provided within the Security framework. The method ensures that the ordering of the
+	 * Filters is automatically taken care of.
+	 *
+	 * The ordering of the Filters is:
+	 *
+	 * <ul>
+	 * <li>{@link ChannelProcessingFilter}</li>
+	 * <li>{@link ConcurrentSessionFilter}</li>
+	 * <li>{@link SecurityContextPersistenceFilter}</li>
+	 * <li>{@link LogoutFilter}</li>
+	 * <li>{@link X509AuthenticationFilter}</li>
+	 * <li>{@link AbstractPreAuthenticatedProcessingFilter}</li>
+	 * <li>{@link org.springframework.security.cas.web.CasAuthenticationFilter}</li>
+	 * <li>{@link UsernamePasswordAuthenticationFilter}</li>
+	 * <li>{@link ConcurrentSessionFilter}</li>
+	 * <li>{@link OpenIDAuthenticationFilter}</li>
+	 * <li>{@link DefaultLoginPageGeneratingFilter}</li>
+	 * <li>{@link ConcurrentSessionFilter}</li>
+	 * <li>{@link DigestAuthenticationFilter}</li>
+	 * <li>{@link BasicAuthenticationFilter}</li>
+	 * <li>{@link RequestCacheAwareFilter}</li>
+	 * <li>{@link SecurityContextHolderAwareRequestFilter}</li>
+	 * <li>{@link JaasApiIntegrationFilter}</li>
+	 * <li>{@link RememberMeAuthenticationFilter}</li>
+	 * <li>{@link AnonymousAuthenticationFilter}</li>
+	 * <li>{@link SessionManagementFilter}</li>
+	 * <li>{@link ExceptionTranslationFilter}</li>
+	 * <li>{@link FilterSecurityInterceptor}</li>
+	 * <li>{@link SwitchUserFilter}</li>
+	 * </ul>
+	 *
+	 * @param filter the {@link Filter} to add
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	H addFilter(Filter filter);
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/WebSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/WebSecurityConfigurer.java
index 19ab476ea6..d25d7e3233 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/WebSecurityConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/WebSecurityConfigurer.java
@@ -25,17 +25,17 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 /**
- * Allows customization to the {@link WebSecurity}. In most instances
- * users will use {@link EnableWebSecurity} and a create {@link Configuration}
- * that extends {@link WebSecurityConfigurerAdapter} which will automatically be
- * applied to the {@link WebSecurity} by the {@link EnableWebSecurity}
- * annotation.
+ * Allows customization to the {@link WebSecurity}. In most instances users will use
+ * {@link EnableWebSecurity} and a create {@link Configuration} that extends
+ * {@link WebSecurityConfigurerAdapter} which will automatically be applied to the
+ * {@link WebSecurity} by the {@link EnableWebSecurity} annotation.
  *
  * @see WebSecurityConfigurerAdapter
  *
  * @author Rob Winch
  * @since 3.2
  */
-public interface WebSecurityConfigurer<T extends SecurityBuilder<Filter>> extends SecurityConfigurer<Filter, T> {
+public interface WebSecurityConfigurer<T extends SecurityBuilder<Filter>> extends
+		SecurityConfigurer<Filter, T> {
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java
index fc257364bc..0f456107b3 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java
@@ -46,8 +46,8 @@ import org.springframework.security.web.session.ConcurrentSessionFilter;
 import org.springframework.security.web.session.SessionManagementFilter;
 
 /**
- * An internal use only {@link Comparator} that sorts the Security {@link Filter} instances to ensure they are in the
- * correct order.
+ * An internal use only {@link Comparator} that sorts the Security {@link Filter}
+ * instances to ensure they are in the correct order.
  *
  * @author Rob Winch
  * @since 3.2
@@ -55,127 +55,138 @@ import org.springframework.security.web.session.SessionManagementFilter;
 
 @SuppressWarnings("serial")
 final class FilterComparator implements Comparator<Filter>, Serializable {
-    private static final int STEP = 100;
-    private Map<String,Integer> filterToOrder = new HashMap<String,Integer>();
+	private static final int STEP = 100;
+	private Map<String, Integer> filterToOrder = new HashMap<String, Integer>();
 
-    FilterComparator() {
-        int order = 100;
-        put(ChannelProcessingFilter.class, order);
-        order += STEP;
-        put(ConcurrentSessionFilter.class, order);
-        order += STEP;
-        put(WebAsyncManagerIntegrationFilter.class, order);
-        order += STEP;
-        put(SecurityContextPersistenceFilter.class, order);
-        order += STEP;
-        put(HeaderWriterFilter.class, order);
-        order += STEP;
-        put(CsrfFilter.class, order);
-        order += STEP;
-        put(LogoutFilter.class, order);
-        order += STEP;
-        put(X509AuthenticationFilter.class, order);
-        order += STEP;
-        put(AbstractPreAuthenticatedProcessingFilter.class, order);
-        order += STEP;
-        filterToOrder.put("org.springframework.security.cas.web.CasAuthenticationFilter", order);
-        order += STEP;
-        put(UsernamePasswordAuthenticationFilter.class, order);
-        order += STEP;
-        put(ConcurrentSessionFilter.class, order);
-        order += STEP;
-        filterToOrder.put("org.springframework.security.openid.OpenIDAuthenticationFilter", order);
-        order += STEP;
-        put(DefaultLoginPageGeneratingFilter.class, order);
-        order += STEP;
-        put(ConcurrentSessionFilter.class, order);
-        order += STEP;
-        put(DigestAuthenticationFilter.class, order);
-        order += STEP;
-        put(BasicAuthenticationFilter.class, order);
-        order += STEP;
-        put(RequestCacheAwareFilter.class, order);
-        order += STEP;
-        put(SecurityContextHolderAwareRequestFilter.class, order);
-        order += STEP;
-        put(JaasApiIntegrationFilter.class, order);
-        order += STEP;
-        put(RememberMeAuthenticationFilter.class, order);
-        order += STEP;
-        put(AnonymousAuthenticationFilter.class, order);
-        order += STEP;
-        put(SessionManagementFilter.class, order);
-        order += STEP;
-        put(ExceptionTranslationFilter.class, order);
-        order += STEP;
-        put(FilterSecurityInterceptor.class, order);
-        order += STEP;
-        put(SwitchUserFilter.class, order);
-    }
+	FilterComparator() {
+		int order = 100;
+		put(ChannelProcessingFilter.class, order);
+		order += STEP;
+		put(ConcurrentSessionFilter.class, order);
+		order += STEP;
+		put(WebAsyncManagerIntegrationFilter.class, order);
+		order += STEP;
+		put(SecurityContextPersistenceFilter.class, order);
+		order += STEP;
+		put(HeaderWriterFilter.class, order);
+		order += STEP;
+		put(CsrfFilter.class, order);
+		order += STEP;
+		put(LogoutFilter.class, order);
+		order += STEP;
+		put(X509AuthenticationFilter.class, order);
+		order += STEP;
+		put(AbstractPreAuthenticatedProcessingFilter.class, order);
+		order += STEP;
+		filterToOrder.put("org.springframework.security.cas.web.CasAuthenticationFilter",
+				order);
+		order += STEP;
+		put(UsernamePasswordAuthenticationFilter.class, order);
+		order += STEP;
+		put(ConcurrentSessionFilter.class, order);
+		order += STEP;
+		filterToOrder.put(
+				"org.springframework.security.openid.OpenIDAuthenticationFilter", order);
+		order += STEP;
+		put(DefaultLoginPageGeneratingFilter.class, order);
+		order += STEP;
+		put(ConcurrentSessionFilter.class, order);
+		order += STEP;
+		put(DigestAuthenticationFilter.class, order);
+		order += STEP;
+		put(BasicAuthenticationFilter.class, order);
+		order += STEP;
+		put(RequestCacheAwareFilter.class, order);
+		order += STEP;
+		put(SecurityContextHolderAwareRequestFilter.class, order);
+		order += STEP;
+		put(JaasApiIntegrationFilter.class, order);
+		order += STEP;
+		put(RememberMeAuthenticationFilter.class, order);
+		order += STEP;
+		put(AnonymousAuthenticationFilter.class, order);
+		order += STEP;
+		put(SessionManagementFilter.class, order);
+		order += STEP;
+		put(ExceptionTranslationFilter.class, order);
+		order += STEP;
+		put(FilterSecurityInterceptor.class, order);
+		order += STEP;
+		put(SwitchUserFilter.class, order);
+	}
 
-    public int compare(Filter lhs, Filter rhs) {
-        Integer left = getOrder(lhs.getClass());
-        Integer right = getOrder(rhs.getClass());
-        return left - right;
-    }
+	public int compare(Filter lhs, Filter rhs) {
+		Integer left = getOrder(lhs.getClass());
+		Integer right = getOrder(rhs.getClass());
+		return left - right;
+	}
 
-    /**
-     * Determines if a particular {@link Filter} is registered to be sorted
-     *
-     * @param filter
-     * @return
-     */
-    public boolean isRegistered(Class<? extends Filter> filter) {
-        return getOrder(filter) != null;
-    }
+	/**
+	 * Determines if a particular {@link Filter} is registered to be sorted
+	 *
+	 * @param filter
+	 * @return
+	 */
+	public boolean isRegistered(Class<? extends Filter> filter) {
+		return getOrder(filter) != null;
+	}
 
-    /**
-     * Registers a {@link Filter} to exist after a particular {@link Filter} that is already registered.
-     * @param filter the {@link Filter} to register
-     * @param afterFilter the {@link Filter} that is already registered and that {@code filter} should be placed after.
-     */
-    public void registerAfter(Class<? extends Filter> filter, Class<? extends Filter> afterFilter) {
-        Integer position = getOrder(afterFilter);
-        if(position == null) {
-            throw new IllegalArgumentException("Cannot register after unregistered Filter "+afterFilter);
-        }
+	/**
+	 * Registers a {@link Filter} to exist after a particular {@link Filter} that is
+	 * already registered.
+	 * @param filter the {@link Filter} to register
+	 * @param afterFilter the {@link Filter} that is already registered and that
+	 * {@code filter} should be placed after.
+	 */
+	public void registerAfter(Class<? extends Filter> filter,
+			Class<? extends Filter> afterFilter) {
+		Integer position = getOrder(afterFilter);
+		if (position == null) {
+			throw new IllegalArgumentException(
+					"Cannot register after unregistered Filter " + afterFilter);
+		}
 
-        put(filter, position + 1);
-    }
+		put(filter, position + 1);
+	}
 
-    /**
-     * Registers a {@link Filter} to exist before a particular {@link Filter} that is already registered.
-     * @param filter the {@link Filter} to register
-     * @param beforeFilter the {@link Filter} that is already registered and that {@code filter} should be placed before.
-     */
-    public void registerBefore(Class<? extends Filter> filter, Class<? extends Filter> beforeFilter) {
-        Integer position = getOrder(beforeFilter);
-        if(position == null) {
-            throw new IllegalArgumentException("Cannot register after unregistered Filter "+beforeFilter);
-        }
+	/**
+	 * Registers a {@link Filter} to exist before a particular {@link Filter} that is
+	 * already registered.
+	 * @param filter the {@link Filter} to register
+	 * @param beforeFilter the {@link Filter} that is already registered and that
+	 * {@code filter} should be placed before.
+	 */
+	public void registerBefore(Class<? extends Filter> filter,
+			Class<? extends Filter> beforeFilter) {
+		Integer position = getOrder(beforeFilter);
+		if (position == null) {
+			throw new IllegalArgumentException(
+					"Cannot register after unregistered Filter " + beforeFilter);
+		}
 
-        put(filter, position - 1);
-    }
+		put(filter, position - 1);
+	}
 
-    private void put(Class<? extends Filter> filter, int position) {
-        String className = filter.getName();
-        filterToOrder.put(className, position);
-    }
+	private void put(Class<? extends Filter> filter, int position) {
+		String className = filter.getName();
+		filterToOrder.put(className, position);
+	}
 
-    /**
-     * Gets the order of a particular {@link Filter} class taking into consideration superclasses.
-     *
-     * @param clazz the {@link Filter} class to determine the sort order
-     * @return the sort order or null if not defined
-     */
-    private Integer getOrder(Class<?> clazz) {
-        while(clazz != null) {
-            Integer result = filterToOrder.get(clazz.getName());
-            if(result != null) {
-                return result;
-            }
-            clazz = clazz.getSuperclass();
-        }
-        return null;
-    }
+	/**
+	 * Gets the order of a particular {@link Filter} class taking into consideration
+	 * superclasses.
+	 *
+	 * @param clazz the {@link Filter} class to determine the sort order
+	 * @return the sort order or null if not defined
+	 */
+	private Integer getOrder(Class<?> clazz) {
+		while (clazz != null) {
+			Integer result = filterToOrder.get(clazz.getName());
+			if (result != null) {
+				return result;
+			}
+			clazz = clazz.getSuperclass();
+		}
+		return null;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
index f77546531d..d387d25874 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
@@ -71,40 +71,33 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * A {@link HttpSecurity} is similar to Spring Security's XML <http> element in the namespace
- * configuration. It allows configuring web based security for specific http requests. By default
- * it will be applied to all requests, but can be restricted using {@link #requestMatcher(RequestMatcher)}
- * or other similar methods.
+ * A {@link HttpSecurity} is similar to Spring Security's XML <http> element in the
+ * namespace configuration. It allows configuring web based security for specific http
+ * requests. By default it will be applied to all requests, but can be restricted using
+ * {@link #requestMatcher(RequestMatcher)} or other similar methods.
  *
  * <h2>Example Usage</h2>
  *
- * The most basic form based configuration can be seen below. The configuration will require that any URL
- * that is requested will require a User with the role "ROLE_USER". It also defines an in memory authentication
- * scheme with a user that has the username "user", the password "password", and the role "ROLE_USER". For
- * additional examples, refer to the Java Doc of individual methods on {@link HttpSecurity}.
+ * The most basic form based configuration can be seen below. The configuration will
+ * require that any URL that is requested will require a User with the role "ROLE_USER".
+ * It also defines an in memory authentication scheme with a user that has the username
+ * "user", the password "password", and the role "ROLE_USER". For additional examples,
+ * refer to the Java Doc of individual methods on {@link HttpSecurity}.
  *
  * <pre>
  * &#064;Configuration
  * &#064;EnableWebSecurity
  * public class FormLoginSecurityConfig extends WebSecurityConfigurerAdapter {
- *
- *     &#064;Override
- *     protected void configure(HttpSecurity http) throws Exception {
- *         http
- *             .authorizeRequests()
- *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
- *                 .and()
- *             .formLogin();
- *     }
- *
- *     &#064;Override
- *     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
- *         auth
- *              .inMemoryAuthentication()
- *                   .withUser(&quot;user&quot;)
- *                        .password(&quot;password&quot;)
- *                        .roles(&quot;USER&quot;);
- *     }
+ * 
+ * 	&#064;Override
+ * 	protected void configure(HttpSecurity http) throws Exception {
+ * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin();
+ * 	}
+ * 
+ * 	&#064;Override
+ * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+ * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+ * 	}
  * }
  * </pre>
  *
@@ -112,1241 +105,1085 @@ import org.springframework.util.Assert;
  * @since 3.2
  * @see EnableWebSecurity
  */
-public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<DefaultSecurityFilterChain,HttpSecurity> implements SecurityBuilder<DefaultSecurityFilterChain>, HttpSecurityBuilder<HttpSecurity> {
-    private final RequestMatcherConfigurer requestMatcherConfigurer = new RequestMatcherConfigurer();
-    private List<Filter> filters =  new ArrayList<Filter>();
-    private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
-    private FilterComparator comparitor = new FilterComparator();
+public final class HttpSecurity extends
+		AbstractConfiguredSecurityBuilder<DefaultSecurityFilterChain, HttpSecurity>
+		implements SecurityBuilder<DefaultSecurityFilterChain>,
+		HttpSecurityBuilder<HttpSecurity> {
+	private final RequestMatcherConfigurer requestMatcherConfigurer = new RequestMatcherConfigurer();
+	private List<Filter> filters = new ArrayList<Filter>();
+	private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
+	private FilterComparator comparitor = new FilterComparator();
 
-    /**
-     * Creates a new instance
-     * @param objectPostProcessor the {@link ObjectPostProcessor} that should be used
-     * @param authenticationBuilder the {@link AuthenticationManagerBuilder} to use for additional updates
-     * @param sharedObjects the shared Objects to initialize the {@link HttpSecurity} with
-     * @see WebSecurityConfiguration
-     */
-    public HttpSecurity(ObjectPostProcessor<Object> objectPostProcessor, AuthenticationManagerBuilder authenticationBuilder, Map<Class<Object>,Object> sharedObjects) {
-        super(objectPostProcessor);
-        Assert.notNull(authenticationBuilder, "authenticationBuilder cannot be null");
-        setSharedObject(AuthenticationManagerBuilder.class, authenticationBuilder);
-        for(Map.Entry<Class<Object>, Object> entry : sharedObjects.entrySet()) {
-            setSharedObject(entry.getKey(), entry.getValue());
-        }
-    }
+	/**
+	 * Creates a new instance
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} that should be used
+	 * @param authenticationBuilder the {@link AuthenticationManagerBuilder} to use for
+	 * additional updates
+	 * @param sharedObjects the shared Objects to initialize the {@link HttpSecurity} with
+	 * @see WebSecurityConfiguration
+	 */
+	public HttpSecurity(ObjectPostProcessor<Object> objectPostProcessor,
+			AuthenticationManagerBuilder authenticationBuilder,
+			Map<Class<Object>, Object> sharedObjects) {
+		super(objectPostProcessor);
+		Assert.notNull(authenticationBuilder, "authenticationBuilder cannot be null");
+		setSharedObject(AuthenticationManagerBuilder.class, authenticationBuilder);
+		for (Map.Entry<Class<Object>, Object> entry : sharedObjects.entrySet()) {
+			setSharedObject(entry.getKey(), entry.getValue());
+		}
+	}
 
-    /**
-     * Allows configuring OpenID based authentication.
-     *
-     * <h2>Example Configurations</h2>
-     *
-     * A basic example accepting the defaults and not using attribute exchange:
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class OpenIDLoginConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .openidLogin()
-     *                 .permitAll();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-     *         auth
-     *                 .inMemoryAuthentication()
-     *                     // the username must match the OpenID of the user you are
-     *                     // logging in with
-     *                     .withUser(&quot;https://www.google.com/accounts/o8/id?id=lmkCn9xzPdsxVwG7pjYMuDgNNdASFmobNkcRPaWU&quot;)
-     *                         .password(&quot;password&quot;)
-     *                         .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * A more advanced example demonstrating using attribute exchange and
-     * providing a custom AuthenticationUserDetailsService that will make any
-     * user that authenticates a valid user.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class OpenIDLoginConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .openidLogin()
-     *                 .loginPage(&quot;/login&quot;)
-     *                 .permitAll()
-     *                 .authenticationUserDetailsService(new AutoProvisioningUserDetailsService())
-     *                     .attributeExchange(&quot;https://www.google.com/.*&quot;)
-     *                         .attribute(&quot;email&quot;)
-     *                             .type(&quot;http://axschema.org/contact/email&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .attribute(&quot;firstname&quot;)
-     *                             .type(&quot;http://axschema.org/namePerson/first&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .attribute(&quot;lastname&quot;)
-     *                             .type(&quot;http://axschema.org/namePerson/last&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .and()
-     *                     .attributeExchange(&quot;.*yahoo.com.*&quot;)
-     *                         .attribute(&quot;email&quot;)
-     *                             .type(&quot;http://schema.openid.net/contact/email&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .attribute(&quot;fullname&quot;)
-     *                             .type(&quot;http://axschema.org/namePerson&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .and()
-     *                     .attributeExchange(&quot;.*myopenid.com.*&quot;)
-     *                         .attribute(&quot;email&quot;)
-     *                             .type(&quot;http://schema.openid.net/contact/email&quot;)
-     *                             .required(true)
-     *                             .and()
-     *                         .attribute(&quot;fullname&quot;)
-     *                             .type(&quot;http://schema.openid.net/namePerson&quot;)
-     *                             .required(true);
-     *     }
-     * }
-     *
-     * public class AutoProvisioningUserDetailsService implements
-     *         AuthenticationUserDetailsService&lt;OpenIDAuthenticationToken&gt; {
-     *     public UserDetails loadUserDetails(OpenIDAuthenticationToken token) throws UsernameNotFoundException {
-     *         return new User(token.getName(), &quot;NOTUSED&quot;, AuthorityUtils.createAuthorityList(&quot;ROLE_USER&quot;));
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link OpenIDLoginConfigurer} for further customizations.
-     *
-     * @throws Exception
-     * @see OpenIDLoginConfigurer
-     */
-    public OpenIDLoginConfigurer<HttpSecurity> openidLogin() throws Exception {
-        return getOrApply(new OpenIDLoginConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring OpenID based authentication.
+	 *
+	 * <h2>Example Configurations</h2>
+	 *
+	 * A basic example accepting the defaults and not using attribute exchange:
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class OpenIDLoginConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().openidLogin()
+	 * 				.permitAll();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication()
+	 * 				// the username must match the OpenID of the user you are
+	 * 				// logging in with
+	 * 				.withUser(
+	 * 						&quot;https://www.google.com/accounts/o8/id?id=lmkCn9xzPdsxVwG7pjYMuDgNNdASFmobNkcRPaWU&quot;)
+	 * 				.password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * A more advanced example demonstrating using attribute exchange and providing a
+	 * custom AuthenticationUserDetailsService that will make any user that authenticates
+	 * a valid user.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class OpenIDLoginConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) {
+	 * 		http.authorizeRequests()
+	 * 				.antMatchers(&quot;/**&quot;)
+	 * 				.hasRole(&quot;USER&quot;)
+	 * 				.and()
+	 * 				.openidLogin()
+	 * 				.loginPage(&quot;/login&quot;)
+	 * 				.permitAll()
+	 * 				.authenticationUserDetailsService(
+	 * 						new AutoProvisioningUserDetailsService())
+	 * 				.attributeExchange(&quot;https://www.google.com/.*&quot;).attribute(&quot;email&quot;)
+	 * 				.type(&quot;http://axschema.org/contact/email&quot;).required(true).and()
+	 * 				.attribute(&quot;firstname&quot;).type(&quot;http://axschema.org/namePerson/first&quot;)
+	 * 				.required(true).and().attribute(&quot;lastname&quot;)
+	 * 				.type(&quot;http://axschema.org/namePerson/last&quot;).required(true).and().and()
+	 * 				.attributeExchange(&quot;.*yahoo.com.*&quot;).attribute(&quot;email&quot;)
+	 * 				.type(&quot;http://schema.openid.net/contact/email&quot;).required(true).and()
+	 * 				.attribute(&quot;fullname&quot;).type(&quot;http://axschema.org/namePerson&quot;)
+	 * 				.required(true).and().and().attributeExchange(&quot;.*myopenid.com.*&quot;)
+	 * 				.attribute(&quot;email&quot;).type(&quot;http://schema.openid.net/contact/email&quot;)
+	 * 				.required(true).and().attribute(&quot;fullname&quot;)
+	 * 				.type(&quot;http://schema.openid.net/namePerson&quot;).required(true);
+	 * 	}
+	 * }
+	 * 
+	 * public class AutoProvisioningUserDetailsService implements
+	 * 		AuthenticationUserDetailsService&lt;OpenIDAuthenticationToken&gt; {
+	 * 	public UserDetails loadUserDetails(OpenIDAuthenticationToken token)
+	 * 			throws UsernameNotFoundException {
+	 * 		return new User(token.getName(), &quot;NOTUSED&quot;,
+	 * 				AuthorityUtils.createAuthorityList(&quot;ROLE_USER&quot;));
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link OpenIDLoginConfigurer} for further customizations.
+	 *
+	 * @throws Exception
+	 * @see OpenIDLoginConfigurer
+	 */
+	public OpenIDLoginConfigurer<HttpSecurity> openidLogin() throws Exception {
+		return getOrApply(new OpenIDLoginConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Adds the Security headers to the response. This is activated by default
-     * when using {@link WebSecurityConfigurerAdapter}'s default constructor.
-     * Only invoking the {@link #headers()} without invoking additional methods
-     * on it, or accepting the default provided by
-     * {@link WebSecurityConfigurerAdapter}, is the equivalent of:
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     * 	&#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .headers()
-     *                 .contentTypeOptions();
-     *                 .xssProtection()
-     *                 .cacheControl()
-     *                 .httpStrictTransportSecurity()
-     *                 .frameOptions()
-     *                 .and()
-     *             ...;
-     *     }
-     * }
-     * </pre>
-     *
-     * You can disable the headers using the following:
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     * 	&#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .headers().disable()
-     *             ...;
-     *     }
-     * }
-     * </pre>
-     *
-     * You can enable only a few of the headers by invoking the appropriate
-     * methods on {@link #headers()} result. For example, the following will
-     * enable {@link HeadersConfigurer#cacheControl()} and
-     * {@link HeadersConfigurer#frameOptions()} only.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     * 	&#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .headers()
-     *                 .cacheControl()
-     *                 .frameOptions()
-     *                 .and()
-     *             ...;
-     *     }
-     * }
-     * </pre>
-     *
-     * @return
-     * @throws Exception
-     * @see {@link HeadersConfigurer}
-     */
-    public HeadersConfigurer<HttpSecurity> headers() throws Exception {
-        return getOrApply(new HeadersConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Adds the Security headers to the response. This is activated by default when using
+	 * {@link WebSecurityConfigurerAdapter}'s default constructor. Only invoking the
+	 * {@link #headers()} without invoking additional methods on it, or accepting the
+	 * default provided by {@link WebSecurityConfigurerAdapter}, is the equivalent of:
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 *     protected void configure(HttpSecurity http) throws Exception {
+	 *         http
+	 *             .headers()
+	 *                 .contentTypeOptions();
+	 *                 .xssProtection()
+	 *                 .cacheControl()
+	 *                 .httpStrictTransportSecurity()
+	 *                 .frameOptions()
+	 *                 .and()
+	 *             ...;
+	 *     }
+	 * }
+	 * </pre>
+	 *
+	 * You can disable the headers using the following:
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 *     protected void configure(HttpSecurity http) throws Exception {
+	 *         http
+	 *             .headers().disable()
+	 *             ...;
+	 *     }
+	 * }
+	 * </pre>
+	 *
+	 * You can enable only a few of the headers by invoking the appropriate methods on
+	 * {@link #headers()} result. For example, the following will enable
+	 * {@link HeadersConfigurer#cacheControl()} and
+	 * {@link HeadersConfigurer#frameOptions()} only.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 *     protected void configure(HttpSecurity http) throws Exception {
+	 *         http
+	 *             .headers()
+	 *                 .cacheControl()
+	 *                 .frameOptions()
+	 *                 .and()
+	 *             ...;
+	 *     }
+	 * }
+	 * </pre>
+	 *
+	 * @return
+	 * @throws Exception
+	 * @see {@link HeadersConfigurer}
+	 */
+	public HeadersConfigurer<HttpSecurity> headers() throws Exception {
+		return getOrApply(new HeadersConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring of Session Management.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The following configuration demonstrates how to enforce that only a
-     * single instance of a user is authenticated at a time. If a user
-     * authenticates with the username "user" without logging out and an attempt
-     * to authenticate with "user" is made the first session will be forcibly
-     * terminated and sent to the "/login?expired" URL.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class SessionManagementSecurityConfig extends
-     *         WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .anyRequest().hasRole(&quot;USER&quot;)
-     *                 .and()
-     *            .formLogin()
-     *                 .permitAll()
-     *                 .and()
-     *            .sessionManagement()
-     *                 .maximumSessions(1)
-     *                 .expiredUrl(&quot;/login?expired&quot;);
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth.
-     *             inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * When using {@link SessionManagementConfigurer#maximumSessions(int)}, do
-     * not forget to configure {@link HttpSessionEventPublisher} for the
-     * application to ensure that expired sessions are cleaned up.
-     *
-     * In a web.xml this can be configured using the following:
-     *
-     * <pre>
-     * &lt;listener&gt;
-     *      &ltlistener-class&gt;org.springframework.security.web.session.HttpSessionEventPublisher&lt;/listener-class&gt;
-     * &lt/listener>
-     * </pre>
-     *
-     * Alternatively,
-     * {@link AbstractSecurityWebApplicationInitializer#enableHttpSessionEventPublisher()}
-     * could return true.
-     *
-     * @return the {@link SessionManagementConfigurer} for further
-     *         customizations
-     * @throws Exception
-     */
-    public SessionManagementConfigurer<HttpSecurity> sessionManagement() throws Exception {
-        return getOrApply(new SessionManagementConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring of Session Management.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The following configuration demonstrates how to enforce that only a single instance
+	 * of a user is authenticated at a time. If a user authenticates with the username
+	 * "user" without logging out and an attempt to authenticate with "user" is made the
+	 * first session will be forcibly terminated and sent to the "/login?expired" URL.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class SessionManagementSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().anyRequest().hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.permitAll().and().sessionManagement().maximumSessions(1)
+	 * 				.expiredUrl(&quot;/login?expired&quot;);
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * When using {@link SessionManagementConfigurer#maximumSessions(int)}, do not forget
+	 * to configure {@link HttpSessionEventPublisher} for the application to ensure that
+	 * expired sessions are cleaned up.
+	 *
+	 * In a web.xml this can be configured using the following:
+	 *
+	 * <pre>
+	 * &lt;listener&gt;
+	 *      &ltlistener-class&gt;org.springframework.security.web.session.HttpSessionEventPublisher&lt;/listener-class&gt;
+	 * &lt/listener>
+	 * </pre>
+	 *
+	 * Alternatively,
+	 * {@link AbstractSecurityWebApplicationInitializer#enableHttpSessionEventPublisher()}
+	 * could return true.
+	 *
+	 * @return the {@link SessionManagementConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public SessionManagementConfigurer<HttpSecurity> sessionManagement() throws Exception {
+		return getOrApply(new SessionManagementConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring a {@link PortMapper} that is available from
-     * {@link HttpSecurity#getSharedObject(Class)}. Other provided
-     * {@link SecurityConfigurer} objects use this configured
-     * {@link PortMapper} as a default {@link PortMapper} when redirecting from
-     * HTTP to HTTPS or from HTTPS to HTTP (for example when used in combination
-     * with {@link #requiresChannel()}. By default Spring Security uses a
-     * {@link PortMapperImpl} which maps the HTTP port 8080 to the HTTPS port
-     * 8443 and the HTTP port of 80 to the HTTPS port of 443.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The following configuration will ensure that redirects within Spring
-     * Security from HTTP of a port of 9090 will redirect to HTTPS port of 9443
-     * and the HTTP port of 80 to the HTTPS port of 443.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class PortMapperSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .permitAll()
-     *                 .and()
-     *                 // Example portMapper() configuration
-     *                 .portMapper()
-     *                     .http(9090).mapsTo(9443)
-     *                     .http(80).mapsTo(443);
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-     *         auth
-     *             .inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link PortMapperConfigurer} for further customizations
-     * @throws Exception
-     * @see {@link #requiresChannel()}
-     */
-    public PortMapperConfigurer<HttpSecurity> portMapper() throws Exception {
-        return getOrApply(new PortMapperConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring a {@link PortMapper} that is available from
+	 * {@link HttpSecurity#getSharedObject(Class)}. Other provided
+	 * {@link SecurityConfigurer} objects use this configured {@link PortMapper} as a
+	 * default {@link PortMapper} when redirecting from HTTP to HTTPS or from HTTPS to
+	 * HTTP (for example when used in combination with {@link #requiresChannel()}. By
+	 * default Spring Security uses a {@link PortMapperImpl} which maps the HTTP port 8080
+	 * to the HTTPS port 8443 and the HTTP port of 80 to the HTTPS port of 443.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The following configuration will ensure that redirects within Spring Security from
+	 * HTTP of a port of 9090 will redirect to HTTPS port of 9443 and the HTTP port of 80
+	 * to the HTTPS port of 443.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class PortMapperSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.permitAll().and()
+	 * 				// Example portMapper() configuration
+	 * 				.portMapper().http(9090).mapsTo(9443).http(80).mapsTo(443);
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link PortMapperConfigurer} for further customizations
+	 * @throws Exception
+	 * @see {@link #requiresChannel()}
+	 */
+	public PortMapperConfigurer<HttpSecurity> portMapper() throws Exception {
+		return getOrApply(new PortMapperConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Configures container based based pre authentication. In this case,
-     * authentication is managed by the Servlet Container.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The following configuration will use the principal found on the
-     * {@link HttpServletRequest} and if the user is in the role "ROLE_USER" or
-     * "ROLE_ADMIN" will add that to the resulting {@link Authentication}.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class JeeSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             // Example jee() configuration
-     *             .jee()
-     *                 .mappableRoles(&quot;ROLE_USER&quot;, &quot;ROLE_ADMIN&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * Developers wishing to use pre authentication with the container will need
-     * to ensure their web.xml configures the security constraints. For example,
-     * the web.xml (there is no equivalent Java based configuration supported by
-     * the Servlet specification) might look like:
-     *
-     * <pre>
-     * &lt;login-config&gt;
-     *     &lt;auth-method&gt;FORM&lt;/auth-method&gt;
-     *     &lt;form-login-config&gt;
-     *         &lt;form-login-page&gt;/login&lt;/form-login-page&gt;
-     *         &lt;form-error-page&gt;/login?error&lt;/form-error-page&gt;
-     *     &lt;/form-login-config&gt;
-     * &lt;/login-config&gt;
-     *
-     * &lt;security-role&gt;
-     *     &lt;role-name&gt;ROLE_USER&lt;/role-name&gt;
-     * &lt;/security-role&gt;
-     * &lt;security-constraint&gt;
-     *     &lt;web-resource-collection&gt;
-     *     &lt;web-resource-name&gt;Public&lt;/web-resource-name&gt;
-     *         &lt;description&gt;Matches unconstrained pages&lt;/description&gt;
-     *         &lt;url-pattern&gt;/login&lt;/url-pattern&gt;
-     *         &lt;url-pattern&gt;/logout&lt;/url-pattern&gt;
-     *         &lt;url-pattern&gt;/resources/*&lt;/url-pattern&gt;
-     *     &lt;/web-resource-collection&gt;
-     * &lt;/security-constraint&gt;
-     * &lt;security-constraint&gt;
-     *     &lt;web-resource-collection&gt;
-     *         &lt;web-resource-name&gt;Secured Areas&lt;/web-resource-name&gt;
-     *         &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
-     *     &lt;/web-resource-collection&gt;
-     *     &lt;auth-constraint&gt;
-     *         &lt;role-name&gt;ROLE_USER&lt;/role-name&gt;
-     *     &lt;/auth-constraint&gt;
-     * &lt;/security-constraint&gt;
-     * </pre>
-     *
-     * Last you will need to configure your container to contain the user with the
-     * correct roles. This configuration is specific to the Servlet Container, so consult
-     * your Servlet Container's documentation.
-     *
-     * @return the {@link JeeConfigurer} for further customizations
-     * @throws Exception
-     */
-    public JeeConfigurer<HttpSecurity> jee() throws Exception {
-        return getOrApply(new JeeConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Configures container based based pre authentication. In this case, authentication
+	 * is managed by the Servlet Container.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The following configuration will use the principal found on the
+	 * {@link HttpServletRequest} and if the user is in the role "ROLE_USER" or
+	 * "ROLE_ADMIN" will add that to the resulting {@link Authentication}.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class JeeSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
+	 * 		// Example jee() configuration
+	 * 				.jee().mappableRoles(&quot;ROLE_USER&quot;, &quot;ROLE_ADMIN&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * Developers wishing to use pre authentication with the container will need to ensure
+	 * their web.xml configures the security constraints. For example, the web.xml (there
+	 * is no equivalent Java based configuration supported by the Servlet specification)
+	 * might look like:
+	 *
+	 * <pre>
+	 * &lt;login-config&gt;
+	 *     &lt;auth-method&gt;FORM&lt;/auth-method&gt;
+	 *     &lt;form-login-config&gt;
+	 *         &lt;form-login-page&gt;/login&lt;/form-login-page&gt;
+	 *         &lt;form-error-page&gt;/login?error&lt;/form-error-page&gt;
+	 *     &lt;/form-login-config&gt;
+	 * &lt;/login-config&gt;
+	 * 
+	 * &lt;security-role&gt;
+	 *     &lt;role-name&gt;ROLE_USER&lt;/role-name&gt;
+	 * &lt;/security-role&gt;
+	 * &lt;security-constraint&gt;
+	 *     &lt;web-resource-collection&gt;
+	 *     &lt;web-resource-name&gt;Public&lt;/web-resource-name&gt;
+	 *         &lt;description&gt;Matches unconstrained pages&lt;/description&gt;
+	 *         &lt;url-pattern&gt;/login&lt;/url-pattern&gt;
+	 *         &lt;url-pattern&gt;/logout&lt;/url-pattern&gt;
+	 *         &lt;url-pattern&gt;/resources/*&lt;/url-pattern&gt;
+	 *     &lt;/web-resource-collection&gt;
+	 * &lt;/security-constraint&gt;
+	 * &lt;security-constraint&gt;
+	 *     &lt;web-resource-collection&gt;
+	 *         &lt;web-resource-name&gt;Secured Areas&lt;/web-resource-name&gt;
+	 *         &lt;url-pattern&gt;/*&lt;/url-pattern&gt;
+	 *     &lt;/web-resource-collection&gt;
+	 *     &lt;auth-constraint&gt;
+	 *         &lt;role-name&gt;ROLE_USER&lt;/role-name&gt;
+	 *     &lt;/auth-constraint&gt;
+	 * &lt;/security-constraint&gt;
+	 * </pre>
+	 *
+	 * Last you will need to configure your container to contain the user with the correct
+	 * roles. This configuration is specific to the Servlet Container, so consult your
+	 * Servlet Container's documentation.
+	 *
+	 * @return the {@link JeeConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public JeeConfigurer<HttpSecurity> jee() throws Exception {
+		return getOrApply(new JeeConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Configures X509 based pre authentication.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The following configuration will attempt to extract the username from
-     * the X509 certificate. Remember that the Servlet Container will need to be
-     * configured to request client certificates in order for this to work.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class X509SecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             // Example x509() configuration
-     *             .x509();
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link X509Configurer} for further customizations
-     * @throws Exception
-     */
-    public X509Configurer<HttpSecurity> x509() throws Exception {
-        return getOrApply(new X509Configurer<HttpSecurity>());
-    }
+	/**
+	 * Configures X509 based pre authentication.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The following configuration will attempt to extract the username from the X509
+	 * certificate. Remember that the Servlet Container will need to be configured to
+	 * request client certificates in order for this to work.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class X509SecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
+	 * 		// Example x509() configuration
+	 * 				.x509();
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link X509Configurer} for further customizations
+	 * @throws Exception
+	 */
+	public X509Configurer<HttpSecurity> x509() throws Exception {
+		return getOrApply(new X509Configurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring of Remember Me authentication.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The following configuration demonstrates how to allow token based remember me
-     * authentication. Upon authenticating if the HTTP parameter named "remember-me" exists,
-     * then the user will be remembered even after their {@link javax.servlet.http.HttpSession} expires.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class RememberMeSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .permitAll()
-     *                 .and()
-     *              // Example Remember Me Configuration
-     *             .rememberMe();
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link RememberMeConfigurer} for further customizations
-     * @throws Exception
-     */
-    public RememberMeConfigurer<HttpSecurity> rememberMe() throws Exception {
-        return getOrApply(new RememberMeConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring of Remember Me authentication.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The following configuration demonstrates how to allow token based remember me
+	 * authentication. Upon authenticating if the HTTP parameter named "remember-me"
+	 * exists, then the user will be remembered even after their
+	 * {@link javax.servlet.http.HttpSession} expires.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class RememberMeSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.permitAll().and()
+	 * 				// Example Remember Me Configuration
+	 * 				.rememberMe();
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link RememberMeConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public RememberMeConfigurer<HttpSecurity> rememberMe() throws Exception {
+		return getOrApply(new RememberMeConfigurer<HttpSecurity>());
+	}
 
+	/**
+	 * Allows restricting access based upon the {@link HttpServletRequest} using
+	 *
+	 * <h2>Example Configurations</h2>
+	 *
+	 * The most basic example is to configure all URLs to require the role "ROLE_USER".
+	 * The configuration below requires authentication to every URL and will grant access
+	 * to both the user "admin" and "user".
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class AuthorizeUrlsSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;)
+	 * 				.and().withUser(&quot;adminr&quot;).password(&quot;password&quot;).roles(&quot;ADMIN&quot;, &quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * We can also configure multiple URLs. The configuration below requires
+	 * authentication to every URL and will grant access to URLs starting with /admin/ to
+	 * only the "admin" user. All other URLs either user can access.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class AuthorizeUrlsSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/admin/**&quot;).hasRole(&quot;ADMIN&quot;)
+	 * 				.antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;)
+	 * 				.and().withUser(&quot;adminr&quot;).password(&quot;password&quot;).roles(&quot;ADMIN&quot;, &quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * Note that the matchers are considered in order. Therefore, the following is invalid
+	 * because the first matcher matches every request and will never get to the second
+	 * mapping:
+	 *
+	 * <pre>
+	 * http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).antMatchers(&quot;/admin/**&quot;)
+	 * 		.hasRole(&quot;ADMIN&quot;)
+	 * </pre>
+	 *
+	 * @see #requestMatcher(RequestMatcher)
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry authorizeRequests()
+			throws Exception {
+		return getOrApply(new ExpressionUrlAuthorizationConfigurer<HttpSecurity>())
+				.getRegistry();
+	}
 
-    /**
-     * Allows restricting access based upon the {@link HttpServletRequest} using
-     *
-     * <h2>Example Configurations</h2>
-     *
-     * The most basic example is to configure all URLs to require the role "ROLE_USER". The
-     * configuration below requires authentication to every URL and will grant access to
-     * both the user "admin" and "user".
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class AuthorizeUrlsSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;)
-     *                        .and()
-     *                   .withUser(&quot;adminr&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;ADMIN&quot;,&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * We can also configure multiple URLs. The configuration below requires authentication to every URL
-     * and will grant access to URLs starting with /admin/ to only the "admin" user. All other URLs either
-     * user can access.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class AuthorizeUrlsSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/admin/**&quot;).hasRole(&quot;ADMIN&quot;)
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;)
-     *                        .and()
-     *                   .withUser(&quot;adminr&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;ADMIN&quot;,&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * Note that the matchers are considered in order. Therefore, the following is invalid because the first
-     * matcher matches every request and will never get to the second mapping:
-     *
-     * <pre>
-     * http
-     *     .authorizeRequests()
-     *         .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *         .antMatchers(&quot;/admin/**&quot;).hasRole(&quot;ADMIN&quot;)
-     * </pre>
-     *
-     * @see #requestMatcher(RequestMatcher)
-     *
-     * @return
-     * @throws Exception
-     */
-    public ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry authorizeRequests() throws Exception {
-        return getOrApply(new ExpressionUrlAuthorizationConfigurer<HttpSecurity>()).getRegistry();
-    }
+	/**
+	 * Allows configuring the Request Cache. For example, a protected page (/protected)
+	 * may be requested prior to authentication. The application will redirect the user to
+	 * a login page. After authentication, Spring Security will redirect the user to the
+	 * originally requested protected page (/protected). This is automatically applied
+	 * when using {@link WebSecurityConfigurerAdapter}.
+	 *
+	 * @return the {@link RequestCacheConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public RequestCacheConfigurer<HttpSecurity> requestCache() throws Exception {
+		return getOrApply(new RequestCacheConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring the Request Cache. For example, a protected page (/protected) may be requested prior
-     * to authentication. The application will redirect the user to a login page. After authentication, Spring
-     * Security will redirect the user to the originally requested protected page (/protected). This is
-     * automatically applied when using {@link WebSecurityConfigurerAdapter}.
-     *
-     * @return the {@link RequestCacheConfigurer} for further customizations
-     * @throws Exception
-     */
-    public RequestCacheConfigurer<HttpSecurity> requestCache() throws Exception {
-        return getOrApply(new RequestCacheConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring exception handling. This is automatically applied when using
+	 * {@link WebSecurityConfigurerAdapter}.
+	 *
+	 * @return the {@link ExceptionHandlingConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public ExceptionHandlingConfigurer<HttpSecurity> exceptionHandling() throws Exception {
+		return getOrApply(new ExceptionHandlingConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring exception handling. This is automatically applied when using
-     * {@link WebSecurityConfigurerAdapter}.
-     *
-     * @return the {@link ExceptionHandlingConfigurer} for further customizations
-     * @throws Exception
-     */
-    public ExceptionHandlingConfigurer<HttpSecurity> exceptionHandling() throws Exception {
-        return getOrApply(new ExceptionHandlingConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Sets up management of the {@link SecurityContext} on the
+	 * {@link SecurityContextHolder} between {@link HttpServletRequest}'s. This is
+	 * automatically applied when using {@link WebSecurityConfigurerAdapter}.
+	 *
+	 * @return the {@link SecurityContextConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public SecurityContextConfigurer<HttpSecurity> securityContext() throws Exception {
+		return getOrApply(new SecurityContextConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Sets up management of the {@link SecurityContext} on the
-     * {@link SecurityContextHolder} between {@link HttpServletRequest}'s. This is automatically
-     * applied when using {@link WebSecurityConfigurerAdapter}.
-     *
-     * @return the {@link SecurityContextConfigurer} for further customizations
-     * @throws Exception
-     */
-    public SecurityContextConfigurer<HttpSecurity> securityContext() throws Exception {
-        return getOrApply(new SecurityContextConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Integrates the {@link HttpServletRequest} methods with the values found on the
+	 * {@link SecurityContext}. This is automatically applied when using
+	 * {@link WebSecurityConfigurerAdapter}.
+	 *
+	 * @return the {@link ServletApiConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public ServletApiConfigurer<HttpSecurity> servletApi() throws Exception {
+		return getOrApply(new ServletApiConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Integrates the {@link HttpServletRequest} methods with the values found
-     * on the {@link SecurityContext}. This is automatically applied when using
-     * {@link WebSecurityConfigurerAdapter}.
-     *
-     * @return the {@link ServletApiConfigurer} for further customizations
-     * @throws Exception
-     */
-    public ServletApiConfigurer<HttpSecurity> servletApi() throws Exception {
-        return getOrApply(new ServletApiConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Adds CSRF support. This is activated by default when using
+	 * {@link WebSecurityConfigurerAdapter}'s default constructor. You can disable it
+	 * using:
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 *     protected void configure(HttpSecurity http) throws Exception {
+	 *         http
+	 *             .csrf().disable()
+	 *             ...;
+	 *     }
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link ServletApiConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public CsrfConfigurer<HttpSecurity> csrf() throws Exception {
+		return getOrApply(new CsrfConfigurer<HttpSecurity>());
+	}
 
+	/**
+	 * Provides logout support. This is automatically applied when using
+	 * {@link WebSecurityConfigurerAdapter}. The default is that accessing the URL
+	 * "/logout" will log the user out by invalidating the HTTP Session, cleaning up any
+	 * {@link #rememberMe()} authentication that was configured, clearing the
+	 * {@link SecurityContextHolder}, and then redirect to "/login?success".
+	 *
+	 * <h2>Example Custom Configuration</h2>
+	 *
+	 * The following customization to log out when the URL "/custom-logout" is invoked.
+	 * Log out will remove the cookie named "remove", not invalidate the HttpSession,
+	 * clear the SecurityContextHolder, and upon completion redirect to "/logout-success".
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class LogoutSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.and()
+	 * 				// sample logout customization
+	 * 				.logout().logout().deleteCookies(&quot;remove&quot;).invalidateHttpSession(false)
+	 * 				.logoutUrl(&quot;/custom-logout&quot;).logoutSuccessUrl(&quot;/logout-success&quot;);
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public LogoutConfigurer<HttpSecurity> logout() throws Exception {
+		return getOrApply(new LogoutConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Adds CSRF support. This is activated by default when using
-     * {@link WebSecurityConfigurerAdapter}'s default constructor. You can
-     * disable it using:
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class CsrfSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .csrf().disable()
-     *             ...;
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link ServletApiConfigurer} for further customizations
-     * @throws Exception
-     */
-    public CsrfConfigurer<HttpSecurity> csrf() throws Exception {
-        return getOrApply(new CsrfConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Allows configuring how an anonymous user is represented. This is automatically
+	 * applied when used in conjunction with {@link WebSecurityConfigurerAdapter}. By
+	 * default anonymous users will be represented with an
+	 * {@link org.springframework.security.authentication.AnonymousAuthenticationToken}
+	 * and contain the role "ROLE_ANONYMOUS".
+	 *
+	 * <h2>Example Configuration</h2
+	 *
+	 * The following configuration demonstrates how to specify that anonymous users should
+	 * contain the role "ROLE_ANON" instead.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class AnononymousSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.and()
+	 * 				// sample anonymous customization
+	 * 				.anonymous().authorities(&quot;ROLE_ANON&quot;);
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * The following demonstrates how to represent anonymous users as null. Note that this
+	 * can cause {@link NullPointerException} in code that assumes anonymous
+	 * authentication is enabled.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class AnononymousSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.and()
+	 * 				// sample anonymous customization
+	 * 				.anonymous().disabled();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public AnonymousConfigurer<HttpSecurity> anonymous() throws Exception {
+		return getOrApply(new AnonymousConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Provides logout support. This is automatically applied when using
-     * {@link WebSecurityConfigurerAdapter}. The default is that accessing
-     * the URL "/logout" will log the user out by invalidating the HTTP Session,
-     * cleaning up any {@link #rememberMe()} authentication that was configured,
-     * clearing the {@link SecurityContextHolder}, and then redirect to
-     * "/login?success".
-     *
-     * <h2>Example Custom Configuration</h2>
-     *
-     * The following customization to log out when the URL "/custom-logout" is
-     * invoked. Log out will remove the cookie named "remove", not invalidate the
-     * HttpSession, clear the SecurityContextHolder, and upon completion redirect
-     * to "/logout-success".
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class LogoutSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .and()
-     *             // sample logout customization
-     *             .logout()
-     *                 .logout()
-     *                    .deleteCookies("remove")
-     *                    .invalidateHttpSession(false)
-     *                    .logoutUrl("/custom-logout")
-     *                    .logoutSuccessUrl("/logout-success");
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @return
-     * @throws Exception
-     */
-    public LogoutConfigurer<HttpSecurity> logout() throws Exception {
-        return getOrApply(new LogoutConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Specifies to support form based authentication. If
+	 * {@link FormLoginConfigurer#loginPage(String)} is not specified a default login page
+	 * will be generated.
+	 *
+	 * <h2>Example Configurations</h2>
+	 *
+	 * The most basic configuration defaults to automatically generating a login page at
+	 * the URL "/login", redirecting to "/login?error" for authentication failure. The
+	 * details of the login page can be found on
+	 * {@link FormLoginConfigurer#loginPage(String)}
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class FormLoginSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * The configuration below demonstrates customizing the defaults.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class FormLoginSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.usernameParameter(&quot;username&quot;) // default is username
+	 * 				.passwordParameter(&quot;password&quot;) // default is password
+	 * 				.loginPage(&quot;/authentication/login&quot;) // default is /login with an HTTP get
+	 * 				.failureUrl(&quot;/authentication/login?failed&quot;) // default is /login?error
+	 * 				.loginProcessingUrl(&quot;/authentication/login/process&quot;); // default is /login
+	 * 																		// with an HTTP
+	 * 																		// post
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @see FormLoginConfigurer#loginPage(String)
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	public FormLoginConfigurer<HttpSecurity> formLogin() throws Exception {
+		return getOrApply(new FormLoginConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Allows configuring how an anonymous user is represented. This is automatically applied
-     * when used in conjunction with {@link WebSecurityConfigurerAdapter}. By default anonymous
-     * users will be represented with an {@link org.springframework.security.authentication.AnonymousAuthenticationToken} and contain the role
-     * "ROLE_ANONYMOUS".
-     *
-     * <h2>Example Configuration</h2
-     *
-     * The following configuration demonstrates how to specify that anonymous users should contain
-     * the role "ROLE_ANON" instead.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class AnononymousSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .and()
-     *             // sample anonymous customization
-     *             .anonymous()
-     *                 .authorities("ROLE_ANON");
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * The following demonstrates how to represent anonymous users as null. Note that this can cause
-     * {@link NullPointerException} in code that assumes anonymous authentication is enabled.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class AnononymousSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .and()
-     *             // sample anonymous customization
-     *             .anonymous()
-     *                 .disabled();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @return
-     * @throws Exception
-     */
-    public AnonymousConfigurer<HttpSecurity> anonymous() throws Exception {
-        return getOrApply(new AnonymousConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Configures channel security. In order for this configuration to be useful at least
+	 * one mapping to a required channel must be provided.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The example below demonstrates how to require HTTPs for every request. Only
+	 * requiring HTTPS for some requests is supported, but not recommended since an
+	 * application that allows for HTTP introduces many security vulnerabilities. For one
+	 * such example, read about <a
+	 * href="http://en.wikipedia.org/wiki/Firesheep">Firesheep</a>.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class ChannelSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().formLogin()
+	 * 				.and().requiresChannel().anyRequest().requiresSecure();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 *
+	 * @return the {@link ChannelSecurityConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public ChannelSecurityConfigurer<HttpSecurity>.ChannelRequestMatcherRegistry requiresChannel()
+			throws Exception {
+		return getOrApply(new ChannelSecurityConfigurer<HttpSecurity>()).getRegistry();
+	}
 
-    /**
-     * Specifies to support form based authentication. If
-     * {@link FormLoginConfigurer#loginPage(String)} is not specified a
-     * default login page will be generated.
-     *
-     * <h2>Example Configurations</h2>
-     *
-     * The most basic configuration defaults to automatically generating a login
-     * page at the URL "/login", redirecting to "/login?error" for
-     * authentication failure. The details of the login page can be found on
-     * {@link FormLoginConfigurer#loginPage(String)}
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class FormLoginSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * The configuration below demonstrates customizing the defaults.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class FormLoginSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                    .usernameParameter("username") // default is username
-     *                    .passwordParameter("password") // default is password
-     *                    .loginPage("/authentication/login") // default is /login with an HTTP get
-     *                    .failureUrl("/authentication/login?failed") // default is /login?error
-     *                    .loginProcessingUrl("/authentication/login/process"); // default is /login with an HTTP post
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @see FormLoginConfigurer#loginPage(String)
-     *
-     * @return
-     * @throws Exception
-     */
-    public FormLoginConfigurer<HttpSecurity> formLogin() throws Exception {
-        return getOrApply(new FormLoginConfigurer<HttpSecurity>());
-    }
+	/**
+	 * Configures HTTP Basic authentication.
+	 *
+	 * <h2>Example Configuration</h2>
+	 *
+	 * The example below demonstrates how to configure HTTP Basic authentication for an
+	 * application. The default realm is "Spring Security Application", but can be
+	 * customized using {@link HttpBasicConfigurer#realmName(String)}.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class HttpBasicSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().httpBasic();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link HttpBasicConfigurer} for further customizations
+	 * @throws Exception
+	 */
+	public HttpBasicConfigurer<HttpSecurity> httpBasic() throws Exception {
+		return getOrApply(new HttpBasicConfigurer<HttpSecurity>());
+	}
 
-    /**
-     * Configures channel security. In order for this configuration to be useful at least
-     * one mapping to a required channel must be provided.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The example below demonstrates how to require HTTPs for every request. Only requiring HTTPS
-     * for some requests is supported, but not recommended since an application that allows for HTTP
-     * introduces many security vulnerabilities. For one such example, read about
-     * <a href="http://en.wikipedia.org/wiki/Firesheep">Firesheep</a>.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class ChannelSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;)
-     *                 .and()
-     *             .formLogin()
-     *                 .and()
-     *             .requiresChannel()
-     *                 .anyRequest().requiresSecure();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *              .inMemoryAuthentication()
-     *                   .withUser(&quot;user&quot;)
-     *                        .password(&quot;password&quot;)
-     *                        .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     *
-     * @return the {@link ChannelSecurityConfigurer} for further customizations
-     * @throws Exception
-     */
-    public ChannelSecurityConfigurer<HttpSecurity>.ChannelRequestMatcherRegistry requiresChannel() throws Exception {
-        return getOrApply(new ChannelSecurityConfigurer<HttpSecurity>()).getRegistry();
-    }
+	@Override
+	protected void beforeConfigure() throws Exception {
+		setSharedObject(AuthenticationManager.class, getAuthenticationRegistry().build());
+	}
 
-    /**
-     * Configures HTTP Basic authentication.
-     *
-     * <h2>Example Configuration</h2>
-     *
-     * The example below demonstrates how to configure HTTP Basic authentication
-     * for an application. The default realm is "Spring Security Application",
-     * but can be customized using
-     * {@link HttpBasicConfigurer#realmName(String)}.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class HttpBasicSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
-     *                 .httpBasic();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *             .inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link HttpBasicConfigurer} for further customizations
-     * @throws Exception
-     */
-    public HttpBasicConfigurer<HttpSecurity> httpBasic() throws Exception {
-        return getOrApply(new HttpBasicConfigurer<HttpSecurity>());
-    }
+	@Override
+	protected DefaultSecurityFilterChain performBuild() throws Exception {
+		Collections.sort(filters, comparitor);
+		return new DefaultSecurityFilterChain(requestMatcher, filters);
+	}
 
-    @Override
-    protected void beforeConfigure() throws Exception {
-        setSharedObject(AuthenticationManager.class,getAuthenticationRegistry().build());
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.HttpBuilder#authenticationProvider
+	 * (org.springframework.security.authentication.AuthenticationProvider)
+	 */
+	public HttpSecurity authenticationProvider(
+			AuthenticationProvider authenticationProvider) {
+		getAuthenticationRegistry().authenticationProvider(authenticationProvider);
+		return this;
+	}
 
-    @Override
-    protected DefaultSecurityFilterChain performBuild() throws Exception {
-        Collections.sort(filters,comparitor);
-        return new DefaultSecurityFilterChain(requestMatcher, filters);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.HttpBuilder#userDetailsService
+	 * (org.springframework.security.core.userdetails.UserDetailsService)
+	 */
+	public HttpSecurity userDetailsService(UserDetailsService userDetailsService)
+			throws Exception {
+		getAuthenticationRegistry().userDetailsService(userDetailsService);
+		return this;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.HttpBuilder#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)
-     */
-    public HttpSecurity authenticationProvider(AuthenticationProvider authenticationProvider) {
-        getAuthenticationRegistry().authenticationProvider(authenticationProvider);
-        return this;
-    }
+	private AuthenticationManagerBuilder getAuthenticationRegistry() {
+		return getSharedObject(AuthenticationManagerBuilder.class);
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.HttpBuilder#userDetailsService(org.springframework.security.core.userdetails.UserDetailsService)
-     */
-    public HttpSecurity userDetailsService(UserDetailsService userDetailsService) throws Exception {
-        getAuthenticationRegistry().userDetailsService(userDetailsService);
-        return this;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.HttpBuilder#addFilterAfter(javax
+	 * .servlet.Filter, java.lang.Class)
+	 */
+	public HttpSecurity addFilterAfter(Filter filter, Class<? extends Filter> afterFilter) {
+		comparitor.registerAfter(filter.getClass(), afterFilter);
+		return addFilter(filter);
+	}
 
-    private AuthenticationManagerBuilder getAuthenticationRegistry() {
-        return getSharedObject(AuthenticationManagerBuilder.class);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.HttpBuilder#addFilterBefore(
+	 * javax.servlet.Filter, java.lang.Class)
+	 */
+	public HttpSecurity addFilterBefore(Filter filter,
+			Class<? extends Filter> beforeFilter) {
+		comparitor.registerBefore(filter.getClass(), beforeFilter);
+		return addFilter(filter);
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.HttpBuilder#addFilterAfter(javax.servlet.Filter, java.lang.Class)
-     */
-    public HttpSecurity addFilterAfter(Filter filter, Class<? extends Filter> afterFilter) {
-        comparitor.registerAfter(filter.getClass(), afterFilter);
-        return addFilter(filter);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.config.annotation.web.HttpBuilder#addFilter(javax.
+	 * servlet.Filter)
+	 */
+	public HttpSecurity addFilter(Filter filter) {
+		Class<? extends Filter> filterClass = filter.getClass();
+		if (!comparitor.isRegistered(filterClass)) {
+			throw new IllegalArgumentException(
+					"The Filter class "
+							+ filterClass.getName()
+							+ " does not have a registered order and cannot be added without a specified order. Consider using addFilterBefore or addFilterAfter instead.");
+		}
+		this.filters.add(filter);
+		return this;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.HttpBuilder#addFilterBefore(javax.servlet.Filter, java.lang.Class)
-     */
-    public HttpSecurity addFilterBefore(Filter filter, Class<? extends Filter> beforeFilter) {
-        comparitor.registerBefore(filter.getClass(), beforeFilter);
-        return addFilter(filter);
-    }
+	/**
+	 * Allows specifying which {@link HttpServletRequest} instances this
+	 * {@link HttpSecurity} will be invoked on. This method allows for easily invoking the
+	 * {@link HttpSecurity} for multiple different {@link RequestMatcher} instances. If
+	 * only a single {@link RequestMatcher} is necessary consider using
+	 * {@link #antMatcher(String)}, {@link #regexMatcher(String)}, or
+	 * {@link #requestMatcher(RequestMatcher)}.
+	 *
+	 * <p>
+	 * Invoking {@link #requestMatchers()} will override previous invocations of
+	 * {@link #requestMatchers()}, {@link #antMatcher(String)},
+	 * {@link #regexMatcher(String)}, and {@link #requestMatcher(RequestMatcher)}.
+	 * </p>
+	 *
+	 * <h3>Example Configurations</h3>
+	 *
+	 * The following configuration enables the {@link HttpSecurity} for URLs that begin
+	 * with "/api/" or "/oauth/".
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.requestMatchers().antMatchers(&quot;/api/**&quot;, &quot;/oauth/**&quot;).and()
+	 * 				.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().httpBasic();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * The configuration below is the same as the previous configuration.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.requestMatchers().antMatchers(&quot;/api/**&quot;).antMatchers(&quot;/oauth/**&quot;).and()
+	 * 				.authorizeRequests().antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and().httpBasic();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * The configuration below is also the same as the above configuration.
+	 *
+	 * <pre>
+	 * &#064;Configuration
+	 * &#064;EnableWebSecurity
+	 * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(HttpSecurity http) throws Exception {
+	 * 		http.requestMatchers().antMatchers(&quot;/api/**&quot;).and().requestMatchers()
+	 * 				.antMatchers(&quot;/oauth/**&quot;).and().authorizeRequests().antMatchers(&quot;/**&quot;)
+	 * 				.hasRole(&quot;USER&quot;).and().httpBasic();
+	 * 	}
+	 * 
+	 * 	&#064;Override
+	 * 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+	 * 		auth.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;);
+	 * 	}
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link RequestMatcherConfigurer} for further customizations
+	 */
+	public RequestMatcherConfigurer requestMatchers() {
+		return requestMatcherConfigurer;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.HttpBuilder#addFilter(javax.servlet.Filter)
-     */
-    public HttpSecurity addFilter(Filter filter) {
-        Class<? extends Filter> filterClass = filter.getClass();
-        if(!comparitor.isRegistered(filterClass)) {
-            throw new IllegalArgumentException(
-                    "The Filter class " + filterClass.getName()
-                            + " does not have a registered order and cannot be added without a specified order. Consider using addFilterBefore or addFilterAfter instead.");
-        }
-        this.filters.add(filter);
-        return this;
-    }
+	/**
+	 * Allows configuring the {@link HttpSecurity} to only be invoked when matching the
+	 * provided {@link RequestMatcher}. If more advanced configuration is necessary,
+	 * consider using {@link #requestMatchers()}.
+	 *
+	 * <p>
+	 * Invoking {@link #requestMatcher(RequestMatcher)} will override previous invocations
+	 * of {@link #requestMatchers()}, {@link #antMatcher(String)},
+	 * {@link #regexMatcher(String)}, and {@link #requestMatcher(RequestMatcher)}.
+	 * </p>
+	 *
+	 * @param requestMatcher the {@link RequestMatcher} to use (i.e. new
+	 * AntPathRequestMatcher("/admin/**","GET") )
+	 * @return the {@link HttpSecurity} for further customizations
+	 * @see #requestMatchers()
+	 * @see #antMatcher(String)
+	 * @see #regexMatcher(String)
+	 */
+	public HttpSecurity requestMatcher(RequestMatcher requestMatcher) {
+		this.requestMatcher = requestMatcher;
+		return this;
+	}
 
-    /**
-     * Allows specifying which {@link HttpServletRequest} instances this
-     * {@link HttpSecurity} will be invoked on.  This method allows for
-     * easily invoking the {@link HttpSecurity} for multiple
-     * different {@link RequestMatcher} instances. If only a single {@link RequestMatcher}
-     * is necessary consider using {@link #antMatcher(String)},
-     * {@link #regexMatcher(String)}, or {@link #requestMatcher(RequestMatcher)}.
-     *
-     * <p>
-     * Invoking {@link #requestMatchers()} will override previous invocations of
-     * {@link #requestMatchers()}, {@link #antMatcher(String)}, {@link #regexMatcher(String)},
-     * and {@link #requestMatcher(RequestMatcher)}.
-     * </p>
-     *
-     * <h3>Example Configurations</h3>
-     *
-     * The following configuration enables the {@link HttpSecurity} for URLs that
-     * begin with "/api/" or "/oauth/".
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .requestMatchers()
-     *                 .antMatchers("/api/**","/oauth/**")
-     *                 .and()
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
-     *                 .httpBasic();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *             .inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * The configuration below is the same as the previous configuration.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .requestMatchers()
-     *                 .antMatchers("/api/**")
-     *                 .antMatchers("/oauth/**")
-     *                 .and()
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
-     *                 .httpBasic();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *             .inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * The configuration below is also the same as the above configuration.
-     *
-     * <pre>
-     * &#064;Configuration
-     * &#064;EnableWebSecurity
-     * public class RequestMatchersSecurityConfig extends WebSecurityConfigurerAdapter {
-     *
-     *     &#064;Override
-     *     protected void configure(HttpSecurity http) throws Exception {
-     *         http
-     *             .requestMatchers()
-     *                 .antMatchers("/api/**")
-     *                 .and()
-     *             .requestMatchers()
-     *                 .antMatchers("/oauth/**")
-     *                 .and()
-     *             .authorizeRequests()
-     *                 .antMatchers(&quot;/**&quot;).hasRole(&quot;USER&quot;).and()
-     *                 .httpBasic();
-     *     }
-     *
-     *     &#064;Override
-     *     protected void configure(AuthenticationManagerBuilder auth)
-     *             throws Exception {
-     *         auth
-     *             .inMemoryAuthentication()
-     *                 .withUser(&quot;user&quot;)
-     *                     .password(&quot;password&quot;)
-     *                     .roles(&quot;USER&quot;);
-     *     }
-     * }
-     * </pre>
-     *
-     * @return the {@link RequestMatcherConfigurer} for further customizations
-     */
-    public RequestMatcherConfigurer requestMatchers() {
-        return requestMatcherConfigurer;
-    }
+	/**
+	 * Allows configuring the {@link HttpSecurity} to only be invoked when matching the
+	 * provided ant pattern. If more advanced configuration is necessary, consider using
+	 * {@link #requestMatchers()} or {@link #requestMatcher(RequestMatcher)}.
+	 *
+	 * <p>
+	 * Invoking {@link #antMatcher(String)} will override previous invocations of
+	 * {@link #requestMatchers()}, {@link #antMatcher(String)},
+	 * {@link #regexMatcher(String)}, and {@link #requestMatcher(RequestMatcher)}.
+	 * </p>
+	 *
+	 * @param antPattern the Ant Pattern to match on (i.e. "/admin/**")
+	 * @return the {@link HttpSecurity} for further customizations
+	 * @see AntPathRequestMatcher
+	 */
+	public HttpSecurity antMatcher(String antPattern) {
+		return requestMatcher(new AntPathRequestMatcher(antPattern));
+	}
 
-    /**
-     * Allows configuring the {@link HttpSecurity} to only be invoked when
-     * matching the provided {@link RequestMatcher}. If more advanced configuration is
-     * necessary, consider using {@link #requestMatchers()}.
-     *
-     * <p>
-     * Invoking {@link #requestMatcher(RequestMatcher)} will override previous invocations of
-     * {@link #requestMatchers()}, {@link #antMatcher(String)}, {@link #regexMatcher(String)},
-     * and {@link #requestMatcher(RequestMatcher)}.
-     * </p>
-     *
-     * @param requestMatcher the {@link RequestMatcher} to use (i.e. new AntPathRequestMatcher("/admin/**","GET") )
-     * @return the {@link HttpSecurity} for further customizations
-     * @see #requestMatchers()
-     * @see #antMatcher(String)
-     * @see #regexMatcher(String)
-     */
-    public HttpSecurity requestMatcher(RequestMatcher requestMatcher) {
-        this.requestMatcher = requestMatcher;
-        return this;
-    }
+	/**
+	 * Allows configuring the {@link HttpSecurity} to only be invoked when matching the
+	 * provided regex pattern. If more advanced configuration is necessary, consider using
+	 * {@link #requestMatchers()} or {@link #requestMatcher(RequestMatcher)}.
+	 *
+	 * <p>
+	 * Invoking {@link #regexMatcher(String)} will override previous invocations of
+	 * {@link #requestMatchers()}, {@link #antMatcher(String)},
+	 * {@link #regexMatcher(String)}, and {@link #requestMatcher(RequestMatcher)}.
+	 * </p>
+	 *
+	 * @param pattern the Regular Expression to match on (i.e. "/admin/.+")
+	 * @return the {@link HttpSecurity} for further customizations
+	 * @see RegexRequestMatcher
+	 */
+	public HttpSecurity regexMatcher(String pattern) {
+		return requestMatcher(new RegexRequestMatcher(pattern, null));
+	}
 
-    /**
-     * Allows configuring the {@link HttpSecurity} to only be invoked when
-     * matching the provided ant pattern. If more advanced configuration is
-     * necessary, consider using {@link #requestMatchers()} or
-     * {@link #requestMatcher(RequestMatcher)}.
-     *
-     * <p>
-     * Invoking {@link #antMatcher(String)} will override previous invocations of
-     * {@link #requestMatchers()}, {@link #antMatcher(String)}, {@link #regexMatcher(String)},
-     * and {@link #requestMatcher(RequestMatcher)}.
-     * </p>
-     *
-     * @param antPattern the Ant Pattern to match on (i.e. "/admin/**")
-     * @return the {@link HttpSecurity} for further customizations
-     * @see AntPathRequestMatcher
-     */
-    public HttpSecurity antMatcher(String antPattern) {
-        return requestMatcher(new AntPathRequestMatcher(antPattern));
-    }
+	/**
+	 * Allows mapping HTTP requests that this {@link HttpSecurity} will be used for
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public final class RequestMatcherConfigurer extends
+			AbstractRequestMatcherRegistry<RequestMatcherConfigurer> {
+		private List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
 
-    /**
-     * Allows configuring the {@link HttpSecurity} to only be invoked when
-     * matching the provided regex pattern. If more advanced configuration is
-     * necessary, consider using {@link #requestMatchers()} or
-     * {@link #requestMatcher(RequestMatcher)}.
-     *
-     * <p>
-     * Invoking {@link #regexMatcher(String)} will override previous invocations of
-     * {@link #requestMatchers()}, {@link #antMatcher(String)}, {@link #regexMatcher(String)},
-     * and {@link #requestMatcher(RequestMatcher)}.
-     * </p>
-     *
-     * @param pattern the Regular Expression to match on (i.e. "/admin/.+")
-     * @return the {@link HttpSecurity} for further customizations
-     * @see RegexRequestMatcher
-     */
-    public HttpSecurity regexMatcher(String pattern) {
-        return requestMatcher(new RegexRequestMatcher(pattern, null));
-    }
+		protected RequestMatcherConfigurer chainRequestMatchers(
+				List<RequestMatcher> requestMatchers) {
+			matchers.addAll(requestMatchers);
+			requestMatcher(new OrRequestMatcher(matchers));
+			return this;
+		}
 
-    /**
-     * Allows mapping HTTP requests that this {@link HttpSecurity} will be used for
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public final class RequestMatcherConfigurer extends AbstractRequestMatcherRegistry<RequestMatcherConfigurer> {
-        private List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+		/**
+		 * Return the {@link HttpSecurity} for further customizations
+		 *
+		 * @return the {@link HttpSecurity} for further customizations
+		 */
+		public HttpSecurity and() {
+			return HttpSecurity.this;
+		}
 
-        protected RequestMatcherConfigurer chainRequestMatchers(List<RequestMatcher> requestMatchers) {
-            matchers.addAll(requestMatchers);
-            requestMatcher(new OrRequestMatcher(matchers));
-            return this;
-        }
+		private RequestMatcherConfigurer() {
+		}
+	}
 
-        /**
-         * Return the {@link HttpSecurity} for further customizations
-         *
-         * @return the {@link HttpSecurity} for further customizations
-         */
-        public HttpSecurity and() {
-            return HttpSecurity.this;
-        }
-
-        private RequestMatcherConfigurer(){}
-    }
-
-    /**
-     * If the {@link SecurityConfigurer} has already been specified get the original, otherwise apply the new {@link SecurityConfigurerAdapter}.
-     *
-     * @param configurer the {@link SecurityConfigurer} to apply if one is not found for this {@link SecurityConfigurer} class.
-     * @return the current {@link SecurityConfigurer} for the configurer passed in
-     * @throws Exception
-     */
-    @SuppressWarnings("unchecked")
-    private <C extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity>> C getOrApply(C configurer)
-            throws Exception {
-        C existingConfig = (C) getConfigurer(configurer.getClass());
-        if(existingConfig != null) {
-            return existingConfig;
-        }
-        return apply(configurer);
-    }
+	/**
+	 * If the {@link SecurityConfigurer} has already been specified get the original,
+	 * otherwise apply the new {@link SecurityConfigurerAdapter}.
+	 *
+	 * @param configurer the {@link SecurityConfigurer} to apply if one is not found for
+	 * this {@link SecurityConfigurer} class.
+	 * @return the current {@link SecurityConfigurer} for the configurer passed in
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	private <C extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity>> C getOrApply(
+			C configurer) throws Exception {
+		C existingConfig = (C) getConfigurer(configurer.getClass());
+		if (existingConfig != null) {
+			return existingConfig;
+		}
+		return apply(configurer);
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
index 7cc60e646a..c495ade82e 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
@@ -53,10 +53,10 @@ import org.springframework.web.filter.DelegatingFilterProxy;
 
 /**
  * <p>
- * The {@link WebSecurity} is created by {@link WebSecurityConfiguration}
- * to create the {@link FilterChainProxy} known as the Spring Security Filter
- * Chain (springSecurityFilterChain). The springSecurityFilterChain is the
- * {@link Filter} that the {@link DelegatingFilterProxy} delegates to.
+ * The {@link WebSecurity} is created by {@link WebSecurityConfiguration} to create the
+ * {@link FilterChainProxy} known as the Spring Security Filter Chain
+ * (springSecurityFilterChain). The springSecurityFilterChain is the {@link Filter} that
+ * the {@link DelegatingFilterProxy} delegates to.
  * </p>
  *
  * <p>
@@ -72,273 +72,272 @@ import org.springframework.web.filter.DelegatingFilterProxy;
  * @since 3.2
  */
 public final class WebSecurity extends
-        AbstractConfiguredSecurityBuilder<Filter, WebSecurity> implements SecurityBuilder<Filter>, ApplicationContextAware {
-    private final Log logger = LogFactory.getLog(getClass());
+		AbstractConfiguredSecurityBuilder<Filter, WebSecurity> implements
+		SecurityBuilder<Filter>, ApplicationContextAware {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final List<RequestMatcher> ignoredRequests = new ArrayList<RequestMatcher>();
+	private final List<RequestMatcher> ignoredRequests = new ArrayList<RequestMatcher>();
 
-    private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders =
-            new ArrayList<SecurityBuilder<? extends SecurityFilterChain>>();
+	private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders = new ArrayList<SecurityBuilder<? extends SecurityFilterChain>>();
 
-    private final IgnoredRequestConfigurer ignoredRequestRegistry =
-            new IgnoredRequestConfigurer();
+	private final IgnoredRequestConfigurer ignoredRequestRegistry = new IgnoredRequestConfigurer();
 
-    private FilterSecurityInterceptor filterSecurityInterceptor;
+	private FilterSecurityInterceptor filterSecurityInterceptor;
 
-    private HttpFirewall httpFirewall;
+	private HttpFirewall httpFirewall;
 
-    private boolean debugEnabled;
+	private boolean debugEnabled;
 
-    private WebInvocationPrivilegeEvaluator privilegeEvaluator;
+	private WebInvocationPrivilegeEvaluator privilegeEvaluator;
 
-    private DefaultWebSecurityExpressionHandler defaultWebSecurityExpressionHandler = new DefaultWebSecurityExpressionHandler();
+	private DefaultWebSecurityExpressionHandler defaultWebSecurityExpressionHandler = new DefaultWebSecurityExpressionHandler();
 
-    private SecurityExpressionHandler<FilterInvocation> expressionHandler = defaultWebSecurityExpressionHandler;
+	private SecurityExpressionHandler<FilterInvocation> expressionHandler = defaultWebSecurityExpressionHandler;
 
+	private Runnable postBuildAction = new Runnable() {
+		public void run() {
+		}
+	};
 
-    private Runnable postBuildAction = new Runnable() {
-        public void run() {}
-    };
+	/**
+	 * Creates a new instance
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} to use
+	 * @see WebSecurityConfiguration
+	 */
+	public WebSecurity(ObjectPostProcessor<Object> objectPostProcessor) {
+		super(objectPostProcessor);
+	}
 
-    /**
-     * Creates a new instance
-     * @param objectPostProcessor the {@link ObjectPostProcessor} to use
-     * @see WebSecurityConfiguration
-     */
-    public WebSecurity(ObjectPostProcessor<Object> objectPostProcessor) {
-        super(objectPostProcessor);
-    }
+	/**
+	 * <p>
+	 * Allows adding {@link RequestMatcher} instances that should that Spring Security
+	 * should ignore. Web Security provided by Spring Security (including the
+	 * {@link SecurityContext}) will not be available on {@link HttpServletRequest} that
+	 * match. Typically the requests that are registered should be that of only static
+	 * resources. For requests that are dynamic, consider mapping the request to allow all
+	 * users instead.
+	 * </p>
+	 *
+	 * Example Usage:
+	 *
+	 * <pre>
+	 * webSecurityBuilder.ignoring()
+	 * // ignore all URLs that start with /resources/ or /static/
+	 * 		.antMatchers(&quot;/resources/**&quot;, &quot;/static/**&quot;);
+	 * </pre>
+	 *
+	 * Alternatively this will accomplish the same result:
+	 *
+	 * <pre>
+	 * webSecurityBuilder.ignoring()
+	 * // ignore all URLs that start with /resources/ or /static/
+	 * 		.antMatchers(&quot;/resources/**&quot;).antMatchers(&quot;/static/**&quot;);
+	 * </pre>
+	 *
+	 * Multiple invocations of ignoring() are also additive, so the following is also
+	 * equivalent to the previous two examples:
+	 *
+	 * Alternatively this will accomplish the same result:
+	 *
+	 * <pre>
+	 * webSecurityBuilder.ignoring()
+	 * // ignore all URLs that start with /resources/
+	 * 		.antMatchers(&quot;/resources/**&quot;);
+	 * webSecurityBuilder.ignoring()
+	 * // ignore all URLs that start with /static/
+	 * 		.antMatchers(&quot;/static/**&quot;);
+	 * // now both URLs that start with /resources/ and /static/ will be ignored
+	 * </pre>
+	 *
+	 * @return the {@link IgnoredRequestConfigurer} to use for registering request that
+	 * should be ignored
+	 */
+	public IgnoredRequestConfigurer ignoring() {
+		return ignoredRequestRegistry;
+	}
 
-    /**
-     * <p>
-     * Allows adding {@link RequestMatcher} instances that should that Spring
-     * Security should ignore. Web Security provided by Spring Security
-     * (including the {@link SecurityContext}) will not be available on
-     * {@link HttpServletRequest} that match. Typically the requests that are
-     * registered should be that of only static resources. For requests that are
-     * dynamic, consider mapping the request to allow all users instead.
-     * </p>
-     *
-     * Example Usage:
-     *
-     * <pre>
-     * webSecurityBuilder
-     *     .ignoring()
-     *         // ignore all URLs that start with /resources/ or /static/
-     *         .antMatchers(&quot;/resources/**&quot;, &quot;/static/**&quot;);
-     * </pre>
-     *
-     * Alternatively this will accomplish the same result:
-     *
-     * <pre>
-     * webSecurityBuilder
-     *     .ignoring()
-     *         // ignore all URLs that start with /resources/ or /static/
-     *         .antMatchers(&quot;/resources/**&quot;)
-     *         .antMatchers(&quot;/static/**&quot;);
-     * </pre>
-     *
-     * Multiple invocations of ignoring() are also additive, so the following is
-     * also equivalent to the previous two examples:
-     *
-     * Alternatively this will accomplish the same result:
-     *
-     * <pre>
-     * webSecurityBuilder
-     *     .ignoring()
-     *         // ignore all URLs that start with /resources/
-     *         .antMatchers(&quot;/resources/**&quot;);
-     * webSecurityBuilder
-     *     .ignoring()
-     *         // ignore all URLs that start with /static/
-     *         .antMatchers(&quot;/static/**&quot;);
-     * // now both URLs that start with /resources/ and /static/ will be ignored
-     * </pre>
-     *
-     * @return the {@link IgnoredRequestConfigurer} to use for registering request
-     *         that should be ignored
-     */
-    public IgnoredRequestConfigurer ignoring() {
-        return ignoredRequestRegistry;
-    }
+	/**
+	 * Allows customizing the {@link HttpFirewall}. The default is
+	 * {@link DefaultHttpFirewall}.
+	 *
+	 * @param httpFirewall the custom {@link HttpFirewall}
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity httpFirewall(HttpFirewall httpFirewall) {
+		this.httpFirewall = httpFirewall;
+		return this;
+	}
 
-    /**
-     * Allows customizing the {@link HttpFirewall}. The default is
-     * {@link DefaultHttpFirewall}.
-     *
-     * @param httpFirewall the custom {@link HttpFirewall}
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity httpFirewall(HttpFirewall httpFirewall) {
-        this.httpFirewall = httpFirewall;
-        return this;
-    }
+	/**
+	 * Controls debugging support for Spring Security.
+	 *
+	 * @param debugEnabled if true, enables debug support with Spring Security. Default is
+	 * false.
+	 *
+	 * @return the {@link WebSecurity} for further customization.
+	 * @see EnableWebSecurity#debug()
+	 */
+	public WebSecurity debug(boolean debugEnabled) {
+		this.debugEnabled = debugEnabled;
+		return this;
+	}
 
-    /**
-     * Controls debugging support for Spring Security.
-     *
-     * @param debugEnabled
-     *            if true, enables debug support with Spring Security. Default
-     *            is false.
-     *
-     * @return the {@link WebSecurity} for further customization.
-     * @see EnableWebSecurity#debug()
-     */
-    public WebSecurity debug(boolean debugEnabled) {
-        this.debugEnabled = debugEnabled;
-        return this;
-    }
+	/**
+	 * <p>
+	 * Adds builders to create {@link SecurityFilterChain} instances.
+	 * </p>
+	 *
+	 * <p>
+	 * Typically this method is invoked automatically within the framework from
+	 * {@link WebSecurityConfigurerAdapter#init(WebSecurity)}
+	 * </p>
+	 *
+	 * @param securityFilterChainBuilder the builder to use to create the
+	 * {@link SecurityFilterChain} instances
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity addSecurityFilterChainBuilder(
+			SecurityBuilder<? extends SecurityFilterChain> securityFilterChainBuilder) {
+		this.securityFilterChainBuilders.add(securityFilterChainBuilder);
+		return this;
+	}
 
-    /**
-     * <p>
-     * Adds builders to create {@link SecurityFilterChain} instances.
-     * </p>
-     *
-     * <p>
-     * Typically this method is invoked automatically within the framework from
-     * {@link WebSecurityConfigurerAdapter#init(WebSecurity)}
-     * </p>
-     *
-     * @param securityFilterChainBuilder
-     *            the builder to use to create the {@link SecurityFilterChain}
-     *            instances
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity addSecurityFilterChainBuilder(SecurityBuilder<? extends SecurityFilterChain> securityFilterChainBuilder) {
-        this.securityFilterChainBuilders.add(securityFilterChainBuilder);
-        return this;
-    }
+	/**
+	 * Set the {@link WebInvocationPrivilegeEvaluator} to be used. If this is null, then a
+	 * {@link DefaultWebInvocationPrivilegeEvaluator} will be created when
+	 * {@link #securityInterceptor(FilterSecurityInterceptor)} is non null.
+	 *
+	 * @param privilegeEvaluator the {@link WebInvocationPrivilegeEvaluator} to use
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity privilegeEvaluator(
+			WebInvocationPrivilegeEvaluator privilegeEvaluator) {
+		this.privilegeEvaluator = privilegeEvaluator;
+		return this;
+	}
 
-    /**
-     * Set the {@link WebInvocationPrivilegeEvaluator} to be used. If this is
-     * null, then a {@link DefaultWebInvocationPrivilegeEvaluator} will be
-     * created when {@link #securityInterceptor(FilterSecurityInterceptor)}
-     * is non null.
-     *
-     * @param privilegeEvaluator
-     *            the {@link WebInvocationPrivilegeEvaluator} to use
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity privilegeEvaluator(WebInvocationPrivilegeEvaluator privilegeEvaluator) {
-        this.privilegeEvaluator = privilegeEvaluator;
-        return this;
-    }
+	/**
+	 * Set the {@link SecurityExpressionHandler} to be used. If this is null, then a
+	 * {@link DefaultWebSecurityExpressionHandler} will be used.
+	 *
+	 * @param expressionHandler the {@link SecurityExpressionHandler} to use
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity expressionHandler(
+			SecurityExpressionHandler<FilterInvocation> expressionHandler) {
+		Assert.notNull(expressionHandler, "expressionHandler cannot be null");
+		this.expressionHandler = expressionHandler;
+		return this;
+	}
 
-    /**
-     * Set the {@link SecurityExpressionHandler} to be used. If this is null,
-     * then a {@link DefaultWebSecurityExpressionHandler} will be used.
-     *
-     * @param expressionHandler
-     *            the {@link SecurityExpressionHandler} to use
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity expressionHandler(SecurityExpressionHandler<FilterInvocation> expressionHandler) {
-        Assert.notNull(expressionHandler, "expressionHandler cannot be null");
-        this.expressionHandler = expressionHandler;
-        return this;
-    }
+	/**
+	 * Gets the {@link SecurityExpressionHandler} to be used.
+	 * @return
+	 */
+	public SecurityExpressionHandler<FilterInvocation> getExpressionHandler() {
+		return expressionHandler;
+	}
 
-    /**
-     * Gets the {@link SecurityExpressionHandler} to be used.
-     * @return
-     */
-    public SecurityExpressionHandler<FilterInvocation> getExpressionHandler() {
-        return expressionHandler;
-    }
+	/**
+	 * Gets the {@link WebInvocationPrivilegeEvaluator} to be used.
+	 * @return
+	 */
+	public WebInvocationPrivilegeEvaluator getPrivilegeEvaluator() {
+		if (privilegeEvaluator != null) {
+			return privilegeEvaluator;
+		}
+		return filterSecurityInterceptor == null ? null
+				: new DefaultWebInvocationPrivilegeEvaluator(filterSecurityInterceptor);
+	}
 
-    /**
-     * Gets the {@link WebInvocationPrivilegeEvaluator} to be used.
-     * @return
-     */
-    public WebInvocationPrivilegeEvaluator getPrivilegeEvaluator() {
-        if(privilegeEvaluator != null) {
-            return privilegeEvaluator;
-        }
-        return filterSecurityInterceptor == null ? null : new DefaultWebInvocationPrivilegeEvaluator(filterSecurityInterceptor);
-    }
+	/**
+	 * Sets the {@link FilterSecurityInterceptor}. This is typically invoked by
+	 * {@link WebSecurityConfigurerAdapter}.
+	 * @param securityInterceptor the {@link FilterSecurityInterceptor} to use
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity securityInterceptor(FilterSecurityInterceptor securityInterceptor) {
+		this.filterSecurityInterceptor = securityInterceptor;
+		return this;
+	}
 
-    /**
-     * Sets the {@link FilterSecurityInterceptor}. This is typically invoked by {@link WebSecurityConfigurerAdapter}.
-     * @param securityInterceptor the {@link FilterSecurityInterceptor} to use
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity securityInterceptor(FilterSecurityInterceptor securityInterceptor) {
-        this.filterSecurityInterceptor = securityInterceptor;
-        return this;
-    }
+	/**
+	 * Executes the Runnable immediately after the build takes place
+	 *
+	 * @param postBuildAction
+	 * @return the {@link WebSecurity} for further customizations
+	 */
+	public WebSecurity postBuildAction(Runnable postBuildAction) {
+		this.postBuildAction = postBuildAction;
+		return this;
+	}
 
-    /**
-     * Executes the Runnable immediately after the build takes place
-     *
-     * @param postBuildAction
-     * @return the {@link WebSecurity} for further customizations
-     */
-    public WebSecurity postBuildAction(Runnable postBuildAction) {
-        this.postBuildAction = postBuildAction;
-        return this;
-    }
+	@Override
+	protected Filter performBuild() throws Exception {
+		Assert.state(
+				!securityFilterChainBuilders.isEmpty(),
+				"At least one SecurityBuilder<? extends SecurityFilterChain> needs to be specified. Typically this done by adding a @Configuration that extends WebSecurityConfigurerAdapter. More advanced users can invoke "
+						+ WebSecurity.class.getSimpleName()
+						+ ".addSecurityFilterChainBuilder directly");
+		int chainSize = ignoredRequests.size() + securityFilterChainBuilders.size();
+		List<SecurityFilterChain> securityFilterChains = new ArrayList<SecurityFilterChain>(
+				chainSize);
+		for (RequestMatcher ignoredRequest : ignoredRequests) {
+			securityFilterChains.add(new DefaultSecurityFilterChain(ignoredRequest));
+		}
+		for (SecurityBuilder<? extends SecurityFilterChain> securityFilterChainBuilder : securityFilterChainBuilders) {
+			securityFilterChains.add(securityFilterChainBuilder.build());
+		}
+		FilterChainProxy filterChainProxy = new FilterChainProxy(securityFilterChains);
+		if (httpFirewall != null) {
+			filterChainProxy.setFirewall(httpFirewall);
+		}
+		filterChainProxy.afterPropertiesSet();
 
-    @Override
-    protected Filter performBuild() throws Exception {
-        Assert.state(!securityFilterChainBuilders.isEmpty(),
-                "At least one SecurityBuilder<? extends SecurityFilterChain> needs to be specified. Typically this done by adding a @Configuration that extends WebSecurityConfigurerAdapter. More advanced users can invoke "
-                        + WebSecurity.class.getSimpleName()
-                        + ".addSecurityFilterChainBuilder directly");
-        int chainSize = ignoredRequests.size() + securityFilterChainBuilders.size();
-        List<SecurityFilterChain> securityFilterChains = new ArrayList<SecurityFilterChain>(chainSize);
-        for(RequestMatcher ignoredRequest : ignoredRequests) {
-            securityFilterChains.add(new DefaultSecurityFilterChain(ignoredRequest));
-        }
-        for(SecurityBuilder<? extends SecurityFilterChain> securityFilterChainBuilder : securityFilterChainBuilders) {
-            securityFilterChains.add(securityFilterChainBuilder.build());
-        }
-        FilterChainProxy filterChainProxy = new FilterChainProxy(securityFilterChains);
-        if(httpFirewall != null) {
-            filterChainProxy.setFirewall(httpFirewall);
-        }
-        filterChainProxy.afterPropertiesSet();
+		Filter result = filterChainProxy;
+		if (debugEnabled) {
+			logger.warn("\n\n"
+					+ "********************************************************************\n"
+					+ "**********        Security debugging is enabled.       *************\n"
+					+ "**********    This may include sensitive information.  *************\n"
+					+ "**********      Do not use in a production system!     *************\n"
+					+ "********************************************************************\n\n");
+			result = new DebugFilter(filterChainProxy);
+		}
+		postBuildAction.run();
+		return result;
+	}
 
-        Filter result = filterChainProxy;
-        if(debugEnabled) {
-            logger.warn("\n\n" +
-                    "********************************************************************\n" +
-                    "**********        Security debugging is enabled.       *************\n" +
-                    "**********    This may include sensitive information.  *************\n" +
-                    "**********      Do not use in a production system!     *************\n" +
-                    "********************************************************************\n\n");
-            result = new DebugFilter(filterChainProxy);
-        }
-        postBuildAction.run();
-        return result;
-    }
+	/**
+	 * Allows registering {@link RequestMatcher} instances that should be ignored by
+	 * Spring Security.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public final class IgnoredRequestConfigurer extends
+			AbstractRequestMatcherRegistry<IgnoredRequestConfigurer> {
 
-    /**
-     * Allows registering {@link RequestMatcher} instances that should be
-     * ignored by Spring Security.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public final class IgnoredRequestConfigurer extends AbstractRequestMatcherRegistry<IgnoredRequestConfigurer> {
+		@Override
+		protected IgnoredRequestConfigurer chainRequestMatchers(
+				List<RequestMatcher> requestMatchers) {
+			ignoredRequests.addAll(requestMatchers);
+			return this;
+		}
 
-        @Override
-        protected IgnoredRequestConfigurer chainRequestMatchers(List<RequestMatcher> requestMatchers) {
-            ignoredRequests.addAll(requestMatchers);
-            return this;
-        }
+		/**
+		 * Returns the {@link WebSecurity} to be returned for chaining.
+		 */
+		public WebSecurity and() {
+			return WebSecurity.this;
+		}
 
-        /**
-         * Returns the {@link WebSecurity} to be returned for chaining.
-         */
-        public WebSecurity and() {
-            return WebSecurity.this;
-        }
+		private IgnoredRequestConfigurer() {
+		}
+	}
 
-        private IgnoredRequestConfigurer(){}
-    }
-
-    public void setApplicationContext(ApplicationContext applicationContext)
-            throws BeansException {
-        defaultWebSecurityExpressionHandler.setApplicationContext(applicationContext);
-    }
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		defaultWebSecurityExpressionHandler.setApplicationContext(applicationContext);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java
index 1e034739c0..56767240ab 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java
@@ -29,30 +29,31 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.util.Assert;
 
-
 /**
- * A class used to get all the {@link WebSecurityConfigurer} instances from the
- * current {@link ApplicationContext} but ignoring the parent.
+ * A class used to get all the {@link WebSecurityConfigurer} instances from the current
+ * {@link ApplicationContext} but ignoring the parent.
  *
  * @author Rob Winch
  *
  */
 final class AutowiredWebSecurityConfigurersIgnoreParents {
 
-    private final ConfigurableListableBeanFactory beanFactory;
+	private final ConfigurableListableBeanFactory beanFactory;
 
-    public AutowiredWebSecurityConfigurersIgnoreParents(ConfigurableListableBeanFactory beanFactory) {
-        Assert.notNull(beanFactory,"beanFactory cannot be null");
-        this.beanFactory = beanFactory;
-    }
+	public AutowiredWebSecurityConfigurersIgnoreParents(
+			ConfigurableListableBeanFactory beanFactory) {
+		Assert.notNull(beanFactory, "beanFactory cannot be null");
+		this.beanFactory = beanFactory;
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public List<SecurityConfigurer<Filter, WebSecurity>> getWebSecurityConfigurers() {
-        List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<SecurityConfigurer<Filter, WebSecurity>>();
-        Map<String, WebSecurityConfigurer> beansOfType = beanFactory.getBeansOfType(WebSecurityConfigurer.class);
-        for(Entry<String,WebSecurityConfigurer> entry : beansOfType.entrySet()) {
-            webSecurityConfigurers.add(entry.getValue());
-        }
-        return webSecurityConfigurers;
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public List<SecurityConfigurer<Filter, WebSecurity>> getWebSecurityConfigurers() {
+		List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<SecurityConfigurer<Filter, WebSecurity>>();
+		Map<String, WebSecurityConfigurer> beansOfType = beanFactory
+				.getBeansOfType(WebSecurityConfigurer.class);
+		for (Entry<String, WebSecurityConfigurer> entry : beansOfType.entrySet()) {
+			webSecurityConfigurers.add(entry.getValue());
+		}
+		return webSecurityConfigurers;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/ConditionalOnMissingBean.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/ConditionalOnMissingBean.java
index 9534273a92..2b131c77dd 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/ConditionalOnMissingBean.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/ConditionalOnMissingBean.java
@@ -9,5 +9,5 @@ import org.springframework.context.annotation.Conditional;
 @Conditional(OnMissingBeanCondition.class)
 @interface ConditionalOnMissingBean {
 
-    Class<?> value();
+	Class<?> value();
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java
index d5bce5e2fe..f55e5575cd 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java
@@ -27,45 +27,40 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 
 /**
  * Add this annotation to an {@code @Configuration} class to have the Spring Security
- * configuration defined in any {@link WebSecurityConfigurer} or more likely by extending the
- * {@link WebSecurityConfigurerAdapter} base class and overriding individual methods:
+ * configuration defined in any {@link WebSecurityConfigurer} or more likely by extending
+ * the {@link WebSecurityConfigurerAdapter} base class and overriding individual methods:
  *
  * <pre class="code">
  * &#064;Configuration
  * &#064;EnableWebSecurity
  * public class MyWebSecurityConfiguration extends WebSecurityConfigurerAdapter {
- *
- *    &#064;Override
- *    public void configure(WebSecurity web) throws Exception {
- *        web
- *            .ignoring()
- *                // Spring Security should completely ignore URLs starting with /resources/
- *                .antMatchers("/resources/**");
- *    }
- *
- *    &#064;Override
- *    protected void configure(HttpSecurity http) throws Exception {
- *        http
- *            .authorizeRequests()
- *                .antMatchers("/public/**").permitAll()
- *                .anyRequest().hasRole("USER")
- *                .and()
- *            // Possibly more configuration ...
- *            .formLogin() // enable form based log in
- *                // set permitAll for all URLs associated with Form Login
- *               .permitAll();
- *    }
- *
- *    &#064;Override
- *    protected void configure(AuthenticationManagerBuilder auth) {
- *        auth
- *            // enable in memory based authentication with a user named "user" and "admin"
- *            .inMemoryAuthentication()
- *                .withUser("user").password("password").roles("USER").and()
- *                .withUser("admin").password("password").roles("USER", "ADMIN");
- *    }
- *
- *    // Possibly more overridden methods ...
+ * 
+ * 	&#064;Override
+ * 	public void configure(WebSecurity web) throws Exception {
+ * 		web.ignoring()
+ * 		// Spring Security should completely ignore URLs starting with /resources/
+ * 				.antMatchers(&quot;/resources/**&quot;);
+ * 	}
+ * 
+ * 	&#064;Override
+ * 	protected void configure(HttpSecurity http) throws Exception {
+ * 		http.authorizeRequests().antMatchers(&quot;/public/**&quot;).permitAll().anyRequest()
+ * 				.hasRole(&quot;USER&quot;).and()
+ * 				// Possibly more configuration ...
+ * 				.formLogin() // enable form based log in
+ * 				// set permitAll for all URLs associated with Form Login
+ * 				.permitAll();
+ * 	}
+ * 
+ * 	&#064;Override
+ * 	protected void configure(AuthenticationManagerBuilder auth) {
+ * 		auth
+ * 		// enable in memory based authentication with a user named &quot;user&quot; and &quot;admin&quot;
+ * 		.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;)
+ * 				.and().withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
+ * 	}
+ * 
+ * 	// Possibly more overridden methods ...
  * }
  * </pre>
  *
@@ -75,17 +70,18 @@ import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
  * @author Rob Winch
  * @since 3.2
  */
-@Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target(value={java.lang.annotation.ElementType.TYPE})
+@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(value = { java.lang.annotation.ElementType.TYPE })
 @Documented
-@Import({WebSecurityConfiguration.class,ObjectPostProcessorConfiguration.class, SpringWebMvcImportSelector.class})
+@Import({ WebSecurityConfiguration.class, ObjectPostProcessorConfiguration.class,
+		SpringWebMvcImportSelector.class })
 @EnableGlobalAuthentication
 @Configuration
 public @interface EnableWebSecurity {
 
-    /**
-     * Controls debugging support for Spring Security. Default is false.
-     * @return if true, enables debug support with Spring Security
-     */
-    boolean debug() default false;
+	/**
+	 * Controls debugging support for Spring Security. Default is false.
+	 * @return if true, enables debug support with Spring Security
+	 */
+	boolean debug() default false;
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java
index 7f485a9e01..924c17ba15 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java
@@ -26,15 +26,16 @@ import java.util.Map;
  * @author Rob Winch
  */
 class OnMissingBeanCondition implements ConfigurationCondition {
-    public ConfigurationPhase getConfigurationPhase() {
-        return ConfigurationPhase.REGISTER_BEAN;
-    }
+	public ConfigurationPhase getConfigurationPhase() {
+		return ConfigurationPhase.REGISTER_BEAN;
+	}
 
-    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
-        Map<String,Object> attrs = metadata.getAnnotationAttributes(ConditionalOnMissingBean.class.getName());
+	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+		Map<String, Object> attrs = metadata
+				.getAnnotationAttributes(ConditionalOnMissingBean.class.getName());
 
-        Class<?> type = (Class) attrs.get("value");
-        final Map<String, ?> beans = context.getBeanFactory().getBeansOfType(type);
-        return beans.isEmpty();
-    }
+		Class<?> type = (Class) attrs.get("value");
+		final Map<String, ?> beans = context.getBeanFactory().getBeansOfType(type);
+		return beans.isEmpty();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
index 5d430b7bf6..22960557b3 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java
@@ -29,11 +29,18 @@ import org.springframework.util.ClassUtils;
  */
 class SpringWebMvcImportSelector implements ImportSelector {
 
-    /* (non-Javadoc)
-     * @see org.springframework.context.annotation.ImportSelector#selectImports(org.springframework.core.type.AnnotationMetadata)
-     */
-    public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-        boolean webmvcPresent = ClassUtils.isPresent("org.springframework.web.servlet.DispatcherServlet", getClass().getClassLoader());
-        return webmvcPresent ? new String[] {"org.springframework.security.config.annotation.web.configuration.WebMvcSecurityConfiguration"} : new String[] {};
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.context.annotation.ImportSelector#selectImports(org.springframework
+	 * .core.type.AnnotationMetadata)
+	 */
+	public String[] selectImports(AnnotationMetadata importingClassMetadata) {
+		boolean webmvcPresent = ClassUtils.isPresent(
+				"org.springframework.web.servlet.DispatcherServlet", getClass()
+						.getClassLoader());
+		return webmvcPresent ? new String[] { "org.springframework.security.config.annotation.web.configuration.WebMvcSecurityConfiguration" }
+				: new String[] {};
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java
index 1bdf1156b8..97abb5c21f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java
@@ -27,11 +27,10 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 import java.util.List;
 
 /**
- * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring
- * Security CSRF integration. This configuration is added whenever
- * {@link EnableWebMvc} is added by {@link SpringWebMvcImportSelector} and the
- * DispatcherServlet is present on the classpath. It also adds the
- * {@link AuthenticationPrincipalArgumentResolver} as a
+ * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF
+ * integration. This configuration is added whenever {@link EnableWebMvc} is added by
+ * {@link SpringWebMvcImportSelector} and the DispatcherServlet is present on the
+ * classpath. It also adds the {@link AuthenticationPrincipalArgumentResolver} as a
  * {@link HandlerMethodArgumentResolver}.
  *
  * @author Rob Winch
@@ -39,18 +38,18 @@ import java.util.List;
  */
 class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter {
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public void addArgumentResolvers(
-            List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
-        argumentResolvers.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
-        argumentResolvers.add(new CsrfTokenArgumentResolver());
-    }
+	@Override
+	@SuppressWarnings("deprecation")
+	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+		argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
+		argumentResolvers
+				.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
+		argumentResolvers.add(new CsrfTokenArgumentResolver());
+	}
 
-    @ConditionalOnMissingBean(RequestDataValueProcessor.class)
-    @Bean
-    public RequestDataValueProcessor requestDataValueProcessor() {
-        return new CsrfRequestDataValueProcessor();
-    }
+	@ConditionalOnMissingBean(RequestDataValueProcessor.class)
+	@Bean
+	public RequestDataValueProcessor requestDataValueProcessor() {
+		return new CsrfRequestDataValueProcessor();
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
index 224e97b8a1..80903d7bf1 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
@@ -49,13 +49,12 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
 import org.springframework.util.ClassUtils;
 
 /**
- * Uses a {@link WebSecurity} to create the {@link FilterChainProxy} that
- * performs the web based security for Spring Security. It then exports the
- * necessary beans. Customizations can be made to {@link WebSecurity} by
- * extending {@link WebSecurityConfigurerAdapter} and exposing it as a
- * {@link Configuration} or implementing {@link WebSecurityConfigurer} and
- * exposing it as a {@link Configuration}. This configuration is imported when
- * using {@link EnableWebSecurity}.
+ * Uses a {@link WebSecurity} to create the {@link FilterChainProxy} that performs the web
+ * based security for Spring Security. It then exports the necessary beans. Customizations
+ * can be made to {@link WebSecurity} by extending {@link WebSecurityConfigurerAdapter}
+ * and exposing it as a {@link Configuration} or implementing
+ * {@link WebSecurityConfigurer} and exposing it as a {@link Configuration}. This
+ * configuration is imported when using {@link EnableWebSecurity}.
  *
  * @see EnableWebSecurity
  * @see WebSecurity
@@ -66,150 +65,178 @@ import org.springframework.util.ClassUtils;
  */
 @Configuration
 public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAware {
-    private WebSecurity webSecurity;
+	private WebSecurity webSecurity;
 
-    private Boolean debugEnabled;
+	private Boolean debugEnabled;
 
-    private List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers;
+	private List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers;
 
-    private ClassLoader beanClassLoader;
+	private ClassLoader beanClassLoader;
 
-    @Autowired(required = false)
-    private ObjectPostProcessor<Object> objectObjectPostProcessor;
+	@Autowired(required = false)
+	private ObjectPostProcessor<Object> objectObjectPostProcessor;
 
-    @Bean
-    public static DelegatingApplicationListener delegatingApplicationListener() {
-        return new DelegatingApplicationListener();
-    }
+	@Bean
+	public static DelegatingApplicationListener delegatingApplicationListener() {
+		return new DelegatingApplicationListener();
+	}
 
-    @Bean
-    @DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
-    public SecurityExpressionHandler<FilterInvocation> webSecurityExpressionHandler() {
-        return webSecurity.getExpressionHandler();
-    }
+	@Bean
+	@DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
+	public SecurityExpressionHandler<FilterInvocation> webSecurityExpressionHandler() {
+		return webSecurity.getExpressionHandler();
+	}
 
-    /**
-     * Creates the Spring Security Filter Chain
-     * @return
-     * @throws Exception
-     */
-    @Bean(name=AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
-    public Filter springSecurityFilterChain() throws Exception {
-        boolean hasConfigurers = webSecurityConfigurers != null && !webSecurityConfigurers.isEmpty();
-        if(!hasConfigurers) {
-            WebSecurityConfigurerAdapter adapter = objectObjectPostProcessor.postProcess(new WebSecurityConfigurerAdapter() {});
-            webSecurity.apply(adapter);
-        }
-        return webSecurity.build();
-    }
+	/**
+	 * Creates the Spring Security Filter Chain
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean(name = AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
+	public Filter springSecurityFilterChain() throws Exception {
+		boolean hasConfigurers = webSecurityConfigurers != null
+				&& !webSecurityConfigurers.isEmpty();
+		if (!hasConfigurers) {
+			WebSecurityConfigurerAdapter adapter = objectObjectPostProcessor
+					.postProcess(new WebSecurityConfigurerAdapter() {
+					});
+			webSecurity.apply(adapter);
+		}
+		return webSecurity.build();
+	}
 
-    /**
-     * Creates the {@link WebInvocationPrivilegeEvaluator} that is necessary for the JSP tag support.
-     * @return the {@link WebInvocationPrivilegeEvaluator}
-     * @throws Exception
-     */
-    @Bean
-    @DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
-    public WebInvocationPrivilegeEvaluator privilegeEvaluator() throws Exception {
-        return webSecurity.getPrivilegeEvaluator();
-    }
+	/**
+	 * Creates the {@link WebInvocationPrivilegeEvaluator} that is necessary for the JSP
+	 * tag support.
+	 * @return the {@link WebInvocationPrivilegeEvaluator}
+	 * @throws Exception
+	 */
+	@Bean
+	@DependsOn(AbstractSecurityWebApplicationInitializer.DEFAULT_FILTER_NAME)
+	public WebInvocationPrivilegeEvaluator privilegeEvaluator() throws Exception {
+		return webSecurity.getPrivilegeEvaluator();
+	}
 
-    /**
-     * Sets the {@code <SecurityConfigurer<FilterChainProxy, WebSecurityBuilder>} instances used to create the web configuration.
-     *
-     * @param objectPostProcessor the {@link ObjectPostProcessor} used to create a {@link WebSecurity} instance
-     * @param webSecurityConfigurers the {@code <SecurityConfigurer<FilterChainProxy, WebSecurityBuilder>} instances used to create the web configuration
-     * @throws Exception
-     */
-    @Autowired(required = false)
-    public void setFilterChainProxySecurityConfigurer(ObjectPostProcessor<Object> objectPostProcessor,
-            @Value("#{@autowiredWebSecurityConfigurersIgnoreParents.getWebSecurityConfigurers()}") List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers) throws Exception {
-        webSecurity = objectPostProcessor.postProcess(new WebSecurity(objectPostProcessor));
-        if(debugEnabled != null) {
-            webSecurity.debug(debugEnabled);
-        }
+	/**
+	 * Sets the {@code <SecurityConfigurer<FilterChainProxy, WebSecurityBuilder>}
+	 * instances used to create the web configuration.
+	 *
+	 * @param objectPostProcessor the {@link ObjectPostProcessor} used to create a
+	 * {@link WebSecurity} instance
+	 * @param webSecurityConfigurers the
+	 * {@code <SecurityConfigurer<FilterChainProxy, WebSecurityBuilder>} instances used to
+	 * create the web configuration
+	 * @throws Exception
+	 */
+	@Autowired(required = false)
+	public void setFilterChainProxySecurityConfigurer(
+			ObjectPostProcessor<Object> objectPostProcessor,
+			@Value("#{@autowiredWebSecurityConfigurersIgnoreParents.getWebSecurityConfigurers()}") List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers)
+			throws Exception {
+		webSecurity = objectPostProcessor
+				.postProcess(new WebSecurity(objectPostProcessor));
+		if (debugEnabled != null) {
+			webSecurity.debug(debugEnabled);
+		}
 
-        Collections.sort(webSecurityConfigurers, AnnotationAwareOrderComparator.INSTANCE);
+		Collections.sort(webSecurityConfigurers, AnnotationAwareOrderComparator.INSTANCE);
 
-        Integer previousOrder = null;
-        for(SecurityConfigurer<Filter, WebSecurity> config : webSecurityConfigurers) {
-            Integer order = AnnotationAwareOrderComparator.lookupOrder(config);
-            if(previousOrder != null && previousOrder.equals(order)) {
-                throw new IllegalStateException("@Order on WebSecurityConfigurers must be unique. Order of " + order + " was already used, so it cannot be used on " + config + " too.");
-            }
-            previousOrder = order;
-        }
-        for(SecurityConfigurer<Filter, WebSecurity> webSecurityConfigurer : webSecurityConfigurers) {
-            webSecurity.apply(webSecurityConfigurer);
-        }
-        this.webSecurityConfigurers = webSecurityConfigurers;
-    }
+		Integer previousOrder = null;
+		for (SecurityConfigurer<Filter, WebSecurity> config : webSecurityConfigurers) {
+			Integer order = AnnotationAwareOrderComparator.lookupOrder(config);
+			if (previousOrder != null && previousOrder.equals(order)) {
+				throw new IllegalStateException(
+						"@Order on WebSecurityConfigurers must be unique. Order of "
+								+ order + " was already used, so it cannot be used on "
+								+ config + " too.");
+			}
+			previousOrder = order;
+		}
+		for (SecurityConfigurer<Filter, WebSecurity> webSecurityConfigurer : webSecurityConfigurers) {
+			webSecurity.apply(webSecurityConfigurer);
+		}
+		this.webSecurityConfigurers = webSecurityConfigurers;
+	}
 
-    @Bean
-    public AutowiredWebSecurityConfigurersIgnoreParents autowiredWebSecurityConfigurersIgnoreParents(ConfigurableListableBeanFactory beanFactory) {
-        return new AutowiredWebSecurityConfigurersIgnoreParents(beanFactory);
-    }
+	@Bean
+	public AutowiredWebSecurityConfigurersIgnoreParents autowiredWebSecurityConfigurersIgnoreParents(
+			ConfigurableListableBeanFactory beanFactory) {
+		return new AutowiredWebSecurityConfigurersIgnoreParents(beanFactory);
+	}
 
-    /**
-     * A custom verision of the Spring provided AnnotationAwareOrderComparator
-     * that uses {@link AnnotationUtils#findAnnotation(Class, Class)} to look on
-     * super class instances for the {@link Order} annotation.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    private static class AnnotationAwareOrderComparator extends OrderComparator {
-        private static final AnnotationAwareOrderComparator INSTANCE = new AnnotationAwareOrderComparator();
+	/**
+	 * A custom verision of the Spring provided AnnotationAwareOrderComparator that uses
+	 * {@link AnnotationUtils#findAnnotation(Class, Class)} to look on super class
+	 * instances for the {@link Order} annotation.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	private static class AnnotationAwareOrderComparator extends OrderComparator {
+		private static final AnnotationAwareOrderComparator INSTANCE = new AnnotationAwareOrderComparator();
 
-        @Override
-        protected int getOrder(Object obj) {
-            return lookupOrder(obj);
-        }
+		@Override
+		protected int getOrder(Object obj) {
+			return lookupOrder(obj);
+		}
 
-        private static int lookupOrder(Object obj) {
-            if (obj instanceof Ordered) {
-                return ((Ordered) obj).getOrder();
-            }
-            if (obj != null) {
-                Class<?> clazz = (obj instanceof Class ? (Class<?>) obj : obj.getClass());
-                Order order = AnnotationUtils.findAnnotation(clazz,Order.class);
-                if (order != null) {
-                    return order.value();
-                }
-            }
-            return Ordered.LOWEST_PRECEDENCE;
-        }
-    }
+		private static int lookupOrder(Object obj) {
+			if (obj instanceof Ordered) {
+				return ((Ordered) obj).getOrder();
+			}
+			if (obj != null) {
+				Class<?> clazz = (obj instanceof Class ? (Class<?>) obj : obj.getClass());
+				Order order = AnnotationUtils.findAnnotation(clazz, Order.class);
+				if (order != null) {
+					return order.value();
+				}
+			}
+			return Ordered.LOWEST_PRECEDENCE;
+		}
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.context.annotation.ImportAware#setImportMetadata(org.springframework.core.type.AnnotationMetadata)
-     */
-    public void setImportMetadata(AnnotationMetadata importMetadata) {
-        Map<String, Object> enableWebSecurityAttrMap = importMetadata.getAnnotationAttributes(EnableWebSecurity.class.getName());
-        AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes.fromMap(enableWebSecurityAttrMap);
-        if(enableWebSecurityAttrs == null) {
-            // search parent classes
-            Class<?> currentClass = ClassUtils.resolveClassName(importMetadata.getClassName(), beanClassLoader);
-            for(Class<?> classToInspect = currentClass ;classToInspect != null; classToInspect = classToInspect.getSuperclass()) {
-                EnableWebSecurity enableWebSecurityAnnotation = AnnotationUtils.findAnnotation(classToInspect, EnableWebSecurity.class);
-                if(enableWebSecurityAnnotation == null) {
-                    continue;
-                }
-                enableWebSecurityAttrMap = AnnotationUtils
-                        .getAnnotationAttributes(enableWebSecurityAnnotation);
-                enableWebSecurityAttrs = AnnotationAttributes.fromMap(enableWebSecurityAttrMap);
-            }
-        }
-        debugEnabled = enableWebSecurityAttrs.getBoolean("debug");
-        if(webSecurity != null) {
-            webSecurity.debug(debugEnabled);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.context.annotation.ImportAware#setImportMetadata(org.
+	 * springframework.core.type.AnnotationMetadata)
+	 */
+	public void setImportMetadata(AnnotationMetadata importMetadata) {
+		Map<String, Object> enableWebSecurityAttrMap = importMetadata
+				.getAnnotationAttributes(EnableWebSecurity.class.getName());
+		AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes
+				.fromMap(enableWebSecurityAttrMap);
+		if (enableWebSecurityAttrs == null) {
+			// search parent classes
+			Class<?> currentClass = ClassUtils.resolveClassName(
+					importMetadata.getClassName(), beanClassLoader);
+			for (Class<?> classToInspect = currentClass; classToInspect != null; classToInspect = classToInspect
+					.getSuperclass()) {
+				EnableWebSecurity enableWebSecurityAnnotation = AnnotationUtils
+						.findAnnotation(classToInspect, EnableWebSecurity.class);
+				if (enableWebSecurityAnnotation == null) {
+					continue;
+				}
+				enableWebSecurityAttrMap = AnnotationUtils
+						.getAnnotationAttributes(enableWebSecurityAnnotation);
+				enableWebSecurityAttrs = AnnotationAttributes
+						.fromMap(enableWebSecurityAttrMap);
+			}
+		}
+		debugEnabled = enableWebSecurityAttrs.getBoolean("debug");
+		if (webSecurity != null) {
+			webSecurity.debug(debugEnabled);
+		}
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
-     */
-    public void setBeanClassLoader(ClassLoader classLoader) {
-        this.beanClassLoader = classLoader;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.
+	 * lang.ClassLoader)
+	 */
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.beanClassLoader = classLoader;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java
index 7404c5ecc6..b2d9af370d 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.config.annotation.web.configuration;
 
-
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collections;
@@ -58,413 +57,428 @@ import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 
 /**
- * Provides a convenient base class for creating a {@link WebSecurityConfigurer}
- * instance. The implementation allows customization by overriding methods.
+ * Provides a convenient base class for creating a {@link WebSecurityConfigurer} instance.
+ * The implementation allows customization by overriding methods.
  *
  * @see EnableWebSecurity
  *
  * @author Rob Winch
  */
 @Order(100)
-public abstract class WebSecurityConfigurerAdapter implements WebSecurityConfigurer<WebSecurity> {
-    private final Log logger = LogFactory.getLog(WebSecurityConfigurerAdapter.class);
+public abstract class WebSecurityConfigurerAdapter implements
+		WebSecurityConfigurer<WebSecurity> {
+	private final Log logger = LogFactory.getLog(WebSecurityConfigurerAdapter.class);
 
-    private ApplicationContext context;
+	private ApplicationContext context;
 
-    private ContentNegotiationStrategy contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
+	private ContentNegotiationStrategy contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
 
-    private ObjectPostProcessor<Object> objectPostProcessor = new ObjectPostProcessor<Object>() {
-        public <T> T postProcess(T object) {
-            throw new IllegalStateException(ObjectPostProcessor.class.getName()+ " is a required bean. Ensure you have used @EnableWebSecurity and @Configuration");
-        }
-    };
+	private ObjectPostProcessor<Object> objectPostProcessor = new ObjectPostProcessor<Object>() {
+		public <T> T postProcess(T object) {
+			throw new IllegalStateException(
+					ObjectPostProcessor.class.getName()
+							+ " is a required bean. Ensure you have used @EnableWebSecurity and @Configuration");
+		}
+	};
 
-    private AuthenticationConfiguration authenticationConfiguration;
-    private AuthenticationManagerBuilder authenticationBuilder;
-    private AuthenticationManagerBuilder localConfigureAuthenticationBldr;
-    private boolean disableLocalConfigureAuthenticationBldr;
-    private boolean authenticationManagerInitialized;
-    private AuthenticationManager authenticationManager;
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
-    private HttpSecurity http;
-    private boolean disableDefaults;
+	private AuthenticationConfiguration authenticationConfiguration;
+	private AuthenticationManagerBuilder authenticationBuilder;
+	private AuthenticationManagerBuilder localConfigureAuthenticationBldr;
+	private boolean disableLocalConfigureAuthenticationBldr;
+	private boolean authenticationManagerInitialized;
+	private AuthenticationManager authenticationManager;
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private HttpSecurity http;
+	private boolean disableDefaults;
 
-    /**
-     * Creates an instance with the default configuration enabled.
-     */
-    protected WebSecurityConfigurerAdapter() {
-        this(false);
-    }
+	/**
+	 * Creates an instance with the default configuration enabled.
+	 */
+	protected WebSecurityConfigurerAdapter() {
+		this(false);
+	}
 
-    /**
-     * Creates an instance which allows specifying if the default configuration
-     * should be enabled. Disabling the default configuration should be
-     * considered more advanced usage as it requires more understanding of how
-     * the framework is implemented.
-     *
-     * @param disableDefaults
-     *            true if the default configuration should be enabled, else
-     *            false
-     */
-    protected WebSecurityConfigurerAdapter(boolean disableDefaults) {
-        this.disableDefaults = disableDefaults;
-    }
+	/**
+	 * Creates an instance which allows specifying if the default configuration should be
+	 * enabled. Disabling the default configuration should be considered more advanced
+	 * usage as it requires more understanding of how the framework is implemented.
+	 *
+	 * @param disableDefaults true if the default configuration should be enabled, else
+	 * false
+	 */
+	protected WebSecurityConfigurerAdapter(boolean disableDefaults) {
+		this.disableDefaults = disableDefaults;
+	}
 
-    /**
-     * Used by the default implementation of {@link #authenticationManager()} to
-     * attempt to obtain an {@link AuthenticationManager}. If overridden, the
-     * {@link AuthenticationManagerBuilder} should be used to specify the
-     * {@link AuthenticationManager}.
-     *
-     * <p>
-     * The {@link #authenticationManagerBean()} method can be used to expose the
-     * resulting {@link AuthenticationManager} as a Bean. The
-     * {@link #userDetailsServiceBean()} can be used to expose the last
-     * populated {@link UserDetailsService} that is created with the
-     * {@link AuthenticationManagerBuilder} as a Bean. The
-     * {@link UserDetailsService} will also automatically be populated on
-     * {@link HttpSecurity#getSharedObject(Class)} for use with other
-     * {@link SecurityContextConfigurer} (i.e. RememberMeConfigurer )
-     * </p>
-     *
-     * <p>
-     * For example, the following configuration could be used to register in
-     * memory authentication that exposes an in memory
-     * {@link UserDetailsService}:
-     * </p>
-     *
-     * <pre>
-     * &#064;Override
-     * protected void configure(AuthenticationManagerBuilder auth) {
-     *     auth
-     *         // enable in memory based authentication with a user named
-     *         // &quot;user&quot; and &quot;admin&quot;
-     *         .inMemoryAuthentication()
-     *             .withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;).and()
-     *             .withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
-     * }
-     *
-     * // Expose the UserDetailsService as a Bean
-     * &#064;Bean
-     * &#064;Override
-     * public UserDetailsService userDetailsServiceBean() throws Exception {
-     *     return super.userDetailsServiceBean();
-     * }
-     *
-     * </pre>
-     *
-     * @param auth
-     *            the {@link AuthenticationManagerBuilder} to use
-     * @throws Exception
-     */
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        this.disableLocalConfigureAuthenticationBldr = true;
-    }
+	/**
+	 * Used by the default implementation of {@link #authenticationManager()} to attempt
+	 * to obtain an {@link AuthenticationManager}. If overridden, the
+	 * {@link AuthenticationManagerBuilder} should be used to specify the
+	 * {@link AuthenticationManager}.
+	 *
+	 * <p>
+	 * The {@link #authenticationManagerBean()} method can be used to expose the resulting
+	 * {@link AuthenticationManager} as a Bean. The {@link #userDetailsServiceBean()} can
+	 * be used to expose the last populated {@link UserDetailsService} that is created
+	 * with the {@link AuthenticationManagerBuilder} as a Bean. The
+	 * {@link UserDetailsService} will also automatically be populated on
+	 * {@link HttpSecurity#getSharedObject(Class)} for use with other
+	 * {@link SecurityContextConfigurer} (i.e. RememberMeConfigurer )
+	 * </p>
+	 *
+	 * <p>
+	 * For example, the following configuration could be used to register in memory
+	 * authentication that exposes an in memory {@link UserDetailsService}:
+	 * </p>
+	 *
+	 * <pre>
+	 * &#064;Override
+	 * protected void configure(AuthenticationManagerBuilder auth) {
+	 * 	auth
+	 * 	// enable in memory based authentication with a user named
+	 * 	// &quot;user&quot; and &quot;admin&quot;
+	 * 	.inMemoryAuthentication().withUser(&quot;user&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;).and()
+	 * 			.withUser(&quot;admin&quot;).password(&quot;password&quot;).roles(&quot;USER&quot;, &quot;ADMIN&quot;);
+	 * }
+	 *
+	 * // Expose the UserDetailsService as a Bean
+	 * &#064;Bean
+	 * &#064;Override
+	 * public UserDetailsService userDetailsServiceBean() throws Exception {
+	 * 	return super.userDetailsServiceBean();
+	 * }
+	 *
+	 * </pre>
+	 *
+	 * @param auth the {@link AuthenticationManagerBuilder} to use
+	 * @throws Exception
+	 */
+	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+		this.disableLocalConfigureAuthenticationBldr = true;
+	}
 
-    /**
-     * Creates the {@link HttpSecurity} or returns the current instance
-     *
-     * @return the {@link HttpSecurity}
-     * @throws Exception
-     */
-    protected final HttpSecurity getHttp() throws Exception {
-        if(http != null) {
-            return http;
-        }
+	/**
+	 * Creates the {@link HttpSecurity} or returns the current instance
+	 *
+	 * ] * @return the {@link HttpSecurity}
+	 * @throws Exception
+	 */
+	protected final HttpSecurity getHttp() throws Exception {
+		if (http != null) {
+			return http;
+		}
 
-        DefaultAuthenticationEventPublisher eventPublisher = objectPostProcessor.postProcess(new DefaultAuthenticationEventPublisher());
-        localConfigureAuthenticationBldr.authenticationEventPublisher(eventPublisher);
+		DefaultAuthenticationEventPublisher eventPublisher = objectPostProcessor
+				.postProcess(new DefaultAuthenticationEventPublisher());
+		localConfigureAuthenticationBldr.authenticationEventPublisher(eventPublisher);
 
-        AuthenticationManager authenticationManager = authenticationManager();
-        authenticationBuilder.parentAuthenticationManager(authenticationManager);
-        http = new HttpSecurity(objectPostProcessor,authenticationBuilder, localConfigureAuthenticationBldr.getSharedObjects());
-        http.setSharedObject(UserDetailsService.class, userDetailsService());
-        http.setSharedObject(ApplicationContext.class, context);
-        http.setSharedObject(ContentNegotiationStrategy.class, contentNegotiationStrategy);
-        http.setSharedObject(AuthenticationTrustResolver.class, trustResolver);
-        if(!disableDefaults) {
-            http
-                .csrf().and()
-                .addFilter(new WebAsyncManagerIntegrationFilter())
-                .exceptionHandling().and()
-                .headers().and()
-                .sessionManagement().and()
-                .securityContext().and()
-                .requestCache().and()
-                .anonymous().and()
-                .servletApi().and()
-                .apply(new DefaultLoginPageConfigurer<HttpSecurity>()).and()
-                .logout();
-        }
-        configure(http);
-        return http;
-    }
+		AuthenticationManager authenticationManager = authenticationManager();
+		authenticationBuilder.parentAuthenticationManager(authenticationManager);
+		http = new HttpSecurity(objectPostProcessor, authenticationBuilder,
+				localConfigureAuthenticationBldr.getSharedObjects());
+		http.setSharedObject(UserDetailsService.class, userDetailsService());
+		http.setSharedObject(ApplicationContext.class, context);
+		http.setSharedObject(ContentNegotiationStrategy.class, contentNegotiationStrategy);
+		http.setSharedObject(AuthenticationTrustResolver.class, trustResolver);
+		if (!disableDefaults) {
+			// @formatter:off
+			http
+				.csrf().and()
+				.addFilter(new WebAsyncManagerIntegrationFilter())
+				.exceptionHandling().and()
+				.headers().and()
+				.sessionManagement().and()
+				.securityContext().and()
+				.requestCache().and()
+				.anonymous().and()
+				.servletApi().and()
+				.apply(new DefaultLoginPageConfigurer<HttpSecurity>()).and()
+				.logout();
+			// @formatter:on
+		}
+		configure(http);
+		return http;
+	}
 
-    /**
-     * Override this method to expose the {@link AuthenticationManager} from
-     * {@link #configure(AuthenticationManagerBuilder)} to be exposed as
-     * a Bean. For example:
-     *
-     * <pre>
-     * &#064;Bean(name name="myAuthenticationManager")
-     * &#064;Override
-     * public AuthenticationManager authenticationManagerBean() throws Exception {
-     *     return super.authenticationManagerBean();
-     * }
-     * </pre>
-     *
-     * @return the {@link AuthenticationManager}
-     * @throws Exception
-     */
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return new AuthenticationManagerDelegator(authenticationBuilder, context);
-    }
+	/**
+	 * Override this method to expose the {@link AuthenticationManager} from
+	 * {@link #configure(AuthenticationManagerBuilder)} to be exposed as a Bean. For
+	 * example:
+	 *
+	 * <pre>
+	 * &#064;Bean(name name="myAuthenticationManager")
+	 * &#064;Override
+	 * public AuthenticationManager authenticationManagerBean() throws Exception {
+	 *     return super.authenticationManagerBean();
+	 * }
+	 * </pre>
+	 *
+	 * @return the {@link AuthenticationManager}
+	 * @throws Exception
+	 */
+	public AuthenticationManager authenticationManagerBean() throws Exception {
+		return new AuthenticationManagerDelegator(authenticationBuilder, context);
+	}
 
-    /**
-     * Gets the {@link AuthenticationManager} to use. The default strategy is if
-     * {@link #configure(AuthenticationManagerBuilder)} method is
-     * overridden to use the {@link AuthenticationManagerBuilder} that was passed in.
-     * Otherwise, autowire the {@link AuthenticationManager} by type.
-     *
-     * @return
-     * @throws Exception
-     */
-    protected AuthenticationManager authenticationManager() throws Exception {
-        if(!authenticationManagerInitialized) {
-            configure(localConfigureAuthenticationBldr);
-            if(disableLocalConfigureAuthenticationBldr) {
-                authenticationManager = authenticationConfiguration.getAuthenticationManager();
-            } else {
-                authenticationManager = localConfigureAuthenticationBldr.build();
-            }
-            authenticationManagerInitialized = true;
-        }
-        return authenticationManager;
-    }
+	/**
+	 * Gets the {@link AuthenticationManager} to use. The default strategy is if
+	 * {@link #configure(AuthenticationManagerBuilder)} method is overridden to use the
+	 * {@link AuthenticationManagerBuilder} that was passed in. Otherwise, autowire the
+	 * {@link AuthenticationManager} by type.
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	protected AuthenticationManager authenticationManager() throws Exception {
+		if (!authenticationManagerInitialized) {
+			configure(localConfigureAuthenticationBldr);
+			if (disableLocalConfigureAuthenticationBldr) {
+				authenticationManager = authenticationConfiguration
+						.getAuthenticationManager();
+			}
+			else {
+				authenticationManager = localConfigureAuthenticationBldr.build();
+			}
+			authenticationManagerInitialized = true;
+		}
+		return authenticationManager;
+	}
 
-    /**
-     * Override this method to expose a {@link UserDetailsService} created from
-     * {@link #configure(AuthenticationManagerBuilder)} as a bean. In
-     * general only the following override should be done of this method:
-     *
-     * <pre>
-     * &#064;Bean(name = "myUserDetailsService") // any or no name specified is allowed
-     * &#064;Override
-     * public UserDetailsService userDetailsServiceBean() throws Exception {
-     *     return super.userDetailsServiceBean();
-     * }
-     * </pre>
-     *
-     * To change the instance returned, developers should change
-     * {@link #userDetailsService()} instead
-     * @return
-     * @throws Exception
-     * @see {@link #userDetailsService()}
-     */
-    public UserDetailsService userDetailsServiceBean() throws Exception {
-        AuthenticationManagerBuilder globalAuthBuilder = context.getBean(AuthenticationManagerBuilder.class);
-        return new UserDetailsServiceDelegator(Arrays.asList(localConfigureAuthenticationBldr, globalAuthBuilder));
-    }
+	/**
+	 * Override this method to expose a {@link UserDetailsService} created from
+	 * {@link #configure(AuthenticationManagerBuilder)} as a bean. In general only the
+	 * following override should be done of this method:
+	 *
+	 * <pre>
+	 * &#064;Bean(name = &quot;myUserDetailsService&quot;)
+	 * // any or no name specified is allowed
+	 * &#064;Override
+	 * public UserDetailsService userDetailsServiceBean() throws Exception {
+	 * 	return super.userDetailsServiceBean();
+	 * }
+	 * </pre>
+	 *
+	 * To change the instance returned, developers should change
+	 * {@link #userDetailsService()} instead
+	 * @return
+	 * @throws Exception
+	 * @see {@link #userDetailsService()}
+	 */
+	public UserDetailsService userDetailsServiceBean() throws Exception {
+		AuthenticationManagerBuilder globalAuthBuilder = context
+				.getBean(AuthenticationManagerBuilder.class);
+		return new UserDetailsServiceDelegator(Arrays.asList(
+				localConfigureAuthenticationBldr, globalAuthBuilder));
+	}
 
-    /**
-     * Allows modifying and accessing the {@link UserDetailsService} from
-     * {@link #userDetailsServiceBean()()} without interacting with the
-     * {@link ApplicationContext}. Developers should override this method when
-     * changing the instance of {@link #userDetailsServiceBean()}.
-     *
-     * @return
-     */
-    protected UserDetailsService userDetailsService() {
-        AuthenticationManagerBuilder globalAuthBuilder = context.getBean(AuthenticationManagerBuilder.class);
-        return new UserDetailsServiceDelegator(Arrays.asList(localConfigureAuthenticationBldr, globalAuthBuilder));
-    }
+	/**
+	 * Allows modifying and accessing the {@link UserDetailsService} from
+	 * {@link #userDetailsServiceBean()()} without interacting with the
+	 * {@link ApplicationContext}. Developers should override this method when changing
+	 * the instance of {@link #userDetailsServiceBean()}.
+	 *
+	 * @return
+	 */
+	protected UserDetailsService userDetailsService() {
+		AuthenticationManagerBuilder globalAuthBuilder = context
+				.getBean(AuthenticationManagerBuilder.class);
+		return new UserDetailsServiceDelegator(Arrays.asList(
+				localConfigureAuthenticationBldr, globalAuthBuilder));
+	}
 
-    public void init(final WebSecurity web) throws Exception {
-        final HttpSecurity http = getHttp();
-        web
-            .addSecurityFilterChainBuilder(http)
-            .postBuildAction(new Runnable() {
-                public void run() {
-                    FilterSecurityInterceptor securityInterceptor = http.getSharedObject(FilterSecurityInterceptor.class);
-                    web.securityInterceptor(securityInterceptor);
-                }
-            });
-    }
+	public void init(final WebSecurity web) throws Exception {
+		final HttpSecurity http = getHttp();
+		web.addSecurityFilterChainBuilder(http).postBuildAction(new Runnable() {
+			public void run() {
+				FilterSecurityInterceptor securityInterceptor = http
+						.getSharedObject(FilterSecurityInterceptor.class);
+				web.securityInterceptor(securityInterceptor);
+			}
+		});
+	}
 
-    /**
-     * Override this method to configure {@link WebSecurity}. For
-     * example, if you wish to ignore certain requests.
-     */
-    public void configure(WebSecurity web) throws Exception {
-    }
+	/**
+	 * Override this method to configure {@link WebSecurity}. For example, if you wish to
+	 * ignore certain requests.
+	 */
+	public void configure(WebSecurity web) throws Exception {
+	}
 
-    /**
-     * Override this method to configure the {@link HttpSecurity}.
-     * Typically subclasses should not invoke this method by calling super
-     * as it may override their configuration. The default configuration is:
-     *
-     * <pre>
-     * http
-     *     .authorizeRequests()
-     *         .anyRequest().authenticated().and()
-     *     .formLogin().and()
-     *     .httpBasic();
-     * </pre>
-     *
-     * @param http
-     *            the {@link HttpSecurity} to modify
-     * @throws Exception
-     *             if an error occurs
-     */
-    protected void configure(HttpSecurity http) throws Exception {
-        logger.debug("Using default configure(HttpSecurity). If subclassed this will potentially override subclass configure(HttpSecurity).");
+	/**
+	 * Override this method to configure the {@link HttpSecurity}. Typically subclasses
+	 * should not invoke this method by calling super as it may override their
+	 * configuration. The default configuration is:
+	 *
+	 * <pre>
+	 * http.authorizeRequests().anyRequest().authenticated().and().formLogin().and().httpBasic();
+	 * </pre>
+	 *
+	 * @param http the {@link HttpSecurity} to modify
+	 * @throws Exception if an error occurs
+	 */
+	// @formatter:off
+	protected void configure(HttpSecurity http) throws Exception {
+		logger.debug("Using default configure(HttpSecurity). If subclassed this will potentially override subclass configure(HttpSecurity).");
 
-        http
-            .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin().and()
-            .httpBasic();
-    }
+		http
+			.authorizeRequests()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin().and()
+			.httpBasic();
+	}
+	// @formatter:on
 
-    @Autowired
-    public void setApplicationContext(ApplicationContext context) {
-        this.context = context;
-    }
+	@Autowired
+	public void setApplicationContext(ApplicationContext context) {
+		this.context = context;
+	}
 
-    @Autowired(required=false)
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        this.trustResolver = trustResolver;
-    }
+	@Autowired(required = false)
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		this.trustResolver = trustResolver;
+	}
 
-    @Autowired(required=false)
-    public void setContentNegotationStrategy(ContentNegotiationStrategy contentNegotiationStrategy) {
-        this.contentNegotiationStrategy = contentNegotiationStrategy;
-    }
+	@Autowired(required = false)
+	public void setContentNegotationStrategy(
+			ContentNegotiationStrategy contentNegotiationStrategy) {
+		this.contentNegotiationStrategy = contentNegotiationStrategy;
+	}
 
-    @Autowired
-    public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
-        this.objectPostProcessor = objectPostProcessor;
+	@Autowired
+	public void setObjectPostProcessor(ObjectPostProcessor<Object> objectPostProcessor) {
+		this.objectPostProcessor = objectPostProcessor;
 
-        authenticationBuilder = new AuthenticationManagerBuilder(objectPostProcessor);
-        localConfigureAuthenticationBldr = new AuthenticationManagerBuilder(objectPostProcessor) {
-            @Override
-            public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) {
-                authenticationBuilder.eraseCredentials(eraseCredentials);
-                return super.eraseCredentials(eraseCredentials);
-            }
+		authenticationBuilder = new AuthenticationManagerBuilder(objectPostProcessor);
+		localConfigureAuthenticationBldr = new AuthenticationManagerBuilder(
+				objectPostProcessor) {
+			@Override
+			public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) {
+				authenticationBuilder.eraseCredentials(eraseCredentials);
+				return super.eraseCredentials(eraseCredentials);
+			}
 
-        };
-    }
+		};
+	}
 
-    @Autowired
-    public void setAuthenticationConfiguration(AuthenticationConfiguration authenticationConfiguration) {
-        this.authenticationConfiguration = authenticationConfiguration;
-    }
+	@Autowired
+	public void setAuthenticationConfiguration(
+			AuthenticationConfiguration authenticationConfiguration) {
+		this.authenticationConfiguration = authenticationConfiguration;
+	}
 
-    /**
-     * Delays the use of the {@link UserDetailsService} from the
-     * {@link AuthenticationManagerBuilder} to ensure that it has been fully
-     * configured.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    static final class UserDetailsServiceDelegator implements UserDetailsService {
-        private List<AuthenticationManagerBuilder> delegateBuilders;
-        private UserDetailsService delegate;
-        private final Object delegateMonitor = new Object();
+	/**
+	 * Delays the use of the {@link UserDetailsService} from the
+	 * {@link AuthenticationManagerBuilder} to ensure that it has been fully configured.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	static final class UserDetailsServiceDelegator implements UserDetailsService {
+		private List<AuthenticationManagerBuilder> delegateBuilders;
+		private UserDetailsService delegate;
+		private final Object delegateMonitor = new Object();
 
-        UserDetailsServiceDelegator(List<AuthenticationManagerBuilder> delegateBuilders) {
-            if(delegateBuilders.contains(null)) {
-                throw new IllegalArgumentException("delegateBuilders cannot contain null values. Got " + delegateBuilders);
-            }
-            this.delegateBuilders = delegateBuilders;
-        }
+		UserDetailsServiceDelegator(List<AuthenticationManagerBuilder> delegateBuilders) {
+			if (delegateBuilders.contains(null)) {
+				throw new IllegalArgumentException(
+						"delegateBuilders cannot contain null values. Got "
+								+ delegateBuilders);
+			}
+			this.delegateBuilders = delegateBuilders;
+		}
 
-        public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-            if(delegate != null) {
-                return delegate.loadUserByUsername(username);
-            }
+		public UserDetails loadUserByUsername(String username)
+				throws UsernameNotFoundException {
+			if (delegate != null) {
+				return delegate.loadUserByUsername(username);
+			}
 
-            synchronized(delegateMonitor) {
-                if (delegate == null) {
-                    for(AuthenticationManagerBuilder delegateBuilder : delegateBuilders) {
-                        delegate = delegateBuilder.getDefaultUserDetailsService();
-                        if(delegate != null) {
-                            break;
-                        }
-                    }
+			synchronized (delegateMonitor) {
+				if (delegate == null) {
+					for (AuthenticationManagerBuilder delegateBuilder : delegateBuilders) {
+						delegate = delegateBuilder.getDefaultUserDetailsService();
+						if (delegate != null) {
+							break;
+						}
+					}
 
-                    if(delegate == null) {
-                        throw new IllegalStateException("UserDetailsService is required.");
-                    }
-                    this.delegateBuilders = null;
-                }
-            }
+					if (delegate == null) {
+						throw new IllegalStateException("UserDetailsService is required.");
+					}
+					this.delegateBuilders = null;
+				}
+			}
 
-            return delegate.loadUserByUsername(username);
-        }
-    }
+			return delegate.loadUserByUsername(username);
+		}
+	}
 
+	/**
+	 * Delays the use of the {@link AuthenticationManager} build from the
+	 * {@link AuthenticationManagerBuilder} to ensure that it has been fully configured.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	static final class AuthenticationManagerDelegator implements AuthenticationManager {
+		private AuthenticationManagerBuilder delegateBuilder;
+		private AuthenticationManager delegate;
+		private final Object delegateMonitor = new Object();
+		private Set<String> beanNames;
 
-    /**
-     * Delays the use of the {@link AuthenticationManager} build from the
-     * {@link AuthenticationManagerBuilder} to ensure that it has been fully
-     * configured.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    static final class AuthenticationManagerDelegator implements AuthenticationManager {
-        private AuthenticationManagerBuilder delegateBuilder;
-        private AuthenticationManager delegate;
-        private final Object delegateMonitor = new Object();
-        private Set<String> beanNames;
+		AuthenticationManagerDelegator(AuthenticationManagerBuilder delegateBuilder,
+				ApplicationContext context) {
+			Assert.notNull(delegateBuilder, "delegateBuilder cannot be null");
+			Field parentAuthMgrField = ReflectionUtils.findField(
+					AuthenticationManagerBuilder.class, "parentAuthenticationManager");
+			ReflectionUtils.makeAccessible(parentAuthMgrField);
+			beanNames = getAuthenticationManagerBeanNames(context);
+			validateBeanCycle(
+					ReflectionUtils.getField(parentAuthMgrField, delegateBuilder),
+					beanNames);
+			this.delegateBuilder = delegateBuilder;
+		}
 
-        AuthenticationManagerDelegator(AuthenticationManagerBuilder delegateBuilder, ApplicationContext context) {
-            Assert.notNull(delegateBuilder,"delegateBuilder cannot be null");
-            Field parentAuthMgrField = ReflectionUtils.findField(AuthenticationManagerBuilder.class, "parentAuthenticationManager");
-            ReflectionUtils.makeAccessible(parentAuthMgrField);
-            beanNames = getAuthenticationManagerBeanNames(context);
-            validateBeanCycle(ReflectionUtils.getField(parentAuthMgrField, delegateBuilder), beanNames);
-            this.delegateBuilder = delegateBuilder;
-        }
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			if (delegate != null) {
+				return delegate.authenticate(authentication);
+			}
 
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            if(delegate != null) {
-                return delegate.authenticate(authentication);
-            }
+			synchronized (delegateMonitor) {
+				if (delegate == null) {
+					delegate = this.delegateBuilder.getObject();
+					this.delegateBuilder = null;
+				}
+			}
 
-            synchronized(delegateMonitor) {
-                if (delegate == null) {
-                    delegate = this.delegateBuilder.getObject();
-                    this.delegateBuilder = null;
-                }
-            }
+			return delegate.authenticate(authentication);
+		}
 
-            return delegate.authenticate(authentication);
-        }
+		private static Set<String> getAuthenticationManagerBeanNames(
+				ApplicationContext applicationContext) {
+			String[] beanNamesForType = BeanFactoryUtils
+					.beanNamesForTypeIncludingAncestors(applicationContext,
+							AuthenticationManager.class);
+			return new HashSet<String>(Arrays.asList(beanNamesForType));
+		}
 
-        private static Set<String> getAuthenticationManagerBeanNames(ApplicationContext applicationContext) {
-             String[] beanNamesForType = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(applicationContext, AuthenticationManager.class);
-             return new HashSet<String>(Arrays.asList(beanNamesForType));
-        }
-
-        private static void validateBeanCycle(Object auth, Set<String> beanNames) {
-            if(auth != null && !beanNames.isEmpty()) {
-                if(auth instanceof Advised){
-                    Advised advised = (Advised) auth;
-                    TargetSource targetSource = advised.getTargetSource();
-                    if(targetSource instanceof LazyInitTargetSource) {
-                        LazyInitTargetSource lits = (LazyInitTargetSource) targetSource;
-                        if(beanNames.contains(lits.getTargetBeanName())) {
-                            throw new FatalBeanException("A dependency cycle was detected when trying to resolve the AuthenticationManager. Please ensure you have configured authentication.");
-                        }
-                    }
-                }
-                beanNames = Collections.emptySet();
-            }
-        }
-    }
+		private static void validateBeanCycle(Object auth, Set<String> beanNames) {
+			if (auth != null && !beanNames.isEmpty()) {
+				if (auth instanceof Advised) {
+					Advised advised = (Advised) auth;
+					TargetSource targetSource = advised.getTargetSource();
+					if (targetSource instanceof LazyInitTargetSource) {
+						LazyInitTargetSource lits = (LazyInitTargetSource) targetSource;
+						if (beanNames.contains(lits.getTargetBeanName())) {
+							throw new FatalBeanException(
+									"A dependency cycle was detected when trying to resolve the AuthenticationManager. Please ensure you have configured authentication.");
+						}
+					}
+				}
+				beanNames = Collections.emptySet();
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java
index e2a56e37a3..a539364245 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java
@@ -42,329 +42,339 @@ import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 
 /**
- * Base class for confuring {@link AbstractAuthenticationFilterConfigurer}. This is intended for internal use only.
+ * Base class for confuring {@link AbstractAuthenticationFilterConfigurer}. This is
+ * intended for internal use only.
  *
  * @see FormLoginConfigurer
  * @see OpenIDLoginConfigurer
  *
  * @param T refers to "this" for returning the current configurer
- * @param F refers to the {@link AbstractAuthenticationProcessingFilter} that is being built
+ * @param F refers to the {@link AbstractAuthenticationProcessingFilter} that is being
+ * built
  *
  * @author Rob Winch
  * @since 3.2
  */
-public abstract class AbstractAuthenticationFilterConfigurer<B  extends HttpSecurityBuilder<B>,T extends AbstractAuthenticationFilterConfigurer<B,T, F>, F extends AbstractAuthenticationProcessingFilter> extends AbstractHttpConfigurer<T,B> {
+public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecurityBuilder<B>, T extends AbstractAuthenticationFilterConfigurer<B, T, F>, F extends AbstractAuthenticationProcessingFilter>
+		extends AbstractHttpConfigurer<T, B> {
 
-    private final F authFilter;
+	private final F authFilter;
 
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource;
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource;
 
-    private AuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+	private AuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
 
-    private LoginUrlAuthenticationEntryPoint authenticationEntryPoint;
+	private LoginUrlAuthenticationEntryPoint authenticationEntryPoint;
 
-    private boolean customLoginPage;
-    private String loginPage;
-    private String loginProcessingUrl;
+	private boolean customLoginPage;
+	private String loginPage;
+	private String loginProcessingUrl;
 
-    private AuthenticationFailureHandler failureHandler;
+	private AuthenticationFailureHandler failureHandler;
 
-    private boolean permitAll;
+	private boolean permitAll;
 
-    private String failureUrl;
+	private String failureUrl;
 
-    /**
-     * Creates a new instance
-     * @param authenticationFilter the {@link AbstractAuthenticationProcessingFilter} to use
-     * @param defaultLoginProcessingUrl the default URL to use for {@link #loginProcessingUrl(String)}
-     */
-    protected AbstractAuthenticationFilterConfigurer(F authenticationFilter, String defaultLoginProcessingUrl) {
-        this.authFilter = authenticationFilter;
-        setLoginPage("/login");
-        if(defaultLoginProcessingUrl != null) {
-            loginProcessingUrl(defaultLoginProcessingUrl);
-        }
-    }
+	/**
+	 * Creates a new instance
+	 * @param authenticationFilter the {@link AbstractAuthenticationProcessingFilter} to
+	 * use
+	 * @param defaultLoginProcessingUrl the default URL to use for
+	 * {@link #loginProcessingUrl(String)}
+	 */
+	protected AbstractAuthenticationFilterConfigurer(F authenticationFilter,
+			String defaultLoginProcessingUrl) {
+		this.authFilter = authenticationFilter;
+		setLoginPage("/login");
+		if (defaultLoginProcessingUrl != null) {
+			loginProcessingUrl(defaultLoginProcessingUrl);
+		}
+	}
 
-    /**
-     * Specifies where users will go after authenticating successfully if they
-     * have not visited a secured page prior to authenticating. This is a
-     * shortcut for calling {@link #defaultSuccessUrl(String)}.
-     *
-     * @param defaultSuccessUrl
-     *            the default success url
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T defaultSuccessUrl(String defaultSuccessUrl) {
-        return defaultSuccessUrl(defaultSuccessUrl, false);
-    }
+	/**
+	 * Specifies where users will go after authenticating successfully if they have not
+	 * visited a secured page prior to authenticating. This is a shortcut for calling
+	 * {@link #defaultSuccessUrl(String)}.
+	 *
+	 * @param defaultSuccessUrl the default success url
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T defaultSuccessUrl(String defaultSuccessUrl) {
+		return defaultSuccessUrl(defaultSuccessUrl, false);
+	}
 
-    /**
-     * Specifies where users will go after authenticating successfully if they
-     * have not visited a secured page prior to authenticating or
-     * {@code alwaysUse} is true. This is a shortcut for calling
-     * {@link #successHandler(AuthenticationSuccessHandler)}.
-     *
-     * @param defaultSuccessUrl
-     *            the default success url
-     * @param alwaysUse
-     *            true if the {@code defaultSuccesUrl} should be used after
-     *            authentication despite if a protected page had been previously
-     *            visited
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T defaultSuccessUrl(String defaultSuccessUrl, boolean alwaysUse) {
-        SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
-        handler.setDefaultTargetUrl(defaultSuccessUrl);
-        handler.setAlwaysUseDefaultTargetUrl(alwaysUse);
-        return successHandler(handler);
-    }
+	/**
+	 * Specifies where users will go after authenticating successfully if they have not
+	 * visited a secured page prior to authenticating or {@code alwaysUse} is true. This
+	 * is a shortcut for calling {@link #successHandler(AuthenticationSuccessHandler)}.
+	 *
+	 * @param defaultSuccessUrl the default success url
+	 * @param alwaysUse true if the {@code defaultSuccesUrl} should be used after
+	 * authentication despite if a protected page had been previously visited
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T defaultSuccessUrl(String defaultSuccessUrl, boolean alwaysUse) {
+		SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
+		handler.setDefaultTargetUrl(defaultSuccessUrl);
+		handler.setAlwaysUseDefaultTargetUrl(alwaysUse);
+		return successHandler(handler);
+	}
 
-    /**
-     * Specifies the URL to validate the credentials.
-     *
-     * @param loginProcessingUrl
-     *            the URL to validate username and password
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public T loginProcessingUrl(String loginProcessingUrl) {
-        this.loginProcessingUrl = loginProcessingUrl;
-        authFilter.setRequiresAuthenticationRequestMatcher(createLoginProcessingUrlMatcher(loginProcessingUrl));
-        return getSelf();
-    }
+	/**
+	 * Specifies the URL to validate the credentials.
+	 *
+	 * @param loginProcessingUrl the URL to validate username and password
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public T loginProcessingUrl(String loginProcessingUrl) {
+		this.loginProcessingUrl = loginProcessingUrl;
+		authFilter
+				.setRequiresAuthenticationRequestMatcher(createLoginProcessingUrlMatcher(loginProcessingUrl));
+		return getSelf();
+	}
 
-    /**
-     * Create the {@link RequestMatcher} given a loginProcessingUrl
-     * @param loginProcessingUrl creates the {@link RequestMatcher} based upon the loginProcessingUrl
-     * @return the {@link RequestMatcher} to use based upon the loginProcessingUrl
-     */
-    protected abstract RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl);
+	/**
+	 * Create the {@link RequestMatcher} given a loginProcessingUrl
+	 * @param loginProcessingUrl creates the {@link RequestMatcher} based upon the
+	 * loginProcessingUrl
+	 * @return the {@link RequestMatcher} to use based upon the loginProcessingUrl
+	 */
+	protected abstract RequestMatcher createLoginProcessingUrlMatcher(
+			String loginProcessingUrl);
 
-    /**
-     * Specifies a custom {@link AuthenticationDetailsSource}. The default is {@link WebAuthenticationDetailsSource}.
-     *
-     * @param authenticationDetailsSource the custom {@link AuthenticationDetailsSource}
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T authenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
-        this.authenticationDetailsSource = authenticationDetailsSource;
-        return getSelf();
-    }
+	/**
+	 * Specifies a custom {@link AuthenticationDetailsSource}. The default is
+	 * {@link WebAuthenticationDetailsSource}.
+	 *
+	 * @param authenticationDetailsSource the custom {@link AuthenticationDetailsSource}
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T authenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		this.authenticationDetailsSource = authenticationDetailsSource;
+		return getSelf();
+	}
 
-    /**
-     * Specifies the {@link AuthenticationSuccessHandler} to be used. The
-     * default is {@link SavedRequestAwareAuthenticationSuccessHandler} with no
-     * additional properites set.
-     *
-     * @param successHandler
-     *            the {@link AuthenticationSuccessHandler}.
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T successHandler(AuthenticationSuccessHandler successHandler) {
-        this.successHandler = successHandler;
-        return getSelf();
-    }
+	/**
+	 * Specifies the {@link AuthenticationSuccessHandler} to be used. The default is
+	 * {@link SavedRequestAwareAuthenticationSuccessHandler} with no additional properites
+	 * set.
+	 *
+	 * @param successHandler the {@link AuthenticationSuccessHandler}.
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T successHandler(AuthenticationSuccessHandler successHandler) {
+		this.successHandler = successHandler;
+		return getSelf();
+	}
 
-    /**
-     * Equivalent of invoking permitAll(true)
-     * @return
-     */
-    public final T permitAll() {
-        return permitAll(true);
-    }
+	/**
+	 * Equivalent of invoking permitAll(true)
+	 * @return
+	 */
+	public final T permitAll() {
+		return permitAll(true);
+	}
 
-    /**
-     * Ensures the urls for {@link #failureUrl(String)} and
-     * {@link #authenticationUrls(String)} are granted access to any user.
-     *
-     * @param permitAll true to grant access to the URLs false to skip this step
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T permitAll(boolean permitAll) {
-        this.permitAll = permitAll;
-        return getSelf();
-    }
+	/**
+	 * Ensures the urls for {@link #failureUrl(String)} and
+	 * {@link #authenticationUrls(String)} are granted access to any user.
+	 *
+	 * @param permitAll true to grant access to the URLs false to skip this step
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T permitAll(boolean permitAll) {
+		this.permitAll = permitAll;
+		return getSelf();
+	}
 
-    /**
-     * The URL to send users if authentication fails. This is a shortcut for
-     * invoking {@link #failureHandler(AuthenticationFailureHandler)}. The
-     * default is "/login?error".
-     *
-     * @param authenticationFailureUrl
-     *            the URL to send users if authentication fails (i.e.
-     *            "/login?error").
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T failureUrl(String authenticationFailureUrl) {
-        T result = failureHandler(new SimpleUrlAuthenticationFailureHandler(authenticationFailureUrl));
-        this.failureUrl = authenticationFailureUrl;
-        return result;
-    }
+	/**
+	 * The URL to send users if authentication fails. This is a shortcut for invoking
+	 * {@link #failureHandler(AuthenticationFailureHandler)}. The default is
+	 * "/login?error".
+	 *
+	 * @param authenticationFailureUrl the URL to send users if authentication fails (i.e.
+	 * "/login?error").
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T failureUrl(String authenticationFailureUrl) {
+		T result = failureHandler(new SimpleUrlAuthenticationFailureHandler(
+				authenticationFailureUrl));
+		this.failureUrl = authenticationFailureUrl;
+		return result;
+	}
 
-    /**
-     * Specifies the {@link AuthenticationFailureHandler} to use when
-     * authentication fails. The default is redirecting to "/login?error" using
-     * {@link SimpleUrlAuthenticationFailureHandler}
-     *
-     * @param authenticationFailureHandler
-     *            the {@link AuthenticationFailureHandler} to use when
-     *            authentication fails.
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public final T failureHandler(AuthenticationFailureHandler authenticationFailureHandler) {
-        this.failureUrl = null;
-        this.failureHandler = authenticationFailureHandler;
-        return getSelf();
-    }
+	/**
+	 * Specifies the {@link AuthenticationFailureHandler} to use when authentication
+	 * fails. The default is redirecting to "/login?error" using
+	 * {@link SimpleUrlAuthenticationFailureHandler}
+	 *
+	 * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} to use
+	 * when authentication fails.
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public final T failureHandler(
+			AuthenticationFailureHandler authenticationFailureHandler) {
+		this.failureUrl = null;
+		this.failureHandler = authenticationFailureHandler;
+		return getSelf();
+	}
 
-    @Override
-    public void init(B http) throws Exception {
-        updateAuthenticationDefaults();
-        if(permitAll) {
-            PermitAllSupport.permitAll(http, loginPage, loginProcessingUrl, failureUrl);
-        }
+	@Override
+	public void init(B http) throws Exception {
+		updateAuthenticationDefaults();
+		if (permitAll) {
+			PermitAllSupport.permitAll(http, loginPage, loginProcessingUrl, failureUrl);
+		}
 
-        registerDefaultAuthenticationEntryPoint(http);
-    }
+		registerDefaultAuthenticationEntryPoint(http);
+	}
 
-    @SuppressWarnings("unchecked")
-    private void registerDefaultAuthenticationEntryPoint(B http) {
-        ExceptionHandlingConfigurer<B> exceptionHandling = http.getConfigurer(ExceptionHandlingConfigurer.class);
-        if(exceptionHandling == null) {
-            return;
-        }
-        ContentNegotiationStrategy contentNegotiationStrategy = http.getSharedObject(ContentNegotiationStrategy.class);
-        if(contentNegotiationStrategy == null) {
-            contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
-        }
-        MediaTypeRequestMatcher preferredMatcher = new MediaTypeRequestMatcher(contentNegotiationStrategy, MediaType.APPLICATION_XHTML_XML, new MediaType("image","*"), MediaType.TEXT_HTML, MediaType.TEXT_PLAIN);
-        preferredMatcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
-        exceptionHandling.defaultAuthenticationEntryPointFor(postProcess(authenticationEntryPoint), preferredMatcher);
-    }
+	@SuppressWarnings("unchecked")
+	private void registerDefaultAuthenticationEntryPoint(B http) {
+		ExceptionHandlingConfigurer<B> exceptionHandling = http
+				.getConfigurer(ExceptionHandlingConfigurer.class);
+		if (exceptionHandling == null) {
+			return;
+		}
+		ContentNegotiationStrategy contentNegotiationStrategy = http
+				.getSharedObject(ContentNegotiationStrategy.class);
+		if (contentNegotiationStrategy == null) {
+			contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
+		}
+		MediaTypeRequestMatcher preferredMatcher = new MediaTypeRequestMatcher(
+				contentNegotiationStrategy, MediaType.APPLICATION_XHTML_XML,
+				new MediaType("image", "*"), MediaType.TEXT_HTML, MediaType.TEXT_PLAIN);
+		preferredMatcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+		exceptionHandling.defaultAuthenticationEntryPointFor(
+				postProcess(authenticationEntryPoint), preferredMatcher);
+	}
 
-    @Override
-    public void configure(B http) throws Exception {
-        PortMapper portMapper = http.getSharedObject(PortMapper.class);
-        if(portMapper != null) {
-            authenticationEntryPoint.setPortMapper(portMapper);
-        }
+	@Override
+	public void configure(B http) throws Exception {
+		PortMapper portMapper = http.getSharedObject(PortMapper.class);
+		if (portMapper != null) {
+			authenticationEntryPoint.setPortMapper(portMapper);
+		}
 
-        authFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class));
-        authFilter.setAuthenticationSuccessHandler(successHandler);
-        authFilter.setAuthenticationFailureHandler(failureHandler);
-        if(authenticationDetailsSource != null) {
-            authFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
-        }
-        SessionAuthenticationStrategy sessionAuthenticationStrategy = http.getSharedObject(SessionAuthenticationStrategy.class);
-        if(sessionAuthenticationStrategy != null) {
-            authFilter.setSessionAuthenticationStrategy(sessionAuthenticationStrategy);
-        }
-        RememberMeServices rememberMeServices = http.getSharedObject(RememberMeServices.class);
-        if(rememberMeServices != null) {
-            authFilter.setRememberMeServices(rememberMeServices);
-        }
-        F filter = postProcess(authFilter);
-        http.addFilter(filter);
-    }
+		authFilter.setAuthenticationManager(http
+				.getSharedObject(AuthenticationManager.class));
+		authFilter.setAuthenticationSuccessHandler(successHandler);
+		authFilter.setAuthenticationFailureHandler(failureHandler);
+		if (authenticationDetailsSource != null) {
+			authFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
+		}
+		SessionAuthenticationStrategy sessionAuthenticationStrategy = http
+				.getSharedObject(SessionAuthenticationStrategy.class);
+		if (sessionAuthenticationStrategy != null) {
+			authFilter.setSessionAuthenticationStrategy(sessionAuthenticationStrategy);
+		}
+		RememberMeServices rememberMeServices = http
+				.getSharedObject(RememberMeServices.class);
+		if (rememberMeServices != null) {
+			authFilter.setRememberMeServices(rememberMeServices);
+		}
+		F filter = postProcess(authFilter);
+		http.addFilter(filter);
+	}
 
-    /**
-     * <p>
-     * Specifies the URL to send users to if login is required. If used with
-     * {@link WebSecurityConfigurerAdapter} a default login page will be
-     * generated when this attribute is not specified.
-     * </p>
-     *
-     * <p>
-     * If a URL is specified or this is not being used in conjuction with
-     * {@link WebSecurityConfigurerAdapter}, users are required to process the
-     * specified URL to generate a login page.
-     * </p>
-     */
-    protected T loginPage(String loginPage) {
-        setLoginPage(loginPage);
-        updateAuthenticationDefaults();
-        this.customLoginPage = true;
-        return getSelf();
-    }
+	/**
+	 * <p>
+	 * Specifies the URL to send users to if login is required. If used with
+	 * {@link WebSecurityConfigurerAdapter} a default login page will be generated when
+	 * this attribute is not specified.
+	 * </p>
+	 *
+	 * <p>
+	 * If a URL is specified or this is not being used in conjuction with
+	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
+	 * URL to generate a login page.
+	 * </p>
+	 */
+	protected T loginPage(String loginPage) {
+		setLoginPage(loginPage);
+		updateAuthenticationDefaults();
+		this.customLoginPage = true;
+		return getSelf();
+	}
 
-    /**
-     *
-     * @return true if a custom login page has been specified, else false
-     */
-    public final boolean isCustomLoginPage() {
-        return customLoginPage;
-    }
+	/**
+	 *
+	 * @return true if a custom login page has been specified, else false
+	 */
+	public final boolean isCustomLoginPage() {
+		return customLoginPage;
+	}
 
-    /**
-     * Gets the Authentication Filter
-     *
-     * @return
-     */
-    protected final F getAuthenticationFilter() {
-        return authFilter;
-    }
+	/**
+	 * Gets the Authentication Filter
+	 *
+	 * @return
+	 */
+	protected final F getAuthenticationFilter() {
+		return authFilter;
+	}
 
-    /**
-     * Gets the login page
-     *
-     * @return the login page
-     */
-    protected final String getLoginPage() {
-        return loginPage;
-    }
+	/**
+	 * Gets the login page
+	 *
+	 * @return the login page
+	 */
+	protected final String getLoginPage() {
+		return loginPage;
+	}
 
-    /**
-     * Gets the URL to submit an authentication request to (i.e. where
-     * username/password must be submitted)
-     *
-     * @return the URL to submit an authentication request to
-     */
-    protected final String getLoginProcessingUrl() {
-        return loginProcessingUrl;
-    }
+	/**
+	 * Gets the URL to submit an authentication request to (i.e. where username/password
+	 * must be submitted)
+	 *
+	 * @return the URL to submit an authentication request to
+	 */
+	protected final String getLoginProcessingUrl() {
+		return loginProcessingUrl;
+	}
 
-    /**
-     * Gets the URL to send users to if authentication fails
-     *
-     * @return
-     */
-    protected final String getFailureUrl() {
-        return failureUrl;
-    }
+	/**
+	 * Gets the URL to send users to if authentication fails
+	 *
+	 * @return
+	 */
+	protected final String getFailureUrl() {
+		return failureUrl;
+	}
 
-    /**
-     * Updates the default values for authentication.
-     *
-     * @throws Exception
-     */
-    private void updateAuthenticationDefaults() {
-        if (loginProcessingUrl == null) {
-            loginProcessingUrl(loginPage);
-        }
-        if (failureHandler == null) {
-            failureUrl(loginPage + "?error");
-        }
+	/**
+	 * Updates the default values for authentication.
+	 *
+	 * @throws Exception
+	 */
+	private void updateAuthenticationDefaults() {
+		if (loginProcessingUrl == null) {
+			loginProcessingUrl(loginPage);
+		}
+		if (failureHandler == null) {
+			failureUrl(loginPage + "?error");
+		}
 
-        final LogoutConfigurer<B> logoutConfigurer = getBuilder()
-                .getConfigurer(LogoutConfigurer.class);
-        if (logoutConfigurer != null
-                && !logoutConfigurer.isCustomLogoutSuccess()) {
-            logoutConfigurer.logoutSuccessUrl(loginPage + "?logout");
-        }
-    }
+		final LogoutConfigurer<B> logoutConfigurer = getBuilder().getConfigurer(
+				LogoutConfigurer.class);
+		if (logoutConfigurer != null && !logoutConfigurer.isCustomLogoutSuccess()) {
+			logoutConfigurer.logoutSuccessUrl(loginPage + "?logout");
+		}
+	}
 
-    /**
-     * Sets the loginPage and updates the {@link AuthenticationEntryPoint}.
-     * @param loginPage
-     */
-    private void setLoginPage(String loginPage) {
-        this.loginPage = loginPage;
-        this.authenticationEntryPoint = new LoginUrlAuthenticationEntryPoint(
-                loginPage);
-    }
+	/**
+	 * Sets the loginPage and updates the {@link AuthenticationEntryPoint}.
+	 * @param loginPage
+	 */
+	private void setLoginPage(String loginPage) {
+		this.loginPage = loginPage;
+		this.authenticationEntryPoint = new LoginUrlAuthenticationEntryPoint(loginPage);
+	}
 
-    @SuppressWarnings("unchecked")
-    private T getSelf() {
-        return (T) this;
-    }
+	@SuppressWarnings("unchecked")
+	private T getSelf() {
+		return (T) this;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
index dba0458553..e6a22be222 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
@@ -25,8 +25,8 @@ import org.springframework.security.config.annotation.web.AbstractRequestMatcher
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
- * A base class for registering {@link RequestMatcher}'s. For example, it might allow for specifying which
- * {@link RequestMatcher} require a certain level of authorization.
+ * A base class for registering {@link RequestMatcher}'s. For example, it might allow for
+ * specifying which {@link RequestMatcher} require a certain level of authorization.
  *
  * @author Rob Winch
  * @since 3.2
@@ -37,105 +37,111 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @see UrlAuthorizationConfigurer
  * @see ExpressionUrlAuthorizationConfigurer
  */
-public abstract class AbstractConfigAttributeRequestMatcherRegistry<C> extends AbstractRequestMatcherRegistry<C> {
-    private List<UrlMapping> urlMappings = new ArrayList<UrlMapping>();
-    private List<RequestMatcher> unmappedMatchers;
+public abstract class AbstractConfigAttributeRequestMatcherRegistry<C> extends
+		AbstractRequestMatcherRegistry<C> {
+	private List<UrlMapping> urlMappings = new ArrayList<UrlMapping>();
+	private List<RequestMatcher> unmappedMatchers;
 
-    /**
-     * Gets the {@link UrlMapping} added by subclasses in {@link #chainRequestMatchers(java.util.List)}. May be empty.
-     *
-     * @return the {@link UrlMapping} added by subclasses in {@link #chainRequestMatchers(java.util.List)}
-     */
-    final List<UrlMapping> getUrlMappings() {
-        return urlMappings;
-    }
+	/**
+	 * Gets the {@link UrlMapping} added by subclasses in
+	 * {@link #chainRequestMatchers(java.util.List)}. May be empty.
+	 *
+	 * @return the {@link UrlMapping} added by subclasses in
+	 * {@link #chainRequestMatchers(java.util.List)}
+	 */
+	final List<UrlMapping> getUrlMappings() {
+		return urlMappings;
+	}
 
-    /**
-     * Adds a {@link UrlMapping} added by subclasses in
-     * {@link #chainRequestMatchers(java.util.List)} and resets the unmapped
-     * {@link RequestMatcher}'s.
-     *
-     * @param urlMapping
-     *            {@link UrlMapping} the mapping to add
-     */
-    final void addMapping(UrlMapping urlMapping) {
-        this.unmappedMatchers = null;
-        this.urlMappings.add(urlMapping);
-    }
+	/**
+	 * Adds a {@link UrlMapping} added by subclasses in
+	 * {@link #chainRequestMatchers(java.util.List)} and resets the unmapped
+	 * {@link RequestMatcher}'s.
+	 *
+	 * @param urlMapping {@link UrlMapping} the mapping to add
+	 */
+	final void addMapping(UrlMapping urlMapping) {
+		this.unmappedMatchers = null;
+		this.urlMappings.add(urlMapping);
+	}
 
-    /**
-     * Marks the {@link RequestMatcher}'s as unmapped and then calls {@link #chainRequestMatchersInternal(List)}.
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances that were created
-     * @return the chained Object for the subclass which allows association of something else to the
-     *         {@link RequestMatcher}
-     */
-    protected final C chainRequestMatchers(List<RequestMatcher> requestMatchers) {
-        this.unmappedMatchers = requestMatchers;
-        return chainRequestMatchersInternal(requestMatchers);
-    }
+	/**
+	 * Marks the {@link RequestMatcher}'s as unmapped and then calls
+	 * {@link #chainRequestMatchersInternal(List)}.
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances that were created
+	 * @return the chained Object for the subclass which allows association of something
+	 * else to the {@link RequestMatcher}
+	 */
+	protected final C chainRequestMatchers(List<RequestMatcher> requestMatchers) {
+		this.unmappedMatchers = requestMatchers;
+		return chainRequestMatchersInternal(requestMatchers);
+	}
 
-    /**
-     * Subclasses should implement this method for returning the object that is chained to the creation of the
-     * {@link RequestMatcher} instances.
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances that were created
-     * @return the chained Object for the subclass which allows association of something else to the
-     *         {@link RequestMatcher}
-     */
-     protected abstract C chainRequestMatchersInternal(List<RequestMatcher> requestMatchers);
+	/**
+	 * Subclasses should implement this method for returning the object that is chained to
+	 * the creation of the {@link RequestMatcher} instances.
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances that were created
+	 * @return the chained Object for the subclass which allows association of something
+	 * else to the {@link RequestMatcher}
+	 */
+	protected abstract C chainRequestMatchersInternal(List<RequestMatcher> requestMatchers);
 
-    /**
-     * Adds a {@link UrlMapping} added by subclasses in {@link #chainRequestMatchers(java.util.List)} at a particular
-     * index.
-     *
-     * @param index the index to add a {@link UrlMapping}
-     * @param urlMapping {@link UrlMapping} the mapping to add
-     */
-    final void addMapping(int index, UrlMapping urlMapping) {
-        this.urlMappings.add(index, urlMapping);
-    }
+	/**
+	 * Adds a {@link UrlMapping} added by subclasses in
+	 * {@link #chainRequestMatchers(java.util.List)} at a particular index.
+	 *
+	 * @param index the index to add a {@link UrlMapping}
+	 * @param urlMapping {@link UrlMapping} the mapping to add
+	 */
+	final void addMapping(int index, UrlMapping urlMapping) {
+		this.urlMappings.add(index, urlMapping);
+	}
 
-    /**
-     * Creates the mapping of {@link RequestMatcher} to {@link Collection} of {@link ConfigAttribute} instances
-     *
-     * @return the mapping of {@link RequestMatcher} to {@link Collection} of {@link ConfigAttribute} instances. Cannot
-     *         be null.
-     */
-    final LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> createRequestMap() {
-        if(unmappedMatchers != null) {
-            throw new IllegalStateException("An incomplete mapping was found for " + unmappedMatchers +". Try completing it with something like requestUrls().<something>.hasRole('USER')");
-        }
+	/**
+	 * Creates the mapping of {@link RequestMatcher} to {@link Collection} of
+	 * {@link ConfigAttribute} instances
+	 *
+	 * @return the mapping of {@link RequestMatcher} to {@link Collection} of
+	 * {@link ConfigAttribute} instances. Cannot be null.
+	 */
+	final LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> createRequestMap() {
+		if (unmappedMatchers != null) {
+			throw new IllegalStateException(
+					"An incomplete mapping was found for "
+							+ unmappedMatchers
+							+ ". Try completing it with something like requestUrls().<something>.hasRole('USER')");
+		}
 
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
-        for (UrlMapping mapping : getUrlMappings()) {
-            RequestMatcher matcher = mapping.getRequestMatcher();
-            Collection<ConfigAttribute> configAttrs = mapping.getConfigAttrs();
-            requestMap.put(matcher,configAttrs);
-        }
-        return requestMap;
-    }
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		for (UrlMapping mapping : getUrlMappings()) {
+			RequestMatcher matcher = mapping.getRequestMatcher();
+			Collection<ConfigAttribute> configAttrs = mapping.getConfigAttrs();
+			requestMap.put(matcher, configAttrs);
+		}
+		return requestMap;
+	}
 
-    /**
-     * A mapping of {@link RequestMatcher} to {@link Collection} of {@link ConfigAttribute} instances
-     */
-    static final class UrlMapping {
-        private RequestMatcher requestMatcher;
-        private Collection<ConfigAttribute> configAttrs;
+	/**
+	 * A mapping of {@link RequestMatcher} to {@link Collection} of
+	 * {@link ConfigAttribute} instances
+	 */
+	static final class UrlMapping {
+		private RequestMatcher requestMatcher;
+		private Collection<ConfigAttribute> configAttrs;
 
-        UrlMapping(RequestMatcher requestMatcher,
-                Collection<ConfigAttribute> configAttrs) {
-            this.requestMatcher = requestMatcher;
-            this.configAttrs = configAttrs;
-        }
+		UrlMapping(RequestMatcher requestMatcher, Collection<ConfigAttribute> configAttrs) {
+			this.requestMatcher = requestMatcher;
+			this.configAttrs = configAttrs;
+		}
 
-        public RequestMatcher getRequestMatcher() {
-            return requestMatcher;
-        }
+		public RequestMatcher getRequestMatcher() {
+			return requestMatcher;
+		}
 
-        public Collection<ConfigAttribute> getConfigAttrs() {
-            return configAttrs;
-        }
-    }
+		public Collection<ConfigAttribute> getConfigAttrs() {
+			return configAttrs;
+		}
+	}
 }
-
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
index 4bd4d0479e..127b79be8d 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
@@ -23,29 +23,30 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.DefaultSecurityFilterChain;
 
 /**
- * Adds a convenient base class for {@link SecurityConfigurer} instances that
- * operate on {@link HttpSecurity}.
+ * Adds a convenient base class for {@link SecurityConfigurer} instances that operate on
+ * {@link HttpSecurity}.
  *
  * @author Rob Winch
  *
  */
-abstract class AbstractHttpConfigurer<T extends AbstractHttpConfigurer<T, B>,B extends HttpSecurityBuilder<B>> extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, B> {
+abstract class AbstractHttpConfigurer<T extends AbstractHttpConfigurer<T, B>, B extends HttpSecurityBuilder<B>>
+		extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, B> {
 
-    /**
-     * Disables the {@link AbstractHttpConfigurer} by removing it. After doing
-     * so a fresh version of the configuration can be applied.
-     *
-     * @return the {@link HttpSecurityBuilder} for additional customizations
-     */
-    @SuppressWarnings("unchecked")
-    public B disable() {
-        getBuilder().removeConfigurer(getClass());
-        return getBuilder();
-    }
+	/**
+	 * Disables the {@link AbstractHttpConfigurer} by removing it. After doing so a fresh
+	 * version of the configuration can be applied.
+	 *
+	 * @return the {@link HttpSecurityBuilder} for additional customizations
+	 */
+	@SuppressWarnings("unchecked")
+	public B disable() {
+		getBuilder().removeConfigurer(getClass());
+		return getBuilder();
+	}
 
-    @SuppressWarnings("unchecked")
-    public T withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-        addObjectPostProcessor(objectPostProcessor);
-        return (T) this;
-    }
+	@SuppressWarnings("unchecked")
+	public T withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
+		addObjectPostProcessor(objectPostProcessor);
+		return (T) this;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
index b65c2c1d22..4fe6e09571 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
@@ -34,14 +34,15 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
  * The following Filters are populated
  *
  * <ul>
- *     <li>{@link FilterSecurityInterceptor}</li>
+ * <li>{@link FilterSecurityInterceptor}</li>
  * </ul>
-  *
+ *
  * <h2>Shared Objects Created</h2>
  *
- * The following shared objects are populated to allow other {@link SecurityConfigurer}'s to customize:
+ * The following shared objects are populated to allow other {@link SecurityConfigurer}'s
+ * to customize:
  * <ul>
- *     <li>{@link FilterSecurityInterceptor}</li>
+ * <li>{@link FilterSecurityInterceptor}</li>
  * </ul>
  *
  * <h2>Shared Objects Used</h2>
@@ -49,7 +50,9 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
  * The following shared objects are used:
  *
  * <ul>
- *     <li>{@link org.springframework.security.config.annotation.web.builders.HttpSecurity#getAuthenticationManager()}</li>
+ * <li>
+ * {@link org.springframework.security.config.annotation.web.builders.HttpSecurity#getAuthenticationManager()}
+ * </li>
  * </ul>
  *
  *
@@ -61,130 +64,135 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
  * @see ExpressionUrlAuthorizationConfigurer
  * @see UrlAuthorizationConfigurer
  */
-abstract class AbstractInterceptUrlConfigurer<C extends AbstractInterceptUrlConfigurer<C,H>, H extends HttpSecurityBuilder<H>> extends
-        AbstractHttpConfigurer<C, H>{
-    private Boolean filterSecurityInterceptorOncePerRequest;
+abstract class AbstractInterceptUrlConfigurer<C extends AbstractInterceptUrlConfigurer<C, H>, H extends HttpSecurityBuilder<H>>
+		extends AbstractHttpConfigurer<C, H> {
+	private Boolean filterSecurityInterceptorOncePerRequest;
 
-    private AccessDecisionManager accessDecisionManager;
+	private AccessDecisionManager accessDecisionManager;
 
-    @Override
-    public void configure(H http) throws Exception {
-        FilterInvocationSecurityMetadataSource metadataSource = createMetadataSource(http);
-        if(metadataSource == null) {
-            return;
-        }
-        FilterSecurityInterceptor securityInterceptor = createFilterSecurityInterceptor(http, metadataSource, http.getSharedObject(AuthenticationManager.class));
-        if(filterSecurityInterceptorOncePerRequest != null) {
-            securityInterceptor.setObserveOncePerRequest(filterSecurityInterceptorOncePerRequest);
-        }
-        securityInterceptor = postProcess(securityInterceptor);
-        http.addFilter(securityInterceptor);
-        http.setSharedObject(FilterSecurityInterceptor.class, securityInterceptor);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		FilterInvocationSecurityMetadataSource metadataSource = createMetadataSource(http);
+		if (metadataSource == null) {
+			return;
+		}
+		FilterSecurityInterceptor securityInterceptor = createFilterSecurityInterceptor(
+				http, metadataSource, http.getSharedObject(AuthenticationManager.class));
+		if (filterSecurityInterceptorOncePerRequest != null) {
+			securityInterceptor
+					.setObserveOncePerRequest(filterSecurityInterceptorOncePerRequest);
+		}
+		securityInterceptor = postProcess(securityInterceptor);
+		http.addFilter(securityInterceptor);
+		http.setSharedObject(FilterSecurityInterceptor.class, securityInterceptor);
+	}
 
-    /**
-     * Subclasses should implement this method to provide a {@link FilterInvocationSecurityMetadataSource} for the
-     * {@link FilterSecurityInterceptor}.
-     *
-     * @param http the builder to use
-     *
-     * @return the {@link FilterInvocationSecurityMetadataSource} to set on the {@link FilterSecurityInterceptor}.
-     *         Cannot be null.
-     */
-    abstract FilterInvocationSecurityMetadataSource createMetadataSource(H http);
+	/**
+	 * Subclasses should implement this method to provide a
+	 * {@link FilterInvocationSecurityMetadataSource} for the
+	 * {@link FilterSecurityInterceptor}.
+	 *
+	 * @param http the builder to use
+	 *
+	 * @return the {@link FilterInvocationSecurityMetadataSource} to set on the
+	 * {@link FilterSecurityInterceptor}. Cannot be null.
+	 */
+	abstract FilterInvocationSecurityMetadataSource createMetadataSource(H http);
 
-    /**
-     * Subclasses should implement this method to provide the {@link AccessDecisionVoter} instances used to create the
-     * default {@link AccessDecisionManager}
-     *
-     * @param http the builder to use
-     *
-     * @return the {@link AccessDecisionVoter} instances used to create the
-     *         default {@link AccessDecisionManager}
-     */
-    @SuppressWarnings("rawtypes")
-    abstract List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http);
+	/**
+	 * Subclasses should implement this method to provide the {@link AccessDecisionVoter}
+	 * instances used to create the default {@link AccessDecisionManager}
+	 *
+	 * @param http the builder to use
+	 *
+	 * @return the {@link AccessDecisionVoter} instances used to create the default
+	 * {@link AccessDecisionManager}
+	 */
+	@SuppressWarnings("rawtypes")
+	abstract List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http);
 
-    abstract class AbstractInterceptUrlRegistry<R extends AbstractInterceptUrlRegistry<R,T>,T> extends AbstractConfigAttributeRequestMatcherRegistry<T> {
+	abstract class AbstractInterceptUrlRegistry<R extends AbstractInterceptUrlRegistry<R, T>, T>
+			extends AbstractConfigAttributeRequestMatcherRegistry<T> {
 
-        /**
-         * Allows setting the {@link AccessDecisionManager}. If none is provided, a default {@l AccessDecisionManager} is
-         * created.
-         *
-         * @param accessDecisionManager the {@link AccessDecisionManager} to use
-         * @return  the {@link AbstractInterceptUrlConfigurer} for further customization
-         */
-        public R accessDecisionManager(
-                AccessDecisionManager accessDecisionManager) {
-            AbstractInterceptUrlConfigurer.this.accessDecisionManager = accessDecisionManager;
-            return getSelf();
-        }
+		/**
+		 * Allows setting the {@link AccessDecisionManager}. If none is provided, a
+		 * default {@l AccessDecisionManager} is created.
+		 *
+		 * @param accessDecisionManager the {@link AccessDecisionManager} to use
+		 * @return the {@link AbstractInterceptUrlConfigurer} for further customization
+		 */
+		public R accessDecisionManager(AccessDecisionManager accessDecisionManager) {
+			AbstractInterceptUrlConfigurer.this.accessDecisionManager = accessDecisionManager;
+			return getSelf();
+		}
 
-        /**
-         * Allows setting if the {@link FilterSecurityInterceptor} should be only applied once per request (i.e. if the
-         * filter intercepts on a forward, should it be applied again).
-         *
-         * @param filterSecurityInterceptorOncePerRequest if the {@link FilterSecurityInterceptor} should be only applied
-         *                                                once per request
-         * @return  the {@link AbstractInterceptUrlConfigurer} for further customization
-         */
-        public R filterSecurityInterceptorOncePerRequest(
-                boolean filterSecurityInterceptorOncePerRequest) {
-            AbstractInterceptUrlConfigurer.this.filterSecurityInterceptorOncePerRequest = filterSecurityInterceptorOncePerRequest;
-            return getSelf();
-        }
+		/**
+		 * Allows setting if the {@link FilterSecurityInterceptor} should be only applied
+		 * once per request (i.e. if the filter intercepts on a forward, should it be
+		 * applied again).
+		 *
+		 * @param filterSecurityInterceptorOncePerRequest if the
+		 * {@link FilterSecurityInterceptor} should be only applied once per request
+		 * @return the {@link AbstractInterceptUrlConfigurer} for further customization
+		 */
+		public R filterSecurityInterceptorOncePerRequest(
+				boolean filterSecurityInterceptorOncePerRequest) {
+			AbstractInterceptUrlConfigurer.this.filterSecurityInterceptorOncePerRequest = filterSecurityInterceptorOncePerRequest;
+			return getSelf();
+		}
 
-        /**
-         * Returns a reference to the current object with a single suppression of
-         * the type
-         *
-         * @return a reference to the current object
-         */
-        @SuppressWarnings("unchecked")
-        private R getSelf() {
-            return (R) this;
-        }
-    }
+		/**
+		 * Returns a reference to the current object with a single suppression of the type
+		 *
+		 * @return a reference to the current object
+		 */
+		@SuppressWarnings("unchecked")
+		private R getSelf() {
+			return (R) this;
+		}
+	}
 
-    /**
-     * Creates the default {@code AccessDecisionManager}
-     * @return the default {@code AccessDecisionManager}
-     */
-    private AccessDecisionManager createDefaultAccessDecisionManager(H http) {
-        return new AffirmativeBased(getDecisionVoters(http));
-    }
+	/**
+	 * Creates the default {@code AccessDecisionManager}
+	 * @return the default {@code AccessDecisionManager}
+	 */
+	private AccessDecisionManager createDefaultAccessDecisionManager(H http) {
+		return new AffirmativeBased(getDecisionVoters(http));
+	}
 
-    /**
-     * If currently null, creates a default {@link AccessDecisionManager} using
-     * {@link #createDefaultAccessDecisionManager()}. Otherwise returns the {@link AccessDecisionManager}.
-     *
-     * @param http the builder to use
-     *
-     * @return the {@link AccessDecisionManager} to use
-     */
-    private AccessDecisionManager getAccessDecisionManager(H http) {
-        if (accessDecisionManager == null) {
-            accessDecisionManager = createDefaultAccessDecisionManager(http);
-        }
-        return accessDecisionManager;
-    }
+	/**
+	 * If currently null, creates a default {@link AccessDecisionManager} using
+	 * {@link #createDefaultAccessDecisionManager()}. Otherwise returns the
+	 * {@link AccessDecisionManager}.
+	 *
+	 * @param http the builder to use
+	 *
+	 * @return the {@link AccessDecisionManager} to use
+	 */
+	private AccessDecisionManager getAccessDecisionManager(H http) {
+		if (accessDecisionManager == null) {
+			accessDecisionManager = createDefaultAccessDecisionManager(http);
+		}
+		return accessDecisionManager;
+	}
 
-    /**
-     * Creates the {@link FilterSecurityInterceptor}
-     *
-     * @param http the builder to use
-     * @param metadataSource the {@link FilterInvocationSecurityMetadataSource} to use
-     * @param authenticationManager the {@link AuthenticationManager} to use
-     * @return the {@link FilterSecurityInterceptor}
-     * @throws Exception
-     */
-    private FilterSecurityInterceptor createFilterSecurityInterceptor(H http, FilterInvocationSecurityMetadataSource metadataSource,
-                                                                      AuthenticationManager authenticationManager) throws Exception {
-        FilterSecurityInterceptor securityInterceptor = new FilterSecurityInterceptor();
-        securityInterceptor.setSecurityMetadataSource(metadataSource);
-        securityInterceptor.setAccessDecisionManager(getAccessDecisionManager(http));
-        securityInterceptor.setAuthenticationManager(authenticationManager);
-        securityInterceptor.afterPropertiesSet();
-        return securityInterceptor;
-    }
+	/**
+	 * Creates the {@link FilterSecurityInterceptor}
+	 *
+	 * @param http the builder to use
+	 * @param metadataSource the {@link FilterInvocationSecurityMetadataSource} to use
+	 * @param authenticationManager the {@link AuthenticationManager} to use
+	 * @return the {@link FilterSecurityInterceptor}
+	 * @throws Exception
+	 */
+	private FilterSecurityInterceptor createFilterSecurityInterceptor(H http,
+			FilterInvocationSecurityMetadataSource metadataSource,
+			AuthenticationManager authenticationManager) throws Exception {
+		FilterSecurityInterceptor securityInterceptor = new FilterSecurityInterceptor();
+		securityInterceptor.setSecurityMetadataSource(metadataSource);
+		securityInterceptor.setAccessDecisionManager(getAccessDecisionManager(http));
+		securityInterceptor.setAuthenticationManager(authenticationManager);
+		securityInterceptor.afterPropertiesSet();
+		return securityInterceptor;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java
index 19cfcc9185..f5d0f3382b 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AnonymousConfigurer.java
@@ -29,123 +29,144 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
 
 /**
- * Configures Anonymous authentication (i.e. populate an {@link Authentication} that represents an anonymous user
- * instead of having a null value) for an {@link HttpSecurity}. Specifically this will configure an
- * {@link AnonymousAuthenticationFilter} and an {@link AnonymousAuthenticationProvider}. All properties have reasonable
- * defaults, so no additional configuration is required other than applying this {@link SecurityConfigurer}.
+ * Configures Anonymous authentication (i.e. populate an {@link Authentication} that
+ * represents an anonymous user instead of having a null value) for an
+ * {@link HttpSecurity}. Specifically this will configure an
+ * {@link AnonymousAuthenticationFilter} and an {@link AnonymousAuthenticationProvider}.
+ * All properties have reasonable defaults, so no additional configuration is required
+ * other than applying this {@link SecurityConfigurer}.
  *
- * @author  Rob Winch
- * @since  3.2
+ * @author Rob Winch
+ * @since 3.2
  */
-public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<AnonymousConfigurer<H>,H> {
-    private String key;
-    private AuthenticationProvider authenticationProvider;
-    private AnonymousAuthenticationFilter authenticationFilter;
-    private Object principal = "anonymousUser";
-    private List<GrantedAuthority> authorities = AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS");
+public final class AnonymousConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<AnonymousConfigurer<H>, H> {
+	private String key;
+	private AuthenticationProvider authenticationProvider;
+	private AnonymousAuthenticationFilter authenticationFilter;
+	private Object principal = "anonymousUser";
+	private List<GrantedAuthority> authorities = AuthorityUtils
+			.createAuthorityList("ROLE_ANONYMOUS");
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#anonymous()
-     */
-    public AnonymousConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#anonymous()
+	 */
+	public AnonymousConfigurer() {
+	}
 
-    /**
-     * Sets the key to identify tokens created for anonymous authentication. Default is a secure randomly generated
-     * key.
-     *
-     * @param key the key to identify tokens created for anonymous authentication. Default is a secure randomly generated
-     *            key.
-     * @return  the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> key(String key) {
-        this.key = key;
-        return this;
-    }
+	/**
+	 * Sets the key to identify tokens created for anonymous authentication. Default is a
+	 * secure randomly generated key.
+	 *
+	 * @param key the key to identify tokens created for anonymous authentication. Default
+	 * is a secure randomly generated key.
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> key(String key) {
+		this.key = key;
+		return this;
+	}
 
-    /**
-     * Sets the principal for {@link Authentication} objects of anonymous users
-     *
-     * @param principal used for the {@link Authentication} object of anonymous users
-     * @return  the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> principal(Object principal) {
-        this.principal = principal;
-        return this;
-    }
+	/**
+	 * Sets the principal for {@link Authentication} objects of anonymous users
+	 *
+	 * @param principal used for the {@link Authentication} object of anonymous users
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> principal(Object principal) {
+		this.principal = principal;
+		return this;
+	}
 
-    /**
-     * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()} for anonymous users
-     *
-     * @param authorities Sets the {@link org.springframework.security.core.Authentication#getAuthorities()} for anonymous users
-     * @return the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> authorities(List<GrantedAuthority> authorities) {
-        this.authorities = authorities;
-        return this;
-    }
+	/**
+	 * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()}
+	 * for anonymous users
+	 *
+	 * @param authorities Sets the
+	 * {@link org.springframework.security.core.Authentication#getAuthorities()} for
+	 * anonymous users
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> authorities(List<GrantedAuthority> authorities) {
+		this.authorities = authorities;
+		return this;
+	}
 
-    /**
-     * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()} for anonymous users
-     *
-     * @param authorities Sets the {@link org.springframework.security.core.Authentication#getAuthorities()} for
-     *                    anonymous users (i.e. "ROLE_ANONYMOUS")
-     * @return the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> authorities(String... authorities) {
-        return authorities(AuthorityUtils.createAuthorityList(authorities));
-    }
+	/**
+	 * Sets the {@link org.springframework.security.core.Authentication#getAuthorities()}
+	 * for anonymous users
+	 *
+	 * @param authorities Sets the
+	 * {@link org.springframework.security.core.Authentication#getAuthorities()} for
+	 * anonymous users (i.e. "ROLE_ANONYMOUS")
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> authorities(String... authorities) {
+		return authorities(AuthorityUtils.createAuthorityList(authorities));
+	}
 
-    /**
-     * Sets the {@link AuthenticationProvider} used to validate an anonymous user. If this is set, no attributes
-     * on the {@link AnonymousConfigurer} will be set on the {@link AuthenticationProvider}.
-     *
-     * @param authenticationProvider the {@link AuthenticationProvider} used to validate an anonymous user. Default is
-     *                               {@link AnonymousAuthenticationProvider}
-     *
-     * @return the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> authenticationProvider(AuthenticationProvider authenticationProvider) {
-        this.authenticationProvider = authenticationProvider;
-        return this;
-    }
+	/**
+	 * Sets the {@link AuthenticationProvider} used to validate an anonymous user. If this
+	 * is set, no attributes on the {@link AnonymousConfigurer} will be set on the
+	 * {@link AuthenticationProvider}.
+	 *
+	 * @param authenticationProvider the {@link AuthenticationProvider} used to validate
+	 * an anonymous user. Default is {@link AnonymousAuthenticationProvider}
+	 *
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> authenticationProvider(
+			AuthenticationProvider authenticationProvider) {
+		this.authenticationProvider = authenticationProvider;
+		return this;
+	}
 
-    /**
-     * Sets the {@link AnonymousAuthenticationFilter} used to populate an anonymous user. If this is set, no attributes
-     * on the {@link AnonymousConfigurer} will be set on the {@link AnonymousAuthenticationFilter}.
-     *
-     * @param authenticationFilter the {@link AnonymousAuthenticationFilter} used to populate an anonymous user.
-     *
-     * @return the {@link AnonymousConfigurer} for further customization of anonymous authentication
-     */
-    public AnonymousConfigurer<H> authenticationFilter(AnonymousAuthenticationFilter authenticationFilter) {
-        this.authenticationFilter = authenticationFilter;
-        return this;
-    }
+	/**
+	 * Sets the {@link AnonymousAuthenticationFilter} used to populate an anonymous user.
+	 * If this is set, no attributes on the {@link AnonymousConfigurer} will be set on the
+	 * {@link AnonymousAuthenticationFilter}.
+	 *
+	 * @param authenticationFilter the {@link AnonymousAuthenticationFilter} used to
+	 * populate an anonymous user.
+	 *
+	 * @return the {@link AnonymousConfigurer} for further customization of anonymous
+	 * authentication
+	 */
+	public AnonymousConfigurer<H> authenticationFilter(
+			AnonymousAuthenticationFilter authenticationFilter) {
+		this.authenticationFilter = authenticationFilter;
+		return this;
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        if(authenticationProvider == null) {
-            authenticationProvider = new AnonymousAuthenticationProvider(getKey());
-        }
-        if(authenticationFilter == null) {
-            authenticationFilter = new AnonymousAuthenticationFilter(getKey(), principal, authorities);
-        }
-        authenticationProvider = postProcess(authenticationProvider);
-        http.authenticationProvider(authenticationProvider);
-    }
+	@Override
+	public void init(H http) throws Exception {
+		if (authenticationProvider == null) {
+			authenticationProvider = new AnonymousAuthenticationProvider(getKey());
+		}
+		if (authenticationFilter == null) {
+			authenticationFilter = new AnonymousAuthenticationFilter(getKey(), principal,
+					authorities);
+		}
+		authenticationProvider = postProcess(authenticationProvider);
+		http.authenticationProvider(authenticationProvider);
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        authenticationFilter.afterPropertiesSet();
-        http.addFilter(authenticationFilter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		authenticationFilter.afterPropertiesSet();
+		http.addFilter(authenticationFilter);
+	}
 
-    private String getKey() {
-        if(key == null) {
-            key = UUID.randomUUID().toString();
-        }
-        return key;
-    }
+	private String getKey() {
+		if (key == null) {
+			key = UUID.randomUUID().toString();
+		}
+		return key;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java
index 691bd02674..fe28944d7f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java
@@ -40,11 +40,12 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
  * Adds channel security (i.e. requires HTTPS or HTTP) to an application. In order for
- * {@link ChannelSecurityConfigurer} to be useful, at least one {@link RequestMatcher} should be mapped to HTTP
- * or HTTPS.
+ * {@link ChannelSecurityConfigurer} to be useful, at least one {@link RequestMatcher}
+ * should be mapped to HTTP or HTTPS.
  *
  * <p>
- * By default an {@link InsecureChannelProcessor} and a {@link SecureChannelProcessor} will be registered.
+ * By default an {@link InsecureChannelProcessor} and a {@link SecureChannelProcessor}
+ * will be registered.
  * </p>
  *
  * <h2>Security Filters</h2>
@@ -52,7 +53,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * The following Filters are populated
  *
  * <ul>
- *     <li>{@link ChannelProcessingFilter}</li>
+ * <li>{@link ChannelProcessingFilter}</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
@@ -64,7 +65,8 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * The following shared objects are used:
  *
  * <ul>
- *     <li>{@link PortMapper} is used to create the default {@link ChannelProcessor} instances</li>
+ * <li>{@link PortMapper} is used to create the default {@link ChannelProcessor} instances
+ * </li>
  * </ul>
  *
  * @param <H> the type of {@link HttpSecurityBuilder} that is being configured
@@ -73,130 +75,138 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @since 3.2
  */
 public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>> extends
-        AbstractHttpConfigurer<ChannelSecurityConfigurer<H>, H> {
-    private ChannelProcessingFilter channelFilter = new ChannelProcessingFilter();
-    private LinkedHashMap<RequestMatcher,Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher,Collection<ConfigAttribute>>();
-    private List<ChannelProcessor> channelProcessors;
+		AbstractHttpConfigurer<ChannelSecurityConfigurer<H>, H> {
+	private ChannelProcessingFilter channelFilter = new ChannelProcessingFilter();
+	private LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+	private List<ChannelProcessor> channelProcessors;
 
-    private final ChannelRequestMatcherRegistry REGISTRY = new ChannelRequestMatcherRegistry();
+	private final ChannelRequestMatcherRegistry REGISTRY = new ChannelRequestMatcherRegistry();
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#requiresChannel()
-     */
-    public ChannelSecurityConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#requiresChannel()
+	 */
+	public ChannelSecurityConfigurer() {
+	}
 
-    public ChannelRequestMatcherRegistry getRegistry() {
-        return REGISTRY;
-    }
+	public ChannelRequestMatcherRegistry getRegistry() {
+		return REGISTRY;
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        ChannelDecisionManagerImpl channelDecisionManager = new ChannelDecisionManagerImpl();
-        channelDecisionManager.setChannelProcessors(getChannelProcessors(http));
-        channelDecisionManager = postProcess(channelDecisionManager);
+	@Override
+	public void configure(H http) throws Exception {
+		ChannelDecisionManagerImpl channelDecisionManager = new ChannelDecisionManagerImpl();
+		channelDecisionManager.setChannelProcessors(getChannelProcessors(http));
+		channelDecisionManager = postProcess(channelDecisionManager);
 
-        channelFilter.setChannelDecisionManager(channelDecisionManager);
+		channelFilter.setChannelDecisionManager(channelDecisionManager);
 
-        DefaultFilterInvocationSecurityMetadataSource filterInvocationSecurityMetadataSource =
-                new DefaultFilterInvocationSecurityMetadataSource(requestMap);
-        channelFilter.setSecurityMetadataSource(filterInvocationSecurityMetadataSource);
+		DefaultFilterInvocationSecurityMetadataSource filterInvocationSecurityMetadataSource = new DefaultFilterInvocationSecurityMetadataSource(
+				requestMap);
+		channelFilter.setSecurityMetadataSource(filterInvocationSecurityMetadataSource);
 
-        channelFilter = postProcess(channelFilter);
-        http.addFilter(channelFilter);
-    }
+		channelFilter = postProcess(channelFilter);
+		http.addFilter(channelFilter);
+	}
 
-    private List<ChannelProcessor> getChannelProcessors(H http) {
-        if(channelProcessors != null) {
-            return channelProcessors;
-        }
+	private List<ChannelProcessor> getChannelProcessors(H http) {
+		if (channelProcessors != null) {
+			return channelProcessors;
+		}
 
-        InsecureChannelProcessor insecureChannelProcessor = new InsecureChannelProcessor();
-        SecureChannelProcessor secureChannelProcessor = new SecureChannelProcessor();
+		InsecureChannelProcessor insecureChannelProcessor = new InsecureChannelProcessor();
+		SecureChannelProcessor secureChannelProcessor = new SecureChannelProcessor();
 
-        PortMapper portMapper = http.getSharedObject(PortMapper.class);
-        if(portMapper != null) {
-            RetryWithHttpEntryPoint httpEntryPoint = new RetryWithHttpEntryPoint();
-            httpEntryPoint.setPortMapper(portMapper);
-            insecureChannelProcessor.setEntryPoint(httpEntryPoint);
+		PortMapper portMapper = http.getSharedObject(PortMapper.class);
+		if (portMapper != null) {
+			RetryWithHttpEntryPoint httpEntryPoint = new RetryWithHttpEntryPoint();
+			httpEntryPoint.setPortMapper(portMapper);
+			insecureChannelProcessor.setEntryPoint(httpEntryPoint);
 
-            RetryWithHttpsEntryPoint httpsEntryPoint = new RetryWithHttpsEntryPoint();
-            httpsEntryPoint.setPortMapper(portMapper);
-            secureChannelProcessor.setEntryPoint(httpsEntryPoint);
-        }
-        insecureChannelProcessor = postProcess(insecureChannelProcessor);
-        secureChannelProcessor = postProcess(secureChannelProcessor);
-        return Arrays.<ChannelProcessor>asList(insecureChannelProcessor, secureChannelProcessor);
-    }
+			RetryWithHttpsEntryPoint httpsEntryPoint = new RetryWithHttpsEntryPoint();
+			httpsEntryPoint.setPortMapper(portMapper);
+			secureChannelProcessor.setEntryPoint(httpsEntryPoint);
+		}
+		insecureChannelProcessor = postProcess(insecureChannelProcessor);
+		secureChannelProcessor = postProcess(secureChannelProcessor);
+		return Arrays.<ChannelProcessor> asList(insecureChannelProcessor,
+				secureChannelProcessor);
+	}
 
+	private ChannelRequestMatcherRegistry addAttribute(String attribute,
+			List<RequestMatcher> matchers) {
+		for (RequestMatcher matcher : matchers) {
+			Collection<ConfigAttribute> attrs = Arrays
+					.<ConfigAttribute> asList(new SecurityConfig(attribute));
+			requestMap.put(matcher, attrs);
+		}
+		return REGISTRY;
+	}
 
-    private ChannelRequestMatcherRegistry addAttribute(String attribute, List<RequestMatcher> matchers) {
-        for(RequestMatcher matcher : matchers) {
-            Collection<ConfigAttribute> attrs = Arrays.<ConfigAttribute>asList(new SecurityConfig(attribute));
-            requestMap.put(matcher, attrs);
-        }
-        return REGISTRY;
-    }
+	public final class ChannelRequestMatcherRegistry extends
+			AbstractConfigAttributeRequestMatcherRegistry<RequiresChannelUrl> {
 
-    public final class ChannelRequestMatcherRegistry extends AbstractConfigAttributeRequestMatcherRegistry<RequiresChannelUrl> {
+		@Override
+		protected RequiresChannelUrl chainRequestMatchersInternal(
+				List<RequestMatcher> requestMatchers) {
+			return new RequiresChannelUrl(requestMatchers);
+		}
 
-        @Override
-        protected RequiresChannelUrl chainRequestMatchersInternal(List<RequestMatcher> requestMatchers) {
-            return new RequiresChannelUrl(requestMatchers);
-        }
+		/**
+		 * Adds an {@link ObjectPostProcessor} for this class.
+		 *
+		 * @param objectPostProcessor
+		 * @return the {@link ChannelSecurityConfigurer} for further customizations
+		 */
+		public ChannelRequestMatcherRegistry withObjectPostProcessor(
+				ObjectPostProcessor<?> objectPostProcessor) {
+			addObjectPostProcessor(objectPostProcessor);
+			return this;
+		}
 
-        /**
-         * Adds an {@link ObjectPostProcessor} for this class.
-         *
-         * @param objectPostProcessor
-         * @return the {@link ChannelSecurityConfigurer} for further customizations
-         */
-        public ChannelRequestMatcherRegistry withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-            addObjectPostProcessor(objectPostProcessor);
-            return this;
-        }
+		/**
+		 * Sets the {@link ChannelProcessor} instances to use in
+		 * {@link ChannelDecisionManagerImpl}
+		 * @param channelProcessors
+		 * @return
+		 */
+		public ChannelRequestMatcherRegistry channelProcessors(
+				List<ChannelProcessor> channelProcessors) {
+			ChannelSecurityConfigurer.this.channelProcessors = channelProcessors;
+			return this;
+		}
 
-        /**
-         * Sets the {@link ChannelProcessor} instances to use in  {@link ChannelDecisionManagerImpl}
-         * @param channelProcessors
-         * @return
-         */
-        public ChannelRequestMatcherRegistry channelProcessors(List<ChannelProcessor> channelProcessors) {
-            ChannelSecurityConfigurer.this.channelProcessors = channelProcessors;
-            return this;
-        }
+		/**
+		 * Return the {@link SecurityBuilder} when done using the
+		 * {@link SecurityConfigurer}. This is useful for method chaining.
+		 *
+		 * @return
+		 */
+		public H and() {
+			return ChannelSecurityConfigurer.this.and();
+		}
 
-        /**
-         * Return the {@link SecurityBuilder} when done using the
-         * {@link SecurityConfigurer}. This is useful for method chaining.
-         *
-         * @return
-         */
-        public H and() {
-            return ChannelSecurityConfigurer.this.and();
-        }
+		private ChannelRequestMatcherRegistry() {
+		}
+	}
 
-        private ChannelRequestMatcherRegistry() {}
-    }
+	public final class RequiresChannelUrl {
+		private List<RequestMatcher> requestMatchers;
 
-    public final class RequiresChannelUrl {
-        private List<RequestMatcher> requestMatchers;
+		private RequiresChannelUrl(List<RequestMatcher> requestMatchers) {
+			this.requestMatchers = requestMatchers;
+		}
 
-        private RequiresChannelUrl(List<RequestMatcher> requestMatchers) {
-            this.requestMatchers = requestMatchers;
-        }
+		public ChannelRequestMatcherRegistry requiresSecure() {
+			return requires("REQUIRES_SECURE_CHANNEL");
+		}
 
-        public ChannelRequestMatcherRegistry requiresSecure() {
-            return requires("REQUIRES_SECURE_CHANNEL");
-        }
+		public ChannelRequestMatcherRegistry requiresInsecure() {
+			return requires("REQUIRES_INSECURE_CHANNEL");
+		}
 
-        public ChannelRequestMatcherRegistry requiresInsecure() {
-            return requires("REQUIRES_INSECURE_CHANNEL");
-        }
-
-        public ChannelRequestMatcherRegistry requires(String attribute) {
-            return addAttribute(attribute, requestMatchers);
-        }
-    }
+		public ChannelRequestMatcherRegistry requires(String attribute) {
+			return addAttribute(attribute, requestMatchers);
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
index 3a27c23a0e..e4cf68dd49 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
@@ -43,8 +43,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * Adds <a
- * href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)"
+ * Adds <a href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)"
  * >CSRF</a> protection for the methods as specified by
  * {@link #requireCsrfProtectionMatcher(RequestMatcher)}.
  *
@@ -64,200 +63,212 @@ import org.springframework.util.Assert;
  *
  * <ul>
  * <li>
- * {@link ExceptionHandlingConfigurer#accessDeniedHandler(AccessDeniedHandler)}
- * is used to determine how to handle CSRF attempts</li>
+ * {@link ExceptionHandlingConfigurer#accessDeniedHandler(AccessDeniedHandler)} is used to
+ * determine how to handle CSRF attempts</li>
  * <li>{@link InvalidSessionStrategy}</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class CsrfConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<CsrfConfigurer<H>,H> {
-    private CsrfTokenRepository csrfTokenRepository = new HttpSessionCsrfTokenRepository();
-    private RequestMatcher requireCsrfProtectionMatcher = CsrfFilter.DEFAULT_CSRF_MATCHER;
-    private List<RequestMatcher> ignoredCsrfProtectionMatchers = new ArrayList<RequestMatcher>();
+public final class CsrfConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<CsrfConfigurer<H>, H> {
+	private CsrfTokenRepository csrfTokenRepository = new HttpSessionCsrfTokenRepository();
+	private RequestMatcher requireCsrfProtectionMatcher = CsrfFilter.DEFAULT_CSRF_MATCHER;
+	private List<RequestMatcher> ignoredCsrfProtectionMatchers = new ArrayList<RequestMatcher>();
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#csrf()
-     */
-    public CsrfConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#csrf()
+	 */
+	public CsrfConfigurer() {
+	}
 
-    /**
-     * Specify the {@link CsrfTokenRepository} to use. The default is an {@link HttpSessionCsrfTokenRepository}.
-     *
-     * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
-     * @return the {@link CsrfConfigurer} for further customizations
-     */
-    public CsrfConfigurer<H> csrfTokenRepository(CsrfTokenRepository csrfTokenRepository) {
-        Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
-        this.csrfTokenRepository = csrfTokenRepository;
-        return this;
-    }
+	/**
+	 * Specify the {@link CsrfTokenRepository} to use. The default is an
+	 * {@link HttpSessionCsrfTokenRepository}.
+	 *
+	 * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
+	 * @return the {@link CsrfConfigurer} for further customizations
+	 */
+	public CsrfConfigurer<H> csrfTokenRepository(CsrfTokenRepository csrfTokenRepository) {
+		Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
+		this.csrfTokenRepository = csrfTokenRepository;
+		return this;
+	}
 
-    /**
-     * Specify the {@link RequestMatcher} to use for determining when CSRF
-     * should be applied. The default is to ignore GET, HEAD, TRACE, OPTIONS and
-     * process all other requests.
-     *
-     * @param requireCsrfProtectionMatcher
-     *            the {@link RequestMatcher} to use
-     * @return the {@link CsrfConfigurer} for further customizations
-     */
-    public CsrfConfigurer<H> requireCsrfProtectionMatcher(RequestMatcher requireCsrfProtectionMatcher) {
-        Assert.notNull(requireCsrfProtectionMatcher, "requireCsrfProtectionMatcher cannot be null");
-        this.requireCsrfProtectionMatcher = requireCsrfProtectionMatcher;
-        return this;
-    }
+	/**
+	 * Specify the {@link RequestMatcher} to use for determining when CSRF should be
+	 * applied. The default is to ignore GET, HEAD, TRACE, OPTIONS and process all other
+	 * requests.
+	 *
+	 * @param requireCsrfProtectionMatcher the {@link RequestMatcher} to use
+	 * @return the {@link CsrfConfigurer} for further customizations
+	 */
+	public CsrfConfigurer<H> requireCsrfProtectionMatcher(
+			RequestMatcher requireCsrfProtectionMatcher) {
+		Assert.notNull(requireCsrfProtectionMatcher,
+				"requireCsrfProtectionMatcher cannot be null");
+		this.requireCsrfProtectionMatcher = requireCsrfProtectionMatcher;
+		return this;
+	}
 
-    /**
-     * <p>
-     * Allows specifying {@link HttpServletRequest} that should not use CSRF Protection even if they match the {@link #requireCsrfProtectionMatcher(RequestMatcher)}.
-     * </p>
-     *
-     * <p>
-     * The following will ensure CSRF protection ignores:
-     * </p>
-     * <ul>
-     * <li>Any GET, HEAD, TRACE, OPTIONS (this is the default)</li>
-     * <li>We also explicitly state to ignore any request that starts with "/sockjs/"</li>
-     * </ul>
-     *
-     * <pre>
-     * http
-     *     .csrf()
-     *         .ignoringAntMatchers("/sockjs/**")
-     *         .and()
-     *     ...
-     * </pre>
-     *
-     * @since 4.0
-     */
-    public CsrfConfigurer<H> ignoringAntMatchers(String... antPatterns) {
-        return new IgnoreCsrfProtectionRegistry().antMatchers(antPatterns).and();
-    }
+	/**
+	 * <p>
+	 * Allows specifying {@link HttpServletRequest} that should not use CSRF Protection
+	 * even if they match the {@link #requireCsrfProtectionMatcher(RequestMatcher)}.
+	 * </p>
+	 *
+	 * <p>
+	 * The following will ensure CSRF protection ignores:
+	 * </p>
+	 * <ul>
+	 * <li>Any GET, HEAD, TRACE, OPTIONS (this is the default)</li>
+	 * <li>We also explicitly state to ignore any request that starts with "/sockjs/"</li>
+	 * </ul>
+	 *
+	 * <pre>
+	 * http
+	 *     .csrf()
+	 *         .ignoringAntMatchers("/sockjs/**")
+	 *         .and()
+	 *     ...
+	 * </pre>
+	 *
+	 * @since 4.0
+	 */
+	public CsrfConfigurer<H> ignoringAntMatchers(String... antPatterns) {
+		return new IgnoreCsrfProtectionRegistry().antMatchers(antPatterns).and();
+	}
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public void configure(H http) throws Exception {
-        CsrfFilter filter = new CsrfFilter(csrfTokenRepository);
-        RequestMatcher requireCsrfProtectionMatcher = getRequireCsrfProtectionMatcher();
-        if(requireCsrfProtectionMatcher != null) {
-            filter.setRequireCsrfProtectionMatcher(requireCsrfProtectionMatcher);
-        }
-        AccessDeniedHandler accessDeniedHandler = createAccessDeniedHandler(http);
-        if(accessDeniedHandler != null) {
-            filter.setAccessDeniedHandler(accessDeniedHandler);
-        }
-        LogoutConfigurer<H> logoutConfigurer = http.getConfigurer(LogoutConfigurer.class);
-        if(logoutConfigurer != null) {
-            logoutConfigurer.addLogoutHandler(new CsrfLogoutHandler(csrfTokenRepository));
-        }
-        SessionManagementConfigurer<H> sessionConfigurer = http.getConfigurer(SessionManagementConfigurer.class);
-        if(sessionConfigurer != null) {
-            sessionConfigurer.addSessionAuthenticationStrategy(new CsrfAuthenticationStrategy(csrfTokenRepository));
-        }
-        filter = postProcess(filter);
-        http.addFilter(filter);
-    }
+	@SuppressWarnings("unchecked")
+	@Override
+	public void configure(H http) throws Exception {
+		CsrfFilter filter = new CsrfFilter(csrfTokenRepository);
+		RequestMatcher requireCsrfProtectionMatcher = getRequireCsrfProtectionMatcher();
+		if (requireCsrfProtectionMatcher != null) {
+			filter.setRequireCsrfProtectionMatcher(requireCsrfProtectionMatcher);
+		}
+		AccessDeniedHandler accessDeniedHandler = createAccessDeniedHandler(http);
+		if (accessDeniedHandler != null) {
+			filter.setAccessDeniedHandler(accessDeniedHandler);
+		}
+		LogoutConfigurer<H> logoutConfigurer = http.getConfigurer(LogoutConfigurer.class);
+		if (logoutConfigurer != null) {
+			logoutConfigurer.addLogoutHandler(new CsrfLogoutHandler(csrfTokenRepository));
+		}
+		SessionManagementConfigurer<H> sessionConfigurer = http
+				.getConfigurer(SessionManagementConfigurer.class);
+		if (sessionConfigurer != null) {
+			sessionConfigurer
+					.addSessionAuthenticationStrategy(new CsrfAuthenticationStrategy(
+							csrfTokenRepository));
+		}
+		filter = postProcess(filter);
+		http.addFilter(filter);
+	}
 
-    /**
-     * Gets the final {@link RequestMatcher} to use by combining the {@link #requireCsrfProtectionMatcher(RequestMatcher)} and any {@link #ignore()}.
-     *
-     * @return the {@link RequestMatcher} to use
-     */
-    private RequestMatcher getRequireCsrfProtectionMatcher() {
-        if(ignoredCsrfProtectionMatchers.isEmpty()) {
-            return requireCsrfProtectionMatcher;
-        }
-        return new AndRequestMatcher(requireCsrfProtectionMatcher, new NegatedRequestMatcher(new OrRequestMatcher(ignoredCsrfProtectionMatchers)));
-    }
+	/**
+	 * Gets the final {@link RequestMatcher} to use by combining the
+	 * {@link #requireCsrfProtectionMatcher(RequestMatcher)} and any {@link #ignore()}.
+	 *
+	 * @return the {@link RequestMatcher} to use
+	 */
+	private RequestMatcher getRequireCsrfProtectionMatcher() {
+		if (ignoredCsrfProtectionMatchers.isEmpty()) {
+			return requireCsrfProtectionMatcher;
+		}
+		return new AndRequestMatcher(requireCsrfProtectionMatcher,
+				new NegatedRequestMatcher(new OrRequestMatcher(
+						ignoredCsrfProtectionMatchers)));
+	}
 
-    /**
-     * Gets the default {@link AccessDeniedHandler} from the
-     * {@link ExceptionHandlingConfigurer#getAccessDeniedHandler()} or create a
-     * {@link AccessDeniedHandlerImpl} if not available.
-     *
-     * @param http the {@link HttpSecurityBuilder}
-     * @return the {@link AccessDeniedHandler}
-     */
-    @SuppressWarnings("unchecked")
-    private AccessDeniedHandler getDefaultAccessDeniedHandler(H http) {
-        ExceptionHandlingConfigurer<H> exceptionConfig = http.getConfigurer(ExceptionHandlingConfigurer.class);
-        AccessDeniedHandler handler = null;
-        if(exceptionConfig != null) {
-            handler = exceptionConfig.getAccessDeniedHandler();
-        }
-        if(handler == null) {
-            handler = new AccessDeniedHandlerImpl();
-        }
-        return handler;
-    }
+	/**
+	 * Gets the default {@link AccessDeniedHandler} from the
+	 * {@link ExceptionHandlingConfigurer#getAccessDeniedHandler()} or create a
+	 * {@link AccessDeniedHandlerImpl} if not available.
+	 *
+	 * @param http the {@link HttpSecurityBuilder}
+	 * @return the {@link AccessDeniedHandler}
+	 */
+	@SuppressWarnings("unchecked")
+	private AccessDeniedHandler getDefaultAccessDeniedHandler(H http) {
+		ExceptionHandlingConfigurer<H> exceptionConfig = http
+				.getConfigurer(ExceptionHandlingConfigurer.class);
+		AccessDeniedHandler handler = null;
+		if (exceptionConfig != null) {
+			handler = exceptionConfig.getAccessDeniedHandler();
+		}
+		if (handler == null) {
+			handler = new AccessDeniedHandlerImpl();
+		}
+		return handler;
+	}
 
-    /**
-     * Gets the default {@link InvalidSessionStrategy} from the
-     * {@link SessionManagementConfigurer#getInvalidSessionStrategy()} or null
-     * if not available.
-     *
-     * @param http
-     *            the {@link HttpSecurityBuilder}
-     * @return the {@link InvalidSessionStrategy}
-     */
-    @SuppressWarnings("unchecked")
-    private InvalidSessionStrategy getInvalidSessionStrategy(H http) {
-        SessionManagementConfigurer<H> sessionManagement = http.getConfigurer(SessionManagementConfigurer.class);
-        if(sessionManagement == null) {
-            return null;
-        }
-        return sessionManagement.getInvalidSessionStrategy();
-    }
+	/**
+	 * Gets the default {@link InvalidSessionStrategy} from the
+	 * {@link SessionManagementConfigurer#getInvalidSessionStrategy()} or null if not
+	 * available.
+	 *
+	 * @param http the {@link HttpSecurityBuilder}
+	 * @return the {@link InvalidSessionStrategy}
+	 */
+	@SuppressWarnings("unchecked")
+	private InvalidSessionStrategy getInvalidSessionStrategy(H http) {
+		SessionManagementConfigurer<H> sessionManagement = http
+				.getConfigurer(SessionManagementConfigurer.class);
+		if (sessionManagement == null) {
+			return null;
+		}
+		return sessionManagement.getInvalidSessionStrategy();
+	}
 
-    /**
-     * Creates the {@link AccessDeniedHandler} from the result of
-     * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} and
-     * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)}. If
-     * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)} is non-null, then
-     * a {@link DelegatingAccessDeniedHandler} is used in combination with
-     * {@link InvalidSessionAccessDeniedHandler} and the
-     * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)}. Otherwise,
-     * only {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} is used.
-     *
-     * @param http the {@link HttpSecurityBuilder}
-     * @return the {@link AccessDeniedHandler}
-     */
-    private AccessDeniedHandler createAccessDeniedHandler(H http) {
-        InvalidSessionStrategy invalidSessionStrategy = getInvalidSessionStrategy(http);
-        AccessDeniedHandler defaultAccessDeniedHandler = getDefaultAccessDeniedHandler(http);
-        if(invalidSessionStrategy == null) {
-            return defaultAccessDeniedHandler;
-        }
+	/**
+	 * Creates the {@link AccessDeniedHandler} from the result of
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} and
+	 * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)}. If
+	 * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)} is non-null, then a
+	 * {@link DelegatingAccessDeniedHandler} is used in combination with
+	 * {@link InvalidSessionAccessDeniedHandler} and the
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)}. Otherwise, only
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} is used.
+	 *
+	 * @param http the {@link HttpSecurityBuilder}
+	 * @return the {@link AccessDeniedHandler}
+	 */
+	private AccessDeniedHandler createAccessDeniedHandler(H http) {
+		InvalidSessionStrategy invalidSessionStrategy = getInvalidSessionStrategy(http);
+		AccessDeniedHandler defaultAccessDeniedHandler = getDefaultAccessDeniedHandler(http);
+		if (invalidSessionStrategy == null) {
+			return defaultAccessDeniedHandler;
+		}
 
-        InvalidSessionAccessDeniedHandler invalidSessionDeniedHandler = new InvalidSessionAccessDeniedHandler(invalidSessionStrategy);
-        LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers =
-                new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
-        handlers.put(MissingCsrfTokenException.class, invalidSessionDeniedHandler);
-        return new DelegatingAccessDeniedHandler(handlers, defaultAccessDeniedHandler);
-    }
+		InvalidSessionAccessDeniedHandler invalidSessionDeniedHandler = new InvalidSessionAccessDeniedHandler(
+				invalidSessionStrategy);
+		LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
+		handlers.put(MissingCsrfTokenException.class, invalidSessionDeniedHandler);
+		return new DelegatingAccessDeniedHandler(handlers, defaultAccessDeniedHandler);
+	}
 
-    /**
-     * Allows registering {@link RequestMatcher} instances that should be
-     * ignored (even if the {@link HttpServletRequest} matches the
-     * {@link CsrfConfigurer#requireCsrfProtectionMatcher(RequestMatcher)}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    private class IgnoreCsrfProtectionRegistry extends AbstractRequestMatcherRegistry<IgnoreCsrfProtectionRegistry>{
+	/**
+	 * Allows registering {@link RequestMatcher} instances that should be ignored (even if
+	 * the {@link HttpServletRequest} matches the
+	 * {@link CsrfConfigurer#requireCsrfProtectionMatcher(RequestMatcher)}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	private class IgnoreCsrfProtectionRegistry extends
+			AbstractRequestMatcherRegistry<IgnoreCsrfProtectionRegistry> {
 
-        public CsrfConfigurer<H> and() {
-            return CsrfConfigurer.this;
-        }
+		public CsrfConfigurer<H> and() {
+			return CsrfConfigurer.this;
+		}
 
-        protected IgnoreCsrfProtectionRegistry chainRequestMatchers(
-                List<RequestMatcher> requestMatchers) {
-            ignoredCsrfProtectionMatchers.addAll(requestMatchers);
-            return this;
-        }
-    }
+		protected IgnoreCsrfProtectionRegistry chainRequestMatchers(
+				List<RequestMatcher> requestMatchers) {
+			ignoredCsrfProtectionMatchers.addAll(requestMatchers);
+			return this;
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java
index 2172e69371..57d03b5b76 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/DefaultLoginPageConfigurer.java
@@ -21,10 +21,14 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
 
 /**
- * Adds a Filter that will generate a login page if one is not specified otherwise when using {@link WebSecurityConfigurerAdapter}.
+ * Adds a Filter that will generate a login page if one is not specified otherwise when
+ * using {@link WebSecurityConfigurerAdapter}.
  *
  * <p>
- * By default an {@link org.springframework.security.web.access.channel.InsecureChannelProcessor} and a {@link org.springframework.security.web.access.channel.SecureChannelProcessor} will be registered.
+ * By default an
+ * {@link org.springframework.security.web.access.channel.InsecureChannelProcessor} and a
+ * {@link org.springframework.security.web.access.channel.SecureChannelProcessor} will be
+ * registered.
  * </p>
  *
  * <h2>Security Filters</h2>
@@ -32,20 +36,21 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  * The following Filters are conditionally populated
  *
  * <ul>
- *     <li>{@link DefaultLoginPageGeneratingFilter} if the {@link FormLoginConfigurer} did not have a login page specified</li>
+ * <li>{@link DefaultLoginPageGeneratingFilter} if the {@link FormLoginConfigurer} did not
+ * have a login page specified</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
  *
- * No shared objects are created.
- *isLogoutRequest
- * <h2>Shared Objects Used</h2>
+ * No shared objects are created. isLogoutRequest <h2>Shared Objects Used</h2>
  *
  * The following shared objects are used:
  *
  * <ul>
- *     <li>{@link org.springframework.security.web.PortMapper} is used to create the default {@link org.springframework.security.web.access.channel.ChannelProcessor} instances</li>
- *     <li>{@link FormLoginConfigurer} is used to determine if the {@link DefaultLoginPageConfigurer} should be added and how to configure it.</li>
+ * <li>{@link org.springframework.security.web.PortMapper} is used to create the default
+ * {@link org.springframework.security.web.access.channel.ChannelProcessor} instances</li>
+ * <li>{@link FormLoginConfigurer} is used to determine if the
+ * {@link DefaultLoginPageConfigurer} should be added and how to configure it.</li>
  * </ul>
  *
  * @see WebSecurityConfigurerAdapter
@@ -54,29 +59,30 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  * @since 3.2
  */
 public final class DefaultLoginPageConfigurer<H extends HttpSecurityBuilder<H>> extends
-        AbstractHttpConfigurer<DefaultLoginPageConfigurer<H>,H> {
+		AbstractHttpConfigurer<DefaultLoginPageConfigurer<H>, H> {
 
-    private DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = new DefaultLoginPageGeneratingFilter();
+	private DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = new DefaultLoginPageGeneratingFilter();
 
-    @Override
-    public void init(H http) throws Exception {
-        http.setSharedObject(DefaultLoginPageGeneratingFilter.class, loginPageGeneratingFilter);
-    }
+	@Override
+	public void init(H http) throws Exception {
+		http.setSharedObject(DefaultLoginPageGeneratingFilter.class,
+				loginPageGeneratingFilter);
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void configure(H http) throws Exception {
-        AuthenticationEntryPoint authenticationEntryPoint = null;
-        ExceptionHandlingConfigurer<?> exceptionConf = http.getConfigurer(ExceptionHandlingConfigurer.class);
-        if(exceptionConf != null) {
-            authenticationEntryPoint = exceptionConf.getAuthenticationEntryPoint();
-        }
-
-        if(loginPageGeneratingFilter.isEnabled() && authenticationEntryPoint == null) {
-            loginPageGeneratingFilter = postProcess(loginPageGeneratingFilter);
-            http.addFilter(loginPageGeneratingFilter);
-        }
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	public void configure(H http) throws Exception {
+		AuthenticationEntryPoint authenticationEntryPoint = null;
+		ExceptionHandlingConfigurer<?> exceptionConf = http
+				.getConfigurer(ExceptionHandlingConfigurer.class);
+		if (exceptionConf != null) {
+			authenticationEntryPoint = exceptionConf.getAuthenticationEntryPoint();
+		}
 
+		if (loginPageGeneratingFilter.isEnabled() && authenticationEntryPoint == null) {
+			loginPageGeneratingFilter = postProcess(loginPageGeneratingFilter);
+			http.addFilter(loginPageGeneratingFilter);
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java
index 19562ae22c..9cfb37e4c5 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java
@@ -30,8 +30,9 @@ import org.springframework.security.web.savedrequest.RequestCache;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
- * Adds exception handling for Spring Security related exceptions to an application. All properties have reasonable
- * defaults, so no additional configuration is required other than applying this
+ * Adds exception handling for Spring Security related exceptions to an application. All
+ * properties have reasonable defaults, so no additional configuration is required other
+ * than applying this
  * {@link org.springframework.security.config.annotation.SecurityConfigurer}.
  *
  * <h2>Security Filters</h2>
@@ -39,7 +40,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * The following Filters are populated
  *
  * <ul>
- *     <li>{@link ExceptionTranslationFilter}</li>
+ * <li>{@link ExceptionTranslationFilter}</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
@@ -51,166 +52,173 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * The following shared objects are used:
  *
  * <ul>
- *     <li>If no explicit {@link RequestCache}, is provided a {@link RequestCache} shared object is used to replay
- *     the request after authentication is successful</li>
- *     <li>{@link AuthenticationEntryPoint} - see {@link #authenticationEntryPoint(AuthenticationEntryPoint)} </li>
+ * <li>If no explicit {@link RequestCache}, is provided a {@link RequestCache} shared
+ * object is used to replay the request after authentication is successful</li>
+ * <li>{@link AuthenticationEntryPoint} - see
+ * {@link #authenticationEntryPoint(AuthenticationEntryPoint)}</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<ExceptionHandlingConfigurer<H>,H> {
+public final class ExceptionHandlingConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<ExceptionHandlingConfigurer<H>, H> {
 
-    private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationEntryPoint authenticationEntryPoint;
 
-    private AccessDeniedHandler accessDeniedHandler;
+	private AccessDeniedHandler accessDeniedHandler;
 
-    private LinkedHashMap<RequestMatcher,AuthenticationEntryPoint> defaultEntryPointMappings = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
+	private LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> defaultEntryPointMappings = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#exceptionHandling()
-     */
-    public ExceptionHandlingConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#exceptionHandling()
+	 */
+	public ExceptionHandlingConfigurer() {
+	}
 
-    /**
-     * Shortcut to specify the {@link AccessDeniedHandler} to be used is a specific error page
-     *
-     * @param accessDeniedUrl the URL to the access denied page (i.e. /errors/401)
-     * @return the {@link ExceptionHandlingConfigurer} for further customization
-     * @see AccessDeniedHandlerImpl
-     * @see {@link #accessDeniedHandler(org.springframework.security.web.access.AccessDeniedHandler)}
-     */
-    public ExceptionHandlingConfigurer<H> accessDeniedPage(String accessDeniedUrl) {
-        AccessDeniedHandlerImpl accessDeniedHandler = new AccessDeniedHandlerImpl();
-        accessDeniedHandler.setErrorPage(accessDeniedUrl);
-        return accessDeniedHandler(accessDeniedHandler);
-    }
+	/**
+	 * Shortcut to specify the {@link AccessDeniedHandler} to be used is a specific error
+	 * page
+	 *
+	 * @param accessDeniedUrl the URL to the access denied page (i.e. /errors/401)
+	 * @return the {@link ExceptionHandlingConfigurer} for further customization
+	 * @see AccessDeniedHandlerImpl
+	 * @see {@link #accessDeniedHandler(org.springframework.security.web.access.AccessDeniedHandler)}
+	 */
+	public ExceptionHandlingConfigurer<H> accessDeniedPage(String accessDeniedUrl) {
+		AccessDeniedHandlerImpl accessDeniedHandler = new AccessDeniedHandlerImpl();
+		accessDeniedHandler.setErrorPage(accessDeniedUrl);
+		return accessDeniedHandler(accessDeniedHandler);
+	}
 
-    /**
-     * Specifies the {@link AccessDeniedHandler} to be used
-     *
-     * @param accessDeniedHandler the {@link AccessDeniedHandler} to be used
-     * @return the {@link ExceptionHandlingConfigurer} for further customization
-     */
-    public ExceptionHandlingConfigurer<H> accessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
-        this.accessDeniedHandler = accessDeniedHandler;
-        return this;
-    }
+	/**
+	 * Specifies the {@link AccessDeniedHandler} to be used
+	 *
+	 * @param accessDeniedHandler the {@link AccessDeniedHandler} to be used
+	 * @return the {@link ExceptionHandlingConfigurer} for further customization
+	 */
+	public ExceptionHandlingConfigurer<H> accessDeniedHandler(
+			AccessDeniedHandler accessDeniedHandler) {
+		this.accessDeniedHandler = accessDeniedHandler;
+		return this;
+	}
 
-    /**
-     * Sets the {@link AuthenticationEntryPoint} to be used.
-     *
-     * <p>
-     * If no {@link #authenticationEntryPoint(AuthenticationEntryPoint)} is
-     * specified, then
-     * {@link #defaultAuthenticationEntryPointFor(AuthenticationEntryPoint, RequestMatcher)}
-     * will be used. The first {@link AuthenticationEntryPoint} will be used as
-     * the default is no matches were found.
-     * </p>
-     *
-     * <p>
-     * If that is not provided defaults to {@link Http403ForbiddenEntryPoint}.
-     * </p>
-     *
-     * @param authenticationEntryPoint
-     *            the {@link AuthenticationEntryPoint} to use
-     * @return the {@link ExceptionHandlingConfigurer} for further
-     *         customizations
-     */
-    public ExceptionHandlingConfigurer<H> authenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) {
-        this.authenticationEntryPoint = authenticationEntryPoint;
-        return this;
-    }
+	/**
+	 * Sets the {@link AuthenticationEntryPoint} to be used.
+	 *
+	 * <p>
+	 * If no {@link #authenticationEntryPoint(AuthenticationEntryPoint)} is specified,
+	 * then
+	 * {@link #defaultAuthenticationEntryPointFor(AuthenticationEntryPoint, RequestMatcher)}
+	 * will be used. The first {@link AuthenticationEntryPoint} will be used as the
+	 * default is no matches were found.
+	 * </p>
+	 *
+	 * <p>
+	 * If that is not provided defaults to {@link Http403ForbiddenEntryPoint}.
+	 * </p>
+	 *
+	 * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use
+	 * @return the {@link ExceptionHandlingConfigurer} for further customizations
+	 */
+	public ExceptionHandlingConfigurer<H> authenticationEntryPoint(
+			AuthenticationEntryPoint authenticationEntryPoint) {
+		this.authenticationEntryPoint = authenticationEntryPoint;
+		return this;
+	}
 
-    /**
-     * Sets a default {@link AuthenticationEntryPoint} to be used which prefers
-     * being invoked for the provided {@link RequestMatcher}. If only a single
-     * default {@link AuthenticationEntryPoint} is specified, it will be what is
-     * used for the default {@link AuthenticationEntryPoint}. If multiple
-     * default {@link AuthenticationEntryPoint} instances are configured, then a
-     * {@link DelegatingAuthenticationEntryPoint} will be used.
-     *
-     * @param entryPoint
-     *            the {@link AuthenticationEntryPoint} to use
-     * @param preferredMatcher
-     *            the {@link RequestMatcher} for this default
-     *            {@link AuthenticationEntryPoint}
-     * @return the {@link ExceptionHandlingConfigurer} for further
-     *         customizations
-     */
-    public ExceptionHandlingConfigurer<H> defaultAuthenticationEntryPointFor(AuthenticationEntryPoint entryPoint, RequestMatcher preferredMatcher) {
-        this.defaultEntryPointMappings.put(preferredMatcher, entryPoint);
-        return this;
-    }
+	/**
+	 * Sets a default {@link AuthenticationEntryPoint} to be used which prefers being
+	 * invoked for the provided {@link RequestMatcher}. If only a single default
+	 * {@link AuthenticationEntryPoint} is specified, it will be what is used for the
+	 * default {@link AuthenticationEntryPoint}. If multiple default
+	 * {@link AuthenticationEntryPoint} instances are configured, then a
+	 * {@link DelegatingAuthenticationEntryPoint} will be used.
+	 *
+	 * @param entryPoint the {@link AuthenticationEntryPoint} to use
+	 * @param preferredMatcher the {@link RequestMatcher} for this default
+	 * {@link AuthenticationEntryPoint}
+	 * @return the {@link ExceptionHandlingConfigurer} for further customizations
+	 */
+	public ExceptionHandlingConfigurer<H> defaultAuthenticationEntryPointFor(
+			AuthenticationEntryPoint entryPoint, RequestMatcher preferredMatcher) {
+		this.defaultEntryPointMappings.put(preferredMatcher, entryPoint);
+		return this;
+	}
 
-    /**
-     * Gets any explicitly configured {@link AuthenticationEntryPoint}
-     * @return
-     */
-    AuthenticationEntryPoint getAuthenticationEntryPoint() {
-        return this.authenticationEntryPoint;
-    }
+	/**
+	 * Gets any explicitly configured {@link AuthenticationEntryPoint}
+	 * @return
+	 */
+	AuthenticationEntryPoint getAuthenticationEntryPoint() {
+		return this.authenticationEntryPoint;
+	}
 
-    /**
-     * Gets the {@link AccessDeniedHandler} that is configured.
-     *
-     * @return the {@link AccessDeniedHandler}
-     */
-    AccessDeniedHandler getAccessDeniedHandler() {
-        return this.accessDeniedHandler;
-    }
+	/**
+	 * Gets the {@link AccessDeniedHandler} that is configured.
+	 *
+	 * @return the {@link AccessDeniedHandler}
+	 */
+	AccessDeniedHandler getAccessDeniedHandler() {
+		return this.accessDeniedHandler;
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        AuthenticationEntryPoint entryPoint = getAuthenticationEntryPoint(http);
-        ExceptionTranslationFilter exceptionTranslationFilter = new ExceptionTranslationFilter(entryPoint, getRequestCache(http));
-        if(accessDeniedHandler != null) {
-            exceptionTranslationFilter.setAccessDeniedHandler(accessDeniedHandler);
-        }
-        exceptionTranslationFilter = postProcess(exceptionTranslationFilter);
-        http.addFilter(exceptionTranslationFilter);
-    }
-    /**
-     * Gets the {@link AuthenticationEntryPoint} according to the rules specified by {@link #authenticationEntryPoint(AuthenticationEntryPoint)}
-     * @param http the {@link HttpSecurity} used to look up shared {@link AuthenticationEntryPoint}
-     * @return the {@link AuthenticationEntryPoint} to use
-     */
-     AuthenticationEntryPoint getAuthenticationEntryPoint(H http) {
-        AuthenticationEntryPoint entryPoint = this.authenticationEntryPoint;
-        if(entryPoint == null) {
-            entryPoint = createDefaultEntryPoint(http);
-        }
-        return entryPoint;
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		AuthenticationEntryPoint entryPoint = getAuthenticationEntryPoint(http);
+		ExceptionTranslationFilter exceptionTranslationFilter = new ExceptionTranslationFilter(
+				entryPoint, getRequestCache(http));
+		if (accessDeniedHandler != null) {
+			exceptionTranslationFilter.setAccessDeniedHandler(accessDeniedHandler);
+		}
+		exceptionTranslationFilter = postProcess(exceptionTranslationFilter);
+		http.addFilter(exceptionTranslationFilter);
+	}
 
-    private AuthenticationEntryPoint createDefaultEntryPoint(H http) {
-        if(defaultEntryPointMappings.isEmpty()) {
-            return new Http403ForbiddenEntryPoint();
-        }
-        if(defaultEntryPointMappings.size() == 1) {
-            return defaultEntryPointMappings.values().iterator().next();
-        }
-        DelegatingAuthenticationEntryPoint entryPoint = new DelegatingAuthenticationEntryPoint(defaultEntryPointMappings);
-        entryPoint.setDefaultEntryPoint(defaultEntryPointMappings.values().iterator().next());
-        return entryPoint;
-    }
+	/**
+	 * Gets the {@link AuthenticationEntryPoint} according to the rules specified by
+	 * {@link #authenticationEntryPoint(AuthenticationEntryPoint)}
+	 * @param http the {@link HttpSecurity} used to look up shared
+	 * {@link AuthenticationEntryPoint}
+	 * @return the {@link AuthenticationEntryPoint} to use
+	 */
+	AuthenticationEntryPoint getAuthenticationEntryPoint(H http) {
+		AuthenticationEntryPoint entryPoint = this.authenticationEntryPoint;
+		if (entryPoint == null) {
+			entryPoint = createDefaultEntryPoint(http);
+		}
+		return entryPoint;
+	}
 
-    /**
-     * Gets the {@link RequestCache} to use. If one is defined using
-     * {@link #requestCache(org.springframework.security.web.savedrequest.RequestCache)}, then it is used. Otherwise, an
-     * attempt to find a {@link RequestCache} shared object is made. If that fails, an {@link HttpSessionRequestCache}
-     * is used
-     *
-     * @param http the {@link HttpSecurity} to attempt to fined the shared object
-     * @return the {@link RequestCache} to use
-     */
-    private RequestCache getRequestCache(H http) {
-        RequestCache result = http.getSharedObject(RequestCache.class);
-        if(result != null) {
-            return result;
-        }
-        return new HttpSessionRequestCache();
-    }
+	private AuthenticationEntryPoint createDefaultEntryPoint(H http) {
+		if (defaultEntryPointMappings.isEmpty()) {
+			return new Http403ForbiddenEntryPoint();
+		}
+		if (defaultEntryPointMappings.size() == 1) {
+			return defaultEntryPointMappings.values().iterator().next();
+		}
+		DelegatingAuthenticationEntryPoint entryPoint = new DelegatingAuthenticationEntryPoint(
+				defaultEntryPointMappings);
+		entryPoint.setDefaultEntryPoint(defaultEntryPointMappings.values().iterator()
+				.next());
+		return entryPoint;
+	}
+
+	/**
+	 * Gets the {@link RequestCache} to use. If one is defined using
+	 * {@link #requestCache(org.springframework.security.web.savedrequest.RequestCache)},
+	 * then it is used. Otherwise, an attempt to find a {@link RequestCache} shared object
+	 * is made. If that fails, an {@link HttpSessionRequestCache} is used
+	 *
+	 * @param http the {@link HttpSecurity} to attempt to fined the shared object
+	 * @return the {@link RequestCache} to use
+	 */
+	private RequestCache getRequestCache(H http) {
+		RequestCache result = http.getSharedObject(RequestCache.class);
+		if (result != null) {
+			return result;
+		}
+		return new HttpSessionRequestCache();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
index 84594a10bf..cf9fc82a01 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
@@ -37,28 +37,33 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Adds URL based authorization based upon SpEL expressions to an application. At least one
- * {@link org.springframework.web.bind.annotation.RequestMapping} needs to be mapped to {@link ConfigAttribute}'s for
- * this {@link SecurityContextConfigurer} to have meaning.
- * <h2>Security Filters</h2>
+ * Adds URL based authorization based upon SpEL expressions to an application. At least
+ * one {@link org.springframework.web.bind.annotation.RequestMapping} needs to be mapped
+ * to {@link ConfigAttribute}'s for this {@link SecurityContextConfigurer} to have
+ * meaning. <h2>Security Filters</h2>
  *
  * The following Filters are populated
  *
  * <ul>
- *     <li>{@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}</li>
+ * <li>{@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}
+ * </li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
  *
- * The following shared objects are populated to allow other {@link org.springframework.security.config.annotation.SecurityConfigurer}'s to customize:
+ * The following shared objects are populated to allow other
+ * {@link org.springframework.security.config.annotation.SecurityConfigurer}'s to
+ * customize:
  * <ul>
- *     <li>{@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}</li>
+ * <li>{@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}
+ * </li>
  * </ul>
  *
  * <h2>Shared Objects Used</h2>
  *
  * <ul>
- * <li>{@link AuthenticationTrustResolver} is optionally used to populate the {@link DefaultWebSecurityExpressionHandler}</li>
+ * <li>{@link AuthenticationTrustResolver} is optionally used to populate the
+ * {@link DefaultWebSecurityExpressionHandler}</li>
  * </ul>
  *
  * @param <H> the type of {@link HttpSecurityBuilder} that is being configured
@@ -67,287 +72,325 @@ import org.springframework.util.StringUtils;
  * @since 3.2
  * @see {@link org.springframework.security.config.annotation.web.builders.HttpSecurity#authorizeRequests()}
  */
-public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractInterceptUrlConfigurer<ExpressionUrlAuthorizationConfigurer<H>,H> {
-    static final String permitAll = "permitAll";
-    private static final String denyAll = "denyAll";
-    private static final String anonymous = "anonymous";
-    private static final String authenticated = "authenticated";
-    private static final String fullyAuthenticated = "fullyAuthenticated";
-    private static final String rememberMe = "rememberMe";
+public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>>
+		extends
+		AbstractInterceptUrlConfigurer<ExpressionUrlAuthorizationConfigurer<H>, H> {
+	static final String permitAll = "permitAll";
+	private static final String denyAll = "denyAll";
+	private static final String anonymous = "anonymous";
+	private static final String authenticated = "authenticated";
+	private static final String fullyAuthenticated = "fullyAuthenticated";
+	private static final String rememberMe = "rememberMe";
 
-    private final ExpressionInterceptUrlRegistry REGISTRY = new ExpressionInterceptUrlRegistry();
+	private final ExpressionInterceptUrlRegistry REGISTRY = new ExpressionInterceptUrlRegistry();
 
-    private SecurityExpressionHandler<FilterInvocation> expressionHandler;
+	private SecurityExpressionHandler<FilterInvocation> expressionHandler;
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#authorizeRequests()
-     */
-    public ExpressionUrlAuthorizationConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#authorizeRequests()
+	 */
+	public ExpressionUrlAuthorizationConfigurer() {
+	}
 
-    public ExpressionInterceptUrlRegistry getRegistry() {
-        return REGISTRY;
-    }
+	public ExpressionInterceptUrlRegistry getRegistry() {
+		return REGISTRY;
+	}
 
-    public class ExpressionInterceptUrlRegistry extends ExpressionUrlAuthorizationConfigurer<H>.AbstractInterceptUrlRegistry<ExpressionInterceptUrlRegistry,AuthorizedUrl> {
+	public class ExpressionInterceptUrlRegistry
+			extends
+			ExpressionUrlAuthorizationConfigurer<H>.AbstractInterceptUrlRegistry<ExpressionInterceptUrlRegistry, AuthorizedUrl> {
 
-        @Override
-        protected final AuthorizedUrl chainRequestMatchersInternal(List<RequestMatcher> requestMatchers) {
-            return new AuthorizedUrl(requestMatchers);
-        }
+		@Override
+		protected final AuthorizedUrl chainRequestMatchersInternal(
+				List<RequestMatcher> requestMatchers) {
+			return new AuthorizedUrl(requestMatchers);
+		}
 
+		/**
+		 * Allows customization of the {@link SecurityExpressionHandler} to be used. The
+		 * default is {@link DefaultWebSecurityExpressionHandler}
+		 *
+		 * @param expressionHandler the {@link SecurityExpressionHandler} to be used
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization.
+		 */
+		public ExpressionInterceptUrlRegistry expressionHandler(
+				SecurityExpressionHandler<FilterInvocation> expressionHandler) {
+			ExpressionUrlAuthorizationConfigurer.this.expressionHandler = expressionHandler;
+			return this;
+		}
 
-        /**
-         * Allows customization of the {@link SecurityExpressionHandler} to be used. The default is {@link DefaultWebSecurityExpressionHandler}
-         *
-         * @param expressionHandler the {@link SecurityExpressionHandler} to be used
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization.
-         */
-        public ExpressionInterceptUrlRegistry expressionHandler(SecurityExpressionHandler<FilterInvocation> expressionHandler) {
-            ExpressionUrlAuthorizationConfigurer.this.expressionHandler = expressionHandler;
-            return this;
-        }
+		/**
+		 * Adds an {@link ObjectPostProcessor} for this class.
+		 *
+		 * @param objectPostProcessor
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customizations
+		 */
+		public ExpressionInterceptUrlRegistry withObjectPostProcessor(
+				ObjectPostProcessor<?> objectPostProcessor) {
+			addObjectPostProcessor(objectPostProcessor);
+			return this;
+		}
 
-        /**
-         * Adds an {@link ObjectPostProcessor} for this class.
-         *
-         * @param objectPostProcessor
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customizations
-         */
-        public ExpressionInterceptUrlRegistry withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-            addObjectPostProcessor(objectPostProcessor);
-            return this;
-        }
+		public H and() {
+			return ExpressionUrlAuthorizationConfigurer.this.and();
+		}
 
-        public H and() {
-            return ExpressionUrlAuthorizationConfigurer.this.and();
-        }
+	}
 
-    }
+	/**
+	 * Allows registering multiple {@link RequestMatcher} instances to a collection of
+	 * {@link ConfigAttribute} instances
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances to register to the
+	 * {@link ConfigAttribute} instances
+	 * @param configAttributes the {@link ConfigAttribute} to be mapped by the
+	 * {@link RequestMatcher} instances
+	 */
+	private void interceptUrl(Iterable<? extends RequestMatcher> requestMatchers,
+			Collection<ConfigAttribute> configAttributes) {
+		for (RequestMatcher requestMatcher : requestMatchers) {
+			REGISTRY.addMapping(new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(
+					requestMatcher, configAttributes));
+		}
+	}
 
+	@Override
+	@SuppressWarnings("rawtypes")
+	final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
+		List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+		WebExpressionVoter expressionVoter = new WebExpressionVoter();
+		expressionVoter.setExpressionHandler(getExpressionHandler(http));
+		decisionVoters.add(expressionVoter);
+		return decisionVoters;
+	}
 
-    /**
-     * Allows registering multiple {@link RequestMatcher} instances to a collection of {@link ConfigAttribute} instances
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances to register to the {@link ConfigAttribute} instances
-     * @param configAttributes the {@link ConfigAttribute} to be mapped by the {@link RequestMatcher} instances
-     */
-    private void interceptUrl(Iterable<? extends RequestMatcher> requestMatchers, Collection<ConfigAttribute> configAttributes) {
-        for(RequestMatcher requestMatcher : requestMatchers) {
-            REGISTRY.addMapping(new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(requestMatcher, configAttributes));
-        }
-    }
+	@Override
+	final ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource(
+			H http) {
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = REGISTRY
+				.createRequestMap();
+		if (requestMap.isEmpty()) {
+			throw new IllegalStateException(
+					"At least one mapping is required (i.e. authorizeRequests().anyRequest.authenticated())");
+		}
+		return new ExpressionBasedFilterInvocationSecurityMetadataSource(requestMap,
+				getExpressionHandler(http));
+	}
 
-    @Override
-    @SuppressWarnings("rawtypes")
-    final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
-        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
-        WebExpressionVoter expressionVoter = new WebExpressionVoter();
-        expressionVoter.setExpressionHandler(getExpressionHandler(http));
-        decisionVoters.add(expressionVoter);
-        return decisionVoters;
-    }
+	private SecurityExpressionHandler<FilterInvocation> getExpressionHandler(H http) {
+		if (expressionHandler == null) {
+			DefaultWebSecurityExpressionHandler defaultHandler = new DefaultWebSecurityExpressionHandler();
+			AuthenticationTrustResolver trustResolver = http
+					.getSharedObject(AuthenticationTrustResolver.class);
+			if (trustResolver != null) {
+				defaultHandler.setTrustResolver(trustResolver);
+			}
+			expressionHandler = postProcess(defaultHandler);
+		}
 
-    @Override
-    final ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource(H http) {
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = REGISTRY.createRequestMap();
-        if(requestMap.isEmpty()) {
-            throw new IllegalStateException("At least one mapping is required (i.e. authorizeRequests().anyRequest.authenticated())");
-        }
-        return new ExpressionBasedFilterInvocationSecurityMetadataSource(requestMap, getExpressionHandler(http));
-    }
+		return expressionHandler;
+	}
 
-    private SecurityExpressionHandler<FilterInvocation> getExpressionHandler(H http) {
-        if(expressionHandler == null) {
-            DefaultWebSecurityExpressionHandler defaultHandler = new DefaultWebSecurityExpressionHandler();
-            AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class);
-            if(trustResolver != null) {
-                defaultHandler.setTrustResolver(trustResolver);
-            }
-            expressionHandler = postProcess(defaultHandler);
-        }
+	private static String hasAnyRole(String... authorities) {
+		String anyAuthorities = StringUtils.arrayToDelimitedString(authorities,
+				"','ROLE_");
+		return "hasAnyRole('ROLE_" + anyAuthorities + "')";
+	}
 
-        return expressionHandler;
-    }
+	private static String hasRole(String role) {
+		Assert.notNull(role, "role cannot be null");
+		if (role.startsWith("ROLE_")) {
+			throw new IllegalArgumentException(
+					"role should not start with 'ROLE_' since it is automatically inserted. Got '"
+							+ role + "'");
+		}
+		return "hasRole('ROLE_" + role + "')";
+	}
 
-    private static String hasAnyRole(String... authorities) {
-        String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','ROLE_");
-        return "hasAnyRole('ROLE_" + anyAuthorities + "')";
-    }
+	private static String hasAuthority(String authority) {
+		return "hasAuthority('" + authority + "')";
+	}
 
-    private static String hasRole(String role) {
-        Assert.notNull(role, "role cannot be null");
-        if (role.startsWith("ROLE_")) {
-            throw new IllegalArgumentException("role should not start with 'ROLE_' since it is automatically inserted. Got '" + role + "'");
-        }
-        return "hasRole('ROLE_" + role + "')";
-    }
+	private static String hasAnyAuthority(String... authorities) {
+		String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','");
+		return "hasAnyAuthority('" + anyAuthorities + "')";
+	}
 
-    private static String hasAuthority(String authority) {
-        return "hasAuthority('" + authority + "')";
-    }
+	private static String hasIpAddress(String ipAddressExpression) {
+		return "hasIpAddress('" + ipAddressExpression + "')";
+	}
 
-    private static String hasAnyAuthority(String... authorities) {
-        String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','");
-        return "hasAnyAuthority('" + anyAuthorities + "')";
-    }
+	public final class AuthorizedUrl {
+		private List<RequestMatcher> requestMatchers;
+		private boolean not;
 
-    private static String hasIpAddress(String ipAddressExpression) {
-        return "hasIpAddress('" + ipAddressExpression + "')";
-    }
+		/**
+		 * Creates a new instance
+		 *
+		 * @param requestMatchers the {@link RequestMatcher} instances to map
+		 */
+		private AuthorizedUrl(List<RequestMatcher> requestMatchers) {
+			this.requestMatchers = requestMatchers;
+		}
 
-    public final class AuthorizedUrl {
-        private List<RequestMatcher> requestMatchers;
-        private boolean not;
+		/**
+		 * Negates the following expression.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public AuthorizedUrl not() {
+			this.not = true;
+			return this;
+		}
 
-        /**
-         * Creates a new instance
-         *
-         * @param requestMatchers the {@link RequestMatcher} instances to map
-         */
-        private AuthorizedUrl(List<RequestMatcher> requestMatchers) {
-            this.requestMatchers = requestMatchers;
-        }
+		/**
+		 * Shortcut for specifying URLs require a particular role. If you do not want to
+		 * have "ROLE_" automatically inserted see {@link #hasAuthority(String)}.
+		 *
+		 * @param role the role to require (i.e. USER, ADMIN, etc). Note, it should not
+		 * start with "ROLE_" as this is automatically inserted.
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry hasRole(String role) {
+			return access(ExpressionUrlAuthorizationConfigurer.hasRole(role));
+		}
 
-        /**
-         * Negates the following expression.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public AuthorizedUrl not() {
-            this.not = true;
-            return this;
-        }
+		/**
+		 * Shortcut for specifying URLs require any of a number of roles. If you do not
+		 * want to have "ROLE_" automatically inserted see
+		 * {@link #hasAnyAuthority(String...)}
+		 *
+		 * @param roles the roles to require (i.e. USER, ADMIN, etc). Note, it should not
+		 * start with "ROLE_" as this is automatically inserted.
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry hasAnyRole(String... roles) {
+			return access(ExpressionUrlAuthorizationConfigurer.hasAnyRole(roles));
+		}
 
-        /**
-         * Shortcut for specifying URLs require a particular role. If you do not want to have "ROLE_" automatically
-         * inserted see {@link #hasAuthority(String)}.
-         *
-         * @param role the role to require (i.e. USER, ADMIN, etc). Note, it should not start with "ROLE_" as
-         *             this is automatically inserted.
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry hasRole(String role) {
-            return access(ExpressionUrlAuthorizationConfigurer.hasRole(role));
-        }
+		/**
+		 * Specify that URLs require a particular authority.
+		 *
+		 * @param authority the authority to require (i.e. ROLE_USER, ROLE_ADMIN, etc).
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry hasAuthority(String authority) {
+			return access(ExpressionUrlAuthorizationConfigurer.hasAuthority(authority));
+		}
 
-        /**
-         * Shortcut for specifying URLs require any of a number of roles. If you
-         * do not want to have "ROLE_" automatically inserted see
-         * {@link #hasAnyAuthority(String...)}
-         *
-         * @param roles
-         *            the roles to require (i.e. USER, ADMIN, etc). Note, it
-         *            should not start with "ROLE_" as this is automatically
-         *            inserted.
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
-         *         customization
-         */
-        public ExpressionInterceptUrlRegistry hasAnyRole(String... roles) {
-            return access(ExpressionUrlAuthorizationConfigurer.hasAnyRole(roles));
-        }
+		/**
+		 * Specify that URLs requires any of a number authorities.
+		 *
+		 * @param authorities the requests require at least one of the authorities (i.e.
+		 * "ROLE_USER","ROLE_ADMIN" would mean either "ROLE_USER" or "ROLE_ADMIN" is
+		 * required).
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry hasAnyAuthority(String... authorities) {
+			return access(ExpressionUrlAuthorizationConfigurer
+					.hasAnyAuthority(authorities));
+		}
 
-        /**
-         * Specify that URLs require a particular authority.
-         *
-         * @param authority the authority to require (i.e. ROLE_USER, ROLE_ADMIN, etc).
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry hasAuthority(String authority) {
-            return access(ExpressionUrlAuthorizationConfigurer.hasAuthority(authority));
-        }
+		/**
+		 * Specify that URLs requires a specific IP Address or <a href=
+		 * "http://forum.springsource.org/showthread.php?102783-How-to-use-hasIpAddress&p=343971#post343971"
+		 * >subnet</a>.
+		 *
+		 * @param ipaddressExpression the ipaddress (i.e. 192.168.1.79) or local subnet
+		 * (i.e. 192.168.0/24)
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry hasIpAddress(String ipaddressExpression) {
+			return access(ExpressionUrlAuthorizationConfigurer
+					.hasIpAddress(ipaddressExpression));
+		}
 
-        /**
-         * Specify that URLs requires any of a number authorities.
-         *
-         * @param authorities the requests require at least one of the authorities (i.e. "ROLE_USER","ROLE_ADMIN" would
-         *                    mean either "ROLE_USER" or "ROLE_ADMIN" is required).
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry hasAnyAuthority(String... authorities) {
-            return access(ExpressionUrlAuthorizationConfigurer.hasAnyAuthority(authorities));
-        }
+		/**
+		 * Specify that URLs are allowed by anyone.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry permitAll() {
+			return access(permitAll);
+		}
 
-        /**
-         * Specify that URLs requires a specific IP Address or
-         * <a href="http://forum.springsource.org/showthread.php?102783-How-to-use-hasIpAddress&p=343971#post343971">subnet</a>.
-         *
-         * @param ipaddressExpression the ipaddress (i.e. 192.168.1.79) or local subnet (i.e. 192.168.0/24)
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry hasIpAddress(String ipaddressExpression) {
-            return access(ExpressionUrlAuthorizationConfigurer.hasIpAddress(ipaddressExpression));
-        }
+		/**
+		 * Specify that URLs are allowed by anonymous users.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry anonymous() {
+			return access(anonymous);
+		}
 
-        /**
-         * Specify that URLs are allowed by anyone.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry permitAll() {
-            return access(permitAll);
-        }
+		/**
+		 * Specify that URLs are allowed by users that have been remembered.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 * @see {@link RememberMeConfigurer}
+		 */
+		public ExpressionInterceptUrlRegistry rememberMe() {
+			return access(rememberMe);
+		}
 
-        /**
-         * Specify that URLs are allowed by anonymous users.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry anonymous() {
-            return access(anonymous);
-        }
+		/**
+		 * Specify that URLs are not allowed by anyone.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry denyAll() {
+			return access(denyAll);
+		}
 
-        /**
-         * Specify that URLs are allowed by users that have been remembered.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         * @see {@link RememberMeConfigurer}
-         */
-        public ExpressionInterceptUrlRegistry rememberMe() {
-            return access(rememberMe);
-        }
+		/**
+		 * Specify that URLs are allowed by any authenticated user.
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry authenticated() {
+			return access(authenticated);
+		}
 
-        /**
-         * Specify that URLs are not allowed by anyone.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry denyAll() {
-            return access(denyAll);
-        }
+		/**
+		 * Specify that URLs are allowed by users who have authenticated and were not
+		 * "remembered".
+		 *
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 * @see {@link RememberMeConfigurer}
+		 */
+		public ExpressionInterceptUrlRegistry fullyAuthenticated() {
+			return access(fullyAuthenticated);
+		}
 
-        /**
-         * Specify that URLs are allowed by any authenticated user.
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry authenticated() {
-            return access(authenticated);
-        }
-
-        /**
-         * Specify that URLs are allowed by users who have authenticated and were not "remembered".
-         *
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         * @see {@link RememberMeConfigurer}
-         */
-        public ExpressionInterceptUrlRegistry fullyAuthenticated() {
-            return access(fullyAuthenticated);
-        }
-
-        /**
-         * Allows specifying that URLs are secured by an arbitrary expression
-         *
-         * @param attribute the expression to secure the URLs (i.e. "hasRole('ROLE_USER') and hasRole('ROLE_SUPER')")
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customization
-         */
-        public ExpressionInterceptUrlRegistry access(String attribute) {
-            if(not) {
-                attribute = "!" + attribute;
-            }
-            interceptUrl(requestMatchers, SecurityConfig.createList(attribute));
-            return ExpressionUrlAuthorizationConfigurer.this.REGISTRY;
-        }
-    }
+		/**
+		 * Allows specifying that URLs are secured by an arbitrary expression
+		 *
+		 * @param attribute the expression to secure the URLs (i.e.
+		 * "hasRole('ROLE_USER') and hasRole('ROLE_SUPER')")
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customization
+		 */
+		public ExpressionInterceptUrlRegistry access(String attribute) {
+			if (not) {
+				attribute = "!" + attribute;
+			}
+			interceptUrl(requestMatchers, SecurityConfig.createList(attribute));
+			return ExpressionUrlAuthorizationConfigurer.this.REGISTRY;
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java
index 90e7060b09..98d33658f0 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java
@@ -27,9 +27,9 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
- * Adds form based authentication. All attributes have reasonable defaults
- * making all parameters are optional. If no {@link #loginPage(String)} is
- * specified, a default login page will be generated by the framework.
+ * Adds form based authentication. All attributes have reasonable defaults making all
+ * parameters are optional. If no {@link #loginPage(String)} is specified, a default login
+ * page will be generated by the framework.
  *
  * <h2>Security Filters</h2>
  *
@@ -37,8 +37,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  *
  * <ul>
  * <li>
- * {@link UsernamePasswordAuthenticationFilter}
- * </li>
+ * {@link UsernamePasswordAuthenticationFilter}</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
@@ -46,7 +45,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * The following shared objects are populated
  *
  * <ul>
- * <li> {@link AuthenticationEntryPoint} </li>
+ * <li> {@link AuthenticationEntryPoint}</li>
  * </ul>
  *
  * <h2>Shared Objects Used</h2>
@@ -56,208 +55,209 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * <ul>
  * <li>{@link AuthenticationManager}</li>
  * <li>{@link RememberMeServices} - is optionally used. See {@link RememberMeConfigurer}</li>
- * <li>{@link SessionAuthenticationStrategy} - is optionally used. See {@link SessionManagementConfigurer}</li>
- * <li>{@link DefaultLoginPageGeneratingFilter} - if present will be populated with information from the configuration</li>
+ * <li>{@link SessionAuthenticationStrategy} - is optionally used. See
+ * {@link SessionManagementConfigurer}</li>
+ * <li>{@link DefaultLoginPageGeneratingFilter} - if present will be populated with
+ * information from the configuration</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractAuthenticationFilterConfigurer<H,FormLoginConfigurer<H>,UsernamePasswordAuthenticationFilter> {
+public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>>
+		extends
+		AbstractAuthenticationFilterConfigurer<H, FormLoginConfigurer<H>, UsernamePasswordAuthenticationFilter> {
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#formLogin()
-     */
-    public FormLoginConfigurer() {
-        super(new UsernamePasswordAuthenticationFilter(),null);
-        usernameParameter("username");
-        passwordParameter("password");
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#formLogin()
+	 */
+	public FormLoginConfigurer() {
+		super(new UsernamePasswordAuthenticationFilter(), null);
+		usernameParameter("username");
+		passwordParameter("password");
+	}
 
-    /**
-     * <p>
-     * Specifies the URL to send users to if login is required. If used with
-     * {@link WebSecurityConfigurerAdapter} a default login page will be
-     * generated when this attribute is not specified.
-     * </p>
-     *
-     * <p>
-     * If a URL is specified or this is not being used in conjuction with
-     * {@link WebSecurityConfigurerAdapter}, users are required to process the
-     * specified URL to generate a login page. In general, the login page should
-     * create a form that submits a request with the following requirements to
-     * work with {@link UsernamePasswordAuthenticationFilter}:
-     * </p>
-     *
-     * <ul>
-     * <li>It must be an HTTP POST</li>
-     * <li>It must be submitted to {@link #loginProcessingUrl(String)}</li>
-     * <li>It should include the username as an HTTP parameter by the name of
-     * {@link #usernameParameter(String)}</li>
-     * <li>It should include the password as an HTTP parameter by the name of
-     * {@link #passwordParameter(String)}</li>
-     * </ul>
-     *
-     * <h2>Example login.jsp</h2>
-     *
-     * Login pages can be rendered with any technology you choose so long as the
-     * rules above are followed. Below is an example login.jsp that can be used as
-     * a quick start when using JSP's or as a baseline to translate into another view
-     * technology.
-     *
-     * <pre>
-     * <!-- loginProcessingUrl should correspond to FormLoginConfigurer#loginProcessingUrl. Don't forget to perform a POST -->
-     * &lt;c:url value="/login" var="loginProcessingUrl"/&gt;
-     * &lt;form action="${loginProcessingUrl}" method="post"&gt;
-     *    &lt;fieldset&gt;
-     *        &lt;legend&gt;Please Login&lt;/legend&gt;
-     *        &lt;!-- use param.error assuming FormLoginConfigurer#failureUrl contains the query parameter error --&gt;
-     *        &lt;c:if test="${param.error != null}"&gt;
-     *            &lt;div&gt;
-     *                Failed to login.
-     *                &lt;c:if test="${SPRING_SECURITY_LAST_EXCEPTION != null}"&gt;
-     *                  Reason: &lt;c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}" /&gt;
-     *                &lt;/c:if&gt;
-     *            &lt;/div&gt;
-     *        &lt;/c:if&gt;
-     *        &lt;!-- the configured LogoutConfigurer#logoutSuccessUrl is /login?logout and contains the query param logout --&gt;
-     *        &lt;c:if test="${param.logout != null}"&gt;
-     *            &lt;div&gt;
-     *                You have been logged out.
-     *            &lt;/div&gt;
-     *        &lt;/c:if&gt;
-     *        &lt;p&gt;
-     *        &lt;label for="username"&gt;Username&lt;/label&gt;
-     *        &lt;input type="text" id="username" name="username"/&gt;
-     *        &lt;/p&gt;
-     *        &lt;p&gt;
-     *        &lt;label for="password"&gt;Password&lt;/label&gt;
-     *        &lt;input type="password" id="password" name="password"/&gt;
-     *        &lt;/p&gt;
-     *        &lt;!-- if using RememberMeConfigurer make sure remember-me matches RememberMeConfigurer#rememberMeParameter --&gt;
-     *        &lt;p&gt;
-     *        &lt;label for="remember-me"&gt;Remember Me?&lt;/label&gt;
-     *        &lt;input type="checkbox" id="remember-me" name="remember-me"/&gt;
-     *        &lt;/p&gt;
-     *        &lt;div&gt;
-     *            &lt;button type="submit" class="btn"&gt;Log in&lt;/button&gt;
-     *        &lt;/div&gt;
-     *    &lt;/fieldset&gt;
-     * &lt;/form&gt;
-     * </pre>
-     *
-     * <h2>Impact on other defaults</h2>
-     *
-     * Updating this value, also impacts a number of other default values. For example,
-     * the following are the default values when only formLogin() was specified.
-     *
-     * <ul>
-     * <li>/login GET - the login form</li>
-     * <li>/login POST - process the credentials and if valid authenticate the
-     * user</li>
-     * <li>/login?error GET - redirect here for failed authentication attempts</li>
-     * <li>/login?logout GET - redirect here after successfully logging out</li>
-     * </ul>
-     *
-     * If "/authenticate" was passed to this method it update the defaults as shown
-     * below:
-     *
-     * <ul>
-     * <li>/authenticate GET - the login form</li>
-     * <li>/authenticate POST - process the credentials and if valid authenticate the
-     * user</li>
-     * <li>/authenticate?error GET - redirect here for failed authentication attempts</li>
-     * <li>/authenticate?logout GET - redirect here after successfully logging out</li>
-     * </ul>
-     *
-     *
-     * @param loginPage
-     *            the login page to redirect to if authentication is required
-     *            (i.e. "/login")
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public FormLoginConfigurer<H> loginPage(String loginPage) {
-        return super.loginPage(loginPage);
-    }
+	/**
+	 * <p>
+	 * Specifies the URL to send users to if login is required. If used with
+	 * {@link WebSecurityConfigurerAdapter} a default login page will be generated when
+	 * this attribute is not specified.
+	 * </p>
+	 *
+	 * <p>
+	 * If a URL is specified or this is not being used in conjuction with
+	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
+	 * URL to generate a login page. In general, the login page should create a form that
+	 * submits a request with the following requirements to work with
+	 * {@link UsernamePasswordAuthenticationFilter}:
+	 * </p>
+	 *
+	 * <ul>
+	 * <li>It must be an HTTP POST</li>
+	 * <li>It must be submitted to {@link #loginProcessingUrl(String)}</li>
+	 * <li>It should include the username as an HTTP parameter by the name of
+	 * {@link #usernameParameter(String)}</li>
+	 * <li>It should include the password as an HTTP parameter by the name of
+	 * {@link #passwordParameter(String)}</li>
+	 * </ul>
+	 *
+	 * <h2>Example login.jsp</h2>
+	 *
+	 * Login pages can be rendered with any technology you choose so long as the rules
+	 * above are followed. Below is an example login.jsp that can be used as a quick start
+	 * when using JSP's or as a baseline to translate into another view technology.
+	 *
+	 * <pre>
+	 * <!-- loginProcessingUrl should correspond to FormLoginConfigurer#loginProcessingUrl. Don't forget to perform a POST -->
+	 * &lt;c:url value="/login" var="loginProcessingUrl"/&gt;
+	 * &lt;form action="${loginProcessingUrl}" method="post"&gt;
+	 *    &lt;fieldset&gt;
+	 *        &lt;legend&gt;Please Login&lt;/legend&gt;
+	 *        &lt;!-- use param.error assuming FormLoginConfigurer#failureUrl contains the query parameter error --&gt;
+	 *        &lt;c:if test="${param.error != null}"&gt;
+	 *            &lt;div&gt;
+	 *                Failed to login.
+	 *                &lt;c:if test="${SPRING_SECURITY_LAST_EXCEPTION != null}"&gt;
+	 *                  Reason: &lt;c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}" /&gt;
+	 *                &lt;/c:if&gt;
+	 *            &lt;/div&gt;
+	 *        &lt;/c:if&gt;
+	 *        &lt;!-- the configured LogoutConfigurer#logoutSuccessUrl is /login?logout and contains the query param logout --&gt;
+	 *        &lt;c:if test="${param.logout != null}"&gt;
+	 *            &lt;div&gt;
+	 *                You have been logged out.
+	 *            &lt;/div&gt;
+	 *        &lt;/c:if&gt;
+	 *        &lt;p&gt;
+	 *        &lt;label for="username"&gt;Username&lt;/label&gt;
+	 *        &lt;input type="text" id="username" name="username"/&gt;
+	 *        &lt;/p&gt;
+	 *        &lt;p&gt;
+	 *        &lt;label for="password"&gt;Password&lt;/label&gt;
+	 *        &lt;input type="password" id="password" name="password"/&gt;
+	 *        &lt;/p&gt;
+	 *        &lt;!-- if using RememberMeConfigurer make sure remember-me matches RememberMeConfigurer#rememberMeParameter --&gt;
+	 *        &lt;p&gt;
+	 *        &lt;label for="remember-me"&gt;Remember Me?&lt;/label&gt;
+	 *        &lt;input type="checkbox" id="remember-me" name="remember-me"/&gt;
+	 *        &lt;/p&gt;
+	 *        &lt;div&gt;
+	 *            &lt;button type="submit" class="btn"&gt;Log in&lt;/button&gt;
+	 *        &lt;/div&gt;
+	 *    &lt;/fieldset&gt;
+	 * &lt;/form&gt;
+	 * </pre>
+	 *
+	 * <h2>Impact on other defaults</h2>
+	 *
+	 * Updating this value, also impacts a number of other default values. For example,
+	 * the following are the default values when only formLogin() was specified.
+	 *
+	 * <ul>
+	 * <li>/login GET - the login form</li>
+	 * <li>/login POST - process the credentials and if valid authenticate the user</li>
+	 * <li>/login?error GET - redirect here for failed authentication attempts</li>
+	 * <li>/login?logout GET - redirect here after successfully logging out</li>
+	 * </ul>
+	 *
+	 * If "/authenticate" was passed to this method it update the defaults as shown below:
+	 *
+	 * <ul>
+	 * <li>/authenticate GET - the login form</li>
+	 * <li>/authenticate POST - process the credentials and if valid authenticate the user
+	 * </li>
+	 * <li>/authenticate?error GET - redirect here for failed authentication attempts</li>
+	 * <li>/authenticate?logout GET - redirect here after successfully logging out</li>
+	 * </ul>
+	 *
+	 *
+	 * @param loginPage the login page to redirect to if authentication is required (i.e.
+	 * "/login")
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public FormLoginConfigurer<H> loginPage(String loginPage) {
+		return super.loginPage(loginPage);
+	}
 
+	/**
+	 * The HTTP parameter to look for the username when performing authentication. Default
+	 * is "username".
+	 *
+	 * @param usernameParameter the HTTP parameter to look for the username when
+	 * performing authentication
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public FormLoginConfigurer<H> usernameParameter(String usernameParameter) {
+		getAuthenticationFilter().setUsernameParameter(usernameParameter);
+		return this;
+	}
 
+	/**
+	 * The HTTP parameter to look for the password when performing authentication. Default
+	 * is "password".
+	 *
+	 * @param passwordParameter the HTTP parameter to look for the password when
+	 * performing authentication
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public FormLoginConfigurer<H> passwordParameter(String passwordParameter) {
+		getAuthenticationFilter().setPasswordParameter(passwordParameter);
+		return this;
+	}
 
-    /**
-     * The HTTP parameter to look for the username when performing
-     * authentication. Default is "username".
-     *
-     * @param usernameParameter
-     *            the HTTP parameter to look for the username when performing
-     *            authentication
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public FormLoginConfigurer<H> usernameParameter(String usernameParameter) {
-        getAuthenticationFilter().setUsernameParameter(usernameParameter);
-        return this;
-    }
+	@Override
+	public void init(H http) throws Exception {
+		super.init(http);
+		initDefaultLoginFilter(http);
+	}
 
-    /**
-     * The HTTP parameter to look for the password when performing
-     * authentication. Default is "password".
-     *
-     * @param passwordParameter
-     *            the HTTP parameter to look for the password when performing
-     *            authentication
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public FormLoginConfigurer<H> passwordParameter(String passwordParameter) {
-        getAuthenticationFilter().setPasswordParameter(passwordParameter);
-        return this;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.config.annotation.web.configurers.
+	 * AbstractAuthenticationFilterConfigurer
+	 * #createLoginProcessingUrlMatcher(java.lang.String)
+	 */
+	@Override
+	protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl) {
+		return new AntPathRequestMatcher(loginProcessingUrl, "POST");
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        super.init(http);
-        initDefaultLoginFilter(http);
-    }
+	/**
+	 * Gets the HTTP parameter that is used to submit the username.
+	 *
+	 * @return the HTTP parameter that is used to submit the username
+	 */
+	private String getUsernameParameter() {
+		return getAuthenticationFilter().getUsernameParameter();
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer#createLoginProcessingUrlMatcher(java.lang.String)
-     */
-    @Override
-    protected RequestMatcher createLoginProcessingUrlMatcher(
-            String loginProcessingUrl) {
-        return new AntPathRequestMatcher(loginProcessingUrl, "POST");
-    }
+	/**
+	 * Gets the HTTP parameter that is used to submit the password.
+	 *
+	 * @return the HTTP parameter that is used to submit the password
+	 */
+	private String getPasswordParameter() {
+		return getAuthenticationFilter().getPasswordParameter();
+	}
 
-    /**
-     * Gets the HTTP parameter that is used to submit the username.
-     *
-     * @return the HTTP parameter that is used to submit the username
-     */
-    private String getUsernameParameter() {
-        return getAuthenticationFilter().getUsernameParameter();
-    }
-
-    /**
-     * Gets the HTTP parameter that is used to submit the password.
-     *
-     * @return the HTTP parameter that is used to submit the password
-     */
-    private String getPasswordParameter() {
-        return getAuthenticationFilter().getPasswordParameter();
-    }
-
-    /**
-     * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared object.
-     *
-     * @param http the {@link HttpSecurityBuilder} to use
-     */
-    private void initDefaultLoginFilter(H http) {
-        DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http.getSharedObject(DefaultLoginPageGeneratingFilter.class);
-        if(loginPageGeneratingFilter != null && !isCustomLoginPage()) {
-            loginPageGeneratingFilter.setFormLoginEnabled(true);
-            loginPageGeneratingFilter.setUsernameParameter(getUsernameParameter());
-            loginPageGeneratingFilter.setPasswordParameter(getPasswordParameter());
-            loginPageGeneratingFilter.setLoginPageUrl(getLoginPage());
-            loginPageGeneratingFilter.setFailureUrl(getFailureUrl());
-            loginPageGeneratingFilter.setAuthenticationUrl(getLoginProcessingUrl());
-        }
-    }
+	/**
+	 * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared
+	 * object.
+	 *
+	 * @param http the {@link HttpSecurityBuilder} to use
+	 */
+	private void initDefaultLoginFilter(H http) {
+		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
+				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+		if (loginPageGeneratingFilter != null && !isCustomLoginPage()) {
+			loginPageGeneratingFilter.setFormLoginEnabled(true);
+			loginPageGeneratingFilter.setUsernameParameter(getUsernameParameter());
+			loginPageGeneratingFilter.setPasswordParameter(getPasswordParameter());
+			loginPageGeneratingFilter.setLoginPageUrl(getLoginPage());
+			loginPageGeneratingFilter.setFailureUrl(getFailureUrl());
+			loginPageGeneratingFilter.setAuthenticationUrl(getLoginProcessingUrl());
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
index 0d3f2b7de2..71402ad2be 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java
@@ -36,9 +36,8 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * Adds the Security HTTP headers to the response. Security HTTP headers is
- * activated by default when using {@link WebSecurityConfigurerAdapter}'s
- * default constructor.
+ * Adds the Security HTTP headers to the response. Security HTTP headers is activated by
+ * default when using {@link WebSecurityConfigurerAdapter}'s default constructor.
  * </p>
  *
  * <p>
@@ -59,490 +58,481 @@ import org.springframework.util.Assert;
  * @since 3.2
  */
 public class HeadersConfigurer<H extends HttpSecurityBuilder<H>> extends
-        AbstractHttpConfigurer<HeadersConfigurer<H>, H> {
-    private List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
+		AbstractHttpConfigurer<HeadersConfigurer<H>, H> {
+	private List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
 
-    // --- default header writers ---
+	// --- default header writers ---
 
-    private final ContentTypeOptionsConfig contentTypeOptions = new ContentTypeOptionsConfig();
+	private final ContentTypeOptionsConfig contentTypeOptions = new ContentTypeOptionsConfig();
 
-    private final XXssConfig xssProtection = new XXssConfig();
+	private final XXssConfig xssProtection = new XXssConfig();
 
-    private final CacheControlConfig cacheControl = new CacheControlConfig();
+	private final CacheControlConfig cacheControl = new CacheControlConfig();
 
-    private final HstsConfig hsts = new HstsConfig();
+	private final HstsConfig hsts = new HstsConfig();
 
-    private final FrameOptionsConfig frameOptions = new FrameOptionsConfig();
+	private final FrameOptionsConfig frameOptions = new FrameOptionsConfig();
 
-    /**
-     * Creates a new instance
-     *
-     * @see HttpSecurity#headers()
-     */
-    public HeadersConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @see HttpSecurity#headers()
+	 */
+	public HeadersConfigurer() {
+	}
 
-    /**
-     * Adds a {@link HeaderWriter} instance
-     *
-     * @param headerWriter
-     *            the {@link HeaderWriter} instance to add
-     * @return the {@link HeadersConfigurer} for additional customizations
-     */
-    public HeadersConfigurer<H> addHeaderWriter(HeaderWriter headerWriter) {
-        Assert.notNull(headerWriter, "headerWriter cannot be null");
-        this.headerWriters.add(headerWriter);
-        return this;
-    }
+	/**
+	 * Adds a {@link HeaderWriter} instance
+	 *
+	 * @param headerWriter the {@link HeaderWriter} instance to add
+	 * @return the {@link HeadersConfigurer} for additional customizations
+	 */
+	public HeadersConfigurer<H> addHeaderWriter(HeaderWriter headerWriter) {
+		Assert.notNull(headerWriter, "headerWriter cannot be null");
+		this.headerWriters.add(headerWriter);
+		return this;
+	}
 
-    /**
-     * Configures the {@link XContentTypeOptionsHeaderWriter} which inserts the <a href=
-     * "http://msdn.microsoft.com/en-us/library/ie/gg622941(v=vs.85).aspx"
-     * >X-Content-Type-Options</a>:
-     *
-     * <pre>
-     * X-Content-Type-Options: nosniff
-     * </pre>
-     *
-     * @return the ContentTypeOptionsConfig for additional customizations
-     */
-    public ContentTypeOptionsConfig contentTypeOptions() {
-        return contentTypeOptions.enable();
-    }
+	/**
+	 * Configures the {@link XContentTypeOptionsHeaderWriter} which inserts the <a href=
+	 * "http://msdn.microsoft.com/en-us/library/ie/gg622941(v=vs.85).aspx"
+	 * >X-Content-Type-Options</a>:
+	 *
+	 * <pre>
+	 * X-Content-Type-Options: nosniff
+	 * </pre>
+	 *
+	 * @return the ContentTypeOptionsConfig for additional customizations
+	 */
+	public ContentTypeOptionsConfig contentTypeOptions() {
+		return contentTypeOptions.enable();
+	}
 
-    public final class ContentTypeOptionsConfig {
-        private XContentTypeOptionsHeaderWriter writer;
+	public final class ContentTypeOptionsConfig {
+		private XContentTypeOptionsHeaderWriter writer;
 
-        private ContentTypeOptionsConfig() {
-            enable();
-        }
+		private ContentTypeOptionsConfig() {
+			enable();
+		}
 
-        /**
-         * Removes the X-XSS-Protection header.
-         *
-         * @return {@link HeadersConfigurer} for additional customization.
-         */
-        public HeadersConfigurer<H> disable() {
-            writer = null;
-            return and();
-        }
+		/**
+		 * Removes the X-XSS-Protection header.
+		 *
+		 * @return {@link HeadersConfigurer} for additional customization.
+		 */
+		public HeadersConfigurer<H> disable() {
+			writer = null;
+			return and();
+		}
 
-        /**
-         * Allows customizing the {@link HeadersConfigurer}
-         * @return the {@link HeadersConfigurer} for additional customization
-         */
-        public HeadersConfigurer<H> and() {
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Allows customizing the {@link HeadersConfigurer}
+		 * @return the {@link HeadersConfigurer} for additional customization
+		 */
+		public HeadersConfigurer<H> and() {
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Ensures that Content Type Options is enabled
-         *
-         * @return the {@link ContentTypeOptionsConfig} for additional customization
-         */
-        private ContentTypeOptionsConfig enable() {
-            if(writer == null) {
-                writer = new XContentTypeOptionsHeaderWriter();
-            }
-            return this;
-        }
-    }
+		/**
+		 * Ensures that Content Type Options is enabled
+		 *
+		 * @return the {@link ContentTypeOptionsConfig} for additional customization
+		 */
+		private ContentTypeOptionsConfig enable() {
+			if (writer == null) {
+				writer = new XContentTypeOptionsHeaderWriter();
+			}
+			return this;
+		}
+	}
 
-    /**
-     * <strong>Note this is not comprehensive XSS protection!</strong>
-     *
-     * <p>Allows customizing the {@link XXssProtectionHeaderWriter} which adds the <a href=
-     * "http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx"
-     * >X-XSS-Protection header</a></p>
-     *
-     * @return the {@link HeadersConfigurer} for additional customizations
-     */
-    public XXssConfig xssProtection() {
-        return xssProtection.enable();
-    }
+	/**
+	 * <strong>Note this is not comprehensive XSS protection!</strong>
+	 *
+	 * <p>
+	 * Allows customizing the {@link XXssProtectionHeaderWriter} which adds the <a href=
+	 * "http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx"
+	 * >X-XSS-Protection header</a>
+	 * </p>
+	 *
+	 * @return the {@link HeadersConfigurer} for additional customizations
+	 */
+	public XXssConfig xssProtection() {
+		return xssProtection.enable();
+	}
 
-    public final class XXssConfig {
-        private XXssProtectionHeaderWriter writer;
+	public final class XXssConfig {
+		private XXssProtectionHeaderWriter writer;
 
-        private XXssConfig() {
-            enable();
-        }
+		private XXssConfig() {
+			enable();
+		}
 
-        /**
-         * If false, will not specify the mode as blocked. In this instance, any
-         * content will be attempted to be fixed. If true, the content will be
-         * replaced with "#".
-         *
-         * @param enabled
-         *            the new value
-         */
-        public XXssConfig block(boolean enabled) {
-            writer.setBlock(enabled);
-            return this;
-        }
+		/**
+		 * If false, will not specify the mode as blocked. In this instance, any content
+		 * will be attempted to be fixed. If true, the content will be replaced with "#".
+		 *
+		 * @param enabled the new value
+		 */
+		public XXssConfig block(boolean enabled) {
+			writer.setBlock(enabled);
+			return this;
+		}
 
-        /**
-         * If true, the header value will contain a value of 1. For example:
-         *
-         * <pre>
-         * X-XSS-Protection: 1
-         * </pre>
-         *
-         * or if {@link #setBlock(boolean)} is true
-         *
-         *
-         * <pre>
-         * X-XSS-Protection: 1; mode=block
-         * </pre>
-         *
-         * If false, will explicitly disable specify that X-XSS-Protection is
-         * disabled. For example:
-         *
-         * <pre>
-         * X-XSS-Protection: 0
-         * </pre>
-         *
-         * @param enabled the new value
-         */
-        public XXssConfig xssProtectionEnabled(boolean enabled) {
-            writer.setEnabled(enabled);
-            return this;
-        }
+		/**
+		 * If true, the header value will contain a value of 1. For example:
+		 *
+		 * <pre>
+		 * X-XSS-Protection: 1
+		 * </pre>
+		 *
+		 * or if {@link #setBlock(boolean)} is true
+		 *
+		 *
+		 * <pre>
+		 * X-XSS-Protection: 1; mode=block
+		 * </pre>
+		 *
+		 * If false, will explicitly disable specify that X-XSS-Protection is disabled.
+		 * For example:
+		 *
+		 * <pre>
+		 * X-XSS-Protection: 0
+		 * </pre>
+		 *
+		 * @param enabled the new value
+		 */
+		public XXssConfig xssProtectionEnabled(boolean enabled) {
+			writer.setEnabled(enabled);
+			return this;
+		}
 
-        /**
-         * Disables X-XSS-Protection header (does not include it)
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> disable() {
-            writer = null;
-            return and();
-        }
+		/**
+		 * Disables X-XSS-Protection header (does not include it)
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> disable() {
+			writer = null;
+			return and();
+		}
 
-        /**
-         * Allows completing configuration of Strict Transport Security and
-         * continuing configuration of headers.
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> and() {
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Allows completing configuration of Strict Transport Security and continuing
+		 * configuration of headers.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> and() {
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Ensures the X-XSS-Protection header is enabled if it is not already.
-         *
-         * @return the {@link XXssConfig} for additional customization
-         */
-        private XXssConfig enable() {
-            if(writer == null) {
-                writer  = new XXssProtectionHeaderWriter();
-            }
-            return this;
-        }
-    }
+		/**
+		 * Ensures the X-XSS-Protection header is enabled if it is not already.
+		 *
+		 * @return the {@link XXssConfig} for additional customization
+		 */
+		private XXssConfig enable() {
+			if (writer == null) {
+				writer = new XXssProtectionHeaderWriter();
+			}
+			return this;
+		}
+	}
 
-    /**
-     * Allows customizing the {@link CacheControlHeadersWriter}. Specifically it adds the
-     * following headers:
-     * <ul>
-     * <li>Cache-Control: no-cache, no-store, max-age=0, must-revalidate</li>
-     * <li>Pragma: no-cache</li>
-     * <li>Expires: 0</li>
-     * </ul>
-     *
-     * @return the {@link HeadersConfigurer} for additional customizations
-     */
-    public CacheControlConfig cacheControl() {
-        return cacheControl.enable();
-    }
+	/**
+	 * Allows customizing the {@link CacheControlHeadersWriter}. Specifically it adds the
+	 * following headers:
+	 * <ul>
+	 * <li>Cache-Control: no-cache, no-store, max-age=0, must-revalidate</li>
+	 * <li>Pragma: no-cache</li>
+	 * <li>Expires: 0</li>
+	 * </ul>
+	 *
+	 * @return the {@link HeadersConfigurer} for additional customizations
+	 */
+	public CacheControlConfig cacheControl() {
+		return cacheControl.enable();
+	}
 
-    public final class CacheControlConfig {
-        private CacheControlHeadersWriter writer;
+	public final class CacheControlConfig {
+		private CacheControlHeadersWriter writer;
 
-        private CacheControlConfig() {
-            enable();
-        }
+		private CacheControlConfig() {
+			enable();
+		}
 
-        /**
-         * Disables Cache Control
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> disable() {
-            writer = null;
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Disables Cache Control
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> disable() {
+			writer = null;
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Allows completing configuration of Strict Transport Security and
-         * continuing configuration of headers.
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> and() {
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Allows completing configuration of Strict Transport Security and continuing
+		 * configuration of headers.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> and() {
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Ensures the Cache Control headers are enabled if they are not already.
-         *
-         * @return the {@link CacheControlConfig} for additional customization
-         */
-        private CacheControlConfig enable() {
-            if(writer == null) {
-                writer = new CacheControlHeadersWriter();
-            }
-            return this;
-        }
-    }
+		/**
+		 * Ensures the Cache Control headers are enabled if they are not already.
+		 *
+		 * @return the {@link CacheControlConfig} for additional customization
+		 */
+		private CacheControlConfig enable() {
+			if (writer == null) {
+				writer = new CacheControlHeadersWriter();
+			}
+			return this;
+		}
+	}
 
-    /**
-     * Allows customizing the {@link HstsHeaderWriter} which provides support for <a
-     * href="http://tools.ietf.org/html/rfc6797">HTTP Strict Transport Security
-     * (HSTS)</a>.
-     *
-     * @return the {@link HeadersConfigurer} for additional customizations
-     */
-    public HstsConfig httpStrictTransportSecurity() {
-        return hsts.enable();
-    }
+	/**
+	 * Allows customizing the {@link HstsHeaderWriter} which provides support for <a
+	 * href="http://tools.ietf.org/html/rfc6797">HTTP Strict Transport Security
+	 * (HSTS)</a>.
+	 *
+	 * @return the {@link HeadersConfigurer} for additional customizations
+	 */
+	public HstsConfig httpStrictTransportSecurity() {
+		return hsts.enable();
+	}
 
-    public final class HstsConfig {
-        private HstsHeaderWriter writer;
+	public final class HstsConfig {
+		private HstsHeaderWriter writer;
 
-        private HstsConfig() {
-            enable();
-        }
+		private HstsConfig() {
+			enable();
+		}
 
-        /**
-         * <p>
-         * Sets the value (in seconds) for the max-age directive of the
-         * Strict-Transport-Security header. The default is one year.
-         * </p>
-         *
-         * <p>
-         * This instructs browsers how long to remember to keep this domain as a
-         * known HSTS Host. See <a
-         * href="http://tools.ietf.org/html/rfc6797#section-6.1.1">Section 6.1.1</a>
-         * for additional details.
-         * </p>
-         *
-         * @param maxAgeInSeconds
-         *            the maximum amount of time (in seconds) to consider this
-         *            domain as a known HSTS Host.
-         * @throws IllegalArgumentException
-         *             if maxAgeInSeconds is negative
-         */
-        public HstsConfig maxAgeInSeconds(long maxAgeInSeconds) {
-            writer.setMaxAgeInSeconds(maxAgeInSeconds);
-            return this;
-        }
+		/**
+		 * <p>
+		 * Sets the value (in seconds) for the max-age directive of the
+		 * Strict-Transport-Security header. The default is one year.
+		 * </p>
+		 *
+		 * <p>
+		 * This instructs browsers how long to remember to keep this domain as a known
+		 * HSTS Host. See <a
+		 * href="http://tools.ietf.org/html/rfc6797#section-6.1.1">Section 6.1.1</a> for
+		 * additional details.
+		 * </p>
+		 *
+		 * @param maxAgeInSeconds the maximum amount of time (in seconds) to consider this
+		 * domain as a known HSTS Host.
+		 * @throws IllegalArgumentException if maxAgeInSeconds is negative
+		 */
+		public HstsConfig maxAgeInSeconds(long maxAgeInSeconds) {
+			writer.setMaxAgeInSeconds(maxAgeInSeconds);
+			return this;
+		}
 
-        /**
-         * Sets the {@link RequestMatcher} used to determine if the
-         * "Strict-Transport-Security" should be added. If true the header is added,
-         * else the header is not added. By default the header is added when
-         * {@link HttpServletRequest#isSecure()} returns true.
-         *
-         * @param requestMatcher
-         *            the {@link RequestMatcher} to use.
-         * @throws IllegalArgumentException
-         *             if {@link RequestMatcher} is null
-         */
-        public HstsConfig requestMatcher(RequestMatcher requestMatcher) {
-            writer.setRequestMatcher(requestMatcher);
-            return this;
-        }
+		/**
+		 * Sets the {@link RequestMatcher} used to determine if the
+		 * "Strict-Transport-Security" should be added. If true the header is added, else
+		 * the header is not added. By default the header is added when
+		 * {@link HttpServletRequest#isSecure()} returns true.
+		 *
+		 * @param requestMatcher the {@link RequestMatcher} to use.
+		 * @throws IllegalArgumentException if {@link RequestMatcher} is null
+		 */
+		public HstsConfig requestMatcher(RequestMatcher requestMatcher) {
+			writer.setRequestMatcher(requestMatcher);
+			return this;
+		}
 
-        /**
-         * <p>
-         * If true, subdomains should be considered HSTS Hosts too. The default is
-         * true.
-         * </p>
-         *
-         * <p>
-         * See <a href="http://tools.ietf.org/html/rfc6797#section-6.1.2">Section
-         * 6.1.2</a> for additional details.
-         * </p>
-         *
-         * @param includeSubDomains
-         *            true to include subdomains, else false
-         */
-        public HstsConfig includeSubDomains(boolean includeSubDomains) {
-            writer.setIncludeSubDomains(includeSubDomains);
-            return this;
-        }
+		/**
+		 * <p>
+		 * If true, subdomains should be considered HSTS Hosts too. The default is true.
+		 * </p>
+		 *
+		 * <p>
+		 * See <a href="http://tools.ietf.org/html/rfc6797#section-6.1.2">Section
+		 * 6.1.2</a> for additional details.
+		 * </p>
+		 *
+		 * @param includeSubDomains true to include subdomains, else false
+		 */
+		public HstsConfig includeSubDomains(boolean includeSubDomains) {
+			writer.setIncludeSubDomains(includeSubDomains);
+			return this;
+		}
 
-        /**
-         * Disables Strict Transport Security
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> disable() {
-            writer = null;
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Disables Strict Transport Security
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> disable() {
+			writer = null;
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Allows completing configuration of Strict Transport Security and
-         * continuing configuration of headers.
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> and() {
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Allows completing configuration of Strict Transport Security and continuing
+		 * configuration of headers.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> and() {
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Ensures that Strict-Transport-Security is enabled if it is not already
-         *
-         * @return the {@link HstsConfig} for additional customization
-         */
-        private HstsConfig enable() {
-            if(writer == null) {
-                writer = new HstsHeaderWriter();
-            }
-            return this;
-        }
-    }
+		/**
+		 * Ensures that Strict-Transport-Security is enabled if it is not already
+		 *
+		 * @return the {@link HstsConfig} for additional customization
+		 */
+		private HstsConfig enable() {
+			if (writer == null) {
+				writer = new HstsHeaderWriter();
+			}
+			return this;
+		}
+	}
 
-    /**
-     * Allows customizing the {@link XFrameOptionsHeaderWriter}.
-     *
-     * @return the {@link HeadersConfigurer} for additional customizations
-     */
-    public FrameOptionsConfig frameOptions() {
-        return frameOptions.enable();
-    }
+	/**
+	 * Allows customizing the {@link XFrameOptionsHeaderWriter}.
+	 *
+	 * @return the {@link HeadersConfigurer} for additional customizations
+	 */
+	public FrameOptionsConfig frameOptions() {
+		return frameOptions.enable();
+	}
 
-    public final class FrameOptionsConfig {
-        private XFrameOptionsHeaderWriter writer;
+	public final class FrameOptionsConfig {
+		private XFrameOptionsHeaderWriter writer;
 
-        private FrameOptionsConfig() {
-            enable();
-        }
+		private FrameOptionsConfig() {
+			enable();
+		}
 
-        /**
-         * Specify to DENY framing any content from this application.
-         *
-         * @return the {@link HeadersConfigurer} for additional customization.
-         */
-        public HeadersConfigurer<H> deny() {
-            writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
-            return and();
-        }
+		/**
+		 * Specify to DENY framing any content from this application.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional customization.
+		 */
+		public HeadersConfigurer<H> deny() {
+			writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
+			return and();
+		}
 
-        /**
-         * <p>
-         * Specify to allow any request that comes from the same origin to frame
-         * this application. For example, if the application was hosted on
-         * example.com, then example.com could frame the application, but
-         * evil.com could not frame the application.
-         * </p>
-         *
-         * @return
-         */
-        public HeadersConfigurer<H> sameOrigin() {
-            writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN);
-            return and();
-        }
+		/**
+		 * <p>
+		 * Specify to allow any request that comes from the same origin to frame this
+		 * application. For example, if the application was hosted on example.com, then
+		 * example.com could frame the application, but evil.com could not frame the
+		 * application.
+		 * </p>
+		 *
+		 * @return
+		 */
+		public HeadersConfigurer<H> sameOrigin() {
+			writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN);
+			return and();
+		}
 
-        /**
-         * Prevents the header from being added to the response.
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration.
-         */
-        public HeadersConfigurer<H> disable() {
-            writer = null;
-            return and();
-        }
+		/**
+		 * Prevents the header from being added to the response.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration.
+		 */
+		public HeadersConfigurer<H> disable() {
+			writer = null;
+			return and();
+		}
 
-        /**
-         * Allows continuing customizing the headers configuration.
-         *
-         * @return the {@link HeadersConfigurer} for additional configuration
-         */
-        public HeadersConfigurer<H> and() {
-            return HeadersConfigurer.this;
-        }
+		/**
+		 * Allows continuing customizing the headers configuration.
+		 *
+		 * @return the {@link HeadersConfigurer} for additional configuration
+		 */
+		public HeadersConfigurer<H> and() {
+			return HeadersConfigurer.this;
+		}
 
-        /**
-         * Enables FrameOptionsConfig if it is not already enabled.
-         *
-         * @return the FrameOptionsConfig for additional customization.
-         */
-        private FrameOptionsConfig enable() {
-            if(writer == null) {
-                writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
-            }
-            return this;
-        }
-    }
+		/**
+		 * Enables FrameOptionsConfig if it is not already enabled.
+		 *
+		 * @return the FrameOptionsConfig for additional customization.
+		 */
+		private FrameOptionsConfig enable() {
+			if (writer == null) {
+				writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
+			}
+			return this;
+		}
+	}
 
-    /**
-     * Clears all of the default headers from the response. After doing so, one can add headers back. For example, if you only want to use Spring Security's cache control you can use the following:
-     *
-     * <pre>
-     * http
-     *    .headers()
-     *       .defaultsDisabled()
-     *       .cacheControl();
-     * </pre>
-     *
-     * @return the {@link HeadersConfigurer} for additional customization
-     */
-    public HeadersConfigurer<H> defaultsDisabled() {
-        contentTypeOptions.disable();
-        xssProtection.disable();
-        cacheControl.disable();
-        hsts.disable();
-        frameOptions.disable();
-        return this;
-    }
+	/**
+	 * Clears all of the default headers from the response. After doing so, one can add
+	 * headers back. For example, if you only want to use Spring Security's cache control
+	 * you can use the following:
+	 *
+	 * <pre>
+	 * http.headers().defaultsDisabled().cacheControl();
+	 * </pre>
+	 *
+	 * @return the {@link HeadersConfigurer} for additional customization
+	 */
+	public HeadersConfigurer<H> defaultsDisabled() {
+		contentTypeOptions.disable();
+		xssProtection.disable();
+		cacheControl.disable();
+		hsts.disable();
+		frameOptions.disable();
+		return this;
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        HeaderWriterFilter headersFilter = createHeaderWriterFilter();
-        http.addFilter(headersFilter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		HeaderWriterFilter headersFilter = createHeaderWriterFilter();
+		http.addFilter(headersFilter);
+	}
 
-    /**
-     * Creates the {@link HeaderWriter}
-     *
-     * @return the {@link HeaderWriter}
-     */
-    private HeaderWriterFilter createHeaderWriterFilter() {
-        List<HeaderWriter> writers = getHeaderWriters();
-        if(writers.isEmpty()) {
-            throw new IllegalStateException("Headers security is enabled, but no headers will be added. Either add headers or disable headers security");
-        }
-        HeaderWriterFilter headersFilter = new HeaderWriterFilter(
-                writers);
-        headersFilter = postProcess(headersFilter);
-        return headersFilter;
-    }
+	/**
+	 * Creates the {@link HeaderWriter}
+	 *
+	 * @return the {@link HeaderWriter}
+	 */
+	private HeaderWriterFilter createHeaderWriterFilter() {
+		List<HeaderWriter> writers = getHeaderWriters();
+		if (writers.isEmpty()) {
+			throw new IllegalStateException(
+					"Headers security is enabled, but no headers will be added. Either add headers or disable headers security");
+		}
+		HeaderWriterFilter headersFilter = new HeaderWriterFilter(writers);
+		headersFilter = postProcess(headersFilter);
+		return headersFilter;
+	}
 
-    /**
-     * Gets the {@link HeaderWriter} instances and possibly initializes with the
-     * defaults.
-     *
-     * @return
-     */
-    private List<HeaderWriter> getHeaderWriters() {
-        List<HeaderWriter> writers = new ArrayList<HeaderWriter>();
-        addIfNotNull(writers, contentTypeOptions.writer);
-        addIfNotNull(writers, xssProtection.writer);
-        addIfNotNull(writers, cacheControl.writer);
-        addIfNotNull(writers, hsts.writer);
-        addIfNotNull(writers, frameOptions.writer);
-        writers.addAll(headerWriters);
-        return writers;
-    }
+	/**
+	 * Gets the {@link HeaderWriter} instances and possibly initializes with the defaults.
+	 *
+	 * @return
+	 */
+	private List<HeaderWriter> getHeaderWriters() {
+		List<HeaderWriter> writers = new ArrayList<HeaderWriter>();
+		addIfNotNull(writers, contentTypeOptions.writer);
+		addIfNotNull(writers, xssProtection.writer);
+		addIfNotNull(writers, cacheControl.writer);
+		addIfNotNull(writers, hsts.writer);
+		addIfNotNull(writers, frameOptions.writer);
+		writers.addAll(headerWriters);
+		return writers;
+	}
 
-    private <T> void addIfNotNull(List<T> values, T value) {
-        if(value != null) {
-            values.add(value);
-        }
-    }
+	private <T> void addIfNotNull(List<T> values, T value) {
+		if (value != null) {
+			values.add(value);
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
index 0ec279344f..fb759e9215 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
@@ -39,8 +39,8 @@ import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 
 /**
- * Adds HTTP basic based authentication. All attributes have reasonable defaults
- * making all parameters are optional.
+ * Adds HTTP basic based authentication. All attributes have reasonable defaults making
+ * all parameters are optional.
  *
  * <h2>Security Filters</h2>
  *
@@ -70,101 +70,114 @@ import org.springframework.web.accept.HeaderContentNegotiationStrategy;
  * @author Rob Winch
  * @since 3.2
  */
-public final class HttpBasicConfigurer<B extends HttpSecurityBuilder<B>> extends AbstractHttpConfigurer<HttpBasicConfigurer<B>,B> {
-    private static final String DEFAULT_REALM = "Realm";
+public final class HttpBasicConfigurer<B extends HttpSecurityBuilder<B>> extends
+		AbstractHttpConfigurer<HttpBasicConfigurer<B>, B> {
+	private static final String DEFAULT_REALM = "Realm";
 
-    private AuthenticationEntryPoint authenticationEntryPoint;
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource;
-    private BasicAuthenticationEntryPoint basicAuthEntryPoint = new BasicAuthenticationEntryPoint();
+	private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource;
+	private BasicAuthenticationEntryPoint basicAuthEntryPoint = new BasicAuthenticationEntryPoint();
 
-    /**
-     * Creates a new instance
-     * @throws Exception
-     * @see {@link HttpSecurity#httpBasic()}
-     */
-    public HttpBasicConfigurer() throws Exception {
-        realmName(DEFAULT_REALM);
+	/**
+	 * Creates a new instance
+	 * @throws Exception
+	 * @see {@link HttpSecurity#httpBasic()}
+	 */
+	public HttpBasicConfigurer() throws Exception {
+		realmName(DEFAULT_REALM);
 
-        LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
-        entryPoints.put(new RequestHeaderRequestMatcher("X-Requested-With","XMLHttpRequest"), new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED));
+		LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
+		entryPoints.put(new RequestHeaderRequestMatcher("X-Requested-With",
+				"XMLHttpRequest"), new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED));
 
-        DelegatingAuthenticationEntryPoint defaultEntryPoint = new DelegatingAuthenticationEntryPoint(entryPoints);
-        defaultEntryPoint.setDefaultEntryPoint(basicAuthEntryPoint);
-        authenticationEntryPoint =  defaultEntryPoint;
-    }
+		DelegatingAuthenticationEntryPoint defaultEntryPoint = new DelegatingAuthenticationEntryPoint(
+				entryPoints);
+		defaultEntryPoint.setDefaultEntryPoint(basicAuthEntryPoint);
+		authenticationEntryPoint = defaultEntryPoint;
+	}
 
-    /**
-     * Allows easily changing the realm, but leaving the remaining defaults in
-     * place. If {@link #authenticationEntryPoint(AuthenticationEntryPoint)} has
-     * been invoked, invoking this method will result in an error.
-     *
-     * @param realmName
-     *            the HTTP Basic realm to use
-     * @return {@link HttpBasicConfigurer} for additional customization
-     * @throws Exception
-     */
-    public HttpBasicConfigurer<B> realmName(String realmName) throws Exception {
-        basicAuthEntryPoint.setRealmName(realmName);
-        basicAuthEntryPoint.afterPropertiesSet();
-        return this;
-    }
+	/**
+	 * Allows easily changing the realm, but leaving the remaining defaults in place. If
+	 * {@link #authenticationEntryPoint(AuthenticationEntryPoint)} has been invoked,
+	 * invoking this method will result in an error.
+	 *
+	 * @param realmName the HTTP Basic realm to use
+	 * @return {@link HttpBasicConfigurer} for additional customization
+	 * @throws Exception
+	 */
+	public HttpBasicConfigurer<B> realmName(String realmName) throws Exception {
+		basicAuthEntryPoint.setRealmName(realmName);
+		basicAuthEntryPoint.afterPropertiesSet();
+		return this;
+	}
 
-    /**
-     * The {@link AuthenticationEntryPoint} to be populated on
-     * {@link BasicAuthenticationFilter} in the event that authentication fails.
-     * The default to use {@link BasicAuthenticationEntryPoint} with the realm
-     * "Spring Security Application".
-     *
-     * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use
-     * @return {@link HttpBasicConfigurer} for additional customization
-     */
-    public HttpBasicConfigurer<B> authenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) {
-        this.authenticationEntryPoint = authenticationEntryPoint;
-        return this;
-    }
+	/**
+	 * The {@link AuthenticationEntryPoint} to be populated on
+	 * {@link BasicAuthenticationFilter} in the event that authentication fails. The
+	 * default to use {@link BasicAuthenticationEntryPoint} with the realm
+	 * "Spring Security Application".
+	 *
+	 * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use
+	 * @return {@link HttpBasicConfigurer} for additional customization
+	 */
+	public HttpBasicConfigurer<B> authenticationEntryPoint(
+			AuthenticationEntryPoint authenticationEntryPoint) {
+		this.authenticationEntryPoint = authenticationEntryPoint;
+		return this;
+	}
 
-    /**
-     * Specifies a custom {@link AuthenticationDetailsSource} to use for basic
-     * authentication. The default is {@link WebAuthenticationDetailsSource}.
-     *
-     * @param authenticationDetailsSource
-     *            the custom {@link AuthenticationDetailsSource} to use
-     * @return {@link HttpBasicConfigurer} for additional customization
-     */
-    public HttpBasicConfigurer<B> authenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
-        this.authenticationDetailsSource = authenticationDetailsSource;
-        return this;
-    }
+	/**
+	 * Specifies a custom {@link AuthenticationDetailsSource} to use for basic
+	 * authentication. The default is {@link WebAuthenticationDetailsSource}.
+	 *
+	 * @param authenticationDetailsSource the custom {@link AuthenticationDetailsSource}
+	 * to use
+	 * @return {@link HttpBasicConfigurer} for additional customization
+	 */
+	public HttpBasicConfigurer<B> authenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		this.authenticationDetailsSource = authenticationDetailsSource;
+		return this;
+	}
 
-    public void init(B http) throws Exception {
-        registerDefaultAuthenticationEntryPoint(http);
-    }
+	public void init(B http) throws Exception {
+		registerDefaultAuthenticationEntryPoint(http);
+	}
 
-    @SuppressWarnings("unchecked")
-    private void registerDefaultAuthenticationEntryPoint(B http) {
-        ExceptionHandlingConfigurer<B> exceptionHandling = http.getConfigurer(ExceptionHandlingConfigurer.class);
-        if(exceptionHandling == null) {
-            return;
-        }
-        ContentNegotiationStrategy contentNegotiationStrategy = http.getSharedObject(ContentNegotiationStrategy.class);
-        if(contentNegotiationStrategy == null) {
-            contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
-        }
-        MediaTypeRequestMatcher preferredMatcher = new MediaTypeRequestMatcher(contentNegotiationStrategy, MediaType.APPLICATION_ATOM_XML, MediaType.APPLICATION_FORM_URLENCODED,  MediaType.APPLICATION_JSON, MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_XML, MediaType.MULTIPART_FORM_DATA, MediaType.TEXT_XML);
-        preferredMatcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
-        exceptionHandling.defaultAuthenticationEntryPointFor(postProcess(authenticationEntryPoint), preferredMatcher);
+	@SuppressWarnings("unchecked")
+	private void registerDefaultAuthenticationEntryPoint(B http) {
+		ExceptionHandlingConfigurer<B> exceptionHandling = http
+				.getConfigurer(ExceptionHandlingConfigurer.class);
+		if (exceptionHandling == null) {
+			return;
+		}
+		ContentNegotiationStrategy contentNegotiationStrategy = http
+				.getSharedObject(ContentNegotiationStrategy.class);
+		if (contentNegotiationStrategy == null) {
+			contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
+		}
+		MediaTypeRequestMatcher preferredMatcher = new MediaTypeRequestMatcher(
+				contentNegotiationStrategy, MediaType.APPLICATION_ATOM_XML,
+				MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON,
+				MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_XML,
+				MediaType.MULTIPART_FORM_DATA, MediaType.TEXT_XML);
+		preferredMatcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+		exceptionHandling.defaultAuthenticationEntryPointFor(
+				postProcess(authenticationEntryPoint), preferredMatcher);
 
+	}
 
-    }
-
-    @Override
-    public void configure(B http) throws Exception {
-        AuthenticationManager authenticationManager = http.getSharedObject(AuthenticationManager.class);
-        BasicAuthenticationFilter basicAuthenticationFilter = new BasicAuthenticationFilter(authenticationManager, authenticationEntryPoint);
-        if(authenticationDetailsSource != null) {
-            basicAuthenticationFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
-        }
-        basicAuthenticationFilter = postProcess(basicAuthenticationFilter);
-        http.addFilter(basicAuthenticationFilter);
-    }
+	@Override
+	public void configure(B http) throws Exception {
+		AuthenticationManager authenticationManager = http
+				.getSharedObject(AuthenticationManager.class);
+		BasicAuthenticationFilter basicAuthenticationFilter = new BasicAuthenticationFilter(
+				authenticationManager, authenticationEntryPoint);
+		if (authenticationDetailsSource != null) {
+			basicAuthenticationFilter
+					.setAuthenticationDetailsSource(authenticationDetailsSource);
+		}
+		basicAuthenticationFilter = postProcess(basicAuthenticationFilter);
+		http.addFilter(basicAuthenticationFilter);
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
index 6434f1502f..09a2a3ccf6 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
@@ -50,8 +50,8 @@ import org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthe
  *
  * <ul>
  * <li>
- * {@link AuthenticationEntryPoint}
- * is populated with an {@link Http403ForbiddenEntryPoint}</li>
+ * {@link AuthenticationEntryPoint} is populated with an
+ * {@link Http403ForbiddenEntryPoint}</li>
  * <li>A {@link PreAuthenticatedAuthenticationProvider} is populated into
  * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
  * </li>
@@ -68,193 +68,195 @@ import org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthe
  * @author Rob Winch
  * @since 3.2
  */
-public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<JeeConfigurer<H>,H> {
-    private J2eePreAuthenticatedProcessingFilter j2eePreAuthenticatedProcessingFilter;
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService;
-    private Set<String> mappableRoles = new HashSet<String>();
+public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<JeeConfigurer<H>, H> {
+	private J2eePreAuthenticatedProcessingFilter j2eePreAuthenticatedProcessingFilter;
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService;
+	private Set<String> mappableRoles = new HashSet<String>();
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#jee()
-     */
-    public JeeConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#jee()
+	 */
+	public JeeConfigurer() {
+	}
 
-    /**
-     * Specifies roles to use map from the {@link HttpServletRequest} to the
-     * {@link UserDetails}. If {@link HttpServletRequest#isUserInRole(String)}
-     * returns true, the role is added to the {@link UserDetails}. This method
-     * is the equivalent of invoking {@link #mappableAuthorities(Set)}. Multiple
-     * invocations of {@link #mappableAuthorities(String...)} will override previous
-     * invocations.
-     *
-     * <p>
-     * There are no default roles that are mapped.
-     * </p>
-     *
-     * @param mappableRoles
-     *            the roles to attempt to map to the {@link UserDetails} (i.e.
-     *            "ROLE_USER", "ROLE_ADMIN", etc).
-     * @return the {@link JeeConfigurer} for further customizations
-     * @see SimpleMappableAttributesRetriever
-     * @see #mappableRoles(String...)
-     */
-    public JeeConfigurer<H> mappableAuthorities(String... mappableRoles) {
-        this.mappableRoles.clear();
-        for(String role : mappableRoles) {
-            this.mappableRoles.add(role);
-        }
-        return this;
-    }
+	/**
+	 * Specifies roles to use map from the {@link HttpServletRequest} to the
+	 * {@link UserDetails}. If {@link HttpServletRequest#isUserInRole(String)} returns
+	 * true, the role is added to the {@link UserDetails}. This method is the equivalent
+	 * of invoking {@link #mappableAuthorities(Set)}. Multiple invocations of
+	 * {@link #mappableAuthorities(String...)} will override previous invocations.
+	 *
+	 * <p>
+	 * There are no default roles that are mapped.
+	 * </p>
+	 *
+	 * @param mappableRoles the roles to attempt to map to the {@link UserDetails} (i.e.
+	 * "ROLE_USER", "ROLE_ADMIN", etc).
+	 * @return the {@link JeeConfigurer} for further customizations
+	 * @see SimpleMappableAttributesRetriever
+	 * @see #mappableRoles(String...)
+	 */
+	public JeeConfigurer<H> mappableAuthorities(String... mappableRoles) {
+		this.mappableRoles.clear();
+		for (String role : mappableRoles) {
+			this.mappableRoles.add(role);
+		}
+		return this;
+	}
 
-    /**
-     * Specifies roles to use map from the {@link HttpServletRequest} to the
-     * {@link UserDetails} and automatically prefixes it with "ROLE_". If
-     * {@link HttpServletRequest#isUserInRole(String)} returns true, the role is
-     * added to the {@link UserDetails}. This method is the equivalent of
-     * invoking {@link #mappableAuthorities(Set)}. Multiple invocations of
-     * {@link #mappableRoles(String...)} will override previous invocations.
-     *
-     * <p>
-     * There are no default roles that are mapped.
-     * </p>
-     *
-     * @param mappableRoles
-     *            the roles to attempt to map to the {@link UserDetails} (i.e.
-     *            "USER", "ADMIN", etc).
-     * @return the {@link JeeConfigurer} for further customizations
-     * @see SimpleMappableAttributesRetriever
-     * @see #mappableAuthorities(String...)
-     */
-    public JeeConfigurer<H> mappableRoles(String... mappableRoles) {
-        this.mappableRoles.clear();
-        for(String role : mappableRoles) {
-            this.mappableRoles.add("ROLE_" + role);
-        }
-        return this;
-    }
+	/**
+	 * Specifies roles to use map from the {@link HttpServletRequest} to the
+	 * {@link UserDetails} and automatically prefixes it with "ROLE_". If
+	 * {@link HttpServletRequest#isUserInRole(String)} returns true, the role is added to
+	 * the {@link UserDetails}. This method is the equivalent of invoking
+	 * {@link #mappableAuthorities(Set)}. Multiple invocations of
+	 * {@link #mappableRoles(String...)} will override previous invocations.
+	 *
+	 * <p>
+	 * There are no default roles that are mapped.
+	 * </p>
+	 *
+	 * @param mappableRoles the roles to attempt to map to the {@link UserDetails} (i.e.
+	 * "USER", "ADMIN", etc).
+	 * @return the {@link JeeConfigurer} for further customizations
+	 * @see SimpleMappableAttributesRetriever
+	 * @see #mappableAuthorities(String...)
+	 */
+	public JeeConfigurer<H> mappableRoles(String... mappableRoles) {
+		this.mappableRoles.clear();
+		for (String role : mappableRoles) {
+			this.mappableRoles.add("ROLE_" + role);
+		}
+		return this;
+	}
 
-    /**
-     * Specifies roles to use map from the {@link HttpServletRequest} to the
-     * {@link UserDetails}. If {@link HttpServletRequest#isUserInRole(String)}
-     * returns true, the role is added to the {@link UserDetails}. This is the
-     * equivalent of {@link #mappableRoles(String...)}. Multiple invocations of
-     * {@link #mappableAuthorities(Set)} will override previous invocations.
-     *
-     * <p>
-     * There are no default roles that are mapped.
-     * </p>
-     *
-     * @param mappableRoles
-     *            the roles to attempt to map to the {@link UserDetails}.
-     * @return the {@link JeeConfigurer} for further customizations
-     * @see SimpleMappableAttributesRetriever
-     */
-    public JeeConfigurer<H> mappableAuthorities(Set<String> mappableRoles) {
-        this.mappableRoles = mappableRoles;
-        return this;
-    }
+	/**
+	 * Specifies roles to use map from the {@link HttpServletRequest} to the
+	 * {@link UserDetails}. If {@link HttpServletRequest#isUserInRole(String)} returns
+	 * true, the role is added to the {@link UserDetails}. This is the equivalent of
+	 * {@link #mappableRoles(String...)}. Multiple invocations of
+	 * {@link #mappableAuthorities(Set)} will override previous invocations.
+	 *
+	 * <p>
+	 * There are no default roles that are mapped.
+	 * </p>
+	 *
+	 * @param mappableRoles the roles to attempt to map to the {@link UserDetails}.
+	 * @return the {@link JeeConfigurer} for further customizations
+	 * @see SimpleMappableAttributesRetriever
+	 */
+	public JeeConfigurer<H> mappableAuthorities(Set<String> mappableRoles) {
+		this.mappableRoles = mappableRoles;
+		return this;
+	}
 
-    /**
-     * Specifies the {@link AuthenticationUserDetailsService} that is used with
-     * the {@link PreAuthenticatedAuthenticationProvider}. The default is a
-     * {@link PreAuthenticatedGrantedAuthoritiesUserDetailsService}.
-     *
-     * @param authenticatedUserDetailsService the {@link AuthenticationUserDetailsService} to use.
-     * @return the {@link JeeConfigurer} for further configuration
-     */
-    public JeeConfigurer<H> authenticatedUserDetailsService(
-            AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticatedUserDetailsService) {
-        this.authenticationUserDetailsService = authenticatedUserDetailsService;
-        return this;
-    }
+	/**
+	 * Specifies the {@link AuthenticationUserDetailsService} that is used with the
+	 * {@link PreAuthenticatedAuthenticationProvider}. The default is a
+	 * {@link PreAuthenticatedGrantedAuthoritiesUserDetailsService}.
+	 *
+	 * @param authenticatedUserDetailsService the {@link AuthenticationUserDetailsService}
+	 * to use.
+	 * @return the {@link JeeConfigurer} for further configuration
+	 */
+	public JeeConfigurer<H> authenticatedUserDetailsService(
+			AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticatedUserDetailsService) {
+		this.authenticationUserDetailsService = authenticatedUserDetailsService;
+		return this;
+	}
 
-    /**
-     * Allows specifying the {@link J2eePreAuthenticatedProcessingFilter} to
-     * use. If {@link J2eePreAuthenticatedProcessingFilter} is provided, all of its attributes must also be
-     * configured manually (i.e. all attributes populated in the {@link JeeConfigurer} are not used).
-     *
-     * @param j2eePreAuthenticatedProcessingFilter the {@link J2eePreAuthenticatedProcessingFilter} to use.
-     * @return the {@link JeeConfigurer} for further configuration
-     */
-    public JeeConfigurer<H> j2eePreAuthenticatedProcessingFilter(
-            J2eePreAuthenticatedProcessingFilter j2eePreAuthenticatedProcessingFilter) {
-        this.j2eePreAuthenticatedProcessingFilter = j2eePreAuthenticatedProcessingFilter;
-        return this;
-    }
+	/**
+	 * Allows specifying the {@link J2eePreAuthenticatedProcessingFilter} to use. If
+	 * {@link J2eePreAuthenticatedProcessingFilter} is provided, all of its attributes
+	 * must also be configured manually (i.e. all attributes populated in the
+	 * {@link JeeConfigurer} are not used).
+	 *
+	 * @param j2eePreAuthenticatedProcessingFilter the
+	 * {@link J2eePreAuthenticatedProcessingFilter} to use.
+	 * @return the {@link JeeConfigurer} for further configuration
+	 */
+	public JeeConfigurer<H> j2eePreAuthenticatedProcessingFilter(
+			J2eePreAuthenticatedProcessingFilter j2eePreAuthenticatedProcessingFilter) {
+		this.j2eePreAuthenticatedProcessingFilter = j2eePreAuthenticatedProcessingFilter;
+		return this;
+	}
 
-    /**
-     * Populates a {@link PreAuthenticatedAuthenticationProvider} into
-     * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
-     * and a {@link Http403ForbiddenEntryPoint} into
-     * {@link HttpSecurity#authenticationEntryPoint(org.springframework.security.web.AuthenticationEntryPoint)}
-     *
-     * @see org.springframework.security.config.annotation.SecurityConfigurerAdapter#init(org.springframework.security.config.annotation.SecurityBuilder)
-     */
-    @Override
-    public void init(H http) throws Exception {
-        PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
-        authenticationProvider.setPreAuthenticatedUserDetailsService(getUserDetailsService());
-        authenticationProvider = postProcess(authenticationProvider);
+	/**
+	 * Populates a {@link PreAuthenticatedAuthenticationProvider} into
+	 * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
+	 * and a {@link Http403ForbiddenEntryPoint} into
+	 * {@link HttpSecurity#authenticationEntryPoint(org.springframework.security.web.AuthenticationEntryPoint)}
+	 *
+	 * @see org.springframework.security.config.annotation.SecurityConfigurerAdapter#init(org.springframework.security.config.annotation.SecurityBuilder)
+	 */
+	@Override
+	public void init(H http) throws Exception {
+		PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
+		authenticationProvider
+				.setPreAuthenticatedUserDetailsService(getUserDetailsService());
+		authenticationProvider = postProcess(authenticationProvider);
 
-        http
-            .authenticationProvider(authenticationProvider)
-            .setSharedObject(AuthenticationEntryPoint.class,new Http403ForbiddenEntryPoint());
-    }
+		// @formatter:off
+		http
+			.authenticationProvider(authenticationProvider)
+			.setSharedObject(AuthenticationEntryPoint.class,new Http403ForbiddenEntryPoint());
+		// @formatter:on
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        J2eePreAuthenticatedProcessingFilter filter = getFilter(http.getSharedObject(AuthenticationManager.class));
-        http.addFilter(filter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		J2eePreAuthenticatedProcessingFilter filter = getFilter(http
+				.getSharedObject(AuthenticationManager.class));
+		http.addFilter(filter);
+	}
 
-    /**
-     * Gets the {@link J2eePreAuthenticatedProcessingFilter} or creates a default instance using the properties provided.
-     * @param authenticationManager the {@link AuthenticationManager} to use.
-     * @return the {@link J2eePreAuthenticatedProcessingFilter} to use.
-     */
-    private J2eePreAuthenticatedProcessingFilter getFilter(
-            AuthenticationManager authenticationManager) {
-        if (j2eePreAuthenticatedProcessingFilter == null) {
-            j2eePreAuthenticatedProcessingFilter = new J2eePreAuthenticatedProcessingFilter();
-            j2eePreAuthenticatedProcessingFilter
-                    .setAuthenticationManager(authenticationManager);
-            j2eePreAuthenticatedProcessingFilter
-                    .setAuthenticationDetailsSource(createWebAuthenticationDetailsSource());
-            j2eePreAuthenticatedProcessingFilter = postProcess(j2eePreAuthenticatedProcessingFilter);
-        }
+	/**
+	 * Gets the {@link J2eePreAuthenticatedProcessingFilter} or creates a default instance
+	 * using the properties provided.
+	 * @param authenticationManager the {@link AuthenticationManager} to use.
+	 * @return the {@link J2eePreAuthenticatedProcessingFilter} to use.
+	 */
+	private J2eePreAuthenticatedProcessingFilter getFilter(
+			AuthenticationManager authenticationManager) {
+		if (j2eePreAuthenticatedProcessingFilter == null) {
+			j2eePreAuthenticatedProcessingFilter = new J2eePreAuthenticatedProcessingFilter();
+			j2eePreAuthenticatedProcessingFilter
+					.setAuthenticationManager(authenticationManager);
+			j2eePreAuthenticatedProcessingFilter
+					.setAuthenticationDetailsSource(createWebAuthenticationDetailsSource());
+			j2eePreAuthenticatedProcessingFilter = postProcess(j2eePreAuthenticatedProcessingFilter);
+		}
 
-        return j2eePreAuthenticatedProcessingFilter;
-    }
+		return j2eePreAuthenticatedProcessingFilter;
+	}
 
-    /**
-     * Gets the {@link AuthenticationUserDetailsService} that was specified or
-     * defaults to {@link PreAuthenticatedGrantedAuthoritiesUserDetailsService}.
-     *
-     * @return the {@link AuthenticationUserDetailsService} to use
-     */
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getUserDetailsService() {
-        return authenticationUserDetailsService == null ? new PreAuthenticatedGrantedAuthoritiesUserDetailsService()
-                : authenticationUserDetailsService;
-    }
+	/**
+	 * Gets the {@link AuthenticationUserDetailsService} that was specified or defaults to
+	 * {@link PreAuthenticatedGrantedAuthoritiesUserDetailsService}.
+	 *
+	 * @return the {@link AuthenticationUserDetailsService} to use
+	 */
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getUserDetailsService() {
+		return authenticationUserDetailsService == null ? new PreAuthenticatedGrantedAuthoritiesUserDetailsService()
+				: authenticationUserDetailsService;
+	}
 
-    /**
-     * Creates the
-     * {@link J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource} to set on
-     * the {@link J2eePreAuthenticatedProcessingFilter}. It is populated with a
-     * {@link SimpleMappableAttributesRetriever}.
-     *
-     * @return the
-     *         {@link J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource}
-     *         to use.
-     */
-    private J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource createWebAuthenticationDetailsSource() {
-        J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource detailsSource = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
-        SimpleMappableAttributesRetriever rolesRetriever = new SimpleMappableAttributesRetriever();
-        rolesRetriever.setMappableAttributes(mappableRoles);
-        detailsSource.setMappableRolesRetriever(rolesRetriever);
+	/**
+	 * Creates the {@link J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource} to set
+	 * on the {@link J2eePreAuthenticatedProcessingFilter}. It is populated with a
+	 * {@link SimpleMappableAttributesRetriever}.
+	 *
+	 * @return the {@link J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource} to use.
+	 */
+	private J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource createWebAuthenticationDetailsSource() {
+		J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource detailsSource = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
+		SimpleMappableAttributesRetriever rolesRetriever = new SimpleMappableAttributesRetriever();
+		rolesRetriever.setMappableAttributes(mappableRoles);
+		detailsSource.setMappableRolesRetriever(rolesRetriever);
 
-        detailsSource = postProcess(detailsSource);
-        return detailsSource;
-    }
+		detailsSource = postProcess(detailsSource);
+		return detailsSource;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
index 6242cd71e9..49e16260b8 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
@@ -35,8 +35,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
  * Adds logout support. Other {@link SecurityConfigurer} instances may invoke
- * {@link #addLogoutHandler(LogoutHandler)} in the
- * {@link #init(HttpSecurity)} phase.
+ * {@link #addLogoutHandler(LogoutHandler)} in the {@link #init(HttpSecurity)} phase.
  *
  * <h2>Security Filters</h2>
  *
@@ -59,244 +58,245 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @since 3.2
  * @see RememberMeConfigurer
  */
-public final class LogoutConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<LogoutConfigurer<H>,H> {
-    private List<LogoutHandler> logoutHandlers = new ArrayList<LogoutHandler>();
-    private SecurityContextLogoutHandler contextLogoutHandler = new SecurityContextLogoutHandler();
-    private String logoutSuccessUrl = "/login?logout";
-    private LogoutSuccessHandler logoutSuccessHandler;
-    private String logoutUrl = "/logout";
-    private RequestMatcher logoutRequestMatcher;
-    private boolean permitAll;
-    private boolean customLogoutSuccess;
+public final class LogoutConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<LogoutConfigurer<H>, H> {
+	private List<LogoutHandler> logoutHandlers = new ArrayList<LogoutHandler>();
+	private SecurityContextLogoutHandler contextLogoutHandler = new SecurityContextLogoutHandler();
+	private String logoutSuccessUrl = "/login?logout";
+	private LogoutSuccessHandler logoutSuccessHandler;
+	private String logoutUrl = "/logout";
+	private RequestMatcher logoutRequestMatcher;
+	private boolean permitAll;
+	private boolean customLogoutSuccess;
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#logout()
-     */
-    public LogoutConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#logout()
+	 */
+	public LogoutConfigurer() {
+	}
 
-    /**
-     * Adds a {@link LogoutHandler}. The {@link SecurityContextLogoutHandler} is
-     * added as the last {@link LogoutHandler} by default.
-     *
-     * @param logoutHandler the {@link LogoutHandler} to add
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> addLogoutHandler(LogoutHandler logoutHandler) {
-        this.logoutHandlers.add(logoutHandler);
-        return this;
-    }
+	/**
+	 * Adds a {@link LogoutHandler}. The {@link SecurityContextLogoutHandler} is added as
+	 * the last {@link LogoutHandler} by default.
+	 *
+	 * @param logoutHandler the {@link LogoutHandler} to add
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> addLogoutHandler(LogoutHandler logoutHandler) {
+		this.logoutHandlers.add(logoutHandler);
+		return this;
+	}
 
-    /**
-     * Configures {@link SecurityContextLogoutHandler} to invalidate the {@link HttpSession} at the time of logout.
-     * @param invalidateHttpSession true if the {@link HttpSession} should be invalidated (default), or false otherwise.
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> invalidateHttpSession(boolean invalidateHttpSession) {
-        contextLogoutHandler.setInvalidateHttpSession(invalidateHttpSession);
-        return this;
-    }
+	/**
+	 * Configures {@link SecurityContextLogoutHandler} to invalidate the
+	 * {@link HttpSession} at the time of logout.
+	 * @param invalidateHttpSession true if the {@link HttpSession} should be invalidated
+	 * (default), or false otherwise.
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> invalidateHttpSession(boolean invalidateHttpSession) {
+		contextLogoutHandler.setInvalidateHttpSession(invalidateHttpSession);
+		return this;
+	}
 
-    /**
-     * The URL that triggers log out to occur (default is "/logout"). If CSRF
-     * protection is enabled (default), then the request must also be a POST.
-     * This means that by default POST "/logout" is required to trigger a log
-     * out. If CSRF protection is disabled, then any HTTP method is allowed.
-     *
-     * <p>
-     * It is considered best practice to use an HTTP POST on any action that
-     * changes state (i.e. log out) to protect against <a
-     * href="http://en.wikipedia.org/wiki/Cross-site_request_forgery">CSRF
-     * attacks</a>. If you really want to use an HTTP GET, you can use
-     * <code>logoutRequestMatcher(new AntPathRequestMatcher(logoutUrl, "GET"));</code>
-     * </p>
-     *
-     * @see #logoutRequestMatcher(RequestMatcher)
-     * @see HttpSecurity#csrf()
-     *
-     * @param logoutUrl
-     *            the URL that will invoke logout.
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> logoutUrl(String logoutUrl) {
-        this.logoutRequestMatcher = null;
-        this.logoutUrl = logoutUrl;
-        return this;
-    }
+	/**
+	 * The URL that triggers log out to occur (default is "/logout"). If CSRF protection
+	 * is enabled (default), then the request must also be a POST. This means that by
+	 * default POST "/logout" is required to trigger a log out. If CSRF protection is
+	 * disabled, then any HTTP method is allowed.
+	 *
+	 * <p>
+	 * It is considered best practice to use an HTTP POST on any action that changes state
+	 * (i.e. log out) to protect against <a
+	 * href="http://en.wikipedia.org/wiki/Cross-site_request_forgery">CSRF attacks</a>. If
+	 * you really want to use an HTTP GET, you can use
+	 * <code>logoutRequestMatcher(new AntPathRequestMatcher(logoutUrl, "GET"));</code>
+	 * </p>
+	 *
+	 * @see #logoutRequestMatcher(RequestMatcher)
+	 * @see HttpSecurity#csrf()
+	 *
+	 * @param logoutUrl the URL that will invoke logout.
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> logoutUrl(String logoutUrl) {
+		this.logoutRequestMatcher = null;
+		this.logoutUrl = logoutUrl;
+		return this;
+	}
 
-    /**
-     * The RequestMatcher that triggers log out to occur. In most circumstances
-     * users will use {@link #logoutUrl(String)} which helps enforce good
-     * practices.
-     *
-     * @see #logoutUrl(String)
-     *
-     * @param logoutRequestMatcher
-     *            the RequestMatcher used to determine if logout should occur.
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> logoutRequestMatcher(RequestMatcher logoutRequestMatcher) {
-        this.logoutRequestMatcher = logoutRequestMatcher;
-        return this;
-    }
+	/**
+	 * The RequestMatcher that triggers log out to occur. In most circumstances users will
+	 * use {@link #logoutUrl(String)} which helps enforce good practices.
+	 *
+	 * @see #logoutUrl(String)
+	 *
+	 * @param logoutRequestMatcher the RequestMatcher used to determine if logout should
+	 * occur.
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> logoutRequestMatcher(RequestMatcher logoutRequestMatcher) {
+		this.logoutRequestMatcher = logoutRequestMatcher;
+		return this;
+	}
 
-    /**
-     * The URL to redirect to after logout has occurred. The default is
-     * "/login?logout". This is a shortcut for invoking
-     * {@link #logoutSuccessHandler(LogoutSuccessHandler)} with a
-     * {@link SimpleUrlLogoutSuccessHandler}.
-     *
-     * @param logoutSuccessUrl
-     *            the URL to redirect to after logout occurred
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> logoutSuccessUrl(String logoutSuccessUrl) {
-        this.customLogoutSuccess = true;
-        this.logoutSuccessUrl = logoutSuccessUrl;
-        return this;
-    }
+	/**
+	 * The URL to redirect to after logout has occurred. The default is "/login?logout".
+	 * This is a shortcut for invoking {@link #logoutSuccessHandler(LogoutSuccessHandler)}
+	 * with a {@link SimpleUrlLogoutSuccessHandler}.
+	 *
+	 * @param logoutSuccessUrl the URL to redirect to after logout occurred
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> logoutSuccessUrl(String logoutSuccessUrl) {
+		this.customLogoutSuccess = true;
+		this.logoutSuccessUrl = logoutSuccessUrl;
+		return this;
+	}
 
-    /**
-     * A shortcut for {@link #permitAll(boolean)} with <code>true</code> as an argument.
-     * @return the {@link LogoutConfigurer} for further customizations
-     */
-    public LogoutConfigurer<H> permitAll() {
-        return permitAll(true);
-    }
+	/**
+	 * A shortcut for {@link #permitAll(boolean)} with <code>true</code> as an argument.
+	 * @return the {@link LogoutConfigurer} for further customizations
+	 */
+	public LogoutConfigurer<H> permitAll() {
+		return permitAll(true);
+	}
 
-    /**
-     * Allows specifying the names of cookies to be removed on logout success.
-     * This is a shortcut to easily invoke
-     * {@link #addLogoutHandler(LogoutHandler)} with a
-     * {@link CookieClearingLogoutHandler}.
-     *
-     * @param cookieNamesToClear the names of cookies to be removed on logout success.
-     * @return the {@link LogoutConfigurer} for further customization
-     */
-    public LogoutConfigurer<H> deleteCookies(String... cookieNamesToClear) {
-        return addLogoutHandler(new CookieClearingLogoutHandler(cookieNamesToClear));
-    }
+	/**
+	 * Allows specifying the names of cookies to be removed on logout success. This is a
+	 * shortcut to easily invoke {@link #addLogoutHandler(LogoutHandler)} with a
+	 * {@link CookieClearingLogoutHandler}.
+	 *
+	 * @param cookieNamesToClear the names of cookies to be removed on logout success.
+	 * @return the {@link LogoutConfigurer} for further customization
+	 */
+	public LogoutConfigurer<H> deleteCookies(String... cookieNamesToClear) {
+		return addLogoutHandler(new CookieClearingLogoutHandler(cookieNamesToClear));
+	}
 
-    /**
-     * Sets the {@link LogoutSuccessHandler} to use. If this is specified,
-     * {@link #logoutSuccessUrl(String)} is ignored.
-     *
-     * @param logoutSuccessHandler
-     *            the {@link LogoutSuccessHandler} to use after a user has been
-     *            logged out.
-     * @return the {@link LogoutConfigurer} for further customizations
-     */
-    public LogoutConfigurer<H> logoutSuccessHandler(LogoutSuccessHandler logoutSuccessHandler) {
-        this.logoutSuccessUrl = null;
-        this.customLogoutSuccess = true;
-        this.logoutSuccessHandler = logoutSuccessHandler;
-        return this;
-    }
+	/**
+	 * Sets the {@link LogoutSuccessHandler} to use. If this is specified,
+	 * {@link #logoutSuccessUrl(String)} is ignored.
+	 *
+	 * @param logoutSuccessHandler the {@link LogoutSuccessHandler} to use after a user
+	 * has been logged out.
+	 * @return the {@link LogoutConfigurer} for further customizations
+	 */
+	public LogoutConfigurer<H> logoutSuccessHandler(
+			LogoutSuccessHandler logoutSuccessHandler) {
+		this.logoutSuccessUrl = null;
+		this.customLogoutSuccess = true;
+		this.logoutSuccessHandler = logoutSuccessHandler;
+		return this;
+	}
 
-    /**
-     * Grants access to the {@link #logoutSuccessUrl(String)} and the {@link #logoutUrl(String)} for every user.
-     *
-     * @param permitAll if true grants access, else nothing is done
-     * @return the {@link LogoutConfigurer} for further customization.
-     */
-    public LogoutConfigurer<H> permitAll(boolean permitAll) {
-        this.permitAll = permitAll;
-        return this;
-    }
+	/**
+	 * Grants access to the {@link #logoutSuccessUrl(String)} and the
+	 * {@link #logoutUrl(String)} for every user.
+	 *
+	 * @param permitAll if true grants access, else nothing is done
+	 * @return the {@link LogoutConfigurer} for further customization.
+	 */
+	public LogoutConfigurer<H> permitAll(boolean permitAll) {
+		this.permitAll = permitAll;
+		return this;
+	}
 
-    /**
-     * Gets the {@link LogoutSuccessHandler} if not null, otherwise creates a
-     * new {@link SimpleUrlLogoutSuccessHandler} using the
-     * {@link #logoutSuccessUrl(String)}.
-     *
-     * @return the {@link LogoutSuccessHandler} to use
-     */
-    private LogoutSuccessHandler getLogoutSuccessHandler() {
-        if(logoutSuccessHandler != null) {
-            return logoutSuccessHandler;
-        }
-        SimpleUrlLogoutSuccessHandler logoutSuccessHandler = new SimpleUrlLogoutSuccessHandler();
-        logoutSuccessHandler.setDefaultTargetUrl(logoutSuccessUrl);
-        return logoutSuccessHandler;
-    }
+	/**
+	 * Gets the {@link LogoutSuccessHandler} if not null, otherwise creates a new
+	 * {@link SimpleUrlLogoutSuccessHandler} using the {@link #logoutSuccessUrl(String)}.
+	 *
+	 * @return the {@link LogoutSuccessHandler} to use
+	 */
+	private LogoutSuccessHandler getLogoutSuccessHandler() {
+		if (logoutSuccessHandler != null) {
+			return logoutSuccessHandler;
+		}
+		SimpleUrlLogoutSuccessHandler logoutSuccessHandler = new SimpleUrlLogoutSuccessHandler();
+		logoutSuccessHandler.setDefaultTargetUrl(logoutSuccessUrl);
+		return logoutSuccessHandler;
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        if(permitAll) {
-            PermitAllSupport.permitAll(http, this.logoutSuccessUrl);
-            PermitAllSupport.permitAll(http, this.getLogoutRequestMatcher(http));
-        }
+	@Override
+	public void init(H http) throws Exception {
+		if (permitAll) {
+			PermitAllSupport.permitAll(http, this.logoutSuccessUrl);
+			PermitAllSupport.permitAll(http, this.getLogoutRequestMatcher(http));
+		}
 
-        DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http.getSharedObject(DefaultLoginPageGeneratingFilter.class);
-        if(loginPageGeneratingFilter != null && !isCustomLogoutSuccess()) {
-            loginPageGeneratingFilter.setLogoutSuccessUrl(getLogoutSuccessUrl());
-        }
-    }
+		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
+				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+		if (loginPageGeneratingFilter != null && !isCustomLogoutSuccess()) {
+			loginPageGeneratingFilter.setLogoutSuccessUrl(getLogoutSuccessUrl());
+		}
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        LogoutFilter logoutFilter = createLogoutFilter(http);
-        http.addFilter(logoutFilter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		LogoutFilter logoutFilter = createLogoutFilter(http);
+		http.addFilter(logoutFilter);
+	}
 
-    /**
-     * Returns true if the logout success has been customized via
-     * {@link #logoutSuccessUrl(String)} or
-     * {@link #logoutSuccessHandler(LogoutSuccessHandler)}.
-     *
-     * @return true if logout success handling has been customized, else false
-     */
-    boolean isCustomLogoutSuccess() {
-        return customLogoutSuccess;
-    }
+	/**
+	 * Returns true if the logout success has been customized via
+	 * {@link #logoutSuccessUrl(String)} or
+	 * {@link #logoutSuccessHandler(LogoutSuccessHandler)}.
+	 *
+	 * @return true if logout success handling has been customized, else false
+	 */
+	boolean isCustomLogoutSuccess() {
+		return customLogoutSuccess;
+	}
 
-    /**
-     * Gets the logoutSuccesUrl or null if a
-     * {@link #logoutSuccessHandler(LogoutSuccessHandler)} was configured.
-     *
-     * @return the logoutSuccessUrl
-     */
-    private String getLogoutSuccessUrl() {
-        return logoutSuccessUrl;
-    }
+	/**
+	 * Gets the logoutSuccesUrl or null if a
+	 * {@link #logoutSuccessHandler(LogoutSuccessHandler)} was configured.
+	 *
+	 * @return the logoutSuccessUrl
+	 */
+	private String getLogoutSuccessUrl() {
+		return logoutSuccessUrl;
+	}
 
-    /**
-     * Gets the {@link LogoutHandler} instances that will be used.
-     * @return the {@link LogoutHandler} instances. Cannot be null.
-     */
-    List<LogoutHandler> getLogoutHandlers() {
-        return logoutHandlers;
-    }
+	/**
+	 * Gets the {@link LogoutHandler} instances that will be used.
+	 * @return the {@link LogoutHandler} instances. Cannot be null.
+	 */
+	List<LogoutHandler> getLogoutHandlers() {
+		return logoutHandlers;
+	}
 
-    /**
-     * Creates the {@link LogoutFilter} using the {@link LogoutHandler}
-     * instances, the {@link #logoutSuccessHandler(LogoutSuccessHandler)} and
-     * the {@link #logoutUrl(String)}.
-     *
-     * @param http the builder to use
-     * @return the {@link LogoutFilter} to use.
-     * @throws Exception
-     */
-    private LogoutFilter createLogoutFilter(H http) throws Exception {
-        logoutHandlers.add(contextLogoutHandler);
-        LogoutHandler[] handlers = logoutHandlers.toArray(new LogoutHandler[logoutHandlers.size()]);
-        LogoutFilter result = new LogoutFilter(getLogoutSuccessHandler(), handlers);
-        result.setLogoutRequestMatcher(getLogoutRequestMatcher(http));
-        result = postProcess(result);
-        return result;
-    }
+	/**
+	 * Creates the {@link LogoutFilter} using the {@link LogoutHandler} instances, the
+	 * {@link #logoutSuccessHandler(LogoutSuccessHandler)} and the
+	 * {@link #logoutUrl(String)}.
+	 *
+	 * @param http the builder to use
+	 * @return the {@link LogoutFilter} to use.
+	 * @throws Exception
+	 */
+	private LogoutFilter createLogoutFilter(H http) throws Exception {
+		logoutHandlers.add(contextLogoutHandler);
+		LogoutHandler[] handlers = logoutHandlers
+				.toArray(new LogoutHandler[logoutHandlers.size()]);
+		LogoutFilter result = new LogoutFilter(getLogoutSuccessHandler(), handlers);
+		result.setLogoutRequestMatcher(getLogoutRequestMatcher(http));
+		result = postProcess(result);
+		return result;
+	}
 
-    @SuppressWarnings("unchecked")
-    private RequestMatcher getLogoutRequestMatcher(H http) {
-        if(logoutRequestMatcher != null) {
-            return logoutRequestMatcher;
-        }
-        if(http.getConfigurer(CsrfConfigurer.class) != null) {
-            this.logoutRequestMatcher = new AntPathRequestMatcher(this.logoutUrl, "POST");
-        } else {
-            this.logoutRequestMatcher = new AntPathRequestMatcher(this.logoutUrl);
-        }
-        return this.logoutRequestMatcher;
-    }
+	@SuppressWarnings("unchecked")
+	private RequestMatcher getLogoutRequestMatcher(H http) {
+		if (logoutRequestMatcher != null) {
+			return logoutRequestMatcher;
+		}
+		if (http.getConfigurer(CsrfConfigurer.class) != null) {
+			this.logoutRequestMatcher = new AntPathRequestMatcher(this.logoutUrl, "POST");
+		}
+		else {
+			this.logoutRequestMatcher = new AntPathRequestMatcher(this.logoutUrl);
+		}
+		return this.logoutRequestMatcher;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java
index 56d15ad55b..265e278231 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.config.annotation.web.configurers;
 
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.security.access.SecurityConfig;
@@ -23,7 +22,6 @@ import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
 import org.springframework.security.config.annotation.web.configurers.AbstractConfigAttributeRequestMatcherRegistry.UrlMapping;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
-
 /**
  * Configures non-null URL's to grant access to every URL
  * @author Rob Winch
@@ -31,58 +29,71 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  */
 final class PermitAllSupport {
 
-    public static void permitAll(HttpSecurityBuilder<? extends HttpSecurityBuilder<?>> http, String... urls) {
-        for(String url : urls) {
-            if(url != null) {
-                permitAll(http, new ExactUrlRequestMatcher(url));
-            }
-        }
-    }
+	public static void permitAll(
+			HttpSecurityBuilder<? extends HttpSecurityBuilder<?>> http, String... urls) {
+		for (String url : urls) {
+			if (url != null) {
+				permitAll(http, new ExactUrlRequestMatcher(url));
+			}
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    public static void permitAll(HttpSecurityBuilder<? extends HttpSecurityBuilder<?>> http, RequestMatcher... requestMatchers) {
-        ExpressionUrlAuthorizationConfigurer<?> configurer = http.getConfigurer(ExpressionUrlAuthorizationConfigurer.class);
+	@SuppressWarnings("unchecked")
+	public static void permitAll(
+			HttpSecurityBuilder<? extends HttpSecurityBuilder<?>> http,
+			RequestMatcher... requestMatchers) {
+		ExpressionUrlAuthorizationConfigurer<?> configurer = http
+				.getConfigurer(ExpressionUrlAuthorizationConfigurer.class);
 
-        if(configurer == null) {
-            throw new IllegalStateException("permitAll only works with HttpSecurity.authorizeRequests()");
-        }
+		if (configurer == null) {
+			throw new IllegalStateException(
+					"permitAll only works with HttpSecurity.authorizeRequests()");
+		}
 
-        for(RequestMatcher matcher : requestMatchers) {
-            if(matcher != null) {
-                configurer.getRegistry().addMapping(0, new UrlMapping(matcher, SecurityConfig.createList(ExpressionUrlAuthorizationConfigurer.permitAll)));
-            }
-        }
-    }
+		for (RequestMatcher matcher : requestMatchers) {
+			if (matcher != null) {
+				configurer
+						.getRegistry()
+						.addMapping(
+								0,
+								new UrlMapping(
+										matcher,
+										SecurityConfig
+												.createList(ExpressionUrlAuthorizationConfigurer.permitAll)));
+			}
+		}
+	}
 
-    private final static class ExactUrlRequestMatcher implements RequestMatcher {
-        private String processUrl;
+	private final static class ExactUrlRequestMatcher implements RequestMatcher {
+		private String processUrl;
 
-        private ExactUrlRequestMatcher(String processUrl) {
-            this.processUrl = processUrl;
-        }
+		private ExactUrlRequestMatcher(String processUrl) {
+			this.processUrl = processUrl;
+		}
 
-        public boolean matches(HttpServletRequest request) {
-            String uri = request.getRequestURI();
-            String query = request.getQueryString();
+		public boolean matches(HttpServletRequest request) {
+			String uri = request.getRequestURI();
+			String query = request.getQueryString();
 
-            if(query != null) {
-                uri += "?" + query;
-            }
+			if (query != null) {
+				uri += "?" + query;
+			}
 
-            if ("".equals(request.getContextPath())) {
-                return uri.equals(processUrl);
-            }
+			if ("".equals(request.getContextPath())) {
+				return uri.equals(processUrl);
+			}
 
-            return uri.equals(request.getContextPath() + processUrl);
-        }
+			return uri.equals(request.getContextPath() + processUrl);
+		}
 
-        @Override
-        public String toString() {
-            StringBuilder sb = new StringBuilder();
-            sb.append("ExactUrl [processUrl='").append(processUrl).append("']");
-            return sb.toString();
-        }
-    }
+		@Override
+		public String toString() {
+			StringBuilder sb = new StringBuilder();
+			sb.append("ExactUrl [processUrl='").append(processUrl).append("']");
+			return sb.toString();
+		}
+	}
 
-    private PermitAllSupport() {}
+	private PermitAllSupport() {
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java
index 556ec2733e..aa064b8881 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java
@@ -26,90 +26,91 @@ import org.springframework.security.web.PortMapper;
 import org.springframework.security.web.PortMapperImpl;
 
 /**
- * Allows configuring a shared {@link PortMapper} instance used to determine the
- * ports when redirecting between HTTP and HTTPS. The {@link PortMapper} can be
- * obtained from {@link HttpSecurity#getSharedObject(Class)}.
+ * Allows configuring a shared {@link PortMapper} instance used to determine the ports
+ * when redirecting between HTTP and HTTPS. The {@link PortMapper} can be obtained from
+ * {@link HttpSecurity#getSharedObject(Class)}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class PortMapperConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<PortMapperConfigurer<H>,H> {
-    private PortMapper portMapper;
-    private Map<String, String> httpsPortMappings = new HashMap<String,String>();
+public final class PortMapperConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<PortMapperConfigurer<H>, H> {
+	private PortMapper portMapper;
+	private Map<String, String> httpsPortMappings = new HashMap<String, String>();
 
-    /**
-     * Creates a new instance
-     */
-    public PortMapperConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public PortMapperConfigurer() {
+	}
 
-    /**
-     * Allows specifying the {@link PortMapper} instance.
-     * @param portMapper
-     * @return
-     */
-    public PortMapperConfigurer<H> portMapper(PortMapper portMapper) {
-        this.portMapper = portMapper;
-        return this;
-    }
+	/**
+	 * Allows specifying the {@link PortMapper} instance.
+	 * @param portMapper
+	 * @return
+	 */
+	public PortMapperConfigurer<H> portMapper(PortMapper portMapper) {
+		this.portMapper = portMapper;
+		return this;
+	}
 
-    /**
-     * Adds a port mapping
-     * @param httpPort the HTTP port that maps to a specific HTTPS port.
-     * @return {@link HttpPortMapping} to define the HTTPS port
-     */
-    public HttpPortMapping http(int httpPort) {
-        return new HttpPortMapping(httpPort);
-    }
+	/**
+	 * Adds a port mapping
+	 * @param httpPort the HTTP port that maps to a specific HTTPS port.
+	 * @return {@link HttpPortMapping} to define the HTTPS port
+	 */
+	public HttpPortMapping http(int httpPort) {
+		return new HttpPortMapping(httpPort);
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        http.setSharedObject(PortMapper.class, getPortMapper());
-    }
+	@Override
+	public void init(H http) throws Exception {
+		http.setSharedObject(PortMapper.class, getPortMapper());
+	}
 
-    /**
-     * Gets the {@link PortMapper} to use. If {@link #portMapper(PortMapper)}
-     * was not invoked, builds a {@link PortMapperImpl} using the port mappings
-     * specified with {@link #http(int)}.
-     *
-     * @return the {@link PortMapper} to use
-     */
-    private PortMapper getPortMapper() {
-        if(portMapper == null) {
-            PortMapperImpl portMapper = new PortMapperImpl();
-            portMapper.setPortMappings(httpsPortMappings);
-            this.portMapper = portMapper;
-        }
-        return portMapper;
-    }
+	/**
+	 * Gets the {@link PortMapper} to use. If {@link #portMapper(PortMapper)} was not
+	 * invoked, builds a {@link PortMapperImpl} using the port mappings specified with
+	 * {@link #http(int)}.
+	 *
+	 * @return the {@link PortMapper} to use
+	 */
+	private PortMapper getPortMapper() {
+		if (portMapper == null) {
+			PortMapperImpl portMapper = new PortMapperImpl();
+			portMapper.setPortMappings(httpsPortMappings);
+			this.portMapper = portMapper;
+		}
+		return portMapper;
+	}
 
-    /**
-     * Allows specifying the HTTPS port for a given HTTP port when redirecting
-     * between HTTP and HTTPS.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public final class HttpPortMapping {
-        private final int httpPort;
+	/**
+	 * Allows specifying the HTTPS port for a given HTTP port when redirecting between
+	 * HTTP and HTTPS.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public final class HttpPortMapping {
+		private final int httpPort;
 
-        /**
-         * Creates a new instance
-         * @param httpPort
-         * @see PortMapperConfigurer#http(int)
-         */
-        private HttpPortMapping(int httpPort) {
-            this.httpPort = httpPort;
-        }
+		/**
+		 * Creates a new instance
+		 * @param httpPort
+		 * @see PortMapperConfigurer#http(int)
+		 */
+		private HttpPortMapping(int httpPort) {
+			this.httpPort = httpPort;
+		}
 
-        /**
-         * Maps the given HTTP port to the provided HTTPS port and vice versa.
-         * @param httpsPort the HTTPS port to map to
-         * @return the {@link PortMapperConfigurer} for further customization
-         */
-        public PortMapperConfigurer<H> mapsTo(int httpsPort) {
-            httpsPortMappings.put(String.valueOf(httpPort), String.valueOf(httpsPort));
-            return PortMapperConfigurer.this;
-        }
-    }
+		/**
+		 * Maps the given HTTP port to the provided HTTPS port and vice versa.
+		 * @param httpsPort the HTTPS port to map to
+		 * @return the {@link PortMapperConfigurer} for further customization
+		 */
+		public PortMapperConfigurer<H> mapsTo(int httpsPort) {
+			httpsPortMappings.put(String.valueOf(httpPort), String.valueOf(httpsPort));
+			return PortMapperConfigurer.this;
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
index 8a739fdfb5..91988cf741 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
@@ -35,9 +35,8 @@ import org.springframework.security.web.authentication.rememberme.TokenBasedReme
 import org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter;
 
 /**
- * Configures Remember Me authentication. This typically involves the user
- * checking a box when they enter their username and password that states to
- * "Remember Me".
+ * Configures Remember Me authentication. This typically involves the user checking a box
+ * when they enter their username and password that states to "Remember Me".
  *
  * <h2>Security Filters</h2>
  *
@@ -56,8 +55,10 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  * <li>
  * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
  * is populated with a {@link RememberMeAuthenticationProvider}</li>
- * <li>{@link RememberMeServices} is populated as a shared object and available on {@link HttpSecurity#getSharedObject(Class)}</li>
- * <li>{@link LogoutConfigurer#addLogoutHandler(LogoutHandler)} is used to add a logout handler to clean up the remember me authentication.</li>
+ * <li>{@link RememberMeServices} is populated as a shared object and available on
+ * {@link HttpSecurity#getSharedObject(Class)}</li>
+ * <li>{@link LogoutConfigurer#addLogoutHandler(LogoutHandler)} is used to add a logout
+ * handler to clean up the remember me authentication.</li>
  * </ul>
  *
  * <h2>Shared Objects Used</h2>
@@ -66,299 +67,307 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  *
  * <ul>
  * <li>{@link AuthenticationManager}</li>
- * <li>{@link UserDetailsService} if no {@link #userDetailsService(UserDetailsService)} was specified.</li>
- * <li> {@link DefaultLoginPageGeneratingFilter} - if present will be populated with information from the configuration</li>
+ * <li>{@link UserDetailsService} if no {@link #userDetailsService(UserDetailsService)}
+ * was specified.</li>
+ * <li> {@link DefaultLoginPageGeneratingFilter} - if present will be populated with
+ * information from the configuration</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class RememberMeConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<RememberMeConfigurer<H>,H> {
-    private AuthenticationSuccessHandler authenticationSuccessHandler;
-    private String key;
-    private RememberMeServices rememberMeServices;
-    private LogoutHandler logoutHandler;
-    private String rememberMeParameter = "remember-me";
-    private String rememberMeCookieName = "remember-me";
-    private PersistentTokenRepository tokenRepository;
-    private UserDetailsService userDetailsService;
-    private Integer tokenValiditySeconds;
-    private Boolean useSecureCookie;
+public final class RememberMeConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<RememberMeConfigurer<H>, H> {
+	private AuthenticationSuccessHandler authenticationSuccessHandler;
+	private String key;
+	private RememberMeServices rememberMeServices;
+	private LogoutHandler logoutHandler;
+	private String rememberMeParameter = "remember-me";
+	private String rememberMeCookieName = "remember-me";
+	private PersistentTokenRepository tokenRepository;
+	private UserDetailsService userDetailsService;
+	private Integer tokenValiditySeconds;
+	private Boolean useSecureCookie;
 
-    /**
-     * Creates a new instance
-     */
-    public RememberMeConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public RememberMeConfigurer() {
+	}
 
-    /**
-     * Allows specifying how long (in seconds) a token is valid for
-     *
-     * @param tokenValiditySeconds
-     * @return {@link RememberMeConfigurer} for further customization
-     * @see AbstractRememberMeServices#setTokenValiditySeconds(int)
-     */
-    public RememberMeConfigurer<H> tokenValiditySeconds(int tokenValiditySeconds) {
-        this.tokenValiditySeconds = tokenValiditySeconds;
-        return this;
-    }
+	/**
+	 * Allows specifying how long (in seconds) a token is valid for
+	 *
+	 * @param tokenValiditySeconds
+	 * @return {@link RememberMeConfigurer} for further customization
+	 * @see AbstractRememberMeServices#setTokenValiditySeconds(int)
+	 */
+	public RememberMeConfigurer<H> tokenValiditySeconds(int tokenValiditySeconds) {
+		this.tokenValiditySeconds = tokenValiditySeconds;
+		return this;
+	}
 
-    /**
-     *Whether the cookie should be flagged as secure or not. Secure cookies can only be sent over an HTTPS connection
-     * and thus cannot be accidentally submitted over HTTP where they could be intercepted.
-     * <p>
-     * By default the cookie will be secure if the request is secure. If you only want to use remember-me over
-     * HTTPS (recommended) you should set this property to {@code true}.
-     *
-     * @param useSecureCookie set to {@code true} to always user secure cookies, {@code false} to disable their use.
-     * @return the {@link RememberMeConfigurer} for further customization
-     * @see AbstractRememberMeServices#setUseSecureCookie(boolean)
-     */
-    public RememberMeConfigurer<H> useSecureCookie(boolean useSecureCookie) {
-        this.useSecureCookie = useSecureCookie;
-        return this;
-    }
+	/**
+	 * Whether the cookie should be flagged as secure or not. Secure cookies can only be
+	 * sent over an HTTPS connection and thus cannot be accidentally submitted over HTTP
+	 * where they could be intercepted.
+	 * <p>
+	 * By default the cookie will be secure if the request is secure. If you only want to
+	 * use remember-me over HTTPS (recommended) you should set this property to
+	 * {@code true}.
+	 *
+	 * @param useSecureCookie set to {@code true} to always user secure cookies,
+	 * {@code false} to disable their use.
+	 * @return the {@link RememberMeConfigurer} for further customization
+	 * @see AbstractRememberMeServices#setUseSecureCookie(boolean)
+	 */
+	public RememberMeConfigurer<H> useSecureCookie(boolean useSecureCookie) {
+		this.useSecureCookie = useSecureCookie;
+		return this;
+	}
 
-    /**
-     * Specifies the {@link UserDetailsService} used to look up the
-     * {@link UserDetails} when a remember me token is valid. The default is to
-     * use the {@link UserDetailsService} found by invoking
-     * {@link HttpSecurity#getSharedObject(Class)} which is set when using
-     * {@link WebSecurityConfigurerAdapter#configure(AuthenticationManagerBuilder)}.
-     * Alternatively, one can populate {@link #rememberMeServices(RememberMeServices)}.
-     *
-     * @param userDetailsService
-     *            the {@link UserDetailsService} to configure
-     * @return the {@link RememberMeConfigurer} for further customization
-     * @see AbstractRememberMeServices
-     */
-    public RememberMeConfigurer<H> userDetailsService(UserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-        return this;
-    }
+	/**
+	 * Specifies the {@link UserDetailsService} used to look up the {@link UserDetails}
+	 * when a remember me token is valid. The default is to use the
+	 * {@link UserDetailsService} found by invoking
+	 * {@link HttpSecurity#getSharedObject(Class)} which is set when using
+	 * {@link WebSecurityConfigurerAdapter#configure(AuthenticationManagerBuilder)}.
+	 * Alternatively, one can populate {@link #rememberMeServices(RememberMeServices)}.
+	 *
+	 * @param userDetailsService the {@link UserDetailsService} to configure
+	 * @return the {@link RememberMeConfigurer} for further customization
+	 * @see AbstractRememberMeServices
+	 */
+	public RememberMeConfigurer<H> userDetailsService(
+			UserDetailsService userDetailsService) {
+		this.userDetailsService = userDetailsService;
+		return this;
+	}
 
-    /**
-     * Specifies the {@link PersistentTokenRepository} to use. The default is to
-     * use {@link TokenBasedRememberMeServices} instead.
-     *
-     * @param tokenRepository
-     *            the {@link PersistentTokenRepository} to use
-     * @return the {@link RememberMeConfigurer} for further customization
-     */
-    public RememberMeConfigurer<H> tokenRepository(PersistentTokenRepository tokenRepository) {
-        this.tokenRepository = tokenRepository;
-        return this;
-    }
+	/**
+	 * Specifies the {@link PersistentTokenRepository} to use. The default is to use
+	 * {@link TokenBasedRememberMeServices} instead.
+	 *
+	 * @param tokenRepository the {@link PersistentTokenRepository} to use
+	 * @return the {@link RememberMeConfigurer} for further customization
+	 */
+	public RememberMeConfigurer<H> tokenRepository(
+			PersistentTokenRepository tokenRepository) {
+		this.tokenRepository = tokenRepository;
+		return this;
+	}
 
-    /**
-     * Sets the key to identify tokens created for remember me authentication. Default is a secure randomly generated
-     * key.
-     *
-     * @param key the key to identify tokens created for remember me authentication
-     * @return  the {@link RememberMeConfigurer} for further customization
-     */
-    public RememberMeConfigurer<H> key(String key) {
-        this.key = key;
-        return this;
-    }
+	/**
+	 * Sets the key to identify tokens created for remember me authentication. Default is
+	 * a secure randomly generated key.
+	 *
+	 * @param key the key to identify tokens created for remember me authentication
+	 * @return the {@link RememberMeConfigurer} for further customization
+	 */
+	public RememberMeConfigurer<H> key(String key) {
+		this.key = key;
+		return this;
+	}
 
-    /**
-     * The HTTP parameter used to indicate to remember the user at time of login.
-     *
-     * @param rememberMeParameter the HTTP parameter used to indicate to remember the user
-     * @return  the {@link RememberMeConfigurer} for further customization
-     */
-    public RememberMeConfigurer<H> rememberMeParameter(String rememberMeParameter) {
-        this.rememberMeParameter = rememberMeParameter;
-        return this;
-    }
+	/**
+	 * The HTTP parameter used to indicate to remember the user at time of login.
+	 *
+	 * @param rememberMeParameter the HTTP parameter used to indicate to remember the user
+	 * @return the {@link RememberMeConfigurer} for further customization
+	 */
+	public RememberMeConfigurer<H> rememberMeParameter(String rememberMeParameter) {
+		this.rememberMeParameter = rememberMeParameter;
+		return this;
+	}
 
-    /**
-     * Allows control over the destination a remembered user is sent to when they are successfully authenticated.
-     * By default, the filter will just allow the current request to proceed, but if an
-     * {@code AuthenticationSuccessHandler} is set, it will be invoked and the {@code doFilter()} method will return
-     * immediately, thus allowing the application to redirect the user to a specific URL, regardless of what the original
-     * request was for.
-     *
-     * @param authenticationSuccessHandler the strategy to invoke immediately before returning from {@code doFilter()}.
-     * @return {@link RememberMeConfigurer} for further customization
-     * @see RememberMeAuthenticationFilter#setAuthenticationSuccessHandler(AuthenticationSuccessHandler)
-     */
-    public RememberMeConfigurer<H> authenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) {
-        this.authenticationSuccessHandler = authenticationSuccessHandler;
-        return this;
-    }
+	/**
+	 * Allows control over the destination a remembered user is sent to when they are
+	 * successfully authenticated. By default, the filter will just allow the current
+	 * request to proceed, but if an {@code AuthenticationSuccessHandler} is set, it will
+	 * be invoked and the {@code doFilter()} method will return immediately, thus allowing
+	 * the application to redirect the user to a specific URL, regardless of what the
+	 * original request was for.
+	 *
+	 * @param authenticationSuccessHandler the strategy to invoke immediately before
+	 * returning from {@code doFilter()}.
+	 * @return {@link RememberMeConfigurer} for further customization
+	 * @see RememberMeAuthenticationFilter#setAuthenticationSuccessHandler(AuthenticationSuccessHandler)
+	 */
+	public RememberMeConfigurer<H> authenticationSuccessHandler(
+			AuthenticationSuccessHandler authenticationSuccessHandler) {
+		this.authenticationSuccessHandler = authenticationSuccessHandler;
+		return this;
+	}
 
-    /**
-     * Specify the {@link RememberMeServices} to use.
-     * @param rememberMeServices the {@link RememberMeServices} to use
-     * @return the {@link RememberMeConfigurer} for further customizations
-     * @see RememberMeServices
-     */
-    public RememberMeConfigurer<H> rememberMeServices(RememberMeServices rememberMeServices) {
-        this.rememberMeServices = rememberMeServices;
-        return this;
-    }
+	/**
+	 * Specify the {@link RememberMeServices} to use.
+	 * @param rememberMeServices the {@link RememberMeServices} to use
+	 * @return the {@link RememberMeConfigurer} for further customizations
+	 * @see RememberMeServices
+	 */
+	public RememberMeConfigurer<H> rememberMeServices(
+			RememberMeServices rememberMeServices) {
+		this.rememberMeServices = rememberMeServices;
+		return this;
+	}
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public void init(H http) throws Exception {
-        String key = getKey();
-        RememberMeServices rememberMeServices = getRememberMeServices(http, key);
-        http.setSharedObject(RememberMeServices.class, rememberMeServices);
-        LogoutConfigurer<H> logoutConfigurer = http.getConfigurer(LogoutConfigurer.class);
-        if(logoutConfigurer != null) {
-            logoutConfigurer.addLogoutHandler(logoutHandler);
-        }
+	@SuppressWarnings("unchecked")
+	@Override
+	public void init(H http) throws Exception {
+		String key = getKey();
+		RememberMeServices rememberMeServices = getRememberMeServices(http, key);
+		http.setSharedObject(RememberMeServices.class, rememberMeServices);
+		LogoutConfigurer<H> logoutConfigurer = http.getConfigurer(LogoutConfigurer.class);
+		if (logoutConfigurer != null) {
+			logoutConfigurer.addLogoutHandler(logoutHandler);
+		}
 
-        RememberMeAuthenticationProvider authenticationProvider = new RememberMeAuthenticationProvider(
-                key);
-        authenticationProvider = postProcess(authenticationProvider);
-        http.authenticationProvider(authenticationProvider);
+		RememberMeAuthenticationProvider authenticationProvider = new RememberMeAuthenticationProvider(
+				key);
+		authenticationProvider = postProcess(authenticationProvider);
+		http.authenticationProvider(authenticationProvider);
 
-        initDefaultLoginFilter(http);
-    }
+		initDefaultLoginFilter(http);
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        RememberMeAuthenticationFilter rememberMeFilter = new RememberMeAuthenticationFilter(
-                http.getSharedObject(AuthenticationManager.class), rememberMeServices);
-        if (authenticationSuccessHandler != null) {
-            rememberMeFilter
-                    .setAuthenticationSuccessHandler(authenticationSuccessHandler);
-        }
-        rememberMeFilter = postProcess(rememberMeFilter);
-        http.addFilter(rememberMeFilter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		RememberMeAuthenticationFilter rememberMeFilter = new RememberMeAuthenticationFilter(
+				http.getSharedObject(AuthenticationManager.class), rememberMeServices);
+		if (authenticationSuccessHandler != null) {
+			rememberMeFilter
+					.setAuthenticationSuccessHandler(authenticationSuccessHandler);
+		}
+		rememberMeFilter = postProcess(rememberMeFilter);
+		http.addFilter(rememberMeFilter);
+	}
 
-    /**
-     * Returns the HTTP parameter used to indicate to remember the user at time of login.
-     * @return the HTTP parameter used to indicate to remember the user
-     */
-    private String getRememberMeParameter() {
-        return rememberMeParameter;
-    }
+	/**
+	 * Returns the HTTP parameter used to indicate to remember the user at time of login.
+	 * @return the HTTP parameter used to indicate to remember the user
+	 */
+	private String getRememberMeParameter() {
+		return rememberMeParameter;
+	}
 
-    /**
-     * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared object.
-     *
-     * @param http the {@link HttpSecurityBuilder} to use
-     */
-    private void initDefaultLoginFilter(H http) {
-        DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http.getSharedObject(DefaultLoginPageGeneratingFilter.class);
-        if(loginPageGeneratingFilter != null) {
-            loginPageGeneratingFilter.setRememberMeParameter(getRememberMeParameter());
-        }
-    }
+	/**
+	 * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared
+	 * object.
+	 *
+	 * @param http the {@link HttpSecurityBuilder} to use
+	 */
+	private void initDefaultLoginFilter(H http) {
+		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
+				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+		if (loginPageGeneratingFilter != null) {
+			loginPageGeneratingFilter.setRememberMeParameter(getRememberMeParameter());
+		}
+	}
 
-    /**
-     * Gets the {@link RememberMeServices} or creates the {@link RememberMeServices}.
-     * @param http the {@link HttpSecurity} to lookup shared objects
-     * @param key the {@link #key(String)}
-     * @return the {@link RememberMeServices} to use
-     * @throws Exception
-     */
-    private RememberMeServices getRememberMeServices(H http,
-            String key) throws Exception {
-        if (rememberMeServices != null) {
-            if (rememberMeServices instanceof LogoutHandler
-                    && logoutHandler == null) {
-                this.logoutHandler = (LogoutHandler) rememberMeServices;
-            }
-            return rememberMeServices;
-        }
-        AbstractRememberMeServices tokenRememberMeServices = createRememberMeServices(
-                http, key);
-        tokenRememberMeServices.setParameter(rememberMeParameter);
-        tokenRememberMeServices.setCookieName(rememberMeCookieName);
-        if (tokenValiditySeconds != null) {
-            tokenRememberMeServices
-                    .setTokenValiditySeconds(tokenValiditySeconds);
-        }
-        if (useSecureCookie != null) {
-            tokenRememberMeServices.setUseSecureCookie(useSecureCookie);
-        }
-        tokenRememberMeServices.afterPropertiesSet();
-        logoutHandler = tokenRememberMeServices;
-        rememberMeServices = tokenRememberMeServices;
-        return tokenRememberMeServices;
-    }
+	/**
+	 * Gets the {@link RememberMeServices} or creates the {@link RememberMeServices}.
+	 * @param http the {@link HttpSecurity} to lookup shared objects
+	 * @param key the {@link #key(String)}
+	 * @return the {@link RememberMeServices} to use
+	 * @throws Exception
+	 */
+	private RememberMeServices getRememberMeServices(H http, String key) throws Exception {
+		if (rememberMeServices != null) {
+			if (rememberMeServices instanceof LogoutHandler && logoutHandler == null) {
+				this.logoutHandler = (LogoutHandler) rememberMeServices;
+			}
+			return rememberMeServices;
+		}
+		AbstractRememberMeServices tokenRememberMeServices = createRememberMeServices(
+				http, key);
+		tokenRememberMeServices.setParameter(rememberMeParameter);
+		tokenRememberMeServices.setCookieName(rememberMeCookieName);
+		if (tokenValiditySeconds != null) {
+			tokenRememberMeServices.setTokenValiditySeconds(tokenValiditySeconds);
+		}
+		if (useSecureCookie != null) {
+			tokenRememberMeServices.setUseSecureCookie(useSecureCookie);
+		}
+		tokenRememberMeServices.afterPropertiesSet();
+		logoutHandler = tokenRememberMeServices;
+		rememberMeServices = tokenRememberMeServices;
+		return tokenRememberMeServices;
+	}
 
-    /**
-     * Creates the {@link RememberMeServices} to use when none is provided. The
-     * result is either {@link PersistentTokenRepository} (if a
-     * {@link PersistentTokenRepository} is specified, else
-     * {@link TokenBasedRememberMeServices}.
-     *
-     * @param http the {@link HttpSecurity} to lookup shared objects
-     * @param key the {@link #key(String)}
-     * @return the {@link RememberMeServices} to use
-     * @throws Exception
-     */
-    private AbstractRememberMeServices createRememberMeServices(
-            H http, String key) throws Exception {
-        return tokenRepository == null ? createTokenBasedRememberMeServices(
-                http, key) : createPersistentRememberMeServices(http, key);
-    }
+	/**
+	 * Creates the {@link RememberMeServices} to use when none is provided. The result is
+	 * either {@link PersistentTokenRepository} (if a {@link PersistentTokenRepository} is
+	 * specified, else {@link TokenBasedRememberMeServices}.
+	 *
+	 * @param http the {@link HttpSecurity} to lookup shared objects
+	 * @param key the {@link #key(String)}
+	 * @return the {@link RememberMeServices} to use
+	 * @throws Exception
+	 */
+	private AbstractRememberMeServices createRememberMeServices(H http, String key)
+			throws Exception {
+		return tokenRepository == null ? createTokenBasedRememberMeServices(http, key)
+				: createPersistentRememberMeServices(http, key);
+	}
 
-    /**
-     * Creates {@link TokenBasedRememberMeServices}
-     *
-     * @param http the {@link HttpSecurity} to lookup shared objects
-     * @param key the {@link #key(String)}
-     * @return the {@link TokenBasedRememberMeServices}
-     */
-    private AbstractRememberMeServices createTokenBasedRememberMeServices(
-            H http, String key) {
-        UserDetailsService userDetailsService = getUserDetailsService(http);
-        return new TokenBasedRememberMeServices(key, userDetailsService);
-    }
+	/**
+	 * Creates {@link TokenBasedRememberMeServices}
+	 *
+	 * @param http the {@link HttpSecurity} to lookup shared objects
+	 * @param key the {@link #key(String)}
+	 * @return the {@link TokenBasedRememberMeServices}
+	 */
+	private AbstractRememberMeServices createTokenBasedRememberMeServices(H http,
+			String key) {
+		UserDetailsService userDetailsService = getUserDetailsService(http);
+		return new TokenBasedRememberMeServices(key, userDetailsService);
+	}
 
-    /**
-     * Creates {@link PersistentTokenBasedRememberMeServices}
-     *
-     * @param http the {@link HttpSecurity} to lookup shared objects
-     * @param key the {@link #key(String)}
-     * @return the {@link PersistentTokenBasedRememberMeServices}
-     */
-    private AbstractRememberMeServices createPersistentRememberMeServices(
-            H http, String key) {
-        UserDetailsService userDetailsService = getUserDetailsService(http);
-        return new PersistentTokenBasedRememberMeServices(key,
-                userDetailsService, tokenRepository);
-    }
+	/**
+	 * Creates {@link PersistentTokenBasedRememberMeServices}
+	 *
+	 * @param http the {@link HttpSecurity} to lookup shared objects
+	 * @param key the {@link #key(String)}
+	 * @return the {@link PersistentTokenBasedRememberMeServices}
+	 */
+	private AbstractRememberMeServices createPersistentRememberMeServices(H http,
+			String key) {
+		UserDetailsService userDetailsService = getUserDetailsService(http);
+		return new PersistentTokenBasedRememberMeServices(key, userDetailsService,
+				tokenRepository);
+	}
 
-    /**
-     * Gets the {@link UserDetailsService} to use. Either the explicitly
-     * configure {@link UserDetailsService} from
-     * {@link #userDetailsService(UserDetailsService)} or a shared object from
-     * {@link HttpSecurity#getSharedObject(Class)}.
-     *
-     * @param http {@link HttpSecurity} to get the shared {@link UserDetailsService}
-     * @return the {@link UserDetailsService} to use
-     */
-    private UserDetailsService getUserDetailsService(H http) {
-        if(userDetailsService == null) {
-            userDetailsService = http.getSharedObject(UserDetailsService.class);
-        }
-        if(userDetailsService == null) {
-            throw new IllegalStateException("userDetailsService cannot be null. Invoke "
-                    + RememberMeConfigurer.class.getSimpleName() + "#userDetailsService(UserDetailsService) or see its javadoc for alternative approaches.");
-        }
-        return userDetailsService;
-    }
+	/**
+	 * Gets the {@link UserDetailsService} to use. Either the explicitly configure
+	 * {@link UserDetailsService} from {@link #userDetailsService(UserDetailsService)} or
+	 * a shared object from {@link HttpSecurity#getSharedObject(Class)}.
+	 *
+	 * @param http {@link HttpSecurity} to get the shared {@link UserDetailsService}
+	 * @return the {@link UserDetailsService} to use
+	 */
+	private UserDetailsService getUserDetailsService(H http) {
+		if (userDetailsService == null) {
+			userDetailsService = http.getSharedObject(UserDetailsService.class);
+		}
+		if (userDetailsService == null) {
+			throw new IllegalStateException(
+					"userDetailsService cannot be null. Invoke "
+							+ RememberMeConfigurer.class.getSimpleName()
+							+ "#userDetailsService(UserDetailsService) or see its javadoc for alternative approaches.");
+		}
+		return userDetailsService;
+	}
 
-    /**
-     * Gets the key to use for validating remember me tokens. Either the value
-     * passed into {@link #key(String)}, or a secure random string if none was
-     * specified.
-     *
-     * @return the remember me key to use
-     */
-    private String getKey() {
-        if (key == null) {
-            key = UUID.randomUUID().toString();
-        }
-        return key;
-    }
+	/**
+	 * Gets the key to use for validating remember me tokens. Either the value passed into
+	 * {@link #key(String)}, or a secure random string if none was specified.
+	 *
+	 * @return the remember me key to use
+	 */
+	private String getKey() {
+		if (key == null) {
+			key = UUID.randomUUID().toString();
+		}
+		return key;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java
index e6c252dfbf..b83c91af3f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java
@@ -35,11 +35,11 @@ import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.accept.HeaderContentNegotiationStrategy;
 
 /**
- * Adds request cache for Spring Security. Specifically this ensures that
- * requests that are saved (i.e. after authentication is required) are later
- * replayed. All properties have reasonable defaults, so no additional
- * configuration is required other than applying this
- * {@link org.springframework.security.config.annotation.SecurityConfigurer}.
+ * Adds request cache for Spring Security. Specifically this ensures that requests that
+ * are saved (i.e. after authentication is required) are later replayed. All properties
+ * have reasonable defaults, so no additional configuration is required other than
+ * applying this {@link org.springframework.security.config.annotation.SecurityConfigurer}
+ * .
  *
  * <h2>Security Filters</h2>
  *
@@ -58,90 +58,96 @@ import org.springframework.web.accept.HeaderContentNegotiationStrategy;
  * The following shared objects are used:
  *
  * <ul>
- * <li>If no explicit {@link RequestCache}, is provided a {@link RequestCache}
- * shared object is used to replay the request after authentication is
- * successful</li>
+ * <li>If no explicit {@link RequestCache}, is provided a {@link RequestCache} shared
+ * object is used to replay the request after authentication is successful</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  * @see RequestCache
  */
-public final class RequestCacheConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<RequestCacheConfigurer<H>,H> {
+public final class RequestCacheConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<RequestCacheConfigurer<H>, H> {
 
-    public RequestCacheConfigurer() {
-    }
+	public RequestCacheConfigurer() {
+	}
 
-    /**
-     * Allows explicit configuration of the {@link RequestCache} to be used. Defaults to try finding a
-     * {@link RequestCache} as a shared object. Then falls back to a {@link HttpSessionRequestCache}.
-     *
-     * @param requestCache the explicit {@link RequestCache} to use
-     * @return the {@link RequestCacheConfigurer} for further customization
-     */
-    public RequestCacheConfigurer<H> requestCache(RequestCache requestCache) {
-        getBuilder().setSharedObject(RequestCache.class, requestCache);
-        return this;
-    }
+	/**
+	 * Allows explicit configuration of the {@link RequestCache} to be used. Defaults to
+	 * try finding a {@link RequestCache} as a shared object. Then falls back to a
+	 * {@link HttpSessionRequestCache}.
+	 *
+	 * @param requestCache the explicit {@link RequestCache} to use
+	 * @return the {@link RequestCacheConfigurer} for further customization
+	 */
+	public RequestCacheConfigurer<H> requestCache(RequestCache requestCache) {
+		getBuilder().setSharedObject(RequestCache.class, requestCache);
+		return this;
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        http.setSharedObject(RequestCache.class, getRequestCache(http));
-    }
+	@Override
+	public void init(H http) throws Exception {
+		http.setSharedObject(RequestCache.class, getRequestCache(http));
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        RequestCache requestCache = getRequestCache(http);
-        RequestCacheAwareFilter requestCacheFilter = new RequestCacheAwareFilter(requestCache);
-        requestCacheFilter = postProcess(requestCacheFilter);
-        http.addFilter(requestCacheFilter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		RequestCache requestCache = getRequestCache(http);
+		RequestCacheAwareFilter requestCacheFilter = new RequestCacheAwareFilter(
+				requestCache);
+		requestCacheFilter = postProcess(requestCacheFilter);
+		http.addFilter(requestCacheFilter);
+	}
 
-    /**
-     * Gets the {@link RequestCache} to use. If one is defined using
-     * {@link #requestCache(org.springframework.security.web.savedrequest.RequestCache)}, then it is used. Otherwise, an
-     * attempt to find a {@link RequestCache} shared object is made. If that fails, an {@link HttpSessionRequestCache}
-     * is used
-     *
-     * @param http the {@link HttpSecurity} to attempt to fined the shared object
-     * @return the {@link RequestCache} to use
-     */
-    private RequestCache getRequestCache(H http) {
-        RequestCache result = http.getSharedObject(RequestCache.class);
-        if(result != null) {
-            return result;
-        }
-        HttpSessionRequestCache defaultCache = new HttpSessionRequestCache();
-        defaultCache.setRequestMatcher(createDefaultSavedRequestMatcher(http));
-        return defaultCache;
-    }
+	/**
+	 * Gets the {@link RequestCache} to use. If one is defined using
+	 * {@link #requestCache(org.springframework.security.web.savedrequest.RequestCache)},
+	 * then it is used. Otherwise, an attempt to find a {@link RequestCache} shared object
+	 * is made. If that fails, an {@link HttpSessionRequestCache} is used
+	 *
+	 * @param http the {@link HttpSecurity} to attempt to fined the shared object
+	 * @return the {@link RequestCache} to use
+	 */
+	private RequestCache getRequestCache(H http) {
+		RequestCache result = http.getSharedObject(RequestCache.class);
+		if (result != null) {
+			return result;
+		}
+		HttpSessionRequestCache defaultCache = new HttpSessionRequestCache();
+		defaultCache.setRequestMatcher(createDefaultSavedRequestMatcher(http));
+		return defaultCache;
+	}
 
-    @SuppressWarnings("unchecked")
-    private RequestMatcher createDefaultSavedRequestMatcher(H http) {
-        ContentNegotiationStrategy contentNegotiationStrategy = http.getSharedObject(ContentNegotiationStrategy.class);
-        if(contentNegotiationStrategy == null) {
-            contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
-        }
+	@SuppressWarnings("unchecked")
+	private RequestMatcher createDefaultSavedRequestMatcher(H http) {
+		ContentNegotiationStrategy contentNegotiationStrategy = http
+				.getSharedObject(ContentNegotiationStrategy.class);
+		if (contentNegotiationStrategy == null) {
+			contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
+		}
 
-        RequestMatcher notFavIcon = new NegatedRequestMatcher(new AntPathRequestMatcher("/**/favicon.ico"));
+		RequestMatcher notFavIcon = new NegatedRequestMatcher(new AntPathRequestMatcher(
+				"/**/favicon.ico"));
 
-        MediaTypeRequestMatcher jsonRequest = new MediaTypeRequestMatcher(contentNegotiationStrategy, MediaType.APPLICATION_JSON);
-        jsonRequest.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
-        RequestMatcher notJson = new NegatedRequestMatcher(jsonRequest);
+		MediaTypeRequestMatcher jsonRequest = new MediaTypeRequestMatcher(
+				contentNegotiationStrategy, MediaType.APPLICATION_JSON);
+		jsonRequest.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+		RequestMatcher notJson = new NegatedRequestMatcher(jsonRequest);
 
-        RequestMatcher notXRequestedWith = new NegatedRequestMatcher(new RequestHeaderRequestMatcher("X-Requested-With","XMLHttpRequest"));
+		RequestMatcher notXRequestedWith = new NegatedRequestMatcher(
+				new RequestHeaderRequestMatcher("X-Requested-With", "XMLHttpRequest"));
 
-        boolean isCsrfEnabled = http.getConfigurer(CsrfConfigurer.class) != null;
+		boolean isCsrfEnabled = http.getConfigurer(CsrfConfigurer.class) != null;
 
-        List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
-        if(isCsrfEnabled) {
-            RequestMatcher getRequests = new AntPathRequestMatcher("/**", "GET");
-            matchers.add(0, getRequests);
-        }
-        matchers.add(notFavIcon);
-        matchers.add(notJson);
-        matchers.add(notXRequestedWith);
+		List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+		if (isCsrfEnabled) {
+			RequestMatcher getRequests = new AntPathRequestMatcher("/**", "GET");
+			matchers.add(0, getRequests);
+		}
+		matchers.add(notFavIcon);
+		matchers.add(notJson);
+		matchers.add(notXRequestedWith);
 
-        return new AndRequestMatcher(matchers);
-    }
+		return new AndRequestMatcher(matchers);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
index 483a6e995c..e90832fb44 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
@@ -26,8 +26,8 @@ import org.springframework.security.web.context.SecurityContextRepository;
 /**
  * Allows persisting and restoring of the {@link SecurityContext} found on the
  * {@link SecurityContextHolder} for each request by configuring the
- * {@link SecurityContextPersistenceFilter}. All properties have reasonable
- * defaults, so no additional configuration is required other than applying this
+ * {@link SecurityContextPersistenceFilter}. All properties have reasonable defaults, so
+ * no additional configuration is required other than applying this
  * {@link org.springframework.security.config.annotation.SecurityConfigurer}.
  *
  * <h2>Security Filters</h2>
@@ -47,10 +47,9 @@ import org.springframework.security.web.context.SecurityContextRepository;
  * The following shared objects are used:
  *
  * <ul>
- * <li>If {@link SessionManagementConfigurer}, is provided and set to always,
- * then the
- * {@link SecurityContextPersistenceFilter#setForceEagerSessionCreation(boolean)}
- * will be set to true.</li>
+ * <li>If {@link SessionManagementConfigurer}, is provided and set to always, then the
+ * {@link SecurityContextPersistenceFilter#setForceEagerSessionCreation(boolean)} will be
+ * set to true.</li>
  * <li>{@link SecurityContextRepository} must be set and is used on
  * {@link SecurityContextPersistenceFilter}.</li>
  * </ul>
@@ -58,39 +57,44 @@ import org.springframework.security.web.context.SecurityContextRepository;
  * @author Rob Winch
  * @since 3.2
  */
-public final class SecurityContextConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<SecurityContextConfigurer<H>,H> {
+public final class SecurityContextConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<SecurityContextConfigurer<H>, H> {
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#securityContext()
-     */
-    public SecurityContextConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#securityContext()
+	 */
+	public SecurityContextConfigurer() {
+	}
 
-    /**
-     * Specifies the shared {@link SecurityContextRepository} that is to be used
-     * @param securityContextRepository the {@link SecurityContextRepository} to use
-     * @return the {@link HttpSecurity} for further customizations
-     */
-    public SecurityContextConfigurer<H> securityContextRepository(SecurityContextRepository securityContextRepository) {
-        getBuilder().setSharedObject(SecurityContextRepository.class, securityContextRepository);
-        return this;
-    }
+	/**
+	 * Specifies the shared {@link SecurityContextRepository} that is to be used
+	 * @param securityContextRepository the {@link SecurityContextRepository} to use
+	 * @return the {@link HttpSecurity} for further customizations
+	 */
+	public SecurityContextConfigurer<H> securityContextRepository(
+			SecurityContextRepository securityContextRepository) {
+		getBuilder().setSharedObject(SecurityContextRepository.class,
+				securityContextRepository);
+		return this;
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void configure(H http) throws Exception {
+	@Override
+	@SuppressWarnings("unchecked")
+	public void configure(H http) throws Exception {
 
-        SecurityContextRepository securityContextRepository = http.getSharedObject(SecurityContextRepository.class);
-        SecurityContextPersistenceFilter securityContextFilter = new SecurityContextPersistenceFilter(
-                securityContextRepository);
-        SessionManagementConfigurer<?> sessionManagement = http.getConfigurer(SessionManagementConfigurer.class);
-        SessionCreationPolicy sessionCreationPolicy = sessionManagement == null ? null
-                : sessionManagement.getSessionCreationPolicy();
-        if (SessionCreationPolicy.ALWAYS == sessionCreationPolicy) {
-            securityContextFilter.setForceEagerSessionCreation(true);
-        }
-        securityContextFilter = postProcess(securityContextFilter);
-        http.addFilter(securityContextFilter);
-    }
+		SecurityContextRepository securityContextRepository = http
+				.getSharedObject(SecurityContextRepository.class);
+		SecurityContextPersistenceFilter securityContextFilter = new SecurityContextPersistenceFilter(
+				securityContextRepository);
+		SessionManagementConfigurer<?> sessionManagement = http
+				.getConfigurer(SessionManagementConfigurer.class);
+		SessionCreationPolicy sessionCreationPolicy = sessionManagement == null ? null
+				: sessionManagement.getSessionCreationPolicy();
+		if (SessionCreationPolicy.ALWAYS == sessionCreationPolicy) {
+			securityContextFilter.setForceEagerSessionCreation(true);
+		}
+		securityContextFilter = postProcess(securityContextFilter);
+		http.addFilter(securityContextFilter);
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
index 9ffcd7b570..9dc3abf13e 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
@@ -30,7 +30,8 @@ import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
 
 /**
- * Implements select methods from the {@link HttpServletRequest} using the {@link SecurityContext} from the {@link SecurityContextHolder}.
+ * Implements select methods from the {@link HttpServletRequest} using the
+ * {@link SecurityContext} from the {@link SecurityContextHolder}.
  *
  * <h2>Security Filters</h2>
  *
@@ -47,42 +48,50 @@ import org.springframework.security.web.servletapi.SecurityContextHolderAwareReq
  * <h2>Shared Objects Used</h2>
  *
  * <ul>
- * <li>{@link AuthenticationTrustResolver} is optionally used to populate the {@link SecurityContextHolderAwareRequestFilter}</li>
+ * <li>{@link AuthenticationTrustResolver} is optionally used to populate the
+ * {@link SecurityContextHolderAwareRequestFilter}</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class ServletApiConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<ServletApiConfigurer<H>,H> {
-    private SecurityContextHolderAwareRequestFilter securityContextRequestFilter = new SecurityContextHolderAwareRequestFilter();
+public final class ServletApiConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<ServletApiConfigurer<H>, H> {
+	private SecurityContextHolderAwareRequestFilter securityContextRequestFilter = new SecurityContextHolderAwareRequestFilter();
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#servletApi()
-     */
-    public ServletApiConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#servletApi()
+	 */
+	public ServletApiConfigurer() {
+	}
 
-    public ServletApiConfigurer<H> rolePrefix(String rolePrefix) {
-        securityContextRequestFilter.setRolePrefix(rolePrefix);
-        return this;
-    }
+	public ServletApiConfigurer<H> rolePrefix(String rolePrefix) {
+		securityContextRequestFilter.setRolePrefix(rolePrefix);
+		return this;
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public void configure(H http) throws Exception {
-        securityContextRequestFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class));
-        ExceptionHandlingConfigurer<H> exceptionConf = http.getConfigurer(ExceptionHandlingConfigurer.class);
-        AuthenticationEntryPoint authenticationEntryPoint = exceptionConf == null ? null : exceptionConf.getAuthenticationEntryPoint(http);
-        securityContextRequestFilter.setAuthenticationEntryPoint(authenticationEntryPoint);
-        LogoutConfigurer<H> logoutConf = http.getConfigurer(LogoutConfigurer.class);
-        List<LogoutHandler> logoutHandlers = logoutConf == null ? null : logoutConf.getLogoutHandlers();
-        securityContextRequestFilter.setLogoutHandlers(logoutHandlers);
-        AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class);
-        if(trustResolver != null) {
-            securityContextRequestFilter.setTrustResolver(trustResolver);
-        }
-        securityContextRequestFilter = postProcess(securityContextRequestFilter);
-        http.addFilter(securityContextRequestFilter);
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	public void configure(H http) throws Exception {
+		securityContextRequestFilter.setAuthenticationManager(http
+				.getSharedObject(AuthenticationManager.class));
+		ExceptionHandlingConfigurer<H> exceptionConf = http
+				.getConfigurer(ExceptionHandlingConfigurer.class);
+		AuthenticationEntryPoint authenticationEntryPoint = exceptionConf == null ? null
+				: exceptionConf.getAuthenticationEntryPoint(http);
+		securityContextRequestFilter
+				.setAuthenticationEntryPoint(authenticationEntryPoint);
+		LogoutConfigurer<H> logoutConf = http.getConfigurer(LogoutConfigurer.class);
+		List<LogoutHandler> logoutHandlers = logoutConf == null ? null : logoutConf
+				.getLogoutHandlers();
+		securityContextRequestFilter.setLogoutHandlers(logoutHandlers);
+		AuthenticationTrustResolver trustResolver = http
+				.getSharedObject(AuthenticationTrustResolver.class);
+		if (trustResolver != null) {
+			securityContextRequestFilter.setTrustResolver(trustResolver);
+		}
+		securityContextRequestFilter = postProcess(securityContextRequestFilter);
+		http.addFilter(securityContextRequestFilter);
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
index 7098eb2d79..a711ac7f81 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
@@ -61,7 +61,8 @@ import org.springframework.util.Assert;
  *
  * <ul>
  * <li>{@link SessionManagementFilter}</li>
- * <li>{@link ConcurrentSessionFilter} if there are restrictions on how many concurrent sessions a user can have</li>
+ * <li>{@link ConcurrentSessionFilter} if there are restrictions on how many concurrent
+ * sessions a user can have</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
@@ -79,7 +80,8 @@ import org.springframework.util.Assert;
  *
  * <ul>
  * <li>{@link SecurityContextRepository}</li>
- * <li>{@link AuthenticationTrustResolver} is optionally used to populate the {@link HttpSessionSecurityContextRepository} and {@link SessionManagementFilter}</li>
+ * <li>{@link AuthenticationTrustResolver} is optionally used to populate the
+ * {@link HttpSessionSecurityContextRepository} and {@link SessionManagementFilter}</li>
  * </ul>
  *
  * @author Rob Winch
@@ -87,430 +89,459 @@ import org.springframework.util.Assert;
  * @see SessionManagementFilter
  * @see ConcurrentSessionFilter
  */
-public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<SessionManagementConfigurer<H>,H> {
-    private SessionAuthenticationStrategy sessionFixationAuthenticationStrategy = createDefaultSessionFixationProtectionStrategy();
-    private SessionAuthenticationStrategy sessionAuthenticationStrategy;
-    private InvalidSessionStrategy invalidSessionStrategy;
-    private List<SessionAuthenticationStrategy> sessionAuthenticationStrategies = new ArrayList<SessionAuthenticationStrategy>();
-    private SessionRegistry sessionRegistry;
-    private Integer maximumSessions;
-    private String expiredUrl;
-    private boolean maxSessionsPreventsLogin;
-    private SessionCreationPolicy sessionPolicy = SessionCreationPolicy.IF_REQUIRED;
-    private boolean enableSessionUrlRewriting;
-    private String invalidSessionUrl;
-    private String sessionAuthenticationErrorUrl;
+public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<SessionManagementConfigurer<H>, H> {
+	private SessionAuthenticationStrategy sessionFixationAuthenticationStrategy = createDefaultSessionFixationProtectionStrategy();
+	private SessionAuthenticationStrategy sessionAuthenticationStrategy;
+	private InvalidSessionStrategy invalidSessionStrategy;
+	private List<SessionAuthenticationStrategy> sessionAuthenticationStrategies = new ArrayList<SessionAuthenticationStrategy>();
+	private SessionRegistry sessionRegistry;
+	private Integer maximumSessions;
+	private String expiredUrl;
+	private boolean maxSessionsPreventsLogin;
+	private SessionCreationPolicy sessionPolicy = SessionCreationPolicy.IF_REQUIRED;
+	private boolean enableSessionUrlRewriting;
+	private String invalidSessionUrl;
+	private String sessionAuthenticationErrorUrl;
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#sessionManagement()
-     */
-    public SessionManagementConfigurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#sessionManagement()
+	 */
+	public SessionManagementConfigurer() {
+	}
 
-    /**
-     * Setting this attribute will inject the {@link SessionManagementFilter} with a
-     * {@link SimpleRedirectInvalidSessionStrategy} configured with the attribute value.
-     * When an invalid session ID is submitted, the strategy will be invoked,
-     * redirecting to the configured URL.
-     *
-     * @param invalidSessionUrl the URL to redirect to when an invalid session is detected
-     * @return the {@link SessionManagementConfigurer} for further customization
-     */
-    public SessionManagementConfigurer<H> invalidSessionUrl(String invalidSessionUrl) {
-        this.invalidSessionUrl = invalidSessionUrl;
-        return this;
-    }
+	/**
+	 * Setting this attribute will inject the {@link SessionManagementFilter} with a
+	 * {@link SimpleRedirectInvalidSessionStrategy} configured with the attribute value.
+	 * When an invalid session ID is submitted, the strategy will be invoked, redirecting
+	 * to the configured URL.
+	 *
+	 * @param invalidSessionUrl the URL to redirect to when an invalid session is detected
+	 * @return the {@link SessionManagementConfigurer} for further customization
+	 */
+	public SessionManagementConfigurer<H> invalidSessionUrl(String invalidSessionUrl) {
+		this.invalidSessionUrl = invalidSessionUrl;
+		return this;
+	}
 
-    /**
-     * Defines the URL of the error page which should be shown when the
-     * SessionAuthenticationStrategy raises an exception. If not set, an
-     * unauthorized (402) error code will be returned to the client. Note that
-     * this attribute doesn't apply if the error occurs during a form-based
-     * login, where the URL for authentication failure will take precedence.
-     *
-     * @param sessionAuthenticationErrorUrl
-     *            the URL to redirect to
-     * @return the {@link SessionManagementConfigurer} for further customization
-     */
-    public SessionManagementConfigurer<H> sessionAuthenticationErrorUrl(String sessionAuthenticationErrorUrl) {
-        this.sessionAuthenticationErrorUrl = sessionAuthenticationErrorUrl;
-        return this;
-    }
+	/**
+	 * Defines the URL of the error page which should be shown when the
+	 * SessionAuthenticationStrategy raises an exception. If not set, an unauthorized
+	 * (402) error code will be returned to the client. Note that this attribute doesn't
+	 * apply if the error occurs during a form-based login, where the URL for
+	 * authentication failure will take precedence.
+	 *
+	 * @param sessionAuthenticationErrorUrl the URL to redirect to
+	 * @return the {@link SessionManagementConfigurer} for further customization
+	 */
+	public SessionManagementConfigurer<H> sessionAuthenticationErrorUrl(
+			String sessionAuthenticationErrorUrl) {
+		this.sessionAuthenticationErrorUrl = sessionAuthenticationErrorUrl;
+		return this;
+	}
 
-    /**
-     * If set to true, allows HTTP sessions to be rewritten in the URLs when
-     * using {@link HttpServletResponse#encodeRedirectURL(String)} or
-     * {@link HttpServletResponse#encodeURL(String)}, otherwise disallows HTTP
-     * sessions to be included in the URL. This prevents leaking information to
-     * external domains.
-     *
-     * @param enableSessionUrlRewriting true if should allow the JSESSIONID to be rewritten into the URLs, else false (default)
-     * @return the {@link SessionManagementConfigurer} for further customization
-     * @see HttpSessionSecurityContextRepository#setDisableUrlRewriting(boolean)
-     */
-    public SessionManagementConfigurer<H> enableSessionUrlRewriting(boolean enableSessionUrlRewriting) {
-        this.enableSessionUrlRewriting = enableSessionUrlRewriting;
-        return this;
-    }
+	/**
+	 * If set to true, allows HTTP sessions to be rewritten in the URLs when using
+	 * {@link HttpServletResponse#encodeRedirectURL(String)} or
+	 * {@link HttpServletResponse#encodeURL(String)}, otherwise disallows HTTP sessions to
+	 * be included in the URL. This prevents leaking information to external domains.
+	 *
+	 * @param enableSessionUrlRewriting true if should allow the JSESSIONID to be
+	 * rewritten into the URLs, else false (default)
+	 * @return the {@link SessionManagementConfigurer} for further customization
+	 * @see HttpSessionSecurityContextRepository#setDisableUrlRewriting(boolean)
+	 */
+	public SessionManagementConfigurer<H> enableSessionUrlRewriting(
+			boolean enableSessionUrlRewriting) {
+		this.enableSessionUrlRewriting = enableSessionUrlRewriting;
+		return this;
+	}
 
-    /**
-     * Allows specifying the {@link SessionCreationPolicy}
-     * @param sessionCreationPolicy the {@link SessionCreationPolicy} to use. Cannot be null.
-     * @return the {@link SessionManagementConfigurer} for further customizations
-     * @see SessionCreationPolicy
-     * @throws IllegalArgumentException if {@link SessionCreationPolicy} is null.
-     */
-    public SessionManagementConfigurer<H> sessionCreationPolicy(SessionCreationPolicy sessionCreationPolicy) {
-        Assert.notNull(sessionCreationPolicy, "sessionCreationPolicy cannot be null");
-        this.sessionPolicy = sessionCreationPolicy;
-        return this;
-    }
+	/**
+	 * Allows specifying the {@link SessionCreationPolicy}
+	 * @param sessionCreationPolicy the {@link SessionCreationPolicy} to use. Cannot be
+	 * null.
+	 * @return the {@link SessionManagementConfigurer} for further customizations
+	 * @see SessionCreationPolicy
+	 * @throws IllegalArgumentException if {@link SessionCreationPolicy} is null.
+	 */
+	public SessionManagementConfigurer<H> sessionCreationPolicy(
+			SessionCreationPolicy sessionCreationPolicy) {
+		Assert.notNull(sessionCreationPolicy, "sessionCreationPolicy cannot be null");
+		this.sessionPolicy = sessionCreationPolicy;
+		return this;
+	}
 
-    /**
-     * Allows explicitly specifying the {@link SessionAuthenticationStrategy}.
-     * The default is to use {@link SessionFixationProtectionStrategy}. If
-     * restricting the maximum number of sessions is configured, then
-     * {@link CompositeSessionAuthenticationStrategy} delegating to
-     * {@link ConcurrentSessionControlAuthenticationStrategy},
-     * {@link SessionFixationProtectionStrategy} (optional), and
-     * {@link RegisterSessionAuthenticationStrategy} will be used.
-     *
-     * @param sessionAuthenticationStrategy
-     * @return the {@link SessionManagementConfigurer} for further
-     *         customizations
-     */
-    public SessionManagementConfigurer<H> sessionAuthenticationStrategy(SessionAuthenticationStrategy sessionAuthenticationStrategy) {
-        this.sessionFixationAuthenticationStrategy = sessionAuthenticationStrategy;
-        return this;
-    }
+	/**
+	 * Allows explicitly specifying the {@link SessionAuthenticationStrategy}. The default
+	 * is to use {@link SessionFixationProtectionStrategy}. If restricting the maximum
+	 * number of sessions is configured, then
+	 * {@link CompositeSessionAuthenticationStrategy} delegating to
+	 * {@link ConcurrentSessionControlAuthenticationStrategy},
+	 * {@link SessionFixationProtectionStrategy} (optional), and
+	 * {@link RegisterSessionAuthenticationStrategy} will be used.
+	 *
+	 * @param sessionAuthenticationStrategy
+	 * @return the {@link SessionManagementConfigurer} for further customizations
+	 */
+	public SessionManagementConfigurer<H> sessionAuthenticationStrategy(
+			SessionAuthenticationStrategy sessionAuthenticationStrategy) {
+		this.sessionFixationAuthenticationStrategy = sessionAuthenticationStrategy;
+		return this;
+	}
 
-    /**
-     * Adds an additional {@link SessionAuthenticationStrategy} to be used within the {@link CompositeSessionAuthenticationStrategy}.
-     *
-     * @param sessionAuthenticationStrategy
-     * @return the {@link SessionManagementConfigurer} for further
-     *         customizations
-     */
-    SessionManagementConfigurer<H> addSessionAuthenticationStrategy(SessionAuthenticationStrategy sessionAuthenticationStrategy) {
-        this.sessionAuthenticationStrategies.add(sessionAuthenticationStrategy);
-        return this;
-    }
+	/**
+	 * Adds an additional {@link SessionAuthenticationStrategy} to be used within the
+	 * {@link CompositeSessionAuthenticationStrategy}.
+	 *
+	 * @param sessionAuthenticationStrategy
+	 * @return the {@link SessionManagementConfigurer} for further customizations
+	 */
+	SessionManagementConfigurer<H> addSessionAuthenticationStrategy(
+			SessionAuthenticationStrategy sessionAuthenticationStrategy) {
+		this.sessionAuthenticationStrategies.add(sessionAuthenticationStrategy);
+		return this;
+	}
 
-    public SessionFixationConfigurer sessionFixation() {
-        return new SessionFixationConfigurer();
-    }
+	public SessionFixationConfigurer sessionFixation() {
+		return new SessionFixationConfigurer();
+	}
 
-    /**
-     * Controls the maximum number of sessions for a user. The default is to allow any number of users.
-     * @param maximumSessions the maximum number of sessions for a user
-     * @return the {@link SessionManagementConfigurer} for further customizations
-     */
-    public ConcurrencyControlConfigurer maximumSessions(int maximumSessions) {
-        this.maximumSessions = maximumSessions;
-        return new ConcurrencyControlConfigurer();
-    }
+	/**
+	 * Controls the maximum number of sessions for a user. The default is to allow any
+	 * number of users.
+	 * @param maximumSessions the maximum number of sessions for a user
+	 * @return the {@link SessionManagementConfigurer} for further customizations
+	 */
+	public ConcurrencyControlConfigurer maximumSessions(int maximumSessions) {
+		this.maximumSessions = maximumSessions;
+		return new ConcurrencyControlConfigurer();
+	}
 
-    /**
-     * Invokes {@link #postProcess(Object)} and sets the {@link SessionAuthenticationStrategy} for session fixation.
-     * @param sessionFixationAuthenticationStrategy
-     */
-    private void setSessionFixationAuthenticationStrategy(SessionAuthenticationStrategy sessionFixationAuthenticationStrategy) {
-        this.sessionFixationAuthenticationStrategy = postProcess(sessionFixationAuthenticationStrategy);
-    }
+	/**
+	 * Invokes {@link #postProcess(Object)} and sets the
+	 * {@link SessionAuthenticationStrategy} for session fixation.
+	 * @param sessionFixationAuthenticationStrategy
+	 */
+	private void setSessionFixationAuthenticationStrategy(
+			SessionAuthenticationStrategy sessionFixationAuthenticationStrategy) {
+		this.sessionFixationAuthenticationStrategy = postProcess(sessionFixationAuthenticationStrategy);
+	}
 
-    /**
-     * Allows configuring SessionFixation protection
-     *
-     * @author Rob Winch
-     */
-    public final class SessionFixationConfigurer {
-        /**
-         * Specifies that a new session should be created, but the session
-         * attributes from the original {@link HttpSession} should not be
-         * retained.
-         *
-         * @return the {@link SessionManagementConfigurer} for further customizations
-         */
-        public SessionManagementConfigurer<H> newSession() {
-            SessionFixationProtectionStrategy sessionFixationProtectionStrategy = new SessionFixationProtectionStrategy();
-            sessionFixationProtectionStrategy.setMigrateSessionAttributes(false);
-            setSessionFixationAuthenticationStrategy(sessionFixationProtectionStrategy);
-            return SessionManagementConfigurer.this;
-        }
+	/**
+	 * Allows configuring SessionFixation protection
+	 *
+	 * @author Rob Winch
+	 */
+	public final class SessionFixationConfigurer {
+		/**
+		 * Specifies that a new session should be created, but the session attributes from
+		 * the original {@link HttpSession} should not be retained.
+		 *
+		 * @return the {@link SessionManagementConfigurer} for further customizations
+		 */
+		public SessionManagementConfigurer<H> newSession() {
+			SessionFixationProtectionStrategy sessionFixationProtectionStrategy = new SessionFixationProtectionStrategy();
+			sessionFixationProtectionStrategy.setMigrateSessionAttributes(false);
+			setSessionFixationAuthenticationStrategy(sessionFixationProtectionStrategy);
+			return SessionManagementConfigurer.this;
+		}
 
-        /**
-         * Specifies that a new session should be created and the session
-         * attributes from the original {@link HttpSession} should be
-         * retained.
-         *
-         * @return the {@link SessionManagementConfigurer} for further customizations
-         */
-        public SessionManagementConfigurer<H> migrateSession() {
-            setSessionFixationAuthenticationStrategy(new SessionFixationProtectionStrategy());
-            return SessionManagementConfigurer.this;
-        }
+		/**
+		 * Specifies that a new session should be created and the session attributes from
+		 * the original {@link HttpSession} should be retained.
+		 *
+		 * @return the {@link SessionManagementConfigurer} for further customizations
+		 */
+		public SessionManagementConfigurer<H> migrateSession() {
+			setSessionFixationAuthenticationStrategy(new SessionFixationProtectionStrategy());
+			return SessionManagementConfigurer.this;
+		}
 
-        /**
-         * Specifies that the Servlet container-provided session fixation
-         * protection should be used. When a session authenticates, the
-         * Servlet 3.1 method {@code HttpServletRequest#changeSessionId()} is
-         * called to change the session ID and retain all session attributes.
-         * Using this option in a Servlet 3.0 or older container results in an
-         * {@link IllegalStateException}.
-         *
-         * @return the {@link SessionManagementConfigurer} for further
-         *         customizations
-         * @throws IllegalStateException if the container is not Servlet 3.1 or
-         *         newer.
-         */
-        public SessionManagementConfigurer<H> changeSessionId() {
-            setSessionFixationAuthenticationStrategy(new ChangeSessionIdAuthenticationStrategy());
-            return SessionManagementConfigurer.this;
-        }
+		/**
+		 * Specifies that the Servlet container-provided session fixation protection
+		 * should be used. When a session authenticates, the Servlet 3.1 method
+		 * {@code HttpServletRequest#changeSessionId()} is called to change the session ID
+		 * and retain all session attributes. Using this option in a Servlet 3.0 or older
+		 * container results in an {@link IllegalStateException}.
+		 *
+		 * @return the {@link SessionManagementConfigurer} for further customizations
+		 * @throws IllegalStateException if the container is not Servlet 3.1 or newer.
+		 */
+		public SessionManagementConfigurer<H> changeSessionId() {
+			setSessionFixationAuthenticationStrategy(new ChangeSessionIdAuthenticationStrategy());
+			return SessionManagementConfigurer.this;
+		}
 
-        /**
-         * Specifies that no session fixation protection should be enabled. This
-         * may be useful when utilizing other mechanisms for protecting against
-         * session fixation. For example, if application container session
-         * fixation protection is already in use. Otherwise, this option is not
-         * recommended.
-         *
-         * @return the {@link SessionManagementConfigurer} for further
-         *         customizations
-         */
-        public SessionManagementConfigurer<H> none() {
-            setSessionFixationAuthenticationStrategy(new NullAuthenticatedSessionStrategy());
-            return SessionManagementConfigurer.this;
-        }
-    }
+		/**
+		 * Specifies that no session fixation protection should be enabled. This may be
+		 * useful when utilizing other mechanisms for protecting against session fixation.
+		 * For example, if application container session fixation protection is already in
+		 * use. Otherwise, this option is not recommended.
+		 *
+		 * @return the {@link SessionManagementConfigurer} for further customizations
+		 */
+		public SessionManagementConfigurer<H> none() {
+			setSessionFixationAuthenticationStrategy(new NullAuthenticatedSessionStrategy());
+			return SessionManagementConfigurer.this;
+		}
+	}
 
-    /**
-     * Allows configuring controlling of multiple sessions.
-     *
-     * @author Rob Winch
-     */
-    public final class ConcurrencyControlConfigurer {
+	/**
+	 * Allows configuring controlling of multiple sessions.
+	 *
+	 * @author Rob Winch
+	 */
+	public final class ConcurrencyControlConfigurer {
 
-        /**
-         * The URL to redirect to if a user tries to access a resource and their
-         * session has been expired due to too many sessions for the current user.
-         * The default is to write a simple error message to the response.
-         *
-         * @param expiredUrl the URL to redirect to
-         * @return the {@link ConcurrencyControlConfigurer} for further customizations
-         */
-        public ConcurrencyControlConfigurer expiredUrl(String expiredUrl) {
-            SessionManagementConfigurer.this.expiredUrl = expiredUrl;
-            return this;
-        }
+		/**
+		 * The URL to redirect to if a user tries to access a resource and their session
+		 * has been expired due to too many sessions for the current user. The default is
+		 * to write a simple error message to the response.
+		 *
+		 * @param expiredUrl the URL to redirect to
+		 * @return the {@link ConcurrencyControlConfigurer} for further customizations
+		 */
+		public ConcurrencyControlConfigurer expiredUrl(String expiredUrl) {
+			SessionManagementConfigurer.this.expiredUrl = expiredUrl;
+			return this;
+		}
 
-        /**
-         * If true, prevents a user from authenticating when the
-         * {@link #maximumSessions(int)} has been reached. Otherwise (default), the user who
-         * authenticates is allowed access and an existing user's session is
-         * expired. The user's who's session is forcibly expired is sent to
-         * {@link #expiredUrl(String)}. The advantage of this approach is if a user
-         * accidentally does not log out, there is no need for an administrator to
-         * intervene or wait till their session expires.
-         *
-         * @param maxSessionsPreventsLogin true to have an error at time of authentication, else false (default)
-         * @return the {@link ConcurrencyControlConfigurer} for further customizations
-         */
-        public ConcurrencyControlConfigurer maxSessionsPreventsLogin(boolean maxSessionsPreventsLogin) {
-            SessionManagementConfigurer.this.maxSessionsPreventsLogin = maxSessionsPreventsLogin;
-            return this;
-        }
+		/**
+		 * If true, prevents a user from authenticating when the
+		 * {@link #maximumSessions(int)} has been reached. Otherwise (default), the user
+		 * who authenticates is allowed access and an existing user's session is expired.
+		 * The user's who's session is forcibly expired is sent to
+		 * {@link #expiredUrl(String)}. The advantage of this approach is if a user
+		 * accidentally does not log out, there is no need for an administrator to
+		 * intervene or wait till their session expires.
+		 *
+		 * @param maxSessionsPreventsLogin true to have an error at time of
+		 * authentication, else false (default)
+		 * @return the {@link ConcurrencyControlConfigurer} for further customizations
+		 */
+		public ConcurrencyControlConfigurer maxSessionsPreventsLogin(
+				boolean maxSessionsPreventsLogin) {
+			SessionManagementConfigurer.this.maxSessionsPreventsLogin = maxSessionsPreventsLogin;
+			return this;
+		}
 
-        /**
-         * Controls the {@link SessionRegistry} implementation used. The default
-         * is {@link SessionRegistryImpl} which is an in memory implementation.
-         *
-         * @param sessionRegistry the {@link SessionRegistry} to use
-         * @return the {@link ConcurrencyControlConfigurer} for further customizations
-         */
-        public ConcurrencyControlConfigurer sessionRegistry(SessionRegistry sessionRegistry) {
-            SessionManagementConfigurer.this.sessionRegistry = sessionRegistry;
-            return this;
-        }
+		/**
+		 * Controls the {@link SessionRegistry} implementation used. The default is
+		 * {@link SessionRegistryImpl} which is an in memory implementation.
+		 *
+		 * @param sessionRegistry the {@link SessionRegistry} to use
+		 * @return the {@link ConcurrencyControlConfigurer} for further customizations
+		 */
+		public ConcurrencyControlConfigurer sessionRegistry(
+				SessionRegistry sessionRegistry) {
+			SessionManagementConfigurer.this.sessionRegistry = sessionRegistry;
+			return this;
+		}
 
-        /**
-         * Used to chain back to the {@link SessionManagementConfigurer}
-         *
-         * @return the {@link SessionManagementConfigurer} for further customizations
-         */
-        public SessionManagementConfigurer<H> and() {
-            return SessionManagementConfigurer.this;
-        }
+		/**
+		 * Used to chain back to the {@link SessionManagementConfigurer}
+		 *
+		 * @return the {@link SessionManagementConfigurer} for further customizations
+		 */
+		public SessionManagementConfigurer<H> and() {
+			return SessionManagementConfigurer.this;
+		}
 
-        private ConcurrencyControlConfigurer() {}
-    }
+		private ConcurrencyControlConfigurer() {
+		}
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        SecurityContextRepository securityContextRepository = http.getSharedObject(SecurityContextRepository.class);
-        boolean stateless = isStateless();
+	@Override
+	public void init(H http) throws Exception {
+		SecurityContextRepository securityContextRepository = http
+				.getSharedObject(SecurityContextRepository.class);
+		boolean stateless = isStateless();
 
-        if(securityContextRepository == null) {
-            if(stateless) {
-                http.setSharedObject(SecurityContextRepository.class, new NullSecurityContextRepository());
-            } else {
-                HttpSessionSecurityContextRepository httpSecurityRepository = new HttpSessionSecurityContextRepository();
-                httpSecurityRepository.setDisableUrlRewriting(!enableSessionUrlRewriting);
-                httpSecurityRepository.setAllowSessionCreation(isAllowSessionCreation());
-                AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class);
-                if(trustResolver != null) {
-                    httpSecurityRepository.setTrustResolver(trustResolver);
-                }
-                http.setSharedObject(SecurityContextRepository.class, httpSecurityRepository);
-            }
-        }
+		if (securityContextRepository == null) {
+			if (stateless) {
+				http.setSharedObject(SecurityContextRepository.class,
+						new NullSecurityContextRepository());
+			}
+			else {
+				HttpSessionSecurityContextRepository httpSecurityRepository = new HttpSessionSecurityContextRepository();
+				httpSecurityRepository.setDisableUrlRewriting(!enableSessionUrlRewriting);
+				httpSecurityRepository.setAllowSessionCreation(isAllowSessionCreation());
+				AuthenticationTrustResolver trustResolver = http
+						.getSharedObject(AuthenticationTrustResolver.class);
+				if (trustResolver != null) {
+					httpSecurityRepository.setTrustResolver(trustResolver);
+				}
+				http.setSharedObject(SecurityContextRepository.class,
+						httpSecurityRepository);
+			}
+		}
 
-        RequestCache requestCache = http.getSharedObject(RequestCache.class);
-        if(requestCache == null) {
-            if(stateless) {
-                http.setSharedObject(RequestCache.class, new NullRequestCache());
-            }
-        }
-        http.setSharedObject(SessionAuthenticationStrategy.class, getSessionAuthenticationStrategy(http));
-        http.setSharedObject(InvalidSessionStrategy.class, getInvalidSessionStrategy());
-    }
+		RequestCache requestCache = http.getSharedObject(RequestCache.class);
+		if (requestCache == null) {
+			if (stateless) {
+				http.setSharedObject(RequestCache.class, new NullRequestCache());
+			}
+		}
+		http.setSharedObject(SessionAuthenticationStrategy.class,
+				getSessionAuthenticationStrategy(http));
+		http.setSharedObject(InvalidSessionStrategy.class, getInvalidSessionStrategy());
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        SecurityContextRepository securityContextRepository = http.getSharedObject(SecurityContextRepository.class);
-        SessionManagementFilter sessionManagementFilter = new SessionManagementFilter(securityContextRepository, getSessionAuthenticationStrategy(http));
-        if(sessionAuthenticationErrorUrl != null) {
-            sessionManagementFilter.setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler(sessionAuthenticationErrorUrl));
-        }
-        if(invalidSessionUrl != null) {
-            sessionManagementFilter.setInvalidSessionStrategy(getInvalidSessionStrategy());
-        }
-        AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class);
-        if(trustResolver != null) {
-            sessionManagementFilter.setTrustResolver(trustResolver);
-        }
-        sessionManagementFilter = postProcess(sessionManagementFilter);
+	@Override
+	public void configure(H http) throws Exception {
+		SecurityContextRepository securityContextRepository = http
+				.getSharedObject(SecurityContextRepository.class);
+		SessionManagementFilter sessionManagementFilter = new SessionManagementFilter(
+				securityContextRepository, getSessionAuthenticationStrategy(http));
+		if (sessionAuthenticationErrorUrl != null) {
+			sessionManagementFilter
+					.setAuthenticationFailureHandler(new SimpleUrlAuthenticationFailureHandler(
+							sessionAuthenticationErrorUrl));
+		}
+		if (invalidSessionUrl != null) {
+			sessionManagementFilter
+					.setInvalidSessionStrategy(getInvalidSessionStrategy());
+		}
+		AuthenticationTrustResolver trustResolver = http
+				.getSharedObject(AuthenticationTrustResolver.class);
+		if (trustResolver != null) {
+			sessionManagementFilter.setTrustResolver(trustResolver);
+		}
+		sessionManagementFilter = postProcess(sessionManagementFilter);
 
-        http.addFilter(sessionManagementFilter);
-        if(isConcurrentSessionControlEnabled()) {
-            ConcurrentSessionFilter concurrentSessionFilter = new ConcurrentSessionFilter(getSessionRegistry(http), expiredUrl);
-            concurrentSessionFilter = postProcess(concurrentSessionFilter);
-            http.addFilter(concurrentSessionFilter);
-        }
-    }
+		http.addFilter(sessionManagementFilter);
+		if (isConcurrentSessionControlEnabled()) {
+			ConcurrentSessionFilter concurrentSessionFilter = new ConcurrentSessionFilter(
+					getSessionRegistry(http), expiredUrl);
+			concurrentSessionFilter = postProcess(concurrentSessionFilter);
+			http.addFilter(concurrentSessionFilter);
+		}
+	}
 
-    /**
-     * Gets the {@link InvalidSessionStrategy} to use. If
-     * {@link #invalidSessionUrl} is null, returns null otherwise
-     * {@link SimpleRedirectInvalidSessionStrategy} is used.
-     *
-     * @return the {@link InvalidSessionStrategy} to use
-     */
-    InvalidSessionStrategy getInvalidSessionStrategy() {
-        if(invalidSessionUrl == null) {
-            return null;
-        }
-        if(invalidSessionStrategy == null) {
-            invalidSessionStrategy = new SimpleRedirectInvalidSessionStrategy(invalidSessionUrl);
-        }
-        return invalidSessionStrategy;
-    }
+	/**
+	 * Gets the {@link InvalidSessionStrategy} to use. If {@link #invalidSessionUrl} is
+	 * null, returns null otherwise {@link SimpleRedirectInvalidSessionStrategy} is used.
+	 *
+	 * @return the {@link InvalidSessionStrategy} to use
+	 */
+	InvalidSessionStrategy getInvalidSessionStrategy() {
+		if (invalidSessionUrl == null) {
+			return null;
+		}
+		if (invalidSessionStrategy == null) {
+			invalidSessionStrategy = new SimpleRedirectInvalidSessionStrategy(
+					invalidSessionUrl);
+		}
+		return invalidSessionStrategy;
+	}
 
-    /**
-     * Gets the {@link SessionCreationPolicy}. Can not be null.
-     * @return the {@link SessionCreationPolicy}
-     */
-    SessionCreationPolicy getSessionCreationPolicy() {
-        return sessionPolicy;
-    }
+	/**
+	 * Gets the {@link SessionCreationPolicy}. Can not be null.
+	 * @return the {@link SessionCreationPolicy}
+	 */
+	SessionCreationPolicy getSessionCreationPolicy() {
+		return sessionPolicy;
+	}
 
-    /**
-     * Returns true if the {@link SessionCreationPolicy} allows session creation, else false
-     * @return true if the {@link SessionCreationPolicy} allows session creation
-     */
-    private boolean isAllowSessionCreation() {
-        return SessionCreationPolicy.ALWAYS == sessionPolicy || SessionCreationPolicy.IF_REQUIRED == sessionPolicy;
-    }
+	/**
+	 * Returns true if the {@link SessionCreationPolicy} allows session creation, else
+	 * false
+	 * @return true if the {@link SessionCreationPolicy} allows session creation
+	 */
+	private boolean isAllowSessionCreation() {
+		return SessionCreationPolicy.ALWAYS == sessionPolicy
+				|| SessionCreationPolicy.IF_REQUIRED == sessionPolicy;
+	}
 
-    /**
-     * Returns true if the {@link SessionCreationPolicy} is stateless
-     * @return
-     */
-    private boolean isStateless() {
-        return SessionCreationPolicy.STATELESS == sessionPolicy;
-    }
+	/**
+	 * Returns true if the {@link SessionCreationPolicy} is stateless
+	 * @return
+	 */
+	private boolean isStateless() {
+		return SessionCreationPolicy.STATELESS == sessionPolicy;
+	}
 
-    /**
-     * Gets the customized {@link SessionAuthenticationStrategy} if
-     * {@link #sessionAuthenticationStrategy(SessionAuthenticationStrategy)} was
-     * specified. Otherwise creates a default
-     * {@link SessionAuthenticationStrategy}.
-     *
-     * @return the {@link SessionAuthenticationStrategy} to use
-     */
-    private SessionAuthenticationStrategy getSessionAuthenticationStrategy(H http) {
-        if(sessionAuthenticationStrategy != null) {
-            return sessionAuthenticationStrategy;
-        }
-        List<SessionAuthenticationStrategy> delegateStrategies = sessionAuthenticationStrategies;
-        if(isConcurrentSessionControlEnabled()) {
-            SessionRegistry sessionRegistry = getSessionRegistry(http);
-            ConcurrentSessionControlAuthenticationStrategy concurrentSessionControlStrategy = new ConcurrentSessionControlAuthenticationStrategy(sessionRegistry);
-            concurrentSessionControlStrategy.setMaximumSessions(maximumSessions);
-            concurrentSessionControlStrategy.setExceptionIfMaximumExceeded(maxSessionsPreventsLogin);
-            concurrentSessionControlStrategy = postProcess(concurrentSessionControlStrategy);
+	/**
+	 * Gets the customized {@link SessionAuthenticationStrategy} if
+	 * {@link #sessionAuthenticationStrategy(SessionAuthenticationStrategy)} was
+	 * specified. Otherwise creates a default {@link SessionAuthenticationStrategy}.
+	 *
+	 * @return the {@link SessionAuthenticationStrategy} to use
+	 */
+	private SessionAuthenticationStrategy getSessionAuthenticationStrategy(H http) {
+		if (sessionAuthenticationStrategy != null) {
+			return sessionAuthenticationStrategy;
+		}
+		List<SessionAuthenticationStrategy> delegateStrategies = sessionAuthenticationStrategies;
+		if (isConcurrentSessionControlEnabled()) {
+			SessionRegistry sessionRegistry = getSessionRegistry(http);
+			ConcurrentSessionControlAuthenticationStrategy concurrentSessionControlStrategy = new ConcurrentSessionControlAuthenticationStrategy(
+					sessionRegistry);
+			concurrentSessionControlStrategy.setMaximumSessions(maximumSessions);
+			concurrentSessionControlStrategy
+					.setExceptionIfMaximumExceeded(maxSessionsPreventsLogin);
+			concurrentSessionControlStrategy = postProcess(concurrentSessionControlStrategy);
 
-            RegisterSessionAuthenticationStrategy registerSessionStrategy = new RegisterSessionAuthenticationStrategy(sessionRegistry);
-            registerSessionStrategy = postProcess(registerSessionStrategy);
+			RegisterSessionAuthenticationStrategy registerSessionStrategy = new RegisterSessionAuthenticationStrategy(
+					sessionRegistry);
+			registerSessionStrategy = postProcess(registerSessionStrategy);
 
-            delegateStrategies.addAll(Arrays.asList(concurrentSessionControlStrategy, sessionFixationAuthenticationStrategy, registerSessionStrategy));
-        } else {
-            delegateStrategies.add(sessionFixationAuthenticationStrategy);
-        }
-        sessionAuthenticationStrategy = postProcess(new CompositeSessionAuthenticationStrategy(delegateStrategies));
-        return sessionAuthenticationStrategy;
-    }
+			delegateStrategies.addAll(Arrays.asList(concurrentSessionControlStrategy,
+					sessionFixationAuthenticationStrategy, registerSessionStrategy));
+		}
+		else {
+			delegateStrategies.add(sessionFixationAuthenticationStrategy);
+		}
+		sessionAuthenticationStrategy = postProcess(new CompositeSessionAuthenticationStrategy(
+				delegateStrategies));
+		return sessionAuthenticationStrategy;
+	}
 
-    private SessionRegistry getSessionRegistry(H http) {
-        if(sessionRegistry == null) {
-            SessionRegistryImpl sessionRegistry = new SessionRegistryImpl();
-            registerDelegateApplicationListener(http, sessionRegistry);
-            this.sessionRegistry = sessionRegistry;
-        }
-        return sessionRegistry;
-    }
+	private SessionRegistry getSessionRegistry(H http) {
+		if (sessionRegistry == null) {
+			SessionRegistryImpl sessionRegistry = new SessionRegistryImpl();
+			registerDelegateApplicationListener(http, sessionRegistry);
+			this.sessionRegistry = sessionRegistry;
+		}
+		return sessionRegistry;
+	}
 
-    private void registerDelegateApplicationListener(H http, ApplicationListener<?> delegate) {
-        ApplicationContext context = http.getSharedObject(ApplicationContext.class);
-        if(context == null) {
-            return;
-        }
-        if(context.getBeansOfType(DelegatingApplicationListener.class).isEmpty()) {
-            return;
-        }
-        DelegatingApplicationListener delegating = context.getBean(DelegatingApplicationListener.class);
-        SmartApplicationListener smartListener = new GenericApplicationListenerAdapter(delegate);
-        delegating.addListener(smartListener);
-    }
+	private void registerDelegateApplicationListener(H http,
+			ApplicationListener<?> delegate) {
+		ApplicationContext context = http.getSharedObject(ApplicationContext.class);
+		if (context == null) {
+			return;
+		}
+		if (context.getBeansOfType(DelegatingApplicationListener.class).isEmpty()) {
+			return;
+		}
+		DelegatingApplicationListener delegating = context
+				.getBean(DelegatingApplicationListener.class);
+		SmartApplicationListener smartListener = new GenericApplicationListenerAdapter(
+				delegate);
+		delegating.addListener(smartListener);
+	}
 
-    /**
-     * Returns true if the number of concurrent sessions per user should be restricted.
-     * @return
-     */
-    private boolean isConcurrentSessionControlEnabled() {
-        return maximumSessions != null;
-    }
+	/**
+	 * Returns true if the number of concurrent sessions per user should be restricted.
+	 * @return
+	 */
+	private boolean isConcurrentSessionControlEnabled() {
+		return maximumSessions != null;
+	}
 
-    /**
-     * Creates the default {@link SessionAuthenticationStrategy} for session fixation
-     * @return the default {@link SessionAuthenticationStrategy} for session fixation
-     */
-    private static SessionAuthenticationStrategy createDefaultSessionFixationProtectionStrategy() {
-        try {
-            return new ChangeSessionIdAuthenticationStrategy();
-        } catch(IllegalStateException e) {
-            return new SessionFixationProtectionStrategy();
-        }
-    }
+	/**
+	 * Creates the default {@link SessionAuthenticationStrategy} for session fixation
+	 * @return the default {@link SessionAuthenticationStrategy} for session fixation
+	 */
+	private static SessionAuthenticationStrategy createDefaultSessionFixationProtectionStrategy() {
+		try {
+			return new ChangeSessionIdAuthenticationStrategy();
+		}
+		catch (IllegalStateException e) {
+			return new SessionFixationProtectionStrategy();
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java
index dee4b374f8..8805ab44b9 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java
@@ -33,26 +33,23 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
-
 /**
  * Adds URL based authorization using
  * {@link DefaultFilterInvocationSecurityMetadataSource}. At least one
- * {@link org.springframework.web.bind.annotation.RequestMapping} needs to be
- * mapped to {@link ConfigAttribute}'s for this
- * {@link SecurityContextConfigurer} to have meaning. <h2>Security Filters</h2>
+ * {@link org.springframework.web.bind.annotation.RequestMapping} needs to be mapped to
+ * {@link ConfigAttribute}'s for this {@link SecurityContextConfigurer} to have meaning.
+ * <h2>Security Filters</h2>
  *
  * <p>
- * Usage includes applying the {@link UrlAuthorizationConfigurer} and then
- * modifying the StandardInterceptUrlRegistry. For example:
+ * Usage includes applying the {@link UrlAuthorizationConfigurer} and then modifying the
+ * StandardInterceptUrlRegistry. For example:
  * </p>
  *
  * <pre>
  * protected void configure(HttpSecurity http) throws Exception {
- *     http
- *          .apply(new UrlAuthorizationConfigurer<HttpSecurity>()).getRegistry()
- *              .antMatchers("/users**","/sessions/**").hasRole("USER")
- *              .antMatchers("/signup").hasRole("ANONYMOUS")
- *              .anyRequest().hasRole("USER");
+ * 	http.apply(new UrlAuthorizationConfigurer&lt;HttpSecurity&gt;()).getRegistry()
+ * 			.antMatchers(&quot;/users**&quot;, &quot;/sessions/**&quot;).hasRole(&quot;USER&quot;)
+ * 			.antMatchers(&quot;/signup&quot;).hasRole(&quot;ANONYMOUS&quot;).anyRequest().hasRole(&quot;USER&quot;);
  * }
  * </pre>
  *
@@ -60,19 +57,17 @@ import org.springframework.util.Assert;
  *
  * <ul>
  * <li>
- * {@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}
- * </li>
+ * {@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}</li>
  * </ul>
  *
  * <h2>Shared Objects Created</h2>
  *
  * The following shared objects are populated to allow other
- * {@link org.springframework.security.config.annotation.SecurityConfigurer}'s
- * to customize:
+ * {@link org.springframework.security.config.annotation.SecurityConfigurer}'s to
+ * customize:
  * <ul>
  * <li>
- * {@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}
- * </li>
+ * {@link org.springframework.security.web.access.intercept.FilterSecurityInterceptor}</li>
  * </ul>
  *
  * <h2>Shared Objects Used</h2>
@@ -81,226 +76,236 @@ import org.springframework.util.Assert;
  *
  * <ul>
  * <li>
- * AuthenticationManager
- * </li>
+ * AuthenticationManager</li>
  * </ul>
  *
- * @param <H>
- *            the type of {@link HttpSecurityBuilder} that is being configured
+ * @param <H> the type of {@link HttpSecurityBuilder} that is being configured
  *
  * @author Rob Winch
  * @since 3.2
  * @see ExpressionUrlAuthorizationConfigurer
  */
-public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractInterceptUrlConfigurer<UrlAuthorizationConfigurer<H>,H> {
-    private final StandardInterceptUrlRegistry REGISTRY = new StandardInterceptUrlRegistry();
+public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractInterceptUrlConfigurer<UrlAuthorizationConfigurer<H>, H> {
+	private final StandardInterceptUrlRegistry REGISTRY = new StandardInterceptUrlRegistry();
 
-    /**
-     * The StandardInterceptUrlRegistry is what users will interact with after
-     * applying the {@link UrlAuthorizationConfigurer}.
-     *
-     * @return
-     */
-    public StandardInterceptUrlRegistry getRegistry() {
-        return REGISTRY;
-    }
+	/**
+	 * The StandardInterceptUrlRegistry is what users will interact with after applying
+	 * the {@link UrlAuthorizationConfigurer}.
+	 *
+	 * @return
+	 */
+	public StandardInterceptUrlRegistry getRegistry() {
+		return REGISTRY;
+	}
 
-    /**
-     * Adds an {@link ObjectPostProcessor} for this class.
-     *
-     * @param objectPostProcessor
-     * @return the {@link UrlAuthorizationConfigurer} for further customizations
-     */
-    public UrlAuthorizationConfigurer<H> withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-        addObjectPostProcessor(objectPostProcessor);
-        return this;
-    }
+	/**
+	 * Adds an {@link ObjectPostProcessor} for this class.
+	 *
+	 * @param objectPostProcessor
+	 * @return the {@link UrlAuthorizationConfigurer} for further customizations
+	 */
+	public UrlAuthorizationConfigurer<H> withObjectPostProcessor(
+			ObjectPostProcessor<?> objectPostProcessor) {
+		addObjectPostProcessor(objectPostProcessor);
+		return this;
+	}
 
-    public class StandardInterceptUrlRegistry extends ExpressionUrlAuthorizationConfigurer<H>.AbstractInterceptUrlRegistry<StandardInterceptUrlRegistry,AuthorizedUrl> {
+	public class StandardInterceptUrlRegistry
+			extends
+			ExpressionUrlAuthorizationConfigurer<H>.AbstractInterceptUrlRegistry<StandardInterceptUrlRegistry, AuthorizedUrl> {
 
-        @Override
-        protected final AuthorizedUrl chainRequestMatchersInternal(List<RequestMatcher> requestMatchers) {
-            return new AuthorizedUrl(requestMatchers);
-        }
+		@Override
+		protected final AuthorizedUrl chainRequestMatchersInternal(
+				List<RequestMatcher> requestMatchers) {
+			return new AuthorizedUrl(requestMatchers);
+		}
 
-        /**
-         * Adds an {@link ObjectPostProcessor} for this class.
-         *
-         * @param objectPostProcessor
-         * @return the {@link ExpressionUrlAuthorizationConfigurer} for further customizations
-         */
-        public StandardInterceptUrlRegistry withObjectPostProcessor(ObjectPostProcessor<?> objectPostProcessor) {
-            addObjectPostProcessor(objectPostProcessor);
-            return this;
-        }
+		/**
+		 * Adds an {@link ObjectPostProcessor} for this class.
+		 *
+		 * @param objectPostProcessor
+		 * @return the {@link ExpressionUrlAuthorizationConfigurer} for further
+		 * customizations
+		 */
+		public StandardInterceptUrlRegistry withObjectPostProcessor(
+				ObjectPostProcessor<?> objectPostProcessor) {
+			addObjectPostProcessor(objectPostProcessor);
+			return this;
+		}
 
-        public H and() {
-            return UrlAuthorizationConfigurer.this.and();
-        }
+		public H and() {
+			return UrlAuthorizationConfigurer.this.and();
+		}
 
-    }
+	}
 
-    /**
-     * Creates the default {@link AccessDecisionVoter} instances used if an
-     * {@link AccessDecisionManager} was not specified.
-     *
-     * @param http the builder to use
-     */
-    @Override
-    @SuppressWarnings("rawtypes")
-    final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
-        List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
-        decisionVoters.add(new RoleVoter());
-        decisionVoters.add(new AuthenticatedVoter());
-        return decisionVoters;
-    }
+	/**
+	 * Creates the default {@link AccessDecisionVoter} instances used if an
+	 * {@link AccessDecisionManager} was not specified.
+	 *
+	 * @param http the builder to use
+	 */
+	@Override
+	@SuppressWarnings("rawtypes")
+	final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
+		List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+		decisionVoters.add(new RoleVoter());
+		decisionVoters.add(new AuthenticatedVoter());
+		return decisionVoters;
+	}
 
-    /**
-     * Creates the {@link FilterInvocationSecurityMetadataSource} to use. The
-     * implementation is a {@link DefaultFilterInvocationSecurityMetadataSource}.
-     *
-     * @param http the builder to use
-     */
-    @Override
-    FilterInvocationSecurityMetadataSource createMetadataSource(H http) {
-        return new DefaultFilterInvocationSecurityMetadataSource(REGISTRY.createRequestMap());
-    }
+	/**
+	 * Creates the {@link FilterInvocationSecurityMetadataSource} to use. The
+	 * implementation is a {@link DefaultFilterInvocationSecurityMetadataSource}.
+	 *
+	 * @param http the builder to use
+	 */
+	@Override
+	FilterInvocationSecurityMetadataSource createMetadataSource(H http) {
+		return new DefaultFilterInvocationSecurityMetadataSource(
+				REGISTRY.createRequestMap());
+	}
 
-    /**
-     * Adds a mapping of the {@link RequestMatcher} instances to the {@link ConfigAttribute} instances.
-     * @param requestMatchers the {@link RequestMatcher} instances that should map to the provided {@link ConfigAttribute} instances
-     * @param configAttributes the {@link ConfigAttribute} instances that should be mapped by the {@link RequestMatcher} instances
-     * @return the {@link UrlAuthorizationConfigurer} for further customizations
-     */
-    private StandardInterceptUrlRegistry addMapping(Iterable<? extends RequestMatcher> requestMatchers, Collection<ConfigAttribute> configAttributes) {
-        for(RequestMatcher requestMatcher : requestMatchers) {
-            REGISTRY.addMapping(new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(requestMatcher, configAttributes));
-        }
-        return REGISTRY;
-    }
+	/**
+	 * Adds a mapping of the {@link RequestMatcher} instances to the
+	 * {@link ConfigAttribute} instances.
+	 * @param requestMatchers the {@link RequestMatcher} instances that should map to the
+	 * provided {@link ConfigAttribute} instances
+	 * @param configAttributes the {@link ConfigAttribute} instances that should be mapped
+	 * by the {@link RequestMatcher} instances
+	 * @return the {@link UrlAuthorizationConfigurer} for further customizations
+	 */
+	private StandardInterceptUrlRegistry addMapping(
+			Iterable<? extends RequestMatcher> requestMatchers,
+			Collection<ConfigAttribute> configAttributes) {
+		for (RequestMatcher requestMatcher : requestMatchers) {
+			REGISTRY.addMapping(new AbstractConfigAttributeRequestMatcherRegistry.UrlMapping(
+					requestMatcher, configAttributes));
+		}
+		return REGISTRY;
+	}
 
-    /**
-     * Creates a String for specifying a user requires a role.
-     *
-     * @param role
-     *            the role that should be required which is prepended with ROLE_
-     *            automatically (i.e. USER, ADMIN, etc). It should not start
-     *            with ROLE_
-     * @return the {@link ConfigAttribute} expressed as a String
-     */
-    private static String hasRole(String role) {
-        Assert.isTrue(
-                !role.startsWith("ROLE_"),
-                role
-                        + " should not start with ROLE_ since ROLE_ is automatically prepended when using hasRole. Consider using hasAuthority or access instead.");
-        return "ROLE_" + role;
-    }
+	/**
+	 * Creates a String for specifying a user requires a role.
+	 *
+	 * @param role the role that should be required which is prepended with ROLE_
+	 * automatically (i.e. USER, ADMIN, etc). It should not start with ROLE_
+	 * @return the {@link ConfigAttribute} expressed as a String
+	 */
+	private static String hasRole(String role) {
+		Assert.isTrue(
+				!role.startsWith("ROLE_"),
+				role
+						+ " should not start with ROLE_ since ROLE_ is automatically prepended when using hasRole. Consider using hasAuthority or access instead.");
+		return "ROLE_" + role;
+	}
 
-    /**
-     * Creates a String for specifying that a user requires one of many roles.
-     *
-     * @param roles
-     *            the roles that the user should have at least one of (i.e.
-     *            ADMIN, USER, etc). Each role should not start with ROLE_ since
-     *            it is automatically prepended already.
-     * @return the {@link ConfigAttribute} expressed as a String
-     */
-    private static String[] hasAnyRole(String... roles) {
-        for(int i=0;i<roles.length;i++) {
-            roles[i] = "ROLE_" + roles[i];
-        }
-        return roles;
-    }
+	/**
+	 * Creates a String for specifying that a user requires one of many roles.
+	 *
+	 * @param roles the roles that the user should have at least one of (i.e. ADMIN, USER,
+	 * etc). Each role should not start with ROLE_ since it is automatically prepended
+	 * already.
+	 * @return the {@link ConfigAttribute} expressed as a String
+	 */
+	private static String[] hasAnyRole(String... roles) {
+		for (int i = 0; i < roles.length; i++) {
+			roles[i] = "ROLE_" + roles[i];
+		}
+		return roles;
+	}
 
-    /**
-     * Creates a String for specifying that a user requires one of many authorities
-     * @param authorities the authorities that the user should have at least one of (i.e. ROLE_USER, ROLE_ADMIN, etc).
-     * @return the {@link ConfigAttribute} expressed as a String.
-     */
-    private static String[] hasAnyAuthority(String... authorities) {
-        return authorities;
-    }
+	/**
+	 * Creates a String for specifying that a user requires one of many authorities
+	 * @param authorities the authorities that the user should have at least one of (i.e.
+	 * ROLE_USER, ROLE_ADMIN, etc).
+	 * @return the {@link ConfigAttribute} expressed as a String.
+	 */
+	private static String[] hasAnyAuthority(String... authorities) {
+		return authorities;
+	}
 
-    /**
-     * Maps the specified {@link RequestMatcher} instances to {@link ConfigAttribute} instances.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public final class AuthorizedUrl {
-        private final List<RequestMatcher> requestMatchers;
+	/**
+	 * Maps the specified {@link RequestMatcher} instances to {@link ConfigAttribute}
+	 * instances.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public final class AuthorizedUrl {
+		private final List<RequestMatcher> requestMatchers;
 
-        /**
-         * Creates a new instance
-         * @param requestMatchers the {@link RequestMatcher} instances to map to some {@link ConfigAttribute} instances.
-         */
-        private AuthorizedUrl(List<RequestMatcher> requestMatchers) {
-            Assert.notEmpty(requestMatchers, "requestMatchers must contain at least one value");
-            this.requestMatchers = requestMatchers;
-        }
+		/**
+		 * Creates a new instance
+		 * @param requestMatchers the {@link RequestMatcher} instances to map to some
+		 * {@link ConfigAttribute} instances.
+		 */
+		private AuthorizedUrl(List<RequestMatcher> requestMatchers) {
+			Assert.notEmpty(requestMatchers,
+					"requestMatchers must contain at least one value");
+			this.requestMatchers = requestMatchers;
+		}
 
-        /**
-         * Specifies a user requires a role.
-         *
-         * @param role
-         *            the role that should be required which is prepended with ROLE_
-         *            automatically (i.e. USER, ADMIN, etc). It should not start
-         *            with ROLE_
-         * the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry hasRole(String role) {
-            return access(UrlAuthorizationConfigurer.hasRole(role));
-        }
+		/**
+		 * Specifies a user requires a role.
+		 *
+		 * @param role the role that should be required which is prepended with ROLE_
+		 * automatically (i.e. USER, ADMIN, etc). It should not start with ROLE_ the
+		 * {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry hasRole(String role) {
+			return access(UrlAuthorizationConfigurer.hasRole(role));
+		}
 
-        /**
-         * Specifies that a user requires one of many roles.
-         *
-         * @param roles
-         *            the roles that the user should have at least one of (i.e.
-         *            ADMIN, USER, etc). Each role should not start with ROLE_ since
-         *            it is automatically prepended already.
-         * @return the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry hasAnyRole(String... roles) {
-            return access(UrlAuthorizationConfigurer.hasAnyRole(roles));
-        }
+		/**
+		 * Specifies that a user requires one of many roles.
+		 *
+		 * @param roles the roles that the user should have at least one of (i.e. ADMIN,
+		 * USER, etc). Each role should not start with ROLE_ since it is automatically
+		 * prepended already.
+		 * @return the {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry hasAnyRole(String... roles) {
+			return access(UrlAuthorizationConfigurer.hasAnyRole(roles));
+		}
 
-        /**
-         * Specifies a user requires an authority.
-         *
-         * @param authority
-         *            the authority that should be required
-         * @return the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry hasAuthority(String authority) {
-            return access(authority);
-        }
+		/**
+		 * Specifies a user requires an authority.
+		 *
+		 * @param authority the authority that should be required
+		 * @return the {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry hasAuthority(String authority) {
+			return access(authority);
+		}
 
-        /**
-         * Specifies that a user requires one of many authorities
-         * @param authorities the authorities that the user should have at least one of (i.e. ROLE_USER, ROLE_ADMIN, etc).
-         * @return the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry hasAnyAuthority(String... authorities) {
-            return access(UrlAuthorizationConfigurer.hasAnyAuthority(authorities));
-        }
+		/**
+		 * Specifies that a user requires one of many authorities
+		 * @param authorities the authorities that the user should have at least one of
+		 * (i.e. ROLE_USER, ROLE_ADMIN, etc).
+		 * @return the {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry hasAnyAuthority(String... authorities) {
+			return access(UrlAuthorizationConfigurer.hasAnyAuthority(authorities));
+		}
 
-        /**
-         * Specifies that an anonymous user is allowed access
-         * @return the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry anonymous() {
-            return hasRole("ROLE_ANONYMOUS");
-        }
+		/**
+		 * Specifies that an anonymous user is allowed access
+		 * @return the {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry anonymous() {
+			return hasRole("ROLE_ANONYMOUS");
+		}
 
-        /**
-         * Specifies that the user must have the specified {@link ConfigAttribute}'s
-         * @param attributes the {@link ConfigAttribute}'s that restrict access to a URL
-         * @return the {@link UrlAuthorizationConfigurer} for further customization
-         */
-        public StandardInterceptUrlRegistry access(String... attributes) {
-            addMapping(requestMatchers, SecurityConfig.createList(attributes));
-            return UrlAuthorizationConfigurer.this.REGISTRY;
-        }
-    }
+		/**
+		 * Specifies that the user must have the specified {@link ConfigAttribute}'s
+		 * @param attributes the {@link ConfigAttribute}'s that restrict access to a URL
+		 * @return the {@link UrlAuthorizationConfigurer} for further customization
+		 */
+		public StandardInterceptUrlRegistry access(String... attributes) {
+			addMapping(requestMatchers, SecurityConfig.createList(attributes));
+			return UrlAuthorizationConfigurer.this.REGISTRY;
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java
index 45eb3e23a5..5f7f896b03 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java
@@ -34,10 +34,10 @@ import org.springframework.security.web.authentication.preauth.x509.SubjectDnX50
 import org.springframework.security.web.authentication.preauth.x509.X509AuthenticationFilter;
 
 /**
- * Adds X509 based pre authentication to an application. Since validating the
- * certificate happens when the client connects, the requesting and validation
- * of the client certificate should be performed by the container. Spring Security
- * will then use the certificate to look up the {@link Authentication} for the user.
+ * Adds X509 based pre authentication to an application. Since validating the certificate
+ * happens when the client connects, the requesting and validation of the client
+ * certificate should be performed by the container. Spring Security will then use the
+ * certificate to look up the {@link Authentication} for the user.
  *
  * <h2>Security Filters</h2>
  *
@@ -53,8 +53,8 @@ import org.springframework.security.web.authentication.preauth.x509.X509Authenti
  *
  * <ul>
  * <li>
- * {@link AuthenticationEntryPoint}
- * is populated with an {@link Http403ForbiddenEntryPoint}</li>
+ * {@link AuthenticationEntryPoint} is populated with an
+ * {@link Http403ForbiddenEntryPoint}</li>
  * <li>A {@link PreAuthenticatedAuthenticationProvider} is populated into
  * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
  * </li>
@@ -65,132 +65,140 @@ import org.springframework.security.web.authentication.preauth.x509.X509Authenti
  * The following shared objects are used:
  *
  * <ul>
- * <li>A {@link UserDetailsService} shared object is used if no {@link AuthenticationUserDetailsService} is specified</li>
+ * <li>A {@link UserDetailsService} shared object is used if no
+ * {@link AuthenticationUserDetailsService} is specified</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class X509Configurer<H extends HttpSecurityBuilder<H>> extends AbstractHttpConfigurer<X509Configurer<H>,H> {
-    private X509AuthenticationFilter x509AuthenticationFilter;
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService;
-    private String subjectPrincipalRegex;
-    private AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> authenticationDetailsSource;
+public final class X509Configurer<H extends HttpSecurityBuilder<H>> extends
+		AbstractHttpConfigurer<X509Configurer<H>, H> {
+	private X509AuthenticationFilter x509AuthenticationFilter;
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService;
+	private String subjectPrincipalRegex;
+	private AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> authenticationDetailsSource;
 
-    /**
-     * Creates a new instance
-     * @see HttpSecurity#x509()
-     */
-    public X509Configurer() {
-    }
+	/**
+	 * Creates a new instance
+	 * @see HttpSecurity#x509()
+	 */
+	public X509Configurer() {
+	}
 
-    /**
-     * Allows specifying the entire {@link X509AuthenticationFilter}. If this is
-     * specified, the properties on {@link X509Configurer} will not be
-     * populated on the {@link X509AuthenticationFilter}.
-     *
-     * @param x509AuthenticationFilter the {@link X509AuthenticationFilter} to use
-     * @return the {@link X509Configurer} for further customizations
-     */
-    public X509Configurer<H> x509AuthenticationFilter(
-            X509AuthenticationFilter x509AuthenticationFilter) {
-        this.x509AuthenticationFilter = x509AuthenticationFilter;
-        return this;
-    }
+	/**
+	 * Allows specifying the entire {@link X509AuthenticationFilter}. If this is
+	 * specified, the properties on {@link X509Configurer} will not be populated on the
+	 * {@link X509AuthenticationFilter}.
+	 *
+	 * @param x509AuthenticationFilter the {@link X509AuthenticationFilter} to use
+	 * @return the {@link X509Configurer} for further customizations
+	 */
+	public X509Configurer<H> x509AuthenticationFilter(
+			X509AuthenticationFilter x509AuthenticationFilter) {
+		this.x509AuthenticationFilter = x509AuthenticationFilter;
+		return this;
+	}
 
-    /**
-     * Specifies the {@link AuthenticationDetailsSource}
-     *
-     * @param authenticationDetailsSource the {@link AuthenticationDetailsSource} to use
-     * @return the {@link X509Configurer} to use
-     */
-    public X509Configurer<H> authenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> authenticationDetailsSource) {
-        this.authenticationDetailsSource = authenticationDetailsSource;
-        return this;
-    }
+	/**
+	 * Specifies the {@link AuthenticationDetailsSource}
+	 *
+	 * @param authenticationDetailsSource the {@link AuthenticationDetailsSource} to use
+	 * @return the {@link X509Configurer} to use
+	 */
+	public X509Configurer<H> authenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> authenticationDetailsSource) {
+		this.authenticationDetailsSource = authenticationDetailsSource;
+		return this;
+	}
 
-    /**
-     * Shortcut for invoking {@link #authenticationUserDetailsService(AuthenticationUserDetailsService)} with a {@link UserDetailsByNameServiceWrapper}.
-     *
-     * @param userDetailsService the {@link UserDetailsService} to use
-     * @return the {@link X509Configurer} for further customizations
-     */
-    public X509Configurer<H> userDetailsService(
-            UserDetailsService userDetailsService) {
-        UserDetailsByNameServiceWrapper<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService = new UserDetailsByNameServiceWrapper<PreAuthenticatedAuthenticationToken>();
-        authenticationUserDetailsService.setUserDetailsService(userDetailsService);
-        return authenticationUserDetailsService(authenticationUserDetailsService);
-    }
+	/**
+	 * Shortcut for invoking
+	 * {@link #authenticationUserDetailsService(AuthenticationUserDetailsService)} with a
+	 * {@link UserDetailsByNameServiceWrapper}.
+	 *
+	 * @param userDetailsService the {@link UserDetailsService} to use
+	 * @return the {@link X509Configurer} for further customizations
+	 */
+	public X509Configurer<H> userDetailsService(UserDetailsService userDetailsService) {
+		UserDetailsByNameServiceWrapper<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService = new UserDetailsByNameServiceWrapper<PreAuthenticatedAuthenticationToken>();
+		authenticationUserDetailsService.setUserDetailsService(userDetailsService);
+		return authenticationUserDetailsService(authenticationUserDetailsService);
+	}
 
-    /**
-     * Specifies the {@link AuthenticationUserDetailsService} to use. If not
-     * specified, the shared {@link UserDetailsService} will be used to create a
-     * {@link UserDetailsByNameServiceWrapper}.
-     *
-     * @param authenticationUserDetailsService the {@link AuthenticationUserDetailsService} to use
-     * @return the {@link X509Configurer} for further customizations
-     */
-    public X509Configurer<H> authenticationUserDetailsService(
-            AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService) {
-        this.authenticationUserDetailsService = authenticationUserDetailsService;
-        return this;
-    }
+	/**
+	 * Specifies the {@link AuthenticationUserDetailsService} to use. If not specified,
+	 * the shared {@link UserDetailsService} will be used to create a
+	 * {@link UserDetailsByNameServiceWrapper}.
+	 *
+	 * @param authenticationUserDetailsService the
+	 * {@link AuthenticationUserDetailsService} to use
+	 * @return the {@link X509Configurer} for further customizations
+	 */
+	public X509Configurer<H> authenticationUserDetailsService(
+			AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> authenticationUserDetailsService) {
+		this.authenticationUserDetailsService = authenticationUserDetailsService;
+		return this;
+	}
 
-    /**
-     * Specifies the regex to extract the principal from the certificate. If not
-     * specified, the default expression from
-     * {@link SubjectDnX509PrincipalExtractor} is used.
-     *
-     * @param subjectPrincipalRegex
-     *            the regex to extract the user principal from the certificate
-     *            (i.e. "CN=(.*?)(?:,|$)").
-     * @return the {@link X509Configurer} for further customizations
-     */
-    public X509Configurer<H> subjectPrincipalRegex(String subjectPrincipalRegex) {
-        this.subjectPrincipalRegex = subjectPrincipalRegex;
-        return this;
-    }
+	/**
+	 * Specifies the regex to extract the principal from the certificate. If not
+	 * specified, the default expression from {@link SubjectDnX509PrincipalExtractor} is
+	 * used.
+	 *
+	 * @param subjectPrincipalRegex the regex to extract the user principal from the
+	 * certificate (i.e. "CN=(.*?)(?:,|$)").
+	 * @return the {@link X509Configurer} for further customizations
+	 */
+	public X509Configurer<H> subjectPrincipalRegex(String subjectPrincipalRegex) {
+		this.subjectPrincipalRegex = subjectPrincipalRegex;
+		return this;
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
-        authenticationProvider.setPreAuthenticatedUserDetailsService(getAuthenticationUserDetailsService(http));
+	// @formatter:off
+	@Override
+	public void init(H http) throws Exception {
+		PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
+		authenticationProvider.setPreAuthenticatedUserDetailsService(getAuthenticationUserDetailsService(http));
 
-        http
-            .authenticationProvider(authenticationProvider)
-            .setSharedObject(AuthenticationEntryPoint.class,new Http403ForbiddenEntryPoint());
-    }
+		http
+			.authenticationProvider(authenticationProvider)
+			.setSharedObject(AuthenticationEntryPoint.class,new Http403ForbiddenEntryPoint());
+	}
+	// @formatter:on
 
-    @Override
-    public void configure(H http) throws Exception {
-        X509AuthenticationFilter filter = getFilter(http.getSharedObject(AuthenticationManager.class));
-        http.addFilter(filter);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		X509AuthenticationFilter filter = getFilter(http
+				.getSharedObject(AuthenticationManager.class));
+		http.addFilter(filter);
+	}
 
-    private X509AuthenticationFilter getFilter(
-            AuthenticationManager authenticationManager) {
-        if (x509AuthenticationFilter == null) {
-            x509AuthenticationFilter = new X509AuthenticationFilter();
-            x509AuthenticationFilter.setAuthenticationManager(authenticationManager);
-            if(subjectPrincipalRegex != null) {
-                SubjectDnX509PrincipalExtractor principalExtractor = new SubjectDnX509PrincipalExtractor();
-                principalExtractor.setSubjectDnRegex(subjectPrincipalRegex);
-                x509AuthenticationFilter.setPrincipalExtractor(principalExtractor);
-            }
-            if(authenticationDetailsSource != null) {
-                x509AuthenticationFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
-            }
-            x509AuthenticationFilter = postProcess(x509AuthenticationFilter);
-        }
+	private X509AuthenticationFilter getFilter(AuthenticationManager authenticationManager) {
+		if (x509AuthenticationFilter == null) {
+			x509AuthenticationFilter = new X509AuthenticationFilter();
+			x509AuthenticationFilter.setAuthenticationManager(authenticationManager);
+			if (subjectPrincipalRegex != null) {
+				SubjectDnX509PrincipalExtractor principalExtractor = new SubjectDnX509PrincipalExtractor();
+				principalExtractor.setSubjectDnRegex(subjectPrincipalRegex);
+				x509AuthenticationFilter.setPrincipalExtractor(principalExtractor);
+			}
+			if (authenticationDetailsSource != null) {
+				x509AuthenticationFilter
+						.setAuthenticationDetailsSource(authenticationDetailsSource);
+			}
+			x509AuthenticationFilter = postProcess(x509AuthenticationFilter);
+		}
 
-        return x509AuthenticationFilter;
-    }
+		return x509AuthenticationFilter;
+	}
 
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getAuthenticationUserDetailsService(H http) {
-        if(authenticationUserDetailsService == null) {
-            userDetailsService(http.getSharedObject(UserDetailsService.class));
-        }
-        return authenticationUserDetailsService;
-    }
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getAuthenticationUserDetailsService(
+			H http) {
+		if (authenticationUserDetailsService == null) {
+			userDetailsService(http.getSharedObject(UserDetailsService.class));
+		}
+		return authenticationUserDetailsService;
+	}
 
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java
index 14f1082124..f9fe860f31 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java
@@ -63,7 +63,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * &#064;Configuration
  * &#064;EnableWebSecurity
  * public class OpenIDLoginConfig extends WebSecurityConfigurerAdapter {
- *
+ * 
  * 	&#064;Override
  * 	protected void configure(HttpSecurity http) {
  * 		http
@@ -73,7 +73,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * 			.openidLogin()
  * 				.permitAll();
  * 	}
- *
+ * 
  * 	&#064;Override
  * 	protected void configure(AuthenticationManagerBuilder auth)(
  * 			AuthenticationManagerBuilder auth) throws Exception {
@@ -99,8 +99,8 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  *
  * <ul>
  * <li>
- * {@link AuthenticationEntryPoint}
- * is populated with a {@link LoginUrlAuthenticationEntryPoint}</li>
+ * {@link AuthenticationEntryPoint} is populated with a
+ * {@link LoginUrlAuthenticationEntryPoint}</li>
  * <li>A {@link OpenIDAuthenticationProvider} is populated into
  * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
  * </li>
@@ -112,8 +112,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  *
  * <ul>
  * <li>{@link AuthenticationManager}</li>
- * <li>{@link RememberMeServices} - is optionally used. See
- * {@link RememberMeConfigurer}</li>
+ * <li>{@link RememberMeServices} - is optionally used. See {@link RememberMeConfigurer}</li>
  * <li>{@link SessionAuthenticationStrategy} - is optionally used. See
  * {@link SessionManagementConfigurer}</li>
  * </ul>
@@ -121,380 +120,392 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @author Rob Winch
  * @since 3.2
  */
-public final class OpenIDLoginConfigurer<H extends HttpSecurityBuilder<H>> extends AbstractAuthenticationFilterConfigurer<H,OpenIDLoginConfigurer<H>,OpenIDAuthenticationFilter> {
-    private OpenIDConsumer openIDConsumer;
-    private ConsumerManager consumerManager;
-    private AuthenticationUserDetailsService<OpenIDAuthenticationToken> authenticationUserDetailsService;
-    private List<AttributeExchangeConfigurer> attributeExchangeConfigurers = new ArrayList<AttributeExchangeConfigurer>();
+public final class OpenIDLoginConfigurer<H extends HttpSecurityBuilder<H>>
+		extends
+		AbstractAuthenticationFilterConfigurer<H, OpenIDLoginConfigurer<H>, OpenIDAuthenticationFilter> {
+	private OpenIDConsumer openIDConsumer;
+	private ConsumerManager consumerManager;
+	private AuthenticationUserDetailsService<OpenIDAuthenticationToken> authenticationUserDetailsService;
+	private List<AttributeExchangeConfigurer> attributeExchangeConfigurers = new ArrayList<AttributeExchangeConfigurer>();
 
-    /**
-     * Creates a new instance
-     */
-    public OpenIDLoginConfigurer() {
-        super(new OpenIDAuthenticationFilter(),"/login/openid");
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public OpenIDLoginConfigurer() {
+		super(new OpenIDAuthenticationFilter(), "/login/openid");
+	}
 
-    /**
-     * Sets up OpenID attribute exchange for OpenID's matching the specified
-     * pattern.
-     *
-     * @param identifierPattern
-     *            the regular expression for matching on OpenID's (i.e.
-     *            "https://www.google.com/.*", ".*yahoo.com.*", etc)
-     * @return a {@link AttributeExchangeConfigurer} for further customizations of the attribute exchange
-     */
-    public AttributeExchangeConfigurer attributeExchange(String identifierPattern) {
-        AttributeExchangeConfigurer attributeExchangeConfigurer = new AttributeExchangeConfigurer(identifierPattern);
-        this.attributeExchangeConfigurers .add(attributeExchangeConfigurer);
-        return attributeExchangeConfigurer;
-    }
+	/**
+	 * Sets up OpenID attribute exchange for OpenID's matching the specified pattern.
+	 *
+	 * @param identifierPattern the regular expression for matching on OpenID's (i.e.
+	 * "https://www.google.com/.*", ".*yahoo.com.*", etc)
+	 * @return a {@link AttributeExchangeConfigurer} for further customizations of the
+	 * attribute exchange
+	 */
+	public AttributeExchangeConfigurer attributeExchange(String identifierPattern) {
+		AttributeExchangeConfigurer attributeExchangeConfigurer = new AttributeExchangeConfigurer(
+				identifierPattern);
+		this.attributeExchangeConfigurers.add(attributeExchangeConfigurer);
+		return attributeExchangeConfigurer;
+	}
 
-    /**
-     * Allows specifying the {@link OpenIDConsumer} to be used. The default is
-     * using an {@link OpenID4JavaConsumer}.
-     *
-     * @param consumer
-     *            the {@link OpenIDConsumer} to be used
-     * @return the {@link OpenIDLoginConfigurer} for further customizations
-     */
-    public OpenIDLoginConfigurer<H> consumer(OpenIDConsumer consumer) {
-        this.openIDConsumer = consumer;
-        return this;
-    }
+	/**
+	 * Allows specifying the {@link OpenIDConsumer} to be used. The default is using an
+	 * {@link OpenID4JavaConsumer}.
+	 *
+	 * @param consumer the {@link OpenIDConsumer} to be used
+	 * @return the {@link OpenIDLoginConfigurer} for further customizations
+	 */
+	public OpenIDLoginConfigurer<H> consumer(OpenIDConsumer consumer) {
+		this.openIDConsumer = consumer;
+		return this;
+	}
 
-    /**
-     * Allows specifying the {@link ConsumerManager} to be used. If specified,
-     * will be populated into an {@link OpenID4JavaConsumer}.
-     *
-     * <p>
-     * This is a shortcut for specifying the {@link OpenID4JavaConsumer} with a
-     * specific {@link ConsumerManager} on {@link #consumer(OpenIDConsumer)}.
-     * </p>
-     *
-     * @param consumerManager the {@link ConsumerManager} to use. Cannot be null.
-     * @return the {@link OpenIDLoginConfigurer} for further customizations
-     */
-    public OpenIDLoginConfigurer<H> consumerManager(ConsumerManager consumerManager) {
-        this.consumerManager = consumerManager;
-        return this;
-    }
+	/**
+	 * Allows specifying the {@link ConsumerManager} to be used. If specified, will be
+	 * populated into an {@link OpenID4JavaConsumer}.
+	 *
+	 * <p>
+	 * This is a shortcut for specifying the {@link OpenID4JavaConsumer} with a specific
+	 * {@link ConsumerManager} on {@link #consumer(OpenIDConsumer)}.
+	 * </p>
+	 *
+	 * @param consumerManager the {@link ConsumerManager} to use. Cannot be null.
+	 * @return the {@link OpenIDLoginConfigurer} for further customizations
+	 */
+	public OpenIDLoginConfigurer<H> consumerManager(ConsumerManager consumerManager) {
+		this.consumerManager = consumerManager;
+		return this;
+	}
 
-    /**
-     * The {@link AuthenticationUserDetailsService} to use. By default a
-     * {@link UserDetailsByNameServiceWrapper} is used with the
-     * {@link UserDetailsService} shared object found with
-     * {@link HttpSecurity#getSharedObject(Class)}.
-     *
-     * @param authenticationUserDetailsService the {@link AuthenticationDetailsSource} to use
-     * @return the {@link OpenIDLoginConfigurer} for further customizations
-     */
-    public OpenIDLoginConfigurer<H> authenticationUserDetailsService(AuthenticationUserDetailsService<OpenIDAuthenticationToken> authenticationUserDetailsService) {
-        this.authenticationUserDetailsService = authenticationUserDetailsService;
-        return this;
-    }
+	/**
+	 * The {@link AuthenticationUserDetailsService} to use. By default a
+	 * {@link UserDetailsByNameServiceWrapper} is used with the {@link UserDetailsService}
+	 * shared object found with {@link HttpSecurity#getSharedObject(Class)}.
+	 *
+	 * @param authenticationUserDetailsService the {@link AuthenticationDetailsSource} to
+	 * use
+	 * @return the {@link OpenIDLoginConfigurer} for further customizations
+	 */
+	public OpenIDLoginConfigurer<H> authenticationUserDetailsService(
+			AuthenticationUserDetailsService<OpenIDAuthenticationToken> authenticationUserDetailsService) {
+		this.authenticationUserDetailsService = authenticationUserDetailsService;
+		return this;
+	}
 
-    /**
-     * Specifies the URL used to authenticate OpenID requests. If the {@link HttpServletRequest}
-     * matches this URL the {@link OpenIDAuthenticationFilter} will attempt to
-     * authenticate the request. The default is "/login/openid".
-     *
-     * @param loginUrl
-     *            the URL used to perform authentication
-     * @return the {@link OpenIDLoginConfigurer} for additional customization
-     */
-    public OpenIDLoginConfigurer<H> loginProcessingUrl(String loginProcessingUrl) {
-        return super.loginProcessingUrl(loginProcessingUrl);
-    }
+	/**
+	 * Specifies the URL used to authenticate OpenID requests. If the
+	 * {@link HttpServletRequest} matches this URL the {@link OpenIDAuthenticationFilter}
+	 * will attempt to authenticate the request. The default is "/login/openid".
+	 *
+	 * @param loginUrl the URL used to perform authentication
+	 * @return the {@link OpenIDLoginConfigurer} for additional customization
+	 */
+	public OpenIDLoginConfigurer<H> loginProcessingUrl(String loginProcessingUrl) {
+		return super.loginProcessingUrl(loginProcessingUrl);
+	}
 
-    /**
-     * <p>
-     * Specifies the URL to send users to if login is required. If used with
-     * {@link WebSecurityConfigurerAdapter} a default login page will be
-     * generated when this attribute is not specified.
-     * </p>
-     *
-     * <p>
-     * If a URL is specified or this is not being used in conjuction with
-     * {@link WebSecurityConfigurerAdapter}, users are required to process the
-     * specified URL to generate a login page.
-     * </p>
-     *
-     * <ul>
-     * <li>It must be an HTTP POST</li>
-     * <li>It must be submitted to {@link #loginProcessingUrl(String)}</li>
-     * <li>It should include the OpenID as an HTTP parameter by the name of
-     * {@link OpenIDAuthenticationFilter#DEFAULT_CLAIMED_IDENTITY_FIELD}</li>
-     * </ul>
-     *
-     *
-     * <h2>Impact on other defaults</h2>
-     *
-     * Updating this value, also impacts a number of other default values. For example,
-     * the following are the default values when only formLogin() was specified.
-     *
-     * <ul>
-     * <li>/login GET - the login form</li>
-     * <li>/login POST - process the credentials and if valid authenticate the
-     * user</li>
-     * <li>/login?error GET - redirect here for failed authentication attempts</li>
-     * <li>/login?logout GET - redirect here after successfully logging out</li>
-     * </ul>
-     *
-     * If "/authenticate" was passed to this method it update the defaults as shown
-     * below:
-     *
-     * <ul>
-     * <li>/authenticate GET - the login form</li>
-     * <li>/authenticate POST - process the credentials and if valid authenticate the
-     * user</li>
-     * <li>/authenticate?error GET - redirect here for failed authentication attempts</li>
-     * <li>/authenticate?logout GET - redirect here after successfully logging out</li>
-     * </ul>
-     *
-     * @param loginPage the login page to redirect to if authentication is required (i.e. "/login")
-     * @return the {@link FormLoginConfigurer} for additional customization
-     */
-    public OpenIDLoginConfigurer<H> loginPage(String loginPage) {
-        return super.loginPage(loginPage);
-    }
+	/**
+	 * <p>
+	 * Specifies the URL to send users to if login is required. If used with
+	 * {@link WebSecurityConfigurerAdapter} a default login page will be generated when
+	 * this attribute is not specified.
+	 * </p>
+	 *
+	 * <p>
+	 * If a URL is specified or this is not being used in conjuction with
+	 * {@link WebSecurityConfigurerAdapter}, users are required to process the specified
+	 * URL to generate a login page.
+	 * </p>
+	 *
+	 * <ul>
+	 * <li>It must be an HTTP POST</li>
+	 * <li>It must be submitted to {@link #loginProcessingUrl(String)}</li>
+	 * <li>It should include the OpenID as an HTTP parameter by the name of
+	 * {@link OpenIDAuthenticationFilter#DEFAULT_CLAIMED_IDENTITY_FIELD}</li>
+	 * </ul>
+	 *
+	 *
+	 * <h2>Impact on other defaults</h2>
+	 *
+	 * Updating this value, also impacts a number of other default values. For example,
+	 * the following are the default values when only formLogin() was specified.
+	 *
+	 * <ul>
+	 * <li>/login GET - the login form</li>
+	 * <li>/login POST - process the credentials and if valid authenticate the user</li>
+	 * <li>/login?error GET - redirect here for failed authentication attempts</li>
+	 * <li>/login?logout GET - redirect here after successfully logging out</li>
+	 * </ul>
+	 *
+	 * If "/authenticate" was passed to this method it update the defaults as shown below:
+	 *
+	 * <ul>
+	 * <li>/authenticate GET - the login form</li>
+	 * <li>/authenticate POST - process the credentials and if valid authenticate the user
+	 * </li>
+	 * <li>/authenticate?error GET - redirect here for failed authentication attempts</li>
+	 * <li>/authenticate?logout GET - redirect here after successfully logging out</li>
+	 * </ul>
+	 *
+	 * @param loginPage the login page to redirect to if authentication is required (i.e.
+	 * "/login")
+	 * @return the {@link FormLoginConfigurer} for additional customization
+	 */
+	public OpenIDLoginConfigurer<H> loginPage(String loginPage) {
+		return super.loginPage(loginPage);
+	}
 
-    @Override
-    public void init(H http) throws Exception {
-        super.init(http);
+	@Override
+	public void init(H http) throws Exception {
+		super.init(http);
 
-        OpenIDAuthenticationProvider authenticationProvider = new OpenIDAuthenticationProvider();
-        authenticationProvider.setAuthenticationUserDetailsService(getAuthenticationUserDetailsService(http));
-        authenticationProvider = postProcess(authenticationProvider);
-        http.authenticationProvider(authenticationProvider);
+		OpenIDAuthenticationProvider authenticationProvider = new OpenIDAuthenticationProvider();
+		authenticationProvider
+				.setAuthenticationUserDetailsService(getAuthenticationUserDetailsService(http));
+		authenticationProvider = postProcess(authenticationProvider);
+		http.authenticationProvider(authenticationProvider);
 
-        initDefaultLoginFilter(http);
-    }
+		initDefaultLoginFilter(http);
+	}
 
-    @Override
-    public void configure(H http) throws Exception {
-        getAuthenticationFilter().setConsumer(getConsumer());
-        super.configure(http);
-    }
+	@Override
+	public void configure(H http) throws Exception {
+		getAuthenticationFilter().setConsumer(getConsumer());
+		super.configure(http);
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer#createLoginProcessingUrlMatcher(java.lang.String)
-     */
-    @Override
-    protected RequestMatcher createLoginProcessingUrlMatcher(
-            String loginProcessingUrl) {
-        return new AntPathRequestMatcher(loginProcessingUrl);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.config.annotation.web.configurers.
+	 * AbstractAuthenticationFilterConfigurer
+	 * #createLoginProcessingUrlMatcher(java.lang.String)
+	 */
+	@Override
+	protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl) {
+		return new AntPathRequestMatcher(loginProcessingUrl);
+	}
 
-    /**
-     * Gets the {@link OpenIDConsumer} that was configured or defaults to an {@link OpenID4JavaConsumer}.
-     * @return the {@link OpenIDConsumer} to use
-     * @throws ConsumerException
-     */
-    private OpenIDConsumer getConsumer() throws ConsumerException {
-        if(openIDConsumer == null) {
-            openIDConsumer = new OpenID4JavaConsumer(getConsumerManager(), attributesToFetchFactory());
-        }
-        return openIDConsumer;
-    }
+	/**
+	 * Gets the {@link OpenIDConsumer} that was configured or defaults to an
+	 * {@link OpenID4JavaConsumer}.
+	 * @return the {@link OpenIDConsumer} to use
+	 * @throws ConsumerException
+	 */
+	private OpenIDConsumer getConsumer() throws ConsumerException {
+		if (openIDConsumer == null) {
+			openIDConsumer = new OpenID4JavaConsumer(getConsumerManager(),
+					attributesToFetchFactory());
+		}
+		return openIDConsumer;
+	}
 
-    /**
-     * Gets the {@link ConsumerManager} that was configured or defaults to using a {@link ConsumerManager} with the default constructor.
-     * @return the {@link ConsumerManager} to use
-     */
-    private ConsumerManager getConsumerManager() {
-        if(this.consumerManager != null) {
-            return this.consumerManager;
-        }
-        return new ConsumerManager();
-    }
+	/**
+	 * Gets the {@link ConsumerManager} that was configured or defaults to using a
+	 * {@link ConsumerManager} with the default constructor.
+	 * @return the {@link ConsumerManager} to use
+	 */
+	private ConsumerManager getConsumerManager() {
+		if (this.consumerManager != null) {
+			return this.consumerManager;
+		}
+		return new ConsumerManager();
+	}
 
-    /**
-     * Creates an {@link RegexBasedAxFetchListFactory} using the attributes
-     * populated by {@link AttributeExchangeConfigurer}
-     *
-     * @return the {@link AxFetchListFactory} to use
-     */
-    private AxFetchListFactory attributesToFetchFactory() {
-        Map<String,List<OpenIDAttribute>> identityToAttrs = new HashMap<String,List<OpenIDAttribute>>();
-        for(AttributeExchangeConfigurer conf : attributeExchangeConfigurers) {
-            identityToAttrs.put(conf.identifier, conf.getAttributes());
-        }
-        return new RegexBasedAxFetchListFactory(identityToAttrs);
-    }
+	/**
+	 * Creates an {@link RegexBasedAxFetchListFactory} using the attributes populated by
+	 * {@link AttributeExchangeConfigurer}
+	 *
+	 * @return the {@link AxFetchListFactory} to use
+	 */
+	private AxFetchListFactory attributesToFetchFactory() {
+		Map<String, List<OpenIDAttribute>> identityToAttrs = new HashMap<String, List<OpenIDAttribute>>();
+		for (AttributeExchangeConfigurer conf : attributeExchangeConfigurers) {
+			identityToAttrs.put(conf.identifier, conf.getAttributes());
+		}
+		return new RegexBasedAxFetchListFactory(identityToAttrs);
+	}
 
-    /**
-     * Gets the {@link AuthenticationUserDetailsService} that was configured or
-     * defaults to {@link UserDetailsByNameServiceWrapper} that uses a
-     * {@link UserDetailsService} looked up using
-     * {@link HttpSecurity#getSharedObject(Class)}
-     *
-     * @param http the current {@link HttpSecurity}
-     * @return the {@link AuthenticationUserDetailsService}.
-     */
-    private AuthenticationUserDetailsService<OpenIDAuthenticationToken> getAuthenticationUserDetailsService(
-            H http) {
-        if(authenticationUserDetailsService != null) {
-            return authenticationUserDetailsService;
-        }
-        return new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(http.getSharedObject(UserDetailsService.class));
-    }
+	/**
+	 * Gets the {@link AuthenticationUserDetailsService} that was configured or defaults
+	 * to {@link UserDetailsByNameServiceWrapper} that uses a {@link UserDetailsService}
+	 * looked up using {@link HttpSecurity#getSharedObject(Class)}
+	 *
+	 * @param http the current {@link HttpSecurity}
+	 * @return the {@link AuthenticationUserDetailsService}.
+	 */
+	private AuthenticationUserDetailsService<OpenIDAuthenticationToken> getAuthenticationUserDetailsService(
+			H http) {
+		if (authenticationUserDetailsService != null) {
+			return authenticationUserDetailsService;
+		}
+		return new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(
+				http.getSharedObject(UserDetailsService.class));
+	}
 
-    /**
-     * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared object.
-     *
-     * @param http the {@link HttpSecurityBuilder} to use
-     */
-    private void initDefaultLoginFilter(H http) {
-        DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http.getSharedObject(DefaultLoginPageGeneratingFilter.class);
-        if(loginPageGeneratingFilter != null && !isCustomLoginPage()) {
-            loginPageGeneratingFilter.setOpenIdEnabled(true);
-            loginPageGeneratingFilter.setOpenIDauthenticationUrl(getLoginProcessingUrl());
-            String loginPageUrl = loginPageGeneratingFilter.getLoginPageUrl();
-            if(loginPageUrl == null) {
-                loginPageGeneratingFilter.setLoginPageUrl(getLoginPage());
-                loginPageGeneratingFilter.setFailureUrl(getFailureUrl());
-            }
-            loginPageGeneratingFilter.setOpenIDusernameParameter(OpenIDAuthenticationFilter.DEFAULT_CLAIMED_IDENTITY_FIELD);
-        }
-    }
+	/**
+	 * If available, initializes the {@link DefaultLoginPageGeneratingFilter} shared
+	 * object.
+	 *
+	 * @param http the {@link HttpSecurityBuilder} to use
+	 */
+	private void initDefaultLoginFilter(H http) {
+		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
+				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+		if (loginPageGeneratingFilter != null && !isCustomLoginPage()) {
+			loginPageGeneratingFilter.setOpenIdEnabled(true);
+			loginPageGeneratingFilter.setOpenIDauthenticationUrl(getLoginProcessingUrl());
+			String loginPageUrl = loginPageGeneratingFilter.getLoginPageUrl();
+			if (loginPageUrl == null) {
+				loginPageGeneratingFilter.setLoginPageUrl(getLoginPage());
+				loginPageGeneratingFilter.setFailureUrl(getFailureUrl());
+			}
+			loginPageGeneratingFilter
+					.setOpenIDusernameParameter(OpenIDAuthenticationFilter.DEFAULT_CLAIMED_IDENTITY_FIELD);
+		}
+	}
 
+	/**
+	 * A class used to add OpenID attributes to look up
+	 *
+	 * @author Rob Winch
+	 */
+	public final class AttributeExchangeConfigurer {
+		private final String identifier;
+		private List<OpenIDAttribute> attributes = new ArrayList<OpenIDAttribute>();
+		private List<AttributeConfigurer> attributeConfigurers = new ArrayList<AttributeConfigurer>();
 
-    /**
-     * A class used to add OpenID attributes to look up
-     *
-     * @author Rob Winch
-     */
-    public final class AttributeExchangeConfigurer {
-        private final String identifier;
-        private List<OpenIDAttribute> attributes = new ArrayList<OpenIDAttribute>();
-        private List<AttributeConfigurer> attributeConfigurers = new ArrayList<AttributeConfigurer>();
+		/**
+		 * Creates a new instance
+		 * @param identifierPattern the pattern that attempts to match on the OpenID
+		 * @see OpenIDLoginConfigurer#attributeExchange(String)
+		 */
+		private AttributeExchangeConfigurer(String identifierPattern) {
+			this.identifier = identifierPattern;
+		}
 
-        /**
-         * Creates a new instance
-         * @param identifierPattern the pattern that attempts to match on the OpenID
-         * @see OpenIDLoginConfigurer#attributeExchange(String)
-         */
-        private AttributeExchangeConfigurer(String identifierPattern) {
-            this.identifier = identifierPattern;
-        }
+		/**
+		 * Get the {@link OpenIDLoginConfigurer} to customize the OpenID configuration
+		 * further
+		 * @return the {@link OpenIDLoginConfigurer}
+		 */
+		public OpenIDLoginConfigurer<H> and() {
+			return OpenIDLoginConfigurer.this;
+		}
 
-        /**
-         * Get the {@link OpenIDLoginConfigurer} to customize the OpenID configuration further
-         * @return the {@link OpenIDLoginConfigurer}
-         */
-        public OpenIDLoginConfigurer<H> and() {
-            return OpenIDLoginConfigurer.this;
-        }
+		/**
+		 * Adds an {@link OpenIDAttribute} to be obtained for the configured OpenID
+		 * pattern.
+		 * @param attribute the {@link OpenIDAttribute} to obtain
+		 * @return the {@link AttributeExchangeConfigurer} for further customization of
+		 * attribute exchange
+		 */
+		public AttributeExchangeConfigurer attribute(OpenIDAttribute attribute) {
+			this.attributes.add(attribute);
+			return this;
+		}
 
-        /**
-         * Adds an {@link OpenIDAttribute} to be obtained for the configured OpenID pattern.
-         * @param attribute the {@link OpenIDAttribute} to obtain
-         * @return the {@link AttributeExchangeConfigurer} for further customization of attribute exchange
-         */
-        public AttributeExchangeConfigurer attribute(OpenIDAttribute attribute) {
-            this.attributes.add(attribute);
-            return this;
-        }
+		/**
+		 * Adds an {@link OpenIDAttribute} with the given name
+		 * @param name the name of the {@link OpenIDAttribute} to create
+		 * @return an {@link AttributeConfigurer} to further configure the
+		 * {@link OpenIDAttribute} that should be obtained.
+		 */
+		public AttributeConfigurer attribute(String name) {
+			AttributeConfigurer attributeConfigurer = new AttributeConfigurer(name);
+			this.attributeConfigurers.add(attributeConfigurer);
+			return attributeConfigurer;
+		}
 
-        /**
-         * Adds an {@link OpenIDAttribute} with the given name
-         * @param name the name of the {@link OpenIDAttribute} to create
-         * @return an {@link AttributeConfigurer} to further configure the {@link OpenIDAttribute} that should be obtained.
-         */
-        public AttributeConfigurer attribute(String name) {
-            AttributeConfigurer attributeConfigurer = new AttributeConfigurer(name);
-            this.attributeConfigurers.add(attributeConfigurer);
-            return attributeConfigurer;
-        }
+		/**
+		 * Gets the {@link OpenIDAttribute}'s for the configured OpenID pattern
+		 * @return
+		 */
+		private List<OpenIDAttribute> getAttributes() {
+			for (AttributeConfigurer config : attributeConfigurers) {
+				attributes.add(config.build());
+			}
+			attributeConfigurers.clear();
+			return attributes;
+		}
 
-        /**
-         * Gets the {@link OpenIDAttribute}'s for the configured OpenID pattern
-         * @return
-         */
-        private List<OpenIDAttribute> getAttributes() {
-            for(AttributeConfigurer config : attributeConfigurers) {
-                attributes.add(config.build());
-            }
-            attributeConfigurers.clear();
-            return attributes;
-        }
+		/**
+		 * Configures an {@link OpenIDAttribute}
+		 *
+		 * @author Rob Winch
+		 * @since 3.2
+		 */
+		public final class AttributeConfigurer {
+			private String name;
+			private int count = 1;
+			private boolean required = false;
+			private String type;
 
-        /**
-         * Configures an {@link OpenIDAttribute}
-         *
-         * @author Rob Winch
-         * @since 3.2
-         */
-        public final class AttributeConfigurer {
-            private String name;
-            private int count = 1;
-            private boolean required = false;
-            private String type;
+			/**
+			 * Creates a new instance
+			 * @param name the name of the attribute
+			 * @see AttributeExchangeConfigurer#attribute(String)
+			 */
+			private AttributeConfigurer(String name) {
+				this.name = name;
+			}
 
-            /**
-             * Creates a new instance
-             * @param name the name of the attribute
-             * @see AttributeExchangeConfigurer#attribute(String)
-             */
-            private AttributeConfigurer(String name) {
-                this.name = name;
-            }
+			/**
+			 * Specifies the number of attribute values to request. Default is 1.
+			 * @param count the number of attributes to request.
+			 * @return the {@link AttributeConfigurer} for further customization
+			 */
+			public AttributeConfigurer count(int count) {
+				this.count = count;
+				return this;
+			}
 
-            /**
-             * Specifies the number of attribute values to request. Default is 1.
-             * @param count the number of attributes to request.
-             * @return the {@link AttributeConfigurer} for further customization
-             */
-            public AttributeConfigurer count(int count) {
-                this.count = count;
-                return this;
-            }
+			/**
+			 * Specifies that this attribute is required. The default is
+			 * <code>false</code>. Note that as outlined in the OpenID specification,
+			 * required attributes are not validated by the OpenID Provider. Developers
+			 * should perform any validation in custom code.
+			 *
+			 * @param required specifies the attribute is required
+			 * @return the {@link AttributeConfigurer} for further customization
+			 */
+			public AttributeConfigurer required(boolean required) {
+				this.required = required;
+				return this;
+			}
 
-            /**
-             * Specifies that this attribute is required. The default is
-             * <code>false</code>. Note that as outlined in the OpenID
-             * specification, required attributes are not validated by the
-             * OpenID Provider. Developers should perform any validation in
-             * custom code.
-             *
-             * @param required specifies the attribute is required
-             * @return the {@link AttributeConfigurer} for further customization
-             */
-            public AttributeConfigurer required(boolean required) {
-                this.required = required;
-                return this;
-            }
+			/**
+			 * The OpenID attribute type.
+			 * @param type
+			 * @return
+			 */
+			public AttributeConfigurer type(String type) {
+				this.type = type;
+				return this;
+			}
 
-            /**
-             * The OpenID attribute type.
-             * @param type
-             * @return
-             */
-            public AttributeConfigurer type(String type) {
-                this.type = type;
-                return this;
-            }
+			/**
+			 * Gets the {@link AttributeExchangeConfigurer} for further customization of
+			 * the attributes
+			 *
+			 * @return the {@link AttributeConfigurer}
+			 */
+			public AttributeExchangeConfigurer and() {
+				return AttributeExchangeConfigurer.this;
+			}
 
-            /**
-             * Gets the {@link AttributeExchangeConfigurer} for further
-             * customization of the attributes
-             *
-             * @return the {@link AttributeConfigurer}
-             */
-            public AttributeExchangeConfigurer and() {
-                return AttributeExchangeConfigurer.this;
-            }
-
-            /**
-             * Builds the {@link OpenIDAttribute}.
-             * @return
-             */
-            private OpenIDAttribute build() {
-                OpenIDAttribute attribute = new OpenIDAttribute(name, type);
-                attribute.setCount(count);
-                attribute.setRequired(required);
-                return attribute;
-            }
-        }
-    }
+			/**
+			 * Builds the {@link OpenIDAttribute}.
+			 * @return
+			 */
+			private OpenIDAttribute build() {
+				OpenIDAttribute attribute = new OpenIDAttribute(name, type);
+				attribute.setCount(count);
+				attribute.setRequired(required);
+				return attribute;
+			}
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
index efb52345bb..fcf46e17fd 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
@@ -31,371 +31,412 @@ import org.springframework.util.StringUtils;
 import java.util.*;
 
 /**
- * Allows mapping security constraints using {@link MessageMatcher} to the security expressions.
+ * Allows mapping security constraints using {@link MessageMatcher} to the security
+ * expressions.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public class MessageSecurityMetadataSourceRegistry {
-    private static final String permitAll = "permitAll";
-    private static final String denyAll = "denyAll";
-    private static final String anonymous = "anonymous";
-    private static final String authenticated = "authenticated";
-    private static final String fullyAuthenticated = "fullyAuthenticated";
-    private static final String rememberMe = "rememberMe";
+	private static final String permitAll = "permitAll";
+	private static final String denyAll = "denyAll";
+	private static final String anonymous = "anonymous";
+	private static final String authenticated = "authenticated";
+	private static final String fullyAuthenticated = "fullyAuthenticated";
+	private static final String rememberMe = "rememberMe";
 
-    private final LinkedHashMap<MatcherBuilder,String> matcherToExpression = new LinkedHashMap<MatcherBuilder,String>();
+	private final LinkedHashMap<MatcherBuilder, String> matcherToExpression = new LinkedHashMap<MatcherBuilder, String>();
 
-    private PathMatcher pathMatcher = new AntPathMatcher();
+	private PathMatcher pathMatcher = new AntPathMatcher();
 
-    /**
-     * Maps any {@link Message} to a security expression.
-     *
-     * @return the Expression to associate
-     */
-    public Constraint anyMessage() {
-        return matchers(MessageMatcher.ANY_MESSAGE);
-    }
+	/**
+	 * Maps any {@link Message} to a security expression.
+	 *
+	 * @return the Expression to associate
+	 */
+	public Constraint anyMessage() {
+		return matchers(MessageMatcher.ANY_MESSAGE);
+	}
 
-    /**
-     * Maps any {@link Message} that has a null SimpMessageHeaderAccessor destination header (i.e. CONNECT,
-     * CONNECT_ACK, HEARTBEAT, UNSUBSCRIBE, DISCONNECT, DISCONNECT_ACK, OTHER)
-     *
-     * @return the Expression to associate
-     */
-    public Constraint nullDestMatcher() {
-        return matchers(SimpDestinationMessageMatcher.NULL_DESTINATION_MATCHER);
-    }
+	/**
+	 * Maps any {@link Message} that has a null SimpMessageHeaderAccessor destination
+	 * header (i.e. CONNECT, CONNECT_ACK, HEARTBEAT, UNSUBSCRIBE, DISCONNECT,
+	 * DISCONNECT_ACK, OTHER)
+	 *
+	 * @return the Expression to associate
+	 */
+	public Constraint nullDestMatcher() {
+		return matchers(SimpDestinationMessageMatcher.NULL_DESTINATION_MATCHER);
+	}
 
-    /**
-     * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances.
-     *
-     * @param typesToMatch the {@link SimpMessageType} instance to match on
-     * @return the {@link Constraint} associated to the matchers.
-     */
-    public Constraint simpTypeMatchers(SimpMessageType... typesToMatch) {
-        MessageMatcher<?>[] typeMatchers = new MessageMatcher<?>[typesToMatch.length];
-        for (int i = 0; i < typesToMatch.length; i++) {
-            SimpMessageType typeToMatch = typesToMatch[i];
-            typeMatchers[i] = new SimpMessageTypeMatcher(typeToMatch);
-        }
-        return matchers(typeMatchers);
-    }
+	/**
+	 * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances.
+	 *
+	 * @param typesToMatch the {@link SimpMessageType} instance to match on
+	 * @return the {@link Constraint} associated to the matchers.
+	 */
+	public Constraint simpTypeMatchers(SimpMessageType... typesToMatch) {
+		MessageMatcher<?>[] typeMatchers = new MessageMatcher<?>[typesToMatch.length];
+		for (int i = 0; i < typesToMatch.length; i++) {
+			SimpMessageType typeToMatch = typesToMatch[i];
+			typeMatchers[i] = new SimpMessageTypeMatcher(typeToMatch);
+		}
+		return matchers(typeMatchers);
+	}
 
-    /**
-     * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances
-     * without regard to the {@link SimpMessageType}. If no destination is found
-     * on the Message, then the Matcher returns false.
-     *
-     * @param patterns
-     *            the patterns to create
-     *            {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
-     *            from. Uses
-     *            {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
-     *            .
-     *
-     * @return the {@link Constraint} that is associated to the
-     *         {@link MessageMatcher}
-     * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
-     */
-    public Constraint simpDestMatchers(String... patterns) {
-        return simpDestMatchers(null, patterns);
-    }
+	/**
+	 * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances without
+	 * regard to the {@link SimpMessageType}. If no destination is found on the Message,
+	 * then the Matcher returns false.
+	 *
+	 * @param patterns the patterns to create
+	 * {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
+	 * from. Uses
+	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)} .
+	 *
+	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
+	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 */
+	public Constraint simpDestMatchers(String... patterns) {
+		return simpDestMatchers(null, patterns);
+	}
 
-    /**
-     * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances that match on {@code SimpMessageType.MESSAGE}.
-     * If no destination is found on the Message, then the Matcher returns
-     * false.
-     *
-     * @param patterns the patterns to create {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
-     *                    from. Uses {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
-     *
-     * @return the {@link Constraint}  that is associated to the {@link MessageMatcher}
-     * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
-     */
-    public Constraint simpMessageDestMatchers(String... patterns) {
-        return simpDestMatchers(SimpMessageType.MESSAGE, patterns);
-    }
+	/**
+	 * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances that match
+	 * on {@code SimpMessageType.MESSAGE}. If no destination is found on the Message, then
+	 * the Matcher returns false.
+	 *
+	 * @param patterns the patterns to create
+	 * {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
+	 * from. Uses
+	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
+	 *
+	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
+	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 */
+	public Constraint simpMessageDestMatchers(String... patterns) {
+		return simpDestMatchers(SimpMessageType.MESSAGE, patterns);
+	}
 
-    /**
-     * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances that match on {@code SimpMessageType.SUBSCRIBE}.
-     * If no destination is found on the Message, then the Matcher returns
-     * false.
-     *
-     * @param patterns the patterns to create {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
-     *                    from. Uses {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
-     *
-     * @return the {@link Constraint}  that is associated to the {@link MessageMatcher}
-     * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
-     */
-    public Constraint simpSubscribeDestMatchers(String... patterns) {
-        return simpDestMatchers(SimpMessageType.SUBSCRIBE, patterns);
-    }
+	/**
+	 * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances that match
+	 * on {@code SimpMessageType.SUBSCRIBE}. If no destination is found on the Message,
+	 * then the Matcher returns false.
+	 *
+	 * @param patterns the patterns to create
+	 * {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
+	 * from. Uses
+	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
+	 *
+	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
+	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 */
+	public Constraint simpSubscribeDestMatchers(String... patterns) {
+		return simpDestMatchers(SimpMessageType.SUBSCRIBE, patterns);
+	}
 
-    /**
-     * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances.
-     * If no destination is found on the Message, then the Matcher returns
-     * false.
-     *
-     * @param type the {@link SimpMessageType} to match on. If null, the {@link SimpMessageType} is not considered for matching.
-     * @param patterns the patterns to create {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
-     *                    from. Uses {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
-     *
-     * @return the {@link Constraint}  that is associated to the {@link MessageMatcher}
-     * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
-     */
-    private Constraint simpDestMatchers(SimpMessageType type, String... patterns) {
-        List<MatcherBuilder> matchers = new ArrayList<MatcherBuilder>(patterns.length);
-        for(String pattern : patterns) {
-            matchers.add(new PathMatcherMessageMatcherBuilder(pattern, type));
-        }
-        return new Constraint(matchers);
-    }
+	/**
+	 * Maps a {@link List} of {@link SimpDestinationMessageMatcher} instances. If no
+	 * destination is found on the Message, then the Matcher returns false.
+	 *
+	 * @param type the {@link SimpMessageType} to match on. If null, the
+	 * {@link SimpMessageType} is not considered for matching.
+	 * @param patterns the patterns to create
+	 * {@link org.springframework.security.messaging.util.matcher.SimpDestinationMessageMatcher}
+	 * from. Uses
+	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
+	 *
+	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
+	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 */
+	private Constraint simpDestMatchers(SimpMessageType type, String... patterns) {
+		List<MatcherBuilder> matchers = new ArrayList<MatcherBuilder>(patterns.length);
+		for (String pattern : patterns) {
+			matchers.add(new PathMatcherMessageMatcherBuilder(pattern, type));
+		}
+		return new Constraint(matchers);
+	}
 
-    /**
-     * The {@link PathMatcher} to be used with the {@link MessageSecurityMetadataSourceRegistry#simpDestMatchers(String...)}.
-     * The default is to use the default constructor of {@link AntPathMatcher}.
-     *
-     * @param pathMatcher the {@link PathMatcher} to use. Cannot be null.
-     * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization.
-     */
-    public MessageSecurityMetadataSourceRegistry simpDestPathMatcher(PathMatcher pathMatcher) {
-        Assert.notNull(pathMatcher, "pathMatcher cannot be null");
-        this.pathMatcher = pathMatcher;
-        return this;
-    }
+	/**
+	 * The {@link PathMatcher} to be used with the
+	 * {@link MessageSecurityMetadataSourceRegistry#simpDestMatchers(String...)}. The
+	 * default is to use the default constructor of {@link AntPathMatcher}.
+	 *
+	 * @param pathMatcher the {@link PathMatcher} to use. Cannot be null.
+	 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+	 * customization.
+	 */
+	public MessageSecurityMetadataSourceRegistry simpDestPathMatcher(
+			PathMatcher pathMatcher) {
+		Assert.notNull(pathMatcher, "pathMatcher cannot be null");
+		this.pathMatcher = pathMatcher;
+		return this;
+	}
 
-    /**
-     * Maps a {@link List} of {@link MessageMatcher} instances to a security expression.
-     *
-     * @param matchers the {@link MessageMatcher} instances to map.
-     * @return The {@link Constraint} that is associated to the {@link MessageMatcher} instances
-     */
-    public Constraint matchers(MessageMatcher<?>... matchers) {
-        List<MatcherBuilder> builders = new ArrayList<MatcherBuilder>(matchers.length);
-        for(MessageMatcher<?> matcher : matchers) {
-            builders.add(new PreBuiltMatcherBuilder(matcher));
-        }
-        return new Constraint(builders);
-    }
+	/**
+	 * Maps a {@link List} of {@link MessageMatcher} instances to a security expression.
+	 *
+	 * @param matchers the {@link MessageMatcher} instances to map.
+	 * @return The {@link Constraint} that is associated to the {@link MessageMatcher}
+	 * instances
+	 */
+	public Constraint matchers(MessageMatcher<?>... matchers) {
+		List<MatcherBuilder> builders = new ArrayList<MatcherBuilder>(matchers.length);
+		for (MessageMatcher<?> matcher : matchers) {
+			builders.add(new PreBuiltMatcherBuilder(matcher));
+		}
+		return new Constraint(builders);
+	}
 
-    /**
-     * Allows subclasses to create creating a {@link MessageSecurityMetadataSource}.
-     *
-     * <p>This is not exposed so as not to confuse users of the API, which should never invoke this method.</p>
-     *
-     * @return the {@link MessageSecurityMetadataSource} to use
-     */
-    protected MessageSecurityMetadataSource createMetadataSource() {
-        LinkedHashMap<MessageMatcher<?>,String> matcherToExpression = new LinkedHashMap<MessageMatcher<?>,String>();
-        for(Map.Entry<MatcherBuilder,String> entry : this.matcherToExpression.entrySet()) {
-            matcherToExpression.put(entry.getKey().build(), entry.getValue());
-        }
-        return ExpressionBasedMessageSecurityMetadataSourceFactory.createExpressionMessageMetadataSource(matcherToExpression);
-    }
+	/**
+	 * Allows subclasses to create creating a {@link MessageSecurityMetadataSource}.
+	 *
+	 * <p>
+	 * This is not exposed so as not to confuse users of the API, which should never
+	 * invoke this method.
+	 * </p>
+	 *
+	 * @return the {@link MessageSecurityMetadataSource} to use
+	 */
+	protected MessageSecurityMetadataSource createMetadataSource() {
+		LinkedHashMap<MessageMatcher<?>, String> matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
+		for (Map.Entry<MatcherBuilder, String> entry : this.matcherToExpression
+				.entrySet()) {
+			matcherToExpression.put(entry.getKey().build(), entry.getValue());
+		}
+		return ExpressionBasedMessageSecurityMetadataSourceFactory
+				.createExpressionMessageMetadataSource(matcherToExpression);
+	}
 
-    /**
-     * Allows determining if a mapping was added.
-     *
-     * <p>This is not exposed so as not to confuse users of the API, which should never need to invoke this method.</p>
-     *
-     * @return true if a mapping was added, else false
-     */
-    protected boolean containsMapping() {
-        return !this.matcherToExpression.isEmpty();
-    }
+	/**
+	 * Allows determining if a mapping was added.
+	 *
+	 * <p>
+	 * This is not exposed so as not to confuse users of the API, which should never need
+	 * to invoke this method.
+	 * </p>
+	 *
+	 * @return true if a mapping was added, else false
+	 */
+	protected boolean containsMapping() {
+		return !this.matcherToExpression.isEmpty();
+	}
 
-    /**
-     * Represents the security constraint to be applied to the {@link MessageMatcher} instances.
-     */
-    public class Constraint {
-        private final List<? extends MatcherBuilder> messageMatchers;
+	/**
+	 * Represents the security constraint to be applied to the {@link MessageMatcher}
+	 * instances.
+	 */
+	public class Constraint {
+		private final List<? extends MatcherBuilder> messageMatchers;
 
-        /**
-         * Creates a new instance
-         *
-         * @param messageMatchers the {@link MessageMatcher} instances to map to this constraint
-         */
-        private Constraint(List<? extends MatcherBuilder> messageMatchers) {
-            Assert.notEmpty(messageMatchers, "messageMatchers cannot be null or empty");
-            this.messageMatchers = messageMatchers;
-        }
+		/**
+		 * Creates a new instance
+		 *
+		 * @param messageMatchers the {@link MessageMatcher} instances to map to this
+		 * constraint
+		 */
+		private Constraint(List<? extends MatcherBuilder> messageMatchers) {
+			Assert.notEmpty(messageMatchers, "messageMatchers cannot be null or empty");
+			this.messageMatchers = messageMatchers;
+		}
 
-        /**
-         * Shortcut for specifying {@link Message} instances require a particular role. If you do not want to have "ROLE_" automatically
-         * inserted see {@link #hasAuthority(String)}.
-         *
-         * @param role the role to require (i.e. USER, ADMIN, etc). Note, it should not start with "ROLE_" as
-         *             this is automatically inserted.
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry hasRole(String role) {
-            return access(MessageSecurityMetadataSourceRegistry.hasRole(role));
-        }
+		/**
+		 * Shortcut for specifying {@link Message} instances require a particular role. If
+		 * you do not want to have "ROLE_" automatically inserted see
+		 * {@link #hasAuthority(String)}.
+		 *
+		 * @param role the role to require (i.e. USER, ADMIN, etc). Note, it should not
+		 * start with "ROLE_" as this is automatically inserted.
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry hasRole(String role) {
+			return access(MessageSecurityMetadataSourceRegistry.hasRole(role));
+		}
 
-        /**
-         * Shortcut for specifying {@link Message} instances require any of a number of roles. If you
-         * do not want to have "ROLE_" automatically inserted see
-         * {@link #hasAnyAuthority(String...)}
-         *
-         * @param roles
-         *            the roles to require (i.e. USER, ADMIN, etc). Note, it
-         *            should not start with "ROLE_" as this is automatically
-         *            inserted.
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further
-         *         customization
-         */
-        public MessageSecurityMetadataSourceRegistry hasAnyRole(String... roles) {
-            return access(MessageSecurityMetadataSourceRegistry.hasAnyRole(roles));
-        }
+		/**
+		 * Shortcut for specifying {@link Message} instances require any of a number of
+		 * roles. If you do not want to have "ROLE_" automatically inserted see
+		 * {@link #hasAnyAuthority(String...)}
+		 *
+		 * @param roles the roles to require (i.e. USER, ADMIN, etc). Note, it should not
+		 * start with "ROLE_" as this is automatically inserted.
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry hasAnyRole(String... roles) {
+			return access(MessageSecurityMetadataSourceRegistry.hasAnyRole(roles));
+		}
 
-        /**
-         * Specify that {@link Message} instances require a particular authority.
-         *
-         * @param authority the authority to require (i.e. ROLE_USER, ROLE_ADMIN, etc).
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry hasAuthority(String authority) {
-            return access(MessageSecurityMetadataSourceRegistry.hasAuthority(authority));
-        }
+		/**
+		 * Specify that {@link Message} instances require a particular authority.
+		 *
+		 * @param authority the authority to require (i.e. ROLE_USER, ROLE_ADMIN, etc).
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry hasAuthority(String authority) {
+			return access(MessageSecurityMetadataSourceRegistry.hasAuthority(authority));
+		}
 
-        /**
-         * Specify that {@link Message} instances requires any of a number authorities.
-         *
-         * @param authorities the requests require at least one of the authorities (i.e. "ROLE_USER","ROLE_ADMIN" would
-         *                    mean either "ROLE_USER" or "ROLE_ADMIN" is required).
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry hasAnyAuthority(String... authorities) {
-            return access(MessageSecurityMetadataSourceRegistry.hasAnyAuthority(authorities));
-        }
+		/**
+		 * Specify that {@link Message} instances requires any of a number authorities.
+		 *
+		 * @param authorities the requests require at least one of the authorities (i.e.
+		 * "ROLE_USER","ROLE_ADMIN" would mean either "ROLE_USER" or "ROLE_ADMIN" is
+		 * required).
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry hasAnyAuthority(
+				String... authorities) {
+			return access(MessageSecurityMetadataSourceRegistry
+					.hasAnyAuthority(authorities));
+		}
 
-        /**
-         * Specify that Messages are allowed by anyone.
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry permitAll() {
-            return access(permitAll);
-        }
+		/**
+		 * Specify that Messages are allowed by anyone.
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry permitAll() {
+			return access(permitAll);
+		}
 
-        /**
-         * Specify that Messages are allowed by anonymous users.
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry anonymous() {
-            return access(anonymous);
-        }
+		/**
+		 * Specify that Messages are allowed by anonymous users.
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry anonymous() {
+			return access(anonymous);
+		}
 
-        /**
-         * Specify that Messages are allowed by users that have been remembered.
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         * @see {@link RememberMeConfigurer}
-         */
-        public MessageSecurityMetadataSourceRegistry rememberMe() {
-            return access(rememberMe);
-        }
+		/**
+		 * Specify that Messages are allowed by users that have been remembered.
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 * @see {@link RememberMeConfigurer}
+		 */
+		public MessageSecurityMetadataSourceRegistry rememberMe() {
+			return access(rememberMe);
+		}
 
-        /**
-         * Specify that Messages are not allowed by anyone.
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry denyAll() {
-            return access(denyAll);
-        }
+		/**
+		 * Specify that Messages are not allowed by anyone.
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry denyAll() {
+			return access(denyAll);
+		}
 
-        /**
-         * Specify that Messages are allowed by any authenticated user.
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry authenticated() {
-            return access(authenticated);
-        }
+		/**
+		 * Specify that Messages are allowed by any authenticated user.
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry authenticated() {
+			return access(authenticated);
+		}
 
-        /**
-         * Specify that Messages are allowed by users who have authenticated and were not "remembered".
-         *
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         * @see {@link RememberMeConfigurer}
-         */
-        public MessageSecurityMetadataSourceRegistry fullyAuthenticated() {
-            return access(fullyAuthenticated);
-        }
+		/**
+		 * Specify that Messages are allowed by users who have authenticated and were not
+		 * "remembered".
+		 *
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 * @see {@link RememberMeConfigurer}
+		 */
+		public MessageSecurityMetadataSourceRegistry fullyAuthenticated() {
+			return access(fullyAuthenticated);
+		}
 
-        /**
-         * Allows specifying that Messages are secured by an arbitrary expression
-         *
-         * @param attribute the expression to secure the URLs (i.e. "hasRole('ROLE_USER') and hasRole('ROLE_SUPER')")
-         * @return the {@link MessageSecurityMetadataSourceRegistry} for further customization
-         */
-        public MessageSecurityMetadataSourceRegistry access(String attribute) {
-            for(MatcherBuilder messageMatcher : messageMatchers) {
-                matcherToExpression.put(messageMatcher, attribute);
-            }
-            return MessageSecurityMetadataSourceRegistry.this;
-        }
-    }
+		/**
+		 * Allows specifying that Messages are secured by an arbitrary expression
+		 *
+		 * @param attribute the expression to secure the URLs (i.e.
+		 * "hasRole('ROLE_USER') and hasRole('ROLE_SUPER')")
+		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
+		 * customization
+		 */
+		public MessageSecurityMetadataSourceRegistry access(String attribute) {
+			for (MatcherBuilder messageMatcher : messageMatchers) {
+				matcherToExpression.put(messageMatcher, attribute);
+			}
+			return MessageSecurityMetadataSourceRegistry.this;
+		}
+	}
 
-    private static String hasAnyRole(String... authorities) {
-        String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','ROLE_");
-        return "hasAnyRole('ROLE_" + anyAuthorities + "')";
-    }
+	private static String hasAnyRole(String... authorities) {
+		String anyAuthorities = StringUtils.arrayToDelimitedString(authorities,
+				"','ROLE_");
+		return "hasAnyRole('ROLE_" + anyAuthorities + "')";
+	}
 
-    private static String hasRole(String role) {
-        Assert.notNull(role, "role cannot be null");
-        if (role.startsWith("ROLE_")) {
-            throw new IllegalArgumentException("role should not start with 'ROLE_' since it is automatically inserted. Got '" + role + "'");
-        }
-        return "hasRole('ROLE_" + role + "')";
-    }
+	private static String hasRole(String role) {
+		Assert.notNull(role, "role cannot be null");
+		if (role.startsWith("ROLE_")) {
+			throw new IllegalArgumentException(
+					"role should not start with 'ROLE_' since it is automatically inserted. Got '"
+							+ role + "'");
+		}
+		return "hasRole('ROLE_" + role + "')";
+	}
 
-    private static String hasAuthority(String authority) {
-        return "hasAuthority('" + authority + "')";
-    }
+	private static String hasAuthority(String authority) {
+		return "hasAuthority('" + authority + "')";
+	}
 
-    private static String hasAnyAuthority(String... authorities) {
-        String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','");
-        return "hasAnyAuthority('" + anyAuthorities + "')";
-    }
+	private static String hasAnyAuthority(String... authorities) {
+		String anyAuthorities = StringUtils.arrayToDelimitedString(authorities, "','");
+		return "hasAnyAuthority('" + anyAuthorities + "')";
+	}
 
-    private class PreBuiltMatcherBuilder implements MatcherBuilder {
-        private MessageMatcher<?> matcher;
+	private class PreBuiltMatcherBuilder implements MatcherBuilder {
+		private MessageMatcher<?> matcher;
 
-        private PreBuiltMatcherBuilder(MessageMatcher<?> matcher) {
-            this.matcher = matcher;
-        }
+		private PreBuiltMatcherBuilder(MessageMatcher<?> matcher) {
+			this.matcher = matcher;
+		}
 
-        public MessageMatcher<?> build() {
-            return matcher;
-        }
-    }
+		public MessageMatcher<?> build() {
+			return matcher;
+		}
+	}
 
-    private class PathMatcherMessageMatcherBuilder implements MatcherBuilder {
-        private final String pattern;
-        private final SimpMessageType type;
+	private class PathMatcherMessageMatcherBuilder implements MatcherBuilder {
+		private final String pattern;
+		private final SimpMessageType type;
 
-        private PathMatcherMessageMatcherBuilder(String pattern, SimpMessageType type) {
-            this.pattern = pattern;
-            this.type = type;
-        }
+		private PathMatcherMessageMatcherBuilder(String pattern, SimpMessageType type) {
+			this.pattern = pattern;
+			this.type = type;
+		}
 
-        public MessageMatcher<?> build() {
-            if(type == null) {
-                return new SimpDestinationMessageMatcher(pattern, pathMatcher);
-            } else if(SimpMessageType.MESSAGE == type) {
-                return SimpDestinationMessageMatcher.createMessageMatcher(pattern, pathMatcher);
-            } else if(SimpMessageType.SUBSCRIBE == type) {
-                return SimpDestinationMessageMatcher.createSubscribeMatcher(pattern, pathMatcher);
-            }
-            throw new IllegalStateException(type + " is not supported since it does not have a destination");
-        }
-    }
+		public MessageMatcher<?> build() {
+			if (type == null) {
+				return new SimpDestinationMessageMatcher(pattern, pathMatcher);
+			}
+			else if (SimpMessageType.MESSAGE == type) {
+				return SimpDestinationMessageMatcher.createMessageMatcher(pattern,
+						pathMatcher);
+			}
+			else if (SimpMessageType.SUBSCRIBE == type) {
+				return SimpDestinationMessageMatcher.createSubscribeMatcher(pattern,
+						pathMatcher);
+			}
+			throw new IllegalStateException(type
+					+ " is not supported since it does not have a destination");
+		}
+	}
 
-    private interface MatcherBuilder {
-        MessageMatcher<?> build();
-    }
+	private interface MatcherBuilder {
+		MessageMatcher<?> build();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java
index 687a6861ca..f8e2e1034c 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java
@@ -23,17 +23,17 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.security.config.annotation.authentication.configuration.EnableGlobalAuthentication;
 
-
 /**
  * Add this annotation to an {@code @Configuration} class to have the Spring Security
  * configuration integrate with Spring MVC.
  *
- * @deprecated Use EnableWebSecurity instead which will automatically add the Spring MVC related Security items.
+ * @deprecated Use EnableWebSecurity instead which will automatically add the Spring MVC
+ * related Security items.
  * @author Rob Winch
  * @since 3.2
  */
-@Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
-@Target(value={java.lang.annotation.ElementType.TYPE})
+@Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(value = { java.lang.annotation.ElementType.TYPE })
 @Documented
 @Import(WebMvcSecurityConfiguration.class)
 @EnableGlobalAuthentication
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
index 8c045b2fad..84084634a3 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
@@ -28,11 +28,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
 
 /**
- * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring
- * Security CSRF integration. This configuration is added whenever
- * {@link EnableWebMvc} is added by {@link SpringWebMvcImportSelector} and the
- * DispatcherServlet is present on the classpath. It also adds the
- * {@link AuthenticationPrincipalArgumentResolver} as a
+ * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF
+ * integration. This configuration is added whenever {@link EnableWebMvc} is added by
+ * {@link SpringWebMvcImportSelector} and the DispatcherServlet is present on the
+ * classpath. It also adds the {@link AuthenticationPrincipalArgumentResolver} as a
  * {@link HandlerMethodArgumentResolver}.
  *
  * @deprecated This is applied internally using SpringWebMvcImportSelector
@@ -42,16 +41,16 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 @EnableWebSecurity
 public class WebMvcSecurityConfiguration extends WebMvcConfigurerAdapter {
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public void addArgumentResolvers(
-            List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
-        argumentResolvers.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
-    }
+	@Override
+	@SuppressWarnings("deprecation")
+	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+		argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
+		argumentResolvers
+				.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
+	}
 
-    @Bean
-    public RequestDataValueProcessor requestDataValueProcessor() {
-        return new CsrfRequestDataValueProcessor();
-    }
+	@Bean
+	public RequestDataValueProcessor requestDataValueProcessor() {
+		return new CsrfRequestDataValueProcessor();
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java
index 54d1e99a01..40e2dfe2c4 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java
@@ -49,19 +49,21 @@ import java.util.Map;
 /**
  * Allows configuring WebSocket Authorization.
  *
- * <p>For example:</p>
+ * <p>
+ * For example:
+ * </p>
  *
  * <pre>
- * @Configuration
- * public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
- *
- *   @Override
- *   protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
- *     messages
- *       .simpDestMatchers("/user/queue/errors").permitAll()
- *       .simpDestMatchers("/admin/**").hasRole("ADMIN")
- *       .anyMessage().authenticated();
- *   }
+ * &#064;Configuration
+ * public class WebSocketSecurityConfig extends
+ * 		AbstractSecurityWebSocketMessageBrokerConfigurer {
+ * 
+ * 	&#064;Override
+ * 	protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+ * 		messages.simpDestMatchers(&quot;/user/queue/errors&quot;).permitAll()
+ * 				.simpDestMatchers(&quot;/admin/**&quot;).hasRole(&quot;ADMIN&quot;).anyMessage()
+ * 				.authenticated();
+ * 	}
  * }
  * </pre>
  *
@@ -70,140 +72,158 @@ import java.util.Map;
  * @author Rob Winch
  */
 @Order(Ordered.HIGHEST_PRECEDENCE + 100)
-public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends AbstractWebSocketMessageBrokerConfigurer
-        implements SmartInitializingSingleton {
-    private final WebSocketMessageSecurityMetadataSourceRegistry inboundRegistry = new WebSocketMessageSecurityMetadataSourceRegistry();
+public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends
+		AbstractWebSocketMessageBrokerConfigurer implements SmartInitializingSingleton {
+	private final WebSocketMessageSecurityMetadataSourceRegistry inboundRegistry = new WebSocketMessageSecurityMetadataSourceRegistry();
 
-    private ApplicationContext context;
+	private ApplicationContext context;
 
-    public void registerStompEndpoints(StompEndpointRegistry registry) {}
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+	}
 
-    @Override
-    public void addArgumentResolvers(
-            List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
-    }
+	@Override
+	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+		argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
+	}
 
-    @Override
-    public final void configureClientInboundChannel(ChannelRegistration registration) {
-        ChannelSecurityInterceptor inboundChannelSecurity = inboundChannelSecurity();
-        registration.setInterceptors(securityContextChannelInterceptor());
-        if(!sameOriginDisabled()) {
-            registration.setInterceptors(csrfChannelInterceptor());
-        }
-        if(inboundRegistry.containsMapping()) {
-            registration.setInterceptors(inboundChannelSecurity);
-        }
-        customizeClientInboundChannel(registration);
-    }
+	@Override
+	public final void configureClientInboundChannel(ChannelRegistration registration) {
+		ChannelSecurityInterceptor inboundChannelSecurity = inboundChannelSecurity();
+		registration.setInterceptors(securityContextChannelInterceptor());
+		if (!sameOriginDisabled()) {
+			registration.setInterceptors(csrfChannelInterceptor());
+		}
+		if (inboundRegistry.containsMapping()) {
+			registration.setInterceptors(inboundChannelSecurity);
+		}
+		customizeClientInboundChannel(registration);
+	}
 
-    /**
-     * <p>
-     * Determines if a CSRF token is required for connecting. This protects against remote sites from connecting to the
-     * application and being able to read/write data over the connection. The default is false (the token is required).
-     * </p>
-     * <p>
-     * Subclasses can override this method to disable CSRF protection
-     * </p>
-     *
-     * @return false if a CSRF token is required for connecting, else true
-     */
-    protected boolean sameOriginDisabled() {
-        return false;
-    }
+	/**
+	 * <p>
+	 * Determines if a CSRF token is required for connecting. This protects against remote
+	 * sites from connecting to the application and being able to read/write data over the
+	 * connection. The default is false (the token is required).
+	 * </p>
+	 * <p>
+	 * Subclasses can override this method to disable CSRF protection
+	 * </p>
+	 *
+	 * @return false if a CSRF token is required for connecting, else true
+	 */
+	protected boolean sameOriginDisabled() {
+		return false;
+	}
 
-    /**
-     * Allows subclasses to customize the configuration of the {@link ChannelRegistration}.
-     *
-     * @param registration the {@link ChannelRegistration} to customize
-     */
-    protected void customizeClientInboundChannel(ChannelRegistration registration) {
-    }
+	/**
+	 * Allows subclasses to customize the configuration of the {@link ChannelRegistration}
+	 * .
+	 *
+	 * @param registration the {@link ChannelRegistration} to customize
+	 */
+	protected void customizeClientInboundChannel(ChannelRegistration registration) {
+	}
 
-    @Bean
-    public CsrfChannelInterceptor csrfChannelInterceptor() {
-        return new CsrfChannelInterceptor();
-    }
+	@Bean
+	public CsrfChannelInterceptor csrfChannelInterceptor() {
+		return new CsrfChannelInterceptor();
+	}
 
-    @Bean
-    public ChannelSecurityInterceptor inboundChannelSecurity() {
-        ChannelSecurityInterceptor channelSecurityInterceptor = new ChannelSecurityInterceptor(inboundMessageSecurityMetadataSource());
-        List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
-        voters.add(new MessageExpressionVoter<Object>());
-        AffirmativeBased manager = new AffirmativeBased(voters);
-        channelSecurityInterceptor.setAccessDecisionManager(manager);
-        return channelSecurityInterceptor;
-    }
+	@Bean
+	public ChannelSecurityInterceptor inboundChannelSecurity() {
+		ChannelSecurityInterceptor channelSecurityInterceptor = new ChannelSecurityInterceptor(
+				inboundMessageSecurityMetadataSource());
+		List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+		voters.add(new MessageExpressionVoter<Object>());
+		AffirmativeBased manager = new AffirmativeBased(voters);
+		channelSecurityInterceptor.setAccessDecisionManager(manager);
+		return channelSecurityInterceptor;
+	}
 
-    @Bean
-    public SecurityContextChannelInterceptor securityContextChannelInterceptor() {
-        return new SecurityContextChannelInterceptor();
-    }
+	@Bean
+	public SecurityContextChannelInterceptor securityContextChannelInterceptor() {
+		return new SecurityContextChannelInterceptor();
+	}
 
-    @Bean
-    public MessageSecurityMetadataSource inboundMessageSecurityMetadataSource() {
-        configureInbound(inboundRegistry);
-        return inboundRegistry.createMetadataSource();
-    }
+	@Bean
+	public MessageSecurityMetadataSource inboundMessageSecurityMetadataSource() {
+		configureInbound(inboundRegistry);
+		return inboundRegistry.createMetadataSource();
+	}
 
-    /**
-     *
-     * @param messages
-     */
-    protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {}
+	/**
+	 *
+	 * @param messages
+	 */
+	protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+	}
 
-    private class WebSocketMessageSecurityMetadataSourceRegistry extends MessageSecurityMetadataSourceRegistry {
-        @Override
-        public MessageSecurityMetadataSource createMetadataSource() {
-            return super.createMetadataSource();
-        }
+	private class WebSocketMessageSecurityMetadataSourceRegistry extends
+			MessageSecurityMetadataSourceRegistry {
+		@Override
+		public MessageSecurityMetadataSource createMetadataSource() {
+			return super.createMetadataSource();
+		}
 
-        @Override
-        protected boolean containsMapping() {
-            return super.containsMapping();
-        }
-    }
+		@Override
+		protected boolean containsMapping() {
+			return super.containsMapping();
+		}
+	}
 
-    @Autowired
-    public void setApplicationContext(ApplicationContext context) {
-        this.context = context;
-    }
+	@Autowired
+	public void setApplicationContext(ApplicationContext context) {
+		this.context = context;
+	}
 
-    public void afterSingletonsInstantiated() {
-        if(sameOriginDisabled()) {
-            return;
-        }
+	public void afterSingletonsInstantiated() {
+		if (sameOriginDisabled()) {
+			return;
+		}
 
-        String beanName = "stompWebSocketHandlerMapping";
-        SimpleUrlHandlerMapping mapping = context.getBean(beanName, SimpleUrlHandlerMapping.class);
-        Map<String, Object> mappings = mapping.getHandlerMap();
-        for(Object object : mappings.values()) {
-            if(object instanceof SockJsHttpRequestHandler) {
-                SockJsHttpRequestHandler sockjsHandler = (SockJsHttpRequestHandler) object;
-                SockJsService sockJsService = sockjsHandler.getSockJsService();
-                if(!(sockJsService instanceof TransportHandlingSockJsService)) {
-                    throw new IllegalStateException("sockJsService must be instance of TransportHandlingSockJsService got " + sockJsService);
-                }
+		String beanName = "stompWebSocketHandlerMapping";
+		SimpleUrlHandlerMapping mapping = context.getBean(beanName,
+				SimpleUrlHandlerMapping.class);
+		Map<String, Object> mappings = mapping.getHandlerMap();
+		for (Object object : mappings.values()) {
+			if (object instanceof SockJsHttpRequestHandler) {
+				SockJsHttpRequestHandler sockjsHandler = (SockJsHttpRequestHandler) object;
+				SockJsService sockJsService = sockjsHandler.getSockJsService();
+				if (!(sockJsService instanceof TransportHandlingSockJsService)) {
+					throw new IllegalStateException(
+							"sockJsService must be instance of TransportHandlingSockJsService got "
+									+ sockJsService);
+				}
 
-                TransportHandlingSockJsService transportHandlingSockJsService = (TransportHandlingSockJsService) sockJsService;
-                List<HandshakeInterceptor> handshakeInterceptors = transportHandlingSockJsService.getHandshakeInterceptors();
-                List<HandshakeInterceptor> interceptorsToSet = new ArrayList<HandshakeInterceptor>(handshakeInterceptors.size() + 1);
-                interceptorsToSet.add(new CsrfTokenHandshakeInterceptor());
-                interceptorsToSet.addAll(handshakeInterceptors);
+				TransportHandlingSockJsService transportHandlingSockJsService = (TransportHandlingSockJsService) sockJsService;
+				List<HandshakeInterceptor> handshakeInterceptors = transportHandlingSockJsService
+						.getHandshakeInterceptors();
+				List<HandshakeInterceptor> interceptorsToSet = new ArrayList<HandshakeInterceptor>(
+						handshakeInterceptors.size() + 1);
+				interceptorsToSet.add(new CsrfTokenHandshakeInterceptor());
+				interceptorsToSet.addAll(handshakeInterceptors);
 
-                transportHandlingSockJsService.setHandshakeInterceptors(interceptorsToSet);
-            }
-            else if(object instanceof WebSocketHttpRequestHandler) {
-                WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) object;
-                List<HandshakeInterceptor> handshakeInterceptors = handler.getHandshakeInterceptors();
-                List<HandshakeInterceptor> interceptorsToSet = new ArrayList<HandshakeInterceptor>(handshakeInterceptors.size() + 1);
-                interceptorsToSet.add(new CsrfTokenHandshakeInterceptor());
-                interceptorsToSet.addAll(handshakeInterceptors);
+				transportHandlingSockJsService
+						.setHandshakeInterceptors(interceptorsToSet);
+			}
+			else if (object instanceof WebSocketHttpRequestHandler) {
+				WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) object;
+				List<HandshakeInterceptor> handshakeInterceptors = handler
+						.getHandshakeInterceptors();
+				List<HandshakeInterceptor> interceptorsToSet = new ArrayList<HandshakeInterceptor>(
+						handshakeInterceptors.size() + 1);
+				interceptorsToSet.add(new CsrfTokenHandshakeInterceptor());
+				interceptorsToSet.addAll(handshakeInterceptors);
 
-                handler.setHandshakeInterceptors(interceptorsToSet);
-            } else {
-                throw new IllegalStateException("Bean " + beanName + " is expected to contain mappings to either a SockJsHttpRequestHandler or a WebSocketHttpRequestHandler but got " + object);
-            }
-        }
-    }
+				handler.setHandshakeInterceptors(interceptorsToSet);
+			}
+			else {
+				throw new IllegalStateException(
+						"Bean "
+								+ beanName
+								+ " is expected to contain mappings to either a SockJsHttpRequestHandler or a WebSocketHttpRequestHandler but got "
+								+ object);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java
index 3513144f2e..08960291c1 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java
@@ -16,63 +16,71 @@ import org.w3c.dom.Element;
 /**
  * @author Luke Taylor
  */
-public abstract class AbstractUserDetailsServiceBeanDefinitionParser implements BeanDefinitionParser {
-    static final String CACHE_REF = "cache-ref";
-    public static final String CACHING_SUFFIX = ".caching";
+public abstract class AbstractUserDetailsServiceBeanDefinitionParser implements
+		BeanDefinitionParser {
+	static final String CACHE_REF = "cache-ref";
+	public static final String CACHING_SUFFIX = ".caching";
 
-    protected abstract String getBeanClassName(Element element);
+	protected abstract String getBeanClassName(Element element);
 
-    protected abstract void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder);
+	protected abstract void doParse(Element element, ParserContext parserContext,
+			BeanDefinitionBuilder builder);
 
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(getBeanClassName(element));
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(getBeanClassName(element));
 
-        doParse(element, parserContext, builder);
+		doParse(element, parserContext, builder);
 
-        RootBeanDefinition userService = (RootBeanDefinition) builder.getBeanDefinition();
-        final String beanId = resolveId(element, userService, parserContext);
+		RootBeanDefinition userService = (RootBeanDefinition) builder.getBeanDefinition();
+		final String beanId = resolveId(element, userService, parserContext);
 
-        parserContext.registerBeanComponent(new BeanComponentDefinition(userService, beanId));
+		parserContext.registerBeanComponent(new BeanComponentDefinition(userService,
+				beanId));
 
-        String cacheRef = element.getAttribute(CACHE_REF);
+		String cacheRef = element.getAttribute(CACHE_REF);
 
-        // Register a caching version of the user service if there's a cache-ref
-        if (StringUtils.hasText(cacheRef)) {
-            BeanDefinitionBuilder cachingUSBuilder = BeanDefinitionBuilder.rootBeanDefinition(CachingUserDetailsService.class);
-            cachingUSBuilder.addConstructorArgReference(beanId);
+		// Register a caching version of the user service if there's a cache-ref
+		if (StringUtils.hasText(cacheRef)) {
+			BeanDefinitionBuilder cachingUSBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(CachingUserDetailsService.class);
+			cachingUSBuilder.addConstructorArgReference(beanId);
 
-            cachingUSBuilder.addPropertyValue("userCache", new RuntimeBeanReference(cacheRef));
-            BeanDefinition cachingUserService = cachingUSBuilder.getBeanDefinition();
-            parserContext.registerBeanComponent(new BeanComponentDefinition(cachingUserService, beanId + CACHING_SUFFIX));
-        }
+			cachingUSBuilder.addPropertyValue("userCache", new RuntimeBeanReference(
+					cacheRef));
+			BeanDefinition cachingUserService = cachingUSBuilder.getBeanDefinition();
+			parserContext.registerBeanComponent(new BeanComponentDefinition(
+					cachingUserService, beanId + CACHING_SUFFIX));
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    private String resolveId(Element element, AbstractBeanDefinition definition, ParserContext pc)
-            throws BeanDefinitionStoreException {
+	private String resolveId(Element element, AbstractBeanDefinition definition,
+			ParserContext pc) throws BeanDefinitionStoreException {
 
-        String id = element.getAttribute("id");
+		String id = element.getAttribute("id");
 
-        if (pc.isNested()) {
-            // We're inside an <authentication-provider> element
-            if (!StringUtils.hasText(id)) {
-                id = pc.getReaderContext().generateBeanName(definition);
-            }
-            BeanDefinition container = pc.getContainingBeanDefinition();
-            container.getPropertyValues().add("userDetailsService", new RuntimeBeanReference(id));
-        }
+		if (pc.isNested()) {
+			// We're inside an <authentication-provider> element
+			if (!StringUtils.hasText(id)) {
+				id = pc.getReaderContext().generateBeanName(definition);
+			}
+			BeanDefinition container = pc.getContainingBeanDefinition();
+			container.getPropertyValues().add("userDetailsService",
+					new RuntimeBeanReference(id));
+		}
 
-        if (StringUtils.hasText(id)) {
-            return id;
-        }
+		if (StringUtils.hasText(id)) {
+			return id;
+		}
 
-        // If top level, use the default name or throw an exception if already used
-        if (pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE)) {
-            throw new BeanDefinitionStoreException("No id supplied and another " +
-                    "bean is already registered as " + BeanIds.USER_DETAILS_SERVICE);
-        }
+		// If top level, use the default name or throw an exception if already used
+		if (pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE)) {
+			throw new BeanDefinitionStoreException("No id supplied and another "
+					+ "bean is already registered as " + BeanIds.USER_DETAILS_SERVICE);
+		}
 
-        return BeanIds.USER_DETAILS_SERVICE;
-    }
+		return BeanIds.USER_DETAILS_SERVICE;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
index 2ed8017cc0..2a7672ba42 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java
@@ -26,104 +26,125 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
- * Registers the central ProviderManager used by the namespace configuration, and allows the configuration of an
- * alias, allowing users to reference it in their beans and clearly see where the name is
- * coming from.
+ * Registers the central ProviderManager used by the namespace configuration, and allows
+ * the configuration of an alias, allowing users to reference it in their beans and
+ * clearly see where the name is coming from.
  *
  * @author Luke Taylor
  */
 public class AuthenticationManagerBeanDefinitionParser implements BeanDefinitionParser {
-    private static final String ATT_ALIAS = "alias";
-    private static final String ATT_REF = "ref";
-    private static final String ATT_ERASE_CREDENTIALS = "erase-credentials";
+	private static final String ATT_ALIAS = "alias";
+	private static final String ATT_REF = "ref";
+	private static final String ATT_ERASE_CREDENTIALS = "erase-credentials";
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        String id = element.getAttribute("id");
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		String id = element.getAttribute("id");
 
-        if (!StringUtils.hasText(id)) {
-            if (pc.getRegistry().containsBeanDefinition(BeanIds.AUTHENTICATION_MANAGER)) {
-                pc.getReaderContext().warning("Overriding globally registered AuthenticationManager", pc.extractSource(element));
-            }
-            id = BeanIds.AUTHENTICATION_MANAGER;
-        }
-        pc.pushContainingComponent(new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element)));
+		if (!StringUtils.hasText(id)) {
+			if (pc.getRegistry().containsBeanDefinition(BeanIds.AUTHENTICATION_MANAGER)) {
+				pc.getReaderContext().warning(
+						"Overriding globally registered AuthenticationManager",
+						pc.extractSource(element));
+			}
+			id = BeanIds.AUTHENTICATION_MANAGER;
+		}
+		pc.pushContainingComponent(new CompositeComponentDefinition(element.getTagName(),
+				pc.extractSource(element)));
 
-        BeanDefinitionBuilder providerManagerBldr = BeanDefinitionBuilder.rootBeanDefinition(ProviderManager.class);
+		BeanDefinitionBuilder providerManagerBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(ProviderManager.class);
 
-        String alias = element.getAttribute(ATT_ALIAS);
+		String alias = element.getAttribute(ATT_ALIAS);
 
-        List<BeanMetadataElement> providers = new ManagedList<BeanMetadataElement>();
-        NamespaceHandlerResolver resolver = pc.getReaderContext().getNamespaceHandlerResolver();
+		List<BeanMetadataElement> providers = new ManagedList<BeanMetadataElement>();
+		NamespaceHandlerResolver resolver = pc.getReaderContext()
+				.getNamespaceHandlerResolver();
 
-        NodeList children = element.getChildNodes();
+		NodeList children = element.getChildNodes();
 
-        for (int i = 0; i < children.getLength(); i++) {
-            Node node = children.item(i);
-            if (node instanceof Element) {
-                Element providerElt = (Element)node;
-                if (StringUtils.hasText(providerElt.getAttribute(ATT_REF))) {
-                    if (providerElt.getAttributes().getLength() > 1) {
-                        pc.getReaderContext().error("authentication-provider element cannot be used with other attributes " +
-                                "when using 'ref' attribute", pc.extractSource(element));
-                    }
-                    NodeList providerChildren = providerElt.getChildNodes();
-                    for (int j = 0; j < providerChildren.getLength(); j++) {
-                        if (providerChildren.item(j) instanceof Element) {
-                            pc.getReaderContext().error("authentication-provider element cannot have child elements when used " +
-                                    "with 'ref' attribute", pc.extractSource(element));
-                        }
-                    }
-                    providers.add(new RuntimeBeanReference(providerElt.getAttribute(ATT_REF)));
-                } else {
-                    BeanDefinition provider = resolver.resolve(providerElt.getNamespaceURI()).parse(providerElt, pc);
-                    Assert.notNull(provider, "Parser for " + providerElt.getNodeName() + " returned a null bean definition");
-                    String providerId = pc.getReaderContext().generateBeanName(provider);
-                    pc.registerBeanComponent(new BeanComponentDefinition(provider, providerId));
-                    providers.add(new RuntimeBeanReference(providerId));
-                }
-            }
-        }
+		for (int i = 0; i < children.getLength(); i++) {
+			Node node = children.item(i);
+			if (node instanceof Element) {
+				Element providerElt = (Element) node;
+				if (StringUtils.hasText(providerElt.getAttribute(ATT_REF))) {
+					if (providerElt.getAttributes().getLength() > 1) {
+						pc.getReaderContext().error(
+								"authentication-provider element cannot be used with other attributes "
+										+ "when using 'ref' attribute",
+								pc.extractSource(element));
+					}
+					NodeList providerChildren = providerElt.getChildNodes();
+					for (int j = 0; j < providerChildren.getLength(); j++) {
+						if (providerChildren.item(j) instanceof Element) {
+							pc.getReaderContext().error(
+									"authentication-provider element cannot have child elements when used "
+											+ "with 'ref' attribute",
+									pc.extractSource(element));
+						}
+					}
+					providers.add(new RuntimeBeanReference(providerElt
+							.getAttribute(ATT_REF)));
+				}
+				else {
+					BeanDefinition provider = resolver.resolve(
+							providerElt.getNamespaceURI()).parse(providerElt, pc);
+					Assert.notNull(provider, "Parser for " + providerElt.getNodeName()
+							+ " returned a null bean definition");
+					String providerId = pc.getReaderContext().generateBeanName(provider);
+					pc.registerBeanComponent(new BeanComponentDefinition(provider,
+							providerId));
+					providers.add(new RuntimeBeanReference(providerId));
+				}
+			}
+		}
 
-        if (providers.isEmpty()) {
-            providers.add(new RootBeanDefinition(NullAuthenticationProvider.class));
-        }
+		if (providers.isEmpty()) {
+			providers.add(new RootBeanDefinition(NullAuthenticationProvider.class));
+		}
 
-        providerManagerBldr.addConstructorArgValue(providers);
+		providerManagerBldr.addConstructorArgValue(providers);
 
-        if ("false".equals(element.getAttribute(ATT_ERASE_CREDENTIALS))) {
-            providerManagerBldr.addPropertyValue("eraseCredentialsAfterAuthentication", false);
-        }
+		if ("false".equals(element.getAttribute(ATT_ERASE_CREDENTIALS))) {
+			providerManagerBldr.addPropertyValue("eraseCredentialsAfterAuthentication",
+					false);
+		}
 
-        // Add the default event publisher
-        BeanDefinition publisher = new RootBeanDefinition(DefaultAuthenticationEventPublisher.class);
-        String pubId = pc.getReaderContext().generateBeanName(publisher);
-        pc.registerBeanComponent(new BeanComponentDefinition(publisher, pubId));
-        providerManagerBldr.addPropertyReference("authenticationEventPublisher", pubId);
+		// Add the default event publisher
+		BeanDefinition publisher = new RootBeanDefinition(
+				DefaultAuthenticationEventPublisher.class);
+		String pubId = pc.getReaderContext().generateBeanName(publisher);
+		pc.registerBeanComponent(new BeanComponentDefinition(publisher, pubId));
+		providerManagerBldr.addPropertyReference("authenticationEventPublisher", pubId);
 
-        pc.registerBeanComponent(new BeanComponentDefinition(providerManagerBldr.getBeanDefinition(), id));
+		pc.registerBeanComponent(new BeanComponentDefinition(providerManagerBldr
+				.getBeanDefinition(), id));
 
-        if (StringUtils.hasText(alias)) {
-            pc.getRegistry().registerAlias(id, alias);
-            pc.getReaderContext().fireAliasRegistered(id, alias, pc.extractSource(element));
-        }
+		if (StringUtils.hasText(alias)) {
+			pc.getRegistry().registerAlias(id, alias);
+			pc.getReaderContext().fireAliasRegistered(id, alias,
+					pc.extractSource(element));
+		}
 
-        pc.popAndRegisterContainingComponent();
+		pc.popAndRegisterContainingComponent();
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Provider which doesn't provide any service. Only used to prevent a configuration exception if the provider list
-     * is empty (usually because a child ProviderManager from the &lt;http&gt; namespace, such as OpenID, is expected
-     * to handle the request).
-     */
-    public static final class NullAuthenticationProvider implements AuthenticationProvider {
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            return null;
-        }
+	/**
+	 * Provider which doesn't provide any service. Only used to prevent a configuration
+	 * exception if the provider list is empty (usually because a child ProviderManager
+	 * from the &lt;http&gt; namespace, such as OpenID, is expected to handle the
+	 * request).
+	 */
+	public static final class NullAuthenticationProvider implements
+			AuthenticationProvider {
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			return null;
+		}
 
-        public boolean supports(Class<?> authentication) {
-            return false;
-        }
-    }
+		public boolean supports(Class<?> authentication) {
+			return false;
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java
index 5c9326c134..2ac78905a5 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerFactoryBean.java
@@ -15,47 +15,53 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import java.util.Arrays;
 
 /**
- * Factory bean for the namespace AuthenticationManager, which allows a more meaningful error message
- * to be reported in the <tt>NoSuchBeanDefinitionException</tt>, if the user has forgotten to declare
- * the &lt;authentication-manager&gt; element.
+ * Factory bean for the namespace AuthenticationManager, which allows a more meaningful
+ * error message to be reported in the <tt>NoSuchBeanDefinitionException</tt>, if the user
+ * has forgotten to declare the &lt;authentication-manager&gt; element.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class AuthenticationManagerFactoryBean implements FactoryBean<AuthenticationManager>, BeanFactoryAware {
-    private BeanFactory bf;
-    public static final String MISSING_BEAN_ERROR_MESSAGE = "Did you forget to add a gobal <authentication-manager> element " +
-            "to your configuration (with child <authentication-provider> elements)? Alternatively you can use the " +
-            "authentication-manager-ref attribute on your <http> and <global-method-security> elements.";
+public class AuthenticationManagerFactoryBean implements
+		FactoryBean<AuthenticationManager>, BeanFactoryAware {
+	private BeanFactory bf;
+	public static final String MISSING_BEAN_ERROR_MESSAGE = "Did you forget to add a gobal <authentication-manager> element "
+			+ "to your configuration (with child <authentication-provider> elements)? Alternatively you can use the "
+			+ "authentication-manager-ref attribute on your <http> and <global-method-security> elements.";
 
-    public AuthenticationManager getObject() throws Exception {
-        try {
-             return (AuthenticationManager) bf.getBean(BeanIds.AUTHENTICATION_MANAGER);
-        } catch (NoSuchBeanDefinitionException e) {
-            if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
-                try {
-                    UserDetailsService uds = bf.getBean(UserDetailsService.class);
-                    DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-                    provider.setUserDetailsService(uds);
-                    provider.afterPropertiesSet();
-                    return new ProviderManager(Arrays.<AuthenticationProvider>asList(provider));
-                } catch(NoSuchBeanDefinitionException noUds) {}
-                throw new NoSuchBeanDefinitionException(BeanIds.AUTHENTICATION_MANAGER, MISSING_BEAN_ERROR_MESSAGE);
-            }
-            throw e;
-        }
-    }
+	public AuthenticationManager getObject() throws Exception {
+		try {
+			return (AuthenticationManager) bf.getBean(BeanIds.AUTHENTICATION_MANAGER);
+		}
+		catch (NoSuchBeanDefinitionException e) {
+			if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
+				try {
+					UserDetailsService uds = bf.getBean(UserDetailsService.class);
+					DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+					provider.setUserDetailsService(uds);
+					provider.afterPropertiesSet();
+					return new ProviderManager(
+							Arrays.<AuthenticationProvider> asList(provider));
+				}
+				catch (NoSuchBeanDefinitionException noUds) {
+				}
+				throw new NoSuchBeanDefinitionException(BeanIds.AUTHENTICATION_MANAGER,
+						MISSING_BEAN_ERROR_MESSAGE);
+			}
+			throw e;
+		}
+	}
 
-    public Class<? extends AuthenticationManager> getObjectType() {
-        return ProviderManager.class;
-    }
+	public Class<? extends AuthenticationManager> getObjectType() {
+		return ProviderManager.class;
+	}
 
-    public boolean isSingleton() {
-        return true;
-    }
+	public boolean isSingleton() {
+		return true;
+	}
 
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        bf = beanFactory;
-    }
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		bf = beanFactory;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParser.java
index 71704bb0d0..d29a4d2eb2 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParser.java
@@ -12,63 +12,78 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Wraps a UserDetailsService bean with a DaoAuthenticationProvider and registers the latter with the
- * ProviderManager.
+ * Wraps a UserDetailsService bean with a DaoAuthenticationProvider and registers the
+ * latter with the ProviderManager.
  *
  * @author Luke Taylor
  */
 public class AuthenticationProviderBeanDefinitionParser implements BeanDefinitionParser {
-    private static final String ATT_USER_DETAILS_REF = "user-service-ref";
+	private static final String ATT_USER_DETAILS_REF = "user-service-ref";
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        RootBeanDefinition authProvider = new RootBeanDefinition(DaoAuthenticationProvider.class);
-        authProvider.setSource(pc.extractSource(element));
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		RootBeanDefinition authProvider = new RootBeanDefinition(
+				DaoAuthenticationProvider.class);
+		authProvider.setSource(pc.extractSource(element));
 
-        Element passwordEncoderElt = DomUtils.getChildElementByTagName(element, Elements.PASSWORD_ENCODER);
+		Element passwordEncoderElt = DomUtils.getChildElementByTagName(element,
+				Elements.PASSWORD_ENCODER);
 
-        if (passwordEncoderElt != null) {
-            PasswordEncoderParser pep = new PasswordEncoderParser(passwordEncoderElt, pc);
-            authProvider.getPropertyValues().addPropertyValue("passwordEncoder", pep.getPasswordEncoder());
+		if (passwordEncoderElt != null) {
+			PasswordEncoderParser pep = new PasswordEncoderParser(passwordEncoderElt, pc);
+			authProvider.getPropertyValues().addPropertyValue("passwordEncoder",
+					pep.getPasswordEncoder());
 
-            if (pep.getSaltSource() != null) {
-                authProvider.getPropertyValues().addPropertyValue("saltSource", pep.getSaltSource());
-            }
-        }
+			if (pep.getSaltSource() != null) {
+				authProvider.getPropertyValues().addPropertyValue("saltSource",
+						pep.getSaltSource());
+			}
+		}
 
-        Element userServiceElt = DomUtils.getChildElementByTagName(element, Elements.USER_SERVICE);
-        if (userServiceElt == null) {
-            userServiceElt = DomUtils.getChildElementByTagName(element, Elements.JDBC_USER_SERVICE);
-        }
-        if (userServiceElt == null) {
-            userServiceElt = DomUtils.getChildElementByTagName(element, Elements.LDAP_USER_SERVICE);
-        }
+		Element userServiceElt = DomUtils.getChildElementByTagName(element,
+				Elements.USER_SERVICE);
+		if (userServiceElt == null) {
+			userServiceElt = DomUtils.getChildElementByTagName(element,
+					Elements.JDBC_USER_SERVICE);
+		}
+		if (userServiceElt == null) {
+			userServiceElt = DomUtils.getChildElementByTagName(element,
+					Elements.LDAP_USER_SERVICE);
+		}
 
-        String ref = element.getAttribute(ATT_USER_DETAILS_REF);
+		String ref = element.getAttribute(ATT_USER_DETAILS_REF);
 
-        if (StringUtils.hasText(ref)) {
-            if (userServiceElt != null) {
-                pc.getReaderContext().error("The " + ATT_USER_DETAILS_REF + " attribute cannot be used in combination with child" +
-                        "elements '" + Elements.USER_SERVICE + "', '" + Elements.JDBC_USER_SERVICE + "' or '" +
-                        Elements.LDAP_USER_SERVICE + "'", element);
-            }
+		if (StringUtils.hasText(ref)) {
+			if (userServiceElt != null) {
+				pc.getReaderContext().error(
+						"The " + ATT_USER_DETAILS_REF
+								+ " attribute cannot be used in combination with child"
+								+ "elements '" + Elements.USER_SERVICE + "', '"
+								+ Elements.JDBC_USER_SERVICE + "' or '"
+								+ Elements.LDAP_USER_SERVICE + "'", element);
+			}
 
-            authProvider.getPropertyValues().add("userDetailsService", new RuntimeBeanReference(ref));
-        } else {
-            // Use the child elements to create the UserDetailsService
-            if (userServiceElt != null) {
-                pc.getDelegate().parseCustomElement(userServiceElt, authProvider);
-            } else {
-                pc.getReaderContext().error("A user-service is required", element);
-            }
+			authProvider.getPropertyValues().add("userDetailsService",
+					new RuntimeBeanReference(ref));
+		}
+		else {
+			// Use the child elements to create the UserDetailsService
+			if (userServiceElt != null) {
+				pc.getDelegate().parseCustomElement(userServiceElt, authProvider);
+			}
+			else {
+				pc.getReaderContext().error("A user-service is required", element);
+			}
 
-            // Pinch the cache-ref from the UserDetailService element, if set.
-            String cacheRef = userServiceElt.getAttribute(AbstractUserDetailsServiceBeanDefinitionParser.CACHE_REF);
+			// Pinch the cache-ref from the UserDetailService element, if set.
+			String cacheRef = userServiceElt
+					.getAttribute(AbstractUserDetailsServiceBeanDefinitionParser.CACHE_REF);
 
-            if (StringUtils.hasText(cacheRef)) {
-                authProvider.getPropertyValues().addPropertyValue("userCache", new RuntimeBeanReference(cacheRef));
-            }
-        }
+			if (StringUtils.hasText(cacheRef)) {
+				authProvider.getPropertyValues().addPropertyValue("userCache",
+						new RuntimeBeanReference(cacheRef));
+			}
+		}
 
-        return authProvider;
-    }
+		return authProvider;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java b/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java
index 364f18e8f4..5b85d7d4fe 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/CachingUserDetailsService.java
@@ -12,33 +12,34 @@ import org.springframework.util.Assert;
  * @since 2.0
  */
 public class CachingUserDetailsService implements UserDetailsService {
-    private UserCache userCache = new NullUserCache();
-    private final UserDetailsService delegate;
+	private UserCache userCache = new NullUserCache();
+	private final UserDetailsService delegate;
 
-    CachingUserDetailsService(UserDetailsService delegate) {
-        this.delegate = delegate;
-    }
+	CachingUserDetailsService(UserDetailsService delegate) {
+		this.delegate = delegate;
+	}
 
-    public UserCache getUserCache() {
-        return userCache;
-    }
+	public UserCache getUserCache() {
+		return userCache;
+	}
 
-    public void setUserCache(UserCache userCache) {
-        this.userCache = userCache;
-    }
+	public void setUserCache(UserCache userCache) {
+		this.userCache = userCache;
+	}
 
-    public UserDetails loadUserByUsername(String username) {
-        UserDetails user = userCache.getUserFromCache(username);
+	public UserDetails loadUserByUsername(String username) {
+		UserDetails user = userCache.getUserFromCache(username);
 
-        if (user == null) {
-            user = delegate.loadUserByUsername(username);
-        }
+		if (user == null) {
+			user = delegate.loadUserByUsername(username);
+		}
 
-        Assert.notNull(user, "UserDetailsService " + delegate + " returned null for username " + username + ". " +
-                "This is an interface contract violation");
+		Assert.notNull(user, "UserDetailsService " + delegate
+				+ " returned null for username " + username + ". "
+				+ "This is an interface contract violation");
 
-        userCache.putUserInCache(user);
+		userCache.putUserInCache(user);
 
-        return user;
-    }
+		return user;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParser.java
index dea8bcbed7..3ec683a71c 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParser.java
@@ -10,47 +10,52 @@ import org.w3c.dom.Element;
 /**
  * @author Luke Taylor
  */
-public class JdbcUserServiceBeanDefinitionParser extends AbstractUserDetailsServiceBeanDefinitionParser {
-    static final String ATT_DATA_SOURCE = "data-source-ref";
-    static final String ATT_USERS_BY_USERNAME_QUERY = "users-by-username-query";
-    static final String ATT_AUTHORITIES_BY_USERNAME_QUERY = "authorities-by-username-query";
-    static final String ATT_GROUP_AUTHORITIES_QUERY = "group-authorities-by-username-query";
-    static final String ATT_ROLE_PREFIX = "role-prefix";
+public class JdbcUserServiceBeanDefinitionParser extends
+		AbstractUserDetailsServiceBeanDefinitionParser {
+	static final String ATT_DATA_SOURCE = "data-source-ref";
+	static final String ATT_USERS_BY_USERNAME_QUERY = "users-by-username-query";
+	static final String ATT_AUTHORITIES_BY_USERNAME_QUERY = "authorities-by-username-query";
+	static final String ATT_GROUP_AUTHORITIES_QUERY = "group-authorities-by-username-query";
+	static final String ATT_ROLE_PREFIX = "role-prefix";
 
-    protected String getBeanClassName(Element element) {
-        return "org.springframework.security.provisioning.JdbcUserDetailsManager";
-    }
+	protected String getBeanClassName(Element element) {
+		return "org.springframework.security.provisioning.JdbcUserDetailsManager";
+	}
 
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String dataSource = element.getAttribute(ATT_DATA_SOURCE);
+	protected void doParse(Element element, ParserContext parserContext,
+			BeanDefinitionBuilder builder) {
+		String dataSource = element.getAttribute(ATT_DATA_SOURCE);
 
-        if (dataSource != null) {
-            builder.addPropertyReference("dataSource", dataSource);
-        } else {
-            parserContext.getReaderContext().error(ATT_DATA_SOURCE  + " is required for "
-                    + Elements.JDBC_USER_SERVICE, parserContext.extractSource(element));
-        }
+		if (dataSource != null) {
+			builder.addPropertyReference("dataSource", dataSource);
+		}
+		else {
+			parserContext.getReaderContext().error(
+					ATT_DATA_SOURCE + " is required for " + Elements.JDBC_USER_SERVICE,
+					parserContext.extractSource(element));
+		}
 
-        String usersQuery = element.getAttribute(ATT_USERS_BY_USERNAME_QUERY);
-        String authoritiesQuery = element.getAttribute(ATT_AUTHORITIES_BY_USERNAME_QUERY);
-        String groupAuthoritiesQuery = element.getAttribute(ATT_GROUP_AUTHORITIES_QUERY);
-        String rolePrefix = element.getAttribute(ATT_ROLE_PREFIX);
+		String usersQuery = element.getAttribute(ATT_USERS_BY_USERNAME_QUERY);
+		String authoritiesQuery = element.getAttribute(ATT_AUTHORITIES_BY_USERNAME_QUERY);
+		String groupAuthoritiesQuery = element.getAttribute(ATT_GROUP_AUTHORITIES_QUERY);
+		String rolePrefix = element.getAttribute(ATT_ROLE_PREFIX);
 
-        if (StringUtils.hasText(rolePrefix)) {
-            builder.addPropertyValue("rolePrefix", rolePrefix);
-        }
+		if (StringUtils.hasText(rolePrefix)) {
+			builder.addPropertyValue("rolePrefix", rolePrefix);
+		}
 
-        if (StringUtils.hasText(usersQuery)) {
-            builder.addPropertyValue("usersByUsernameQuery", usersQuery);
-        }
+		if (StringUtils.hasText(usersQuery)) {
+			builder.addPropertyValue("usersByUsernameQuery", usersQuery);
+		}
 
-        if (StringUtils.hasText(authoritiesQuery)) {
-            builder.addPropertyValue("authoritiesByUsernameQuery", authoritiesQuery);
-        }
+		if (StringUtils.hasText(authoritiesQuery)) {
+			builder.addPropertyValue("authoritiesByUsernameQuery", authoritiesQuery);
+		}
 
-        if (StringUtils.hasText(groupAuthoritiesQuery)) {
-            builder.addPropertyValue("enableGroups", Boolean.TRUE);
-            builder.addPropertyValue("groupAuthoritiesByUsernameQuery", groupAuthoritiesQuery);
-        }
-    }
+		if (StringUtils.hasText(groupAuthoritiesQuery)) {
+			builder.addPropertyValue("enableGroups", Boolean.TRUE);
+			builder.addPropertyValue("groupAuthoritiesByUsernameQuery",
+					groupAuthoritiesQuery);
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
index c9b221636c..21ba9a483a 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
@@ -32,93 +32,103 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  */
 public class PasswordEncoderParser {
-    static final String ATT_REF = "ref";
-    public static final String ATT_HASH = "hash";
-    static final String ATT_BASE_64 = "base64";
-    static final String OPT_HASH_BCRYPT = "bcrypt";
-    static final String OPT_HASH_PLAINTEXT = "plaintext";
-    static final String OPT_HASH_SHA = "sha";
-    static final String OPT_HASH_SHA256 = "sha-256";
-    static final String OPT_HASH_MD4 = "md4";
-    static final String OPT_HASH_MD5 = "md5";
-    static final String OPT_HASH_LDAP_SHA = "{sha}";
-    static final String OPT_HASH_LDAP_SSHA = "{ssha}";
+	static final String ATT_REF = "ref";
+	public static final String ATT_HASH = "hash";
+	static final String ATT_BASE_64 = "base64";
+	static final String OPT_HASH_BCRYPT = "bcrypt";
+	static final String OPT_HASH_PLAINTEXT = "plaintext";
+	static final String OPT_HASH_SHA = "sha";
+	static final String OPT_HASH_SHA256 = "sha-256";
+	static final String OPT_HASH_MD4 = "md4";
+	static final String OPT_HASH_MD5 = "md5";
+	static final String OPT_HASH_LDAP_SHA = "{sha}";
+	static final String OPT_HASH_LDAP_SSHA = "{ssha}";
 
-    private static final Map<String, Class<?>> ENCODER_CLASSES;
+	private static final Map<String, Class<?>> ENCODER_CLASSES;
 
-    static {
-        ENCODER_CLASSES = new HashMap<String, Class<?>>();
-        ENCODER_CLASSES.put(OPT_HASH_PLAINTEXT, PlaintextPasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_SHA, ShaPasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_SHA256, ShaPasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_MD4, Md4PasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_MD5, Md5PasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_LDAP_SHA, LdapShaPasswordEncoder.class);
-        ENCODER_CLASSES.put(OPT_HASH_LDAP_SSHA, LdapShaPasswordEncoder.class);
-    }
+	static {
+		ENCODER_CLASSES = new HashMap<String, Class<?>>();
+		ENCODER_CLASSES.put(OPT_HASH_PLAINTEXT, PlaintextPasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_SHA, ShaPasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_SHA256, ShaPasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_MD4, Md4PasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_MD5, Md5PasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_LDAP_SHA, LdapShaPasswordEncoder.class);
+		ENCODER_CLASSES.put(OPT_HASH_LDAP_SSHA, LdapShaPasswordEncoder.class);
+	}
 
-    private static final Log logger = LogFactory.getLog(PasswordEncoderParser.class);
+	private static final Log logger = LogFactory.getLog(PasswordEncoderParser.class);
 
-    private BeanMetadataElement passwordEncoder;
-    private BeanMetadataElement saltSource;
+	private BeanMetadataElement passwordEncoder;
+	private BeanMetadataElement saltSource;
 
-    public PasswordEncoderParser(Element element, ParserContext parserContext) {
-        parse(element, parserContext);
-    }
+	public PasswordEncoderParser(Element element, ParserContext parserContext) {
+		parse(element, parserContext);
+	}
 
-    private void parse(Element element, ParserContext parserContext) {
-        String hash = element.getAttribute(ATT_HASH);
-        boolean useBase64 = false;
+	private void parse(Element element, ParserContext parserContext) {
+		String hash = element.getAttribute(ATT_HASH);
+		boolean useBase64 = false;
 
-        if (StringUtils.hasText(element.getAttribute(ATT_BASE_64))) {
-            useBase64 = Boolean.valueOf(element.getAttribute(ATT_BASE_64)).booleanValue();
-        }
+		if (StringUtils.hasText(element.getAttribute(ATT_BASE_64))) {
+			useBase64 = Boolean.valueOf(element.getAttribute(ATT_BASE_64)).booleanValue();
+		}
 
-        String ref = element.getAttribute(ATT_REF);
+		String ref = element.getAttribute(ATT_REF);
 
-        if (StringUtils.hasText(ref)) {
-            passwordEncoder = new RuntimeBeanReference(ref);
-        } else {
-            passwordEncoder = createPasswordEncoderBeanDefinition(hash, useBase64);
-            ((RootBeanDefinition)passwordEncoder).setSource(parserContext.extractSource(element));
-        }
+		if (StringUtils.hasText(ref)) {
+			passwordEncoder = new RuntimeBeanReference(ref);
+		}
+		else {
+			passwordEncoder = createPasswordEncoderBeanDefinition(hash, useBase64);
+			((RootBeanDefinition) passwordEncoder).setSource(parserContext
+					.extractSource(element));
+		}
 
-        Element saltSourceElt = DomUtils.getChildElementByTagName(element, Elements.SALT_SOURCE);
+		Element saltSourceElt = DomUtils.getChildElementByTagName(element,
+				Elements.SALT_SOURCE);
 
-        if (saltSourceElt != null) {
-            if (OPT_HASH_BCRYPT.equals(hash)) {
-                parserContext.getReaderContext().error(Elements.SALT_SOURCE + " isn't compatible with bcrypt",
-                        parserContext.extractSource(saltSourceElt));
-            } else {
-                saltSource = new SaltSourceBeanDefinitionParser().parse(saltSourceElt, parserContext);
-            }
-        }
-    }
+		if (saltSourceElt != null) {
+			if (OPT_HASH_BCRYPT.equals(hash)) {
+				parserContext.getReaderContext().error(
+						Elements.SALT_SOURCE + " isn't compatible with bcrypt",
+						parserContext.extractSource(saltSourceElt));
+			}
+			else {
+				saltSource = new SaltSourceBeanDefinitionParser().parse(saltSourceElt,
+						parserContext);
+			}
+		}
+	}
 
-    public static BeanDefinition createPasswordEncoderBeanDefinition(String hash, boolean useBase64) {
-        Class<?> beanClass = ENCODER_CLASSES.get(hash);
-        BeanDefinitionBuilder beanBldr = BeanDefinitionBuilder.rootBeanDefinition(beanClass);
+	public static BeanDefinition createPasswordEncoderBeanDefinition(String hash,
+			boolean useBase64) {
+		Class<?> beanClass = ENCODER_CLASSES.get(hash);
+		BeanDefinitionBuilder beanBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(beanClass);
 
-        if (OPT_HASH_SHA256.equals(hash)) {
-            beanBldr.addConstructorArgValue(Integer.valueOf(256));
-        }
+		if (OPT_HASH_SHA256.equals(hash)) {
+			beanBldr.addConstructorArgValue(Integer.valueOf(256));
+		}
 
-        if (useBase64) {
-            if (BaseDigestPasswordEncoder.class.isAssignableFrom(beanClass)) {
-                beanBldr.addPropertyValue("encodeHashAsBase64", "true");
-            } else {
-                logger.warn(ATT_BASE_64 + " isn't compatible with " + hash + " and will be ignored");
-            }
-        }
-        return beanBldr.getBeanDefinition();
-    }
+		if (useBase64) {
+			if (BaseDigestPasswordEncoder.class.isAssignableFrom(beanClass)) {
+				beanBldr.addPropertyValue("encodeHashAsBase64", "true");
+			}
+			else {
+				logger.warn(ATT_BASE_64 + " isn't compatible with " + hash
+						+ " and will be ignored");
+			}
+		}
+		return beanBldr.getBeanDefinition();
+	}
 
-    public BeanMetadataElement getPasswordEncoder() {
-        return passwordEncoder;
-    }
+	public BeanMetadataElement getPasswordEncoder() {
+		return passwordEncoder;
+	}
 
-    public BeanMetadataElement getSaltSource() {
-        return saltSource;
-    }
+	public BeanMetadataElement getSaltSource() {
+		return saltSource;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/SaltSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/SaltSourceBeanDefinitionParser.java
index a8227bd121..8ff84204f9 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/SaltSourceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/SaltSourceBeanDefinitionParser.java
@@ -16,41 +16,44 @@ import org.w3c.dom.Element;
  * @since 2.0
  */
 class SaltSourceBeanDefinitionParser {
-    private static final String ATT_USER_PROPERTY = "user-property";
-    private static final String ATT_REF = "ref";
-    private static final String ATT_SYSTEM_WIDE = "system-wide";
+	private static final String ATT_USER_PROPERTY = "user-property";
+	private static final String ATT_REF = "ref";
+	private static final String ATT_SYSTEM_WIDE = "system-wide";
 
-    public BeanMetadataElement parse(Element element, ParserContext parserContext) {
-        String ref = element.getAttribute(ATT_REF);
+	public BeanMetadataElement parse(Element element, ParserContext parserContext) {
+		String ref = element.getAttribute(ATT_REF);
 
-        if (StringUtils.hasText(ref)) {
-            return new RuntimeBeanReference(ref);
-        }
+		if (StringUtils.hasText(ref)) {
+			return new RuntimeBeanReference(ref);
+		}
 
-        String userProperty = element.getAttribute(ATT_USER_PROPERTY);
-        RootBeanDefinition saltSource;
+		String userProperty = element.getAttribute(ATT_USER_PROPERTY);
+		RootBeanDefinition saltSource;
 
-        if (StringUtils.hasText(userProperty)) {
-            saltSource = new RootBeanDefinition(ReflectionSaltSource.class);
-            saltSource.getPropertyValues().addPropertyValue("userPropertyToUse", userProperty);
-            saltSource.setSource(parserContext.extractSource(element));
-            saltSource.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		if (StringUtils.hasText(userProperty)) {
+			saltSource = new RootBeanDefinition(ReflectionSaltSource.class);
+			saltSource.getPropertyValues().addPropertyValue("userPropertyToUse",
+					userProperty);
+			saltSource.setSource(parserContext.extractSource(element));
+			saltSource.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 
-            return saltSource;
-        }
+			return saltSource;
+		}
 
-        String systemWideSalt = element.getAttribute(ATT_SYSTEM_WIDE);
+		String systemWideSalt = element.getAttribute(ATT_SYSTEM_WIDE);
 
-        if (StringUtils.hasText(systemWideSalt)) {
-            saltSource = new RootBeanDefinition(SystemWideSaltSource.class);
-            saltSource.getPropertyValues().addPropertyValue("systemWideSalt", systemWideSalt);
-            saltSource.setSource(parserContext.extractSource(element));
-            saltSource.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		if (StringUtils.hasText(systemWideSalt)) {
+			saltSource = new RootBeanDefinition(SystemWideSaltSource.class);
+			saltSource.getPropertyValues().addPropertyValue("systemWideSalt",
+					systemWideSalt);
+			saltSource.setSource(parserContext.extractSource(element));
+			saltSource.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 
-            return saltSource;
-        }
+			return saltSource;
+		}
 
-        parserContext.getReaderContext().error(Elements.SALT_SOURCE + " requires an attribute", element);
-        return null;
-    }
+		parserContext.getReaderContext().error(
+				Elements.SALT_SOURCE + " requires an attribute", element);
+		return null;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java
index e83b1d8627..f5f3dcfd03 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java
@@ -24,86 +24,94 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  * @author Ben Alex
  */
-public class UserServiceBeanDefinitionParser extends AbstractUserDetailsServiceBeanDefinitionParser {
+public class UserServiceBeanDefinitionParser extends
+		AbstractUserDetailsServiceBeanDefinitionParser {
 
-    static final String ATT_PASSWORD = "password";
-    static final String ATT_NAME = "name";
-    static final String ELT_USER = "user";
-    static final String ATT_AUTHORITIES = "authorities";
-    static final String ATT_PROPERTIES = "properties";
-    static final String ATT_DISABLED = "disabled";
-    static final String ATT_LOCKED = "locked";
+	static final String ATT_PASSWORD = "password";
+	static final String ATT_NAME = "name";
+	static final String ELT_USER = "user";
+	static final String ATT_AUTHORITIES = "authorities";
+	static final String ATT_PROPERTIES = "properties";
+	static final String ATT_DISABLED = "disabled";
+	static final String ATT_LOCKED = "locked";
 
-    private SecureRandom random;
+	private SecureRandom random;
 
-    protected String getBeanClassName(Element element) {
-        return InMemoryUserDetailsManager.class.getName();
-    }
+	protected String getBeanClassName(Element element) {
+		return InMemoryUserDetailsManager.class.getName();
+	}
 
-    @SuppressWarnings("unchecked")
-    protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-        String userProperties = element.getAttribute(ATT_PROPERTIES);
-        List<Element> userElts = DomUtils.getChildElementsByTagName(element, ELT_USER);
+	@SuppressWarnings("unchecked")
+	protected void doParse(Element element, ParserContext parserContext,
+			BeanDefinitionBuilder builder) {
+		String userProperties = element.getAttribute(ATT_PROPERTIES);
+		List<Element> userElts = DomUtils.getChildElementsByTagName(element, ELT_USER);
 
-        if (StringUtils.hasText(userProperties)) {
+		if (StringUtils.hasText(userProperties)) {
 
-            if(!CollectionUtils.isEmpty(userElts)) {
-                throw new BeanDefinitionStoreException("Use of a properties file and user elements are mutually exclusive");
-            }
+			if (!CollectionUtils.isEmpty(userElts)) {
+				throw new BeanDefinitionStoreException(
+						"Use of a properties file and user elements are mutually exclusive");
+			}
 
-            BeanDefinition bd = new RootBeanDefinition(PropertiesFactoryBean.class);
-            bd.getPropertyValues().addPropertyValue("location", userProperties);
-            builder.addConstructorArgValue(bd);
+			BeanDefinition bd = new RootBeanDefinition(PropertiesFactoryBean.class);
+			bd.getPropertyValues().addPropertyValue("location", userProperties);
+			builder.addConstructorArgValue(bd);
 
-            return;
-        }
+			return;
+		}
 
-        if (CollectionUtils.isEmpty(userElts)) {
-            throw new BeanDefinitionStoreException("You must supply user definitions, either with <" + ELT_USER + "> child elements or a " +
-                "properties file (using the '" + ATT_PROPERTIES + "' attribute)" );
-        }
+		if (CollectionUtils.isEmpty(userElts)) {
+			throw new BeanDefinitionStoreException(
+					"You must supply user definitions, either with <" + ELT_USER
+							+ "> child elements or a " + "properties file (using the '"
+							+ ATT_PROPERTIES + "' attribute)");
+		}
 
-        ManagedList<BeanDefinition> users = new ManagedList<BeanDefinition>();
+		ManagedList<BeanDefinition> users = new ManagedList<BeanDefinition>();
 
-        for (Object elt : userElts) {
-            Element userElt = (Element) elt;
-            String userName = userElt.getAttribute(ATT_NAME);
-            String password = userElt.getAttribute(ATT_PASSWORD);
+		for (Object elt : userElts) {
+			Element userElt = (Element) elt;
+			String userName = userElt.getAttribute(ATT_NAME);
+			String password = userElt.getAttribute(ATT_PASSWORD);
 
-            if (!StringUtils.hasLength(password)) {
-                password = generateRandomPassword();
-            }
+			if (!StringUtils.hasLength(password)) {
+				password = generateRandomPassword();
+			}
 
-            boolean locked = "true".equals(userElt.getAttribute(ATT_LOCKED));
-            boolean disabled = "true".equals(userElt.getAttribute(ATT_DISABLED));
-            BeanDefinitionBuilder authorities = BeanDefinitionBuilder.rootBeanDefinition(AuthorityUtils.class);
-            authorities.addConstructorArgValue(userElt.getAttribute(ATT_AUTHORITIES));
-            authorities.setFactoryMethod("commaSeparatedStringToAuthorityList");
+			boolean locked = "true".equals(userElt.getAttribute(ATT_LOCKED));
+			boolean disabled = "true".equals(userElt.getAttribute(ATT_DISABLED));
+			BeanDefinitionBuilder authorities = BeanDefinitionBuilder
+					.rootBeanDefinition(AuthorityUtils.class);
+			authorities.addConstructorArgValue(userElt.getAttribute(ATT_AUTHORITIES));
+			authorities.setFactoryMethod("commaSeparatedStringToAuthorityList");
 
-            BeanDefinitionBuilder user = BeanDefinitionBuilder.rootBeanDefinition(User.class);
-            user.addConstructorArgValue(userName);
-            user.addConstructorArgValue(password);
-            user.addConstructorArgValue(!disabled);
-            user.addConstructorArgValue(true);
-            user.addConstructorArgValue(true);
-            user.addConstructorArgValue(!locked);
-            user.addConstructorArgValue(authorities.getBeanDefinition());
+			BeanDefinitionBuilder user = BeanDefinitionBuilder
+					.rootBeanDefinition(User.class);
+			user.addConstructorArgValue(userName);
+			user.addConstructorArgValue(password);
+			user.addConstructorArgValue(!disabled);
+			user.addConstructorArgValue(true);
+			user.addConstructorArgValue(true);
+			user.addConstructorArgValue(!locked);
+			user.addConstructorArgValue(authorities.getBeanDefinition());
 
-            users.add(user.getBeanDefinition());
-        }
+			users.add(user.getBeanDefinition());
+		}
 
-        builder.addConstructorArgValue(users);
-    }
+		builder.addConstructorArgValue(users);
+	}
 
-    private String generateRandomPassword() {
-        if (random == null) {
-            try {
-                random = SecureRandom.getInstance("SHA1PRNG");
-            } catch (NoSuchAlgorithmException e) {
-                // Shouldn't happen...
-                throw new RuntimeException("Failed find SHA1PRNG algorithm!");
-            }
-        }
-        return Long.toString(random.nextLong());
-    }
+	private String generateRandomPassword() {
+		if (random == null) {
+			try {
+				random = SecureRandom.getInstance("SHA1PRNG");
+			}
+			catch (NoSuchAlgorithmException e) {
+				// Shouldn't happen...
+				throw new RuntimeException("Failed find SHA1PRNG algorithm!");
+			}
+		}
+		return Long.toString(random.nextLong());
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java b/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java
index f510272ce1..ccffc8501e 100644
--- a/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/debug/SecurityDebugBeanFactoryPostProcessor.java
@@ -30,28 +30,36 @@ import org.springframework.security.web.debug.DebugFilter;
  * @author Luke Taylor
  * @author Rob Winch
  */
-public class SecurityDebugBeanFactoryPostProcessor implements BeanDefinitionRegistryPostProcessor {
-    private final Log logger = LogFactory.getLog(getClass());
+public class SecurityDebugBeanFactoryPostProcessor implements
+		BeanDefinitionRegistryPostProcessor {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-        logger.warn("\n\n" +
-                "********************************************************************\n" +
-                "**********        Security debugging is enabled.       *************\n" +
-                "**********    This may include sensitive information.  *************\n" +
-                "**********      Do not use in a production system!     *************\n" +
-                "********************************************************************\n\n");
-        // SPRING_SECURITY_FILTER_CHAIN does not exist yet since it is an alias that has not been processed, so use FILTER_CHAIN_PROXY
-        if (registry.containsBeanDefinition(BeanIds.FILTER_CHAIN_PROXY)) {
-            BeanDefinition fcpBeanDef = registry.getBeanDefinition(BeanIds.FILTER_CHAIN_PROXY);
-            BeanDefinitionBuilder debugFilterBldr = BeanDefinitionBuilder.genericBeanDefinition(DebugFilter.class);
-            debugFilterBldr.addConstructorArgValue(fcpBeanDef);
-            // Remove the alias to SPRING_SECURITY_FILTER_CHAIN, so that it does not override the new
-            // SPRING_SECURITY_FILTER_CHAIN definition
-            registry.removeAlias(BeanIds.SPRING_SECURITY_FILTER_CHAIN);
-            registry.registerBeanDefinition(BeanIds.SPRING_SECURITY_FILTER_CHAIN, debugFilterBldr.getBeanDefinition());
-        }
-    }
+	public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
+			throws BeansException {
+		logger.warn("\n\n"
+				+ "********************************************************************\n"
+				+ "**********        Security debugging is enabled.       *************\n"
+				+ "**********    This may include sensitive information.  *************\n"
+				+ "**********      Do not use in a production system!     *************\n"
+				+ "********************************************************************\n\n");
+		// SPRING_SECURITY_FILTER_CHAIN does not exist yet since it is an alias that has
+		// not been processed, so use FILTER_CHAIN_PROXY
+		if (registry.containsBeanDefinition(BeanIds.FILTER_CHAIN_PROXY)) {
+			BeanDefinition fcpBeanDef = registry
+					.getBeanDefinition(BeanIds.FILTER_CHAIN_PROXY);
+			BeanDefinitionBuilder debugFilterBldr = BeanDefinitionBuilder
+					.genericBeanDefinition(DebugFilter.class);
+			debugFilterBldr.addConstructorArgValue(fcpBeanDef);
+			// Remove the alias to SPRING_SECURITY_FILTER_CHAIN, so that it does not
+			// override the new
+			// SPRING_SECURITY_FILTER_CHAIN definition
+			registry.removeAlias(BeanIds.SPRING_SECURITY_FILTER_CHAIN);
+			registry.registerBeanDefinition(BeanIds.SPRING_SECURITY_FILTER_CHAIN,
+					debugFilterBldr.getBeanDefinition());
+		}
+	}
 
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-    }
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
+			throws BeansException {
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java
index f81785bc6e..4502a27ff1 100644
--- a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java
@@ -61,704 +61,794 @@ import java.security.SecureRandom;
 import java.util.*;
 
 /**
- * Handles creation of authentication mechanism filters and related beans for &lt;http&gt; parsing.
+ * Handles creation of authentication mechanism filters and related beans for &lt;http&gt;
+ * parsing.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.0
  */
 final class AuthenticationConfigBuilder {
-    private final Log logger = LogFactory.getLog(getClass());
-
-    private static final String ATT_REALM = "realm";
-    private static final String DEF_REALM = "Spring Security Application";
-
-    static final String OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationFilter";
-    static final String OPEN_ID_AUTHENTICATION_PROVIDER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationProvider";
-    private static final String OPEN_ID_CONSUMER_CLASS = "org.springframework.security.openid.OpenID4JavaConsumer";
-    static final String OPEN_ID_ATTRIBUTE_CLASS = "org.springframework.security.openid.OpenIDAttribute";
-    private static final String OPEN_ID_ATTRIBUTE_FACTORY_CLASS = "org.springframework.security.openid.RegexBasedAxFetchListFactory";
-    static final String AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter";
-
-    static final String ATT_AUTH_DETAILS_SOURCE_REF = "authentication-details-source-ref";
-
-    private static final String ATT_AUTO_CONFIG = "auto-config";
-
-    private static final String ATT_ACCESS_DENIED_ERROR_PAGE = "error-page";
-    private static final String ATT_ENTRY_POINT_REF = "entry-point-ref";
-
-    private static final String ATT_USER_SERVICE_REF = "user-service-ref";
-
-    private static final String ATT_KEY = "key";
-
-    private final Element httpElt;
-    private final ParserContext pc;
-
-    private final boolean autoConfig;
-    private final boolean allowSessionCreation;
-
-    private RootBeanDefinition anonymousFilter;
-    private BeanReference anonymousProviderRef;
-    private BeanDefinition rememberMeFilter;
-    private String rememberMeServicesId;
-    private BeanReference rememberMeProviderRef;
-    private BeanDefinition basicFilter;
-    private RuntimeBeanReference basicEntryPoint;
-    private BeanDefinition formEntryPoint;
-    private BeanDefinition openIDEntryPoint;
-    private BeanReference openIDProviderRef;
-    private String formFilterId = null;
-    private String openIDFilterId = null;
-    private BeanDefinition x509Filter;
-    private BeanReference x509ProviderRef;
-    private BeanDefinition jeeFilter;
-    private BeanReference jeeProviderRef;
-    private RootBeanDefinition preAuthEntryPoint;
-    private BeanMetadataElement mainEntryPoint;
-    private BeanMetadataElement accessDeniedHandler;
-
-    private BeanDefinition logoutFilter;
-    @SuppressWarnings("rawtypes")
-    private ManagedList logoutHandlers;
-    private BeanDefinition loginPageGenerationFilter;
-    private BeanDefinition etf;
-    private final BeanReference requestCache;
-    private final BeanReference portMapper;
-    private final BeanReference portResolver;
-    private final BeanMetadataElement csrfLogoutHandler;
-
-    private String loginProcessingUrl;
-    private String openidLoginProcessingUrl;
-
-    public AuthenticationConfigBuilder(Element element, boolean forceAutoConfig, ParserContext pc, SessionCreationPolicy sessionPolicy,
-            BeanReference requestCache, BeanReference authenticationManager, BeanReference sessionStrategy, BeanReference portMapper, BeanReference portResolver, BeanMetadataElement csrfLogoutHandler) {
-        this.httpElt = element;
-        this.pc = pc;
-        this.requestCache = requestCache;
-        autoConfig = forceAutoConfig | "true".equals(element.getAttribute(ATT_AUTO_CONFIG));
-        this.allowSessionCreation = sessionPolicy != SessionCreationPolicy.NEVER
-                && sessionPolicy != SessionCreationPolicy.STATELESS;
-        this.portMapper = portMapper;
-        this.portResolver = portResolver;
-        this.csrfLogoutHandler = csrfLogoutHandler;
-
-        createAnonymousFilter();
-        createRememberMeFilter(authenticationManager);
-        createBasicFilter(authenticationManager);
-        createFormLoginFilter(sessionStrategy, authenticationManager);
-        createOpenIDLoginFilter(sessionStrategy, authenticationManager);
-        createX509Filter(authenticationManager);
-        createJeeFilter(authenticationManager);
-        createLogoutFilter();
-        createLoginPageFilterIfNeeded();
-        createUserDetailsServiceFactory();
-        createExceptionTranslationFilter();
-
-    }
-
-    void createRememberMeFilter(BeanReference authenticationManager) {
-
-        // Parse remember me before logout as RememberMeServices is also a LogoutHandler implementation.
-        Element rememberMeElt = DomUtils.getChildElementByTagName(httpElt, Elements.REMEMBER_ME);
-
-        if (rememberMeElt != null) {
-            String key = rememberMeElt.getAttribute(ATT_KEY);
-
-            if (!StringUtils.hasText(key)) {
-                key = createKey();
-            }
-
-            RememberMeBeanDefinitionParser rememberMeParser = new RememberMeBeanDefinitionParser(key, authenticationManager);
-            rememberMeFilter = rememberMeParser.parse(rememberMeElt, pc);
-            rememberMeServicesId = rememberMeParser.getRememberMeServicesId();
-            createRememberMeProvider(key);
-        }
-    }
-
-    private void createRememberMeProvider(String key) {
-        RootBeanDefinition provider = new RootBeanDefinition(RememberMeAuthenticationProvider.class);
-        provider.setSource(rememberMeFilter.getSource());
-
-        provider.getConstructorArgumentValues().addGenericArgumentValue(key);
-
-        String id = pc.getReaderContext().generateBeanName(provider);
-        pc.registerBeanComponent(new BeanComponentDefinition(provider, id));
-
-        rememberMeProviderRef = new RuntimeBeanReference(id);
-    }
-
-    void createFormLoginFilter(BeanReference sessionStrategy, BeanReference authManager) {
-
-        Element formLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.FORM_LOGIN);
-        RootBeanDefinition formFilter = null;
-
-        if (formLoginElt != null || autoConfig) {
-            FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/login", "POST",
-                    AUTHENTICATION_PROCESSING_FILTER_CLASS, requestCache, sessionStrategy, allowSessionCreation, portMapper, portResolver);
-
-            parser.parse(formLoginElt, pc);
-            formFilter = parser.getFilterBean();
-            formEntryPoint = parser.getEntryPointBean();
-            loginProcessingUrl = parser.getLoginProcessingUrl();
-        }
-
-        if (formFilter != null) {
-            formFilter.getPropertyValues().addPropertyValue("allowSessionCreation", allowSessionCreation);
-            formFilter.getPropertyValues().addPropertyValue("authenticationManager", authManager);
-
-            // Id is required by login page filter
-            formFilterId = pc.getReaderContext().generateBeanName(formFilter);
-            pc.registerBeanComponent(new BeanComponentDefinition(formFilter, formFilterId));
-            injectRememberMeServicesRef(formFilter, rememberMeServicesId);
-        }
-    }
-
-    void createOpenIDLoginFilter(BeanReference sessionStrategy, BeanReference authManager) {
-        Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN);
-        RootBeanDefinition openIDFilter = null;
-
-        if (openIDLoginElt != null) {
-            FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser("/login/openid", null,
-                    OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS, requestCache, sessionStrategy, allowSessionCreation, portMapper, portResolver);
-
-            parser.parse(openIDLoginElt, pc);
-            openIDFilter = parser.getFilterBean();
-            openIDEntryPoint = parser.getEntryPointBean();
-            openidLoginProcessingUrl = parser.getLoginProcessingUrl();
-
-            List<Element> attrExElts = DomUtils.getChildElementsByTagName(openIDLoginElt, Elements.OPENID_ATTRIBUTE_EXCHANGE);
-
-            if (!attrExElts.isEmpty()) {
-                // Set up the consumer with the required attribute list
-                BeanDefinitionBuilder consumerBldr = BeanDefinitionBuilder.rootBeanDefinition(OPEN_ID_CONSUMER_CLASS);
-                BeanDefinitionBuilder axFactory = BeanDefinitionBuilder.rootBeanDefinition(OPEN_ID_ATTRIBUTE_FACTORY_CLASS);
-                ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<String, ManagedList<BeanDefinition>>();
-
-                for (Element attrExElt : attrExElts) {
-                    String identifierMatch = attrExElt.getAttribute("identifier-match");
-
-                    if (!StringUtils.hasText(identifierMatch)) {
-                        if (attrExElts.size() > 1) {
-                            pc.getReaderContext().error("You must supply an identifier-match attribute if using more" +
-                                    " than one " + Elements.OPENID_ATTRIBUTE_EXCHANGE + " element", attrExElt);
-                        }
-                        // Match anything
-                        identifierMatch = ".*";
-                    }
-
-                    axMap.put(identifierMatch, parseOpenIDAttributes(attrExElt));
-                }
-                axFactory.addConstructorArgValue(axMap);
-
-                consumerBldr.addConstructorArgValue(axFactory.getBeanDefinition());
-                openIDFilter.getPropertyValues().addPropertyValue("consumer", consumerBldr.getBeanDefinition());
-            }
-        }
-
-        if (openIDFilter != null) {
-            openIDFilter.getPropertyValues().addPropertyValue("allowSessionCreation", allowSessionCreation);
-            openIDFilter.getPropertyValues().addPropertyValue("authenticationManager", authManager);
-            // Required by login page filter
-            openIDFilterId = pc.getReaderContext().generateBeanName(openIDFilter);
-            pc.registerBeanComponent(new BeanComponentDefinition(openIDFilter, openIDFilterId));
-            injectRememberMeServicesRef(openIDFilter, rememberMeServicesId);
-
-            createOpenIDProvider();
-        }
-    }
-
-    private ManagedList<BeanDefinition> parseOpenIDAttributes(Element attrExElt) {
-        ManagedList<BeanDefinition> attributes = new ManagedList<BeanDefinition> ();
-        for (Element attElt : DomUtils.getChildElementsByTagName(attrExElt, Elements.OPENID_ATTRIBUTE)) {
-            String name = attElt.getAttribute("name");
-            String type = attElt.getAttribute("type");
-            String required = attElt.getAttribute("required");
-            String count = attElt.getAttribute("count");
-            BeanDefinitionBuilder attrBldr = BeanDefinitionBuilder.rootBeanDefinition(OPEN_ID_ATTRIBUTE_CLASS);
-            attrBldr.addConstructorArgValue(name);
-            attrBldr.addConstructorArgValue(type);
-            if (StringUtils.hasLength(required)) {
-                attrBldr.addPropertyValue("required", Boolean.valueOf(required));
-            }
-
-            if (StringUtils.hasLength(count)) {
-                attrBldr.addPropertyValue("count", Integer.parseInt(count));
-            }
-            attributes.add(attrBldr.getBeanDefinition());
-        }
-
-        return attributes;
-    }
-
-    private void createOpenIDProvider() {
-        Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN);
-        BeanDefinitionBuilder openIDProviderBuilder =
-            BeanDefinitionBuilder.rootBeanDefinition(OPEN_ID_AUTHENTICATION_PROVIDER_CLASS);
-
-        RootBeanDefinition uds = new RootBeanDefinition();
-        uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
-        uds.setFactoryMethodName("authenticationUserDetailsService");
-        uds.getConstructorArgumentValues().addGenericArgumentValue(openIDLoginElt.getAttribute(ATT_USER_SERVICE_REF));
-
-        openIDProviderBuilder.addPropertyValue("authenticationUserDetailsService", uds);
-
-        BeanDefinition openIDProvider = openIDProviderBuilder.getBeanDefinition();
-        openIDProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(openIDProvider));
-    }
-
-    private void injectRememberMeServicesRef(RootBeanDefinition bean, String rememberMeServicesId) {
-        if (rememberMeServicesId != null) {
-            bean.getPropertyValues().addPropertyValue("rememberMeServices", new RuntimeBeanReference(rememberMeServicesId));
-        }
-    }
-
-    void createBasicFilter(BeanReference authManager) {
-        Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt, Elements.BASIC_AUTH);
-
-        if (basicAuthElt == null && !autoConfig) {
-            // No basic auth, do nothing
-            return;
-        }
-
-        String realm = httpElt.getAttribute(ATT_REALM);
-        if (!StringUtils.hasText(realm)) {
-            realm = DEF_REALM;
-        }
-
-        BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(BasicAuthenticationFilter.class);
-
-        String entryPointId;
-
-        if (basicAuthElt != null) {
-            if (StringUtils.hasText(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF))) {
-                basicEntryPoint = new RuntimeBeanReference(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF));
-            }
-
-            injectAuthenticationDetailsSource(basicAuthElt, filterBuilder);
-
-        }
-
-        if (basicEntryPoint == null) {
-            RootBeanDefinition entryPoint = new RootBeanDefinition(BasicAuthenticationEntryPoint.class);
-            entryPoint.setSource(pc.extractSource(httpElt));
-            entryPoint.getPropertyValues().addPropertyValue("realmName", realm);
-            entryPointId = pc.getReaderContext().generateBeanName(entryPoint);
-            pc.registerBeanComponent(new BeanComponentDefinition(entryPoint, entryPointId));
-            basicEntryPoint = new RuntimeBeanReference(entryPointId);
-        }
-
-        filterBuilder.addConstructorArgValue(authManager);
-        filterBuilder.addConstructorArgValue(basicEntryPoint);
-        basicFilter = filterBuilder.getBeanDefinition();
-    }
-
-    void createX509Filter(BeanReference authManager) {
-        Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509);
-        RootBeanDefinition filter = null;
-
-        if (x509Elt != null) {
-            BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(X509AuthenticationFilter.class);
-            filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(x509Elt));
-            filterBuilder.addPropertyValue("authenticationManager", authManager);
-
-            String regex = x509Elt.getAttribute("subject-principal-regex");
-
-            if (StringUtils.hasText(regex)) {
-                BeanDefinitionBuilder extractor = BeanDefinitionBuilder.rootBeanDefinition(SubjectDnX509PrincipalExtractor.class);
-                extractor.addPropertyValue("subjectDnRegex", regex);
-
-                filterBuilder.addPropertyValue("principalExtractor", extractor.getBeanDefinition());
-            }
-
-            injectAuthenticationDetailsSource(x509Elt, filterBuilder);
-
-            filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
-            createPrauthEntryPoint(x509Elt);
-
-            createX509Provider();
-        }
-
-        x509Filter = filter;
-    }
-
-    private void injectAuthenticationDetailsSource(Element elt, BeanDefinitionBuilder filterBuilder) {
-        String authDetailsSourceRef = elt.getAttribute(AuthenticationConfigBuilder.ATT_AUTH_DETAILS_SOURCE_REF);
-
-        if (StringUtils.hasText(authDetailsSourceRef)) {
-            filterBuilder.addPropertyReference("authenticationDetailsSource", authDetailsSourceRef);
-        }
-    }
-
-    private void createX509Provider() {
-        Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509);
-        BeanDefinition provider = new RootBeanDefinition(PreAuthenticatedAuthenticationProvider.class);
-
-        RootBeanDefinition uds = new RootBeanDefinition();
-        uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
-        uds.setFactoryMethodName("authenticationUserDetailsService");
-        uds.getConstructorArgumentValues().addGenericArgumentValue(x509Elt.getAttribute(ATT_USER_SERVICE_REF));
-
-        provider.getPropertyValues().addPropertyValue("preAuthenticatedUserDetailsService", uds);
-
-        x509ProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(provider));
-    }
-
-    private void createPrauthEntryPoint(Element source) {
-        if (preAuthEntryPoint == null) {
-            preAuthEntryPoint = new RootBeanDefinition(Http403ForbiddenEntryPoint.class);
-            preAuthEntryPoint.setSource(pc.extractSource(source));
-        }
-    }
-
-    void createJeeFilter(BeanReference authManager) {
-        final String ATT_MAPPABLE_ROLES = "mappable-roles";
-
-        Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE);
-        RootBeanDefinition filter = null;
-
-        if (jeeElt != null) {
-            BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(J2eePreAuthenticatedProcessingFilter.class);
-            filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(jeeElt));
-            filterBuilder.addPropertyValue("authenticationManager", authManager);
-
-            BeanDefinitionBuilder adsBldr = BeanDefinitionBuilder.rootBeanDefinition(J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.class);
-            adsBldr.addPropertyValue("userRoles2GrantedAuthoritiesMapper", new RootBeanDefinition(SimpleAttributes2GrantedAuthoritiesMapper.class));
-
-            String roles = jeeElt.getAttribute(ATT_MAPPABLE_ROLES);
-            Assert.state(StringUtils.hasText(roles));
-            BeanDefinitionBuilder rolesBuilder = BeanDefinitionBuilder.rootBeanDefinition(StringUtils.class);
-            rolesBuilder.addConstructorArgValue(roles);
-            rolesBuilder.setFactoryMethod("commaDelimitedListToSet");
-
-            RootBeanDefinition mappableRolesRetriever = new RootBeanDefinition(SimpleMappableAttributesRetriever.class);
-            mappableRolesRetriever.getPropertyValues().addPropertyValue("mappableAttributes", rolesBuilder.getBeanDefinition());
-            adsBldr.addPropertyValue("mappableRolesRetriever", mappableRolesRetriever);
-            filterBuilder.addPropertyValue("authenticationDetailsSource", adsBldr.getBeanDefinition());
-
-            filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
-
-            createPrauthEntryPoint(jeeElt);
-            createJeeProvider();
-        }
-
-        jeeFilter = filter;
-    }
-
-    private void createJeeProvider() {
-        Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE);
-        BeanDefinition provider = new RootBeanDefinition(PreAuthenticatedAuthenticationProvider.class);
-
-        RootBeanDefinition uds;
-        if (StringUtils.hasText(jeeElt.getAttribute(ATT_USER_SERVICE_REF))) {
-            uds = new RootBeanDefinition();
-            uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
-            uds.setFactoryMethodName("authenticationUserDetailsService");
-            uds.getConstructorArgumentValues().addGenericArgumentValue(jeeElt.getAttribute(ATT_USER_SERVICE_REF));
-        } else {
-            uds = new RootBeanDefinition(PreAuthenticatedGrantedAuthoritiesUserDetailsService.class);
-        }
-
-        provider.getPropertyValues().addPropertyValue("preAuthenticatedUserDetailsService", uds);
-
-        jeeProviderRef = new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(provider));
-    }
-
-    void createLoginPageFilterIfNeeded() {
-        boolean needLoginPage = formFilterId != null || openIDFilterId != null;
-        String formLoginPage = getLoginFormUrl(formEntryPoint);
-        String openIDLoginPage = getLoginFormUrl(openIDEntryPoint);
-
-        // If no login page has been defined, add in the default page generator.
-        if (needLoginPage && formLoginPage == null && openIDLoginPage == null) {
-            logger.info("No login page configured. The default internal one will be used. Use the '"
-                     + FormLoginBeanDefinitionParser.ATT_LOGIN_PAGE + "' attribute to set the URL of the login page.");
-            BeanDefinitionBuilder loginPageFilter =
-                BeanDefinitionBuilder.rootBeanDefinition(DefaultLoginPageGeneratingFilter.class);
-
-            if (formFilterId != null) {
-                loginPageFilter.addConstructorArgReference(formFilterId);
-                loginPageFilter.addPropertyValue("authenticationUrl", loginProcessingUrl);
-            }
-
-            if (openIDFilterId != null) {
-                loginPageFilter.addConstructorArgReference(openIDFilterId);
-                loginPageFilter.addPropertyValue("openIDauthenticationUrl", openidLoginProcessingUrl);
-            }
-
-            loginPageGenerationFilter = loginPageFilter.getBeanDefinition();
-        }
-    }
-
-    void createLogoutFilter() {
-        Element logoutElt = DomUtils.getChildElementByTagName(httpElt, Elements.LOGOUT);
-        if (logoutElt != null || autoConfig) {
-            String formLoginPage = getLoginFormUrl(formEntryPoint);
-            if(formLoginPage == null) {
-                formLoginPage = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL;
-            }
-            LogoutBeanDefinitionParser logoutParser = new LogoutBeanDefinitionParser(formLoginPage,rememberMeServicesId, csrfLogoutHandler);
-            logoutFilter = logoutParser.parse(logoutElt, pc);
-            logoutHandlers = logoutParser.getLogoutHandlers();
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    ManagedList getLogoutHandlers() {
-        if(logoutHandlers == null && rememberMeProviderRef != null) {
-            logoutHandlers = new ManagedList();
-            if(csrfLogoutHandler != null) {
-                logoutHandlers.add(csrfLogoutHandler);
-            }
-            logoutHandlers.add(new RuntimeBeanReference(rememberMeServicesId));
-            logoutHandlers.add(new RootBeanDefinition(SecurityContextLogoutHandler.class));
-        }
-
-        return logoutHandlers;
-    }
-
-    BeanMetadataElement getEntryPointBean() {
-        return mainEntryPoint;
-    }
-
-    BeanMetadataElement getAccessDeniedHandlerBean() {
-        return accessDeniedHandler;
-    }
-
-    void createAnonymousFilter() {
-        Element anonymousElt = DomUtils.getChildElementByTagName(httpElt, Elements.ANONYMOUS);
-
-        if (anonymousElt != null && "false".equals(anonymousElt.getAttribute("enabled"))) {
-            return;
-        }
-
-        String grantedAuthority = null;
-        String username = null;
-        String key = null;
-        Object source = pc.extractSource(httpElt);
-
-        if (anonymousElt != null) {
-            grantedAuthority = anonymousElt.getAttribute("granted-authority");
-            username = anonymousElt.getAttribute("username");
-            key = anonymousElt.getAttribute(ATT_KEY);
-            source = pc.extractSource(anonymousElt);
-        }
-
-        if (!StringUtils.hasText(grantedAuthority)) {
-            grantedAuthority = "ROLE_ANONYMOUS";
-        }
-
-        if (!StringUtils.hasText(username)) {
-            username = "anonymousUser";
-        }
-
-        if (!StringUtils.hasText(key)) {
-            // Generate a random key for the Anonymous provider
-            key = createKey();
-        }
-
-        anonymousFilter = new RootBeanDefinition(AnonymousAuthenticationFilter.class);
-        anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(0, key);
-        anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(1, username);
-        anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(2, AuthorityUtils.commaSeparatedStringToAuthorityList(grantedAuthority));
-        anonymousFilter.setSource(source);
-
-        RootBeanDefinition anonymousProviderBean = new RootBeanDefinition(AnonymousAuthenticationProvider.class);
-        anonymousProviderBean.getConstructorArgumentValues().addIndexedArgumentValue(0, key);
-        anonymousProviderBean.setSource(anonymousFilter.getSource());
-        String id = pc.getReaderContext().generateBeanName(anonymousProviderBean);
-        pc.registerBeanComponent(new BeanComponentDefinition(anonymousProviderBean, id));
-
-        anonymousProviderRef = new RuntimeBeanReference(id);
-
-    }
-
-    private String createKey() {
-        SecureRandom random = new SecureRandom();
-        return Long.toString(random.nextLong());
-    }
-
-    void createExceptionTranslationFilter() {
-        BeanDefinitionBuilder etfBuilder = BeanDefinitionBuilder.rootBeanDefinition(ExceptionTranslationFilter.class);
-        accessDeniedHandler = createAccessDeniedHandler(httpElt, pc);
-        etfBuilder.addPropertyValue("accessDeniedHandler", accessDeniedHandler);
-        assert requestCache != null;
-        mainEntryPoint = selectEntryPoint();
-        etfBuilder.addConstructorArgValue(mainEntryPoint);
-        etfBuilder.addConstructorArgValue(requestCache);
-
-        etf = etfBuilder.getBeanDefinition();
-    }
-
-    private BeanMetadataElement createAccessDeniedHandler(Element element, ParserContext pc) {
-        Element accessDeniedElt = DomUtils.getChildElementByTagName(element, Elements.ACCESS_DENIED_HANDLER);
-        BeanDefinitionBuilder accessDeniedHandler = BeanDefinitionBuilder.rootBeanDefinition(AccessDeniedHandlerImpl.class);
-
-        if (accessDeniedElt != null) {
-            String errorPage = accessDeniedElt.getAttribute("error-page");
-            String ref = accessDeniedElt.getAttribute("ref");
-
-            if (StringUtils.hasText(errorPage)) {
-                if (StringUtils.hasText(ref)) {
-                    pc.getReaderContext().error("The attribute " + ATT_ACCESS_DENIED_ERROR_PAGE +
-                            " cannot be used together with the 'ref' attribute within <" +
-                            Elements.ACCESS_DENIED_HANDLER + ">", pc.extractSource(accessDeniedElt));
-
-                }
-                accessDeniedHandler.addPropertyValue("errorPage", errorPage);
-            } else if (StringUtils.hasText(ref)) {
-                return new RuntimeBeanReference(ref);
-            }
-
-        }
-
-        return accessDeniedHandler.getBeanDefinition();
-    }
-
-    private BeanMetadataElement selectEntryPoint() {
-        // We need to establish the main entry point.
-        // First check if a custom entry point bean is set
-        String customEntryPoint = httpElt.getAttribute(ATT_ENTRY_POINT_REF);
-
-        if (StringUtils.hasText(customEntryPoint)) {
-            return new RuntimeBeanReference(customEntryPoint);
-        }
-
-        Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt, Elements.BASIC_AUTH);
-        Element formLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.FORM_LOGIN);
-        Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt, Elements.OPENID_LOGIN);
-        // Basic takes precedence if explicit element is used and no others are configured
-        if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null) {
-            return basicEntryPoint;
-        }
-
-        // If formLogin has been enabled either through an element or auto-config, then it is used if no openID login page
-        // has been set.
-        String formLoginPage = getLoginFormUrl(formEntryPoint);
-        String openIDLoginPage = getLoginFormUrl(openIDEntryPoint);
-
-        if (formLoginPage != null && openIDLoginPage != null) {
-            pc.getReaderContext().error("Only one login-page can be defined, either for OpenID or form-login, " +
-                    "but not both.", pc.extractSource(openIDLoginElt));
-        }
-
-        if (formFilterId != null && openIDLoginPage == null) {
-            return formEntryPoint;
-        }
-
-        // Otherwise use OpenID if enabled
-        if (openIDFilterId != null) {
-            return openIDEntryPoint;
-        }
-
-        // If X.509 or JEE have been enabled, use the preauth entry point.
-        if (preAuthEntryPoint != null) {
-            return preAuthEntryPoint;
-        }
-
-        pc.getReaderContext().error("No AuthenticationEntryPoint could be established. Please " +
-                "make sure you have a login mechanism configured through the namespace (such as form-login) or " +
-                "specify a custom AuthenticationEntryPoint with the '" + ATT_ENTRY_POINT_REF+ "' attribute ",
-                pc.extractSource(httpElt));
-        return null;
-    }
-
-    private String getLoginFormUrl(BeanDefinition entryPoint) {
-        if (entryPoint == null) {
-            return null;
-        }
-
-        ConstructorArgumentValues cavs = entryPoint.getConstructorArgumentValues();
-        ValueHolder vh = cavs.getIndexedArgumentValue(0, String.class);
-        if (vh == null) {
-             return null;
-        }
-
-        // If the login URL is the default one, then it is assumed not to have been set explicitly
-        if (DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL.equals(vh.getValue())) {
-            return null;
-        }
-
-        return (String) vh.getValue();
-    }
-
-    private void createUserDetailsServiceFactory() {
-        if (pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE_FACTORY)) {
-            // Multiple <http> case
-            return;
-        }
-        RootBeanDefinition bean = new RootBeanDefinition(UserDetailsServiceFactoryBean.class);
-        bean.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        pc.registerBeanComponent(new BeanComponentDefinition(bean, BeanIds.USER_DETAILS_SERVICE_FACTORY));
-    }
-
-    List<OrderDecorator> getFilters() {
-        List<OrderDecorator> filters = new ArrayList<OrderDecorator>();
-
-        if (anonymousFilter != null) {
-            filters.add(new OrderDecorator(anonymousFilter, ANONYMOUS_FILTER));
-        }
-
-        if (rememberMeFilter != null) {
-            filters.add(new OrderDecorator(rememberMeFilter, REMEMBER_ME_FILTER));
-        }
-
-        if (logoutFilter != null) {
-            filters.add(new OrderDecorator(logoutFilter, LOGOUT_FILTER));
-        }
-
-        if (x509Filter != null) {
-            filters.add(new OrderDecorator(x509Filter, X509_FILTER));
-        }
-
-        if (jeeFilter != null) {
-            filters.add(new OrderDecorator(jeeFilter, PRE_AUTH_FILTER));
-        }
-
-        if (formFilterId != null) {
-            filters.add(new OrderDecorator(new RuntimeBeanReference(formFilterId), FORM_LOGIN_FILTER));
-        }
-
-        if (openIDFilterId != null) {
-            filters.add(new OrderDecorator(new RuntimeBeanReference(openIDFilterId), OPENID_FILTER));
-        }
-
-        if (loginPageGenerationFilter != null) {
-            filters.add(new OrderDecorator(loginPageGenerationFilter, LOGIN_PAGE_FILTER));
-        }
-
-        if (basicFilter != null) {
-            filters.add(new OrderDecorator(basicFilter, BASIC_AUTH_FILTER));
-        }
-
-        filters.add(new OrderDecorator(etf, EXCEPTION_TRANSLATION_FILTER));
-
-        return filters;
-    }
-
-    List<BeanReference> getProviders() {
-        List<BeanReference> providers = new ArrayList<BeanReference>();
-
-        if (anonymousProviderRef != null) {
-            providers.add(anonymousProviderRef);
-        }
-
-        if (rememberMeProviderRef != null) {
-            providers.add(rememberMeProviderRef);
-        }
-
-        if (openIDProviderRef != null) {
-            providers.add(openIDProviderRef);
-        }
-
-        if (x509ProviderRef != null) {
-            providers.add(x509ProviderRef);
-        }
-
-        if (jeeProviderRef != null) {
-            providers.add(jeeProviderRef);
-        }
-
-        return providers;
-    }
+	private final Log logger = LogFactory.getLog(getClass());
+
+	private static final String ATT_REALM = "realm";
+	private static final String DEF_REALM = "Spring Security Application";
+
+	static final String OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationFilter";
+	static final String OPEN_ID_AUTHENTICATION_PROVIDER_CLASS = "org.springframework.security.openid.OpenIDAuthenticationProvider";
+	private static final String OPEN_ID_CONSUMER_CLASS = "org.springframework.security.openid.OpenID4JavaConsumer";
+	static final String OPEN_ID_ATTRIBUTE_CLASS = "org.springframework.security.openid.OpenIDAttribute";
+	private static final String OPEN_ID_ATTRIBUTE_FACTORY_CLASS = "org.springframework.security.openid.RegexBasedAxFetchListFactory";
+	static final String AUTHENTICATION_PROCESSING_FILTER_CLASS = "org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter";
+
+	static final String ATT_AUTH_DETAILS_SOURCE_REF = "authentication-details-source-ref";
+
+	private static final String ATT_AUTO_CONFIG = "auto-config";
+
+	private static final String ATT_ACCESS_DENIED_ERROR_PAGE = "error-page";
+	private static final String ATT_ENTRY_POINT_REF = "entry-point-ref";
+
+	private static final String ATT_USER_SERVICE_REF = "user-service-ref";
+
+	private static final String ATT_KEY = "key";
+
+	private final Element httpElt;
+	private final ParserContext pc;
+
+	private final boolean autoConfig;
+	private final boolean allowSessionCreation;
+
+	private RootBeanDefinition anonymousFilter;
+	private BeanReference anonymousProviderRef;
+	private BeanDefinition rememberMeFilter;
+	private String rememberMeServicesId;
+	private BeanReference rememberMeProviderRef;
+	private BeanDefinition basicFilter;
+	private RuntimeBeanReference basicEntryPoint;
+	private BeanDefinition formEntryPoint;
+	private BeanDefinition openIDEntryPoint;
+	private BeanReference openIDProviderRef;
+	private String formFilterId = null;
+	private String openIDFilterId = null;
+	private BeanDefinition x509Filter;
+	private BeanReference x509ProviderRef;
+	private BeanDefinition jeeFilter;
+	private BeanReference jeeProviderRef;
+	private RootBeanDefinition preAuthEntryPoint;
+	private BeanMetadataElement mainEntryPoint;
+	private BeanMetadataElement accessDeniedHandler;
+
+	private BeanDefinition logoutFilter;
+	@SuppressWarnings("rawtypes")
+	private ManagedList logoutHandlers;
+	private BeanDefinition loginPageGenerationFilter;
+	private BeanDefinition etf;
+	private final BeanReference requestCache;
+	private final BeanReference portMapper;
+	private final BeanReference portResolver;
+	private final BeanMetadataElement csrfLogoutHandler;
+
+	private String loginProcessingUrl;
+	private String openidLoginProcessingUrl;
+
+	public AuthenticationConfigBuilder(Element element, boolean forceAutoConfig,
+			ParserContext pc, SessionCreationPolicy sessionPolicy,
+			BeanReference requestCache, BeanReference authenticationManager,
+			BeanReference sessionStrategy, BeanReference portMapper,
+			BeanReference portResolver, BeanMetadataElement csrfLogoutHandler) {
+		this.httpElt = element;
+		this.pc = pc;
+		this.requestCache = requestCache;
+		autoConfig = forceAutoConfig
+				| "true".equals(element.getAttribute(ATT_AUTO_CONFIG));
+		this.allowSessionCreation = sessionPolicy != SessionCreationPolicy.NEVER
+				&& sessionPolicy != SessionCreationPolicy.STATELESS;
+		this.portMapper = portMapper;
+		this.portResolver = portResolver;
+		this.csrfLogoutHandler = csrfLogoutHandler;
+
+		createAnonymousFilter();
+		createRememberMeFilter(authenticationManager);
+		createBasicFilter(authenticationManager);
+		createFormLoginFilter(sessionStrategy, authenticationManager);
+		createOpenIDLoginFilter(sessionStrategy, authenticationManager);
+		createX509Filter(authenticationManager);
+		createJeeFilter(authenticationManager);
+		createLogoutFilter();
+		createLoginPageFilterIfNeeded();
+		createUserDetailsServiceFactory();
+		createExceptionTranslationFilter();
+
+	}
+
+	void createRememberMeFilter(BeanReference authenticationManager) {
+
+		// Parse remember me before logout as RememberMeServices is also a LogoutHandler
+		// implementation.
+		Element rememberMeElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.REMEMBER_ME);
+
+		if (rememberMeElt != null) {
+			String key = rememberMeElt.getAttribute(ATT_KEY);
+
+			if (!StringUtils.hasText(key)) {
+				key = createKey();
+			}
+
+			RememberMeBeanDefinitionParser rememberMeParser = new RememberMeBeanDefinitionParser(
+					key, authenticationManager);
+			rememberMeFilter = rememberMeParser.parse(rememberMeElt, pc);
+			rememberMeServicesId = rememberMeParser.getRememberMeServicesId();
+			createRememberMeProvider(key);
+		}
+	}
+
+	private void createRememberMeProvider(String key) {
+		RootBeanDefinition provider = new RootBeanDefinition(
+				RememberMeAuthenticationProvider.class);
+		provider.setSource(rememberMeFilter.getSource());
+
+		provider.getConstructorArgumentValues().addGenericArgumentValue(key);
+
+		String id = pc.getReaderContext().generateBeanName(provider);
+		pc.registerBeanComponent(new BeanComponentDefinition(provider, id));
+
+		rememberMeProviderRef = new RuntimeBeanReference(id);
+	}
+
+	void createFormLoginFilter(BeanReference sessionStrategy, BeanReference authManager) {
+
+		Element formLoginElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.FORM_LOGIN);
+		RootBeanDefinition formFilter = null;
+
+		if (formLoginElt != null || autoConfig) {
+			FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser(
+					"/login", "POST", AUTHENTICATION_PROCESSING_FILTER_CLASS,
+					requestCache, sessionStrategy, allowSessionCreation, portMapper,
+					portResolver);
+
+			parser.parse(formLoginElt, pc);
+			formFilter = parser.getFilterBean();
+			formEntryPoint = parser.getEntryPointBean();
+			loginProcessingUrl = parser.getLoginProcessingUrl();
+		}
+
+		if (formFilter != null) {
+			formFilter.getPropertyValues().addPropertyValue("allowSessionCreation",
+					allowSessionCreation);
+			formFilter.getPropertyValues().addPropertyValue("authenticationManager",
+					authManager);
+
+			// Id is required by login page filter
+			formFilterId = pc.getReaderContext().generateBeanName(formFilter);
+			pc.registerBeanComponent(new BeanComponentDefinition(formFilter, formFilterId));
+			injectRememberMeServicesRef(formFilter, rememberMeServicesId);
+		}
+	}
+
+	void createOpenIDLoginFilter(BeanReference sessionStrategy, BeanReference authManager) {
+		Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.OPENID_LOGIN);
+		RootBeanDefinition openIDFilter = null;
+
+		if (openIDLoginElt != null) {
+			FormLoginBeanDefinitionParser parser = new FormLoginBeanDefinitionParser(
+					"/login/openid", null,
+					OPEN_ID_AUTHENTICATION_PROCESSING_FILTER_CLASS, requestCache,
+					sessionStrategy, allowSessionCreation, portMapper, portResolver);
+
+			parser.parse(openIDLoginElt, pc);
+			openIDFilter = parser.getFilterBean();
+			openIDEntryPoint = parser.getEntryPointBean();
+			openidLoginProcessingUrl = parser.getLoginProcessingUrl();
+
+			List<Element> attrExElts = DomUtils.getChildElementsByTagName(openIDLoginElt,
+					Elements.OPENID_ATTRIBUTE_EXCHANGE);
+
+			if (!attrExElts.isEmpty()) {
+				// Set up the consumer with the required attribute list
+				BeanDefinitionBuilder consumerBldr = BeanDefinitionBuilder
+						.rootBeanDefinition(OPEN_ID_CONSUMER_CLASS);
+				BeanDefinitionBuilder axFactory = BeanDefinitionBuilder
+						.rootBeanDefinition(OPEN_ID_ATTRIBUTE_FACTORY_CLASS);
+				ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<String, ManagedList<BeanDefinition>>();
+
+				for (Element attrExElt : attrExElts) {
+					String identifierMatch = attrExElt.getAttribute("identifier-match");
+
+					if (!StringUtils.hasText(identifierMatch)) {
+						if (attrExElts.size() > 1) {
+							pc.getReaderContext().error(
+									"You must supply an identifier-match attribute if using more"
+											+ " than one "
+											+ Elements.OPENID_ATTRIBUTE_EXCHANGE
+											+ " element", attrExElt);
+						}
+						// Match anything
+						identifierMatch = ".*";
+					}
+
+					axMap.put(identifierMatch, parseOpenIDAttributes(attrExElt));
+				}
+				axFactory.addConstructorArgValue(axMap);
+
+				consumerBldr.addConstructorArgValue(axFactory.getBeanDefinition());
+				openIDFilter.getPropertyValues().addPropertyValue("consumer",
+						consumerBldr.getBeanDefinition());
+			}
+		}
+
+		if (openIDFilter != null) {
+			openIDFilter.getPropertyValues().addPropertyValue("allowSessionCreation",
+					allowSessionCreation);
+			openIDFilter.getPropertyValues().addPropertyValue("authenticationManager",
+					authManager);
+			// Required by login page filter
+			openIDFilterId = pc.getReaderContext().generateBeanName(openIDFilter);
+			pc.registerBeanComponent(new BeanComponentDefinition(openIDFilter,
+					openIDFilterId));
+			injectRememberMeServicesRef(openIDFilter, rememberMeServicesId);
+
+			createOpenIDProvider();
+		}
+	}
+
+	private ManagedList<BeanDefinition> parseOpenIDAttributes(Element attrExElt) {
+		ManagedList<BeanDefinition> attributes = new ManagedList<BeanDefinition>();
+		for (Element attElt : DomUtils.getChildElementsByTagName(attrExElt,
+				Elements.OPENID_ATTRIBUTE)) {
+			String name = attElt.getAttribute("name");
+			String type = attElt.getAttribute("type");
+			String required = attElt.getAttribute("required");
+			String count = attElt.getAttribute("count");
+			BeanDefinitionBuilder attrBldr = BeanDefinitionBuilder
+					.rootBeanDefinition(OPEN_ID_ATTRIBUTE_CLASS);
+			attrBldr.addConstructorArgValue(name);
+			attrBldr.addConstructorArgValue(type);
+			if (StringUtils.hasLength(required)) {
+				attrBldr.addPropertyValue("required", Boolean.valueOf(required));
+			}
+
+			if (StringUtils.hasLength(count)) {
+				attrBldr.addPropertyValue("count", Integer.parseInt(count));
+			}
+			attributes.add(attrBldr.getBeanDefinition());
+		}
+
+		return attributes;
+	}
+
+	private void createOpenIDProvider() {
+		Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.OPENID_LOGIN);
+		BeanDefinitionBuilder openIDProviderBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(OPEN_ID_AUTHENTICATION_PROVIDER_CLASS);
+
+		RootBeanDefinition uds = new RootBeanDefinition();
+		uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
+		uds.setFactoryMethodName("authenticationUserDetailsService");
+		uds.getConstructorArgumentValues().addGenericArgumentValue(
+				openIDLoginElt.getAttribute(ATT_USER_SERVICE_REF));
+
+		openIDProviderBuilder.addPropertyValue("authenticationUserDetailsService", uds);
+
+		BeanDefinition openIDProvider = openIDProviderBuilder.getBeanDefinition();
+		openIDProviderRef = new RuntimeBeanReference(pc.getReaderContext()
+				.registerWithGeneratedName(openIDProvider));
+	}
+
+	private void injectRememberMeServicesRef(RootBeanDefinition bean,
+			String rememberMeServicesId) {
+		if (rememberMeServicesId != null) {
+			bean.getPropertyValues().addPropertyValue("rememberMeServices",
+					new RuntimeBeanReference(rememberMeServicesId));
+		}
+	}
+
+	void createBasicFilter(BeanReference authManager) {
+		Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.BASIC_AUTH);
+
+		if (basicAuthElt == null && !autoConfig) {
+			// No basic auth, do nothing
+			return;
+		}
+
+		String realm = httpElt.getAttribute(ATT_REALM);
+		if (!StringUtils.hasText(realm)) {
+			realm = DEF_REALM;
+		}
+
+		BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(BasicAuthenticationFilter.class);
+
+		String entryPointId;
+
+		if (basicAuthElt != null) {
+			if (StringUtils.hasText(basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF))) {
+				basicEntryPoint = new RuntimeBeanReference(
+						basicAuthElt.getAttribute(ATT_ENTRY_POINT_REF));
+			}
+
+			injectAuthenticationDetailsSource(basicAuthElt, filterBuilder);
+
+		}
+
+		if (basicEntryPoint == null) {
+			RootBeanDefinition entryPoint = new RootBeanDefinition(
+					BasicAuthenticationEntryPoint.class);
+			entryPoint.setSource(pc.extractSource(httpElt));
+			entryPoint.getPropertyValues().addPropertyValue("realmName", realm);
+			entryPointId = pc.getReaderContext().generateBeanName(entryPoint);
+			pc.registerBeanComponent(new BeanComponentDefinition(entryPoint, entryPointId));
+			basicEntryPoint = new RuntimeBeanReference(entryPointId);
+		}
+
+		filterBuilder.addConstructorArgValue(authManager);
+		filterBuilder.addConstructorArgValue(basicEntryPoint);
+		basicFilter = filterBuilder.getBeanDefinition();
+	}
+
+	void createX509Filter(BeanReference authManager) {
+		Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509);
+		RootBeanDefinition filter = null;
+
+		if (x509Elt != null) {
+			BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(X509AuthenticationFilter.class);
+			filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(x509Elt));
+			filterBuilder.addPropertyValue("authenticationManager", authManager);
+
+			String regex = x509Elt.getAttribute("subject-principal-regex");
+
+			if (StringUtils.hasText(regex)) {
+				BeanDefinitionBuilder extractor = BeanDefinitionBuilder
+						.rootBeanDefinition(SubjectDnX509PrincipalExtractor.class);
+				extractor.addPropertyValue("subjectDnRegex", regex);
+
+				filterBuilder.addPropertyValue("principalExtractor",
+						extractor.getBeanDefinition());
+			}
+
+			injectAuthenticationDetailsSource(x509Elt, filterBuilder);
+
+			filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
+			createPrauthEntryPoint(x509Elt);
+
+			createX509Provider();
+		}
+
+		x509Filter = filter;
+	}
+
+	private void injectAuthenticationDetailsSource(Element elt,
+			BeanDefinitionBuilder filterBuilder) {
+		String authDetailsSourceRef = elt
+				.getAttribute(AuthenticationConfigBuilder.ATT_AUTH_DETAILS_SOURCE_REF);
+
+		if (StringUtils.hasText(authDetailsSourceRef)) {
+			filterBuilder.addPropertyReference("authenticationDetailsSource",
+					authDetailsSourceRef);
+		}
+	}
+
+	private void createX509Provider() {
+		Element x509Elt = DomUtils.getChildElementByTagName(httpElt, Elements.X509);
+		BeanDefinition provider = new RootBeanDefinition(
+				PreAuthenticatedAuthenticationProvider.class);
+
+		RootBeanDefinition uds = new RootBeanDefinition();
+		uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
+		uds.setFactoryMethodName("authenticationUserDetailsService");
+		uds.getConstructorArgumentValues().addGenericArgumentValue(
+				x509Elt.getAttribute(ATT_USER_SERVICE_REF));
+
+		provider.getPropertyValues().addPropertyValue(
+				"preAuthenticatedUserDetailsService", uds);
+
+		x509ProviderRef = new RuntimeBeanReference(pc.getReaderContext()
+				.registerWithGeneratedName(provider));
+	}
+
+	private void createPrauthEntryPoint(Element source) {
+		if (preAuthEntryPoint == null) {
+			preAuthEntryPoint = new RootBeanDefinition(Http403ForbiddenEntryPoint.class);
+			preAuthEntryPoint.setSource(pc.extractSource(source));
+		}
+	}
+
+	void createJeeFilter(BeanReference authManager) {
+		final String ATT_MAPPABLE_ROLES = "mappable-roles";
+
+		Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE);
+		RootBeanDefinition filter = null;
+
+		if (jeeElt != null) {
+			BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(J2eePreAuthenticatedProcessingFilter.class);
+			filterBuilder.getRawBeanDefinition().setSource(pc.extractSource(jeeElt));
+			filterBuilder.addPropertyValue("authenticationManager", authManager);
+
+			BeanDefinitionBuilder adsBldr = BeanDefinitionBuilder
+					.rootBeanDefinition(J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.class);
+			adsBldr.addPropertyValue("userRoles2GrantedAuthoritiesMapper",
+					new RootBeanDefinition(
+							SimpleAttributes2GrantedAuthoritiesMapper.class));
+
+			String roles = jeeElt.getAttribute(ATT_MAPPABLE_ROLES);
+			Assert.state(StringUtils.hasText(roles));
+			BeanDefinitionBuilder rolesBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(StringUtils.class);
+			rolesBuilder.addConstructorArgValue(roles);
+			rolesBuilder.setFactoryMethod("commaDelimitedListToSet");
+
+			RootBeanDefinition mappableRolesRetriever = new RootBeanDefinition(
+					SimpleMappableAttributesRetriever.class);
+			mappableRolesRetriever.getPropertyValues().addPropertyValue(
+					"mappableAttributes", rolesBuilder.getBeanDefinition());
+			adsBldr.addPropertyValue("mappableRolesRetriever", mappableRolesRetriever);
+			filterBuilder.addPropertyValue("authenticationDetailsSource",
+					adsBldr.getBeanDefinition());
+
+			filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
+
+			createPrauthEntryPoint(jeeElt);
+			createJeeProvider();
+		}
+
+		jeeFilter = filter;
+	}
+
+	private void createJeeProvider() {
+		Element jeeElt = DomUtils.getChildElementByTagName(httpElt, Elements.JEE);
+		BeanDefinition provider = new RootBeanDefinition(
+				PreAuthenticatedAuthenticationProvider.class);
+
+		RootBeanDefinition uds;
+		if (StringUtils.hasText(jeeElt.getAttribute(ATT_USER_SERVICE_REF))) {
+			uds = new RootBeanDefinition();
+			uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
+			uds.setFactoryMethodName("authenticationUserDetailsService");
+			uds.getConstructorArgumentValues().addGenericArgumentValue(
+					jeeElt.getAttribute(ATT_USER_SERVICE_REF));
+		}
+		else {
+			uds = new RootBeanDefinition(
+					PreAuthenticatedGrantedAuthoritiesUserDetailsService.class);
+		}
+
+		provider.getPropertyValues().addPropertyValue(
+				"preAuthenticatedUserDetailsService", uds);
+
+		jeeProviderRef = new RuntimeBeanReference(pc.getReaderContext()
+				.registerWithGeneratedName(provider));
+	}
+
+	void createLoginPageFilterIfNeeded() {
+		boolean needLoginPage = formFilterId != null || openIDFilterId != null;
+		String formLoginPage = getLoginFormUrl(formEntryPoint);
+		String openIDLoginPage = getLoginFormUrl(openIDEntryPoint);
+
+		// If no login page has been defined, add in the default page generator.
+		if (needLoginPage && formLoginPage == null && openIDLoginPage == null) {
+			logger.info("No login page configured. The default internal one will be used. Use the '"
+					+ FormLoginBeanDefinitionParser.ATT_LOGIN_PAGE
+					+ "' attribute to set the URL of the login page.");
+			BeanDefinitionBuilder loginPageFilter = BeanDefinitionBuilder
+					.rootBeanDefinition(DefaultLoginPageGeneratingFilter.class);
+
+			if (formFilterId != null) {
+				loginPageFilter.addConstructorArgReference(formFilterId);
+				loginPageFilter.addPropertyValue("authenticationUrl", loginProcessingUrl);
+			}
+
+			if (openIDFilterId != null) {
+				loginPageFilter.addConstructorArgReference(openIDFilterId);
+				loginPageFilter.addPropertyValue("openIDauthenticationUrl",
+						openidLoginProcessingUrl);
+			}
+
+			loginPageGenerationFilter = loginPageFilter.getBeanDefinition();
+		}
+	}
+
+	void createLogoutFilter() {
+		Element logoutElt = DomUtils.getChildElementByTagName(httpElt, Elements.LOGOUT);
+		if (logoutElt != null || autoConfig) {
+			String formLoginPage = getLoginFormUrl(formEntryPoint);
+			if (formLoginPage == null) {
+				formLoginPage = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL;
+			}
+			LogoutBeanDefinitionParser logoutParser = new LogoutBeanDefinitionParser(
+					formLoginPage, rememberMeServicesId, csrfLogoutHandler);
+			logoutFilter = logoutParser.parse(logoutElt, pc);
+			logoutHandlers = logoutParser.getLogoutHandlers();
+		}
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	ManagedList getLogoutHandlers() {
+		if (logoutHandlers == null && rememberMeProviderRef != null) {
+			logoutHandlers = new ManagedList();
+			if (csrfLogoutHandler != null) {
+				logoutHandlers.add(csrfLogoutHandler);
+			}
+			logoutHandlers.add(new RuntimeBeanReference(rememberMeServicesId));
+			logoutHandlers
+					.add(new RootBeanDefinition(SecurityContextLogoutHandler.class));
+		}
+
+		return logoutHandlers;
+	}
+
+	BeanMetadataElement getEntryPointBean() {
+		return mainEntryPoint;
+	}
+
+	BeanMetadataElement getAccessDeniedHandlerBean() {
+		return accessDeniedHandler;
+	}
+
+	void createAnonymousFilter() {
+		Element anonymousElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.ANONYMOUS);
+
+		if (anonymousElt != null && "false".equals(anonymousElt.getAttribute("enabled"))) {
+			return;
+		}
+
+		String grantedAuthority = null;
+		String username = null;
+		String key = null;
+		Object source = pc.extractSource(httpElt);
+
+		if (anonymousElt != null) {
+			grantedAuthority = anonymousElt.getAttribute("granted-authority");
+			username = anonymousElt.getAttribute("username");
+			key = anonymousElt.getAttribute(ATT_KEY);
+			source = pc.extractSource(anonymousElt);
+		}
+
+		if (!StringUtils.hasText(grantedAuthority)) {
+			grantedAuthority = "ROLE_ANONYMOUS";
+		}
+
+		if (!StringUtils.hasText(username)) {
+			username = "anonymousUser";
+		}
+
+		if (!StringUtils.hasText(key)) {
+			// Generate a random key for the Anonymous provider
+			key = createKey();
+		}
+
+		anonymousFilter = new RootBeanDefinition(AnonymousAuthenticationFilter.class);
+		anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(0, key);
+		anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(1,
+				username);
+		anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(2,
+				AuthorityUtils.commaSeparatedStringToAuthorityList(grantedAuthority));
+		anonymousFilter.setSource(source);
+
+		RootBeanDefinition anonymousProviderBean = new RootBeanDefinition(
+				AnonymousAuthenticationProvider.class);
+		anonymousProviderBean.getConstructorArgumentValues().addIndexedArgumentValue(0,
+				key);
+		anonymousProviderBean.setSource(anonymousFilter.getSource());
+		String id = pc.getReaderContext().generateBeanName(anonymousProviderBean);
+		pc.registerBeanComponent(new BeanComponentDefinition(anonymousProviderBean, id));
+
+		anonymousProviderRef = new RuntimeBeanReference(id);
+
+	}
+
+	private String createKey() {
+		SecureRandom random = new SecureRandom();
+		return Long.toString(random.nextLong());
+	}
+
+	void createExceptionTranslationFilter() {
+		BeanDefinitionBuilder etfBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(ExceptionTranslationFilter.class);
+		accessDeniedHandler = createAccessDeniedHandler(httpElt, pc);
+		etfBuilder.addPropertyValue("accessDeniedHandler", accessDeniedHandler);
+		assert requestCache != null;
+		mainEntryPoint = selectEntryPoint();
+		etfBuilder.addConstructorArgValue(mainEntryPoint);
+		etfBuilder.addConstructorArgValue(requestCache);
+
+		etf = etfBuilder.getBeanDefinition();
+	}
+
+	private BeanMetadataElement createAccessDeniedHandler(Element element,
+			ParserContext pc) {
+		Element accessDeniedElt = DomUtils.getChildElementByTagName(element,
+				Elements.ACCESS_DENIED_HANDLER);
+		BeanDefinitionBuilder accessDeniedHandler = BeanDefinitionBuilder
+				.rootBeanDefinition(AccessDeniedHandlerImpl.class);
+
+		if (accessDeniedElt != null) {
+			String errorPage = accessDeniedElt.getAttribute("error-page");
+			String ref = accessDeniedElt.getAttribute("ref");
+
+			if (StringUtils.hasText(errorPage)) {
+				if (StringUtils.hasText(ref)) {
+					pc.getReaderContext()
+							.error("The attribute "
+									+ ATT_ACCESS_DENIED_ERROR_PAGE
+									+ " cannot be used together with the 'ref' attribute within <"
+									+ Elements.ACCESS_DENIED_HANDLER + ">",
+									pc.extractSource(accessDeniedElt));
+
+				}
+				accessDeniedHandler.addPropertyValue("errorPage", errorPage);
+			}
+			else if (StringUtils.hasText(ref)) {
+				return new RuntimeBeanReference(ref);
+			}
+
+		}
+
+		return accessDeniedHandler.getBeanDefinition();
+	}
+
+	private BeanMetadataElement selectEntryPoint() {
+		// We need to establish the main entry point.
+		// First check if a custom entry point bean is set
+		String customEntryPoint = httpElt.getAttribute(ATT_ENTRY_POINT_REF);
+
+		if (StringUtils.hasText(customEntryPoint)) {
+			return new RuntimeBeanReference(customEntryPoint);
+		}
+
+		Element basicAuthElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.BASIC_AUTH);
+		Element formLoginElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.FORM_LOGIN);
+		Element openIDLoginElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.OPENID_LOGIN);
+		// Basic takes precedence if explicit element is used and no others are configured
+		if (basicAuthElt != null && formLoginElt == null && openIDLoginElt == null) {
+			return basicEntryPoint;
+		}
+
+		// If formLogin has been enabled either through an element or auto-config, then it
+		// is used if no openID login page
+		// has been set.
+		String formLoginPage = getLoginFormUrl(formEntryPoint);
+		String openIDLoginPage = getLoginFormUrl(openIDEntryPoint);
+
+		if (formLoginPage != null && openIDLoginPage != null) {
+			pc.getReaderContext().error(
+					"Only one login-page can be defined, either for OpenID or form-login, "
+							+ "but not both.", pc.extractSource(openIDLoginElt));
+		}
+
+		if (formFilterId != null && openIDLoginPage == null) {
+			return formEntryPoint;
+		}
+
+		// Otherwise use OpenID if enabled
+		if (openIDFilterId != null) {
+			return openIDEntryPoint;
+		}
+
+		// If X.509 or JEE have been enabled, use the preauth entry point.
+		if (preAuthEntryPoint != null) {
+			return preAuthEntryPoint;
+		}
+
+		pc.getReaderContext()
+				.error("No AuthenticationEntryPoint could be established. Please "
+						+ "make sure you have a login mechanism configured through the namespace (such as form-login) or "
+						+ "specify a custom AuthenticationEntryPoint with the '"
+						+ ATT_ENTRY_POINT_REF + "' attribute ", pc.extractSource(httpElt));
+		return null;
+	}
+
+	private String getLoginFormUrl(BeanDefinition entryPoint) {
+		if (entryPoint == null) {
+			return null;
+		}
+
+		ConstructorArgumentValues cavs = entryPoint.getConstructorArgumentValues();
+		ValueHolder vh = cavs.getIndexedArgumentValue(0, String.class);
+		if (vh == null) {
+			return null;
+		}
+
+		// If the login URL is the default one, then it is assumed not to have been set
+		// explicitly
+		if (DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL.equals(vh.getValue())) {
+			return null;
+		}
+
+		return (String) vh.getValue();
+	}
+
+	private void createUserDetailsServiceFactory() {
+		if (pc.getRegistry().containsBeanDefinition(BeanIds.USER_DETAILS_SERVICE_FACTORY)) {
+			// Multiple <http> case
+			return;
+		}
+		RootBeanDefinition bean = new RootBeanDefinition(
+				UserDetailsServiceFactoryBean.class);
+		bean.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		pc.registerBeanComponent(new BeanComponentDefinition(bean,
+				BeanIds.USER_DETAILS_SERVICE_FACTORY));
+	}
+
+	List<OrderDecorator> getFilters() {
+		List<OrderDecorator> filters = new ArrayList<OrderDecorator>();
+
+		if (anonymousFilter != null) {
+			filters.add(new OrderDecorator(anonymousFilter, ANONYMOUS_FILTER));
+		}
+
+		if (rememberMeFilter != null) {
+			filters.add(new OrderDecorator(rememberMeFilter, REMEMBER_ME_FILTER));
+		}
+
+		if (logoutFilter != null) {
+			filters.add(new OrderDecorator(logoutFilter, LOGOUT_FILTER));
+		}
+
+		if (x509Filter != null) {
+			filters.add(new OrderDecorator(x509Filter, X509_FILTER));
+		}
+
+		if (jeeFilter != null) {
+			filters.add(new OrderDecorator(jeeFilter, PRE_AUTH_FILTER));
+		}
+
+		if (formFilterId != null) {
+			filters.add(new OrderDecorator(new RuntimeBeanReference(formFilterId),
+					FORM_LOGIN_FILTER));
+		}
+
+		if (openIDFilterId != null) {
+			filters.add(new OrderDecorator(new RuntimeBeanReference(openIDFilterId),
+					OPENID_FILTER));
+		}
+
+		if (loginPageGenerationFilter != null) {
+			filters.add(new OrderDecorator(loginPageGenerationFilter, LOGIN_PAGE_FILTER));
+		}
+
+		if (basicFilter != null) {
+			filters.add(new OrderDecorator(basicFilter, BASIC_AUTH_FILTER));
+		}
+
+		filters.add(new OrderDecorator(etf, EXCEPTION_TRANSLATION_FILTER));
+
+		return filters;
+	}
+
+	List<BeanReference> getProviders() {
+		List<BeanReference> providers = new ArrayList<BeanReference>();
+
+		if (anonymousProviderRef != null) {
+			providers.add(anonymousProviderRef);
+		}
+
+		if (rememberMeProviderRef != null) {
+			providers.add(rememberMeProviderRef);
+		}
+
+		if (openIDProviderRef != null) {
+			providers.add(openIDProviderRef);
+		}
+
+		if (x509ProviderRef != null) {
+			providers.add(x509ProviderRef);
+		}
+
+		if (jeeProviderRef != null) {
+			providers.add(jeeProviderRef);
+		}
+
+		return providers;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/ChannelAttributeFactory.java b/config/src/main/java/org/springframework/security/config/http/ChannelAttributeFactory.java
index 66e811f6b1..d69ab55a79 100644
--- a/config/src/main/java/org/springframework/security/config/http/ChannelAttributeFactory.java
+++ b/config/src/main/java/org/springframework/security/config/http/ChannelAttributeFactory.java
@@ -8,29 +8,34 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.web.access.channel.ChannelDecisionManagerImpl;
 
 /**
- * Used as a factory bean to create config attribute values for the <tt>requires-channel</tt> attribute.
+ * Used as a factory bean to create config attribute values for the
+ * <tt>requires-channel</tt> attribute.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class ChannelAttributeFactory {
-    private static final String OPT_REQUIRES_HTTP = "http";
-    private static final String OPT_REQUIRES_HTTPS = "https";
-    private static final String OPT_ANY_CHANNEL = "any";
+	private static final String OPT_REQUIRES_HTTP = "http";
+	private static final String OPT_REQUIRES_HTTPS = "https";
+	private static final String OPT_ANY_CHANNEL = "any";
 
-    public static List<ConfigAttribute> createChannelAttributes(String requiredChannel) {
-        String channelConfigAttribute;
+	public static List<ConfigAttribute> createChannelAttributes(String requiredChannel) {
+		String channelConfigAttribute;
 
-        if (requiredChannel.equals(OPT_REQUIRES_HTTPS)) {
-            channelConfigAttribute = "REQUIRES_SECURE_CHANNEL";
-        } else if (requiredChannel.equals(OPT_REQUIRES_HTTP)) {
-            channelConfigAttribute = "REQUIRES_INSECURE_CHANNEL";
-        } else if (requiredChannel.equals(OPT_ANY_CHANNEL)) {
-            channelConfigAttribute = ChannelDecisionManagerImpl.ANY_CHANNEL;
-        } else {
-            throw new BeanCreationException("Unknown channel attribute " + requiredChannel);
-        }
+		if (requiredChannel.equals(OPT_REQUIRES_HTTPS)) {
+			channelConfigAttribute = "REQUIRES_SECURE_CHANNEL";
+		}
+		else if (requiredChannel.equals(OPT_REQUIRES_HTTP)) {
+			channelConfigAttribute = "REQUIRES_INSECURE_CHANNEL";
+		}
+		else if (requiredChannel.equals(OPT_ANY_CHANNEL)) {
+			channelConfigAttribute = ChannelDecisionManagerImpl.ANY_CHANNEL;
+		}
+		else {
+			throw new BeanCreationException("Unknown channel attribute "
+					+ requiredChannel);
+		}
 
-        return SecurityConfig.createList(channelConfigAttribute);
-    }
+		return SecurityConfig.createList(channelConfigAttribute);
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java
index 4455cc1595..19dadf5605 100644
--- a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java
@@ -47,102 +47,119 @@ import org.w3c.dom.Element;
  */
 public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
 
-    private static final String REQUEST_DATA_VALUE_PROCESSOR = "requestDataValueProcessor";
-    private static final String DISPATCHER_SERVLET_CLASS_NAME = "org.springframework.web.servlet.DispatcherServlet";
-    private static final String ATT_MATCHER = "request-matcher-ref";
-    private static final String ATT_REPOSITORY = "token-repository-ref";
+	private static final String REQUEST_DATA_VALUE_PROCESSOR = "requestDataValueProcessor";
+	private static final String DISPATCHER_SERVLET_CLASS_NAME = "org.springframework.web.servlet.DispatcherServlet";
+	private static final String ATT_MATCHER = "request-matcher-ref";
+	private static final String ATT_REPOSITORY = "token-repository-ref";
 
-    private String csrfRepositoryRef;
-    private BeanDefinition csrfFilter;
+	private String csrfRepositoryRef;
+	private BeanDefinition csrfFilter;
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        boolean disabled = element != null && "true".equals(element.getAttribute("disabled"));
-        if(disabled) {
-            return null;
-        }
-        boolean webmvcPresent = ClassUtils.isPresent(DISPATCHER_SERVLET_CLASS_NAME, getClass().getClassLoader());
-        if(webmvcPresent) {
-            RootBeanDefinition beanDefinition = new RootBeanDefinition(CsrfRequestDataValueProcessor.class);
-            BeanComponentDefinition componentDefinition =
-                    new BeanComponentDefinition(beanDefinition, REQUEST_DATA_VALUE_PROCESSOR);
-            pc.registerBeanComponent(componentDefinition);
-        }
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		boolean disabled = element != null
+				&& "true".equals(element.getAttribute("disabled"));
+		if (disabled) {
+			return null;
+		}
+		boolean webmvcPresent = ClassUtils.isPresent(DISPATCHER_SERVLET_CLASS_NAME,
+				getClass().getClassLoader());
+		if (webmvcPresent) {
+			RootBeanDefinition beanDefinition = new RootBeanDefinition(
+					CsrfRequestDataValueProcessor.class);
+			BeanComponentDefinition componentDefinition = new BeanComponentDefinition(
+					beanDefinition, REQUEST_DATA_VALUE_PROCESSOR);
+			pc.registerBeanComponent(componentDefinition);
+		}
 
-        String matcherRef = null;
-        if(element != null) {
-            csrfRepositoryRef = element.getAttribute(ATT_REPOSITORY);
-            matcherRef = element.getAttribute(ATT_MATCHER);
-        }
+		String matcherRef = null;
+		if (element != null) {
+			csrfRepositoryRef = element.getAttribute(ATT_REPOSITORY);
+			matcherRef = element.getAttribute(ATT_MATCHER);
+		}
 
-        if(!StringUtils.hasText(csrfRepositoryRef)) {
-            RootBeanDefinition csrfTokenRepository = new RootBeanDefinition(HttpSessionCsrfTokenRepository.class);
-            csrfRepositoryRef = pc.getReaderContext().generateBeanName(csrfTokenRepository);
-            pc.registerBeanComponent(new BeanComponentDefinition(csrfTokenRepository, csrfRepositoryRef));
-        }
+		if (!StringUtils.hasText(csrfRepositoryRef)) {
+			RootBeanDefinition csrfTokenRepository = new RootBeanDefinition(
+					HttpSessionCsrfTokenRepository.class);
+			csrfRepositoryRef = pc.getReaderContext().generateBeanName(
+					csrfTokenRepository);
+			pc.registerBeanComponent(new BeanComponentDefinition(csrfTokenRepository,
+					csrfRepositoryRef));
+		}
 
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(CsrfFilter.class);
-        builder.addConstructorArgReference(csrfRepositoryRef);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(CsrfFilter.class);
+		builder.addConstructorArgReference(csrfRepositoryRef);
 
-        if(StringUtils.hasText(matcherRef)) {
-            builder.addPropertyReference("requireCsrfProtectionMatcher", matcherRef);
-        }
+		if (StringUtils.hasText(matcherRef)) {
+			builder.addPropertyReference("requireCsrfProtectionMatcher", matcherRef);
+		}
 
-        csrfFilter = builder.getBeanDefinition();
-        return csrfFilter;
-    }
+		csrfFilter = builder.getBeanDefinition();
+		return csrfFilter;
+	}
 
-    /**
-     * Populate the AccessDeniedHandler on the {@link CsrfFilter}
-     *
-     * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to use
-     * @param defaultDeniedHandler the {@link AccessDeniedHandler} to use
-     */
-    void initAccessDeniedHandler(BeanDefinition invalidSessionStrategy, BeanMetadataElement defaultDeniedHandler) {
-        BeanMetadataElement accessDeniedHandler = createAccessDeniedHandler(invalidSessionStrategy, defaultDeniedHandler);
-        csrfFilter.getPropertyValues().addPropertyValue("accessDeniedHandler", accessDeniedHandler);
-    }
+	/**
+	 * Populate the AccessDeniedHandler on the {@link CsrfFilter}
+	 *
+	 * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to use
+	 * @param defaultDeniedHandler the {@link AccessDeniedHandler} to use
+	 */
+	void initAccessDeniedHandler(BeanDefinition invalidSessionStrategy,
+			BeanMetadataElement defaultDeniedHandler) {
+		BeanMetadataElement accessDeniedHandler = createAccessDeniedHandler(
+				invalidSessionStrategy, defaultDeniedHandler);
+		csrfFilter.getPropertyValues().addPropertyValue("accessDeniedHandler",
+				accessDeniedHandler);
+	}
 
-    /**
-     * Creates the {@link AccessDeniedHandler} from the result of
-     * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} and
-     * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)}. If
-     * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)} is non-null, then
-     * a {@link DelegatingAccessDeniedHandler} is used in combination with
-     * {@link InvalidSessionAccessDeniedHandler} and the
-     * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)}. Otherwise,
-     * only {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} is used.
-     *
-     * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to use
-     * @param defaultDeniedHandler the {@link AccessDeniedHandler} to use
-     *
-     * @return the {@link BeanMetadataElement} that is the {@link AccessDeniedHandler} to populate on the {@link CsrfFilter}
-     */
-    private BeanMetadataElement createAccessDeniedHandler(BeanDefinition invalidSessionStrategy, BeanMetadataElement defaultDeniedHandler) {
-        if(invalidSessionStrategy == null) {
-            return defaultDeniedHandler;
-        }
-        ManagedMap<Class<? extends AccessDeniedException>,BeanDefinition> handlers =
-                new ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition>();
-        BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
-        invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy);
-        handlers.put(MissingCsrfTokenException.class, invalidSessionHandlerBldr.getBeanDefinition());
+	/**
+	 * Creates the {@link AccessDeniedHandler} from the result of
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} and
+	 * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)}. If
+	 * {@link #getInvalidSessionStrategy(HttpSecurityBuilder)} is non-null, then a
+	 * {@link DelegatingAccessDeniedHandler} is used in combination with
+	 * {@link InvalidSessionAccessDeniedHandler} and the
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)}. Otherwise, only
+	 * {@link #getDefaultAccessDeniedHandler(HttpSecurityBuilder)} is used.
+	 *
+	 * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to use
+	 * @param defaultDeniedHandler the {@link AccessDeniedHandler} to use
+	 *
+	 * @return the {@link BeanMetadataElement} that is the {@link AccessDeniedHandler} to
+	 * populate on the {@link CsrfFilter}
+	 */
+	private BeanMetadataElement createAccessDeniedHandler(
+			BeanDefinition invalidSessionStrategy,
+			BeanMetadataElement defaultDeniedHandler) {
+		if (invalidSessionStrategy == null) {
+			return defaultDeniedHandler;
+		}
+		ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition>();
+		BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
+		invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy);
+		handlers.put(MissingCsrfTokenException.class,
+				invalidSessionHandlerBldr.getBeanDefinition());
 
-        BeanDefinitionBuilder deniedBldr = BeanDefinitionBuilder.rootBeanDefinition(DelegatingAccessDeniedHandler.class);
-        deniedBldr.addConstructorArgValue(handlers);
-        deniedBldr.addConstructorArgValue(defaultDeniedHandler);
+		BeanDefinitionBuilder deniedBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(DelegatingAccessDeniedHandler.class);
+		deniedBldr.addConstructorArgValue(handlers);
+		deniedBldr.addConstructorArgValue(defaultDeniedHandler);
 
-        return deniedBldr.getBeanDefinition();
-    }
+		return deniedBldr.getBeanDefinition();
+	}
 
-    BeanDefinition getCsrfAuthenticationStrategy() {
-        BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder.rootBeanDefinition(CsrfAuthenticationStrategy.class);
-        csrfAuthenticationStrategy.addConstructorArgReference(csrfRepositoryRef);
-        return csrfAuthenticationStrategy.getBeanDefinition();
-    }
+	BeanDefinition getCsrfAuthenticationStrategy() {
+		BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder
+				.rootBeanDefinition(CsrfAuthenticationStrategy.class);
+		csrfAuthenticationStrategy.addConstructorArgReference(csrfRepositoryRef);
+		return csrfAuthenticationStrategy.getBeanDefinition();
+	}
 
-    BeanDefinition getCsrfLogoutHandler() {
-        BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder.rootBeanDefinition(CsrfLogoutHandler.class);
-        csrfAuthenticationStrategy.addConstructorArgReference(csrfRepositoryRef);
-        return csrfAuthenticationStrategy.getBeanDefinition();
-    }
+	BeanDefinition getCsrfLogoutHandler() {
+		BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder
+				.rootBeanDefinition(CsrfLogoutHandler.class);
+		csrfAuthenticationStrategy.addConstructorArgReference(csrfRepositoryRef);
+		return csrfAuthenticationStrategy.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
index 8af80aba8d..457d3d4666 100644
--- a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
+++ b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java
@@ -29,156 +29,180 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.security.web.util.matcher.AnyRequestMatcher;
 
 public class DefaultFilterChainValidator implements FilterChainProxy.FilterChainValidator {
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    public void validate(FilterChainProxy fcp) {
-        for(SecurityFilterChain filterChain : fcp.getFilterChains()) {
-            checkLoginPageIsntProtected(fcp, filterChain.getFilters());
-            checkFilterStack(filterChain.getFilters());
-        }
+	public void validate(FilterChainProxy fcp) {
+		for (SecurityFilterChain filterChain : fcp.getFilterChains()) {
+			checkLoginPageIsntProtected(fcp, filterChain.getFilters());
+			checkFilterStack(filterChain.getFilters());
+		}
 
-        checkPathOrder(new ArrayList<SecurityFilterChain>(fcp.getFilterChains()));
-        checkForDuplicateMatchers(new ArrayList<SecurityFilterChain>(fcp.getFilterChains()));
-    }
+		checkPathOrder(new ArrayList<SecurityFilterChain>(fcp.getFilterChains()));
+		checkForDuplicateMatchers(new ArrayList<SecurityFilterChain>(
+				fcp.getFilterChains()));
+	}
 
-    private void checkPathOrder(List<SecurityFilterChain> filterChains) {
-        // Check that the universal pattern is listed at the end, if at all
-        Iterator<SecurityFilterChain> chains = filterChains.iterator();
+	private void checkPathOrder(List<SecurityFilterChain> filterChains) {
+		// Check that the universal pattern is listed at the end, if at all
+		Iterator<SecurityFilterChain> chains = filterChains.iterator();
 
-        while (chains.hasNext()) {
-            RequestMatcher matcher = ((DefaultSecurityFilterChain)chains.next()).getRequestMatcher();
-            if (AnyRequestMatcher.INSTANCE.equals(matcher) && chains.hasNext()) {
-                throw new IllegalArgumentException("A universal match pattern ('/**') is defined " +
-                        " before other patterns in the filter chain, causing them to be ignored. Please check the " +
-                        "ordering in your <security:http> namespace or FilterChainProxy bean configuration");
-            }
-        }
-    }
+		while (chains.hasNext()) {
+			RequestMatcher matcher = ((DefaultSecurityFilterChain) chains.next())
+					.getRequestMatcher();
+			if (AnyRequestMatcher.INSTANCE.equals(matcher) && chains.hasNext()) {
+				throw new IllegalArgumentException(
+						"A universal match pattern ('/**') is defined "
+								+ " before other patterns in the filter chain, causing them to be ignored. Please check the "
+								+ "ordering in your <security:http> namespace or FilterChainProxy bean configuration");
+			}
+		}
+	}
 
-    private void checkForDuplicateMatchers(List<SecurityFilterChain> chains) {
+	private void checkForDuplicateMatchers(List<SecurityFilterChain> chains) {
 
-        while (chains.size() > 1) {
-            DefaultSecurityFilterChain chain = (DefaultSecurityFilterChain)chains.remove(0);
+		while (chains.size() > 1) {
+			DefaultSecurityFilterChain chain = (DefaultSecurityFilterChain) chains
+					.remove(0);
 
-            for (SecurityFilterChain test : chains) {
-                if (chain.getRequestMatcher().equals(((DefaultSecurityFilterChain)test).getRequestMatcher())) {
-                    throw new IllegalArgumentException("The FilterChainProxy contains two filter chains using the" +
-                            " matcher " + chain.getRequestMatcher() + ". If you are using multiple <http> namespace " +
-                            "elements, you must use a 'pattern' attribute to define the request patterns to which they apply.");
-                }
-            }
-        }
-    }
+			for (SecurityFilterChain test : chains) {
+				if (chain.getRequestMatcher().equals(
+						((DefaultSecurityFilterChain) test).getRequestMatcher())) {
+					throw new IllegalArgumentException(
+							"The FilterChainProxy contains two filter chains using the"
+									+ " matcher "
+									+ chain.getRequestMatcher()
+									+ ". If you are using multiple <http> namespace "
+									+ "elements, you must use a 'pattern' attribute to define the request patterns to which they apply.");
+				}
+			}
+		}
+	}
 
-    @SuppressWarnings({"unchecked"})
-    private <F extends Filter> F getFilter(Class<F> type, List<Filter> filters) {
-        for (Filter f : filters) {
-            if (type.isAssignableFrom(f.getClass())) {
-                return (F) f;
-            }
-        }
+	@SuppressWarnings({ "unchecked" })
+	private <F extends Filter> F getFilter(Class<F> type, List<Filter> filters) {
+		for (Filter f : filters) {
+			if (type.isAssignableFrom(f.getClass())) {
+				return (F) f;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Checks the filter list for possible errors and logs them
-     */
-    private void checkFilterStack(List<Filter> filters) {
-        checkForDuplicates(SecurityContextPersistenceFilter.class, filters);
-        checkForDuplicates(UsernamePasswordAuthenticationFilter.class, filters);
-        checkForDuplicates(SessionManagementFilter.class, filters);
-        checkForDuplicates(BasicAuthenticationFilter.class, filters);
-        checkForDuplicates(SecurityContextHolderAwareRequestFilter.class, filters);
-        checkForDuplicates(JaasApiIntegrationFilter.class, filters);
-        checkForDuplicates(ExceptionTranslationFilter.class, filters);
-        checkForDuplicates(FilterSecurityInterceptor.class, filters);
-    }
+	/**
+	 * Checks the filter list for possible errors and logs them
+	 */
+	private void checkFilterStack(List<Filter> filters) {
+		checkForDuplicates(SecurityContextPersistenceFilter.class, filters);
+		checkForDuplicates(UsernamePasswordAuthenticationFilter.class, filters);
+		checkForDuplicates(SessionManagementFilter.class, filters);
+		checkForDuplicates(BasicAuthenticationFilter.class, filters);
+		checkForDuplicates(SecurityContextHolderAwareRequestFilter.class, filters);
+		checkForDuplicates(JaasApiIntegrationFilter.class, filters);
+		checkForDuplicates(ExceptionTranslationFilter.class, filters);
+		checkForDuplicates(FilterSecurityInterceptor.class, filters);
+	}
 
-    private void checkForDuplicates(Class<? extends Filter> clazz, List<Filter> filters) {
-        for (int i=0; i < filters.size(); i++) {
-            Filter f1 = filters.get(i);
-            if (clazz.isAssignableFrom(f1.getClass())) {
-                // Found the first one, check remaining for another
-                for (int j=i+1; j < filters.size(); j++) {
-                    Filter f2 = filters.get(j);
-                    if (clazz.isAssignableFrom(f2.getClass())) {
-                        logger.warn("Possible error: Filters at position " + i + " and " + j + " are both " +
-                                "instances of " + clazz.getName());
-                        return;
-                    }
-                }
-            }
-        }
-    }
+	private void checkForDuplicates(Class<? extends Filter> clazz, List<Filter> filters) {
+		for (int i = 0; i < filters.size(); i++) {
+			Filter f1 = filters.get(i);
+			if (clazz.isAssignableFrom(f1.getClass())) {
+				// Found the first one, check remaining for another
+				for (int j = i + 1; j < filters.size(); j++) {
+					Filter f2 = filters.get(j);
+					if (clazz.isAssignableFrom(f2.getClass())) {
+						logger.warn("Possible error: Filters at position " + i + " and "
+								+ j + " are both " + "instances of " + clazz.getName());
+						return;
+					}
+				}
+			}
+		}
+	}
 
-    /* Checks for the common error of having a login page URL protected by the security interceptor */
-    private void checkLoginPageIsntProtected(FilterChainProxy fcp, List<Filter> filterStack) {
-        ExceptionTranslationFilter etf = getFilter(ExceptionTranslationFilter.class, filterStack);
+	/*
+	 * Checks for the common error of having a login page URL protected by the security
+	 * interceptor
+	 */
+	private void checkLoginPageIsntProtected(FilterChainProxy fcp,
+			List<Filter> filterStack) {
+		ExceptionTranslationFilter etf = getFilter(ExceptionTranslationFilter.class,
+				filterStack);
 
-        if(etf == null || !(etf.getAuthenticationEntryPoint() instanceof LoginUrlAuthenticationEntryPoint)) {
-            return;
-        }
+		if (etf == null
+				|| !(etf.getAuthenticationEntryPoint() instanceof LoginUrlAuthenticationEntryPoint)) {
+			return;
+		}
 
-        String loginPage = ((LoginUrlAuthenticationEntryPoint)etf.getAuthenticationEntryPoint()).getLoginFormUrl();
-        logger.info("Checking whether login URL '" + loginPage + "' is accessible with your configuration");
-        FilterInvocation loginRequest = new FilterInvocation(loginPage, "POST");
-        List<Filter> filters = null;
+		String loginPage = ((LoginUrlAuthenticationEntryPoint) etf
+				.getAuthenticationEntryPoint()).getLoginFormUrl();
+		logger.info("Checking whether login URL '" + loginPage
+				+ "' is accessible with your configuration");
+		FilterInvocation loginRequest = new FilterInvocation(loginPage, "POST");
+		List<Filter> filters = null;
 
-        try {
-            filters = fcp.getFilters(loginPage);
-        } catch (Exception e) {
-            // May happen legitimately if a filter-chain request matcher requires more request data than that provided
-            // by the dummy request used when creating the filter invocation.
-            logger.info("Failed to obtain filter chain information for the login page. Unable to complete check.");
-        }
+		try {
+			filters = fcp.getFilters(loginPage);
+		}
+		catch (Exception e) {
+			// May happen legitimately if a filter-chain request matcher requires more
+			// request data than that provided
+			// by the dummy request used when creating the filter invocation.
+			logger.info("Failed to obtain filter chain information for the login page. Unable to complete check.");
+		}
 
-        if (filters == null || filters.isEmpty()) {
-            logger.debug("Filter chain is empty for the login page");
-            return;
-        }
+		if (filters == null || filters.isEmpty()) {
+			logger.debug("Filter chain is empty for the login page");
+			return;
+		}
 
-        if (getFilter(DefaultLoginPageGeneratingFilter.class, filters) != null) {
-            logger.debug("Default generated login page is in use");
-            return;
-        }
+		if (getFilter(DefaultLoginPageGeneratingFilter.class, filters) != null) {
+			logger.debug("Default generated login page is in use");
+			return;
+		}
 
-        FilterSecurityInterceptor fsi = getFilter(FilterSecurityInterceptor.class, filters);
-        FilterInvocationSecurityMetadataSource fids =
-                fsi.getSecurityMetadataSource();
+		FilterSecurityInterceptor fsi = getFilter(FilterSecurityInterceptor.class,
+				filters);
+		FilterInvocationSecurityMetadataSource fids = fsi.getSecurityMetadataSource();
 
-        Collection<ConfigAttribute> attributes = fids.getAttributes(loginRequest);
+		Collection<ConfigAttribute> attributes = fids.getAttributes(loginRequest);
 
-        if (attributes == null) {
-            logger.debug("No access attributes defined for login page URL");
-            if (fsi.isRejectPublicInvocations()) {
-                logger.warn("FilterSecurityInterceptor is configured to reject public invocations." +
-                        " Your login page may not be accessible.");
-            }
-            return;
-        }
+		if (attributes == null) {
+			logger.debug("No access attributes defined for login page URL");
+			if (fsi.isRejectPublicInvocations()) {
+				logger.warn("FilterSecurityInterceptor is configured to reject public invocations."
+						+ " Your login page may not be accessible.");
+			}
+			return;
+		}
 
-        AnonymousAuthenticationFilter anonPF = getFilter(AnonymousAuthenticationFilter.class, filters);
-        if (anonPF == null) {
-            logger.warn("The login page is being protected by the filter chain, but you don't appear to have" +
-                    " anonymous authentication enabled. This is almost certainly an error.");
-            return;
-        }
+		AnonymousAuthenticationFilter anonPF = getFilter(
+				AnonymousAuthenticationFilter.class, filters);
+		if (anonPF == null) {
+			logger.warn("The login page is being protected by the filter chain, but you don't appear to have"
+					+ " anonymous authentication enabled. This is almost certainly an error.");
+			return;
+		}
 
-        // Simulate an anonymous access with the supplied attributes.
-        AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key", anonPF.getPrincipal(),
-                        anonPF.getAuthorities());
-        try {
-            fsi.getAccessDecisionManager().decide(token, loginRequest, attributes);
-        } catch (AccessDeniedException e) {
-            logger.warn("Anonymous access to the login page doesn't appear to be enabled. This is almost certainly " +
-                    "an error. Please check your configuration allows unauthenticated access to the configured " +
-                    "login page. (Simulated access was rejected: " + e + ")");
-        } catch (Exception e) {
-            // May happen legitimately if a filter-chain request matcher requires more request data than that provided
-            // by the dummy request used when creating the filter invocation. See SEC-1878
-            logger.info("Unable to check access to the login page to determine if anonymous access is allowed. This might be an error, but can happen under normal circumstances.", e);
-        }
-    }
+		// Simulate an anonymous access with the supplied attributes.
+		AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key",
+				anonPF.getPrincipal(), anonPF.getAuthorities());
+		try {
+			fsi.getAccessDecisionManager().decide(token, loginRequest, attributes);
+		}
+		catch (AccessDeniedException e) {
+			logger.warn("Anonymous access to the login page doesn't appear to be enabled. This is almost certainly "
+					+ "an error. Please check your configuration allows unauthenticated access to the configured "
+					+ "login page. (Simulated access was rejected: " + e + ")");
+		}
+		catch (Exception e) {
+			// May happen legitimately if a filter-chain request matcher requires more
+			// request data than that provided
+			// by the dummy request used when creating the filter invocation. See SEC-1878
+			logger.info(
+					"Unable to check access to the login page to determine if anonymous access is allowed. This might be an error, but can happen under normal circumstances.",
+					e);
+		}
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java
index d05cee3aa4..175500e546 100644
--- a/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java
@@ -19,37 +19,41 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class FilterChainBeanDefinitionParser implements BeanDefinitionParser {
-    private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
+	private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
 
-    public BeanDefinition parse(Element elt, ParserContext pc) {
-        MatcherType matcherType = MatcherType.fromElement(elt);
-        String path = elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN);
-        String requestMatcher = elt.getAttribute(ATT_REQUEST_MATCHER_REF);
-        String filters = elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS);
+	public BeanDefinition parse(Element elt, ParserContext pc) {
+		MatcherType matcherType = MatcherType.fromElement(elt);
+		String path = elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN);
+		String requestMatcher = elt.getAttribute(ATT_REQUEST_MATCHER_REF);
+		String filters = elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS);
 
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(DefaultSecurityFilterChain.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(DefaultSecurityFilterChain.class);
 
-        if (StringUtils.hasText(path)) {
-            Assert.isTrue(!StringUtils.hasText(requestMatcher), "");
-            builder.addConstructorArgValue(matcherType.createMatcher(path, null));
-        } else {
-            Assert.isTrue(StringUtils.hasText(requestMatcher), "");
-            builder.addConstructorArgReference(requestMatcher);
-        }
+		if (StringUtils.hasText(path)) {
+			Assert.isTrue(!StringUtils.hasText(requestMatcher), "");
+			builder.addConstructorArgValue(matcherType.createMatcher(path, null));
+		}
+		else {
+			Assert.isTrue(StringUtils.hasText(requestMatcher), "");
+			builder.addConstructorArgReference(requestMatcher);
+		}
 
-        if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {
-            builder.addConstructorArgValue(Collections.EMPTY_LIST);
-        } else {
-            String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ",");
-            ManagedList<RuntimeBeanReference> filterChain = new ManagedList<RuntimeBeanReference>(filterBeanNames.length);
+		if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {
+			builder.addConstructorArgValue(Collections.EMPTY_LIST);
+		}
+		else {
+			String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ",");
+			ManagedList<RuntimeBeanReference> filterChain = new ManagedList<RuntimeBeanReference>(
+					filterBeanNames.length);
 
-            for (String name : filterBeanNames) {
-                filterChain.add(new RuntimeBeanReference(name));
-            }
+			for (String name : filterBeanNames) {
+				filterChain.add(new RuntimeBeanReference(name));
+			}
 
-            builder.addConstructorArgValue(filterChain);
-        }
+			builder.addConstructorArgValue(filterChain);
+		}
 
-        return builder.getBeanDefinition();
-    }
+		return builder.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java
index e186660285..f414c6a625 100644
--- a/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java
+++ b/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java
@@ -28,56 +28,69 @@ import org.w3c.dom.Node;
  */
 public class FilterChainMapBeanDefinitionDecorator implements BeanDefinitionDecorator {
 
-    @SuppressWarnings("unchecked")
-    public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder holder, ParserContext parserContext) {
-        BeanDefinition filterChainProxy = holder.getBeanDefinition();
+	@SuppressWarnings("unchecked")
+	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder holder,
+			ParserContext parserContext) {
+		BeanDefinition filterChainProxy = holder.getBeanDefinition();
 
-        ManagedList<BeanMetadataElement> securityFilterChains = new ManagedList<BeanMetadataElement>();
-        Element elt = (Element)node;
+		ManagedList<BeanMetadataElement> securityFilterChains = new ManagedList<BeanMetadataElement>();
+		Element elt = (Element) node;
 
-        MatcherType matcherType = MatcherType.fromElement(elt);
+		MatcherType matcherType = MatcherType.fromElement(elt);
 
-        List<Element> filterChainElts = DomUtils.getChildElementsByTagName(elt, Elements.FILTER_CHAIN);
+		List<Element> filterChainElts = DomUtils.getChildElementsByTagName(elt,
+				Elements.FILTER_CHAIN);
 
-        for (Element chain : filterChainElts) {
-            String path = chain.getAttribute(HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN);
-            String filters = chain.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS);
+		for (Element chain : filterChainElts) {
+			String path = chain
+					.getAttribute(HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN);
+			String filters = chain
+					.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS);
 
-            if(!StringUtils.hasText(path)) {
-                parserContext.getReaderContext().error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN +
-                    "' must not be empty", elt);
-            }
+			if (!StringUtils.hasText(path)) {
+				parserContext.getReaderContext().error(
+						"The attribute '"
+								+ HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN
+								+ "' must not be empty", elt);
+			}
 
-            if(!StringUtils.hasText(filters)) {
-                parserContext.getReaderContext().error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS +
-                    "'must not be empty", elt);
-            }
+			if (!StringUtils.hasText(filters)) {
+				parserContext.getReaderContext().error(
+						"The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS
+								+ "'must not be empty", elt);
+			}
 
-            BeanDefinition matcher = matcherType.createMatcher(path, null);
+			BeanDefinition matcher = matcherType.createMatcher(path, null);
 
-            if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {
-                securityFilterChains.add(createSecurityFilterChain(matcher, new ManagedList(0)));
-            } else {
-                String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ",");
-                ManagedList filterChain = new ManagedList(filterBeanNames.length);
+			if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {
+				securityFilterChains.add(createSecurityFilterChain(matcher,
+						new ManagedList(0)));
+			}
+			else {
+				String[] filterBeanNames = StringUtils
+						.tokenizeToStringArray(filters, ",");
+				ManagedList filterChain = new ManagedList(filterBeanNames.length);
 
-                for (String name : filterBeanNames) {
-                    filterChain.add(new RuntimeBeanReference(name));
-                }
+				for (String name : filterBeanNames) {
+					filterChain.add(new RuntimeBeanReference(name));
+				}
 
-                securityFilterChains.add(createSecurityFilterChain(matcher, filterChain));
-            }
-        }
+				securityFilterChains.add(createSecurityFilterChain(matcher, filterChain));
+			}
+		}
 
-        filterChainProxy.getConstructorArgumentValues().addGenericArgumentValue(securityFilterChains);
+		filterChainProxy.getConstructorArgumentValues().addGenericArgumentValue(
+				securityFilterChains);
 
-        return holder;
-    }
+		return holder;
+	}
 
-    private BeanDefinition createSecurityFilterChain(BeanDefinition matcher, ManagedList<?> filters) {
-        BeanDefinitionBuilder sfc = BeanDefinitionBuilder.rootBeanDefinition(DefaultSecurityFilterChain.class);
-        sfc.addConstructorArgValue(matcher);
-        sfc.addConstructorArgValue(filters);
-        return sfc.getBeanDefinition();
-    }
+	private BeanDefinition createSecurityFilterChain(BeanDefinition matcher,
+			ManagedList<?> filters) {
+		BeanDefinitionBuilder sfc = BeanDefinitionBuilder
+				.rootBeanDefinition(DefaultSecurityFilterChain.class);
+		sfc.addConstructorArgValue(matcher);
+		sfc.addConstructorArgValue(filters);
+		return sfc.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
index a6851f21a7..b23adbfc50 100644
--- a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
@@ -23,141 +23,172 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Allows for convenient creation of a {@link FilterInvocationSecurityMetadataSource} bean for use with a FilterSecurityInterceptor.
+ * Allows for convenient creation of a {@link FilterInvocationSecurityMetadataSource} bean
+ * for use with a FilterSecurityInterceptor.
  *
  * @author Luke Taylor
  */
 public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinitionParser {
-    private static final String ATT_USE_EXPRESSIONS = "use-expressions";
-    private static final String ATT_HTTP_METHOD = "method";
-    private static final String ATT_PATTERN = "pattern";
-    private static final String ATT_ACCESS = "access";
-    private static final Log logger = LogFactory.getLog(FilterInvocationSecurityMetadataSourceParser.class);
+	private static final String ATT_USE_EXPRESSIONS = "use-expressions";
+	private static final String ATT_HTTP_METHOD = "method";
+	private static final String ATT_PATTERN = "pattern";
+	private static final String ATT_ACCESS = "access";
+	private static final Log logger = LogFactory
+			.getLog(FilterInvocationSecurityMetadataSourceParser.class);
 
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        List<Element> interceptUrls = DomUtils.getChildElementsByTagName(element, "intercept-url");
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		List<Element> interceptUrls = DomUtils.getChildElementsByTagName(element,
+				"intercept-url");
 
-        // Check for attributes that aren't allowed in this context
-        for(Element elt : interceptUrls) {
-            if (StringUtils.hasLength(elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL))) {
-                parserContext.getReaderContext().error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL + "' isn't allowed here.", elt);
-            }
+		// Check for attributes that aren't allowed in this context
+		for (Element elt : interceptUrls) {
+			if (StringUtils.hasLength(elt
+					.getAttribute(HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL))) {
+				parserContext.getReaderContext().error(
+						"The attribute '"
+								+ HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL
+								+ "' isn't allowed here.", elt);
+			}
 
-            if (StringUtils.hasLength(elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS))) {
-                parserContext.getReaderContext().error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS + "' isn't allowed here.", elt);
-            }
-        }
+			if (StringUtils.hasLength(elt
+					.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS))) {
+				parserContext.getReaderContext().error(
+						"The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS
+								+ "' isn't allowed here.", elt);
+			}
+		}
 
-        BeanDefinition mds = createSecurityMetadataSource(interceptUrls, false, element, parserContext);
+		BeanDefinition mds = createSecurityMetadataSource(interceptUrls, false, element,
+				parserContext);
 
-        String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
 
-        if (StringUtils.hasText(id)) {
-            parserContext.registerComponent(new BeanComponentDefinition(mds, id));
-            parserContext.getRegistry().registerBeanDefinition(id, mds);
-        }
+		if (StringUtils.hasText(id)) {
+			parserContext.registerComponent(new BeanComponentDefinition(mds, id));
+			parserContext.getRegistry().registerBeanDefinition(id, mds);
+		}
 
-        return mds;
-    }
+		return mds;
+	}
 
-    static RootBeanDefinition createSecurityMetadataSource(List<Element> interceptUrls, boolean addAllAuth, Element httpElt, ParserContext pc) {
-        MatcherType matcherType = MatcherType.fromElement(httpElt);
-        boolean useExpressions = isUseExpressions(httpElt);
+	static RootBeanDefinition createSecurityMetadataSource(List<Element> interceptUrls,
+			boolean addAllAuth, Element httpElt, ParserContext pc) {
+		MatcherType matcherType = MatcherType.fromElement(httpElt);
+		boolean useExpressions = isUseExpressions(httpElt);
 
-        ManagedMap<BeanDefinition, BeanDefinition> requestToAttributesMap = parseInterceptUrlsForFilterInvocationRequestMap(
-                matcherType, interceptUrls, useExpressions, addAllAuth, pc);
-        BeanDefinitionBuilder fidsBuilder;
+		ManagedMap<BeanDefinition, BeanDefinition> requestToAttributesMap = parseInterceptUrlsForFilterInvocationRequestMap(
+				matcherType, interceptUrls, useExpressions, addAllAuth, pc);
+		BeanDefinitionBuilder fidsBuilder;
 
-        if (useExpressions) {
-            Element expressionHandlerElt = DomUtils.getChildElementByTagName(httpElt, Elements.EXPRESSION_HANDLER);
-            String expressionHandlerRef = expressionHandlerElt == null ? null : expressionHandlerElt.getAttribute("ref");
+		if (useExpressions) {
+			Element expressionHandlerElt = DomUtils.getChildElementByTagName(httpElt,
+					Elements.EXPRESSION_HANDLER);
+			String expressionHandlerRef = expressionHandlerElt == null ? null
+					: expressionHandlerElt.getAttribute("ref");
 
-            if (StringUtils.hasText(expressionHandlerRef)) {
-                logger.info("Using bean '" + expressionHandlerRef + "' as web SecurityExpressionHandler implementation");
-            } else {
-                expressionHandlerRef = registerDefaultExpressionHandler(pc);
-            }
+			if (StringUtils.hasText(expressionHandlerRef)) {
+				logger.info("Using bean '" + expressionHandlerRef
+						+ "' as web SecurityExpressionHandler implementation");
+			}
+			else {
+				expressionHandlerRef = registerDefaultExpressionHandler(pc);
+			}
 
-            fidsBuilder = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
-            fidsBuilder.addConstructorArgValue(requestToAttributesMap);
-            fidsBuilder.addConstructorArgReference(expressionHandlerRef);
-        } else {
-            fidsBuilder = BeanDefinitionBuilder.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
-            fidsBuilder.addConstructorArgValue(requestToAttributesMap);
-        }
+			fidsBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
+			fidsBuilder.addConstructorArgValue(requestToAttributesMap);
+			fidsBuilder.addConstructorArgReference(expressionHandlerRef);
+		}
+		else {
+			fidsBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
+			fidsBuilder.addConstructorArgValue(requestToAttributesMap);
+		}
 
-        fidsBuilder.getRawBeanDefinition().setSource(pc.extractSource(httpElt));
+		fidsBuilder.getRawBeanDefinition().setSource(pc.extractSource(httpElt));
 
-        return (RootBeanDefinition) fidsBuilder.getBeanDefinition();
-    }
+		return (RootBeanDefinition) fidsBuilder.getBeanDefinition();
+	}
 
-    static String registerDefaultExpressionHandler(ParserContext pc) {
-        BeanDefinition expressionHandler = BeanDefinitionBuilder.rootBeanDefinition(DefaultWebSecurityExpressionHandler.class).getBeanDefinition();
-        String expressionHandlerRef = pc.getReaderContext().generateBeanName(expressionHandler);
-        pc.registerBeanComponent(new BeanComponentDefinition(expressionHandler, expressionHandlerRef));
+	static String registerDefaultExpressionHandler(ParserContext pc) {
+		BeanDefinition expressionHandler = BeanDefinitionBuilder.rootBeanDefinition(
+				DefaultWebSecurityExpressionHandler.class).getBeanDefinition();
+		String expressionHandlerRef = pc.getReaderContext().generateBeanName(
+				expressionHandler);
+		pc.registerBeanComponent(new BeanComponentDefinition(expressionHandler,
+				expressionHandlerRef));
 
-        return expressionHandlerRef;
-    }
+		return expressionHandlerRef;
+	}
 
-    static boolean isUseExpressions(Element elt) {
-        String useExpressions = elt.getAttribute(ATT_USE_EXPRESSIONS);
-        return !StringUtils.hasText(useExpressions) || "true".equals(useExpressions);
-    }
+	static boolean isUseExpressions(Element elt) {
+		String useExpressions = elt.getAttribute(ATT_USE_EXPRESSIONS);
+		return !StringUtils.hasText(useExpressions) || "true".equals(useExpressions);
+	}
 
-    private static ManagedMap<BeanDefinition, BeanDefinition>
-        parseInterceptUrlsForFilterInvocationRequestMap(MatcherType matcherType,
-                List<Element> urlElts, boolean useExpressions, boolean addAuthenticatedAll, ParserContext parserContext) {
+	private static ManagedMap<BeanDefinition, BeanDefinition> parseInterceptUrlsForFilterInvocationRequestMap(
+			MatcherType matcherType, List<Element> urlElts, boolean useExpressions,
+			boolean addAuthenticatedAll, ParserContext parserContext) {
 
-        ManagedMap<BeanDefinition, BeanDefinition> filterInvocationDefinitionMap = new ManagedMap<BeanDefinition, BeanDefinition>();
+		ManagedMap<BeanDefinition, BeanDefinition> filterInvocationDefinitionMap = new ManagedMap<BeanDefinition, BeanDefinition>();
 
-        for (Element urlElt : urlElts) {
-            String access = urlElt.getAttribute(ATT_ACCESS);
-            if (!StringUtils.hasText(access)) {
-                continue;
-            }
+		for (Element urlElt : urlElts) {
+			String access = urlElt.getAttribute(ATT_ACCESS);
+			if (!StringUtils.hasText(access)) {
+				continue;
+			}
 
-            String path = urlElt.getAttribute(ATT_PATTERN);
+			String path = urlElt.getAttribute(ATT_PATTERN);
 
-            if(!StringUtils.hasText(path)) {
-                parserContext.getReaderContext().error("path attribute cannot be empty or null", urlElt);
-            }
+			if (!StringUtils.hasText(path)) {
+				parserContext.getReaderContext().error(
+						"path attribute cannot be empty or null", urlElt);
+			}
 
-            String method = urlElt.getAttribute(ATT_HTTP_METHOD);
-            if (!StringUtils.hasText(method)) {
-                method = null;
-            }
+			String method = urlElt.getAttribute(ATT_HTTP_METHOD);
+			if (!StringUtils.hasText(method)) {
+				method = null;
+			}
 
-            BeanDefinition matcher = matcherType.createMatcher(path, method);
-            BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder.rootBeanDefinition(SecurityConfig.class);
+			BeanDefinition matcher = matcherType.createMatcher(path, method);
+			BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(SecurityConfig.class);
 
-            if (useExpressions) {
-                logger.info("Creating access control expression attribute '" + access + "' for " + path);
-                // The single expression will be parsed later by the ExpressionFilterInvocationSecurityMetadataSource
-                attributeBuilder.addConstructorArgValue(new String[] { access });
-                attributeBuilder.setFactoryMethod("createList");
+			if (useExpressions) {
+				logger.info("Creating access control expression attribute '" + access
+						+ "' for " + path);
+				// The single expression will be parsed later by the
+				// ExpressionFilterInvocationSecurityMetadataSource
+				attributeBuilder.addConstructorArgValue(new String[] { access });
+				attributeBuilder.setFactoryMethod("createList");
 
-            } else {
-                attributeBuilder.addConstructorArgValue(access);
-                attributeBuilder.setFactoryMethod("createListFromCommaDelimitedString");
-            }
+			}
+			else {
+				attributeBuilder.addConstructorArgValue(access);
+				attributeBuilder.setFactoryMethod("createListFromCommaDelimitedString");
+			}
 
-            if (filterInvocationDefinitionMap.containsKey(matcher)) {
-                logger.warn("Duplicate URL defined: " + path + ". The original attribute values will be overwritten");
-            }
+			if (filterInvocationDefinitionMap.containsKey(matcher)) {
+				logger.warn("Duplicate URL defined: " + path
+						+ ". The original attribute values will be overwritten");
+			}
 
-            filterInvocationDefinitionMap.put(matcher, attributeBuilder.getBeanDefinition());
-        }
+			filterInvocationDefinitionMap.put(matcher,
+					attributeBuilder.getBeanDefinition());
+		}
 
-        if(addAuthenticatedAll && filterInvocationDefinitionMap.isEmpty()) {
+		if (addAuthenticatedAll && filterInvocationDefinitionMap.isEmpty()) {
 
-            BeanDefinition matcher = matcherType.createMatcher("/**", null);
-            BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder.rootBeanDefinition(SecurityConfig.class);
-            attributeBuilder.addConstructorArgValue(new String[] { "authenticated" });
-            attributeBuilder.setFactoryMethod("createList");
-            filterInvocationDefinitionMap.put(matcher, attributeBuilder.getBeanDefinition());
-        }
+			BeanDefinition matcher = matcherType.createMatcher("/**", null);
+			BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(SecurityConfig.class);
+			attributeBuilder.addConstructorArgValue(new String[] { "authenticated" });
+			attributeBuilder.setFactoryMethod("createList");
+			filterInvocationDefinitionMap.put(matcher,
+					attributeBuilder.getBeanDefinition());
+		}
 
-        return filterInvocationDefinitionMap;
-    }
+		return filterInvocationDefinitionMap;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
index 9a08bff9b2..b99c3a2316 100644
--- a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
@@ -35,185 +35,211 @@ import org.w3c.dom.Element;
  * @author Rob Winch
  */
 public class FormLoginBeanDefinitionParser {
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private static final String ATT_LOGIN_URL = "login-processing-url";
+	private static final String ATT_LOGIN_URL = "login-processing-url";
 
-    static final String ATT_LOGIN_PAGE = "login-page";
-    private static final String DEF_LOGIN_PAGE = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL;
+	static final String ATT_LOGIN_PAGE = "login-page";
+	private static final String DEF_LOGIN_PAGE = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL;
 
-    private static final String ATT_FORM_LOGIN_TARGET_URL = "default-target-url";
-    private static final String ATT_ALWAYS_USE_DEFAULT_TARGET_URL = "always-use-default-target";
-    private static final String DEF_FORM_LOGIN_TARGET_URL = "/";
-    private static final String ATT_USERNAME_PARAMETER = "username-parameter";
-    private static final String ATT_PASSWORD_PARAMETER = "password-parameter";
+	private static final String ATT_FORM_LOGIN_TARGET_URL = "default-target-url";
+	private static final String ATT_ALWAYS_USE_DEFAULT_TARGET_URL = "always-use-default-target";
+	private static final String DEF_FORM_LOGIN_TARGET_URL = "/";
+	private static final String ATT_USERNAME_PARAMETER = "username-parameter";
+	private static final String ATT_PASSWORD_PARAMETER = "password-parameter";
 
-    private static final String ATT_FORM_LOGIN_AUTHENTICATION_FAILURE_URL = "authentication-failure-url";
-    private static final String DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL =
-        DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL + "?" + DefaultLoginPageGeneratingFilter.ERROR_PARAMETER_NAME;
+	private static final String ATT_FORM_LOGIN_AUTHENTICATION_FAILURE_URL = "authentication-failure-url";
+	private static final String DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL = DefaultLoginPageGeneratingFilter.DEFAULT_LOGIN_PAGE_URL
+			+ "?" + DefaultLoginPageGeneratingFilter.ERROR_PARAMETER_NAME;
 
-    private static final String ATT_SUCCESS_HANDLER_REF = "authentication-success-handler-ref";
-    private static final String ATT_FAILURE_HANDLER_REF = "authentication-failure-handler-ref";
+	private static final String ATT_SUCCESS_HANDLER_REF = "authentication-success-handler-ref";
+	private static final String ATT_FAILURE_HANDLER_REF = "authentication-failure-handler-ref";
 
-    private final String defaultLoginProcessingUrl;
-    private final String filterClassName;
-    private final BeanReference requestCache;
-    private final BeanReference sessionStrategy;
-    private final boolean allowSessionCreation;
-    private final BeanReference portMapper;
-    private final BeanReference portResolver;
+	private final String defaultLoginProcessingUrl;
+	private final String filterClassName;
+	private final BeanReference requestCache;
+	private final BeanReference sessionStrategy;
+	private final boolean allowSessionCreation;
+	private final BeanReference portMapper;
+	private final BeanReference portResolver;
 
-    private RootBeanDefinition filterBean;
-    private RootBeanDefinition entryPointBean;
-    private String loginPage;
-    private String loginMethod;
-    private String loginProcessingUrl;
+	private RootBeanDefinition filterBean;
+	private RootBeanDefinition entryPointBean;
+	private String loginPage;
+	private String loginMethod;
+	private String loginProcessingUrl;
 
-    FormLoginBeanDefinitionParser(String defaultLoginProcessingUrl, String loginMethod, String filterClassName,
-            BeanReference requestCache, BeanReference sessionStrategy, boolean allowSessionCreation, BeanReference portMapper, BeanReference portResolver) {
-        this.defaultLoginProcessingUrl = defaultLoginProcessingUrl;
-        this.loginMethod = loginMethod;
-        this.filterClassName = filterClassName;
-        this.requestCache = requestCache;
-        this.sessionStrategy = sessionStrategy;
-        this.allowSessionCreation = allowSessionCreation;
-        this.portMapper = portMapper;
-        this.portResolver = portResolver;
-    }
+	FormLoginBeanDefinitionParser(String defaultLoginProcessingUrl, String loginMethod,
+			String filterClassName, BeanReference requestCache,
+			BeanReference sessionStrategy, boolean allowSessionCreation,
+			BeanReference portMapper, BeanReference portResolver) {
+		this.defaultLoginProcessingUrl = defaultLoginProcessingUrl;
+		this.loginMethod = loginMethod;
+		this.filterClassName = filterClassName;
+		this.requestCache = requestCache;
+		this.sessionStrategy = sessionStrategy;
+		this.allowSessionCreation = allowSessionCreation;
+		this.portMapper = portMapper;
+		this.portResolver = portResolver;
+	}
 
-    public BeanDefinition parse(Element elt, ParserContext pc) {
-        String loginUrl = null;
-        String defaultTargetUrl = null;
-        String authenticationFailureUrl = null;
-        String alwaysUseDefault = null;
-        String successHandlerRef = null;
-        String failureHandlerRef = null;
-        // Only available with form-login
-        String usernameParameter = null;
-        String passwordParameter = null;
-        String authDetailsSourceRef = null;
+	public BeanDefinition parse(Element elt, ParserContext pc) {
+		String loginUrl = null;
+		String defaultTargetUrl = null;
+		String authenticationFailureUrl = null;
+		String alwaysUseDefault = null;
+		String successHandlerRef = null;
+		String failureHandlerRef = null;
+		// Only available with form-login
+		String usernameParameter = null;
+		String passwordParameter = null;
+		String authDetailsSourceRef = null;
 
-        Object source = null;
+		Object source = null;
 
-        if (elt != null) {
-            source = pc.extractSource(elt);
-            loginUrl = elt.getAttribute(ATT_LOGIN_URL);
-            WebConfigUtils.validateHttpRedirect(loginUrl, pc, source);
-            defaultTargetUrl = elt.getAttribute(ATT_FORM_LOGIN_TARGET_URL);
-            WebConfigUtils.validateHttpRedirect(defaultTargetUrl, pc, source);
-            authenticationFailureUrl = elt.getAttribute(ATT_FORM_LOGIN_AUTHENTICATION_FAILURE_URL);
-            WebConfigUtils.validateHttpRedirect(authenticationFailureUrl, pc, source);
-            alwaysUseDefault = elt.getAttribute(ATT_ALWAYS_USE_DEFAULT_TARGET_URL);
-            loginPage = elt.getAttribute(ATT_LOGIN_PAGE);
-            successHandlerRef = elt.getAttribute(ATT_SUCCESS_HANDLER_REF);
-            failureHandlerRef = elt.getAttribute(ATT_FAILURE_HANDLER_REF);
-            authDetailsSourceRef = elt.getAttribute(AuthenticationConfigBuilder.ATT_AUTH_DETAILS_SOURCE_REF);
+		if (elt != null) {
+			source = pc.extractSource(elt);
+			loginUrl = elt.getAttribute(ATT_LOGIN_URL);
+			WebConfigUtils.validateHttpRedirect(loginUrl, pc, source);
+			defaultTargetUrl = elt.getAttribute(ATT_FORM_LOGIN_TARGET_URL);
+			WebConfigUtils.validateHttpRedirect(defaultTargetUrl, pc, source);
+			authenticationFailureUrl = elt
+					.getAttribute(ATT_FORM_LOGIN_AUTHENTICATION_FAILURE_URL);
+			WebConfigUtils.validateHttpRedirect(authenticationFailureUrl, pc, source);
+			alwaysUseDefault = elt.getAttribute(ATT_ALWAYS_USE_DEFAULT_TARGET_URL);
+			loginPage = elt.getAttribute(ATT_LOGIN_PAGE);
+			successHandlerRef = elt.getAttribute(ATT_SUCCESS_HANDLER_REF);
+			failureHandlerRef = elt.getAttribute(ATT_FAILURE_HANDLER_REF);
+			authDetailsSourceRef = elt
+					.getAttribute(AuthenticationConfigBuilder.ATT_AUTH_DETAILS_SOURCE_REF);
 
+			if (!StringUtils.hasText(loginPage)) {
+				loginPage = null;
+			}
+			WebConfigUtils.validateHttpRedirect(loginPage, pc, source);
+			usernameParameter = elt.getAttribute(ATT_USERNAME_PARAMETER);
+			passwordParameter = elt.getAttribute(ATT_PASSWORD_PARAMETER);
+		}
 
-            if (!StringUtils.hasText(loginPage)) {
-                loginPage = null;
-            }
-            WebConfigUtils.validateHttpRedirect(loginPage, pc, source);
-            usernameParameter = elt.getAttribute(ATT_USERNAME_PARAMETER);
-            passwordParameter = elt.getAttribute(ATT_PASSWORD_PARAMETER);
-        }
+		filterBean = createFilterBean(loginUrl, defaultTargetUrl, alwaysUseDefault,
+				loginPage, authenticationFailureUrl, successHandlerRef,
+				failureHandlerRef, authDetailsSourceRef);
 
-        filterBean = createFilterBean(loginUrl, defaultTargetUrl, alwaysUseDefault, loginPage, authenticationFailureUrl,
-                successHandlerRef, failureHandlerRef, authDetailsSourceRef);
+		if (StringUtils.hasText(usernameParameter)) {
+			filterBean.getPropertyValues().addPropertyValue("usernameParameter",
+					usernameParameter);
+		}
+		if (StringUtils.hasText(passwordParameter)) {
+			filterBean.getPropertyValues().addPropertyValue("passwordParameter",
+					passwordParameter);
+		}
 
-        if (StringUtils.hasText(usernameParameter)) {
-            filterBean.getPropertyValues().addPropertyValue("usernameParameter", usernameParameter);
-        }
-        if (StringUtils.hasText(passwordParameter)) {
-            filterBean.getPropertyValues().addPropertyValue("passwordParameter", passwordParameter);
-        }
+		filterBean.setSource(source);
 
-        filterBean.setSource(source);
+		BeanDefinitionBuilder entryPointBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class);
+		entryPointBuilder.getRawBeanDefinition().setSource(source);
+		entryPointBuilder.addConstructorArgValue(loginPage != null ? loginPage
+				: DEF_LOGIN_PAGE);
+		entryPointBuilder.addPropertyValue("portMapper", portMapper);
+		entryPointBuilder.addPropertyValue("portResolver", portResolver);
+		entryPointBean = (RootBeanDefinition) entryPointBuilder.getBeanDefinition();
 
-        BeanDefinitionBuilder entryPointBuilder =
-                BeanDefinitionBuilder.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class);
-        entryPointBuilder.getRawBeanDefinition().setSource(source);
-        entryPointBuilder.addConstructorArgValue(loginPage != null ? loginPage : DEF_LOGIN_PAGE);
-        entryPointBuilder.addPropertyValue("portMapper", portMapper);
-        entryPointBuilder.addPropertyValue("portResolver", portResolver);
-        entryPointBean = (RootBeanDefinition) entryPointBuilder.getBeanDefinition();
+		return null;
+	}
 
-        return null;
-    }
+	private RootBeanDefinition createFilterBean(String loginUrl, String defaultTargetUrl,
+			String alwaysUseDefault, String loginPage, String authenticationFailureUrl,
+			String successHandlerRef, String failureHandlerRef,
+			String authDetailsSourceRef) {
 
-    private RootBeanDefinition createFilterBean(String loginUrl, String defaultTargetUrl, String alwaysUseDefault,
-            String loginPage, String authenticationFailureUrl, String successHandlerRef, String failureHandlerRef,
-            String authDetailsSourceRef) {
+		BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(filterClassName);
 
-        BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder.rootBeanDefinition(filterClassName);
+		if (!StringUtils.hasText(loginUrl)) {
+			loginUrl = defaultLoginProcessingUrl;
+		}
 
-        if (!StringUtils.hasText(loginUrl)) {
-            loginUrl = defaultLoginProcessingUrl;
-        }
+		this.loginProcessingUrl = loginUrl;
 
-        this.loginProcessingUrl = loginUrl;
+		BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
+		matcherBuilder.addConstructorArgValue(loginUrl);
+		if (loginMethod != null) {
+			matcherBuilder.addConstructorArgValue("POST");
+		}
 
-        BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
-        matcherBuilder.addConstructorArgValue(loginUrl);
-        if(loginMethod != null) {
-            matcherBuilder.addConstructorArgValue("POST");
-        }
+		filterBuilder.addPropertyValue("requiresAuthenticationRequestMatcher",
+				matcherBuilder.getBeanDefinition());
 
-        filterBuilder.addPropertyValue("requiresAuthenticationRequestMatcher", matcherBuilder.getBeanDefinition());
+		if (StringUtils.hasText(successHandlerRef)) {
+			filterBuilder.addPropertyReference("authenticationSuccessHandler",
+					successHandlerRef);
+		}
+		else {
+			BeanDefinitionBuilder successHandler = BeanDefinitionBuilder
+					.rootBeanDefinition(SavedRequestAwareAuthenticationSuccessHandler.class);
+			if ("true".equals(alwaysUseDefault)) {
+				successHandler
+						.addPropertyValue("alwaysUseDefaultTargetUrl", Boolean.TRUE);
+			}
+			successHandler.addPropertyValue("requestCache", requestCache);
+			successHandler.addPropertyValue("defaultTargetUrl", StringUtils
+					.hasText(defaultTargetUrl) ? defaultTargetUrl
+					: DEF_FORM_LOGIN_TARGET_URL);
+			filterBuilder.addPropertyValue("authenticationSuccessHandler",
+					successHandler.getBeanDefinition());
+		}
 
-        if (StringUtils.hasText(successHandlerRef)) {
-            filterBuilder.addPropertyReference("authenticationSuccessHandler", successHandlerRef);
-        } else {
-            BeanDefinitionBuilder successHandler = BeanDefinitionBuilder.rootBeanDefinition(SavedRequestAwareAuthenticationSuccessHandler.class);
-            if ("true".equals(alwaysUseDefault)) {
-                successHandler.addPropertyValue("alwaysUseDefaultTargetUrl", Boolean.TRUE);
-            }
-            successHandler.addPropertyValue("requestCache", requestCache);
-            successHandler.addPropertyValue("defaultTargetUrl", StringUtils.hasText(defaultTargetUrl) ? defaultTargetUrl : DEF_FORM_LOGIN_TARGET_URL);
-            filterBuilder.addPropertyValue("authenticationSuccessHandler", successHandler.getBeanDefinition());
-        }
+		if (StringUtils.hasText(authDetailsSourceRef)) {
+			filterBuilder.addPropertyReference("authenticationDetailsSource",
+					authDetailsSourceRef);
+		}
 
-        if (StringUtils.hasText(authDetailsSourceRef)) {
-            filterBuilder.addPropertyReference("authenticationDetailsSource", authDetailsSourceRef);
-        }
+		if (sessionStrategy != null) {
+			filterBuilder.addPropertyValue("sessionAuthenticationStrategy",
+					sessionStrategy);
+		}
 
-        if (sessionStrategy != null) {
-            filterBuilder.addPropertyValue("sessionAuthenticationStrategy", sessionStrategy);
-        }
+		if (StringUtils.hasText(failureHandlerRef)) {
+			filterBuilder.addPropertyReference("authenticationFailureHandler",
+					failureHandlerRef);
+		}
+		else {
+			BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder
+					.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
+			if (!StringUtils.hasText(authenticationFailureUrl)) {
+				// Fall back to redisplaying the custom login page, if one was specified.
+				if (StringUtils.hasText(loginPage)) {
+					authenticationFailureUrl = loginPage;
+				}
+				else {
+					authenticationFailureUrl = DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL;
+				}
+			}
+			failureHandler
+					.addPropertyValue("defaultFailureUrl", authenticationFailureUrl);
+			failureHandler.addPropertyValue("allowSessionCreation", allowSessionCreation);
+			filterBuilder.addPropertyValue("authenticationFailureHandler",
+					failureHandler.getBeanDefinition());
+		}
 
-        if (StringUtils.hasText(failureHandlerRef)) {
-            filterBuilder.addPropertyReference("authenticationFailureHandler", failureHandlerRef);
-        } else {
-            BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
-            if (!StringUtils.hasText(authenticationFailureUrl)) {
-                // Fall back to redisplaying the custom login page, if one was specified.
-                if (StringUtils.hasText(loginPage)) {
-                    authenticationFailureUrl = loginPage;
-                } else {
-                    authenticationFailureUrl = DEF_FORM_LOGIN_AUTHENTICATION_FAILURE_URL;
-                }
-            }
-            failureHandler.addPropertyValue("defaultFailureUrl", authenticationFailureUrl);
-            failureHandler.addPropertyValue("allowSessionCreation", allowSessionCreation);
-            filterBuilder.addPropertyValue("authenticationFailureHandler", failureHandler.getBeanDefinition());
-        }
+		return (RootBeanDefinition) filterBuilder.getBeanDefinition();
+	}
 
-        return (RootBeanDefinition) filterBuilder.getBeanDefinition();
-    }
+	RootBeanDefinition getFilterBean() {
+		return filterBean;
+	}
 
-    RootBeanDefinition getFilterBean() {
-        return filterBean;
-    }
+	RootBeanDefinition getEntryPointBean() {
+		return entryPointBean;
+	}
 
-    RootBeanDefinition getEntryPointBean() {
-        return entryPointBean;
-    }
+	String getLoginPage() {
+		return loginPage;
+	}
 
-    String getLoginPage() {
-        return loginPage;
-    }
-
-    String getLoginProcessingUrl() {
-        return loginProcessingUrl;
-    }
+	String getLoginProcessingUrl() {
+		return loginProcessingUrl;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
index 4d83c2db76..ec458c453d 100644
--- a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
@@ -48,266 +48,317 @@ import org.w3c.dom.Element;
  * @since 3.2
  */
 public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
-    private static final String ATT_DISABLED = "disabled";
+	private static final String ATT_DISABLED = "disabled";
 
-    private static final String ATT_ENABLED = "enabled";
-    private static final String ATT_BLOCK = "block";
+	private static final String ATT_ENABLED = "enabled";
+	private static final String ATT_BLOCK = "block";
 
-    private static final String ATT_POLICY = "policy";
-    private static final String ATT_STRATEGY = "strategy";
-    private static final String ATT_FROM_PARAMETER = "from-parameter";
+	private static final String ATT_POLICY = "policy";
+	private static final String ATT_STRATEGY = "strategy";
+	private static final String ATT_FROM_PARAMETER = "from-parameter";
 
-    private static final String ATT_NAME = "name";
-    private static final String ATT_VALUE = "value";
-    private static final String ATT_REF = "ref";
+	private static final String ATT_NAME = "name";
+	private static final String ATT_VALUE = "value";
+	private static final String ATT_REF = "ref";
 
-    private static final String ATT_INCLUDE_SUBDOMAINS = "include-subdomains";
-    private static final String ATT_MAX_AGE_SECONDS = "max-age-seconds";
-    private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
+	private static final String ATT_INCLUDE_SUBDOMAINS = "include-subdomains";
+	private static final String ATT_MAX_AGE_SECONDS = "max-age-seconds";
+	private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
 
-    private static final String CACHE_CONTROL_ELEMENT = "cache-control";
+	private static final String CACHE_CONTROL_ELEMENT = "cache-control";
 
-    private static final String HSTS_ELEMENT = "hsts";
+	private static final String HSTS_ELEMENT = "hsts";
 
-    private static final String XSS_ELEMENT = "xss-protection";
-    private static final String CONTENT_TYPE_ELEMENT = "content-type-options";
-    private static final String FRAME_OPTIONS_ELEMENT = "frame-options";
-    private static final String GENERIC_HEADER_ELEMENT = "header";
+	private static final String XSS_ELEMENT = "xss-protection";
+	private static final String CONTENT_TYPE_ELEMENT = "content-type-options";
+	private static final String FRAME_OPTIONS_ELEMENT = "frame-options";
+	private static final String GENERIC_HEADER_ELEMENT = "header";
 
-    private static final String ALLOW_FROM = "ALLOW-FROM";
+	private static final String ALLOW_FROM = "ALLOW-FROM";
 
-    private ManagedList<BeanMetadataElement> headerWriters;
+	private ManagedList<BeanMetadataElement> headerWriters;
 
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        headerWriters = new ManagedList<BeanMetadataElement>();
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(HeaderWriterFilter.class);
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		headerWriters = new ManagedList<BeanMetadataElement>();
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(HeaderWriterFilter.class);
 
-        boolean disabled = element != null && "true".equals(element.getAttribute("disabled"));
-        boolean defaultsDisabled = element != null && "true".equals(element.getAttribute("defaults-disabled"));
+		boolean disabled = element != null
+				&& "true".equals(element.getAttribute("disabled"));
+		boolean defaultsDisabled = element != null
+				&& "true".equals(element.getAttribute("defaults-disabled"));
 
-        boolean addIfNotPresent = element == null || !disabled && !defaultsDisabled;
+		boolean addIfNotPresent = element == null || !disabled && !defaultsDisabled;
 
-        parseCacheControlElement(addIfNotPresent, element);
-        parseHstsElement(addIfNotPresent,element, parserContext);
-        parseXssElement(addIfNotPresent, element, parserContext);
-        parseFrameOptionsElement(addIfNotPresent, element, parserContext);
-        parseContentTypeOptionsElement(addIfNotPresent, element);
+		parseCacheControlElement(addIfNotPresent, element);
+		parseHstsElement(addIfNotPresent, element, parserContext);
+		parseXssElement(addIfNotPresent, element, parserContext);
+		parseFrameOptionsElement(addIfNotPresent, element, parserContext);
+		parseContentTypeOptionsElement(addIfNotPresent, element);
 
-        parseHeaderElements(element);
+		parseHeaderElements(element);
 
-        if(disabled) {
-            if(!headerWriters.isEmpty()) {
-                parserContext.getReaderContext().error("Cannot specify <headers disabled=\"true\"> with child elements.", element);
-            }
-            return null;
-        }
+		if (disabled) {
+			if (!headerWriters.isEmpty()) {
+				parserContext
+						.getReaderContext()
+						.error("Cannot specify <headers disabled=\"true\"> with child elements.",
+								element);
+			}
+			return null;
+		}
 
-        builder.addConstructorArgValue(headerWriters);
-        return builder.getBeanDefinition();
-    }
+		builder.addConstructorArgValue(headerWriters);
+		return builder.getBeanDefinition();
+	}
 
-    private void parseCacheControlElement(boolean addIfNotPresent, Element element) {
-        Element cacheControlElement = element == null ? null : DomUtils.getChildElementByTagName(element, CACHE_CONTROL_ELEMENT);
-        boolean disabled = "true".equals(getAttribute(cacheControlElement, ATT_DISABLED, "false"));
-        if(disabled) {
-            return;
-        }
-        if (addIfNotPresent || cacheControlElement != null) {
-            addCacheControl();
-        }
-    }
+	private void parseCacheControlElement(boolean addIfNotPresent, Element element) {
+		Element cacheControlElement = element == null ? null : DomUtils
+				.getChildElementByTagName(element, CACHE_CONTROL_ELEMENT);
+		boolean disabled = "true".equals(getAttribute(cacheControlElement, ATT_DISABLED,
+				"false"));
+		if (disabled) {
+			return;
+		}
+		if (addIfNotPresent || cacheControlElement != null) {
+			addCacheControl();
+		}
+	}
 
-    private void addCacheControl() {
-        BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder.genericBeanDefinition(CacheControlHeadersWriter.class);
-        headerWriters.add(headersWriter.getBeanDefinition());
-    }
+	private void addCacheControl() {
+		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
+				.genericBeanDefinition(CacheControlHeadersWriter.class);
+		headerWriters.add(headersWriter.getBeanDefinition());
+	}
 
-    private void parseHstsElement(boolean addIfNotPresent, Element element, ParserContext context) {
-        Element hstsElement = element == null ? null : DomUtils.getChildElementByTagName(element, HSTS_ELEMENT);
-        if (addIfNotPresent || hstsElement != null) {
-            addHsts(addIfNotPresent, hstsElement, context);
-        }
-    }
+	private void parseHstsElement(boolean addIfNotPresent, Element element,
+			ParserContext context) {
+		Element hstsElement = element == null ? null : DomUtils.getChildElementByTagName(
+				element, HSTS_ELEMENT);
+		if (addIfNotPresent || hstsElement != null) {
+			addHsts(addIfNotPresent, hstsElement, context);
+		}
+	}
 
-    private void addHsts(boolean addIfNotPresent, Element hstsElement, ParserContext context) {
-        BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder.genericBeanDefinition(HstsHeaderWriter.class);
-        if(hstsElement != null) {
-            boolean disabled = "true".equals(getAttribute(hstsElement, ATT_DISABLED, "false"));
-            String includeSubDomains = hstsElement.getAttribute(ATT_INCLUDE_SUBDOMAINS);
-            if(StringUtils.hasText(includeSubDomains)) {
-                if(disabled) {
-                    attrNotAllowed(context, ATT_INCLUDE_SUBDOMAINS, ATT_DISABLED, hstsElement);
-                }
-                headersWriter.addPropertyValue("includeSubDomains", includeSubDomains);
-            }
-            String maxAgeSeconds = hstsElement.getAttribute(ATT_MAX_AGE_SECONDS);
-            if(StringUtils.hasText(maxAgeSeconds)) {
-                if(disabled) {
-                    attrNotAllowed(context, ATT_MAX_AGE_SECONDS, ATT_DISABLED, hstsElement);
-                }
-                headersWriter.addPropertyValue("maxAgeInSeconds", maxAgeSeconds);
-            }
-            String requestMatcherRef = hstsElement.getAttribute(ATT_REQUEST_MATCHER_REF);
-            if(StringUtils.hasText(requestMatcherRef)) {
-                if(disabled) {
-                    attrNotAllowed(context, ATT_REQUEST_MATCHER_REF, ATT_DISABLED, hstsElement);
-                }
-                headersWriter.addPropertyReference("requestMatcher", requestMatcherRef);
-            }
+	private void addHsts(boolean addIfNotPresent, Element hstsElement,
+			ParserContext context) {
+		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
+				.genericBeanDefinition(HstsHeaderWriter.class);
+		if (hstsElement != null) {
+			boolean disabled = "true".equals(getAttribute(hstsElement, ATT_DISABLED,
+					"false"));
+			String includeSubDomains = hstsElement.getAttribute(ATT_INCLUDE_SUBDOMAINS);
+			if (StringUtils.hasText(includeSubDomains)) {
+				if (disabled) {
+					attrNotAllowed(context, ATT_INCLUDE_SUBDOMAINS, ATT_DISABLED,
+							hstsElement);
+				}
+				headersWriter.addPropertyValue("includeSubDomains", includeSubDomains);
+			}
+			String maxAgeSeconds = hstsElement.getAttribute(ATT_MAX_AGE_SECONDS);
+			if (StringUtils.hasText(maxAgeSeconds)) {
+				if (disabled) {
+					attrNotAllowed(context, ATT_MAX_AGE_SECONDS, ATT_DISABLED,
+							hstsElement);
+				}
+				headersWriter.addPropertyValue("maxAgeInSeconds", maxAgeSeconds);
+			}
+			String requestMatcherRef = hstsElement.getAttribute(ATT_REQUEST_MATCHER_REF);
+			if (StringUtils.hasText(requestMatcherRef)) {
+				if (disabled) {
+					attrNotAllowed(context, ATT_REQUEST_MATCHER_REF, ATT_DISABLED,
+							hstsElement);
+				}
+				headersWriter.addPropertyReference("requestMatcher", requestMatcherRef);
+			}
 
-            if(disabled == true) {
-                return;
-            }
-        }
-        if(addIfNotPresent || hstsElement != null) {
-            headerWriters.add(headersWriter.getBeanDefinition());
-        }
-    }
+			if (disabled == true) {
+				return;
+			}
+		}
+		if (addIfNotPresent || hstsElement != null) {
+			headerWriters.add(headersWriter.getBeanDefinition());
+		}
+	}
 
-    private void attrNotAllowed(ParserContext context, String attrName, String otherAttrName, Element element) {
-        context.getReaderContext().error("Only one of '" + attrName + "' or '"+ otherAttrName +"' can be set.",
-                element);
-    }
+	private void attrNotAllowed(ParserContext context, String attrName,
+			String otherAttrName, Element element) {
+		context.getReaderContext().error(
+				"Only one of '" + attrName + "' or '" + otherAttrName + "' can be set.",
+				element);
+	}
 
-    private void parseHeaderElements(Element element) {
-        List<Element> headerElts = element == null ? Collections.<Element>emptyList() : DomUtils.getChildElementsByTagName(element, GENERIC_HEADER_ELEMENT);
-        for (Element headerElt : headerElts) {
-            String headerFactoryRef = headerElt.getAttribute(ATT_REF);
-            if (StringUtils.hasText(headerFactoryRef)) {
-                headerWriters.add(new RuntimeBeanReference(headerFactoryRef));
-            } else {
-                BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(StaticHeadersWriter.class);
-                builder.addConstructorArgValue(headerElt.getAttribute(ATT_NAME));
-                builder.addConstructorArgValue(headerElt.getAttribute(ATT_VALUE));
-                headerWriters.add(builder.getBeanDefinition());
-            }
-        }
-    }
+	private void parseHeaderElements(Element element) {
+		List<Element> headerElts = element == null ? Collections.<Element> emptyList()
+				: DomUtils.getChildElementsByTagName(element, GENERIC_HEADER_ELEMENT);
+		for (Element headerElt : headerElts) {
+			String headerFactoryRef = headerElt.getAttribute(ATT_REF);
+			if (StringUtils.hasText(headerFactoryRef)) {
+				headerWriters.add(new RuntimeBeanReference(headerFactoryRef));
+			}
+			else {
+				BeanDefinitionBuilder builder = BeanDefinitionBuilder
+						.genericBeanDefinition(StaticHeadersWriter.class);
+				builder.addConstructorArgValue(headerElt.getAttribute(ATT_NAME));
+				builder.addConstructorArgValue(headerElt.getAttribute(ATT_VALUE));
+				headerWriters.add(builder.getBeanDefinition());
+			}
+		}
+	}
 
-    private void parseContentTypeOptionsElement(boolean addIfNotPresent, Element element) {
-        Element contentTypeElt = element == null ? null : DomUtils.getChildElementByTagName(element, CONTENT_TYPE_ELEMENT);
-        boolean disabled = "true".equals(getAttribute(contentTypeElt, ATT_DISABLED, "false"));
-        if(disabled) {
-            return;
-        }
-        if (addIfNotPresent || contentTypeElt != null) {
-            addContentTypeOptions();
-        }
-    }
+	private void parseContentTypeOptionsElement(boolean addIfNotPresent, Element element) {
+		Element contentTypeElt = element == null ? null : DomUtils
+				.getChildElementByTagName(element, CONTENT_TYPE_ELEMENT);
+		boolean disabled = "true".equals(getAttribute(contentTypeElt, ATT_DISABLED,
+				"false"));
+		if (disabled) {
+			return;
+		}
+		if (addIfNotPresent || contentTypeElt != null) {
+			addContentTypeOptions();
+		}
+	}
 
-    private void addContentTypeOptions() {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XContentTypeOptionsHeaderWriter.class);
-        headerWriters.add(builder.getBeanDefinition());
-    }
+	private void addContentTypeOptions() {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(XContentTypeOptionsHeaderWriter.class);
+		headerWriters.add(builder.getBeanDefinition());
+	}
 
-    private void parseFrameOptionsElement(boolean addIfNotPresent, Element element, ParserContext parserContext) {
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XFrameOptionsHeaderWriter.class);
+	private void parseFrameOptionsElement(boolean addIfNotPresent, Element element,
+			ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(XFrameOptionsHeaderWriter.class);
 
-        Element frameElt = element == null ? null : DomUtils.getChildElementByTagName(element, FRAME_OPTIONS_ELEMENT);
-        if (frameElt != null) {
-            String header = getAttribute(frameElt, ATT_POLICY, null);
-            boolean disabled = "true".equals(getAttribute(frameElt, ATT_DISABLED, "false"));
+		Element frameElt = element == null ? null : DomUtils.getChildElementByTagName(
+				element, FRAME_OPTIONS_ELEMENT);
+		if (frameElt != null) {
+			String header = getAttribute(frameElt, ATT_POLICY, null);
+			boolean disabled = "true"
+					.equals(getAttribute(frameElt, ATT_DISABLED, "false"));
 
-            if(disabled && header != null) {
-                this.attrNotAllowed(parserContext, ATT_DISABLED, ATT_POLICY, frameElt);
-            }
-            if(!StringUtils.hasText(header)) {
-                header = "DENY";
-            }
+			if (disabled && header != null) {
+				this.attrNotAllowed(parserContext, ATT_DISABLED, ATT_POLICY, frameElt);
+			}
+			if (!StringUtils.hasText(header)) {
+				header = "DENY";
+			}
 
-            if (ALLOW_FROM.equals(header) ) {
-                String strategyRef = getAttribute(frameElt, ATT_REF, null);
-                String strategy = getAttribute(frameElt, ATT_STRATEGY, null);
+			if (ALLOW_FROM.equals(header)) {
+				String strategyRef = getAttribute(frameElt, ATT_REF, null);
+				String strategy = getAttribute(frameElt, ATT_STRATEGY, null);
 
-                if (StringUtils.hasText(strategy) && StringUtils.hasText(strategyRef)) {
-                    parserContext.getReaderContext().error("Only one of 'strategy' or 'strategy-ref' can be set.",
-                            frameElt);
-                } else if (strategyRef != null) {
-                    builder.addConstructorArgReference(strategyRef);
-                } else if (strategy != null) {
-                    String value = getAttribute(frameElt, ATT_VALUE, null);
-                    if (!StringUtils.hasText(value)) {
-                        parserContext.getReaderContext().error("Strategy requires a 'value' to be set.", frameElt);
-                    }
-                    // static, whitelist, regexp
-                    if ("static".equals(strategy)) {
-                        try {
-                            builder.addConstructorArgValue(new StaticAllowFromStrategy(new URI(value)));
-                        } catch (URISyntaxException e) {
-                            parserContext.getReaderContext().error(
-                                    "'value' attribute doesn't represent a valid URI.", frameElt, e);
-                        }
-                    } else {
-                        BeanDefinitionBuilder allowFromStrategy;
-                        if ("whitelist".equals(strategy)) {
-                            allowFromStrategy =  BeanDefinitionBuilder.rootBeanDefinition(WhiteListedAllowFromStrategy.class);
-                            allowFromStrategy.addConstructorArgValue(StringUtils.commaDelimitedListToSet(value));
-                        } else {
-                            allowFromStrategy =  BeanDefinitionBuilder.rootBeanDefinition(RegExpAllowFromStrategy.class);
-                            allowFromStrategy.addConstructorArgValue(value);
-                        }
-                        String fromParameter = getAttribute(frameElt, ATT_FROM_PARAMETER, "from");
-                        allowFromStrategy.addPropertyValue("allowFromParameterName", fromParameter);
-                        builder.addConstructorArgValue(allowFromStrategy.getBeanDefinition());
-                    }
-                } else {
-                    parserContext.getReaderContext().error("One of 'strategy' and 'strategy-ref' must be set.",
-                            frameElt);
-                }
-            } else {
-                builder.addConstructorArgValue(header);
-            }
+				if (StringUtils.hasText(strategy) && StringUtils.hasText(strategyRef)) {
+					parserContext.getReaderContext().error(
+							"Only one of 'strategy' or 'strategy-ref' can be set.",
+							frameElt);
+				}
+				else if (strategyRef != null) {
+					builder.addConstructorArgReference(strategyRef);
+				}
+				else if (strategy != null) {
+					String value = getAttribute(frameElt, ATT_VALUE, null);
+					if (!StringUtils.hasText(value)) {
+						parserContext.getReaderContext().error(
+								"Strategy requires a 'value' to be set.", frameElt);
+					}
+					// static, whitelist, regexp
+					if ("static".equals(strategy)) {
+						try {
+							builder.addConstructorArgValue(new StaticAllowFromStrategy(
+									new URI(value)));
+						}
+						catch (URISyntaxException e) {
+							parserContext.getReaderContext().error(
+									"'value' attribute doesn't represent a valid URI.",
+									frameElt, e);
+						}
+					}
+					else {
+						BeanDefinitionBuilder allowFromStrategy;
+						if ("whitelist".equals(strategy)) {
+							allowFromStrategy = BeanDefinitionBuilder
+									.rootBeanDefinition(WhiteListedAllowFromStrategy.class);
+							allowFromStrategy.addConstructorArgValue(StringUtils
+									.commaDelimitedListToSet(value));
+						}
+						else {
+							allowFromStrategy = BeanDefinitionBuilder
+									.rootBeanDefinition(RegExpAllowFromStrategy.class);
+							allowFromStrategy.addConstructorArgValue(value);
+						}
+						String fromParameter = getAttribute(frameElt, ATT_FROM_PARAMETER,
+								"from");
+						allowFromStrategy.addPropertyValue("allowFromParameterName",
+								fromParameter);
+						builder.addConstructorArgValue(allowFromStrategy
+								.getBeanDefinition());
+					}
+				}
+				else {
+					parserContext.getReaderContext()
+							.error("One of 'strategy' and 'strategy-ref' must be set.",
+									frameElt);
+				}
+			}
+			else {
+				builder.addConstructorArgValue(header);
+			}
 
-            if(disabled) {
-                return;
-            }
-        }
+			if (disabled) {
+				return;
+			}
+		}
 
-        if(addIfNotPresent || frameElt != null) {
-            headerWriters.add(builder.getBeanDefinition());
-        }
-    }
+		if (addIfNotPresent || frameElt != null) {
+			headerWriters.add(builder.getBeanDefinition());
+		}
+	}
 
-    private void parseXssElement(boolean addIfNotPresent, Element element, ParserContext parserContext) {
-        Element xssElt = element == null ? null : DomUtils.getChildElementByTagName(element, XSS_ELEMENT);
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XXssProtectionHeaderWriter.class);
-        if (xssElt != null) {
-            boolean disabled = "true".equals(getAttribute(xssElt, ATT_DISABLED, "false"));
+	private void parseXssElement(boolean addIfNotPresent, Element element,
+			ParserContext parserContext) {
+		Element xssElt = element == null ? null : DomUtils.getChildElementByTagName(
+				element, XSS_ELEMENT);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(XXssProtectionHeaderWriter.class);
+		if (xssElt != null) {
+			boolean disabled = "true".equals(getAttribute(xssElt, ATT_DISABLED, "false"));
 
-            String enabled = xssElt.getAttribute(ATT_ENABLED);
-            if(StringUtils.hasText(enabled)) {
-                if(disabled) {
-                    attrNotAllowed(parserContext, ATT_ENABLED, ATT_DISABLED, xssElt);
-                }
-                builder.addPropertyValue("enabled", enabled);
-            }
+			String enabled = xssElt.getAttribute(ATT_ENABLED);
+			if (StringUtils.hasText(enabled)) {
+				if (disabled) {
+					attrNotAllowed(parserContext, ATT_ENABLED, ATT_DISABLED, xssElt);
+				}
+				builder.addPropertyValue("enabled", enabled);
+			}
 
-            String block = xssElt.getAttribute(ATT_BLOCK);
-            if(StringUtils.hasText(block)) {
-                if(disabled) {
-                    attrNotAllowed(parserContext, ATT_BLOCK, ATT_DISABLED, xssElt);
-                }
-                builder.addPropertyValue("block", block);
-            }
+			String block = xssElt.getAttribute(ATT_BLOCK);
+			if (StringUtils.hasText(block)) {
+				if (disabled) {
+					attrNotAllowed(parserContext, ATT_BLOCK, ATT_DISABLED, xssElt);
+				}
+				builder.addPropertyValue("block", block);
+			}
 
-            if(disabled) {
-                return;
-            }
-        }
-        if(addIfNotPresent || xssElt != null) {
-            headerWriters.add(builder.getBeanDefinition());
-        }
-    }
+			if (disabled) {
+				return;
+			}
+		}
+		if (addIfNotPresent || xssElt != null) {
+			headerWriters.add(builder.getBeanDefinition());
+		}
+	}
 
-    private String getAttribute(Element element, String name, String defaultValue) {
-        if(element == null) {
-            return defaultValue;
-        }
-        String value = element.getAttribute(name);
-        if (StringUtils.hasText(value)) {
-            return value;
-        } else {
-            return defaultValue;
-        }
-    }
+	private String getAttribute(Element element, String name, String defaultValue) {
+		if (element == null) {
+			return defaultValue;
+		}
+		String value = element.getAttribute(name);
+		if (StringUtils.hasText(value)) {
+			return value;
+		}
+		else {
+			return defaultValue;
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
index aec530bb80..d45876c561 100644
--- a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
+++ b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
@@ -78,645 +78,741 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Stateful class which helps HttpSecurityBDP to create the configuration for the &lt;http&gt; element.
+ * Stateful class which helps HttpSecurityBDP to create the configuration for the
+ * &lt;http&gt; element.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.0
  */
 class HttpConfigurationBuilder {
-    private static final String ATT_CREATE_SESSION = "create-session";
-
-    private static final String ATT_SESSION_FIXATION_PROTECTION = "session-fixation-protection";
-    private static final String OPT_SESSION_FIXATION_NO_PROTECTION = "none";
-    private static final String OPT_SESSION_FIXATION_MIGRATE_SESSION = "migrateSession";
-    private static final String OPT_CHANGE_SESSION_ID = "changeSessionId";
-
-    private static final String ATT_INVALID_SESSION_URL = "invalid-session-url";
-    private static final String ATT_SESSION_AUTH_STRATEGY_REF = "session-authentication-strategy-ref";
-    private static final String ATT_SESSION_AUTH_ERROR_URL = "session-authentication-error-url";
-    private static final String ATT_SECURITY_CONTEXT_REPOSITORY = "security-context-repository-ref";
-
-    private static final String ATT_DISABLE_URL_REWRITING = "disable-url-rewriting";
-
-    private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
-    private static final String ATT_ONCE_PER_REQUEST = "once-per-request";
-
-    private static final String ATT_REF = "ref";
-
-    private final Element httpElt;
-    private final ParserContext pc;
-    private final SessionCreationPolicy sessionPolicy;
-    private final List<Element> interceptUrls;
-    private final MatcherType matcherType;
-
-    private BeanDefinition cpf;
-    private BeanDefinition securityContextPersistenceFilter;
-    private BeanReference contextRepoRef;
-    private BeanReference sessionRegistryRef;
-    private BeanDefinition concurrentSessionFilter;
-    private BeanDefinition webAsyncManagerFilter;
-    private BeanDefinition requestCacheAwareFilter;
-    private BeanReference sessionStrategyRef;
-    private RootBeanDefinition sfpf;
-    private BeanDefinition servApiFilter;
-    private BeanDefinition jaasApiFilter;
-    private final BeanReference portMapper;
-    private final BeanReference portResolver;
-    private BeanReference fsi;
-    private BeanReference requestCache;
-    private BeanDefinition addHeadersFilter;
-    private BeanDefinition csrfFilter;
-    private BeanMetadataElement csrfLogoutHandler;
-    private BeanMetadataElement csrfAuthStrategy;
-
-    private CsrfBeanDefinitionParser csrfParser;
-
-    private BeanDefinition invalidSession;
-    private boolean addAllAuth;
-
-    public HttpConfigurationBuilder(Element element, boolean addAllAuth, ParserContext pc,
-            BeanReference portMapper, BeanReference portResolver, BeanReference authenticationManager) {
-        this.httpElt = element;
-        this.addAllAuth = addAllAuth;
-        this.pc = pc;
-        this.portMapper = portMapper;
-        this.portResolver = portResolver;
-        this.matcherType = MatcherType.fromElement(element);
-        interceptUrls = DomUtils.getChildElementsByTagName(element, Elements.INTERCEPT_URL);
-
-        for (Element urlElt : interceptUrls) {
-            if (StringUtils.hasText(urlElt.getAttribute(ATT_FILTERS))) {
-                pc.getReaderContext().error("The use of \"filters='none'\" is no longer supported. Please define a" +
-                        " separate <http> element for the pattern you want to exclude and use the attribute" +
-                        " \"security='none'\".", pc.extractSource(urlElt));
-            }
-        }
-
-        String createSession = element.getAttribute(ATT_CREATE_SESSION);
-
-        if (StringUtils.hasText(createSession)) {
-            sessionPolicy = createPolicy(createSession);
-        } else {
-            sessionPolicy = SessionCreationPolicy.IF_REQUIRED;
-        }
-
-        createCsrfFilter();
-        createSecurityContextPersistenceFilter();
-        createSessionManagementFilters();
-        createWebAsyncManagerFilter();
-        createRequestCacheFilter();
-        createServletApiFilter(authenticationManager);
-        createJaasApiFilter();
-        createChannelProcessingFilter();
-        createFilterSecurityInterceptor(authenticationManager);
-        createAddHeadersFilter();
-    }
-
-    private SessionCreationPolicy createPolicy(String createSession) {
-        if("ifRequired".equals(createSession)) {
-            return SessionCreationPolicy.IF_REQUIRED;
-        } else if("always".equals(createSession)) {
-            return SessionCreationPolicy.ALWAYS;
-        } else if("never".equals(createSession)) {
-            return SessionCreationPolicy.NEVER;
-        } else if("stateless".equals(createSession)) {
-            return SessionCreationPolicy.STATELESS;
-        }
-
-        throw new IllegalStateException("Cannot convert " + createSession + " to " + SessionCreationPolicy.class.getName());
-    }
-
-    @SuppressWarnings("rawtypes")
-    void setLogoutHandlers(ManagedList logoutHandlers) {
-        if(logoutHandlers != null) {
-            if(concurrentSessionFilter != null) {
-                concurrentSessionFilter.getPropertyValues().add("logoutHandlers", logoutHandlers);
-            }
-            if(servApiFilter != null) {
-                servApiFilter.getPropertyValues().add("logoutHandlers", logoutHandlers);
-            }
-        }
-    }
-
-    void setEntryPoint(BeanMetadataElement entryPoint) {
-        if(servApiFilter != null) {
-            servApiFilter.getPropertyValues().add("authenticationEntryPoint", entryPoint);
-        }
-    }
-
-    void setAccessDeniedHandler(BeanMetadataElement accessDeniedHandler) {
-        if(csrfParser != null ) {
-            csrfParser.initAccessDeniedHandler(this.invalidSession, accessDeniedHandler);
-        }
-    }
-
-    // Needed to account for placeholders
-    static String createPath(String path, boolean lowerCase) {
-        return lowerCase ? path.toLowerCase() : path;
-    }
-
-    private void createSecurityContextPersistenceFilter() {
-        BeanDefinitionBuilder scpf = BeanDefinitionBuilder.rootBeanDefinition(SecurityContextPersistenceFilter.class);
-
-        String repoRef = httpElt.getAttribute(ATT_SECURITY_CONTEXT_REPOSITORY);
-        String disableUrlRewriting = httpElt.getAttribute(ATT_DISABLE_URL_REWRITING);
-
-        if (StringUtils.hasText(repoRef)) {
-            if (sessionPolicy == SessionCreationPolicy.ALWAYS) {
-                scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
-            }
-        } else {
-            BeanDefinitionBuilder contextRepo;
-            if (sessionPolicy == SessionCreationPolicy.STATELESS) {
-                contextRepo = BeanDefinitionBuilder.rootBeanDefinition(NullSecurityContextRepository.class);
-            } else {
-                contextRepo = BeanDefinitionBuilder.rootBeanDefinition(HttpSessionSecurityContextRepository.class);
-                switch (sessionPolicy) {
-                    case ALWAYS:
-                        contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
-                        scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
-                        break;
-                    case NEVER:
-                        contextRepo.addPropertyValue("allowSessionCreation", Boolean.FALSE);
-                        scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
-                        break;
-                    default:
-                        contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
-                        scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
-                }
-
-                if ("true".equals(disableUrlRewriting)) {
-                    contextRepo.addPropertyValue("disableUrlRewriting", Boolean.TRUE);
-                }
-            }
-
-            BeanDefinition repoBean = contextRepo.getBeanDefinition();
-            repoRef = pc.getReaderContext().generateBeanName(repoBean);
-            pc.registerBeanComponent(new BeanComponentDefinition(repoBean, repoRef));
-        }
-
-        contextRepoRef = new RuntimeBeanReference(repoRef);
-        scpf.addConstructorArgValue(contextRepoRef);
-
-        securityContextPersistenceFilter = scpf.getBeanDefinition();
-    }
-
-    private void createSessionManagementFilters() {
-        Element sessionMgmtElt = DomUtils.getChildElementByTagName(httpElt, Elements.SESSION_MANAGEMENT);
-        Element sessionCtrlElt = null;
-
-        String sessionFixationAttribute = null;
-        String invalidSessionUrl = null;
-        String sessionAuthStratRef = null;
-        String errorUrl = null;
-
-        boolean sessionControlEnabled = false;
-        if (sessionMgmtElt != null) {
-            if (sessionPolicy == SessionCreationPolicy.STATELESS) {
-                pc.getReaderContext().error(Elements.SESSION_MANAGEMENT + "  cannot be used" +
-                        " in combination with " + ATT_CREATE_SESSION + "='"+ SessionCreationPolicy.STATELESS +"'",
-                        pc.extractSource(sessionMgmtElt));
-            }
-            sessionFixationAttribute = sessionMgmtElt.getAttribute(ATT_SESSION_FIXATION_PROTECTION);
-            invalidSessionUrl = sessionMgmtElt.getAttribute(ATT_INVALID_SESSION_URL);
-            sessionAuthStratRef = sessionMgmtElt.getAttribute(ATT_SESSION_AUTH_STRATEGY_REF);
-            errorUrl = sessionMgmtElt.getAttribute(ATT_SESSION_AUTH_ERROR_URL);
-            sessionCtrlElt = DomUtils.getChildElementByTagName(sessionMgmtElt, Elements.CONCURRENT_SESSIONS);
-            sessionControlEnabled =  sessionCtrlElt != null;
-
-            if (sessionControlEnabled) {
-                if (StringUtils.hasText(sessionAuthStratRef)) {
-                    pc.getReaderContext().error(ATT_SESSION_AUTH_STRATEGY_REF + " attribute cannot be used" +
-                            " in combination with <" + Elements.CONCURRENT_SESSIONS + ">", pc.extractSource(sessionCtrlElt));
-                }
-                createConcurrencyControlFilterAndSessionRegistry(sessionCtrlElt);
-            }
-        }
-
-        if (!StringUtils.hasText(sessionFixationAttribute)) {
-             Method changeSessionIdMethod = ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId");
-            sessionFixationAttribute = changeSessionIdMethod == null ? OPT_SESSION_FIXATION_MIGRATE_SESSION : OPT_CHANGE_SESSION_ID;
-        } else if (StringUtils.hasText(sessionAuthStratRef)) {
-            pc.getReaderContext().error(ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used" +
-                    " in combination with " + ATT_SESSION_AUTH_STRATEGY_REF, pc.extractSource(sessionMgmtElt));
-        }
-
-        if (sessionPolicy == SessionCreationPolicy.STATELESS) {
-            // SEC-1424: do nothing
-            return;
-        }
-
-        boolean sessionFixationProtectionRequired = !sessionFixationAttribute.equals(OPT_SESSION_FIXATION_NO_PROTECTION);
-
-        ManagedList<BeanMetadataElement> delegateSessionStrategies = new ManagedList<BeanMetadataElement>();
-        BeanDefinitionBuilder concurrentSessionStrategy;
-        BeanDefinitionBuilder sessionFixationStrategy = null;
-        BeanDefinitionBuilder registerSessionStrategy;
-
-        if(csrfAuthStrategy != null) {
-            delegateSessionStrategies.add(csrfAuthStrategy);
-        }
-
-        if (sessionControlEnabled) {
-            assert sessionRegistryRef != null;
-            concurrentSessionStrategy = BeanDefinitionBuilder.rootBeanDefinition(ConcurrentSessionControlAuthenticationStrategy.class);
-            concurrentSessionStrategy.addConstructorArgValue(sessionRegistryRef);
-
-            String maxSessions = sessionCtrlElt.getAttribute("max-sessions");
-
-            if (StringUtils.hasText(maxSessions)) {
-                concurrentSessionStrategy.addPropertyValue("maximumSessions", maxSessions);
-            }
-
-            String exceptionIfMaximumExceeded = sessionCtrlElt.getAttribute("error-if-maximum-exceeded");
-
-            if (StringUtils.hasText(exceptionIfMaximumExceeded)) {
-                concurrentSessionStrategy.addPropertyValue("exceptionIfMaximumExceeded", exceptionIfMaximumExceeded);
-            }
-            delegateSessionStrategies.add(concurrentSessionStrategy.getBeanDefinition());
-        }
-        boolean useChangeSessionId = OPT_CHANGE_SESSION_ID.equals(sessionFixationAttribute);
-        if (sessionFixationProtectionRequired || StringUtils.hasText(invalidSessionUrl)) {
-            if(useChangeSessionId) {
-                sessionFixationStrategy = BeanDefinitionBuilder.rootBeanDefinition(ChangeSessionIdAuthenticationStrategy.class);
-            } else {
-                sessionFixationStrategy = BeanDefinitionBuilder.rootBeanDefinition(SessionFixationProtectionStrategy.class);
-            }
-            delegateSessionStrategies.add(sessionFixationStrategy.getBeanDefinition());
-        }
-
-        if(StringUtils.hasText(sessionAuthStratRef)) {
-            delegateSessionStrategies.add(new RuntimeBeanReference(sessionAuthStratRef));
-        }
-
-        if(sessionControlEnabled) {
-            registerSessionStrategy = BeanDefinitionBuilder.rootBeanDefinition(RegisterSessionAuthenticationStrategy.class);
-            registerSessionStrategy.addConstructorArgValue(sessionRegistryRef);
-            delegateSessionStrategies.add(registerSessionStrategy.getBeanDefinition());
-        }
-
-        if(delegateSessionStrategies.isEmpty()) {
-            sfpf = null;
-            return;
-        }
-
-        BeanDefinitionBuilder sessionMgmtFilter = BeanDefinitionBuilder.rootBeanDefinition(SessionManagementFilter.class);
-        RootBeanDefinition failureHandler = new RootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
-        if (StringUtils.hasText(errorUrl)) {
-            failureHandler.getPropertyValues().addPropertyValue("defaultFailureUrl", errorUrl);
-        }
-        sessionMgmtFilter.addPropertyValue("authenticationFailureHandler", failureHandler);
-        sessionMgmtFilter.addConstructorArgValue(contextRepoRef);
-
-        if (!StringUtils.hasText(sessionAuthStratRef) && sessionFixationStrategy != null && !useChangeSessionId ) {
-
-            if (sessionFixationProtectionRequired) {
-                sessionFixationStrategy.addPropertyValue("migrateSessionAttributes",
-                        Boolean.valueOf(sessionFixationAttribute.equals(OPT_SESSION_FIXATION_MIGRATE_SESSION)));
-            }
-        }
-
-        if(!delegateSessionStrategies.isEmpty()) {
-            BeanDefinitionBuilder sessionStrategy = BeanDefinitionBuilder.rootBeanDefinition(CompositeSessionAuthenticationStrategy.class);
-            BeanDefinition strategyBean = sessionStrategy.getBeanDefinition();
-            sessionStrategy.addConstructorArgValue(delegateSessionStrategies);
-            sessionAuthStratRef = pc.getReaderContext().generateBeanName(strategyBean);
-            pc.registerBeanComponent(new BeanComponentDefinition(strategyBean, sessionAuthStratRef));
-
-        }
-
-        if (StringUtils.hasText(invalidSessionUrl)) {
-            BeanDefinitionBuilder invalidSessionBldr = BeanDefinitionBuilder.rootBeanDefinition(SimpleRedirectInvalidSessionStrategy.class);
-            invalidSessionBldr.addConstructorArgValue(invalidSessionUrl);
-            invalidSession = invalidSessionBldr.getBeanDefinition();
-            sessionMgmtFilter.addPropertyValue("invalidSessionStrategy", invalidSession);
-        }
-
-        sessionMgmtFilter.addConstructorArgReference(sessionAuthStratRef);
-
-        sfpf = (RootBeanDefinition) sessionMgmtFilter.getBeanDefinition();
-        sessionStrategyRef = new RuntimeBeanReference(sessionAuthStratRef);
-    }
-
-    private void createConcurrencyControlFilterAndSessionRegistry(Element element) {
-        final String ATT_EXPIRY_URL = "expired-url";
-        final String ATT_SESSION_REGISTRY_ALIAS = "session-registry-alias";
-        final String ATT_SESSION_REGISTRY_REF = "session-registry-ref";
-
-        CompositeComponentDefinition compositeDef =
-            new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element));
-        pc.pushContainingComponent(compositeDef);
-
-        BeanDefinitionRegistry beanRegistry = pc.getRegistry();
-
-        String sessionRegistryId = element.getAttribute(ATT_SESSION_REGISTRY_REF);
-
-        if (!StringUtils.hasText(sessionRegistryId)) {
-            // Register an internal SessionRegistryImpl if no external reference supplied.
-            RootBeanDefinition sessionRegistry = new RootBeanDefinition(SessionRegistryImpl.class);
-            sessionRegistryId = pc.getReaderContext().registerWithGeneratedName(sessionRegistry);
-            pc.registerComponent(new BeanComponentDefinition(sessionRegistry, sessionRegistryId));
-        }
-
-        String registryAlias = element.getAttribute(ATT_SESSION_REGISTRY_ALIAS);
-        if (StringUtils.hasText(registryAlias)) {
-            beanRegistry.registerAlias(sessionRegistryId, registryAlias);
-        }
-
-        BeanDefinitionBuilder filterBuilder =
-                BeanDefinitionBuilder.rootBeanDefinition(ConcurrentSessionFilter.class);
-        filterBuilder.addConstructorArgReference(sessionRegistryId);
-
-        Object source = pc.extractSource(element);
-        filterBuilder.getRawBeanDefinition().setSource(source);
-        filterBuilder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-
-        String expiryUrl = element.getAttribute(ATT_EXPIRY_URL);
-
-        if (StringUtils.hasText(expiryUrl)) {
-            WebConfigUtils.validateHttpRedirect(expiryUrl, pc, source);
-            filterBuilder.addConstructorArgValue(expiryUrl);
-        }
-
-        pc.popAndRegisterContainingComponent();
-
-        concurrentSessionFilter = filterBuilder.getBeanDefinition();
-        sessionRegistryRef = new RuntimeBeanReference(sessionRegistryId);
-    }
-
-    private void createWebAsyncManagerFilter() {
-        boolean asyncSupported = ClassUtils.hasMethod(ServletRequest.class, "startAsync");
-        if(asyncSupported) {
-            webAsyncManagerFilter = new RootBeanDefinition(WebAsyncManagerIntegrationFilter.class);
-        }
-    }
-
-    // Adds the servlet-api integration filter if required
-    private void createServletApiFilter(BeanReference authenticationManager) {
-        final String ATT_SERVLET_API_PROVISION = "servlet-api-provision";
-        final String DEF_SERVLET_API_PROVISION = "true";
-
-        String provideServletApi = httpElt.getAttribute(ATT_SERVLET_API_PROVISION);
-        if (!StringUtils.hasText(provideServletApi)) {
-            provideServletApi = DEF_SERVLET_API_PROVISION;
-        }
-
-        if ("true".equals(provideServletApi)) {
-            servApiFilter = new RootBeanDefinition(SecurityContextHolderAwareRequestFilter.class);
-            servApiFilter.getPropertyValues().add("authenticationManager", authenticationManager);
-        }
-    }
-
-    // Adds the jaas-api integration filter if required
-    private void createJaasApiFilter() {
-        final String ATT_JAAS_API_PROVISION = "jaas-api-provision";
-        final String DEF_JAAS_API_PROVISION = "false";
-
-        String provideJaasApi = httpElt.getAttribute(ATT_JAAS_API_PROVISION);
-        if (!StringUtils.hasText(provideJaasApi)) {
-            provideJaasApi = DEF_JAAS_API_PROVISION;
-        }
-
-        if ("true".equals(provideJaasApi)) {
-            jaasApiFilter = new RootBeanDefinition(JaasApiIntegrationFilter.class);
-        }
-    }
-
-    private void createChannelProcessingFilter() {
-        ManagedMap<BeanDefinition,BeanDefinition> channelRequestMap = parseInterceptUrlsForChannelSecurity();
-
-        if (channelRequestMap.isEmpty()) {
-            return;
-        }
-
-        RootBeanDefinition channelFilter = new RootBeanDefinition(ChannelProcessingFilter.class);
-        BeanDefinitionBuilder metadataSourceBldr = BeanDefinitionBuilder.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
-        metadataSourceBldr.addConstructorArgValue(channelRequestMap);
-//        metadataSourceBldr.addPropertyValue("stripQueryStringFromUrls", matcher instanceof AntUrlPathMatcher);
-
-        channelFilter.getPropertyValues().addPropertyValue("securityMetadataSource", metadataSourceBldr.getBeanDefinition());
-        RootBeanDefinition channelDecisionManager = new RootBeanDefinition(ChannelDecisionManagerImpl.class);
-        ManagedList<RootBeanDefinition> channelProcessors = new ManagedList<RootBeanDefinition>(3);
-        RootBeanDefinition secureChannelProcessor = new RootBeanDefinition(SecureChannelProcessor.class);
-        RootBeanDefinition retryWithHttp = new RootBeanDefinition(RetryWithHttpEntryPoint.class);
-        RootBeanDefinition retryWithHttps = new RootBeanDefinition(RetryWithHttpsEntryPoint.class);
-
-        retryWithHttp.getPropertyValues().addPropertyValue("portMapper", portMapper);
-        retryWithHttp.getPropertyValues().addPropertyValue("portResolver", portResolver);
-        retryWithHttps.getPropertyValues().addPropertyValue("portMapper", portMapper);
-        retryWithHttps.getPropertyValues().addPropertyValue("portResolver", portResolver);
-        secureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint", retryWithHttps);
-        RootBeanDefinition inSecureChannelProcessor = new RootBeanDefinition(InsecureChannelProcessor.class);
-        inSecureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint", retryWithHttp);
-        channelProcessors.add(secureChannelProcessor);
-        channelProcessors.add(inSecureChannelProcessor);
-        channelDecisionManager.getPropertyValues().addPropertyValue("channelProcessors", channelProcessors);
-
-        String id = pc.getReaderContext().registerWithGeneratedName(channelDecisionManager);
-        channelFilter.getPropertyValues().addPropertyValue("channelDecisionManager", new RuntimeBeanReference(id));
-        cpf = channelFilter;
-    }
-
-    /**
-     * Parses the intercept-url elements to obtain the map used by channel security.
-     * This will be empty unless the <tt>requires-channel</tt> attribute has been used on a URL path.
-     */
-    private ManagedMap<BeanDefinition,BeanDefinition> parseInterceptUrlsForChannelSecurity() {
-
-        ManagedMap<BeanDefinition, BeanDefinition> channelRequestMap = new ManagedMap<BeanDefinition, BeanDefinition>();
-
-        for (Element urlElt : interceptUrls) {
-            String path = urlElt.getAttribute(ATT_PATH_PATTERN);
-            String method = urlElt.getAttribute(ATT_HTTP_METHOD);
-
-            if(!StringUtils.hasText(path)) {
-                pc.getReaderContext().error("pattern attribute cannot be empty or null", urlElt);
-            }
-
-            String requiredChannel = urlElt.getAttribute(ATT_REQUIRES_CHANNEL);
-
-            if (StringUtils.hasText(requiredChannel)) {
-                BeanDefinition matcher = matcherType.createMatcher(path, method);
-
-                RootBeanDefinition channelAttributes = new RootBeanDefinition(ChannelAttributeFactory.class);
-                channelAttributes.getConstructorArgumentValues().addGenericArgumentValue(requiredChannel);
-                channelAttributes.setFactoryMethodName("createChannelAttributes");
-
-                channelRequestMap.put(matcher, channelAttributes);
-            }
-        }
-
-        return channelRequestMap;
-    }
-
-    private void createRequestCacheFilter() {
-        Element requestCacheElt = DomUtils.getChildElementByTagName(httpElt, Elements.REQUEST_CACHE);
-
-        if (requestCacheElt != null) {
-            requestCache = new RuntimeBeanReference(requestCacheElt.getAttribute(ATT_REF));
-        } else {
-            BeanDefinitionBuilder requestCacheBldr;
-
-            if (sessionPolicy == SessionCreationPolicy.STATELESS) {
-                requestCacheBldr = BeanDefinitionBuilder.rootBeanDefinition(NullRequestCache.class);
-            } else {
-                requestCacheBldr = BeanDefinitionBuilder.rootBeanDefinition(HttpSessionRequestCache.class);
-                requestCacheBldr.addPropertyValue("createSessionAllowed", sessionPolicy == SessionCreationPolicy.IF_REQUIRED);
-                requestCacheBldr.addPropertyValue("portResolver", portResolver);
-                if(csrfFilter != null) {
-                    BeanDefinitionBuilder requestCacheMatcherBldr = BeanDefinitionBuilder.rootBeanDefinition(AntPathRequestMatcher.class);
-                    requestCacheMatcherBldr.addConstructorArgValue("/**");
-                    requestCacheMatcherBldr.addConstructorArgValue("GET");
-                    requestCacheBldr.addPropertyValue("requestMatcher", requestCacheMatcherBldr.getBeanDefinition());
-                }
-            }
-
-            BeanDefinition bean = requestCacheBldr.getBeanDefinition();
-            String id = pc.getReaderContext().generateBeanName(bean);
-            pc.registerBeanComponent(new BeanComponentDefinition(bean, id));
-
-            this.requestCache = new RuntimeBeanReference(id);
-        }
-
-        requestCacheAwareFilter = new RootBeanDefinition(RequestCacheAwareFilter.class);
-        requestCacheAwareFilter.getConstructorArgumentValues().addGenericArgumentValue(requestCache);
-    }
-
-    private void createFilterSecurityInterceptor(BeanReference authManager) {
-        boolean useExpressions = FilterInvocationSecurityMetadataSourceParser.isUseExpressions(httpElt);
-        RootBeanDefinition securityMds = FilterInvocationSecurityMetadataSourceParser.createSecurityMetadataSource(interceptUrls, addAllAuth, httpElt, pc);
-
-        RootBeanDefinition accessDecisionMgr;
-        ManagedList<BeanDefinition> voters =  new ManagedList<BeanDefinition>(2);
-
-        if (useExpressions) {
-            BeanDefinitionBuilder expressionVoter = BeanDefinitionBuilder.rootBeanDefinition(WebExpressionVoter.class);
-            // Read the expression handler from the FISMS
-            RuntimeBeanReference expressionHandler = (RuntimeBeanReference)
-                    securityMds.getConstructorArgumentValues().getArgumentValue(1, RuntimeBeanReference.class).getValue();
-
-            expressionVoter.addPropertyValue("expressionHandler", expressionHandler);
-
-            voters.add(expressionVoter.getBeanDefinition());
-        } else {
-            voters.add(new RootBeanDefinition(RoleVoter.class));
-            voters.add(new RootBeanDefinition(AuthenticatedVoter.class));
-        }
-        accessDecisionMgr = new RootBeanDefinition(AffirmativeBased.class);
-        accessDecisionMgr.getConstructorArgumentValues().addGenericArgumentValue(voters);
-        accessDecisionMgr.setSource(pc.extractSource(httpElt));
-
-        // Set up the access manager reference for http
-        String accessManagerId = httpElt.getAttribute(ATT_ACCESS_MGR);
+	private static final String ATT_CREATE_SESSION = "create-session";
+
+	private static final String ATT_SESSION_FIXATION_PROTECTION = "session-fixation-protection";
+	private static final String OPT_SESSION_FIXATION_NO_PROTECTION = "none";
+	private static final String OPT_SESSION_FIXATION_MIGRATE_SESSION = "migrateSession";
+	private static final String OPT_CHANGE_SESSION_ID = "changeSessionId";
+
+	private static final String ATT_INVALID_SESSION_URL = "invalid-session-url";
+	private static final String ATT_SESSION_AUTH_STRATEGY_REF = "session-authentication-strategy-ref";
+	private static final String ATT_SESSION_AUTH_ERROR_URL = "session-authentication-error-url";
+	private static final String ATT_SECURITY_CONTEXT_REPOSITORY = "security-context-repository-ref";
+
+	private static final String ATT_DISABLE_URL_REWRITING = "disable-url-rewriting";
+
+	private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
+	private static final String ATT_ONCE_PER_REQUEST = "once-per-request";
+
+	private static final String ATT_REF = "ref";
+
+	private final Element httpElt;
+	private final ParserContext pc;
+	private final SessionCreationPolicy sessionPolicy;
+	private final List<Element> interceptUrls;
+	private final MatcherType matcherType;
+
+	private BeanDefinition cpf;
+	private BeanDefinition securityContextPersistenceFilter;
+	private BeanReference contextRepoRef;
+	private BeanReference sessionRegistryRef;
+	private BeanDefinition concurrentSessionFilter;
+	private BeanDefinition webAsyncManagerFilter;
+	private BeanDefinition requestCacheAwareFilter;
+	private BeanReference sessionStrategyRef;
+	private RootBeanDefinition sfpf;
+	private BeanDefinition servApiFilter;
+	private BeanDefinition jaasApiFilter;
+	private final BeanReference portMapper;
+	private final BeanReference portResolver;
+	private BeanReference fsi;
+	private BeanReference requestCache;
+	private BeanDefinition addHeadersFilter;
+	private BeanDefinition csrfFilter;
+	private BeanMetadataElement csrfLogoutHandler;
+	private BeanMetadataElement csrfAuthStrategy;
+
+	private CsrfBeanDefinitionParser csrfParser;
+
+	private BeanDefinition invalidSession;
+	private boolean addAllAuth;
+
+	public HttpConfigurationBuilder(Element element, boolean addAllAuth,
+			ParserContext pc, BeanReference portMapper, BeanReference portResolver,
+			BeanReference authenticationManager) {
+		this.httpElt = element;
+		this.addAllAuth = addAllAuth;
+		this.pc = pc;
+		this.portMapper = portMapper;
+		this.portResolver = portResolver;
+		this.matcherType = MatcherType.fromElement(element);
+		interceptUrls = DomUtils.getChildElementsByTagName(element,
+				Elements.INTERCEPT_URL);
+
+		for (Element urlElt : interceptUrls) {
+			if (StringUtils.hasText(urlElt.getAttribute(ATT_FILTERS))) {
+				pc.getReaderContext()
+						.error("The use of \"filters='none'\" is no longer supported. Please define a"
+								+ " separate <http> element for the pattern you want to exclude and use the attribute"
+								+ " \"security='none'\".", pc.extractSource(urlElt));
+			}
+		}
+
+		String createSession = element.getAttribute(ATT_CREATE_SESSION);
+
+		if (StringUtils.hasText(createSession)) {
+			sessionPolicy = createPolicy(createSession);
+		}
+		else {
+			sessionPolicy = SessionCreationPolicy.IF_REQUIRED;
+		}
+
+		createCsrfFilter();
+		createSecurityContextPersistenceFilter();
+		createSessionManagementFilters();
+		createWebAsyncManagerFilter();
+		createRequestCacheFilter();
+		createServletApiFilter(authenticationManager);
+		createJaasApiFilter();
+		createChannelProcessingFilter();
+		createFilterSecurityInterceptor(authenticationManager);
+		createAddHeadersFilter();
+	}
+
+	private SessionCreationPolicy createPolicy(String createSession) {
+		if ("ifRequired".equals(createSession)) {
+			return SessionCreationPolicy.IF_REQUIRED;
+		}
+		else if ("always".equals(createSession)) {
+			return SessionCreationPolicy.ALWAYS;
+		}
+		else if ("never".equals(createSession)) {
+			return SessionCreationPolicy.NEVER;
+		}
+		else if ("stateless".equals(createSession)) {
+			return SessionCreationPolicy.STATELESS;
+		}
+
+		throw new IllegalStateException("Cannot convert " + createSession + " to "
+				+ SessionCreationPolicy.class.getName());
+	}
+
+	@SuppressWarnings("rawtypes")
+	void setLogoutHandlers(ManagedList logoutHandlers) {
+		if (logoutHandlers != null) {
+			if (concurrentSessionFilter != null) {
+				concurrentSessionFilter.getPropertyValues().add("logoutHandlers",
+						logoutHandlers);
+			}
+			if (servApiFilter != null) {
+				servApiFilter.getPropertyValues().add("logoutHandlers", logoutHandlers);
+			}
+		}
+	}
+
+	void setEntryPoint(BeanMetadataElement entryPoint) {
+		if (servApiFilter != null) {
+			servApiFilter.getPropertyValues().add("authenticationEntryPoint", entryPoint);
+		}
+	}
+
+	void setAccessDeniedHandler(BeanMetadataElement accessDeniedHandler) {
+		if (csrfParser != null) {
+			csrfParser.initAccessDeniedHandler(this.invalidSession, accessDeniedHandler);
+		}
+	}
+
+	// Needed to account for placeholders
+	static String createPath(String path, boolean lowerCase) {
+		return lowerCase ? path.toLowerCase() : path;
+	}
+
+	private void createSecurityContextPersistenceFilter() {
+		BeanDefinitionBuilder scpf = BeanDefinitionBuilder
+				.rootBeanDefinition(SecurityContextPersistenceFilter.class);
+
+		String repoRef = httpElt.getAttribute(ATT_SECURITY_CONTEXT_REPOSITORY);
+		String disableUrlRewriting = httpElt.getAttribute(ATT_DISABLE_URL_REWRITING);
+
+		if (StringUtils.hasText(repoRef)) {
+			if (sessionPolicy == SessionCreationPolicy.ALWAYS) {
+				scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
+			}
+		}
+		else {
+			BeanDefinitionBuilder contextRepo;
+			if (sessionPolicy == SessionCreationPolicy.STATELESS) {
+				contextRepo = BeanDefinitionBuilder
+						.rootBeanDefinition(NullSecurityContextRepository.class);
+			}
+			else {
+				contextRepo = BeanDefinitionBuilder
+						.rootBeanDefinition(HttpSessionSecurityContextRepository.class);
+				switch (sessionPolicy) {
+				case ALWAYS:
+					contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
+					scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
+					break;
+				case NEVER:
+					contextRepo.addPropertyValue("allowSessionCreation", Boolean.FALSE);
+					scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
+					break;
+				default:
+					contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
+					scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
+				}
+
+				if ("true".equals(disableUrlRewriting)) {
+					contextRepo.addPropertyValue("disableUrlRewriting", Boolean.TRUE);
+				}
+			}
+
+			BeanDefinition repoBean = contextRepo.getBeanDefinition();
+			repoRef = pc.getReaderContext().generateBeanName(repoBean);
+			pc.registerBeanComponent(new BeanComponentDefinition(repoBean, repoRef));
+		}
+
+		contextRepoRef = new RuntimeBeanReference(repoRef);
+		scpf.addConstructorArgValue(contextRepoRef);
+
+		securityContextPersistenceFilter = scpf.getBeanDefinition();
+	}
+
+	private void createSessionManagementFilters() {
+		Element sessionMgmtElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.SESSION_MANAGEMENT);
+		Element sessionCtrlElt = null;
+
+		String sessionFixationAttribute = null;
+		String invalidSessionUrl = null;
+		String sessionAuthStratRef = null;
+		String errorUrl = null;
+
+		boolean sessionControlEnabled = false;
+		if (sessionMgmtElt != null) {
+			if (sessionPolicy == SessionCreationPolicy.STATELESS) {
+				pc.getReaderContext().error(
+						Elements.SESSION_MANAGEMENT + "  cannot be used"
+								+ " in combination with " + ATT_CREATE_SESSION + "='"
+								+ SessionCreationPolicy.STATELESS + "'",
+						pc.extractSource(sessionMgmtElt));
+			}
+			sessionFixationAttribute = sessionMgmtElt
+					.getAttribute(ATT_SESSION_FIXATION_PROTECTION);
+			invalidSessionUrl = sessionMgmtElt.getAttribute(ATT_INVALID_SESSION_URL);
+			sessionAuthStratRef = sessionMgmtElt
+					.getAttribute(ATT_SESSION_AUTH_STRATEGY_REF);
+			errorUrl = sessionMgmtElt.getAttribute(ATT_SESSION_AUTH_ERROR_URL);
+			sessionCtrlElt = DomUtils.getChildElementByTagName(sessionMgmtElt,
+					Elements.CONCURRENT_SESSIONS);
+			sessionControlEnabled = sessionCtrlElt != null;
+
+			if (sessionControlEnabled) {
+				if (StringUtils.hasText(sessionAuthStratRef)) {
+					pc.getReaderContext().error(
+							ATT_SESSION_AUTH_STRATEGY_REF + " attribute cannot be used"
+									+ " in combination with <"
+									+ Elements.CONCURRENT_SESSIONS + ">",
+							pc.extractSource(sessionCtrlElt));
+				}
+				createConcurrencyControlFilterAndSessionRegistry(sessionCtrlElt);
+			}
+		}
+
+		if (!StringUtils.hasText(sessionFixationAttribute)) {
+			Method changeSessionIdMethod = ReflectionUtils.findMethod(
+					HttpServletRequest.class, "changeSessionId");
+			sessionFixationAttribute = changeSessionIdMethod == null ? OPT_SESSION_FIXATION_MIGRATE_SESSION
+					: OPT_CHANGE_SESSION_ID;
+		}
+		else if (StringUtils.hasText(sessionAuthStratRef)) {
+			pc.getReaderContext().error(
+					ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used"
+							+ " in combination with " + ATT_SESSION_AUTH_STRATEGY_REF,
+					pc.extractSource(sessionMgmtElt));
+		}
+
+		if (sessionPolicy == SessionCreationPolicy.STATELESS) {
+			// SEC-1424: do nothing
+			return;
+		}
+
+		boolean sessionFixationProtectionRequired = !sessionFixationAttribute
+				.equals(OPT_SESSION_FIXATION_NO_PROTECTION);
+
+		ManagedList<BeanMetadataElement> delegateSessionStrategies = new ManagedList<BeanMetadataElement>();
+		BeanDefinitionBuilder concurrentSessionStrategy;
+		BeanDefinitionBuilder sessionFixationStrategy = null;
+		BeanDefinitionBuilder registerSessionStrategy;
+
+		if (csrfAuthStrategy != null) {
+			delegateSessionStrategies.add(csrfAuthStrategy);
+		}
+
+		if (sessionControlEnabled) {
+			assert sessionRegistryRef != null;
+			concurrentSessionStrategy = BeanDefinitionBuilder
+					.rootBeanDefinition(ConcurrentSessionControlAuthenticationStrategy.class);
+			concurrentSessionStrategy.addConstructorArgValue(sessionRegistryRef);
+
+			String maxSessions = sessionCtrlElt.getAttribute("max-sessions");
+
+			if (StringUtils.hasText(maxSessions)) {
+				concurrentSessionStrategy
+						.addPropertyValue("maximumSessions", maxSessions);
+			}
+
+			String exceptionIfMaximumExceeded = sessionCtrlElt
+					.getAttribute("error-if-maximum-exceeded");
+
+			if (StringUtils.hasText(exceptionIfMaximumExceeded)) {
+				concurrentSessionStrategy.addPropertyValue("exceptionIfMaximumExceeded",
+						exceptionIfMaximumExceeded);
+			}
+			delegateSessionStrategies.add(concurrentSessionStrategy.getBeanDefinition());
+		}
+		boolean useChangeSessionId = OPT_CHANGE_SESSION_ID
+				.equals(sessionFixationAttribute);
+		if (sessionFixationProtectionRequired || StringUtils.hasText(invalidSessionUrl)) {
+			if (useChangeSessionId) {
+				sessionFixationStrategy = BeanDefinitionBuilder
+						.rootBeanDefinition(ChangeSessionIdAuthenticationStrategy.class);
+			}
+			else {
+				sessionFixationStrategy = BeanDefinitionBuilder
+						.rootBeanDefinition(SessionFixationProtectionStrategy.class);
+			}
+			delegateSessionStrategies.add(sessionFixationStrategy.getBeanDefinition());
+		}
+
+		if (StringUtils.hasText(sessionAuthStratRef)) {
+			delegateSessionStrategies.add(new RuntimeBeanReference(sessionAuthStratRef));
+		}
+
+		if (sessionControlEnabled) {
+			registerSessionStrategy = BeanDefinitionBuilder
+					.rootBeanDefinition(RegisterSessionAuthenticationStrategy.class);
+			registerSessionStrategy.addConstructorArgValue(sessionRegistryRef);
+			delegateSessionStrategies.add(registerSessionStrategy.getBeanDefinition());
+		}
+
+		if (delegateSessionStrategies.isEmpty()) {
+			sfpf = null;
+			return;
+		}
+
+		BeanDefinitionBuilder sessionMgmtFilter = BeanDefinitionBuilder
+				.rootBeanDefinition(SessionManagementFilter.class);
+		RootBeanDefinition failureHandler = new RootBeanDefinition(
+				SimpleUrlAuthenticationFailureHandler.class);
+		if (StringUtils.hasText(errorUrl)) {
+			failureHandler.getPropertyValues().addPropertyValue("defaultFailureUrl",
+					errorUrl);
+		}
+		sessionMgmtFilter
+				.addPropertyValue("authenticationFailureHandler", failureHandler);
+		sessionMgmtFilter.addConstructorArgValue(contextRepoRef);
+
+		if (!StringUtils.hasText(sessionAuthStratRef) && sessionFixationStrategy != null
+				&& !useChangeSessionId) {
+
+			if (sessionFixationProtectionRequired) {
+				sessionFixationStrategy.addPropertyValue("migrateSessionAttributes",
+						Boolean.valueOf(sessionFixationAttribute
+								.equals(OPT_SESSION_FIXATION_MIGRATE_SESSION)));
+			}
+		}
+
+		if (!delegateSessionStrategies.isEmpty()) {
+			BeanDefinitionBuilder sessionStrategy = BeanDefinitionBuilder
+					.rootBeanDefinition(CompositeSessionAuthenticationStrategy.class);
+			BeanDefinition strategyBean = sessionStrategy.getBeanDefinition();
+			sessionStrategy.addConstructorArgValue(delegateSessionStrategies);
+			sessionAuthStratRef = pc.getReaderContext().generateBeanName(strategyBean);
+			pc.registerBeanComponent(new BeanComponentDefinition(strategyBean,
+					sessionAuthStratRef));
+
+		}
+
+		if (StringUtils.hasText(invalidSessionUrl)) {
+			BeanDefinitionBuilder invalidSessionBldr = BeanDefinitionBuilder
+					.rootBeanDefinition(SimpleRedirectInvalidSessionStrategy.class);
+			invalidSessionBldr.addConstructorArgValue(invalidSessionUrl);
+			invalidSession = invalidSessionBldr.getBeanDefinition();
+			sessionMgmtFilter.addPropertyValue("invalidSessionStrategy", invalidSession);
+		}
+
+		sessionMgmtFilter.addConstructorArgReference(sessionAuthStratRef);
+
+		sfpf = (RootBeanDefinition) sessionMgmtFilter.getBeanDefinition();
+		sessionStrategyRef = new RuntimeBeanReference(sessionAuthStratRef);
+	}
+
+	private void createConcurrencyControlFilterAndSessionRegistry(Element element) {
+		final String ATT_EXPIRY_URL = "expired-url";
+		final String ATT_SESSION_REGISTRY_ALIAS = "session-registry-alias";
+		final String ATT_SESSION_REGISTRY_REF = "session-registry-ref";
+
+		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(
+				element.getTagName(), pc.extractSource(element));
+		pc.pushContainingComponent(compositeDef);
+
+		BeanDefinitionRegistry beanRegistry = pc.getRegistry();
+
+		String sessionRegistryId = element.getAttribute(ATT_SESSION_REGISTRY_REF);
+
+		if (!StringUtils.hasText(sessionRegistryId)) {
+			// Register an internal SessionRegistryImpl if no external reference supplied.
+			RootBeanDefinition sessionRegistry = new RootBeanDefinition(
+					SessionRegistryImpl.class);
+			sessionRegistryId = pc.getReaderContext().registerWithGeneratedName(
+					sessionRegistry);
+			pc.registerComponent(new BeanComponentDefinition(sessionRegistry,
+					sessionRegistryId));
+		}
+
+		String registryAlias = element.getAttribute(ATT_SESSION_REGISTRY_ALIAS);
+		if (StringUtils.hasText(registryAlias)) {
+			beanRegistry.registerAlias(sessionRegistryId, registryAlias);
+		}
+
+		BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(ConcurrentSessionFilter.class);
+		filterBuilder.addConstructorArgReference(sessionRegistryId);
+
+		Object source = pc.extractSource(element);
+		filterBuilder.getRawBeanDefinition().setSource(source);
+		filterBuilder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+
+		String expiryUrl = element.getAttribute(ATT_EXPIRY_URL);
+
+		if (StringUtils.hasText(expiryUrl)) {
+			WebConfigUtils.validateHttpRedirect(expiryUrl, pc, source);
+			filterBuilder.addConstructorArgValue(expiryUrl);
+		}
+
+		pc.popAndRegisterContainingComponent();
+
+		concurrentSessionFilter = filterBuilder.getBeanDefinition();
+		sessionRegistryRef = new RuntimeBeanReference(sessionRegistryId);
+	}
+
+	private void createWebAsyncManagerFilter() {
+		boolean asyncSupported = ClassUtils.hasMethod(ServletRequest.class, "startAsync");
+		if (asyncSupported) {
+			webAsyncManagerFilter = new RootBeanDefinition(
+					WebAsyncManagerIntegrationFilter.class);
+		}
+	}
+
+	// Adds the servlet-api integration filter if required
+	private void createServletApiFilter(BeanReference authenticationManager) {
+		final String ATT_SERVLET_API_PROVISION = "servlet-api-provision";
+		final String DEF_SERVLET_API_PROVISION = "true";
+
+		String provideServletApi = httpElt.getAttribute(ATT_SERVLET_API_PROVISION);
+		if (!StringUtils.hasText(provideServletApi)) {
+			provideServletApi = DEF_SERVLET_API_PROVISION;
+		}
+
+		if ("true".equals(provideServletApi)) {
+			servApiFilter = new RootBeanDefinition(
+					SecurityContextHolderAwareRequestFilter.class);
+			servApiFilter.getPropertyValues().add("authenticationManager",
+					authenticationManager);
+		}
+	}
+
+	// Adds the jaas-api integration filter if required
+	private void createJaasApiFilter() {
+		final String ATT_JAAS_API_PROVISION = "jaas-api-provision";
+		final String DEF_JAAS_API_PROVISION = "false";
+
+		String provideJaasApi = httpElt.getAttribute(ATT_JAAS_API_PROVISION);
+		if (!StringUtils.hasText(provideJaasApi)) {
+			provideJaasApi = DEF_JAAS_API_PROVISION;
+		}
+
+		if ("true".equals(provideJaasApi)) {
+			jaasApiFilter = new RootBeanDefinition(JaasApiIntegrationFilter.class);
+		}
+	}
+
+	private void createChannelProcessingFilter() {
+		ManagedMap<BeanDefinition, BeanDefinition> channelRequestMap = parseInterceptUrlsForChannelSecurity();
+
+		if (channelRequestMap.isEmpty()) {
+			return;
+		}
+
+		RootBeanDefinition channelFilter = new RootBeanDefinition(
+				ChannelProcessingFilter.class);
+		BeanDefinitionBuilder metadataSourceBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
+		metadataSourceBldr.addConstructorArgValue(channelRequestMap);
+		// metadataSourceBldr.addPropertyValue("stripQueryStringFromUrls", matcher
+		// instanceof AntUrlPathMatcher);
+
+		channelFilter.getPropertyValues().addPropertyValue("securityMetadataSource",
+				metadataSourceBldr.getBeanDefinition());
+		RootBeanDefinition channelDecisionManager = new RootBeanDefinition(
+				ChannelDecisionManagerImpl.class);
+		ManagedList<RootBeanDefinition> channelProcessors = new ManagedList<RootBeanDefinition>(
+				3);
+		RootBeanDefinition secureChannelProcessor = new RootBeanDefinition(
+				SecureChannelProcessor.class);
+		RootBeanDefinition retryWithHttp = new RootBeanDefinition(
+				RetryWithHttpEntryPoint.class);
+		RootBeanDefinition retryWithHttps = new RootBeanDefinition(
+				RetryWithHttpsEntryPoint.class);
+
+		retryWithHttp.getPropertyValues().addPropertyValue("portMapper", portMapper);
+		retryWithHttp.getPropertyValues().addPropertyValue("portResolver", portResolver);
+		retryWithHttps.getPropertyValues().addPropertyValue("portMapper", portMapper);
+		retryWithHttps.getPropertyValues().addPropertyValue("portResolver", portResolver);
+		secureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint",
+				retryWithHttps);
+		RootBeanDefinition inSecureChannelProcessor = new RootBeanDefinition(
+				InsecureChannelProcessor.class);
+		inSecureChannelProcessor.getPropertyValues().addPropertyValue("entryPoint",
+				retryWithHttp);
+		channelProcessors.add(secureChannelProcessor);
+		channelProcessors.add(inSecureChannelProcessor);
+		channelDecisionManager.getPropertyValues().addPropertyValue("channelProcessors",
+				channelProcessors);
+
+		String id = pc.getReaderContext().registerWithGeneratedName(
+				channelDecisionManager);
+		channelFilter.getPropertyValues().addPropertyValue("channelDecisionManager",
+				new RuntimeBeanReference(id));
+		cpf = channelFilter;
+	}
+
+	/**
+	 * Parses the intercept-url elements to obtain the map used by channel security. This
+	 * will be empty unless the <tt>requires-channel</tt> attribute has been used on a URL
+	 * path.
+	 */
+	private ManagedMap<BeanDefinition, BeanDefinition> parseInterceptUrlsForChannelSecurity() {
+
+		ManagedMap<BeanDefinition, BeanDefinition> channelRequestMap = new ManagedMap<BeanDefinition, BeanDefinition>();
+
+		for (Element urlElt : interceptUrls) {
+			String path = urlElt.getAttribute(ATT_PATH_PATTERN);
+			String method = urlElt.getAttribute(ATT_HTTP_METHOD);
+
+			if (!StringUtils.hasText(path)) {
+				pc.getReaderContext().error("pattern attribute cannot be empty or null",
+						urlElt);
+			}
+
+			String requiredChannel = urlElt.getAttribute(ATT_REQUIRES_CHANNEL);
+
+			if (StringUtils.hasText(requiredChannel)) {
+				BeanDefinition matcher = matcherType.createMatcher(path, method);
+
+				RootBeanDefinition channelAttributes = new RootBeanDefinition(
+						ChannelAttributeFactory.class);
+				channelAttributes.getConstructorArgumentValues().addGenericArgumentValue(
+						requiredChannel);
+				channelAttributes.setFactoryMethodName("createChannelAttributes");
+
+				channelRequestMap.put(matcher, channelAttributes);
+			}
+		}
+
+		return channelRequestMap;
+	}
+
+	private void createRequestCacheFilter() {
+		Element requestCacheElt = DomUtils.getChildElementByTagName(httpElt,
+				Elements.REQUEST_CACHE);
+
+		if (requestCacheElt != null) {
+			requestCache = new RuntimeBeanReference(requestCacheElt.getAttribute(ATT_REF));
+		}
+		else {
+			BeanDefinitionBuilder requestCacheBldr;
+
+			if (sessionPolicy == SessionCreationPolicy.STATELESS) {
+				requestCacheBldr = BeanDefinitionBuilder
+						.rootBeanDefinition(NullRequestCache.class);
+			}
+			else {
+				requestCacheBldr = BeanDefinitionBuilder
+						.rootBeanDefinition(HttpSessionRequestCache.class);
+				requestCacheBldr.addPropertyValue("createSessionAllowed",
+						sessionPolicy == SessionCreationPolicy.IF_REQUIRED);
+				requestCacheBldr.addPropertyValue("portResolver", portResolver);
+				if (csrfFilter != null) {
+					BeanDefinitionBuilder requestCacheMatcherBldr = BeanDefinitionBuilder
+							.rootBeanDefinition(AntPathRequestMatcher.class);
+					requestCacheMatcherBldr.addConstructorArgValue("/**");
+					requestCacheMatcherBldr.addConstructorArgValue("GET");
+					requestCacheBldr.addPropertyValue("requestMatcher",
+							requestCacheMatcherBldr.getBeanDefinition());
+				}
+			}
+
+			BeanDefinition bean = requestCacheBldr.getBeanDefinition();
+			String id = pc.getReaderContext().generateBeanName(bean);
+			pc.registerBeanComponent(new BeanComponentDefinition(bean, id));
+
+			this.requestCache = new RuntimeBeanReference(id);
+		}
+
+		requestCacheAwareFilter = new RootBeanDefinition(RequestCacheAwareFilter.class);
+		requestCacheAwareFilter.getConstructorArgumentValues().addGenericArgumentValue(
+				requestCache);
+	}
+
+	private void createFilterSecurityInterceptor(BeanReference authManager) {
+		boolean useExpressions = FilterInvocationSecurityMetadataSourceParser
+				.isUseExpressions(httpElt);
+		RootBeanDefinition securityMds = FilterInvocationSecurityMetadataSourceParser
+				.createSecurityMetadataSource(interceptUrls, addAllAuth, httpElt, pc);
+
+		RootBeanDefinition accessDecisionMgr;
+		ManagedList<BeanDefinition> voters = new ManagedList<BeanDefinition>(2);
+
+		if (useExpressions) {
+			BeanDefinitionBuilder expressionVoter = BeanDefinitionBuilder
+					.rootBeanDefinition(WebExpressionVoter.class);
+			// Read the expression handler from the FISMS
+			RuntimeBeanReference expressionHandler = (RuntimeBeanReference) securityMds
+					.getConstructorArgumentValues()
+					.getArgumentValue(1, RuntimeBeanReference.class).getValue();
+
+			expressionVoter.addPropertyValue("expressionHandler", expressionHandler);
+
+			voters.add(expressionVoter.getBeanDefinition());
+		}
+		else {
+			voters.add(new RootBeanDefinition(RoleVoter.class));
+			voters.add(new RootBeanDefinition(AuthenticatedVoter.class));
+		}
+		accessDecisionMgr = new RootBeanDefinition(AffirmativeBased.class);
+		accessDecisionMgr.getConstructorArgumentValues().addGenericArgumentValue(voters);
+		accessDecisionMgr.setSource(pc.extractSource(httpElt));
+
+		// Set up the access manager reference for http
+		String accessManagerId = httpElt.getAttribute(ATT_ACCESS_MGR);
+
+		if (!StringUtils.hasText(accessManagerId)) {
+			accessManagerId = pc.getReaderContext().generateBeanName(accessDecisionMgr);
+			pc.registerBeanComponent(new BeanComponentDefinition(accessDecisionMgr,
+					accessManagerId));
+		}
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(FilterSecurityInterceptor.class);
+
+		builder.addPropertyReference("accessDecisionManager", accessManagerId);
+		builder.addPropertyValue("authenticationManager", authManager);
+
+		if ("false".equals(httpElt.getAttribute(ATT_ONCE_PER_REQUEST))) {
+			builder.addPropertyValue("observeOncePerRequest", Boolean.FALSE);
+		}
+
+		builder.addPropertyValue("securityMetadataSource", securityMds);
+		BeanDefinition fsiBean = builder.getBeanDefinition();
+		String fsiId = pc.getReaderContext().generateBeanName(fsiBean);
+		pc.registerBeanComponent(new BeanComponentDefinition(fsiBean, fsiId));
+
+		// Create and register a DefaultWebInvocationPrivilegeEvaluator for use with
+		// taglibs etc.
+		BeanDefinition wipe = new RootBeanDefinition(
+				DefaultWebInvocationPrivilegeEvaluator.class);
+		wipe.getConstructorArgumentValues().addGenericArgumentValue(
+				new RuntimeBeanReference(fsiId));
+
+		pc.registerBeanComponent(new BeanComponentDefinition(wipe, pc.getReaderContext()
+				.generateBeanName(wipe)));
+
+		this.fsi = new RuntimeBeanReference(fsiId);
+	}
+
+	private void createAddHeadersFilter() {
+		Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.HEADERS);
+		this.addHeadersFilter = new HeadersBeanDefinitionParser().parse(elmt, pc);
+
+	}
+
+	private void createCsrfFilter() {
+		Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.CSRF);
+		csrfParser = new CsrfBeanDefinitionParser();
+		csrfFilter = csrfParser.parse(elmt, pc);
+
+		if (csrfFilter == null) {
+			csrfParser = null;
+			return;
+		}
+
+		this.csrfAuthStrategy = csrfParser.getCsrfAuthenticationStrategy();
+		this.csrfLogoutHandler = csrfParser.getCsrfLogoutHandler();
+	}
+
+	BeanMetadataElement getCsrfLogoutHandler() {
+		return this.csrfLogoutHandler;
+	}
+
+	BeanReference getSessionStrategy() {
+		return sessionStrategyRef;
+	}
+
+	SessionCreationPolicy getSessionCreationPolicy() {
+		return sessionPolicy;
+	}
+
+	BeanReference getRequestCache() {
+		return requestCache;
+	}
+
+	List<OrderDecorator> getFilters() {
+		List<OrderDecorator> filters = new ArrayList<OrderDecorator>();
+
+		if (cpf != null) {
+			filters.add(new OrderDecorator(cpf, CHANNEL_FILTER));
+		}
+
+		if (concurrentSessionFilter != null) {
+			filters.add(new OrderDecorator(concurrentSessionFilter,
+					CONCURRENT_SESSION_FILTER));
+		}
+
+		if (webAsyncManagerFilter != null) {
+			filters.add(new OrderDecorator(webAsyncManagerFilter,
+					WEB_ASYNC_MANAGER_FILTER));
+		}
+
+		filters.add(new OrderDecorator(securityContextPersistenceFilter,
+				SECURITY_CONTEXT_FILTER));
+
+		if (servApiFilter != null) {
+			filters.add(new OrderDecorator(servApiFilter, SERVLET_API_SUPPORT_FILTER));
+		}
 
-        if (!StringUtils.hasText(accessManagerId)) {
-            accessManagerId = pc.getReaderContext().generateBeanName(accessDecisionMgr);
-            pc.registerBeanComponent(new BeanComponentDefinition(accessDecisionMgr, accessManagerId));
-        }
+		if (jaasApiFilter != null) {
+			filters.add(new OrderDecorator(jaasApiFilter, JAAS_API_SUPPORT_FILTER));
+		}
 
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(FilterSecurityInterceptor.class);
+		if (sfpf != null) {
+			filters.add(new OrderDecorator(sfpf, SESSION_MANAGEMENT_FILTER));
+		}
 
-        builder.addPropertyReference("accessDecisionManager", accessManagerId);
-        builder.addPropertyValue("authenticationManager", authManager);
+		filters.add(new OrderDecorator(fsi, FILTER_SECURITY_INTERCEPTOR));
 
-        if ("false".equals(httpElt.getAttribute(ATT_ONCE_PER_REQUEST))) {
-            builder.addPropertyValue("observeOncePerRequest", Boolean.FALSE);
-        }
+		if (sessionPolicy != SessionCreationPolicy.STATELESS) {
+			filters.add(new OrderDecorator(requestCacheAwareFilter, REQUEST_CACHE_FILTER));
+		}
 
-        builder.addPropertyValue("securityMetadataSource", securityMds);
-        BeanDefinition fsiBean = builder.getBeanDefinition();
-        String fsiId = pc.getReaderContext().generateBeanName(fsiBean);
-        pc.registerBeanComponent(new BeanComponentDefinition(fsiBean,fsiId));
+		if (addHeadersFilter != null) {
+			filters.add(new OrderDecorator(addHeadersFilter, HEADERS_FILTER));
+		}
 
-        // Create and register a DefaultWebInvocationPrivilegeEvaluator for use with taglibs etc.
-        BeanDefinition wipe = new RootBeanDefinition(DefaultWebInvocationPrivilegeEvaluator.class);
-        wipe.getConstructorArgumentValues().addGenericArgumentValue(new RuntimeBeanReference(fsiId));
+		if (csrfFilter != null) {
+			filters.add(new OrderDecorator(csrfFilter, CSRF_FILTER));
+		}
 
-        pc.registerBeanComponent(new BeanComponentDefinition(wipe, pc.getReaderContext().generateBeanName(wipe)));
-
-        this.fsi = new RuntimeBeanReference(fsiId);
-    }
-
-    private void createAddHeadersFilter() {
-        Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.HEADERS);
-        this.addHeadersFilter = new HeadersBeanDefinitionParser().parse(elmt, pc);
-
-    }
-
-    private void createCsrfFilter() {
-        Element elmt = DomUtils.getChildElementByTagName(httpElt, Elements.CSRF);
-        csrfParser = new CsrfBeanDefinitionParser();
-        csrfFilter = csrfParser.parse(elmt, pc);
-
-        if(csrfFilter == null) {
-            csrfParser = null;
-            return;
-        }
-
-        this.csrfAuthStrategy = csrfParser.getCsrfAuthenticationStrategy();
-        this.csrfLogoutHandler = csrfParser.getCsrfLogoutHandler();
-    }
-
-    BeanMetadataElement getCsrfLogoutHandler() {
-        return this.csrfLogoutHandler;
-    }
-
-    BeanReference getSessionStrategy() {
-        return sessionStrategyRef;
-    }
-
-    SessionCreationPolicy getSessionCreationPolicy() {
-        return sessionPolicy;
-    }
-
-    BeanReference getRequestCache() {
-        return requestCache;
-    }
-
-    List<OrderDecorator> getFilters() {
-        List<OrderDecorator> filters = new ArrayList<OrderDecorator>();
-
-        if (cpf != null) {
-            filters.add(new OrderDecorator(cpf, CHANNEL_FILTER));
-        }
-
-        if (concurrentSessionFilter != null) {
-            filters.add(new OrderDecorator(concurrentSessionFilter, CONCURRENT_SESSION_FILTER));
-        }
-
-        if (webAsyncManagerFilter != null) {
-            filters.add(new OrderDecorator(webAsyncManagerFilter, WEB_ASYNC_MANAGER_FILTER));
-        }
-
-        filters.add(new OrderDecorator(securityContextPersistenceFilter, SECURITY_CONTEXT_FILTER));
-
-        if (servApiFilter != null) {
-            filters.add(new OrderDecorator(servApiFilter, SERVLET_API_SUPPORT_FILTER));
-        }
-
-        if (jaasApiFilter != null) {
-            filters.add(new OrderDecorator(jaasApiFilter, JAAS_API_SUPPORT_FILTER));
-        }
-
-        if (sfpf != null) {
-            filters.add(new OrderDecorator(sfpf, SESSION_MANAGEMENT_FILTER));
-        }
-
-        filters.add(new OrderDecorator(fsi, FILTER_SECURITY_INTERCEPTOR));
-
-        if (sessionPolicy != SessionCreationPolicy.STATELESS) {
-            filters.add(new OrderDecorator(requestCacheAwareFilter, REQUEST_CACHE_FILTER));
-        }
-
-        if (addHeadersFilter != null) {
-            filters.add(new OrderDecorator(addHeadersFilter, HEADERS_FILTER));
-        }
-
-        if (csrfFilter != null) {
-            filters.add(new OrderDecorator(csrfFilter, CSRF_FILTER));
-        }
-
-        return filters;
-    }
+		return filters;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/HttpFirewallBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpFirewallBeanDefinitionParser.java
index 3b232ef51d..b92314247c 100644
--- a/config/src/main/java/org/springframework/security/config/http/HttpFirewallBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HttpFirewallBeanDefinitionParser.java
@@ -9,24 +9,29 @@ import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
- * Injects the supplied {@code HttpFirewall} bean reference into the {@code FilterChainProxy}.
+ * Injects the supplied {@code HttpFirewall} bean reference into the
+ * {@code FilterChainProxy}.
  *
  * @author Luke Taylor
  */
 public class HttpFirewallBeanDefinitionParser implements BeanDefinitionParser {
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        String ref = element.getAttribute("ref");
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		String ref = element.getAttribute("ref");
 
-        if (!StringUtils.hasText(ref)) {
-            pc.getReaderContext().error("ref attribute is required", pc.extractSource(element));
-        }
+		if (!StringUtils.hasText(ref)) {
+			pc.getReaderContext().error("ref attribute is required",
+					pc.extractSource(element));
+		}
 
-        // Ensure the FCP is registered.
-        HttpSecurityBeanDefinitionParser.registerFilterChainProxyIfNecessary(pc, pc.extractSource(element));
-        BeanDefinition filterChainProxy = pc.getRegistry().getBeanDefinition(BeanIds.FILTER_CHAIN_PROXY);
-        filterChainProxy.getPropertyValues().addPropertyValue("firewall", new RuntimeBeanReference(ref));
+		// Ensure the FCP is registered.
+		HttpSecurityBeanDefinitionParser.registerFilterChainProxyIfNecessary(pc,
+				pc.extractSource(element));
+		BeanDefinition filterChainProxy = pc.getRegistry().getBeanDefinition(
+				BeanIds.FILTER_CHAIN_PROXY);
+		filterChainProxy.getPropertyValues().addPropertyValue("firewall",
+				new RuntimeBeanReference(ref));
 
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
index c4c9d1cec6..004eb44908 100644
--- a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
@@ -56,354 +56,413 @@ import java.util.*;
  * @since 2.0
  */
 public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
-    private static final Log logger = LogFactory.getLog(HttpSecurityBeanDefinitionParser.class);
+	private static final Log logger = LogFactory
+			.getLog(HttpSecurityBeanDefinitionParser.class);
 
-    private static final String ATT_AUTHENTICATION_MANAGER_REF = "authentication-manager-ref";
-    private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
-    static final String ATT_PATH_PATTERN = "pattern";
-    static final String ATT_HTTP_METHOD = "method";
+	private static final String ATT_AUTHENTICATION_MANAGER_REF = "authentication-manager-ref";
+	private static final String ATT_REQUEST_MATCHER_REF = "request-matcher-ref";
+	static final String ATT_PATH_PATTERN = "pattern";
+	static final String ATT_HTTP_METHOD = "method";
 
-    static final String ATT_FILTERS = "filters";
-    static final String OPT_FILTERS_NONE = "none";
+	static final String ATT_FILTERS = "filters";
+	static final String OPT_FILTERS_NONE = "none";
 
-    static final String ATT_REQUIRES_CHANNEL = "requires-channel";
+	static final String ATT_REQUIRES_CHANNEL = "requires-channel";
 
-    private static final String ATT_REF = "ref";
-    private static final String ATT_SECURED = "security";
-    private static final String OPT_SECURITY_NONE = "none";
+	private static final String ATT_REF = "ref";
+	private static final String ATT_SECURED = "security";
+	private static final String OPT_SECURITY_NONE = "none";
 
-    public HttpSecurityBeanDefinitionParser() {
-    }
+	public HttpSecurityBeanDefinitionParser() {
+	}
 
-    /**
-     * The aim of this method is to build the list of filters which have been defined by the namespace elements
-     * and attributes within the &lt;http&gt; configuration, along with any custom-filter's linked to user-defined
-     * filter beans.
-     * <p>
-     * By the end of this method, the default <tt>FilterChainProxy</tt> bean should have been registered and will have
-     * the map of filter chains defined, with the "universal" match pattern mapped to the list of beans which have been parsed here.
-     */
-    @SuppressWarnings({"unchecked"})
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        CompositeComponentDefinition compositeDef =
-            new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element));
-        pc.pushContainingComponent(compositeDef);
+	/**
+	 * The aim of this method is to build the list of filters which have been defined by
+	 * the namespace elements and attributes within the &lt;http&gt; configuration, along
+	 * with any custom-filter's linked to user-defined filter beans.
+	 * <p>
+	 * By the end of this method, the default <tt>FilterChainProxy</tt> bean should have
+	 * been registered and will have the map of filter chains defined, with the
+	 * "universal" match pattern mapped to the list of beans which have been parsed here.
+	 */
+	@SuppressWarnings({ "unchecked" })
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(
+				element.getTagName(), pc.extractSource(element));
+		pc.pushContainingComponent(compositeDef);
 
-        registerFilterChainProxyIfNecessary(pc, pc.extractSource(element));
+		registerFilterChainProxyIfNecessary(pc, pc.extractSource(element));
 
-        // Obtain the filter chains and add the new chain to it
-        BeanDefinition listFactoryBean = pc.getRegistry().getBeanDefinition(BeanIds.FILTER_CHAINS);
-        List<BeanReference> filterChains = (List<BeanReference>)
-                listFactoryBean.getPropertyValues().getPropertyValue("sourceList").getValue();
+		// Obtain the filter chains and add the new chain to it
+		BeanDefinition listFactoryBean = pc.getRegistry().getBeanDefinition(
+				BeanIds.FILTER_CHAINS);
+		List<BeanReference> filterChains = (List<BeanReference>) listFactoryBean
+				.getPropertyValues().getPropertyValue("sourceList").getValue();
 
-        filterChains.add(createFilterChain(element, pc));
+		filterChains.add(createFilterChain(element, pc));
 
-        pc.popAndRegisterContainingComponent();
-        return null;
-    }
+		pc.popAndRegisterContainingComponent();
+		return null;
+	}
 
-    /**
-     * Creates the {@code SecurityFilterChain} bean from an &lt;http&gt; element.
-     */
-    private BeanReference createFilterChain(Element element, ParserContext pc) {
-        boolean secured = !OPT_SECURITY_NONE.equals(element.getAttribute(ATT_SECURED));
+	/**
+	 * Creates the {@code SecurityFilterChain} bean from an &lt;http&gt; element.
+	 */
+	private BeanReference createFilterChain(Element element, ParserContext pc) {
+		boolean secured = !OPT_SECURITY_NONE.equals(element.getAttribute(ATT_SECURED));
 
-        if (!secured) {
-            if (!StringUtils.hasText(element.getAttribute(ATT_PATH_PATTERN)) &&
-                    !StringUtils.hasText(ATT_REQUEST_MATCHER_REF)) {
-                pc.getReaderContext().error("The '" + ATT_SECURED + "' attribute must be used in combination with" +
-                        " the '" + ATT_PATH_PATTERN +"' or '" + ATT_REQUEST_MATCHER_REF + "' attributes.",
-                        pc.extractSource(element));
-            }
+		if (!secured) {
+			if (!StringUtils.hasText(element.getAttribute(ATT_PATH_PATTERN))
+					&& !StringUtils.hasText(ATT_REQUEST_MATCHER_REF)) {
+				pc.getReaderContext().error(
+						"The '" + ATT_SECURED
+								+ "' attribute must be used in combination with"
+								+ " the '" + ATT_PATH_PATTERN + "' or '"
+								+ ATT_REQUEST_MATCHER_REF + "' attributes.",
+						pc.extractSource(element));
+			}
 
-            for (int n=0; n < element.getChildNodes().getLength(); n ++) {
-                if (element.getChildNodes().item(n) instanceof Element) {
-                    pc.getReaderContext().error("If you are using <http> to define an unsecured pattern, " +
-                            "it cannot contain child elements.",  pc.extractSource(element));
-                }
-            }
+			for (int n = 0; n < element.getChildNodes().getLength(); n++) {
+				if (element.getChildNodes().item(n) instanceof Element) {
+					pc.getReaderContext().error(
+							"If you are using <http> to define an unsecured pattern, "
+									+ "it cannot contain child elements.",
+							pc.extractSource(element));
+				}
+			}
 
-            return createSecurityFilterChainBean(element, pc, Collections.emptyList());
-        }
+			return createSecurityFilterChainBean(element, pc, Collections.emptyList());
+		}
 
-        final BeanReference portMapper = createPortMapper(element, pc);
-        final BeanReference portResolver = createPortResolver(portMapper, pc);
+		final BeanReference portMapper = createPortMapper(element, pc);
+		final BeanReference portResolver = createPortResolver(portMapper, pc);
 
-        ManagedList<BeanReference> authenticationProviders = new ManagedList<BeanReference>();
-        BeanReference authenticationManager = createAuthenticationManager(element, pc, authenticationProviders);
+		ManagedList<BeanReference> authenticationProviders = new ManagedList<BeanReference>();
+		BeanReference authenticationManager = createAuthenticationManager(element, pc,
+				authenticationProviders);
 
-        boolean forceAutoConfig = isDefaultHttpConfig(element);
-        HttpConfigurationBuilder httpBldr = new HttpConfigurationBuilder(element, forceAutoConfig, pc,
-                portMapper, portResolver, authenticationManager);
+		boolean forceAutoConfig = isDefaultHttpConfig(element);
+		HttpConfigurationBuilder httpBldr = new HttpConfigurationBuilder(element,
+				forceAutoConfig, pc, portMapper, portResolver, authenticationManager);
 
-        AuthenticationConfigBuilder authBldr = new AuthenticationConfigBuilder(element, forceAutoConfig, pc,
-                httpBldr.getSessionCreationPolicy(), httpBldr.getRequestCache(), authenticationManager,
-                httpBldr.getSessionStrategy(), portMapper, portResolver, httpBldr.getCsrfLogoutHandler());
+		AuthenticationConfigBuilder authBldr = new AuthenticationConfigBuilder(element,
+				forceAutoConfig, pc, httpBldr.getSessionCreationPolicy(),
+				httpBldr.getRequestCache(), authenticationManager,
+				httpBldr.getSessionStrategy(), portMapper, portResolver,
+				httpBldr.getCsrfLogoutHandler());
 
-        httpBldr.setLogoutHandlers(authBldr.getLogoutHandlers());
-        httpBldr.setEntryPoint(authBldr.getEntryPointBean());
-        httpBldr.setAccessDeniedHandler(authBldr.getAccessDeniedHandlerBean());
+		httpBldr.setLogoutHandlers(authBldr.getLogoutHandlers());
+		httpBldr.setEntryPoint(authBldr.getEntryPointBean());
+		httpBldr.setAccessDeniedHandler(authBldr.getAccessDeniedHandlerBean());
 
-        authenticationProviders.addAll(authBldr.getProviders());
+		authenticationProviders.addAll(authBldr.getProviders());
 
-        List<OrderDecorator> unorderedFilterChain = new ArrayList<OrderDecorator>();
+		List<OrderDecorator> unorderedFilterChain = new ArrayList<OrderDecorator>();
 
-        unorderedFilterChain.addAll(httpBldr.getFilters());
-        unorderedFilterChain.addAll(authBldr.getFilters());
-        unorderedFilterChain.addAll(buildCustomFilterList(element, pc));
+		unorderedFilterChain.addAll(httpBldr.getFilters());
+		unorderedFilterChain.addAll(authBldr.getFilters());
+		unorderedFilterChain.addAll(buildCustomFilterList(element, pc));
 
-        Collections.sort(unorderedFilterChain, new OrderComparator());
-        checkFilterChainOrder(unorderedFilterChain, pc, pc.extractSource(element));
+		Collections.sort(unorderedFilterChain, new OrderComparator());
+		checkFilterChainOrder(unorderedFilterChain, pc, pc.extractSource(element));
 
-        // The list of filter beans
-        List<BeanMetadataElement> filterChain = new ManagedList<BeanMetadataElement>();
+		// The list of filter beans
+		List<BeanMetadataElement> filterChain = new ManagedList<BeanMetadataElement>();
 
-        for (OrderDecorator od : unorderedFilterChain) {
-            filterChain.add(od.bean);
-        }
+		for (OrderDecorator od : unorderedFilterChain) {
+			filterChain.add(od.bean);
+		}
 
-        return createSecurityFilterChainBean(element, pc, filterChain);
-    }
+		return createSecurityFilterChainBean(element, pc, filterChain);
+	}
 
-    private static boolean isDefaultHttpConfig(Element httpElt) {
-        return httpElt.getChildNodes().getLength() == 0 && httpElt.getAttributes().getLength() == 0;
-    }
+	private static boolean isDefaultHttpConfig(Element httpElt) {
+		return httpElt.getChildNodes().getLength() == 0
+				&& httpElt.getAttributes().getLength() == 0;
+	}
 
-    private BeanReference createSecurityFilterChainBean(Element element, ParserContext pc, List<?> filterChain) {
-        BeanMetadataElement filterChainMatcher;
+	private BeanReference createSecurityFilterChainBean(Element element,
+			ParserContext pc, List<?> filterChain) {
+		BeanMetadataElement filterChainMatcher;
 
-        String requestMatcherRef = element.getAttribute(ATT_REQUEST_MATCHER_REF);
-        String filterChainPattern = element.getAttribute(ATT_PATH_PATTERN);
+		String requestMatcherRef = element.getAttribute(ATT_REQUEST_MATCHER_REF);
+		String filterChainPattern = element.getAttribute(ATT_PATH_PATTERN);
 
-        if (StringUtils.hasText(requestMatcherRef)) {
-        if (StringUtils.hasText(filterChainPattern)) {
-                pc.getReaderContext().error("You can't define a pattern and a request-matcher-ref for the " +
-                        "same filter chain", pc.extractSource(element));
-            }
-            filterChainMatcher = new RuntimeBeanReference(requestMatcherRef);
+		if (StringUtils.hasText(requestMatcherRef)) {
+			if (StringUtils.hasText(filterChainPattern)) {
+				pc.getReaderContext().error(
+						"You can't define a pattern and a request-matcher-ref for the "
+								+ "same filter chain", pc.extractSource(element));
+			}
+			filterChainMatcher = new RuntimeBeanReference(requestMatcherRef);
 
-        } else if (StringUtils.hasText(filterChainPattern)) {
-            filterChainMatcher = MatcherType.fromElement(element).createMatcher(filterChainPattern, null);
-        } else {
-            filterChainMatcher = new RootBeanDefinition(AnyRequestMatcher.class);
-        }
+		}
+		else if (StringUtils.hasText(filterChainPattern)) {
+			filterChainMatcher = MatcherType.fromElement(element).createMatcher(
+					filterChainPattern, null);
+		}
+		else {
+			filterChainMatcher = new RootBeanDefinition(AnyRequestMatcher.class);
+		}
 
-        BeanDefinitionBuilder filterChainBldr = BeanDefinitionBuilder.rootBeanDefinition(DefaultSecurityFilterChain.class);
-        filterChainBldr.addConstructorArgValue(filterChainMatcher);
-        filterChainBldr.addConstructorArgValue(filterChain);
+		BeanDefinitionBuilder filterChainBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(DefaultSecurityFilterChain.class);
+		filterChainBldr.addConstructorArgValue(filterChainMatcher);
+		filterChainBldr.addConstructorArgValue(filterChain);
 
-        BeanDefinition filterChainBean = filterChainBldr.getBeanDefinition();
+		BeanDefinition filterChainBean = filterChainBldr.getBeanDefinition();
 
-        String id = element.getAttribute("name");
-        if (!StringUtils.hasText(id)) {
-            id = element.getAttribute("id");
-            if (!StringUtils.hasText(id)) {
-                id = pc.getReaderContext().generateBeanName(filterChainBean);
-            }
-        }
+		String id = element.getAttribute("name");
+		if (!StringUtils.hasText(id)) {
+			id = element.getAttribute("id");
+			if (!StringUtils.hasText(id)) {
+				id = pc.getReaderContext().generateBeanName(filterChainBean);
+			}
+		}
 
-        pc.registerBeanComponent(new BeanComponentDefinition(filterChainBean, id));
+		pc.registerBeanComponent(new BeanComponentDefinition(filterChainBean, id));
 
-        return new RuntimeBeanReference(id);
-    }
+		return new RuntimeBeanReference(id);
+	}
 
-    private BeanReference createPortMapper(Element elt, ParserContext pc) {
-        // Register the portMapper. A default will always be created, even if no element exists.
-        BeanDefinition portMapper = new PortMappingsBeanDefinitionParser().parse(
-                DomUtils.getChildElementByTagName(elt, Elements.PORT_MAPPINGS), pc);
-        String portMapperName = pc.getReaderContext().generateBeanName(portMapper);
-        pc.registerBeanComponent(new BeanComponentDefinition(portMapper, portMapperName));
+	private BeanReference createPortMapper(Element elt, ParserContext pc) {
+		// Register the portMapper. A default will always be created, even if no element
+		// exists.
+		BeanDefinition portMapper = new PortMappingsBeanDefinitionParser().parse(
+				DomUtils.getChildElementByTagName(elt, Elements.PORT_MAPPINGS), pc);
+		String portMapperName = pc.getReaderContext().generateBeanName(portMapper);
+		pc.registerBeanComponent(new BeanComponentDefinition(portMapper, portMapperName));
 
-        return new RuntimeBeanReference(portMapperName);
-    }
+		return new RuntimeBeanReference(portMapperName);
+	}
 
-    private RuntimeBeanReference createPortResolver(BeanReference portMapper, ParserContext pc) {
-        RootBeanDefinition portResolver = new RootBeanDefinition(PortResolverImpl.class);
-        portResolver.getPropertyValues().addPropertyValue("portMapper", portMapper);
-        String portResolverName = pc.getReaderContext().generateBeanName(portResolver);
-        pc.registerBeanComponent(new BeanComponentDefinition(portResolver, portResolverName));
-        return new RuntimeBeanReference(portResolverName);
-    }
+	private RuntimeBeanReference createPortResolver(BeanReference portMapper,
+			ParserContext pc) {
+		RootBeanDefinition portResolver = new RootBeanDefinition(PortResolverImpl.class);
+		portResolver.getPropertyValues().addPropertyValue("portMapper", portMapper);
+		String portResolverName = pc.getReaderContext().generateBeanName(portResolver);
+		pc.registerBeanComponent(new BeanComponentDefinition(portResolver,
+				portResolverName));
+		return new RuntimeBeanReference(portResolverName);
+	}
 
-    /**
-     * Creates the internal AuthenticationManager bean which uses either the externally registered (global) one as
-     * a parent or the bean specified by "authentication-manager-ref".
-     *
-     * All the providers registered by this &lt;http&gt; block will be registered with the internal authentication
-     * manager.
-     */
-    private BeanReference createAuthenticationManager(Element element, ParserContext pc,
-            ManagedList<BeanReference> authenticationProviders) {
-        String parentMgrRef = element.getAttribute(ATT_AUTHENTICATION_MANAGER_REF);
-        BeanDefinitionBuilder authManager = BeanDefinitionBuilder.rootBeanDefinition(ProviderManager.class);
-        authManager.addConstructorArgValue(authenticationProviders);
+	/**
+	 * Creates the internal AuthenticationManager bean which uses either the externally
+	 * registered (global) one as a parent or the bean specified by
+	 * "authentication-manager-ref".
+	 *
+	 * All the providers registered by this &lt;http&gt; block will be registered with the
+	 * internal authentication manager.
+	 */
+	private BeanReference createAuthenticationManager(Element element, ParserContext pc,
+			ManagedList<BeanReference> authenticationProviders) {
+		String parentMgrRef = element.getAttribute(ATT_AUTHENTICATION_MANAGER_REF);
+		BeanDefinitionBuilder authManager = BeanDefinitionBuilder
+				.rootBeanDefinition(ProviderManager.class);
+		authManager.addConstructorArgValue(authenticationProviders);
 
-        if (StringUtils.hasText(parentMgrRef)) {
-            RuntimeBeanReference parentAuthManager = new RuntimeBeanReference(parentMgrRef);
-            authManager.addConstructorArgValue(parentAuthManager);
-            RootBeanDefinition clearCredentials = new RootBeanDefinition(ClearCredentialsMethodInvokingFactoryBean.class);
-            clearCredentials.getPropertyValues().addPropertyValue("targetObject", parentAuthManager);
-            clearCredentials.getPropertyValues().addPropertyValue("targetMethod", "isEraseCredentialsAfterAuthentication");
+		if (StringUtils.hasText(parentMgrRef)) {
+			RuntimeBeanReference parentAuthManager = new RuntimeBeanReference(
+					parentMgrRef);
+			authManager.addConstructorArgValue(parentAuthManager);
+			RootBeanDefinition clearCredentials = new RootBeanDefinition(
+					ClearCredentialsMethodInvokingFactoryBean.class);
+			clearCredentials.getPropertyValues().addPropertyValue("targetObject",
+					parentAuthManager);
+			clearCredentials.getPropertyValues().addPropertyValue("targetMethod",
+					"isEraseCredentialsAfterAuthentication");
 
-            authManager.addPropertyValue("eraseCredentialsAfterAuthentication", clearCredentials);
-        } else {
-            RootBeanDefinition amfb = new RootBeanDefinition(AuthenticationManagerFactoryBean.class);
-            amfb.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-            String amfbId = pc.getReaderContext().generateBeanName(amfb);
-            pc.registerBeanComponent(new BeanComponentDefinition(amfb, amfbId));
-            RootBeanDefinition clearCredentials = new RootBeanDefinition(MethodInvokingFactoryBean.class);
-            clearCredentials.getPropertyValues().addPropertyValue("targetObject", new RuntimeBeanReference(amfbId));
-            clearCredentials.getPropertyValues().addPropertyValue("targetMethod", "isEraseCredentialsAfterAuthentication");
+			authManager.addPropertyValue("eraseCredentialsAfterAuthentication",
+					clearCredentials);
+		}
+		else {
+			RootBeanDefinition amfb = new RootBeanDefinition(
+					AuthenticationManagerFactoryBean.class);
+			amfb.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			String amfbId = pc.getReaderContext().generateBeanName(amfb);
+			pc.registerBeanComponent(new BeanComponentDefinition(amfb, amfbId));
+			RootBeanDefinition clearCredentials = new RootBeanDefinition(
+					MethodInvokingFactoryBean.class);
+			clearCredentials.getPropertyValues().addPropertyValue("targetObject",
+					new RuntimeBeanReference(amfbId));
+			clearCredentials.getPropertyValues().addPropertyValue("targetMethod",
+					"isEraseCredentialsAfterAuthentication");
 
-            authManager.addConstructorArgValue(new RuntimeBeanReference(amfbId));
-            authManager.addPropertyValue("eraseCredentialsAfterAuthentication", clearCredentials);
-        }
+			authManager.addConstructorArgValue(new RuntimeBeanReference(amfbId));
+			authManager.addPropertyValue("eraseCredentialsAfterAuthentication",
+					clearCredentials);
+		}
 
-        authManager.getRawBeanDefinition().setSource(pc.extractSource(element));
-        BeanDefinition authMgrBean = authManager.getBeanDefinition();
-        String id = pc.getReaderContext().generateBeanName(authMgrBean);
-        pc.registerBeanComponent(new BeanComponentDefinition(authMgrBean, id));
+		authManager.getRawBeanDefinition().setSource(pc.extractSource(element));
+		BeanDefinition authMgrBean = authManager.getBeanDefinition();
+		String id = pc.getReaderContext().generateBeanName(authMgrBean);
+		pc.registerBeanComponent(new BeanComponentDefinition(authMgrBean, id));
 
-        return new RuntimeBeanReference(id);
-    }
+		return new RuntimeBeanReference(id);
+	}
 
-    private void checkFilterChainOrder(List<OrderDecorator> filters, ParserContext pc, Object source) {
-        logger.info("Checking sorted filter chain: " + filters);
+	private void checkFilterChainOrder(List<OrderDecorator> filters, ParserContext pc,
+			Object source) {
+		logger.info("Checking sorted filter chain: " + filters);
 
-        for(int i=0; i < filters.size(); i++) {
-            OrderDecorator filter = filters.get(i);
+		for (int i = 0; i < filters.size(); i++) {
+			OrderDecorator filter = filters.get(i);
 
-            if (i > 0) {
-                OrderDecorator previous = filters.get(i-1);
-                if (filter.getOrder() == previous.getOrder()) {
-                    pc.getReaderContext().error("Filter beans '" + filter.bean + "' and '" +
-                            previous.bean + "' have the same 'order' value. When using custom filters, " +
-                                    "please make sure the positions do not conflict with default filters. " +
-                                    "Alternatively you can disable the default filters by removing the corresponding " +
-                                    "child elements from <http> and avoiding the use of <http auto-config='true'>.", source);
-                }
-            }
-        }
-    }
+			if (i > 0) {
+				OrderDecorator previous = filters.get(i - 1);
+				if (filter.getOrder() == previous.getOrder()) {
+					pc.getReaderContext()
+							.error("Filter beans '"
+									+ filter.bean
+									+ "' and '"
+									+ previous.bean
+									+ "' have the same 'order' value. When using custom filters, "
+									+ "please make sure the positions do not conflict with default filters. "
+									+ "Alternatively you can disable the default filters by removing the corresponding "
+									+ "child elements from <http> and avoiding the use of <http auto-config='true'>.",
+									source);
+				}
+			}
+		}
+	}
 
-    List<OrderDecorator> buildCustomFilterList(Element element, ParserContext pc) {
-        List<Element> customFilterElts = DomUtils.getChildElementsByTagName(element, Elements.CUSTOM_FILTER);
-        List<OrderDecorator> customFilters = new ArrayList<OrderDecorator>();
+	List<OrderDecorator> buildCustomFilterList(Element element, ParserContext pc) {
+		List<Element> customFilterElts = DomUtils.getChildElementsByTagName(element,
+				Elements.CUSTOM_FILTER);
+		List<OrderDecorator> customFilters = new ArrayList<OrderDecorator>();
 
-        final String ATT_AFTER = "after";
-        final String ATT_BEFORE = "before";
-        final String ATT_POSITION = "position";
+		final String ATT_AFTER = "after";
+		final String ATT_BEFORE = "before";
+		final String ATT_POSITION = "position";
 
-        for (Element elt: customFilterElts) {
-            String after = elt.getAttribute(ATT_AFTER);
-            String before = elt.getAttribute(ATT_BEFORE);
-            String position = elt.getAttribute(ATT_POSITION);
+		for (Element elt : customFilterElts) {
+			String after = elt.getAttribute(ATT_AFTER);
+			String before = elt.getAttribute(ATT_BEFORE);
+			String position = elt.getAttribute(ATT_POSITION);
 
-            String ref = elt.getAttribute(ATT_REF);
+			String ref = elt.getAttribute(ATT_REF);
 
-            if (!StringUtils.hasText(ref)) {
-                pc.getReaderContext().error("The '" + ATT_REF + "' attribute must be supplied", pc.extractSource(elt));
-            }
+			if (!StringUtils.hasText(ref)) {
+				pc.getReaderContext().error(
+						"The '" + ATT_REF + "' attribute must be supplied",
+						pc.extractSource(elt));
+			}
 
-            RuntimeBeanReference bean = new RuntimeBeanReference(ref);
+			RuntimeBeanReference bean = new RuntimeBeanReference(ref);
 
-            if(WebConfigUtils.countNonEmpty(new String[] {after, before, position}) != 1) {
-                pc.getReaderContext().error("A single '" + ATT_AFTER + "', '" + ATT_BEFORE + "', or '" +
-                        ATT_POSITION + "' attribute must be supplied", pc.extractSource(elt));
-            }
+			if (WebConfigUtils.countNonEmpty(new String[] { after, before, position }) != 1) {
+				pc.getReaderContext().error(
+						"A single '" + ATT_AFTER + "', '" + ATT_BEFORE + "', or '"
+								+ ATT_POSITION + "' attribute must be supplied",
+						pc.extractSource(elt));
+			}
 
-            if (StringUtils.hasText(position)) {
-                customFilters.add(new OrderDecorator(bean, SecurityFilters.valueOf(position)));
-            } else if (StringUtils.hasText(after)) {
-                SecurityFilters order = SecurityFilters.valueOf(after);
-                if (order == SecurityFilters.LAST) {
-                    customFilters.add(new OrderDecorator(bean, SecurityFilters.LAST));
-                } else {
-                    customFilters.add(new OrderDecorator(bean, order.getOrder() + 1));
-                }
-            } else if (StringUtils.hasText(before)) {
-                SecurityFilters order = SecurityFilters.valueOf(before);
-                if (order == SecurityFilters.FIRST) {
-                    customFilters.add(new OrderDecorator(bean, SecurityFilters.FIRST));
-                } else {
-                    customFilters.add(new OrderDecorator(bean, order.getOrder() - 1));
-                }
-            }
-        }
+			if (StringUtils.hasText(position)) {
+				customFilters.add(new OrderDecorator(bean, SecurityFilters
+						.valueOf(position)));
+			}
+			else if (StringUtils.hasText(after)) {
+				SecurityFilters order = SecurityFilters.valueOf(after);
+				if (order == SecurityFilters.LAST) {
+					customFilters.add(new OrderDecorator(bean, SecurityFilters.LAST));
+				}
+				else {
+					customFilters.add(new OrderDecorator(bean, order.getOrder() + 1));
+				}
+			}
+			else if (StringUtils.hasText(before)) {
+				SecurityFilters order = SecurityFilters.valueOf(before);
+				if (order == SecurityFilters.FIRST) {
+					customFilters.add(new OrderDecorator(bean, SecurityFilters.FIRST));
+				}
+				else {
+					customFilters.add(new OrderDecorator(bean, order.getOrder() - 1));
+				}
+			}
+		}
 
-        return customFilters;
-    }
+		return customFilters;
+	}
 
-    static void registerFilterChainProxyIfNecessary(ParserContext pc, Object source) {
-        if (pc.getRegistry().containsBeanDefinition(BeanIds.FILTER_CHAIN_PROXY)) {
-            return;
-        }
-        // Not already registered, so register the list of filter chains and the FilterChainProxy
-        BeanDefinition listFactoryBean = new RootBeanDefinition(ListFactoryBean.class);
-        listFactoryBean.getPropertyValues().add("sourceList", new ManagedList());
-        pc.registerBeanComponent(new BeanComponentDefinition(listFactoryBean, BeanIds.FILTER_CHAINS));
+	static void registerFilterChainProxyIfNecessary(ParserContext pc, Object source) {
+		if (pc.getRegistry().containsBeanDefinition(BeanIds.FILTER_CHAIN_PROXY)) {
+			return;
+		}
+		// Not already registered, so register the list of filter chains and the
+		// FilterChainProxy
+		BeanDefinition listFactoryBean = new RootBeanDefinition(ListFactoryBean.class);
+		listFactoryBean.getPropertyValues().add("sourceList", new ManagedList());
+		pc.registerBeanComponent(new BeanComponentDefinition(listFactoryBean,
+				BeanIds.FILTER_CHAINS));
 
-        BeanDefinitionBuilder fcpBldr = BeanDefinitionBuilder.rootBeanDefinition(FilterChainProxy.class);
-        fcpBldr.getRawBeanDefinition().setSource(source);
-        fcpBldr.addConstructorArgReference(BeanIds.FILTER_CHAINS);
-        fcpBldr.addPropertyValue("filterChainValidator", new RootBeanDefinition(DefaultFilterChainValidator.class));
-        BeanDefinition fcpBean = fcpBldr.getBeanDefinition();
-        pc.registerBeanComponent(new BeanComponentDefinition(fcpBean, BeanIds.FILTER_CHAIN_PROXY));
-        pc.getRegistry().registerAlias(BeanIds.FILTER_CHAIN_PROXY, BeanIds.SPRING_SECURITY_FILTER_CHAIN);
-    }
+		BeanDefinitionBuilder fcpBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(FilterChainProxy.class);
+		fcpBldr.getRawBeanDefinition().setSource(source);
+		fcpBldr.addConstructorArgReference(BeanIds.FILTER_CHAINS);
+		fcpBldr.addPropertyValue("filterChainValidator", new RootBeanDefinition(
+				DefaultFilterChainValidator.class));
+		BeanDefinition fcpBean = fcpBldr.getBeanDefinition();
+		pc.registerBeanComponent(new BeanComponentDefinition(fcpBean,
+				BeanIds.FILTER_CHAIN_PROXY));
+		pc.getRegistry().registerAlias(BeanIds.FILTER_CHAIN_PROXY,
+				BeanIds.SPRING_SECURITY_FILTER_CHAIN);
+	}
 
 }
 
 class OrderDecorator implements Ordered {
-    final BeanMetadataElement bean;
-    final int order;
+	final BeanMetadataElement bean;
+	final int order;
 
-    public OrderDecorator(BeanMetadataElement bean, SecurityFilters filterOrder) {
-        this.bean = bean;
-        this.order = filterOrder.getOrder();
-    }
+	public OrderDecorator(BeanMetadataElement bean, SecurityFilters filterOrder) {
+		this.bean = bean;
+		this.order = filterOrder.getOrder();
+	}
 
-    public OrderDecorator(BeanMetadataElement bean, int order) {
-        this.bean = bean;
-        this.order = order;
-    }
+	public OrderDecorator(BeanMetadataElement bean, int order) {
+		this.bean = bean;
+		this.order = order;
+	}
 
-    public int getOrder() {
-        return order;
-    }
+	public int getOrder() {
+		return order;
+	}
 
-    public String toString() {
-        return bean + ", order = " + order;
-    }
+	public String toString() {
+		return bean + ", order = " + order;
+	}
 }
 
 /**
- * Custom {@link MethodInvokingFactoryBean} that is specifically used for looking up the child {@link ProviderManager}
- * value for {@link ProviderManager#setEraseCredentialsAfterAuthentication(boolean)} given the parent
- * {@link AuthenticationManager}. This is necessary because the parent {@link AuthenticationManager} might not be a
- * {@link ProviderManager}.
+ * Custom {@link MethodInvokingFactoryBean} that is specifically used for looking up the
+ * child {@link ProviderManager} value for
+ * {@link ProviderManager#setEraseCredentialsAfterAuthentication(boolean)} given the
+ * parent {@link AuthenticationManager}. This is necessary because the parent
+ * {@link AuthenticationManager} might not be a {@link ProviderManager}.
  *
  * @author Rob Winch
  */
 final class ClearCredentialsMethodInvokingFactoryBean extends MethodInvokingFactoryBean {
-    public void afterPropertiesSet() throws Exception {
-        boolean isTargetProviderManager = getTargetObject() instanceof ProviderManager;
-        if(!isTargetProviderManager) {
-            setTargetObject(this);
-        }
-        super.afterPropertiesSet();
-    }
+	public void afterPropertiesSet() throws Exception {
+		boolean isTargetProviderManager = getTargetObject() instanceof ProviderManager;
+		if (!isTargetProviderManager) {
+			setTargetObject(this);
+		}
+		super.afterPropertiesSet();
+	}
 
-    /**
-     * The default value if the target object is not a ProviderManager is false. We use false because this feature is
-     * associated with {@link ProviderManager} not {@link AuthenticationManager}. If the user wants to leverage
-     * {@link ProviderManager#setEraseCredentialsAfterAuthentication(boolean)} their original
-     * {@link AuthenticationManager} must be a {@link ProviderManager} (we should not magically add this functionality
-     * to their implementation since we cannot determine if it should be on or off).
-     *
-     * @return
-     */
-    public boolean isEraseCredentialsAfterAuthentication() {
-        return false;
-    }
+	/**
+	 * The default value if the target object is not a ProviderManager is false. We use
+	 * false because this feature is associated with {@link ProviderManager} not
+	 * {@link AuthenticationManager}. If the user wants to leverage
+	 * {@link ProviderManager#setEraseCredentialsAfterAuthentication(boolean)} their
+	 * original {@link AuthenticationManager} must be a {@link ProviderManager} (we should
+	 * not magically add this functionality to their implementation since we cannot
+	 * determine if it should be on or off).
+	 *
+	 * @return
+	 */
+	public boolean isEraseCredentialsAfterAuthentication() {
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java
index 2a1c330989..881af31c09 100644
--- a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java
@@ -34,102 +34,109 @@ import org.w3c.dom.Element;
  * @author Ben Alex
  */
 class LogoutBeanDefinitionParser implements BeanDefinitionParser {
-    static final String ATT_LOGOUT_SUCCESS_URL = "logout-success-url";
+	static final String ATT_LOGOUT_SUCCESS_URL = "logout-success-url";
 
-    static final String ATT_INVALIDATE_SESSION = "invalidate-session";
+	static final String ATT_INVALIDATE_SESSION = "invalidate-session";
 
-    static final String ATT_LOGOUT_URL = "logout-url";
-    static final String DEF_LOGOUT_URL = "/logout";
-    static final String ATT_LOGOUT_HANDLER = "success-handler-ref";
-    static final String ATT_DELETE_COOKIES = "delete-cookies";
+	static final String ATT_LOGOUT_URL = "logout-url";
+	static final String DEF_LOGOUT_URL = "/logout";
+	static final String ATT_LOGOUT_HANDLER = "success-handler-ref";
+	static final String ATT_DELETE_COOKIES = "delete-cookies";
 
-    final String rememberMeServices;
-    private final String defaultLogoutUrl;
-    private ManagedList<BeanMetadataElement> logoutHandlers = new ManagedList<BeanMetadataElement>();
-    private boolean csrfEnabled;
+	final String rememberMeServices;
+	private final String defaultLogoutUrl;
+	private ManagedList<BeanMetadataElement> logoutHandlers = new ManagedList<BeanMetadataElement>();
+	private boolean csrfEnabled;
 
-    public LogoutBeanDefinitionParser(String loginPageUrl, String rememberMeServices, BeanMetadataElement csrfLogoutHandler) {
-        this.defaultLogoutUrl = loginPageUrl + "?logout";
-        this.rememberMeServices = rememberMeServices;
-        this.csrfEnabled = csrfLogoutHandler != null;
-        if (this.csrfEnabled) {
-            logoutHandlers.add(csrfLogoutHandler);
-        }
-    }
+	public LogoutBeanDefinitionParser(String loginPageUrl, String rememberMeServices,
+			BeanMetadataElement csrfLogoutHandler) {
+		this.defaultLogoutUrl = loginPageUrl + "?logout";
+		this.rememberMeServices = rememberMeServices;
+		this.csrfEnabled = csrfLogoutHandler != null;
+		if (this.csrfEnabled) {
+			logoutHandlers.add(csrfLogoutHandler);
+		}
+	}
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        String logoutUrl = null;
-        String successHandlerRef = null;
-        String logoutSuccessUrl = null;
-        String invalidateSession = null;
-        String deleteCookies = null;
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		String logoutUrl = null;
+		String successHandlerRef = null;
+		String logoutSuccessUrl = null;
+		String invalidateSession = null;
+		String deleteCookies = null;
 
-        BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(LogoutFilter.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.rootBeanDefinition(LogoutFilter.class);
 
-        if (element != null) {
-            Object source = pc.extractSource(element);
-            builder.getRawBeanDefinition().setSource(source);
-            logoutUrl = element.getAttribute(ATT_LOGOUT_URL);
-            successHandlerRef = element.getAttribute(ATT_LOGOUT_HANDLER);
-            WebConfigUtils.validateHttpRedirect(logoutUrl, pc, source);
-            logoutSuccessUrl = element.getAttribute(ATT_LOGOUT_SUCCESS_URL);
-            WebConfigUtils.validateHttpRedirect(logoutSuccessUrl, pc, source);
-            invalidateSession = element.getAttribute(ATT_INVALIDATE_SESSION);
-            deleteCookies = element.getAttribute(ATT_DELETE_COOKIES);
-        }
+		if (element != null) {
+			Object source = pc.extractSource(element);
+			builder.getRawBeanDefinition().setSource(source);
+			logoutUrl = element.getAttribute(ATT_LOGOUT_URL);
+			successHandlerRef = element.getAttribute(ATT_LOGOUT_HANDLER);
+			WebConfigUtils.validateHttpRedirect(logoutUrl, pc, source);
+			logoutSuccessUrl = element.getAttribute(ATT_LOGOUT_SUCCESS_URL);
+			WebConfigUtils.validateHttpRedirect(logoutSuccessUrl, pc, source);
+			invalidateSession = element.getAttribute(ATT_INVALIDATE_SESSION);
+			deleteCookies = element.getAttribute(ATT_DELETE_COOKIES);
+		}
 
-        if (!StringUtils.hasText(logoutUrl)) {
-            logoutUrl = DEF_LOGOUT_URL;
-        }
+		if (!StringUtils.hasText(logoutUrl)) {
+			logoutUrl = DEF_LOGOUT_URL;
+		}
 
+		builder.addPropertyValue("logoutRequestMatcher",
+				getLogoutRequestMatcher(logoutUrl));
 
-        builder.addPropertyValue("logoutRequestMatcher", getLogoutRequestMatcher(logoutUrl));
+		if (StringUtils.hasText(successHandlerRef)) {
+			if (StringUtils.hasText(logoutSuccessUrl)) {
+				pc.getReaderContext().error(
+						"Use " + ATT_LOGOUT_SUCCESS_URL + " or " + ATT_LOGOUT_HANDLER
+								+ ", but not both", pc.extractSource(element));
+			}
+			builder.addConstructorArgReference(successHandlerRef);
+		}
+		else {
+			// Use the logout URL if no handler set
+			if (!StringUtils.hasText(logoutSuccessUrl)) {
+				logoutSuccessUrl = defaultLogoutUrl;
+			}
+			builder.addConstructorArgValue(logoutSuccessUrl);
+		}
 
-        if (StringUtils.hasText(successHandlerRef)) {
-            if (StringUtils.hasText(logoutSuccessUrl)) {
-                pc.getReaderContext().error("Use " + ATT_LOGOUT_SUCCESS_URL + " or " + ATT_LOGOUT_HANDLER + ", but not both",
-                        pc.extractSource(element));
-            }
-            builder.addConstructorArgReference(successHandlerRef);
-        } else {
-            // Use the logout URL if no handler set
-            if (!StringUtils.hasText(logoutSuccessUrl)) {
-                logoutSuccessUrl = defaultLogoutUrl;
-            }
-            builder.addConstructorArgValue(logoutSuccessUrl);
-        }
+		BeanDefinition sclh = new RootBeanDefinition(SecurityContextLogoutHandler.class);
+		sclh.getPropertyValues().addPropertyValue("invalidateHttpSession",
+				!"false".equals(invalidateSession));
+		logoutHandlers.add(sclh);
 
-        BeanDefinition sclh = new RootBeanDefinition(SecurityContextLogoutHandler.class);
-        sclh.getPropertyValues().addPropertyValue("invalidateHttpSession", !"false".equals(invalidateSession));
-        logoutHandlers.add(sclh);
+		if (rememberMeServices != null) {
+			logoutHandlers.add(new RuntimeBeanReference(rememberMeServices));
+		}
 
-        if (rememberMeServices != null) {
-            logoutHandlers.add(new RuntimeBeanReference(rememberMeServices));
-        }
+		if (StringUtils.hasText(deleteCookies)) {
+			BeanDefinition cookieDeleter = new RootBeanDefinition(
+					CookieClearingLogoutHandler.class);
+			String[] names = StringUtils.tokenizeToStringArray(deleteCookies, ",");
+			cookieDeleter.getConstructorArgumentValues().addGenericArgumentValue(names);
+			logoutHandlers.add(cookieDeleter);
+		}
 
-        if (StringUtils.hasText(deleteCookies)) {
-            BeanDefinition cookieDeleter = new RootBeanDefinition(CookieClearingLogoutHandler.class);
-            String[] names = StringUtils.tokenizeToStringArray(deleteCookies, ",");
-            cookieDeleter.getConstructorArgumentValues().addGenericArgumentValue(names);
-            logoutHandlers.add(cookieDeleter);
-        }
+		builder.addConstructorArgValue(logoutHandlers);
 
-        builder.addConstructorArgValue(logoutHandlers);
+		return builder.getBeanDefinition();
+	}
 
-        return builder.getBeanDefinition();
-    }
+	private BeanDefinition getLogoutRequestMatcher(String logoutUrl) {
+		BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
+		matcherBuilder.addConstructorArgValue(logoutUrl);
+		if (this.csrfEnabled) {
+			matcherBuilder.addConstructorArgValue("POST");
+		}
 
-    private BeanDefinition getLogoutRequestMatcher(String logoutUrl) {
-        BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
-        matcherBuilder.addConstructorArgValue(logoutUrl);
-        if(this.csrfEnabled) {
-            matcherBuilder.addConstructorArgValue("POST");
-        }
+		return matcherBuilder.getBeanDefinition();
+	}
 
-        return matcherBuilder.getBeanDefinition();
-    }
-
-    ManagedList<BeanMetadataElement> getLogoutHandlers() {
-        return logoutHandlers;
-    }
+	ManagedList<BeanMetadataElement> getLogoutHandlers() {
+		return logoutHandlers;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/MatcherType.java b/config/src/main/java/org/springframework/security/config/http/MatcherType.java
index e20162bf69..2bc6fa6d6c 100644
--- a/config/src/main/java/org/springframework/security/config/http/MatcherType.java
+++ b/config/src/main/java/org/springframework/security/config/http/MatcherType.java
@@ -17,40 +17,40 @@ import org.w3c.dom.Element;
  * @since 3.1
  */
 public enum MatcherType {
-    ant (AntPathRequestMatcher.class),
-    regex (RegexRequestMatcher.class),
-    ciRegex (RegexRequestMatcher.class);
+	ant(AntPathRequestMatcher.class), regex(RegexRequestMatcher.class), ciRegex(
+			RegexRequestMatcher.class);
 
-    private static final String ATT_MATCHER_TYPE = "request-matcher";
+	private static final String ATT_MATCHER_TYPE = "request-matcher";
 
-    private final Class<? extends RequestMatcher> type;
+	private final Class<? extends RequestMatcher> type;
 
-    MatcherType(Class<? extends RequestMatcher> type) {
-        this.type = type;
-    }
+	MatcherType(Class<? extends RequestMatcher> type) {
+		this.type = type;
+	}
 
-    public BeanDefinition createMatcher(String path, String method) {
-        if (("/**".equals(path) || "**".equals(path)) && method == null) {
-            return new RootBeanDefinition(AnyRequestMatcher.class);
-        }
+	public BeanDefinition createMatcher(String path, String method) {
+		if (("/**".equals(path) || "**".equals(path)) && method == null) {
+			return new RootBeanDefinition(AnyRequestMatcher.class);
+		}
 
-        BeanDefinitionBuilder matcherBldr = BeanDefinitionBuilder.rootBeanDefinition(type);
+		BeanDefinitionBuilder matcherBldr = BeanDefinitionBuilder
+				.rootBeanDefinition(type);
 
-        matcherBldr.addConstructorArgValue(path);
-        matcherBldr.addConstructorArgValue(method);
+		matcherBldr.addConstructorArgValue(path);
+		matcherBldr.addConstructorArgValue(method);
 
-        if (this == ciRegex) {
-             matcherBldr.addConstructorArgValue(true);
-        }
+		if (this == ciRegex) {
+			matcherBldr.addConstructorArgValue(true);
+		}
 
-        return matcherBldr.getBeanDefinition();
-    }
+		return matcherBldr.getBeanDefinition();
+	}
 
-    static MatcherType fromElement(Element elt) {
-        if (StringUtils.hasText(elt.getAttribute(ATT_MATCHER_TYPE))) {
-            return valueOf(elt.getAttribute(ATT_MATCHER_TYPE));
-        }
+	static MatcherType fromElement(Element elt) {
+		if (StringUtils.hasText(elt.getAttribute(ATT_MATCHER_TYPE))) {
+			return valueOf(elt.getAttribute(ATT_MATCHER_TYPE));
+		}
 
-        return ant;
-    }
+		return ant;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/PortMappingsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/PortMappingsBeanDefinitionParser.java
index 42cfc5de4f..effb6dff2a 100644
--- a/config/src/main/java/org/springframework/security/config/http/PortMappingsBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/PortMappingsBeanDefinitionParser.java
@@ -15,46 +15,50 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Parses a port-mappings element, producing a single {@link org.springframework.security.web.PortMapperImpl}
- * bean.
+ * Parses a port-mappings element, producing a single
+ * {@link org.springframework.security.web.PortMapperImpl} bean.
  *
  * @author Luke Taylor
  */
 class PortMappingsBeanDefinitionParser implements BeanDefinitionParser {
-    public static final String ATT_HTTP_PORT = "http";
-    public static final String ATT_HTTPS_PORT = "https";
+	public static final String ATT_HTTP_PORT = "http";
+	public static final String ATT_HTTPS_PORT = "https";
 
-    @SuppressWarnings("unchecked")
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        RootBeanDefinition portMapper = new RootBeanDefinition(PortMapperImpl.class);
-        portMapper.setSource(parserContext.extractSource(element));
+	@SuppressWarnings("unchecked")
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		RootBeanDefinition portMapper = new RootBeanDefinition(PortMapperImpl.class);
+		portMapper.setSource(parserContext.extractSource(element));
 
-        if (element != null) {
-            List<Element> mappingElts = DomUtils.getChildElementsByTagName(element, Elements.PORT_MAPPING);
-            if(mappingElts.isEmpty()) {
-                parserContext.getReaderContext().error("No port-mapping child elements specified", element);
-            }
+		if (element != null) {
+			List<Element> mappingElts = DomUtils.getChildElementsByTagName(element,
+					Elements.PORT_MAPPING);
+			if (mappingElts.isEmpty()) {
+				parserContext.getReaderContext().error(
+						"No port-mapping child elements specified", element);
+			}
 
-            Map mappings = new ManagedMap();
+			Map mappings = new ManagedMap();
 
-            for (Element elt : mappingElts) {
-                String httpPort = elt.getAttribute(ATT_HTTP_PORT);
-                String httpsPort = elt.getAttribute(ATT_HTTPS_PORT);
+			for (Element elt : mappingElts) {
+				String httpPort = elt.getAttribute(ATT_HTTP_PORT);
+				String httpsPort = elt.getAttribute(ATT_HTTPS_PORT);
 
-                if (!StringUtils.hasText(httpPort)) {
-                    parserContext.getReaderContext().error("No http port supplied in port mapping", elt);
-                }
+				if (!StringUtils.hasText(httpPort)) {
+					parserContext.getReaderContext().error(
+							"No http port supplied in port mapping", elt);
+				}
 
-                if (!StringUtils.hasText(httpsPort)) {
-                    parserContext.getReaderContext().error("No https port supplied in port mapping", elt);
-                }
+				if (!StringUtils.hasText(httpsPort)) {
+					parserContext.getReaderContext().error(
+							"No https port supplied in port mapping", elt);
+				}
 
-                mappings.put(httpPort, httpsPort);
-            }
+				mappings.put(httpPort, httpsPort);
+			}
 
-            portMapper.getPropertyValues().addPropertyValue("portMappings", mappings);
-        }
+			portMapper.getPropertyValues().addPropertyValue("portMappings", mappings);
+		}
 
-        return portMapper;
-    }
+		return portMapper;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java
index d6ab05c12e..80a86de886 100644
--- a/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java
@@ -41,145 +41,164 @@ import org.w3c.dom.Element;
  * @author Oliver Becker
  */
 class RememberMeBeanDefinitionParser implements BeanDefinitionParser {
-    static final String ATT_DATA_SOURCE = "data-source-ref";
-    static final String ATT_SERVICES_REF = "services-ref";
-    static final String ATT_SERVICES_ALIAS = "services-alias";
-    static final String ATT_TOKEN_REPOSITORY = "token-repository-ref";
-    static final String ATT_USER_SERVICE_REF = "user-service-ref";
-    static final String ATT_SUCCESS_HANDLER_REF = "authentication-success-handler-ref";
-    static final String ATT_TOKEN_VALIDITY = "token-validity-seconds";
-    static final String ATT_SECURE_COOKIE = "use-secure-cookie";
-    static final String ATT_FORM_REMEMBERME_PARAMETER = "remember-me-parameter";
-    static final String ATT_REMEMBERME_COOKIE = "remember-me-cookie";
+	static final String ATT_DATA_SOURCE = "data-source-ref";
+	static final String ATT_SERVICES_REF = "services-ref";
+	static final String ATT_SERVICES_ALIAS = "services-alias";
+	static final String ATT_TOKEN_REPOSITORY = "token-repository-ref";
+	static final String ATT_USER_SERVICE_REF = "user-service-ref";
+	static final String ATT_SUCCESS_HANDLER_REF = "authentication-success-handler-ref";
+	static final String ATT_TOKEN_VALIDITY = "token-validity-seconds";
+	static final String ATT_SECURE_COOKIE = "use-secure-cookie";
+	static final String ATT_FORM_REMEMBERME_PARAMETER = "remember-me-parameter";
+	static final String ATT_REMEMBERME_COOKIE = "remember-me-cookie";
 
-    protected final Log logger = LogFactory.getLog(getClass());
-    private final String key;
-    private final BeanReference authenticationManager;
-    private String rememberMeServicesId;
+	protected final Log logger = LogFactory.getLog(getClass());
+	private final String key;
+	private final BeanReference authenticationManager;
+	private String rememberMeServicesId;
 
-    RememberMeBeanDefinitionParser(String key, BeanReference authenticationManager) {
-        this.key = key;
-        this.authenticationManager = authenticationManager;
-    }
+	RememberMeBeanDefinitionParser(String key, BeanReference authenticationManager) {
+		this.key = key;
+		this.authenticationManager = authenticationManager;
+	}
 
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        CompositeComponentDefinition compositeDef =
-            new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element));
-        pc.pushContainingComponent(compositeDef);
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(
+				element.getTagName(), pc.extractSource(element));
+		pc.pushContainingComponent(compositeDef);
 
-        String tokenRepository = element.getAttribute(ATT_TOKEN_REPOSITORY);
-        String dataSource = element.getAttribute(ATT_DATA_SOURCE);
-        String userServiceRef = element.getAttribute(ATT_USER_SERVICE_REF);
-        String successHandlerRef = element.getAttribute(ATT_SUCCESS_HANDLER_REF);
-        String rememberMeServicesRef = element.getAttribute(ATT_SERVICES_REF);
-        String tokenValiditySeconds = element.getAttribute(ATT_TOKEN_VALIDITY);
-        String useSecureCookie = element.getAttribute(ATT_SECURE_COOKIE);
-        String remembermeParameter = element.getAttribute(ATT_FORM_REMEMBERME_PARAMETER);
-        String remembermeCookie = element.getAttribute(ATT_REMEMBERME_COOKIE);
-        Object source = pc.extractSource(element);
+		String tokenRepository = element.getAttribute(ATT_TOKEN_REPOSITORY);
+		String dataSource = element.getAttribute(ATT_DATA_SOURCE);
+		String userServiceRef = element.getAttribute(ATT_USER_SERVICE_REF);
+		String successHandlerRef = element.getAttribute(ATT_SUCCESS_HANDLER_REF);
+		String rememberMeServicesRef = element.getAttribute(ATT_SERVICES_REF);
+		String tokenValiditySeconds = element.getAttribute(ATT_TOKEN_VALIDITY);
+		String useSecureCookie = element.getAttribute(ATT_SECURE_COOKIE);
+		String remembermeParameter = element.getAttribute(ATT_FORM_REMEMBERME_PARAMETER);
+		String remembermeCookie = element.getAttribute(ATT_REMEMBERME_COOKIE);
+		Object source = pc.extractSource(element);
 
-        RootBeanDefinition services = null;
+		RootBeanDefinition services = null;
 
-        boolean dataSourceSet = StringUtils.hasText(dataSource);
-        boolean tokenRepoSet = StringUtils.hasText(tokenRepository);
-        boolean servicesRefSet = StringUtils.hasText(rememberMeServicesRef);
-        boolean userServiceSet = StringUtils.hasText(userServiceRef);
-        boolean useSecureCookieSet = StringUtils.hasText(useSecureCookie);
-        boolean tokenValiditySet = StringUtils.hasText(tokenValiditySeconds);
-        boolean remembermeParameterSet = StringUtils.hasText(remembermeParameter);
-        boolean remembermeCookieSet = StringUtils.hasText(remembermeCookie);
+		boolean dataSourceSet = StringUtils.hasText(dataSource);
+		boolean tokenRepoSet = StringUtils.hasText(tokenRepository);
+		boolean servicesRefSet = StringUtils.hasText(rememberMeServicesRef);
+		boolean userServiceSet = StringUtils.hasText(userServiceRef);
+		boolean useSecureCookieSet = StringUtils.hasText(useSecureCookie);
+		boolean tokenValiditySet = StringUtils.hasText(tokenValiditySeconds);
+		boolean remembermeParameterSet = StringUtils.hasText(remembermeParameter);
+		boolean remembermeCookieSet = StringUtils.hasText(remembermeCookie);
 
-        if (servicesRefSet && (dataSourceSet || tokenRepoSet || userServiceSet || tokenValiditySet || useSecureCookieSet || remembermeParameterSet || remembermeCookieSet)) {
-            pc.getReaderContext().error(ATT_SERVICES_REF + " can't be used in combination with attributes "
-                    + ATT_TOKEN_REPOSITORY + "," + ATT_DATA_SOURCE + ", " + ATT_USER_SERVICE_REF + ", " + ATT_TOKEN_VALIDITY
-                    + ", " + ATT_SECURE_COOKIE + ", " + ATT_FORM_REMEMBERME_PARAMETER + " or " + ATT_REMEMBERME_COOKIE, source);
-        }
+		if (servicesRefSet
+				&& (dataSourceSet || tokenRepoSet || userServiceSet || tokenValiditySet
+						|| useSecureCookieSet || remembermeParameterSet || remembermeCookieSet)) {
+			pc.getReaderContext().error(
+					ATT_SERVICES_REF + " can't be used in combination with attributes "
+							+ ATT_TOKEN_REPOSITORY + "," + ATT_DATA_SOURCE + ", "
+							+ ATT_USER_SERVICE_REF + ", " + ATT_TOKEN_VALIDITY + ", "
+							+ ATT_SECURE_COOKIE + ", " + ATT_FORM_REMEMBERME_PARAMETER
+							+ " or " + ATT_REMEMBERME_COOKIE, source);
+		}
 
-        if (dataSourceSet && tokenRepoSet) {
-            pc.getReaderContext().error("Specify " + ATT_TOKEN_REPOSITORY + " or " +
-                    ATT_DATA_SOURCE +" but not both", source);
-        }
+		if (dataSourceSet && tokenRepoSet) {
+			pc.getReaderContext().error(
+					"Specify " + ATT_TOKEN_REPOSITORY + " or " + ATT_DATA_SOURCE
+							+ " but not both", source);
+		}
 
-        boolean isPersistent = dataSourceSet | tokenRepoSet;
+		boolean isPersistent = dataSourceSet | tokenRepoSet;
 
-        if (isPersistent) {
-            Object tokenRepo;
-            services = new RootBeanDefinition(PersistentTokenBasedRememberMeServices.class);
+		if (isPersistent) {
+			Object tokenRepo;
+			services = new RootBeanDefinition(
+					PersistentTokenBasedRememberMeServices.class);
 
-            if (tokenRepoSet) {
-                tokenRepo = new RuntimeBeanReference(tokenRepository);
-            } else {
-                tokenRepo = new RootBeanDefinition(JdbcTokenRepositoryImpl.class);
-                ((BeanDefinition)tokenRepo).getPropertyValues().addPropertyValue("dataSource",
-                        new RuntimeBeanReference(dataSource));
-            }
-            services.getConstructorArgumentValues().addIndexedArgumentValue(2, tokenRepo);
-        } else if (!servicesRefSet) {
-            services = new RootBeanDefinition(TokenBasedRememberMeServices.class);
-        }
+			if (tokenRepoSet) {
+				tokenRepo = new RuntimeBeanReference(tokenRepository);
+			}
+			else {
+				tokenRepo = new RootBeanDefinition(JdbcTokenRepositoryImpl.class);
+				((BeanDefinition) tokenRepo).getPropertyValues().addPropertyValue(
+						"dataSource", new RuntimeBeanReference(dataSource));
+			}
+			services.getConstructorArgumentValues().addIndexedArgumentValue(2, tokenRepo);
+		}
+		else if (!servicesRefSet) {
+			services = new RootBeanDefinition(TokenBasedRememberMeServices.class);
+		}
 
-        String servicesName;
+		String servicesName;
 
-        if (services != null) {
-            RootBeanDefinition uds = new RootBeanDefinition();
-            uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
-            uds.setFactoryMethodName("cachingUserDetailsService");
-            uds.getConstructorArgumentValues().addGenericArgumentValue(userServiceRef);
+		if (services != null) {
+			RootBeanDefinition uds = new RootBeanDefinition();
+			uds.setFactoryBeanName(BeanIds.USER_DETAILS_SERVICE_FACTORY);
+			uds.setFactoryMethodName("cachingUserDetailsService");
+			uds.getConstructorArgumentValues().addGenericArgumentValue(userServiceRef);
 
-            services.getConstructorArgumentValues().addGenericArgumentValue(key);
-            services.getConstructorArgumentValues().addGenericArgumentValue(uds);
-            // tokenRepo is already added if it is a PersistentTokenBasedRememberMeServices
+			services.getConstructorArgumentValues().addGenericArgumentValue(key);
+			services.getConstructorArgumentValues().addGenericArgumentValue(uds);
+			// tokenRepo is already added if it is a
+			// PersistentTokenBasedRememberMeServices
 
-            if (useSecureCookieSet) {
-                services.getPropertyValues().addPropertyValue("useSecureCookie", Boolean.valueOf(useSecureCookie));
-            }
+			if (useSecureCookieSet) {
+				services.getPropertyValues().addPropertyValue("useSecureCookie",
+						Boolean.valueOf(useSecureCookie));
+			}
 
-            if (tokenValiditySet) {
-                boolean isTokenValidityNegative = tokenValiditySeconds.startsWith("-");
-                if (isTokenValidityNegative && isPersistent) {
-                    pc.getReaderContext().error(ATT_TOKEN_VALIDITY + " cannot be negative if using" +
-                            " a persistent remember-me token repository", source);
-                }
-                services.getPropertyValues().addPropertyValue("tokenValiditySeconds", tokenValiditySeconds);
-            }
+			if (tokenValiditySet) {
+				boolean isTokenValidityNegative = tokenValiditySeconds.startsWith("-");
+				if (isTokenValidityNegative && isPersistent) {
+					pc.getReaderContext().error(
+							ATT_TOKEN_VALIDITY + " cannot be negative if using"
+									+ " a persistent remember-me token repository",
+							source);
+				}
+				services.getPropertyValues().addPropertyValue("tokenValiditySeconds",
+						tokenValiditySeconds);
+			}
 
-            if (remembermeParameterSet) {
-                services.getPropertyValues().addPropertyValue("parameter", remembermeParameter);
-            }
+			if (remembermeParameterSet) {
+				services.getPropertyValues().addPropertyValue("parameter",
+						remembermeParameter);
+			}
 
-            if (remembermeCookieSet) {
-                services.getPropertyValues().addPropertyValue("cookieName", remembermeCookie);
-            }
+			if (remembermeCookieSet) {
+				services.getPropertyValues().addPropertyValue("cookieName",
+						remembermeCookie);
+			}
 
-            services.setSource(source);
-            servicesName = pc.getReaderContext().generateBeanName(services);
-            pc.registerBeanComponent(new BeanComponentDefinition(services, servicesName));
-        } else {
-            servicesName = rememberMeServicesRef;
-        }
+			services.setSource(source);
+			servicesName = pc.getReaderContext().generateBeanName(services);
+			pc.registerBeanComponent(new BeanComponentDefinition(services, servicesName));
+		}
+		else {
+			servicesName = rememberMeServicesRef;
+		}
 
-        if (StringUtils.hasText(element.getAttribute(ATT_SERVICES_ALIAS))) {
-            pc.getRegistry().registerAlias(servicesName, element.getAttribute(ATT_SERVICES_ALIAS));
-        }
+		if (StringUtils.hasText(element.getAttribute(ATT_SERVICES_ALIAS))) {
+			pc.getRegistry().registerAlias(servicesName,
+					element.getAttribute(ATT_SERVICES_ALIAS));
+		}
 
-        this.rememberMeServicesId = servicesName;
+		this.rememberMeServicesId = servicesName;
 
-        BeanDefinitionBuilder filter = BeanDefinitionBuilder.rootBeanDefinition(RememberMeAuthenticationFilter.class);
-        filter.getRawBeanDefinition().setSource(source);
+		BeanDefinitionBuilder filter = BeanDefinitionBuilder
+				.rootBeanDefinition(RememberMeAuthenticationFilter.class);
+		filter.getRawBeanDefinition().setSource(source);
 
-        if (StringUtils.hasText(successHandlerRef)) {
-            filter.addPropertyReference("authenticationSuccessHandler", successHandlerRef);
-        }
+		if (StringUtils.hasText(successHandlerRef)) {
+			filter.addPropertyReference("authenticationSuccessHandler", successHandlerRef);
+		}
 
-        filter.addConstructorArgValue(authenticationManager);
-        filter.addConstructorArgReference(servicesName);
+		filter.addConstructorArgValue(authenticationManager);
+		filter.addConstructorArgReference(servicesName);
 
-        pc.popAndRegisterContainingComponent();
+		pc.popAndRegisterContainingComponent();
 
-        return filter.getBeanDefinition();
-    }
+		return filter.getBeanDefinition();
+	}
 
-    String getRememberMeServicesId() {
-        return this.rememberMeServicesId;
-    }
+	String getRememberMeServicesId() {
+		return this.rememberMeServicesId;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java b/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java
index d88c23ff25..52792ae027 100644
--- a/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java
+++ b/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java
@@ -14,55 +14,32 @@ package org.springframework.security.config.http;
 
 import org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter;
 
-
 /**
- * Stores the default order numbers of all Spring Security filters for use in configuration.
+ * Stores the default order numbers of all Spring Security filters for use in
+ * configuration.
  *
  * @author Luke Taylor
  * @author Rob Winch
  */
 
 enum SecurityFilters {
-    FIRST (Integer.MIN_VALUE),
-    CHANNEL_FILTER,
-    SECURITY_CONTEXT_FILTER,
-    CONCURRENT_SESSION_FILTER,
-    /** {@link WebAsyncManagerIntegrationFilter} */
-    WEB_ASYNC_MANAGER_FILTER,
-    HEADERS_FILTER,
-    CSRF_FILTER,
-    LOGOUT_FILTER,
-    X509_FILTER,
-    PRE_AUTH_FILTER,
-    CAS_FILTER,
-    FORM_LOGIN_FILTER,
-    OPENID_FILTER,
-    LOGIN_PAGE_FILTER,
-    DIGEST_AUTH_FILTER,
-    BASIC_AUTH_FILTER,
-    REQUEST_CACHE_FILTER,
-    SERVLET_API_SUPPORT_FILTER,
-    JAAS_API_SUPPORT_FILTER,
-    REMEMBER_ME_FILTER,
-    ANONYMOUS_FILTER,
-    SESSION_MANAGEMENT_FILTER,
-    EXCEPTION_TRANSLATION_FILTER,
-    FILTER_SECURITY_INTERCEPTOR,
-    SWITCH_USER_FILTER,
-    LAST (Integer.MAX_VALUE);
+	FIRST(Integer.MIN_VALUE), CHANNEL_FILTER, SECURITY_CONTEXT_FILTER, CONCURRENT_SESSION_FILTER,
+	/** {@link WebAsyncManagerIntegrationFilter} */
+	WEB_ASYNC_MANAGER_FILTER, HEADERS_FILTER, CSRF_FILTER, LOGOUT_FILTER, X509_FILTER, PRE_AUTH_FILTER, CAS_FILTER, FORM_LOGIN_FILTER, OPENID_FILTER, LOGIN_PAGE_FILTER, DIGEST_AUTH_FILTER, BASIC_AUTH_FILTER, REQUEST_CACHE_FILTER, SERVLET_API_SUPPORT_FILTER, JAAS_API_SUPPORT_FILTER, REMEMBER_ME_FILTER, ANONYMOUS_FILTER, SESSION_MANAGEMENT_FILTER, EXCEPTION_TRANSLATION_FILTER, FILTER_SECURITY_INTERCEPTOR, SWITCH_USER_FILTER, LAST(
+			Integer.MAX_VALUE);
 
-    private static final int INTERVAL = 100;
-    private final int order;
+	private static final int INTERVAL = 100;
+	private final int order;
 
-    private SecurityFilters() {
-        order = ordinal() * INTERVAL;
-    }
+	private SecurityFilters() {
+		order = ordinal() * INTERVAL;
+	}
 
-    private SecurityFilters(int order) {
-        this.order = order;
-    }
+	private SecurityFilters(int order) {
+		this.order = order;
+	}
 
-    public int getOrder() {
-       return order;
-    }
+	public int getOrder() {
+		return order;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/SessionCreationPolicy.java b/config/src/main/java/org/springframework/security/config/http/SessionCreationPolicy.java
index 2848bc8fef..dbd3feaf2f 100644
--- a/config/src/main/java/org/springframework/security/config/http/SessionCreationPolicy.java
+++ b/config/src/main/java/org/springframework/security/config/http/SessionCreationPolicy.java
@@ -11,12 +11,18 @@ import org.springframework.security.core.context.SecurityContext;
  * @since 3.1
  */
 public enum SessionCreationPolicy {
-    /** Always create an {@link HttpSession} */
-    ALWAYS,
-    /** Spring Security will never create an {@link HttpSession}, but will use the {@link HttpSession} if it already exists */
-    NEVER,
-    /** Spring Security will only create an {@link HttpSession} if required */
-    IF_REQUIRED,
-    /** Spring Security will never create an {@link HttpSession} and it will never use it to obtain the {@link SecurityContext} */
-    STATELESS
+	/** Always create an {@link HttpSession} */
+	ALWAYS,
+	/**
+	 * Spring Security will never create an {@link HttpSession}, but will use the
+	 * {@link HttpSession} if it already exists
+	 */
+	NEVER,
+	/** Spring Security will only create an {@link HttpSession} if required */
+	IF_REQUIRED,
+	/**
+	 * Spring Security will never create an {@link HttpSession} and it will never use it
+	 * to obtain the {@link SecurityContext}
+	 */
+	STATELESS
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java
index dc41c4f4a9..3a0cfb9830 100644
--- a/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java
+++ b/config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java
@@ -24,109 +24,121 @@ import org.springframework.util.StringUtils;
  */
 public class UserDetailsServiceFactoryBean implements ApplicationContextAware {
 
-    private ApplicationContext beanFactory;
+	private ApplicationContext beanFactory;
 
-    UserDetailsService userDetailsService(String id) {
-        if (!StringUtils.hasText(id)) {
-            return getUserDetailsService();
-        }
+	UserDetailsService userDetailsService(String id) {
+		if (!StringUtils.hasText(id)) {
+			return getUserDetailsService();
+		}
 
-        return (UserDetailsService) beanFactory.getBean(id);
-    }
+		return (UserDetailsService) beanFactory.getBean(id);
+	}
 
-    UserDetailsService cachingUserDetailsService(String id) {
-        if (!StringUtils.hasText(id)) {
-            return getUserDetailsService();
-        }
-        // Overwrite with the caching version if available
-        String cachingId = id + AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX;
+	UserDetailsService cachingUserDetailsService(String id) {
+		if (!StringUtils.hasText(id)) {
+			return getUserDetailsService();
+		}
+		// Overwrite with the caching version if available
+		String cachingId = id
+				+ AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX;
 
-        if (beanFactory.containsBeanDefinition(cachingId)) {
-            return (UserDetailsService) beanFactory.getBean(cachingId);
-        }
+		if (beanFactory.containsBeanDefinition(cachingId)) {
+			return (UserDetailsService) beanFactory.getBean(cachingId);
+		}
 
-        return (UserDetailsService) beanFactory.getBean(id);
-    }
+		return (UserDetailsService) beanFactory.getBean(id);
+	}
 
-    @SuppressWarnings("unchecked")
-    AuthenticationUserDetailsService authenticationUserDetailsService(String name) {
-        UserDetailsService uds;
+	@SuppressWarnings("unchecked")
+	AuthenticationUserDetailsService authenticationUserDetailsService(String name) {
+		UserDetailsService uds;
 
-        if (!StringUtils.hasText(name)) {
-            Map<String,?> beans = getBeansOfType(AuthenticationUserDetailsService.class);
+		if (!StringUtils.hasText(name)) {
+			Map<String, ?> beans = getBeansOfType(AuthenticationUserDetailsService.class);
 
-            if (!beans.isEmpty()) {
-                if (beans.size() > 1) {
-                    throw new ApplicationContextException("More than one AuthenticationUserDetailsService registered." +
-                            " Please use a specific Id reference.");
-                }
-                return (AuthenticationUserDetailsService) beans.values().toArray()[0];
-            }
+			if (!beans.isEmpty()) {
+				if (beans.size() > 1) {
+					throw new ApplicationContextException(
+							"More than one AuthenticationUserDetailsService registered."
+									+ " Please use a specific Id reference.");
+				}
+				return (AuthenticationUserDetailsService) beans.values().toArray()[0];
+			}
 
-            uds = getUserDetailsService();
-        } else {
-            Object bean = beanFactory.getBean(name);
+			uds = getUserDetailsService();
+		}
+		else {
+			Object bean = beanFactory.getBean(name);
 
-            if (bean instanceof AuthenticationUserDetailsService) {
-                return (AuthenticationUserDetailsService)bean;
-            } else if (bean instanceof UserDetailsService) {
-                uds = cachingUserDetailsService(name);
+			if (bean instanceof AuthenticationUserDetailsService) {
+				return (AuthenticationUserDetailsService) bean;
+			}
+			else if (bean instanceof UserDetailsService) {
+				uds = cachingUserDetailsService(name);
 
-                if (uds == null) {
-                    uds = (UserDetailsService)bean;
-                }
-            } else {
-                throw new ApplicationContextException("Bean '" + name + "' must be a UserDetailsService or an" +
-                        " AuthenticationUserDetailsService");
-            }
-        }
+				if (uds == null) {
+					uds = (UserDetailsService) bean;
+				}
+			}
+			else {
+				throw new ApplicationContextException("Bean '" + name
+						+ "' must be a UserDetailsService or an"
+						+ " AuthenticationUserDetailsService");
+			}
+		}
 
-        return new UserDetailsByNameServiceWrapper(uds);
-    }
+		return new UserDetailsByNameServiceWrapper(uds);
+	}
 
-    /**
-     * Obtains a user details service for use in RememberMeServices etc. Will return a caching version
-     * if available so should not be used for beans which need to separate the two.
-     */
-    private UserDetailsService getUserDetailsService() {
-        Map<String,?> beans = getBeansOfType(CachingUserDetailsService.class);
+	/**
+	 * Obtains a user details service for use in RememberMeServices etc. Will return a
+	 * caching version if available so should not be used for beans which need to separate
+	 * the two.
+	 */
+	private UserDetailsService getUserDetailsService() {
+		Map<String, ?> beans = getBeansOfType(CachingUserDetailsService.class);
 
-        if (beans.size() == 0) {
-            beans = getBeansOfType(UserDetailsService.class);
-        }
+		if (beans.size() == 0) {
+			beans = getBeansOfType(UserDetailsService.class);
+		}
 
-        if (beans.size() == 0) {
-            throw new ApplicationContextException("No UserDetailsService registered.");
+		if (beans.size() == 0) {
+			throw new ApplicationContextException("No UserDetailsService registered.");
 
-        } else if (beans.size() > 1) {
-            throw new ApplicationContextException("More than one UserDetailsService registered. Please " +
-                    "use a specific Id reference in <remember-me/> <openid-login/> or <x509 /> elements.");
-        }
+		}
+		else if (beans.size() > 1) {
+			throw new ApplicationContextException(
+					"More than one UserDetailsService registered. Please "
+							+ "use a specific Id reference in <remember-me/> <openid-login/> or <x509 /> elements.");
+		}
 
-        return (UserDetailsService) beans.values().toArray()[0];
-    }
+		return (UserDetailsService) beans.values().toArray()[0];
+	}
 
-    public void setApplicationContext(ApplicationContext beanFactory) throws BeansException {
-        this.beanFactory = beanFactory;
-    }
+	public void setApplicationContext(ApplicationContext beanFactory)
+			throws BeansException {
+		this.beanFactory = beanFactory;
+	}
 
-    private Map<String,?> getBeansOfType(Class<?> type) {
-        Map<String,?> beans = beanFactory.getBeansOfType(type);
+	private Map<String, ?> getBeansOfType(Class<?> type) {
+		Map<String, ?> beans = beanFactory.getBeansOfType(type);
 
-        // Check ancestor bean factories if they exist and the current one has none of the required type
-        BeanFactory parent = beanFactory.getParentBeanFactory();
-        while (parent != null && beans.size() == 0) {
-            if (parent instanceof ListableBeanFactory) {
-                beans = ((ListableBeanFactory)parent).getBeansOfType(type);
-            }
-            if (parent instanceof HierarchicalBeanFactory) {
-                parent = ((HierarchicalBeanFactory)parent).getParentBeanFactory();
-            } else {
-                break;
-            }
-        }
+		// Check ancestor bean factories if they exist and the current one has none of the
+		// required type
+		BeanFactory parent = beanFactory.getParentBeanFactory();
+		while (parent != null && beans.size() == 0) {
+			if (parent instanceof ListableBeanFactory) {
+				beans = ((ListableBeanFactory) parent).getBeansOfType(type);
+			}
+			if (parent instanceof HierarchicalBeanFactory) {
+				parent = ((HierarchicalBeanFactory) parent).getParentBeanFactory();
+			}
+			else {
+				break;
+			}
+		}
 
-        return beans;
-    }
+		return beans;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java b/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java
index d87ed7d570..8116424733 100644
--- a/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java
+++ b/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java
@@ -20,34 +20,39 @@ import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * Utility methods used internally by the Spring Security http namespace configuration code.
+ * Utility methods used internally by the Spring Security http namespace configuration
+ * code.
  *
  * @author Luke Taylor
  * @author Ben Alex
  */
 abstract class WebConfigUtils {
 
-    public static int countNonEmpty(String[] objects) {
-        int nonNulls = 0;
+	public static int countNonEmpty(String[] objects) {
+		int nonNulls = 0;
 
-        for (String object : objects) {
-            if (StringUtils.hasText(object)) {
-                nonNulls++;
-            }
-        }
+		for (String object : objects) {
+			if (StringUtils.hasText(object)) {
+				nonNulls++;
+			}
+		}
 
-        return nonNulls;
-    }
+		return nonNulls;
+	}
 
-    /**
-     * Checks the value of an XML attribute which represents a redirect URL.
-     * If not empty or starting with "$" (potential placeholder), or starting with "#" (potential SpEL), "/" or "http" it will raise an error.
-     */
-    static void validateHttpRedirect(String url, ParserContext pc, Object source) {
-        if (!StringUtils.hasText(url) || UrlUtils.isValidRedirectUrl(url) || url.startsWith("$") || url.startsWith("#")) {
-            return;
-        }
-        pc.getReaderContext().warning(url + " is not a valid redirect URL (must start with '/' or http(s))", source);
-    }
+	/**
+	 * Checks the value of an XML attribute which represents a redirect URL. If not empty
+	 * or starting with "$" (potential placeholder), or starting with "#" (potential
+	 * SpEL), "/" or "http" it will raise an error.
+	 */
+	static void validateHttpRedirect(String url, ParserContext pc, Object source) {
+		if (!StringUtils.hasText(url) || UrlUtils.isValidRedirectUrl(url)
+				|| url.startsWith("$") || url.startsWith("#")) {
+			return;
+		}
+		pc.getReaderContext().warning(
+				url + " is not a valid redirect URL (must start with '/' or http(s))",
+				source);
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java
index f867d7b27f..5837d9a4a6 100644
--- a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java
@@ -10,56 +10,69 @@ import org.springframework.security.config.Elements;
 import org.springframework.util.ClassUtils;
 
 /**
- * Checks for the presence of a ContextSource instance. Also supplies the standard reference to any
- * unconfigured <ldap-authentication-provider> or <ldap-user-service> beans. This is
- * necessary in cases where the user has given the server a specific Id, but hasn't used
- * the server-ref attribute to link this to the other ldap definitions. See SEC-799.
+ * Checks for the presence of a ContextSource instance. Also supplies the standard
+ * reference to any unconfigured <ldap-authentication-provider> or <ldap-user-service>
+ * beans. This is necessary in cases where the user has given the server a specific Id,
+ * but hasn't used the server-ref attribute to link this to the other ldap definitions.
+ * See SEC-799.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered {
-    private static final String REQUIRED_CONTEXT_SOURCE_CLASS_NAME = "org.springframework.ldap.core.support.BaseLdapPathContextSource";
+	private static final String REQUIRED_CONTEXT_SOURCE_CLASS_NAME = "org.springframework.ldap.core.support.BaseLdapPathContextSource";
 
-    /** If set to true, a bean parser has indicated that the default context source name needs to be set */
-    private boolean defaultNameRequired;
+	/**
+	 * If set to true, a bean parser has indicated that the default context source name
+	 * needs to be set
+	 */
+	private boolean defaultNameRequired;
 
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory bf)
+			throws BeansException {
+		Class<?> contextSourceClass;
 
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory bf) throws BeansException {
-        Class<?> contextSourceClass;
+		try {
+			contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME,
+					ClassUtils.getDefaultClassLoader());
+		}
+		catch (ClassNotFoundException e) {
+			throw new ApplicationContextException(
+					"Couldn't locate: "
+							+ REQUIRED_CONTEXT_SOURCE_CLASS_NAME
+							+ ". "
+							+ " If you are using LDAP with Spring Security, please ensure that you include the spring-ldap "
+							+ "jar file in your application", e);
+		}
 
-        try {
-            contextSourceClass = ClassUtils.forName(REQUIRED_CONTEXT_SOURCE_CLASS_NAME, ClassUtils.getDefaultClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new ApplicationContextException("Couldn't locate: " + REQUIRED_CONTEXT_SOURCE_CLASS_NAME + ". " +
-                    " If you are using LDAP with Spring Security, please ensure that you include the spring-ldap " +
-                    "jar file in your application", e);
-        }
+		String[] sources = bf.getBeanNamesForType(contextSourceClass, false, false);
 
-        String[] sources = bf.getBeanNamesForType(contextSourceClass, false, false);
+		if (sources.length == 0) {
+			throw new ApplicationContextException(
+					"No BaseLdapPathContextSource instances found. Have you "
+							+ "added an <" + Elements.LDAP_SERVER
+							+ " /> element to your application context? If you have "
+							+ "declared an explicit bean, do not use lazy-init");
+		}
 
-        if (sources.length == 0) {
-            throw new ApplicationContextException("No BaseLdapPathContextSource instances found. Have you " +
-                    "added an <" + Elements.LDAP_SERVER + " /> element to your application context? If you have " +
-                    "declared an explicit bean, do not use lazy-init");
-        }
+		if (!bf.containsBean(BeanIds.CONTEXT_SOURCE) && defaultNameRequired) {
+			if (sources.length > 1) {
+				throw new ApplicationContextException(
+						"More than one BaseLdapPathContextSource instance found. "
+								+ "Please specify a specific server id using the 'server-ref' attribute when configuring your <"
+								+ Elements.LDAP_PROVIDER + "> " + "or <"
+								+ Elements.LDAP_USER_SERVICE + ">.");
+			}
 
-        if (!bf.containsBean(BeanIds.CONTEXT_SOURCE) && defaultNameRequired) {
-            if (sources.length > 1) {
-                throw new ApplicationContextException("More than one BaseLdapPathContextSource instance found. " +
-                        "Please specify a specific server id using the 'server-ref' attribute when configuring your <" +
-                        Elements.LDAP_PROVIDER + "> " + "or <" + Elements.LDAP_USER_SERVICE + ">.");
-            }
+			bf.registerAlias(sources[0], BeanIds.CONTEXT_SOURCE);
+		}
+	}
 
-            bf.registerAlias(sources[0], BeanIds.CONTEXT_SOURCE);
-        }
-    }
+	public void setDefaultNameRequired(boolean defaultNameRequired) {
+		this.defaultNameRequired = defaultNameRequired;
+	}
 
-    public void setDefaultNameRequired(boolean defaultNameRequired) {
-        this.defaultNameRequired = defaultNameRequired;
-    }
-
-    public int getOrder() {
-        return LOWEST_PRECEDENCE;
-    }
+	public int getOrder() {
+		return LOWEST_PRECEDENCE;
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java
index f1b5b9e5e0..0531d0e5da 100644
--- a/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java
@@ -20,86 +20,104 @@ import org.w3c.dom.Element;
  * @since 2.0
  */
 public class LdapProviderBeanDefinitionParser implements BeanDefinitionParser {
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private static final String ATT_USER_DN_PATTERN = "user-dn-pattern";
-    private static final String ATT_USER_PASSWORD = "password-attribute";
-    private static final String ATT_HASH = PasswordEncoderParser.ATT_HASH;
+	private static final String ATT_USER_DN_PATTERN = "user-dn-pattern";
+	private static final String ATT_USER_PASSWORD = "password-attribute";
+	private static final String ATT_HASH = PasswordEncoderParser.ATT_HASH;
 
-    private static final String DEF_USER_SEARCH_FILTER = "uid={0}";
+	private static final String DEF_USER_SEARCH_FILTER = "uid={0}";
 
-    static final String PROVIDER_CLASS = "org.springframework.security.ldap.authentication.LdapAuthenticationProvider";
-    static final String BIND_AUTH_CLASS = "org.springframework.security.ldap.authentication.BindAuthenticator";
-    static final String PASSWD_AUTH_CLASS = "org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator";
+	static final String PROVIDER_CLASS = "org.springframework.security.ldap.authentication.LdapAuthenticationProvider";
+	static final String BIND_AUTH_CLASS = "org.springframework.security.ldap.authentication.BindAuthenticator";
+	static final String PASSWD_AUTH_CLASS = "org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator";
 
-    public BeanDefinition parse(Element elt, ParserContext parserContext) {
-        RuntimeBeanReference contextSource = LdapUserServiceBeanDefinitionParser.parseServerReference(elt, parserContext);
+	public BeanDefinition parse(Element elt, ParserContext parserContext) {
+		RuntimeBeanReference contextSource = LdapUserServiceBeanDefinitionParser
+				.parseServerReference(elt, parserContext);
 
-        BeanDefinition searchBean = LdapUserServiceBeanDefinitionParser.parseSearchBean(elt, parserContext);
-        String userDnPattern = elt.getAttribute(ATT_USER_DN_PATTERN);
+		BeanDefinition searchBean = LdapUserServiceBeanDefinitionParser.parseSearchBean(
+				elt, parserContext);
+		String userDnPattern = elt.getAttribute(ATT_USER_DN_PATTERN);
 
-        String[] userDnPatternArray = new String[0];
+		String[] userDnPatternArray = new String[0];
 
-        if (StringUtils.hasText(userDnPattern)) {
-            userDnPatternArray = new String[] {userDnPattern};
-            // TODO: Validate the pattern and make sure it is a valid DN.
-        } else if (searchBean == null) {
-            logger.info("No search information or DN pattern specified. Using default search filter '" + DEF_USER_SEARCH_FILTER + "'");
-            BeanDefinitionBuilder searchBeanBuilder = BeanDefinitionBuilder.rootBeanDefinition(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
-            searchBeanBuilder.getRawBeanDefinition().setSource(elt);
-            searchBeanBuilder.addConstructorArgValue("");
-            searchBeanBuilder.addConstructorArgValue(DEF_USER_SEARCH_FILTER);
-            searchBeanBuilder.addConstructorArgValue(contextSource);
-            searchBean = searchBeanBuilder.getBeanDefinition();
-        }
+		if (StringUtils.hasText(userDnPattern)) {
+			userDnPatternArray = new String[] { userDnPattern };
+			// TODO: Validate the pattern and make sure it is a valid DN.
+		}
+		else if (searchBean == null) {
+			logger.info("No search information or DN pattern specified. Using default search filter '"
+					+ DEF_USER_SEARCH_FILTER + "'");
+			BeanDefinitionBuilder searchBeanBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
+			searchBeanBuilder.getRawBeanDefinition().setSource(elt);
+			searchBeanBuilder.addConstructorArgValue("");
+			searchBeanBuilder.addConstructorArgValue(DEF_USER_SEARCH_FILTER);
+			searchBeanBuilder.addConstructorArgValue(contextSource);
+			searchBean = searchBeanBuilder.getBeanDefinition();
+		}
 
-        BeanDefinitionBuilder authenticatorBuilder =
-            BeanDefinitionBuilder.rootBeanDefinition(BIND_AUTH_CLASS);
-        Element passwordCompareElt = DomUtils.getChildElementByTagName(elt, Elements.LDAP_PASSWORD_COMPARE);
+		BeanDefinitionBuilder authenticatorBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(BIND_AUTH_CLASS);
+		Element passwordCompareElt = DomUtils.getChildElementByTagName(elt,
+				Elements.LDAP_PASSWORD_COMPARE);
 
-        if (passwordCompareElt != null) {
-            authenticatorBuilder =
-                BeanDefinitionBuilder.rootBeanDefinition(PASSWD_AUTH_CLASS);
+		if (passwordCompareElt != null) {
+			authenticatorBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(PASSWD_AUTH_CLASS);
 
-            String passwordAttribute = passwordCompareElt.getAttribute(ATT_USER_PASSWORD);
-            if (StringUtils.hasText(passwordAttribute)) {
-                authenticatorBuilder.addPropertyValue("passwordAttributeName", passwordAttribute);
-            }
+			String passwordAttribute = passwordCompareElt.getAttribute(ATT_USER_PASSWORD);
+			if (StringUtils.hasText(passwordAttribute)) {
+				authenticatorBuilder.addPropertyValue("passwordAttributeName",
+						passwordAttribute);
+			}
 
-            Element passwordEncoderElement = DomUtils.getChildElementByTagName(passwordCompareElt, Elements.PASSWORD_ENCODER);
-            String hash = passwordCompareElt.getAttribute(ATT_HASH);
+			Element passwordEncoderElement = DomUtils.getChildElementByTagName(
+					passwordCompareElt, Elements.PASSWORD_ENCODER);
+			String hash = passwordCompareElt.getAttribute(ATT_HASH);
 
-            if (passwordEncoderElement != null) {
-                if (StringUtils.hasText(hash)) {
-                    parserContext.getReaderContext().warning("Attribute 'hash' cannot be used with 'password-encoder' and " +
-                            "will be ignored.", parserContext.extractSource(elt));
-                }
-                PasswordEncoderParser pep = new PasswordEncoderParser(passwordEncoderElement, parserContext);
-                authenticatorBuilder.addPropertyValue("passwordEncoder", pep.getPasswordEncoder());
+			if (passwordEncoderElement != null) {
+				if (StringUtils.hasText(hash)) {
+					parserContext.getReaderContext().warning(
+							"Attribute 'hash' cannot be used with 'password-encoder' and "
+									+ "will be ignored.",
+							parserContext.extractSource(elt));
+				}
+				PasswordEncoderParser pep = new PasswordEncoderParser(
+						passwordEncoderElement, parserContext);
+				authenticatorBuilder.addPropertyValue("passwordEncoder",
+						pep.getPasswordEncoder());
 
-                if (pep.getSaltSource() != null) {
-                    parserContext.getReaderContext().warning("Salt source information isn't valid when used with LDAP",
-                            passwordEncoderElement);
-                }
-            } else if (StringUtils.hasText(hash)) {
-                authenticatorBuilder.addPropertyValue("passwordEncoder",
-                        PasswordEncoderParser.createPasswordEncoderBeanDefinition(hash, false));
-            }
-        }
+				if (pep.getSaltSource() != null) {
+					parserContext.getReaderContext().warning(
+							"Salt source information isn't valid when used with LDAP",
+							passwordEncoderElement);
+				}
+			}
+			else if (StringUtils.hasText(hash)) {
+				authenticatorBuilder.addPropertyValue("passwordEncoder",
+						PasswordEncoderParser.createPasswordEncoderBeanDefinition(hash,
+								false));
+			}
+		}
 
-        authenticatorBuilder.addConstructorArgValue(contextSource);
-        authenticatorBuilder.addPropertyValue("userDnPatterns", userDnPatternArray);
+		authenticatorBuilder.addConstructorArgValue(contextSource);
+		authenticatorBuilder.addPropertyValue("userDnPatterns", userDnPatternArray);
 
-        if (searchBean != null) {
-            authenticatorBuilder.addPropertyValue("userSearch", searchBean);
-        }
+		if (searchBean != null) {
+			authenticatorBuilder.addPropertyValue("userSearch", searchBean);
+		}
 
-        BeanDefinitionBuilder ldapProvider = BeanDefinitionBuilder.rootBeanDefinition(PROVIDER_CLASS);
-        ldapProvider.addConstructorArgValue(authenticatorBuilder.getBeanDefinition());
-        ldapProvider.addConstructorArgValue(LdapUserServiceBeanDefinitionParser.parseAuthoritiesPopulator(elt, parserContext));
-        ldapProvider.addPropertyValue("userDetailsContextMapper",
-                LdapUserServiceBeanDefinitionParser.parseUserDetailsClassOrUserMapperRef(elt, parserContext));
+		BeanDefinitionBuilder ldapProvider = BeanDefinitionBuilder
+				.rootBeanDefinition(PROVIDER_CLASS);
+		ldapProvider.addConstructorArgValue(authenticatorBuilder.getBeanDefinition());
+		ldapProvider.addConstructorArgValue(LdapUserServiceBeanDefinitionParser
+				.parseAuthoritiesPopulator(elt, parserContext));
+		ldapProvider.addPropertyValue("userDetailsContextMapper",
+				LdapUserServiceBeanDefinitionParser.parseUserDetailsClassOrUserMapperRef(
+						elt, parserContext));
 
-        return ldapProvider.getBeanDefinition();
-    }
+		return ldapProvider.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParser.java
index e4d07d60ee..04ef2ffd90 100644
--- a/config/src/main/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParser.java
@@ -20,148 +20,165 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  */
 public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
-    private static final String CONTEXT_SOURCE_CLASS="org.springframework.security.ldap.DefaultSpringSecurityContextSource";
+	private static final String CONTEXT_SOURCE_CLASS = "org.springframework.security.ldap.DefaultSpringSecurityContextSource";
 
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    /** Defines the Url of the ldap server to use. If not specified, an embedded apache DS instance will be created */
-    private static final String ATT_URL = "url";
+	/**
+	 * Defines the Url of the ldap server to use. If not specified, an embedded apache DS
+	 * instance will be created
+	 */
+	private static final String ATT_URL = "url";
 
-    private static final String ATT_PRINCIPAL = "manager-dn";
-    private static final String ATT_PASSWORD = "manager-password";
+	private static final String ATT_PRINCIPAL = "manager-dn";
+	private static final String ATT_PASSWORD = "manager-password";
 
-    // Properties which apply to embedded server only - when no Url is set
+	// Properties which apply to embedded server only - when no Url is set
 
-    /** sets the configuration suffix (default is "dc=springframework,dc=org"). */
-    public static final String ATT_ROOT_SUFFIX = "root";
-    private static final String OPT_DEFAULT_ROOT_SUFFIX = "dc=springframework,dc=org";
-    /**
-     * Optionally defines an ldif resource to be loaded. Otherwise an attempt will be made to load all ldif files
-     * found on the classpath.
-     */
-    public static final String ATT_LDIF_FILE = "ldif";
-    private static final String OPT_DEFAULT_LDIF_FILE = "classpath*:*.ldif";
+	/** sets the configuration suffix (default is "dc=springframework,dc=org"). */
+	public static final String ATT_ROOT_SUFFIX = "root";
+	private static final String OPT_DEFAULT_ROOT_SUFFIX = "dc=springframework,dc=org";
+	/**
+	 * Optionally defines an ldif resource to be loaded. Otherwise an attempt will be made
+	 * to load all ldif files found on the classpath.
+	 */
+	public static final String ATT_LDIF_FILE = "ldif";
+	private static final String OPT_DEFAULT_LDIF_FILE = "classpath*:*.ldif";
 
-    /** Defines the port the LDAP_PROVIDER server should run on */
-    public static final String ATT_PORT = "port";
-    private static final int DEFAULT_PORT = 33389;
-    public static final String OPT_DEFAULT_PORT = String.valueOf(DEFAULT_PORT);
+	/** Defines the port the LDAP_PROVIDER server should run on */
+	public static final String ATT_PORT = "port";
+	private static final int DEFAULT_PORT = 33389;
+	public static final String OPT_DEFAULT_PORT = String.valueOf(DEFAULT_PORT);
 
+	public BeanDefinition parse(Element elt, ParserContext parserContext) {
+		String url = elt.getAttribute(ATT_URL);
 
-    public BeanDefinition parse(Element elt, ParserContext parserContext) {
-        String url = elt.getAttribute(ATT_URL);
+		RootBeanDefinition contextSource;
 
-        RootBeanDefinition contextSource;
+		if (!StringUtils.hasText(url)) {
+			contextSource = createEmbeddedServer(elt, parserContext);
+		}
+		else {
+			contextSource = new RootBeanDefinition();
+			contextSource.setBeanClassName(CONTEXT_SOURCE_CLASS);
+			contextSource.getConstructorArgumentValues().addIndexedArgumentValue(0, url);
+		}
 
-        if (!StringUtils.hasText(url)) {
-            contextSource = createEmbeddedServer(elt, parserContext);
-        } else {
-            contextSource = new RootBeanDefinition();
-            contextSource.setBeanClassName(CONTEXT_SOURCE_CLASS);
-            contextSource.getConstructorArgumentValues().addIndexedArgumentValue(0, url);
-        }
+		contextSource.setSource(parserContext.extractSource(elt));
 
-        contextSource.setSource(parserContext.extractSource(elt));
+		String managerDn = elt.getAttribute(ATT_PRINCIPAL);
+		String managerPassword = elt.getAttribute(ATT_PASSWORD);
 
-        String managerDn = elt.getAttribute(ATT_PRINCIPAL);
-        String managerPassword = elt.getAttribute(ATT_PASSWORD);
+		if (StringUtils.hasText(managerDn)) {
+			if (!StringUtils.hasText(managerPassword)) {
+				parserContext.getReaderContext().error(
+						"You must specify the " + ATT_PASSWORD + " if you supply a "
+								+ managerDn, elt);
+			}
 
-        if (StringUtils.hasText(managerDn)) {
-            if(!StringUtils.hasText(managerPassword)) {
-                parserContext.getReaderContext().error("You must specify the " + ATT_PASSWORD +
-                        " if you supply a " + managerDn, elt);
-            }
+			contextSource.getPropertyValues().addPropertyValue("userDn", managerDn);
+			contextSource.getPropertyValues().addPropertyValue("password",
+					managerPassword);
+		}
 
-            contextSource.getPropertyValues().addPropertyValue("userDn", managerDn);
-            contextSource.getPropertyValues().addPropertyValue("password", managerPassword);
-        }
+		String id = elt.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
 
-        String id = elt.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
+		String contextSourceId = StringUtils.hasText(id) ? id : BeanIds.CONTEXT_SOURCE;
 
-        String contextSourceId = StringUtils.hasText(id) ? id : BeanIds.CONTEXT_SOURCE;
+		parserContext.getRegistry()
+				.registerBeanDefinition(contextSourceId, contextSource);
 
-        parserContext.getRegistry().registerBeanDefinition(contextSourceId, contextSource);
+		return null;
+	}
 
-        return null;
-    }
+	/**
+	 * Will be called if no url attribute is supplied.
+	 *
+	 * Registers beans to create an embedded apache directory server.
+	 *
+	 * @return the BeanDefinition for the ContextSource for the embedded server.
+	 *
+	 * @see ApacheDSContainer
+	 */
+	private RootBeanDefinition createEmbeddedServer(Element element,
+			ParserContext parserContext) {
+		Object source = parserContext.extractSource(element);
 
-    /**
-     * Will be called if no url attribute is supplied.
-     *
-     * Registers beans to create an embedded apache directory server.
-     *
-     * @return the BeanDefinition for the ContextSource for the embedded server.
-     *
-     * @see ApacheDSContainer
-     */
-    private RootBeanDefinition createEmbeddedServer(Element element, ParserContext parserContext) {
-        Object source = parserContext.extractSource(element);
+		String suffix = element.getAttribute(ATT_ROOT_SUFFIX);
 
-        String suffix = element.getAttribute(ATT_ROOT_SUFFIX);
+		if (!StringUtils.hasText(suffix)) {
+			suffix = OPT_DEFAULT_ROOT_SUFFIX;
+		}
 
-        if (!StringUtils.hasText(suffix)) {
-            suffix = OPT_DEFAULT_ROOT_SUFFIX;
-        }
+		String port = element.getAttribute(ATT_PORT);
 
-        String port = element.getAttribute(ATT_PORT);
+		if (!StringUtils.hasText(port)) {
+			port = getDefaultPort();
+			if (logger.isDebugEnabled()) {
+				logger.debug("Using default port of " + port);
+			}
+		}
 
-        if (!StringUtils.hasText(port)) {
-            port = getDefaultPort();
-            if(logger.isDebugEnabled()) {
-                logger.debug("Using default port of " + port);
-            }
-        }
+		String url = "ldap://127.0.0.1:" + port + "/" + suffix;
 
-        String url = "ldap://127.0.0.1:" + port + "/" + suffix;
+		BeanDefinitionBuilder contextSource = BeanDefinitionBuilder
+				.rootBeanDefinition(CONTEXT_SOURCE_CLASS);
+		contextSource.addConstructorArgValue(url);
+		contextSource.addPropertyValue("userDn", "uid=admin,ou=system");
+		contextSource.addPropertyValue("password", "secret");
 
-        BeanDefinitionBuilder contextSource = BeanDefinitionBuilder.rootBeanDefinition(CONTEXT_SOURCE_CLASS);
-        contextSource.addConstructorArgValue(url);
-        contextSource.addPropertyValue("userDn", "uid=admin,ou=system");
-        contextSource.addPropertyValue("password", "secret");
+		RootBeanDefinition apacheContainer = new RootBeanDefinition(
+				"org.springframework.security.ldap.server.ApacheDSContainer", null, null);
+		apacheContainer.setSource(source);
+		apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(suffix);
 
-        RootBeanDefinition apacheContainer = new RootBeanDefinition("org.springframework.security.ldap.server.ApacheDSContainer", null, null);
-        apacheContainer.setSource(source);
-        apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(suffix);
+		String ldifs = element.getAttribute(ATT_LDIF_FILE);
+		if (!StringUtils.hasText(ldifs)) {
+			ldifs = OPT_DEFAULT_LDIF_FILE;
+		}
 
-        String ldifs = element.getAttribute(ATT_LDIF_FILE);
-        if (!StringUtils.hasText(ldifs)) {
-            ldifs = OPT_DEFAULT_LDIF_FILE;
-        }
+		apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(ldifs);
+		apacheContainer.getPropertyValues().addPropertyValue("port", port);
 
-        apacheContainer.getConstructorArgumentValues().addGenericArgumentValue(ldifs);
-        apacheContainer.getPropertyValues().addPropertyValue("port", port);
+		logger.info("Embedded LDAP server bean definition created for URL: " + url);
 
-        logger.info("Embedded LDAP server bean definition created for URL: " + url);
+		if (parserContext.getRegistry()
+				.containsBeanDefinition(BeanIds.EMBEDDED_APACHE_DS)) {
+			parserContext.getReaderContext().error(
+					"Only one embedded server bean is allowed per application context",
+					element);
+		}
 
-        if (parserContext.getRegistry().containsBeanDefinition(BeanIds.EMBEDDED_APACHE_DS)) {
-            parserContext.getReaderContext().error("Only one embedded server bean is allowed per application context",
-                    element);
-        }
+		parserContext.getRegistry().registerBeanDefinition(BeanIds.EMBEDDED_APACHE_DS,
+				apacheContainer);
 
-        parserContext.getRegistry().registerBeanDefinition(BeanIds.EMBEDDED_APACHE_DS, apacheContainer);
+		return (RootBeanDefinition) contextSource.getBeanDefinition();
+	}
 
-        return (RootBeanDefinition) contextSource.getBeanDefinition();
-    }
-
-    private String getDefaultPort() {
-        ServerSocket serverSocket = null;
-        try {
-            try {
-                serverSocket = new ServerSocket(DEFAULT_PORT);
-            } catch (IOException e) {
-                try {
-                    serverSocket = new ServerSocket(0);
-                } catch(IOException e2) {
-                    return String.valueOf(DEFAULT_PORT);
-                }
-            }
-            return String.valueOf(serverSocket.getLocalPort());
-        } finally {
-            if(serverSocket != null) {
-                try {
-                    serverSocket.close();
-                } catch (IOException e) {}
-            }
-        }
-    }
+	private String getDefaultPort() {
+		ServerSocket serverSocket = null;
+		try {
+			try {
+				serverSocket = new ServerSocket(DEFAULT_PORT);
+			}
+			catch (IOException e) {
+				try {
+					serverSocket = new ServerSocket(0);
+				}
+				catch (IOException e2) {
+					return String.valueOf(DEFAULT_PORT);
+				}
+			}
+			return String.valueOf(serverSocket.getLocalPort());
+		}
+		finally {
+			if (serverSocket != null) {
+				try {
+					serverSocket.close();
+				}
+				catch (IOException e) {
+				}
+			}
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParser.java
index 2d708002d5..953dce3416 100644
--- a/config/src/main/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParser.java
@@ -17,162 +17,184 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  * @since 2.0
  */
-public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServiceBeanDefinitionParser {
-    public static final String ATT_SERVER = "server-ref";
-    public static final String ATT_USER_SEARCH_FILTER = "user-search-filter";
-    public static final String ATT_USER_SEARCH_BASE = "user-search-base";
-    public static final String DEF_USER_SEARCH_BASE = "";
+public class LdapUserServiceBeanDefinitionParser extends
+		AbstractUserDetailsServiceBeanDefinitionParser {
+	public static final String ATT_SERVER = "server-ref";
+	public static final String ATT_USER_SEARCH_FILTER = "user-search-filter";
+	public static final String ATT_USER_SEARCH_BASE = "user-search-base";
+	public static final String DEF_USER_SEARCH_BASE = "";
 
-    public static final String ATT_GROUP_SEARCH_FILTER = "group-search-filter";
-    public static final String ATT_GROUP_SEARCH_BASE = "group-search-base";
-    public static final String ATT_GROUP_ROLE_ATTRIBUTE = "group-role-attribute";
-    public static final String DEF_GROUP_SEARCH_FILTER = "(uniqueMember={0})";
-    public static final String DEF_GROUP_SEARCH_BASE = "";
+	public static final String ATT_GROUP_SEARCH_FILTER = "group-search-filter";
+	public static final String ATT_GROUP_SEARCH_BASE = "group-search-base";
+	public static final String ATT_GROUP_ROLE_ATTRIBUTE = "group-role-attribute";
+	public static final String DEF_GROUP_SEARCH_FILTER = "(uniqueMember={0})";
+	public static final String DEF_GROUP_SEARCH_BASE = "";
 
-    static final String ATT_ROLE_PREFIX = "role-prefix";
-    static final String ATT_USER_CLASS = "user-details-class";
-    static final String ATT_USER_CONTEXT_MAPPER_REF = "user-context-mapper-ref";
-    static final String OPT_PERSON = "person";
-    static final String OPT_INETORGPERSON = "inetOrgPerson";
+	static final String ATT_ROLE_PREFIX = "role-prefix";
+	static final String ATT_USER_CLASS = "user-details-class";
+	static final String ATT_USER_CONTEXT_MAPPER_REF = "user-context-mapper-ref";
+	static final String OPT_PERSON = "person";
+	static final String OPT_INETORGPERSON = "inetOrgPerson";
 
-    public static final String LDAP_SEARCH_CLASS = "org.springframework.security.ldap.search.FilterBasedLdapUserSearch";
-    public static final String PERSON_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.PersonContextMapper";
-    public static final String INET_ORG_PERSON_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.InetOrgPersonContextMapper";
-    public static final String LDAP_USER_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.LdapUserDetailsMapper";
-    public static final String LDAP_AUTHORITIES_POPULATOR_CLASS = "org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator";
+	public static final String LDAP_SEARCH_CLASS = "org.springframework.security.ldap.search.FilterBasedLdapUserSearch";
+	public static final String PERSON_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.PersonContextMapper";
+	public static final String INET_ORG_PERSON_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.InetOrgPersonContextMapper";
+	public static final String LDAP_USER_MAPPER_CLASS = "org.springframework.security.ldap.userdetails.LdapUserDetailsMapper";
+	public static final String LDAP_AUTHORITIES_POPULATOR_CLASS = "org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator";
 
-    protected String getBeanClassName(Element element) {
-        return "org.springframework.security.ldap.userdetails.LdapUserDetailsService";
-    }
+	protected String getBeanClassName(Element element) {
+		return "org.springframework.security.ldap.userdetails.LdapUserDetailsService";
+	}
 
-    protected void doParse(Element elt, ParserContext parserContext, BeanDefinitionBuilder builder) {
+	protected void doParse(Element elt, ParserContext parserContext,
+			BeanDefinitionBuilder builder) {
 
-        if (!StringUtils.hasText(elt.getAttribute(ATT_USER_SEARCH_FILTER))) {
-            parserContext.getReaderContext().error("User search filter must be supplied", elt);
-        }
+		if (!StringUtils.hasText(elt.getAttribute(ATT_USER_SEARCH_FILTER))) {
+			parserContext.getReaderContext().error("User search filter must be supplied",
+					elt);
+		}
 
-        builder.addConstructorArgValue(parseSearchBean(elt, parserContext));
-        builder.getRawBeanDefinition().setSource(parserContext.extractSource(elt));
-        builder.addConstructorArgValue(parseAuthoritiesPopulator(elt, parserContext));
-        builder.addPropertyValue("userDetailsMapper", parseUserDetailsClassOrUserMapperRef(elt, parserContext));
-    }
+		builder.addConstructorArgValue(parseSearchBean(elt, parserContext));
+		builder.getRawBeanDefinition().setSource(parserContext.extractSource(elt));
+		builder.addConstructorArgValue(parseAuthoritiesPopulator(elt, parserContext));
+		builder.addPropertyValue("userDetailsMapper",
+				parseUserDetailsClassOrUserMapperRef(elt, parserContext));
+	}
 
-    static RootBeanDefinition parseSearchBean(Element elt, ParserContext parserContext) {
-        String userSearchFilter = elt.getAttribute(ATT_USER_SEARCH_FILTER);
-        String userSearchBase = elt.getAttribute(ATT_USER_SEARCH_BASE);
-        Object source = parserContext.extractSource(elt);
+	static RootBeanDefinition parseSearchBean(Element elt, ParserContext parserContext) {
+		String userSearchFilter = elt.getAttribute(ATT_USER_SEARCH_FILTER);
+		String userSearchBase = elt.getAttribute(ATT_USER_SEARCH_BASE);
+		Object source = parserContext.extractSource(elt);
 
-        if (StringUtils.hasText(userSearchBase)) {
-            if(!StringUtils.hasText(userSearchFilter)) {
-                parserContext.getReaderContext().error(ATT_USER_SEARCH_BASE + " cannot be used without a " + ATT_USER_SEARCH_FILTER, source);
-            }
-        } else {
-            userSearchBase = DEF_USER_SEARCH_BASE;
-        }
+		if (StringUtils.hasText(userSearchBase)) {
+			if (!StringUtils.hasText(userSearchFilter)) {
+				parserContext.getReaderContext().error(
+						ATT_USER_SEARCH_BASE + " cannot be used without a "
+								+ ATT_USER_SEARCH_FILTER, source);
+			}
+		}
+		else {
+			userSearchBase = DEF_USER_SEARCH_BASE;
+		}
 
-        if (!StringUtils.hasText(userSearchFilter)) {
-            return null;
-        }
+		if (!StringUtils.hasText(userSearchFilter)) {
+			return null;
+		}
 
-        BeanDefinitionBuilder searchBuilder = BeanDefinitionBuilder.rootBeanDefinition(LDAP_SEARCH_CLASS);
-        searchBuilder.getRawBeanDefinition().setSource(source);
-        searchBuilder.addConstructorArgValue(userSearchBase);
-        searchBuilder.addConstructorArgValue(userSearchFilter);
-        searchBuilder.addConstructorArgValue(parseServerReference(elt, parserContext));
+		BeanDefinitionBuilder searchBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(LDAP_SEARCH_CLASS);
+		searchBuilder.getRawBeanDefinition().setSource(source);
+		searchBuilder.addConstructorArgValue(userSearchBase);
+		searchBuilder.addConstructorArgValue(userSearchFilter);
+		searchBuilder.addConstructorArgValue(parseServerReference(elt, parserContext));
 
-        return (RootBeanDefinition) searchBuilder.getBeanDefinition();
-    }
+		return (RootBeanDefinition) searchBuilder.getBeanDefinition();
+	}
 
-    static RuntimeBeanReference parseServerReference(Element elt, ParserContext parserContext) {
-        String server = elt.getAttribute(ATT_SERVER);
-        boolean requiresDefaultName = false;
+	static RuntimeBeanReference parseServerReference(Element elt,
+			ParserContext parserContext) {
+		String server = elt.getAttribute(ATT_SERVER);
+		boolean requiresDefaultName = false;
 
-        if (!StringUtils.hasText(server)) {
-            server = BeanIds.CONTEXT_SOURCE;
-            requiresDefaultName = true;
-        }
+		if (!StringUtils.hasText(server)) {
+			server = BeanIds.CONTEXT_SOURCE;
+			requiresDefaultName = true;
+		}
 
-        RuntimeBeanReference contextSource = new RuntimeBeanReference(server);
-        contextSource.setSource(parserContext.extractSource(elt));
-        registerPostProcessorIfNecessary(parserContext.getRegistry(), requiresDefaultName);
+		RuntimeBeanReference contextSource = new RuntimeBeanReference(server);
+		contextSource.setSource(parserContext.extractSource(elt));
+		registerPostProcessorIfNecessary(parserContext.getRegistry(), requiresDefaultName);
 
-        return contextSource;
-    }
+		return contextSource;
+	}
 
-    private static void registerPostProcessorIfNecessary(BeanDefinitionRegistry registry, boolean defaultNameRequired) {
-        if (registry.containsBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR)) {
-            if (defaultNameRequired) {
-                BeanDefinition bd = registry.getBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR);
-                bd.getPropertyValues().addPropertyValue("defaultNameRequired", Boolean.valueOf(defaultNameRequired));
-            }
-            return;
-        }
+	private static void registerPostProcessorIfNecessary(BeanDefinitionRegistry registry,
+			boolean defaultNameRequired) {
+		if (registry
+				.containsBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR)) {
+			if (defaultNameRequired) {
+				BeanDefinition bd = registry
+						.getBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR);
+				bd.getPropertyValues().addPropertyValue("defaultNameRequired",
+						Boolean.valueOf(defaultNameRequired));
+			}
+			return;
+		}
 
-        BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition(ContextSourceSettingPostProcessor.class);
-        bdb.addPropertyValue("defaultNameRequired", Boolean.valueOf(defaultNameRequired));
-        registry.registerBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR, bdb.getBeanDefinition());
-    }
+		BeanDefinitionBuilder bdb = BeanDefinitionBuilder
+				.rootBeanDefinition(ContextSourceSettingPostProcessor.class);
+		bdb.addPropertyValue("defaultNameRequired", Boolean.valueOf(defaultNameRequired));
+		registry.registerBeanDefinition(BeanIds.CONTEXT_SOURCE_SETTING_POST_PROCESSOR,
+				bdb.getBeanDefinition());
+	}
 
-    static BeanMetadataElement parseUserDetailsClassOrUserMapperRef(Element elt, ParserContext parserContext) {
-        String userDetailsClass = elt.getAttribute(ATT_USER_CLASS);
-        String userMapperRef = elt.getAttribute(ATT_USER_CONTEXT_MAPPER_REF);
+	static BeanMetadataElement parseUserDetailsClassOrUserMapperRef(Element elt,
+			ParserContext parserContext) {
+		String userDetailsClass = elt.getAttribute(ATT_USER_CLASS);
+		String userMapperRef = elt.getAttribute(ATT_USER_CONTEXT_MAPPER_REF);
 
-        if (StringUtils.hasText(userDetailsClass) && StringUtils.hasText(userMapperRef)) {
-            parserContext.getReaderContext().error("Attributes " + ATT_USER_CLASS + " and " + ATT_USER_CONTEXT_MAPPER_REF
-                    + " cannot be used together.", parserContext.extractSource(elt));
-        }
+		if (StringUtils.hasText(userDetailsClass) && StringUtils.hasText(userMapperRef)) {
+			parserContext.getReaderContext().error(
+					"Attributes " + ATT_USER_CLASS + " and "
+							+ ATT_USER_CONTEXT_MAPPER_REF + " cannot be used together.",
+					parserContext.extractSource(elt));
+		}
 
-        if (StringUtils.hasText(userMapperRef)) {
-            return new RuntimeBeanReference(userMapperRef);
-        }
+		if (StringUtils.hasText(userMapperRef)) {
+			return new RuntimeBeanReference(userMapperRef);
+		}
 
-        RootBeanDefinition mapper;
+		RootBeanDefinition mapper;
 
-        if (OPT_PERSON.equals(userDetailsClass)) {
-            mapper = new RootBeanDefinition(PERSON_MAPPER_CLASS, null, null);
-        } else if (OPT_INETORGPERSON.equals(userDetailsClass)) {
-            mapper = new RootBeanDefinition(INET_ORG_PERSON_MAPPER_CLASS, null, null);
-        } else {
-            mapper = new RootBeanDefinition(LDAP_USER_MAPPER_CLASS, null, null);
-        }
+		if (OPT_PERSON.equals(userDetailsClass)) {
+			mapper = new RootBeanDefinition(PERSON_MAPPER_CLASS, null, null);
+		}
+		else if (OPT_INETORGPERSON.equals(userDetailsClass)) {
+			mapper = new RootBeanDefinition(INET_ORG_PERSON_MAPPER_CLASS, null, null);
+		}
+		else {
+			mapper = new RootBeanDefinition(LDAP_USER_MAPPER_CLASS, null, null);
+		}
 
-        mapper.setSource(parserContext.extractSource(elt));
+		mapper.setSource(parserContext.extractSource(elt));
 
-        return mapper;
-    }
+		return mapper;
+	}
 
-    static RootBeanDefinition parseAuthoritiesPopulator(Element elt, ParserContext parserContext) {
-        String groupSearchFilter = elt.getAttribute(ATT_GROUP_SEARCH_FILTER);
-        String groupSearchBase = elt.getAttribute(ATT_GROUP_SEARCH_BASE);
-        String groupRoleAttribute = elt.getAttribute(ATT_GROUP_ROLE_ATTRIBUTE);
-        String rolePrefix = elt.getAttribute(ATT_ROLE_PREFIX);
+	static RootBeanDefinition parseAuthoritiesPopulator(Element elt,
+			ParserContext parserContext) {
+		String groupSearchFilter = elt.getAttribute(ATT_GROUP_SEARCH_FILTER);
+		String groupSearchBase = elt.getAttribute(ATT_GROUP_SEARCH_BASE);
+		String groupRoleAttribute = elt.getAttribute(ATT_GROUP_ROLE_ATTRIBUTE);
+		String rolePrefix = elt.getAttribute(ATT_ROLE_PREFIX);
 
-        if (!StringUtils.hasText(groupSearchFilter)) {
-            groupSearchFilter = DEF_GROUP_SEARCH_FILTER;
-        }
+		if (!StringUtils.hasText(groupSearchFilter)) {
+			groupSearchFilter = DEF_GROUP_SEARCH_FILTER;
+		}
 
-        if (!StringUtils.hasText(groupSearchBase)) {
-            groupSearchBase = DEF_GROUP_SEARCH_BASE;
-        }
+		if (!StringUtils.hasText(groupSearchBase)) {
+			groupSearchBase = DEF_GROUP_SEARCH_BASE;
+		}
 
-        BeanDefinitionBuilder populator = BeanDefinitionBuilder.rootBeanDefinition(LDAP_AUTHORITIES_POPULATOR_CLASS);
-        populator.getRawBeanDefinition().setSource(parserContext.extractSource(elt));
-        populator.addConstructorArgValue(parseServerReference(elt, parserContext));
-        populator.addConstructorArgValue(groupSearchBase);
-        populator.addPropertyValue("groupSearchFilter", groupSearchFilter);
-        populator.addPropertyValue("searchSubtree", Boolean.TRUE);
+		BeanDefinitionBuilder populator = BeanDefinitionBuilder
+				.rootBeanDefinition(LDAP_AUTHORITIES_POPULATOR_CLASS);
+		populator.getRawBeanDefinition().setSource(parserContext.extractSource(elt));
+		populator.addConstructorArgValue(parseServerReference(elt, parserContext));
+		populator.addConstructorArgValue(groupSearchBase);
+		populator.addPropertyValue("groupSearchFilter", groupSearchFilter);
+		populator.addPropertyValue("searchSubtree", Boolean.TRUE);
 
-        if (StringUtils.hasText(rolePrefix)) {
-            if ("none".equals(rolePrefix)) {
-                rolePrefix = "";
-            }
-            populator.addPropertyValue("rolePrefix", rolePrefix);
-        }
+		if (StringUtils.hasText(rolePrefix)) {
+			if ("none".equals(rolePrefix)) {
+				rolePrefix = "";
+			}
+			populator.addPropertyValue("rolePrefix", rolePrefix);
+		}
 
-        if (StringUtils.hasLength(groupRoleAttribute)) {
-            populator.addPropertyValue("groupRoleAttribute", groupRoleAttribute);
-        }
+		if (StringUtils.hasLength(groupRoleAttribute)) {
+			populator.addPropertyValue("groupRoleAttribute", groupRoleAttribute);
+		}
 
-        return (RootBeanDefinition) populator.getBeanDefinition();
-    }
+		return (RootBeanDefinition) populator.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
index 93158b4800..e914d55fff 100644
--- a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
@@ -89,377 +89,466 @@ import org.w3c.dom.Element;
  */
 public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionParser {
 
-    private final Log logger = LogFactory.getLog(getClass());
-
-    private static final String ATT_AUTHENTICATION_MANAGER_REF = "authentication-manager-ref";
-    private static final String ATT_ACCESS = "access";
-    private static final String ATT_EXPRESSION = "expression";
-    private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
-    private static final String ATT_RUN_AS_MGR = "run-as-manager-ref";
-    private static final String ATT_USE_JSR250 = "jsr250-annotations";
-    private static final String ATT_USE_SECURED = "secured-annotations";
-    private static final String ATT_USE_PREPOST = "pre-post-annotations";
-    private static final String ATT_REF = "ref";
-    private static final String ATT_MODE = "mode";
-    private static final String ATT_ADVICE_ORDER = "order";
-    private static final String ATT_META_DATA_SOURCE_REF = "metadata-source-ref";
-
-    public BeanDefinition parse(Element element, ParserContext pc) {
-        CompositeComponentDefinition compositeDef =
-            new CompositeComponentDefinition(element.getTagName(), pc.extractSource(element));
-        pc.pushContainingComponent(compositeDef);
-
-        Object source = pc.extractSource(element);
-        // The list of method metadata delegates
-        ManagedList<BeanMetadataElement> delegates = new ManagedList<BeanMetadataElement>();
-
-        boolean jsr250Enabled = "enabled".equals(element.getAttribute(ATT_USE_JSR250));
-        boolean useSecured = "enabled".equals(element.getAttribute(ATT_USE_SECURED));
-        boolean prePostAnnotationsEnabled = "enabled".equals(element.getAttribute(ATT_USE_PREPOST));
-        boolean useAspectJ = "aspectj".equals(element.getAttribute(ATT_MODE));
-
-        BeanDefinition preInvocationVoter = null;
-        ManagedList<BeanMetadataElement> afterInvocationProviders = new ManagedList<BeanMetadataElement>();
-
-        // Check for an external SecurityMetadataSource, which takes priority over other sources
-        String metaDataSourceId = element.getAttribute(ATT_META_DATA_SOURCE_REF);
-
-        if (StringUtils.hasText(metaDataSourceId)) {
-            delegates.add(new RuntimeBeanReference(metaDataSourceId));
-        }
-
-        if (prePostAnnotationsEnabled) {
-            Element prePostElt = DomUtils.getChildElementByTagName(element, INVOCATION_HANDLING);
-            Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, EXPRESSION_HANDLER);
-
-            if (prePostElt != null && expressionHandlerElt != null) {
-                pc.getReaderContext().error(INVOCATION_HANDLING + " and " +
-                        EXPRESSION_HANDLER + " cannot be used together ", source);
-            }
-
-            BeanDefinitionBuilder preInvocationVoterBldr = BeanDefinitionBuilder.rootBeanDefinition(PreInvocationAuthorizationAdviceVoter.class);
-            // After-invocation provider to handle post-invocation filtering and authorization expression annotations.
-            BeanDefinitionBuilder afterInvocationBldr = BeanDefinitionBuilder.rootBeanDefinition(PostInvocationAdviceProvider.class);
-            // The metadata source for the security interceptor
-            BeanDefinitionBuilder mds = BeanDefinitionBuilder.rootBeanDefinition(PrePostAnnotationSecurityMetadataSource.class);
-
-            if (prePostElt != null) {
-                // Customized override of expression handling system
-                String attributeFactoryRef =
-                    DomUtils.getChildElementByTagName(prePostElt, INVOCATION_ATTRIBUTE_FACTORY).getAttribute("ref");
-                String preAdviceRef =
-                    DomUtils.getChildElementByTagName(prePostElt, PRE_INVOCATION_ADVICE).getAttribute("ref");
-                String postAdviceRef =
-                    DomUtils.getChildElementByTagName(prePostElt, POST_INVOCATION_ADVICE).getAttribute("ref");
-
-                mds.addConstructorArgReference(attributeFactoryRef);
-                preInvocationVoterBldr.addConstructorArgReference(preAdviceRef);
-                afterInvocationBldr.addConstructorArgReference(postAdviceRef);
-            } else {
-                // The default expression-based system
-                String expressionHandlerRef = expressionHandlerElt == null ? null : expressionHandlerElt.getAttribute("ref");
-
-                if (StringUtils.hasText(expressionHandlerRef)) {
-                    logger.info("Using bean '" + expressionHandlerRef + "' as method ExpressionHandler implementation");
-                    RootBeanDefinition lazyInitPP = new RootBeanDefinition(LazyInitBeanDefinitionRegistryPostProcessor.class);
-                    lazyInitPP.getConstructorArgumentValues().addGenericArgumentValue(expressionHandlerRef);
-                    pc.getReaderContext().registerWithGeneratedName(lazyInitPP);
-
-                    BeanDefinitionBuilder lazyMethodSecurityExpressionHandlerBldr = BeanDefinitionBuilder.rootBeanDefinition(LazyInitTargetSource.class);
-                    lazyMethodSecurityExpressionHandlerBldr.addPropertyValue("targetBeanName", expressionHandlerRef);
-
-                    BeanDefinitionBuilder expressionHandlerProxyBldr = BeanDefinitionBuilder.rootBeanDefinition(ProxyFactoryBean.class);
-                    expressionHandlerProxyBldr.addPropertyValue("targetSource", lazyMethodSecurityExpressionHandlerBldr.getBeanDefinition());
-                    expressionHandlerProxyBldr.addPropertyValue("proxyInterfaces", MethodSecurityExpressionHandler.class);
-
-                    expressionHandlerRef = pc.getReaderContext().generateBeanName(expressionHandlerProxyBldr.getBeanDefinition());
-
-                    pc.registerBeanComponent(new BeanComponentDefinition(expressionHandlerProxyBldr.getBeanDefinition(), expressionHandlerRef));
-                } else {
-                    BeanDefinition expressionHandler = new RootBeanDefinition(DefaultMethodSecurityExpressionHandler.class);
-                    expressionHandlerRef = pc.getReaderContext().generateBeanName(expressionHandler);
-                    pc.registerBeanComponent(new BeanComponentDefinition(expressionHandler, expressionHandlerRef));
-                    logger.info("Expressions were enabled for method security but no SecurityExpressionHandler was configured. " +
-                            "All hasPermision() expressions will evaluate to false.");
-                }
-
-                BeanDefinitionBuilder expressionPreAdviceBldr = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedPreInvocationAdvice.class);
-                expressionPreAdviceBldr.addPropertyReference("expressionHandler", expressionHandlerRef);
-                preInvocationVoterBldr.addConstructorArgValue(expressionPreAdviceBldr.getBeanDefinition());
-
-                BeanDefinitionBuilder expressionPostAdviceBldr = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedPostInvocationAdvice.class);
-                expressionPostAdviceBldr.addConstructorArgReference(expressionHandlerRef);
-                afterInvocationBldr.addConstructorArgValue(expressionPostAdviceBldr.getBeanDefinition());
-
-                BeanDefinitionBuilder annotationInvocationFactory = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedAnnotationAttributeFactory.class);
-                annotationInvocationFactory.addConstructorArgReference(expressionHandlerRef);
-                mds.addConstructorArgValue(annotationInvocationFactory.getBeanDefinition());
-            }
-
-            preInvocationVoter = preInvocationVoterBldr.getBeanDefinition();
-            afterInvocationProviders.add(afterInvocationBldr.getBeanDefinition());
-            delegates.add(mds.getBeanDefinition());
-        }
-
-        if (useSecured) {
-            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(SecuredAnnotationSecurityMetadataSource.class).getBeanDefinition());
-        }
-
-        if (jsr250Enabled) {
-            delegates.add(BeanDefinitionBuilder.rootBeanDefinition(Jsr250MethodSecurityMetadataSource.class).getBeanDefinition());
-        }
-
-        // Now create a Map<String, ConfigAttribute> for each <protect-pointcut> sub-element
-        Map<String, List<ConfigAttribute>> pointcutMap = parseProtectPointcuts(pc,
-                DomUtils.getChildElementsByTagName(element, PROTECT_POINTCUT));
-
-        if (pointcutMap.size() > 0) {
-            if (useAspectJ) {
-                pc.getReaderContext().error("You can't use AspectJ mode with protect-pointcut definitions", source);
-            }
-            // Only add it if there are actually any pointcuts defined.
-            BeanDefinition mapBasedMetadataSource = new RootBeanDefinition(MapBasedMethodSecurityMetadataSource.class);
-            BeanReference ref = new RuntimeBeanReference(pc.getReaderContext().generateBeanName(mapBasedMetadataSource));
-
-            delegates.add(ref);
-            pc.registerBeanComponent(new BeanComponentDefinition(mapBasedMetadataSource, ref.getBeanName()));
-            registerProtectPointcutPostProcessor(pc, pointcutMap, ref, source);
-        }
-
-        BeanReference metadataSource = registerDelegatingMethodSecurityMetadataSource(pc, delegates, source);
-
-        // Check for additional after-invocation-providers..
-        List<Element> afterInvocationElts = DomUtils.getChildElementsByTagName(element, Elements.AFTER_INVOCATION_PROVIDER);
-
-        for (Element elt : afterInvocationElts) {
-            afterInvocationProviders.add(new RuntimeBeanReference(elt.getAttribute(ATT_REF)));
-        }
-
-        String accessManagerId = element.getAttribute(ATT_ACCESS_MGR);
-
-        if (!StringUtils.hasText(accessManagerId)) {
-            accessManagerId = registerAccessManager(pc, jsr250Enabled, preInvocationVoter);
-        }
-
-        String authMgrRef = element.getAttribute(ATT_AUTHENTICATION_MANAGER_REF);
-
-        String runAsManagerId = element.getAttribute(ATT_RUN_AS_MGR);
-        BeanReference interceptor = registerMethodSecurityInterceptor(pc, authMgrRef, accessManagerId, runAsManagerId,
-                metadataSource, afterInvocationProviders, source, useAspectJ);
-
-        if (useAspectJ) {
-            BeanDefinitionBuilder aspect =
-                BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.access.intercept.aspectj.aspect.AnnotationSecurityAspect");
-            aspect.setFactoryMethod("aspectOf");
-            aspect.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-            aspect.addPropertyValue("securityInterceptor", interceptor);
-            String id = pc.getReaderContext().registerWithGeneratedName(aspect.getBeanDefinition());
-            pc.registerBeanComponent(new BeanComponentDefinition(aspect.getBeanDefinition(), id));
-        } else {
-            registerAdvisor(pc, interceptor, metadataSource, source, element.getAttribute(ATT_ADVICE_ORDER));
-            AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(pc, element);
-        }
-
-        pc.popAndRegisterContainingComponent();
-
-        return null;
-    }
-
-    /**
-     * Register the default AccessDecisionManager. Adds the special JSR 250 voter jsr-250 is enabled and an
-     * expression voter if expression-based access control is enabled.
-     * @return
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private String registerAccessManager(ParserContext pc, boolean jsr250Enabled, BeanDefinition expressionVoter) {
-
-        BeanDefinitionBuilder accessMgrBuilder = BeanDefinitionBuilder.rootBeanDefinition(AffirmativeBased.class);
-        ManagedList voters = new ManagedList(4);
-
-        if (expressionVoter != null) {
-            voters.add(expressionVoter);
-        }
-        voters.add(new RootBeanDefinition(RoleVoter.class));
-        voters.add(new RootBeanDefinition(AuthenticatedVoter.class));
-
-        if (jsr250Enabled) {
-            voters.add(new RootBeanDefinition(Jsr250Voter.class));
-        }
-
-        accessMgrBuilder.addConstructorArgValue(voters);
-
-        BeanDefinition accessManager = accessMgrBuilder.getBeanDefinition();
-        String id = pc.getReaderContext().generateBeanName(accessManager);
-        pc.registerBeanComponent(new BeanComponentDefinition(accessManager, id));
-
-        return id;
-    }
-
-    @SuppressWarnings("rawtypes")
-    private BeanReference registerDelegatingMethodSecurityMetadataSource(ParserContext pc, ManagedList delegates, Object source) {
-        RootBeanDefinition delegatingMethodSecurityMetadataSource = new RootBeanDefinition(DelegatingMethodSecurityMetadataSource.class);
-        delegatingMethodSecurityMetadataSource.setSource(source);
-        delegatingMethodSecurityMetadataSource.getConstructorArgumentValues().addGenericArgumentValue(delegates);
-
-        String id = pc.getReaderContext().generateBeanName(delegatingMethodSecurityMetadataSource);
-        pc.registerBeanComponent(new BeanComponentDefinition(delegatingMethodSecurityMetadataSource, id));
-
-        return new RuntimeBeanReference(id);
-    }
-
-    private void registerProtectPointcutPostProcessor(ParserContext parserContext,
-            Map<String, List<ConfigAttribute>> pointcutMap,
-            BeanReference mapBasedMethodSecurityMetadataSource, Object source) {
-        RootBeanDefinition ppbp = new RootBeanDefinition(ProtectPointcutPostProcessor.class);
-        ppbp.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        ppbp.setSource(source);
-        ppbp.getConstructorArgumentValues().addGenericArgumentValue(mapBasedMethodSecurityMetadataSource);
-        ppbp.getPropertyValues().addPropertyValue("pointcutMap", pointcutMap);
-        parserContext.getReaderContext().registerWithGeneratedName(ppbp);
-    }
-
-    private Map<String, List<ConfigAttribute>> parseProtectPointcuts(ParserContext parserContext, List<Element> protectPointcutElts) {
-        Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
-
-        for (Element childElt : protectPointcutElts) {
-            String accessConfig = childElt.getAttribute(ATT_ACCESS);
-            String expression = childElt.getAttribute(ATT_EXPRESSION);
-
-            if (!StringUtils.hasText(accessConfig)) {
-                parserContext.getReaderContext().error("Access configuration required", parserContext.extractSource(childElt));
-            }
-
-            if (!StringUtils.hasText(expression)) {
-                parserContext.getReaderContext().error("Pointcut expression required", parserContext.extractSource(childElt));
-            }
-
-            String[] attributeTokens = StringUtils.commaDelimitedListToStringArray(accessConfig);
-            List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(attributeTokens.length);
-
-            for(String token : attributeTokens) {
-                attributes.add(new SecurityConfig(token));
-            }
-
-            pointcutMap.put(expression, attributes);
-        }
-
-        return pointcutMap;
-    }
-
-    private BeanReference registerMethodSecurityInterceptor(ParserContext pc, String authMgrRef, String accessManagerId,
-            String runAsManagerId, BeanReference metadataSource,
-            List<BeanMetadataElement> afterInvocationProviders, Object source, boolean useAspectJ) {
-        BeanDefinitionBuilder bldr =
-            BeanDefinitionBuilder.rootBeanDefinition(useAspectJ ?
-                    AspectJMethodSecurityInterceptor.class : MethodSecurityInterceptor.class);
-        bldr.getRawBeanDefinition().setSource(source);
-        bldr.addPropertyReference("accessDecisionManager", accessManagerId);
-        RootBeanDefinition authMgr = new RootBeanDefinition(AuthenticationManagerDelegator.class);
-        authMgr.getConstructorArgumentValues().addGenericArgumentValue(authMgrRef);
-        bldr.addPropertyValue("authenticationManager", authMgr);
-        bldr.addPropertyValue("securityMetadataSource", metadataSource);
-
-        if (StringUtils.hasText(runAsManagerId)) {
-            bldr.addPropertyReference("runAsManager", runAsManagerId);
-        }
-
-        if (!afterInvocationProviders.isEmpty()) {
-            BeanDefinition afterInvocationManager;
-            afterInvocationManager = new RootBeanDefinition(AfterInvocationProviderManager.class);
-            afterInvocationManager.getPropertyValues().addPropertyValue("providers", afterInvocationProviders);
-            bldr.addPropertyValue("afterInvocationManager", afterInvocationManager);
-        }
-
-        BeanDefinition bean = bldr.getBeanDefinition();
-        String id = pc.getReaderContext().generateBeanName(bean);
-        pc.registerBeanComponent(new BeanComponentDefinition(bean, id));
-
-        return new RuntimeBeanReference(id);
-    }
-
-    private void registerAdvisor(ParserContext parserContext, BeanReference interceptor, BeanReference metadataSource, Object source, String adviceOrder) {
-        if (parserContext.getRegistry().containsBeanDefinition(BeanIds.METHOD_SECURITY_METADATA_SOURCE_ADVISOR)) {
-            parserContext.getReaderContext().error("Duplicate <global-method-security> detected.", source);
-        }
-        RootBeanDefinition advisor = new RootBeanDefinition(MethodSecurityMetadataSourceAdvisor.class);
-
-        if (StringUtils.hasText(adviceOrder)) {
-            advisor.getPropertyValues().addPropertyValue("order", adviceOrder);
-        }
-
-        // advisor must be an infrastructure bean as Spring's InfrastructureAdvisorAutoProxyCreator will ignore it
-        // otherwise
-        advisor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-        advisor.setSource(source);
-        advisor.getConstructorArgumentValues().addGenericArgumentValue(interceptor.getBeanName());
-        advisor.getConstructorArgumentValues().addGenericArgumentValue(metadataSource);
-        advisor.getConstructorArgumentValues().addGenericArgumentValue(metadataSource.getBeanName());
-
-        parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_SECURITY_METADATA_SOURCE_ADVISOR, advisor);
-    }
-
-    /**
-     * Delays the lookup of the AuthenticationManager within MethodSecurityInterceptor, to prevent issues like SEC-933.
-     *
-     * @author Luke Taylor
-     * @since 3.0
-     */
-    static final class AuthenticationManagerDelegator implements AuthenticationManager, BeanFactoryAware {
-        private AuthenticationManager delegate;
-        private final Object delegateMonitor = new Object();
-        private BeanFactory beanFactory;
-        private final String authMgrBean;
-
-        AuthenticationManagerDelegator(String authMgrBean) {
-            this.authMgrBean = StringUtils.hasText(authMgrBean) ? authMgrBean : BeanIds.AUTHENTICATION_MANAGER;
-        }
-
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            synchronized(delegateMonitor) {
-                if (delegate == null) {
-                    Assert.state(beanFactory != null, "BeanFactory must be set to resolve " + authMgrBean);
-                    try {
-                        delegate = beanFactory.getBean(authMgrBean, AuthenticationManager.class);
-                    } catch (NoSuchBeanDefinitionException e) {
-                        if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
-                            throw new NoSuchBeanDefinitionException(BeanIds.AUTHENTICATION_MANAGER,
-                                AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE);
-                        }
-                        throw e;
-                    }
-                }
-            }
-
-            return delegate.authenticate(authentication);
-        }
-
-        public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-            this.beanFactory = beanFactory;
-        }
-    }
-
-    /**
-     * Delays setting a bean of a given name to be lazyily initialized until after all the beans are registered.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    private static final class LazyInitBeanDefinitionRegistryPostProcessor implements BeanDefinitionRegistryPostProcessor {
-        private final String beanName;
-
-        private LazyInitBeanDefinitionRegistryPostProcessor(String beanName) {
-            this.beanName = beanName;
-        }
-
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-            if(!registry.containsBeanDefinition(beanName)) {
-                return;
-            }
-            BeanDefinition beanDefinition = registry.getBeanDefinition(beanName);
-            beanDefinition.setLazyInit(true);
-        }
-
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-        }
-    }
+	private final Log logger = LogFactory.getLog(getClass());
+
+	private static final String ATT_AUTHENTICATION_MANAGER_REF = "authentication-manager-ref";
+	private static final String ATT_ACCESS = "access";
+	private static final String ATT_EXPRESSION = "expression";
+	private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
+	private static final String ATT_RUN_AS_MGR = "run-as-manager-ref";
+	private static final String ATT_USE_JSR250 = "jsr250-annotations";
+	private static final String ATT_USE_SECURED = "secured-annotations";
+	private static final String ATT_USE_PREPOST = "pre-post-annotations";
+	private static final String ATT_REF = "ref";
+	private static final String ATT_MODE = "mode";
+	private static final String ATT_ADVICE_ORDER = "order";
+	private static final String ATT_META_DATA_SOURCE_REF = "metadata-source-ref";
+
+	public BeanDefinition parse(Element element, ParserContext pc) {
+		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(
+				element.getTagName(), pc.extractSource(element));
+		pc.pushContainingComponent(compositeDef);
+
+		Object source = pc.extractSource(element);
+		// The list of method metadata delegates
+		ManagedList<BeanMetadataElement> delegates = new ManagedList<BeanMetadataElement>();
+
+		boolean jsr250Enabled = "enabled".equals(element.getAttribute(ATT_USE_JSR250));
+		boolean useSecured = "enabled".equals(element.getAttribute(ATT_USE_SECURED));
+		boolean prePostAnnotationsEnabled = "enabled".equals(element
+				.getAttribute(ATT_USE_PREPOST));
+		boolean useAspectJ = "aspectj".equals(element.getAttribute(ATT_MODE));
+
+		BeanDefinition preInvocationVoter = null;
+		ManagedList<BeanMetadataElement> afterInvocationProviders = new ManagedList<BeanMetadataElement>();
+
+		// Check for an external SecurityMetadataSource, which takes priority over other
+		// sources
+		String metaDataSourceId = element.getAttribute(ATT_META_DATA_SOURCE_REF);
+
+		if (StringUtils.hasText(metaDataSourceId)) {
+			delegates.add(new RuntimeBeanReference(metaDataSourceId));
+		}
+
+		if (prePostAnnotationsEnabled) {
+			Element prePostElt = DomUtils.getChildElementByTagName(element,
+					INVOCATION_HANDLING);
+			Element expressionHandlerElt = DomUtils.getChildElementByTagName(element,
+					EXPRESSION_HANDLER);
+
+			if (prePostElt != null && expressionHandlerElt != null) {
+				pc.getReaderContext().error(
+						INVOCATION_HANDLING + " and " + EXPRESSION_HANDLER
+								+ " cannot be used together ", source);
+			}
+
+			BeanDefinitionBuilder preInvocationVoterBldr = BeanDefinitionBuilder
+					.rootBeanDefinition(PreInvocationAuthorizationAdviceVoter.class);
+			// After-invocation provider to handle post-invocation filtering and
+			// authorization expression annotations.
+			BeanDefinitionBuilder afterInvocationBldr = BeanDefinitionBuilder
+					.rootBeanDefinition(PostInvocationAdviceProvider.class);
+			// The metadata source for the security interceptor
+			BeanDefinitionBuilder mds = BeanDefinitionBuilder
+					.rootBeanDefinition(PrePostAnnotationSecurityMetadataSource.class);
+
+			if (prePostElt != null) {
+				// Customized override of expression handling system
+				String attributeFactoryRef = DomUtils.getChildElementByTagName(
+						prePostElt, INVOCATION_ATTRIBUTE_FACTORY).getAttribute("ref");
+				String preAdviceRef = DomUtils.getChildElementByTagName(prePostElt,
+						PRE_INVOCATION_ADVICE).getAttribute("ref");
+				String postAdviceRef = DomUtils.getChildElementByTagName(prePostElt,
+						POST_INVOCATION_ADVICE).getAttribute("ref");
+
+				mds.addConstructorArgReference(attributeFactoryRef);
+				preInvocationVoterBldr.addConstructorArgReference(preAdviceRef);
+				afterInvocationBldr.addConstructorArgReference(postAdviceRef);
+			}
+			else {
+				// The default expression-based system
+				String expressionHandlerRef = expressionHandlerElt == null ? null
+						: expressionHandlerElt.getAttribute("ref");
+
+				if (StringUtils.hasText(expressionHandlerRef)) {
+					logger.info("Using bean '" + expressionHandlerRef
+							+ "' as method ExpressionHandler implementation");
+					RootBeanDefinition lazyInitPP = new RootBeanDefinition(
+							LazyInitBeanDefinitionRegistryPostProcessor.class);
+					lazyInitPP.getConstructorArgumentValues().addGenericArgumentValue(
+							expressionHandlerRef);
+					pc.getReaderContext().registerWithGeneratedName(lazyInitPP);
+
+					BeanDefinitionBuilder lazyMethodSecurityExpressionHandlerBldr = BeanDefinitionBuilder
+							.rootBeanDefinition(LazyInitTargetSource.class);
+					lazyMethodSecurityExpressionHandlerBldr.addPropertyValue(
+							"targetBeanName", expressionHandlerRef);
+
+					BeanDefinitionBuilder expressionHandlerProxyBldr = BeanDefinitionBuilder
+							.rootBeanDefinition(ProxyFactoryBean.class);
+					expressionHandlerProxyBldr.addPropertyValue("targetSource",
+							lazyMethodSecurityExpressionHandlerBldr.getBeanDefinition());
+					expressionHandlerProxyBldr.addPropertyValue("proxyInterfaces",
+							MethodSecurityExpressionHandler.class);
+
+					expressionHandlerRef = pc.getReaderContext().generateBeanName(
+							expressionHandlerProxyBldr.getBeanDefinition());
+
+					pc.registerBeanComponent(new BeanComponentDefinition(
+							expressionHandlerProxyBldr.getBeanDefinition(),
+							expressionHandlerRef));
+				}
+				else {
+					BeanDefinition expressionHandler = new RootBeanDefinition(
+							DefaultMethodSecurityExpressionHandler.class);
+					expressionHandlerRef = pc.getReaderContext().generateBeanName(
+							expressionHandler);
+					pc.registerBeanComponent(new BeanComponentDefinition(
+							expressionHandler, expressionHandlerRef));
+					logger.info("Expressions were enabled for method security but no SecurityExpressionHandler was configured. "
+							+ "All hasPermision() expressions will evaluate to false.");
+				}
+
+				BeanDefinitionBuilder expressionPreAdviceBldr = BeanDefinitionBuilder
+						.rootBeanDefinition(ExpressionBasedPreInvocationAdvice.class);
+				expressionPreAdviceBldr.addPropertyReference("expressionHandler",
+						expressionHandlerRef);
+				preInvocationVoterBldr.addConstructorArgValue(expressionPreAdviceBldr
+						.getBeanDefinition());
+
+				BeanDefinitionBuilder expressionPostAdviceBldr = BeanDefinitionBuilder
+						.rootBeanDefinition(ExpressionBasedPostInvocationAdvice.class);
+				expressionPostAdviceBldr.addConstructorArgReference(expressionHandlerRef);
+				afterInvocationBldr.addConstructorArgValue(expressionPostAdviceBldr
+						.getBeanDefinition());
+
+				BeanDefinitionBuilder annotationInvocationFactory = BeanDefinitionBuilder
+						.rootBeanDefinition(ExpressionBasedAnnotationAttributeFactory.class);
+				annotationInvocationFactory
+						.addConstructorArgReference(expressionHandlerRef);
+				mds.addConstructorArgValue(annotationInvocationFactory
+						.getBeanDefinition());
+			}
+
+			preInvocationVoter = preInvocationVoterBldr.getBeanDefinition();
+			afterInvocationProviders.add(afterInvocationBldr.getBeanDefinition());
+			delegates.add(mds.getBeanDefinition());
+		}
+
+		if (useSecured) {
+			delegates.add(BeanDefinitionBuilder.rootBeanDefinition(
+					SecuredAnnotationSecurityMetadataSource.class).getBeanDefinition());
+		}
+
+		if (jsr250Enabled) {
+			delegates.add(BeanDefinitionBuilder.rootBeanDefinition(
+					Jsr250MethodSecurityMetadataSource.class).getBeanDefinition());
+		}
+
+		// Now create a Map<String, ConfigAttribute> for each <protect-pointcut>
+		// sub-element
+		Map<String, List<ConfigAttribute>> pointcutMap = parseProtectPointcuts(pc,
+				DomUtils.getChildElementsByTagName(element, PROTECT_POINTCUT));
+
+		if (pointcutMap.size() > 0) {
+			if (useAspectJ) {
+				pc.getReaderContext().error(
+						"You can't use AspectJ mode with protect-pointcut definitions",
+						source);
+			}
+			// Only add it if there are actually any pointcuts defined.
+			BeanDefinition mapBasedMetadataSource = new RootBeanDefinition(
+					MapBasedMethodSecurityMetadataSource.class);
+			BeanReference ref = new RuntimeBeanReference(pc.getReaderContext()
+					.generateBeanName(mapBasedMetadataSource));
+
+			delegates.add(ref);
+			pc.registerBeanComponent(new BeanComponentDefinition(mapBasedMetadataSource,
+					ref.getBeanName()));
+			registerProtectPointcutPostProcessor(pc, pointcutMap, ref, source);
+		}
+
+		BeanReference metadataSource = registerDelegatingMethodSecurityMetadataSource(pc,
+				delegates, source);
+
+		// Check for additional after-invocation-providers..
+		List<Element> afterInvocationElts = DomUtils.getChildElementsByTagName(element,
+				Elements.AFTER_INVOCATION_PROVIDER);
+
+		for (Element elt : afterInvocationElts) {
+			afterInvocationProviders.add(new RuntimeBeanReference(elt
+					.getAttribute(ATT_REF)));
+		}
+
+		String accessManagerId = element.getAttribute(ATT_ACCESS_MGR);
+
+		if (!StringUtils.hasText(accessManagerId)) {
+			accessManagerId = registerAccessManager(pc, jsr250Enabled, preInvocationVoter);
+		}
+
+		String authMgrRef = element.getAttribute(ATT_AUTHENTICATION_MANAGER_REF);
+
+		String runAsManagerId = element.getAttribute(ATT_RUN_AS_MGR);
+		BeanReference interceptor = registerMethodSecurityInterceptor(pc, authMgrRef,
+				accessManagerId, runAsManagerId, metadataSource,
+				afterInvocationProviders, source, useAspectJ);
+
+		if (useAspectJ) {
+			BeanDefinitionBuilder aspect = BeanDefinitionBuilder
+					.rootBeanDefinition("org.springframework.security.access.intercept.aspectj.aspect.AnnotationSecurityAspect");
+			aspect.setFactoryMethod("aspectOf");
+			aspect.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+			aspect.addPropertyValue("securityInterceptor", interceptor);
+			String id = pc.getReaderContext().registerWithGeneratedName(
+					aspect.getBeanDefinition());
+			pc.registerBeanComponent(new BeanComponentDefinition(aspect
+					.getBeanDefinition(), id));
+		}
+		else {
+			registerAdvisor(pc, interceptor, metadataSource, source,
+					element.getAttribute(ATT_ADVICE_ORDER));
+			AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(pc, element);
+		}
+
+		pc.popAndRegisterContainingComponent();
+
+		return null;
+	}
+
+	/**
+	 * Register the default AccessDecisionManager. Adds the special JSR 250 voter jsr-250
+	 * is enabled and an expression voter if expression-based access control is enabled.
+	 * @return
+	 */
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private String registerAccessManager(ParserContext pc, boolean jsr250Enabled,
+			BeanDefinition expressionVoter) {
+
+		BeanDefinitionBuilder accessMgrBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(AffirmativeBased.class);
+		ManagedList voters = new ManagedList(4);
+
+		if (expressionVoter != null) {
+			voters.add(expressionVoter);
+		}
+		voters.add(new RootBeanDefinition(RoleVoter.class));
+		voters.add(new RootBeanDefinition(AuthenticatedVoter.class));
+
+		if (jsr250Enabled) {
+			voters.add(new RootBeanDefinition(Jsr250Voter.class));
+		}
+
+		accessMgrBuilder.addConstructorArgValue(voters);
+
+		BeanDefinition accessManager = accessMgrBuilder.getBeanDefinition();
+		String id = pc.getReaderContext().generateBeanName(accessManager);
+		pc.registerBeanComponent(new BeanComponentDefinition(accessManager, id));
+
+		return id;
+	}
+
+	@SuppressWarnings("rawtypes")
+	private BeanReference registerDelegatingMethodSecurityMetadataSource(
+			ParserContext pc, ManagedList delegates, Object source) {
+		RootBeanDefinition delegatingMethodSecurityMetadataSource = new RootBeanDefinition(
+				DelegatingMethodSecurityMetadataSource.class);
+		delegatingMethodSecurityMetadataSource.setSource(source);
+		delegatingMethodSecurityMetadataSource.getConstructorArgumentValues()
+				.addGenericArgumentValue(delegates);
+
+		String id = pc.getReaderContext().generateBeanName(
+				delegatingMethodSecurityMetadataSource);
+		pc.registerBeanComponent(new BeanComponentDefinition(
+				delegatingMethodSecurityMetadataSource, id));
+
+		return new RuntimeBeanReference(id);
+	}
+
+	private void registerProtectPointcutPostProcessor(ParserContext parserContext,
+			Map<String, List<ConfigAttribute>> pointcutMap,
+			BeanReference mapBasedMethodSecurityMetadataSource, Object source) {
+		RootBeanDefinition ppbp = new RootBeanDefinition(
+				ProtectPointcutPostProcessor.class);
+		ppbp.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		ppbp.setSource(source);
+		ppbp.getConstructorArgumentValues().addGenericArgumentValue(
+				mapBasedMethodSecurityMetadataSource);
+		ppbp.getPropertyValues().addPropertyValue("pointcutMap", pointcutMap);
+		parserContext.getReaderContext().registerWithGeneratedName(ppbp);
+	}
+
+	private Map<String, List<ConfigAttribute>> parseProtectPointcuts(
+			ParserContext parserContext, List<Element> protectPointcutElts) {
+		Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
+
+		for (Element childElt : protectPointcutElts) {
+			String accessConfig = childElt.getAttribute(ATT_ACCESS);
+			String expression = childElt.getAttribute(ATT_EXPRESSION);
+
+			if (!StringUtils.hasText(accessConfig)) {
+				parserContext.getReaderContext().error("Access configuration required",
+						parserContext.extractSource(childElt));
+			}
+
+			if (!StringUtils.hasText(expression)) {
+				parserContext.getReaderContext().error("Pointcut expression required",
+						parserContext.extractSource(childElt));
+			}
+
+			String[] attributeTokens = StringUtils
+					.commaDelimitedListToStringArray(accessConfig);
+			List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(
+					attributeTokens.length);
+
+			for (String token : attributeTokens) {
+				attributes.add(new SecurityConfig(token));
+			}
+
+			pointcutMap.put(expression, attributes);
+		}
+
+		return pointcutMap;
+	}
+
+	private BeanReference registerMethodSecurityInterceptor(ParserContext pc,
+			String authMgrRef, String accessManagerId, String runAsManagerId,
+			BeanReference metadataSource,
+			List<BeanMetadataElement> afterInvocationProviders, Object source,
+			boolean useAspectJ) {
+		BeanDefinitionBuilder bldr = BeanDefinitionBuilder
+				.rootBeanDefinition(useAspectJ ? AspectJMethodSecurityInterceptor.class
+						: MethodSecurityInterceptor.class);
+		bldr.getRawBeanDefinition().setSource(source);
+		bldr.addPropertyReference("accessDecisionManager", accessManagerId);
+		RootBeanDefinition authMgr = new RootBeanDefinition(
+				AuthenticationManagerDelegator.class);
+		authMgr.getConstructorArgumentValues().addGenericArgumentValue(authMgrRef);
+		bldr.addPropertyValue("authenticationManager", authMgr);
+		bldr.addPropertyValue("securityMetadataSource", metadataSource);
+
+		if (StringUtils.hasText(runAsManagerId)) {
+			bldr.addPropertyReference("runAsManager", runAsManagerId);
+		}
+
+		if (!afterInvocationProviders.isEmpty()) {
+			BeanDefinition afterInvocationManager;
+			afterInvocationManager = new RootBeanDefinition(
+					AfterInvocationProviderManager.class);
+			afterInvocationManager.getPropertyValues().addPropertyValue("providers",
+					afterInvocationProviders);
+			bldr.addPropertyValue("afterInvocationManager", afterInvocationManager);
+		}
+
+		BeanDefinition bean = bldr.getBeanDefinition();
+		String id = pc.getReaderContext().generateBeanName(bean);
+		pc.registerBeanComponent(new BeanComponentDefinition(bean, id));
+
+		return new RuntimeBeanReference(id);
+	}
+
+	private void registerAdvisor(ParserContext parserContext, BeanReference interceptor,
+			BeanReference metadataSource, Object source, String adviceOrder) {
+		if (parserContext.getRegistry().containsBeanDefinition(
+				BeanIds.METHOD_SECURITY_METADATA_SOURCE_ADVISOR)) {
+			parserContext.getReaderContext().error(
+					"Duplicate <global-method-security> detected.", source);
+		}
+		RootBeanDefinition advisor = new RootBeanDefinition(
+				MethodSecurityMetadataSourceAdvisor.class);
+
+		if (StringUtils.hasText(adviceOrder)) {
+			advisor.getPropertyValues().addPropertyValue("order", adviceOrder);
+		}
+
+		// advisor must be an infrastructure bean as Spring's
+		// InfrastructureAdvisorAutoProxyCreator will ignore it
+		// otherwise
+		advisor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+		advisor.setSource(source);
+		advisor.getConstructorArgumentValues().addGenericArgumentValue(
+				interceptor.getBeanName());
+		advisor.getConstructorArgumentValues().addGenericArgumentValue(metadataSource);
+		advisor.getConstructorArgumentValues().addGenericArgumentValue(
+				metadataSource.getBeanName());
+
+		parserContext.getRegistry().registerBeanDefinition(
+				BeanIds.METHOD_SECURITY_METADATA_SOURCE_ADVISOR, advisor);
+	}
+
+	/**
+	 * Delays the lookup of the AuthenticationManager within MethodSecurityInterceptor, to
+	 * prevent issues like SEC-933.
+	 *
+	 * @author Luke Taylor
+	 * @since 3.0
+	 */
+	static final class AuthenticationManagerDelegator implements AuthenticationManager,
+			BeanFactoryAware {
+		private AuthenticationManager delegate;
+		private final Object delegateMonitor = new Object();
+		private BeanFactory beanFactory;
+		private final String authMgrBean;
+
+		AuthenticationManagerDelegator(String authMgrBean) {
+			this.authMgrBean = StringUtils.hasText(authMgrBean) ? authMgrBean
+					: BeanIds.AUTHENTICATION_MANAGER;
+		}
+
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			synchronized (delegateMonitor) {
+				if (delegate == null) {
+					Assert.state(beanFactory != null,
+							"BeanFactory must be set to resolve " + authMgrBean);
+					try {
+						delegate = beanFactory.getBean(authMgrBean,
+								AuthenticationManager.class);
+					}
+					catch (NoSuchBeanDefinitionException e) {
+						if (BeanIds.AUTHENTICATION_MANAGER.equals(e.getBeanName())) {
+							throw new NoSuchBeanDefinitionException(
+									BeanIds.AUTHENTICATION_MANAGER,
+									AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE);
+						}
+						throw e;
+					}
+				}
+			}
+
+			return delegate.authenticate(authentication);
+		}
+
+		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+			this.beanFactory = beanFactory;
+		}
+	}
+
+	/**
+	 * Delays setting a bean of a given name to be lazyily initialized until after all the
+	 * beans are registered.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	private static final class LazyInitBeanDefinitionRegistryPostProcessor implements
+			BeanDefinitionRegistryPostProcessor {
+		private final String beanName;
+
+		private LazyInitBeanDefinitionRegistryPostProcessor(String beanName) {
+			this.beanName = beanName;
+		}
+
+		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
+				throws BeansException {
+			if (!registry.containsBeanDefinition(beanName)) {
+				return;
+			}
+			BeanDefinition beanDefinition = registry.getBeanDefinition(beanName);
+			beanDefinition.setLazyInit(true);
+		}
+
+		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
+				throws BeansException {
+		}
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java
index 15f0325482..e6cc6cbaa5 100644
--- a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java
+++ b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java
@@ -27,69 +27,78 @@ import java.util.*;
  *
  */
 public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDecorator {
-    private final BeanDefinitionDecorator delegate = new InternalInterceptMethodsBeanDefinitionDecorator();
+	private final BeanDefinitionDecorator delegate = new InternalInterceptMethodsBeanDefinitionDecorator();
 
-    public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
-        MethodConfigUtils.registerDefaultMethodAccessManagerIfNecessary(parserContext);
+	public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
+			ParserContext parserContext) {
+		MethodConfigUtils.registerDefaultMethodAccessManagerIfNecessary(parserContext);
 
-        return delegate.decorate(node, definition, parserContext);
-    }
+		return delegate.decorate(node, definition, parserContext);
+	}
 }
 
 /**
- * This is the real class which does the work. We need access to the ParserContext in order to do bean
- * registration.
+ * This is the real class which does the work. We need access to the ParserContext in
+ * order to do bean registration.
  */
-class InternalInterceptMethodsBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator {
-    static final String ATT_METHOD = "method";
-    static final String ATT_ACCESS = "access";
-    private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
+class InternalInterceptMethodsBeanDefinitionDecorator extends
+		AbstractInterceptorDrivenBeanDefinitionDecorator {
+	static final String ATT_METHOD = "method";
+	static final String ATT_ACCESS = "access";
+	private static final String ATT_ACCESS_MGR = "access-decision-manager-ref";
 
-    protected BeanDefinition createInterceptorDefinition(Node node) {
-        Element interceptMethodsElt = (Element)node;
-        BeanDefinitionBuilder interceptor = BeanDefinitionBuilder.rootBeanDefinition(MethodSecurityInterceptor.class);
+	protected BeanDefinition createInterceptorDefinition(Node node) {
+		Element interceptMethodsElt = (Element) node;
+		BeanDefinitionBuilder interceptor = BeanDefinitionBuilder
+				.rootBeanDefinition(MethodSecurityInterceptor.class);
 
-        // Default to autowiring to pick up after invocation mgr
-        interceptor.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		// Default to autowiring to pick up after invocation mgr
+		interceptor.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 
-        String accessManagerId = interceptMethodsElt.getAttribute(ATT_ACCESS_MGR);
+		String accessManagerId = interceptMethodsElt.getAttribute(ATT_ACCESS_MGR);
 
-        if (!StringUtils.hasText(accessManagerId)) {
-            accessManagerId = BeanIds.METHOD_ACCESS_MANAGER;
-        }
+		if (!StringUtils.hasText(accessManagerId)) {
+			accessManagerId = BeanIds.METHOD_ACCESS_MANAGER;
+		}
 
-        interceptor.addPropertyValue("accessDecisionManager", new RuntimeBeanReference(accessManagerId));
-        interceptor.addPropertyValue("authenticationManager", new RuntimeBeanReference(BeanIds.AUTHENTICATION_MANAGER));
+		interceptor.addPropertyValue("accessDecisionManager", new RuntimeBeanReference(
+				accessManagerId));
+		interceptor.addPropertyValue("authenticationManager", new RuntimeBeanReference(
+				BeanIds.AUTHENTICATION_MANAGER));
 
-        // Lookup parent bean information
+		// Lookup parent bean information
 
-        String parentBeanClass = ((Element) node.getParentNode()).getAttribute("class");
+		String parentBeanClass = ((Element) node.getParentNode()).getAttribute("class");
 
-        // Parse the included methods
-        List<Element> methods = DomUtils.getChildElementsByTagName(interceptMethodsElt, Elements.PROTECT);
-        Map<String, BeanDefinition> mappings = new ManagedMap<String, BeanDefinition>();
+		// Parse the included methods
+		List<Element> methods = DomUtils.getChildElementsByTagName(interceptMethodsElt,
+				Elements.PROTECT);
+		Map<String, BeanDefinition> mappings = new ManagedMap<String, BeanDefinition>();
 
-        for (Element protectmethodElt : methods) {
-            BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder.rootBeanDefinition(SecurityConfig.class);
-            attributeBuilder.setFactoryMethod("createListFromCommaDelimitedString");
-            attributeBuilder.addConstructorArgValue(protectmethodElt.getAttribute(ATT_ACCESS));
+		for (Element protectmethodElt : methods) {
+			BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder
+					.rootBeanDefinition(SecurityConfig.class);
+			attributeBuilder.setFactoryMethod("createListFromCommaDelimitedString");
+			attributeBuilder.addConstructorArgValue(protectmethodElt
+					.getAttribute(ATT_ACCESS));
 
-            // Support inference of class names
-            String methodName = protectmethodElt.getAttribute(ATT_METHOD);
+			// Support inference of class names
+			String methodName = protectmethodElt.getAttribute(ATT_METHOD);
 
-            if (methodName.lastIndexOf(".") == -1) {
-                if (parentBeanClass != null && !"".equals(parentBeanClass)) {
-                    methodName = parentBeanClass + "." + methodName;
-                }
-            }
+			if (methodName.lastIndexOf(".") == -1) {
+				if (parentBeanClass != null && !"".equals(parentBeanClass)) {
+					methodName = parentBeanClass + "." + methodName;
+				}
+			}
 
-            mappings.put(methodName, attributeBuilder.getBeanDefinition());
-        }
+			mappings.put(methodName, attributeBuilder.getBeanDefinition());
+		}
 
-        BeanDefinition metadataSource = new RootBeanDefinition(MapBasedMethodSecurityMetadataSource.class);
-        metadataSource.getConstructorArgumentValues().addGenericArgumentValue(mappings);
-        interceptor.addPropertyValue("securityMetadataSource", metadataSource);
+		BeanDefinition metadataSource = new RootBeanDefinition(
+				MapBasedMethodSecurityMetadataSource.class);
+		metadataSource.getConstructorArgumentValues().addGenericArgumentValue(mappings);
+		interceptor.addPropertyValue("securityMetadataSource", metadataSource);
 
-        return interceptor.getBeanDefinition();
-    }
+		return interceptor.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/method/MethodConfigUtils.java b/config/src/main/java/org/springframework/security/config/method/MethodConfigUtils.java
index 4f3f852b95..3a9485c45e 100644
--- a/config/src/main/java/org/springframework/security/config/method/MethodConfigUtils.java
+++ b/config/src/main/java/org/springframework/security/config/method/MethodConfigUtils.java
@@ -33,24 +33,28 @@ import org.springframework.security.config.BeanIds;
  * @author Rob Winch
  */
 abstract class MethodConfigUtils {
-    @SuppressWarnings("unchecked")
-    static void registerDefaultMethodAccessManagerIfNecessary(ParserContext parserContext) {
-        if (!parserContext.getRegistry().containsBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER)) {
-            parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER,
-                    createAccessManagerBean(RoleVoter.class, AuthenticatedVoter.class));
-        }
-    }
+	@SuppressWarnings("unchecked")
+	static void registerDefaultMethodAccessManagerIfNecessary(ParserContext parserContext) {
+		if (!parserContext.getRegistry().containsBeanDefinition(
+				BeanIds.METHOD_ACCESS_MANAGER)) {
+			parserContext.getRegistry().registerBeanDefinition(
+					BeanIds.METHOD_ACCESS_MANAGER,
+					createAccessManagerBean(RoleVoter.class, AuthenticatedVoter.class));
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    private static RootBeanDefinition createAccessManagerBean(Class<? extends AccessDecisionVoter>... voters) {
-        ManagedList defaultVoters = new ManagedList(voters.length);
+	@SuppressWarnings("unchecked")
+	private static RootBeanDefinition createAccessManagerBean(
+			Class<? extends AccessDecisionVoter>... voters) {
+		ManagedList defaultVoters = new ManagedList(voters.length);
 
-        for(Class<? extends AccessDecisionVoter> voter : voters) {
-            defaultVoters.add(new RootBeanDefinition(voter));
-        }
+		for (Class<? extends AccessDecisionVoter> voter : voters) {
+			defaultVoters.add(new RootBeanDefinition(voter));
+		}
 
-        BeanDefinitionBuilder accessMgrBuilder = BeanDefinitionBuilder.rootBeanDefinition(AffirmativeBased.class);
-        accessMgrBuilder.addConstructorArgValue(defaultVoters);
-        return (RootBeanDefinition) accessMgrBuilder.getBeanDefinition();
-    }
+		BeanDefinitionBuilder accessMgrBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(AffirmativeBased.class);
+		accessMgrBuilder.addConstructorArgValue(defaultVoters);
+		return (RootBeanDefinition) accessMgrBuilder.getBeanDefinition();
+	}
 }
diff --git a/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java
index e11003eaa2..84139c2c9e 100644
--- a/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java
@@ -21,26 +21,30 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  * @since 3.1
  */
-public class MethodSecurityMetadataSourceBeanDefinitionParser extends AbstractBeanDefinitionParser {
-    static final String ATT_METHOD = "method";
-    static final String ATT_ACCESS = "access";
+public class MethodSecurityMetadataSourceBeanDefinitionParser extends
+		AbstractBeanDefinitionParser {
+	static final String ATT_METHOD = "method";
+	static final String ATT_ACCESS = "access";
 
-    public AbstractBeanDefinition parseInternal(Element elt, ParserContext pc) {
-        // Parse the included methods
-        List<Element> methods = DomUtils.getChildElementsByTagName(elt, Elements.PROTECT);
-        Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<String, List<ConfigAttribute>>();
+	public AbstractBeanDefinition parseInternal(Element elt, ParserContext pc) {
+		// Parse the included methods
+		List<Element> methods = DomUtils.getChildElementsByTagName(elt, Elements.PROTECT);
+		Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<String, List<ConfigAttribute>>();
 
-        for (Element protectmethodElt : methods) {
-            String[] tokens = StringUtils.commaDelimitedListToStringArray(protectmethodElt.getAttribute(ATT_ACCESS));
-            String methodName = protectmethodElt.getAttribute(ATT_METHOD);
+		for (Element protectmethodElt : methods) {
+			String[] tokens = StringUtils
+					.commaDelimitedListToStringArray(protectmethodElt
+							.getAttribute(ATT_ACCESS));
+			String methodName = protectmethodElt.getAttribute(ATT_METHOD);
 
-            mappings.put(methodName, SecurityConfig.createList(tokens));
-        }
+			mappings.put(methodName, SecurityConfig.createList(tokens));
+		}
 
-        RootBeanDefinition metadataSource = new RootBeanDefinition(MapBasedMethodSecurityMetadataSource.class);
-        metadataSource.getConstructorArgumentValues().addGenericArgumentValue(mappings);
+		RootBeanDefinition metadataSource = new RootBeanDefinition(
+				MapBasedMethodSecurityMetadataSource.class);
+		metadataSource.getConstructorArgumentValues().addGenericArgumentValue(mappings);
 
-        return metadataSource;
-    }
+		return metadataSource;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java
index 0c0dfa8691..ca8b8fc158 100644
--- a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java
+++ b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java
@@ -21,145 +21,163 @@ import org.springframework.util.StringUtils;
  * traditional {@link MapBasedMethodSecurityMetadataSource}.
  *
  * <p>
- * This class provides a convenient way of declaring a list of pointcuts, and then
- * having every method of every bean defined in the Spring application context compared with
- * those pointcuts. Where a match is found, the matching method will be registered with the
- * {@link MapBasedMethodSecurityMetadataSource}.
+ * This class provides a convenient way of declaring a list of pointcuts, and then having
+ * every method of every bean defined in the Spring application context compared with
+ * those pointcuts. Where a match is found, the matching method will be registered with
+ * the {@link MapBasedMethodSecurityMetadataSource}.
  * <p>
- * It is very important to understand that only the <b>first</b> pointcut that matches a given
- * method will be taken as authoritative for that method. This is why pointcuts should be provided
- * as a <tt>LinkedHashMap</tt>, because their order is very important.
+ * It is very important to understand that only the <b>first</b> pointcut that matches a
+ * given method will be taken as authoritative for that method. This is why pointcuts
+ * should be provided as a <tt>LinkedHashMap</tt>, because their order is very important.
  * <p>
- * Note also that only beans defined in the Spring application context will be examined by this
- * class.
+ * Note also that only beans defined in the Spring application context will be examined by
+ * this class.
  * <p>
- * Because this class registers method security metadata with {@link MapBasedMethodSecurityMetadataSource},
- * normal Spring Security capabilities such as {@link MethodSecurityMetadataSourceAdvisor} can be used.
- * It does not matter the fact the method metadata was originally obtained from an AspectJ pointcut
- * expression evaluation.
+ * Because this class registers method security metadata with
+ * {@link MapBasedMethodSecurityMetadataSource}, normal Spring Security capabilities such
+ * as {@link MethodSecurityMetadataSourceAdvisor} can be used. It does not matter the fact
+ * the method metadata was originally obtained from an AspectJ pointcut expression
+ * evaluation.
  *
  * @author Ben Alex
  * @since 2.0
  */
 final class ProtectPointcutPostProcessor implements BeanPostProcessor {
 
-    private static final Log logger = LogFactory.getLog(ProtectPointcutPostProcessor.class);
+	private static final Log logger = LogFactory
+			.getLog(ProtectPointcutPostProcessor.class);
 
-    private final Map<String,List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String,List<ConfigAttribute>>();
-    private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource;
-    private final Set<PointcutExpression> pointCutExpressions = new LinkedHashSet<PointcutExpression>();
-    private final PointcutParser parser;
-    private final Set<String> processedBeans = new HashSet<String>();
+	private final Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
+	private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource;
+	private final Set<PointcutExpression> pointCutExpressions = new LinkedHashSet<PointcutExpression>();
+	private final PointcutParser parser;
+	private final Set<String> processedBeans = new HashSet<String>();
 
+	public ProtectPointcutPostProcessor(
+			MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource) {
+		Assert.notNull(mapBasedMethodSecurityMetadataSource,
+				"MapBasedMethodSecurityMetadataSource to populate is required");
+		this.mapBasedMethodSecurityMetadataSource = mapBasedMethodSecurityMetadataSource;
 
-    public ProtectPointcutPostProcessor(MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource) {
-        Assert.notNull(mapBasedMethodSecurityMetadataSource, "MapBasedMethodSecurityMetadataSource to populate is required");
-        this.mapBasedMethodSecurityMetadataSource = mapBasedMethodSecurityMetadataSource;
+		// Set up AspectJ pointcut expression parser
+		Set<PointcutPrimitive> supportedPrimitives = new HashSet<PointcutPrimitive>(3);
+		supportedPrimitives.add(PointcutPrimitive.EXECUTION);
+		supportedPrimitives.add(PointcutPrimitive.ARGS);
+		supportedPrimitives.add(PointcutPrimitive.REFERENCE);
+		// supportedPrimitives.add(PointcutPrimitive.THIS);
+		// supportedPrimitives.add(PointcutPrimitive.TARGET);
+		// supportedPrimitives.add(PointcutPrimitive.WITHIN);
+		// supportedPrimitives.add(PointcutPrimitive.AT_ANNOTATION);
+		// supportedPrimitives.add(PointcutPrimitive.AT_WITHIN);
+		// supportedPrimitives.add(PointcutPrimitive.AT_ARGS);
+		// supportedPrimitives.add(PointcutPrimitive.AT_TARGET);
+		parser = PointcutParser
+				.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution(supportedPrimitives);
+	}
 
-        // Set up AspectJ pointcut expression parser
-        Set<PointcutPrimitive> supportedPrimitives = new HashSet<PointcutPrimitive>(3);
-        supportedPrimitives.add(PointcutPrimitive.EXECUTION);
-        supportedPrimitives.add(PointcutPrimitive.ARGS);
-        supportedPrimitives.add(PointcutPrimitive.REFERENCE);
-//        supportedPrimitives.add(PointcutPrimitive.THIS);
-//        supportedPrimitives.add(PointcutPrimitive.TARGET);
-//        supportedPrimitives.add(PointcutPrimitive.WITHIN);
-//        supportedPrimitives.add(PointcutPrimitive.AT_ANNOTATION);
-//        supportedPrimitives.add(PointcutPrimitive.AT_WITHIN);
-//        supportedPrimitives.add(PointcutPrimitive.AT_ARGS);
-//        supportedPrimitives.add(PointcutPrimitive.AT_TARGET);
-        parser = PointcutParser.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution(supportedPrimitives);
-    }
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
+		return bean;
+	}
 
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        return bean;
-    }
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+			throws BeansException {
+		if (processedBeans.contains(beanName)) {
+			// We already have the metadata for this bean
+			return bean;
+		}
 
-    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-        if (processedBeans.contains(beanName)) {
-            // We already have the metadata for this bean
-            return bean;
-        }
+		synchronized (processedBeans) {
+			// check again synchronized this time
+			if (processedBeans.contains(beanName)) {
+				return bean;
+			}
 
-        synchronized(processedBeans) {
-            // check again synchronized this time
-            if (processedBeans.contains(beanName)) {
-                return bean;
-            }
+			// Obtain methods for the present bean
+			Method[] methods;
+			try {
+				methods = bean.getClass().getMethods();
+			}
+			catch (Exception e) {
+				throw new IllegalStateException(e.getMessage());
+			}
 
-            // Obtain methods for the present bean
-            Method[] methods;
-            try {
-                methods = bean.getClass().getMethods();
-            } catch (Exception e) {
-                throw new IllegalStateException(e.getMessage());
-            }
+			// Check to see if any of those methods are compatible with our pointcut
+			// expressions
+			for (Method method : methods) {
+				for (PointcutExpression expression : pointCutExpressions) {
+					// Try for the bean class directly
+					if (attemptMatch(bean.getClass(), method, expression, beanName)) {
+						// We've found the first expression that matches this method, so
+						// move onto the next method now
+						break; // the "while" loop, not the "for" loop
+					}
+				}
+			}
 
-            // Check to see if any of those methods are compatible with our pointcut expressions
-            for (Method method : methods) {
-                for (PointcutExpression expression : pointCutExpressions) {
-                    // Try for the bean class directly
-                    if (attemptMatch(bean.getClass(), method, expression, beanName)) {
-                        // We've found the first expression that matches this method, so move onto the next method now
-                        break; // the "while" loop, not the "for" loop
-                    }
-                }
-            }
+			processedBeans.add(beanName);
+		}
 
-            processedBeans.add(beanName);
-        }
+		return bean;
+	}
 
+	private boolean attemptMatch(Class<?> targetClass, Method method,
+			PointcutExpression expression, String beanName) {
+		// Determine if the presented AspectJ pointcut expression matches this method
+		boolean matches = expression.matchesMethodExecution(method).alwaysMatches();
 
-        return bean;
-    }
+		// Handle accordingly
+		if (matches) {
+			List<ConfigAttribute> attr = pointcutMap.get(expression
+					.getPointcutExpression());
 
-    private boolean attemptMatch(Class<?> targetClass, Method method, PointcutExpression expression, String beanName) {
-        // Determine if the presented AspectJ pointcut expression matches this method
-        boolean matches = expression.matchesMethodExecution(method).alwaysMatches();
+			if (logger.isDebugEnabled()) {
+				logger.debug("AspectJ pointcut expression '"
+						+ expression.getPointcutExpression() + "' matches target class '"
+						+ targetClass.getName() + "' (bean ID '" + beanName
+						+ "') for method '" + method
+						+ "'; registering security configuration attribute '" + attr
+						+ "'");
+			}
 
-        // Handle accordingly
-        if (matches) {
-            List<ConfigAttribute> attr = pointcutMap.get(expression.getPointcutExpression());
+			mapBasedMethodSecurityMetadataSource.addSecureMethod(targetClass, method,
+					attr);
+		}
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("AspectJ pointcut expression '" + expression.getPointcutExpression() + "' matches target class '" + targetClass.getName() + "' (bean ID '" + beanName + "') for method '" + method + "'; registering security configuration attribute '" + attr + "'");
-            }
+		return matches;
+	}
 
-            mapBasedMethodSecurityMetadataSource.addSecureMethod(targetClass, method, attr);
-        }
+	public void setPointcutMap(Map<String, List<ConfigAttribute>> map) {
+		Assert.notEmpty(map);
+		for (String expression : map.keySet()) {
+			List<ConfigAttribute> value = map.get(expression);
+			addPointcut(expression, value);
+		}
+	}
 
-        return matches;
-    }
+	private void addPointcut(String pointcutExpression, List<ConfigAttribute> definition) {
+		Assert.hasText(pointcutExpression, "An AspectJ pointcut expression is required");
+		Assert.notNull(definition, "A List of ConfigAttributes is required");
+		pointcutExpression = replaceBooleanOperators(pointcutExpression);
+		pointcutMap.put(pointcutExpression, definition);
+		// Parse the presented AspectJ pointcut expression and add it to the cache
+		pointCutExpressions.add(parser.parsePointcutExpression(pointcutExpression));
 
-    public void setPointcutMap(Map<String, List<ConfigAttribute>> map) {
-        Assert.notEmpty(map);
-        for (String expression : map.keySet()) {
-            List<ConfigAttribute> value = map.get(expression);
-            addPointcut(expression, value);
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("AspectJ pointcut expression '" + pointcutExpression
+					+ "' registered for security configuration attribute '" + definition
+					+ "'");
+		}
+	}
 
-    private void addPointcut(String pointcutExpression, List<ConfigAttribute> definition) {
-        Assert.hasText(pointcutExpression, "An AspectJ pointcut expression is required");
-        Assert.notNull(definition, "A List of ConfigAttributes is required");
-        pointcutExpression = replaceBooleanOperators(pointcutExpression);
-        pointcutMap.put(pointcutExpression, definition);
-     // Parse the presented AspectJ pointcut expression and add it to the cache
-        pointCutExpressions.add(parser.parsePointcutExpression(pointcutExpression));
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("AspectJ pointcut expression '" + pointcutExpression + "' registered for security configuration attribute '" + definition + "'");
-        }
-    }
-
-    /**
-     * @see org.springframework.aop.aspectj.AspectJExpressionPointcut#replaceBooleanOperators
-     */
-    private String replaceBooleanOperators(String pcExpr) {
-        pcExpr = StringUtils.replace(pcExpr," and "," && ");
-        pcExpr = StringUtils.replace(pcExpr, " or ", " || ");
-        pcExpr = StringUtils.replace(pcExpr, " not ", " ! ");
-        return pcExpr;
-    }
+	/**
+	 * @see org.springframework.aop.aspectj.AspectJExpressionPointcut#replaceBooleanOperators
+	 */
+	private String replaceBooleanOperators(String pcExpr) {
+		pcExpr = StringUtils.replace(pcExpr, " and ", " && ");
+		pcExpr = StringUtils.replace(pcExpr, " or ", " || ");
+		pcExpr = StringUtils.replace(pcExpr, " not ", " ! ");
+		return pcExpr;
+	}
 
 }
diff --git a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
index c9142628fb..d92e09da08 100644
--- a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
@@ -55,10 +55,11 @@ import java.util.List;
  * </code>
  *
  * <p>
- * The above configuration will ensure that any SimpAnnotationMethodMessageHandler has the AuthenticationPrincipalArgumentResolver
- * registered as a custom argument resolver. It also ensures that the SecurityContextChannelInterceptor is automatically
- * registered for the clientInboundChannel. Last, it ensures that a ChannelSecurityInterceptor is registered with the
- * clientInboundChannel.
+ * The above configuration will ensure that any SimpAnnotationMethodMessageHandler has the
+ * AuthenticationPrincipalArgumentResolver registered as a custom argument resolver. It
+ * also ensures that the SecurityContextChannelInterceptor is automatically registered for
+ * the clientInboundChannel. Last, it ensures that a ChannelSecurityInterceptor is
+ * registered with the clientInboundChannel.
  * </p>
  *
  * <p>
@@ -73,181 +74,219 @@ import java.util.List;
  * </code>
  *
  * <p>
- * Now the configuration will only create a bean named ChannelSecurityInterceptor and assign it to the id of
- * channelSecurityInterceptor. Users can explicitly wire Spring Security using the standard Spring Messaging XML
- * namespace support.
+ * Now the configuration will only create a bean named ChannelSecurityInterceptor and
+ * assign it to the id of channelSecurityInterceptor. Users can explicitly wire Spring
+ * Security using the standard Spring Messaging XML namespace support.
  * </p>
  *
  * @author Rob Winch
  * @since 4.0
  */
-public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements BeanDefinitionParser {
-    private static final Log logger = LogFactory.getLog(WebSocketMessageBrokerSecurityBeanDefinitionParser.class);
+public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
+		BeanDefinitionParser {
+	private static final Log logger = LogFactory
+			.getLog(WebSocketMessageBrokerSecurityBeanDefinitionParser.class);
 
-    private static final String ID_ATTR = "id";
+	private static final String ID_ATTR = "id";
 
-    private static final String DISABLED_ATTR = "same-origin-disabled";
+	private static final String DISABLED_ATTR = "same-origin-disabled";
 
-    private static final String PATTERN_ATTR = "pattern";
+	private static final String PATTERN_ATTR = "pattern";
 
-    private static final String ACCESS_ATTR = "access";
+	private static final String ACCESS_ATTR = "access";
 
-    private static final String TYPE_ATTR = "type";
+	private static final String TYPE_ATTR = "type";
 
+	/**
+	 * @param element
+	 * @param parserContext
+	 * @return
+	 */
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		BeanDefinitionRegistry registry = parserContext.getRegistry();
+		XmlReaderContext context = parserContext.getReaderContext();
 
-    /**
-     * @param element
-     * @param parserContext
-     * @return
-     */
-    public BeanDefinition parse(Element element, ParserContext parserContext) {
-        BeanDefinitionRegistry registry = parserContext.getRegistry();
-        XmlReaderContext context = parserContext.getReaderContext();
+		ManagedMap<BeanDefinition, String> matcherToExpression = new ManagedMap<BeanDefinition, String>();
 
-        ManagedMap<BeanDefinition,String> matcherToExpression = new ManagedMap<BeanDefinition, String>();
+		String id = element.getAttribute(ID_ATTR);
+		boolean sameOriginDisabled = Boolean.parseBoolean(element
+				.getAttribute(DISABLED_ATTR));
 
-        String id = element.getAttribute(ID_ATTR);
-        boolean sameOriginDisabled = Boolean.parseBoolean(element.getAttribute(DISABLED_ATTR));
+		List<Element> interceptMessages = DomUtils.getChildElementsByTagName(element,
+				Elements.INTERCEPT_MESSAGE);
+		for (Element interceptMessage : interceptMessages) {
+			String matcherPattern = interceptMessage.getAttribute(PATTERN_ATTR);
+			String accessExpression = interceptMessage.getAttribute(ACCESS_ATTR);
+			String messageType = interceptMessage.getAttribute(TYPE_ATTR);
 
+			BeanDefinition matcher = createMatcher(matcherPattern, messageType,
+					parserContext, interceptMessage);
+			matcherToExpression.put(matcher, accessExpression);
+		}
 
-        List<Element> interceptMessages = DomUtils.getChildElementsByTagName(element, Elements.INTERCEPT_MESSAGE);
-        for(Element interceptMessage : interceptMessages) {
-            String matcherPattern = interceptMessage.getAttribute(PATTERN_ATTR);
-            String accessExpression = interceptMessage.getAttribute(ACCESS_ATTR);
-            String messageType = interceptMessage.getAttribute(TYPE_ATTR);
+		BeanDefinitionBuilder mds = BeanDefinitionBuilder
+				.rootBeanDefinition(ExpressionBasedMessageSecurityMetadataSourceFactory.class);
+		mds.setFactoryMethod("createExpressionMessageMetadataSource");
+		mds.addConstructorArgValue(matcherToExpression);
 
-            BeanDefinition matcher = createMatcher(matcherPattern, messageType, parserContext, interceptMessage);
-            matcherToExpression.put(matcher, accessExpression);
-        }
+		String mdsId = context.registerWithGeneratedName(mds.getBeanDefinition());
 
-        BeanDefinitionBuilder mds = BeanDefinitionBuilder.rootBeanDefinition(ExpressionBasedMessageSecurityMetadataSourceFactory.class);
-        mds.setFactoryMethod("createExpressionMessageMetadataSource");
-        mds.addConstructorArgValue(matcherToExpression);
+		ManagedList<BeanDefinition> voters = new ManagedList<BeanDefinition>();
+		voters.add(new RootBeanDefinition(MessageExpressionVoter.class));
+		BeanDefinitionBuilder adm = BeanDefinitionBuilder
+				.rootBeanDefinition(ConsensusBased.class);
+		adm.addConstructorArgValue(voters);
 
-        String mdsId = context.registerWithGeneratedName(mds.getBeanDefinition());
+		BeanDefinitionBuilder inboundChannelSecurityInterceptor = BeanDefinitionBuilder
+				.rootBeanDefinition(ChannelSecurityInterceptor.class);
+		inboundChannelSecurityInterceptor.addConstructorArgValue(registry
+				.getBeanDefinition(mdsId));
+		inboundChannelSecurityInterceptor.addPropertyValue("accessDecisionManager",
+				adm.getBeanDefinition());
+		String inSecurityInterceptorName = context
+				.registerWithGeneratedName(inboundChannelSecurityInterceptor
+						.getBeanDefinition());
 
-        ManagedList<BeanDefinition> voters = new ManagedList<BeanDefinition>();
-        voters.add(new RootBeanDefinition(MessageExpressionVoter.class));
-        BeanDefinitionBuilder adm = BeanDefinitionBuilder.rootBeanDefinition(ConsensusBased.class);
-        adm.addConstructorArgValue(voters);
+		if (StringUtils.hasText(id)) {
+			registry.registerAlias(inSecurityInterceptorName, id);
+		}
+		else {
+			BeanDefinitionBuilder mspp = BeanDefinitionBuilder
+					.rootBeanDefinition(MessageSecurityPostProcessor.class);
+			mspp.addConstructorArgValue(inSecurityInterceptorName);
+			mspp.addConstructorArgValue(sameOriginDisabled);
+			context.registerWithGeneratedName(mspp.getBeanDefinition());
+		}
 
-        BeanDefinitionBuilder inboundChannelSecurityInterceptor = BeanDefinitionBuilder.rootBeanDefinition(ChannelSecurityInterceptor.class);
-        inboundChannelSecurityInterceptor.addConstructorArgValue(registry.getBeanDefinition(mdsId));
-        inboundChannelSecurityInterceptor.addPropertyValue("accessDecisionManager", adm.getBeanDefinition());
-        String inSecurityInterceptorName = context.registerWithGeneratedName(inboundChannelSecurityInterceptor.getBeanDefinition());
+		return null;
+	}
 
-        if(StringUtils.hasText(id)) {
-            registry.registerAlias(inSecurityInterceptorName, id);
-        } else {
-            BeanDefinitionBuilder mspp = BeanDefinitionBuilder.rootBeanDefinition(MessageSecurityPostProcessor.class);
-            mspp.addConstructorArgValue(inSecurityInterceptorName);
-            mspp.addConstructorArgValue(sameOriginDisabled);
-            context.registerWithGeneratedName(mspp.getBeanDefinition());
-        }
+	private BeanDefinition createMatcher(String matcherPattern, String messageType,
+			ParserContext parserContext, Element interceptMessage) {
+		boolean hasPattern = StringUtils.hasText(matcherPattern);
+		boolean hasMessageType = StringUtils.hasText(messageType);
+		if (!hasPattern) {
+			BeanDefinitionBuilder matcher = BeanDefinitionBuilder
+					.rootBeanDefinition(SimpMessageTypeMatcher.class);
+			matcher.addConstructorArgValue(messageType);
+			return matcher.getBeanDefinition();
+		}
 
-        return null;
-    }
+		String factoryName = null;
+		if (hasPattern && hasMessageType) {
+			SimpMessageType type = SimpMessageType.valueOf(messageType);
+			if (SimpMessageType.MESSAGE == type) {
+				factoryName = "createMessageMatcher";
+			}
+			else if (SimpMessageType.SUBSCRIBE == type) {
+				factoryName = "createSubscribeMatcher";
+			}
+			else {
+				parserContext
+						.getReaderContext()
+						.error("Cannot use intercept-websocket@message-type="
+								+ messageType
+								+ " with a pattern because the type does not have a destination.",
+								interceptMessage);
+			}
+		}
+		BeanDefinitionBuilder matcher = BeanDefinitionBuilder
+				.rootBeanDefinition(SimpDestinationMessageMatcher.class);
+		matcher.setFactoryMethod(factoryName);
+		matcher.addConstructorArgValue(matcherPattern);
+		matcher.addConstructorArgValue(new RootBeanDefinition(AntPathMatcher.class));
+		return matcher.getBeanDefinition();
+	}
 
-    private BeanDefinition createMatcher(String matcherPattern, String messageType, ParserContext parserContext, Element interceptMessage) {
-        boolean hasPattern = StringUtils.hasText(matcherPattern);
-        boolean hasMessageType = StringUtils.hasText(messageType);
-        if(!hasPattern) {
-            BeanDefinitionBuilder matcher = BeanDefinitionBuilder.rootBeanDefinition(SimpMessageTypeMatcher.class);
-            matcher.addConstructorArgValue(messageType);
-            return matcher.getBeanDefinition();
-        }
+	static class MessageSecurityPostProcessor implements
+			BeanDefinitionRegistryPostProcessor {
+		private static final String CLIENT_INBOUND_CHANNEL_BEAN_ID = "clientInboundChannel";
 
+		private static final String INTERCEPTORS_PROP = "interceptors";
 
-        String factoryName = null;
-        if(hasPattern && hasMessageType) {
-            SimpMessageType type = SimpMessageType.valueOf(messageType);
-            if(SimpMessageType.MESSAGE == type) {
-                factoryName = "createMessageMatcher";
-            } else if(SimpMessageType.SUBSCRIBE == type) {
-                factoryName = "createSubscribeMatcher";
-            } else {
-                parserContext.getReaderContext().error("Cannot use intercept-websocket@message-type="+messageType+" with a pattern because the type does not have a destination.", interceptMessage);
-            }
-        }
-        BeanDefinitionBuilder matcher = BeanDefinitionBuilder.rootBeanDefinition(SimpDestinationMessageMatcher.class);
-        matcher.setFactoryMethod(factoryName);
-        matcher.addConstructorArgValue(matcherPattern);
-        matcher.addConstructorArgValue(new RootBeanDefinition(AntPathMatcher.class));
-        return matcher.getBeanDefinition();
-    }
+		private static final String CUSTOM_ARG_RESOLVERS_PROP = "customArgumentResolvers";
 
-    static class MessageSecurityPostProcessor implements BeanDefinitionRegistryPostProcessor {
-        private static final String CLIENT_INBOUND_CHANNEL_BEAN_ID = "clientInboundChannel";
+		private final String inboundSecurityInterceptorId;
 
-        private static final String INTERCEPTORS_PROP = "interceptors";
+		private final boolean sameOriginDisabled;
 
-        private static final String CUSTOM_ARG_RESOLVERS_PROP = "customArgumentResolvers";
+		public MessageSecurityPostProcessor(String inboundSecurityInterceptorId,
+				boolean sameOriginDisabled) {
+			this.inboundSecurityInterceptorId = inboundSecurityInterceptorId;
+			this.sameOriginDisabled = sameOriginDisabled;
+		}
 
-        private final String inboundSecurityInterceptorId;
+		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
+				throws BeansException {
+			String[] beanNames = registry.getBeanDefinitionNames();
+			for (String beanName : beanNames) {
+				BeanDefinition bd = registry.getBeanDefinition(beanName);
+				String beanClassName = bd.getBeanClassName();
+				if (beanClassName.equals(SimpAnnotationMethodMessageHandler.class
+						.getName())) {
+					PropertyValue current = bd.getPropertyValues().getPropertyValue(
+							CUSTOM_ARG_RESOLVERS_PROP);
+					ManagedList<Object> argResolvers = new ManagedList<Object>();
+					if (current != null) {
+						argResolvers.addAll((ManagedList<?>) current.getValue());
+					}
+					argResolvers.add(new RootBeanDefinition(
+							AuthenticationPrincipalArgumentResolver.class));
+					bd.getPropertyValues().add(CUSTOM_ARG_RESOLVERS_PROP, argResolvers);
+				}
+				else if (beanClassName
+						.equals("org.springframework.web.socket.server.support.WebSocketHttpRequestHandler")) {
+					addCsrfTokenHandshakeInterceptor(bd);
+				}
+				else if (beanClassName
+						.equals("org.springframework.web.socket.sockjs.transport.TransportHandlingSockJsService")) {
+					addCsrfTokenHandshakeInterceptor(bd);
+				}
+				else if (beanClassName
+						.equals("org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService")) {
+					addCsrfTokenHandshakeInterceptor(bd);
+				}
+			}
 
-        private final boolean sameOriginDisabled;
+			if (!registry.containsBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID)) {
+				return;
+			}
+			ManagedList<Object> interceptors = new ManagedList();
+			interceptors.add(new RootBeanDefinition(
+					SecurityContextChannelInterceptor.class));
+			if (!sameOriginDisabled) {
+				interceptors.add(new RootBeanDefinition(CsrfChannelInterceptor.class));
+			}
+			interceptors.add(registry.getBeanDefinition(inboundSecurityInterceptorId));
 
-        public MessageSecurityPostProcessor(String inboundSecurityInterceptorId, boolean sameOriginDisabled) {
-            this.inboundSecurityInterceptorId = inboundSecurityInterceptorId;
-            this.sameOriginDisabled = sameOriginDisabled;
-        }
+			BeanDefinition inboundChannel = registry
+					.getBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID);
+			PropertyValue currentInterceptorsPv = inboundChannel.getPropertyValues()
+					.getPropertyValue(INTERCEPTORS_PROP);
+			if (currentInterceptorsPv != null) {
+				ManagedList<?> currentInterceptors = (ManagedList<?>) currentInterceptorsPv
+						.getValue();
+				interceptors.addAll(currentInterceptors);
+			}
 
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
-            String[] beanNames = registry.getBeanDefinitionNames();
-            for(String beanName : beanNames) {
-                BeanDefinition bd = registry.getBeanDefinition(beanName);
-                String beanClassName = bd.getBeanClassName();
-                if(beanClassName.equals(SimpAnnotationMethodMessageHandler.class.getName())) {
-                    PropertyValue current = bd.getPropertyValues().getPropertyValue(CUSTOM_ARG_RESOLVERS_PROP);
-                    ManagedList<Object> argResolvers = new ManagedList<Object>();
-                    if(current != null) {
-                        argResolvers.addAll((ManagedList<?>)current.getValue());
-                    }
-                    argResolvers.add(new RootBeanDefinition(AuthenticationPrincipalArgumentResolver.class));
-                    bd.getPropertyValues().add(CUSTOM_ARG_RESOLVERS_PROP, argResolvers);
-                }
-                else if(beanClassName.equals("org.springframework.web.socket.server.support.WebSocketHttpRequestHandler")) {
-                    addCsrfTokenHandshakeInterceptor(bd);
-                } else if(beanClassName.equals("org.springframework.web.socket.sockjs.transport.TransportHandlingSockJsService")) {
-                    addCsrfTokenHandshakeInterceptor(bd);
-                } else if(beanClassName.equals("org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService")) {
-                    addCsrfTokenHandshakeInterceptor(bd);
-                }
-            }
+			inboundChannel.getPropertyValues().add(INTERCEPTORS_PROP, interceptors);
+		}
 
-            if(!registry.containsBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID)) {
-                return;
-            }
-            ManagedList<Object> interceptors = new ManagedList();
-            interceptors.add(new RootBeanDefinition(SecurityContextChannelInterceptor.class));
-            if(!sameOriginDisabled) {
-                interceptors.add(new RootBeanDefinition(CsrfChannelInterceptor.class));
-            }
-            interceptors.add(registry.getBeanDefinition(inboundSecurityInterceptorId));
+		private void addCsrfTokenHandshakeInterceptor(BeanDefinition bd) {
+			if (sameOriginDisabled) {
+				return;
+			}
+			String interceptorPropertyName = "handshakeInterceptors";
+			ManagedList<? super Object> interceptors = new ManagedList<Object>();
+			interceptors.add(new RootBeanDefinition(CsrfTokenHandshakeInterceptor.class));
+			interceptors.addAll((ManagedList<Object>) bd.getPropertyValues().get(
+					interceptorPropertyName));
+			bd.getPropertyValues().add(interceptorPropertyName, interceptors);
+		}
 
-            BeanDefinition inboundChannel = registry.getBeanDefinition(CLIENT_INBOUND_CHANNEL_BEAN_ID);
-            PropertyValue currentInterceptorsPv =  inboundChannel.getPropertyValues().getPropertyValue(INTERCEPTORS_PROP);
-            if(currentInterceptorsPv != null) {
-                ManagedList<?> currentInterceptors = (ManagedList<?>) currentInterceptorsPv.getValue();
-                interceptors.addAll(currentInterceptors);
-            }
+		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
+				throws BeansException {
 
-            inboundChannel.getPropertyValues().add(INTERCEPTORS_PROP, interceptors);
-        }
-
-        private void addCsrfTokenHandshakeInterceptor(BeanDefinition bd) {
-            if(sameOriginDisabled) {
-                return;
-            }
-            String interceptorPropertyName = "handshakeInterceptors";
-            ManagedList<? super Object> interceptors = new ManagedList<Object>();
-            interceptors.add(new RootBeanDefinition(CsrfTokenHandshakeInterceptor.class));
-            interceptors.addAll((ManagedList<Object>)bd.getPropertyValues().get(interceptorPropertyName));
-            bd.getPropertyValues().add(interceptorPropertyName, interceptors);
-        }
-
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-
-        }
-    }
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java b/config/src/test/groovy/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java
index 24b72a9bef..b31dc49be0 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java
@@ -22,16 +22,17 @@ import java.util.List;
  * @author Rob Winch
  *
  */
-class ConcereteSecurityConfigurerAdapter extends SecurityConfigurerAdapter<Object, SecurityBuilder<Object>> {
-    private List<Object> list = new ArrayList<Object>();
+class ConcereteSecurityConfigurerAdapter extends
+		SecurityConfigurerAdapter<Object, SecurityBuilder<Object>> {
+	private List<Object> list = new ArrayList<Object>();
 
-    @Override
-    public void configure(SecurityBuilder<Object> builder) throws Exception {
-        list = postProcess(list);
-    }
+	@Override
+	public void configure(SecurityBuilder<Object> builder) throws Exception {
+		list = postProcess(list);
+	}
 
-    public ConcereteSecurityConfigurerAdapter list(List<Object> l) {
-        this.list = l;
-        return this;
-    }
+	public ConcereteSecurityConfigurerAdapter list(List<Object> l) {
+		this.list = l;
+		return this;
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java
index 4218514261..317c748065 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java
@@ -29,21 +29,22 @@ import org.junit.Test;
  */
 public class ObjectPostProcessorTests {
 
-    @Test
-    public void convertTypes() {
-        assertThat((Object)PerformConversion.perform(new ArrayList<Object>())).isInstanceOf(LinkedList.class);
-    }
+	@Test
+	public void convertTypes() {
+		assertThat((Object) PerformConversion.perform(new ArrayList<Object>()))
+				.isInstanceOf(LinkedList.class);
+	}
 }
 
-class ListToLinkedListObjectPostProcessor implements ObjectPostProcessor<List<?>>{
+class ListToLinkedListObjectPostProcessor implements ObjectPostProcessor<List<?>> {
 
-    public <O extends List<?>> O postProcess(O l) {
-        return (O) new LinkedList(l);
-    }
+	public <O extends List<?>> O postProcess(O l) {
+		return (O) new LinkedList(l);
+	}
 }
 
 class PerformConversion {
-    public static List<?> perform(ArrayList<?> l) {
-        return new ListToLinkedListObjectPostProcessor().postProcess(l);
-    }
+	public static List<?> perform(ArrayList<?> l) {
+		return new ListToLinkedListObjectPostProcessor().postProcess(l);
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerConfigs.java b/config/src/test/groovy/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerConfigs.java
index f8905524fe..0e3a077fcb 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerConfigs.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerConfigs.java
@@ -25,55 +25,59 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
- * Class Containing the {@link Configuration} for
- * {@link PasswordEncoderConfigurerTests}. Separate to ensure the configuration
- * compiles in Java (i.e. we are not using hidden methods).
+ * Class Containing the {@link Configuration} for {@link PasswordEncoderConfigurerTests}.
+ * Separate to ensure the configuration compiles in Java (i.e. we are not using hidden
+ * methods).
  *
  * @author Rob Winch
  * @since 3.2
  */
 public class PasswordEncoderConfigurerConfigs {
 
-    @EnableWebSecurity
-    static class PasswordEncoderConfig extends WebSecurityConfigurerAdapter {
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            BCryptPasswordEncoder encoder = passwordEncoder();
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password(encoder.encode("password")).roles("USER").and()
-                    .passwordEncoder(encoder);
-        }
+	@EnableWebSecurity
+	static class PasswordEncoderConfig extends WebSecurityConfigurerAdapter {
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			BCryptPasswordEncoder encoder = passwordEncoder();
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password(encoder.encode("password")).roles("USER").and()
+					.passwordEncoder(encoder);
+		}
+		// @formatter:on
 
-        @Bean
-        @Override
-        public AuthenticationManager authenticationManagerBean()
-                throws Exception {
-            return super.authenticationManagerBean();
-        }
+		@Bean
+		@Override
+		public AuthenticationManager authenticationManagerBean() throws Exception {
+			return super.authenticationManagerBean();
+		}
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-        }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+		}
 
-        @Bean
-        public BCryptPasswordEncoder passwordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-    }
+		@Bean
+		public BCryptPasswordEncoder passwordEncoder() {
+			return new BCryptPasswordEncoder();
+		}
+	}
 
-    @EnableWebSecurity
-    static class PasswordEncoderNoAuthManagerLoadsConfig extends WebSecurityConfigurerAdapter {
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            BCryptPasswordEncoder encoder = passwordEncoder();
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password(encoder.encode("password")).roles("USER").and()
-                    .passwordEncoder(encoder);
-        }
+	@EnableWebSecurity
+	static class PasswordEncoderNoAuthManagerLoadsConfig extends
+			WebSecurityConfigurerAdapter {
+		// @formatter:off
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			BCryptPasswordEncoder encoder = passwordEncoder();
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password(encoder.encode("password")).roles("USER").and()
+					.passwordEncoder(encoder);
+		}
+		// @formatter:on
 
-        @Bean
-        public BCryptPasswordEncoder passwordEncoder() {
-            return new BCryptPasswordEncoder();
-        }
-    }
+		@Bean
+		public BCryptPasswordEncoder passwordEncoder() {
+			return new BCryptPasswordEncoder();
+		}
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/configuration/AroundMethodInterceptor.java b/config/src/test/groovy/org/springframework/security/config/annotation/configuration/AroundMethodInterceptor.java
index 7bd85edda2..11fd3a1690 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/configuration/AroundMethodInterceptor.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/configuration/AroundMethodInterceptor.java
@@ -19,7 +19,7 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
 public class AroundMethodInterceptor implements MethodInterceptor {
-    public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-        return String.valueOf(methodInvocation.proceed());
-    }
+	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
+		return String.valueOf(methodInvocation.proceed());
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/configuration/MyAdvisedBean.java b/config/src/test/groovy/org/springframework/security/config/annotation/configuration/MyAdvisedBean.java
index 1b0352b462..be4401f308 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/configuration/MyAdvisedBean.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/configuration/MyAdvisedBean.java
@@ -17,7 +17,7 @@ package org.springframework.security.config.annotation.configuration;
 
 public class MyAdvisedBean {
 
-    public Object doStuff() {
-        return null;
-    }
+	public Object doStuff() {
+		return null;
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/ApplicationConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/ApplicationConfig.java
index 4f0752951c..0679e1b80f 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/ApplicationConfig.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/ApplicationConfig.java
@@ -38,31 +38,31 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableJpaRepositories("org.springframework.security.config.annotation.issue50.repo")
 @EnableTransactionManagement
 public class ApplicationConfig {
-    @Bean
-    public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.HSQL).build();
-    }
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+	}
 
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        vendorAdapter.setDatabase(Database.HSQL);
-        vendorAdapter.setGenerateDdl(true);
-        vendorAdapter.setShowSql(true);
+	@Bean
+	public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setDatabase(Database.HSQL);
+		vendorAdapter.setGenerateDdl(true);
+		vendorAdapter.setShowSql(true);
 
-        LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-        factory.setJpaVendorAdapter(vendorAdapter);
-        factory.setPackagesToScan(User.class.getPackage().getName());
-        factory.setDataSource(dataSource());
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setJpaVendorAdapter(vendorAdapter);
+		factory.setPackagesToScan(User.class.getPackage().getName());
+		factory.setDataSource(dataSource());
 
-        return factory;
-    }
+		return factory;
+	}
 
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        JpaTransactionManager txManager = new JpaTransactionManager();
-        txManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return txManager;
-    }
+	@Bean
+	public PlatformTransactionManager transactionManager() {
+		JpaTransactionManager txManager = new JpaTransactionManager();
+		txManager.setEntityManagerFactory(entityManagerFactory().getObject());
+		return txManager;
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/SecurityConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/SecurityConfig.java
index 9ba5b09ed9..3ed0e2ba21 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/SecurityConfig.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/SecurityConfig.java
@@ -42,49 +42,54 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    @Autowired
-    private UserRepository myUserRepository;
+	@Autowired
+	private UserRepository myUserRepository;
 
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .authenticationProvider(authenticationProvider());
-    }
+	// @formatter:off
+	@Override
+	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.authenticationProvider(authenticationProvider());
+	}
+	// @formatter:on
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .antMatchers("/*").permitAll();
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.antMatchers("/*").permitAll();
+	}
+	// @formatter:on
 
-    @Bean
-    @Override
-    public AuthenticationManager authenticationManagerBean()
-            throws Exception {
-        return super.authenticationManagerBean();
-    }
+	@Bean
+	@Override
+	public AuthenticationManager authenticationManagerBean() throws Exception {
+		return super.authenticationManagerBean();
+	}
 
-    @Bean
-    public AuthenticationProvider authenticationProvider() {
-        Assert.notNull(myUserRepository);
-        return new AuthenticationProvider() {
-            public boolean supports(Class<?> authentication) {
-                return true;
-            }
-            public Authentication authenticate(Authentication authentication)
-                    throws AuthenticationException {
-                Object principal = authentication.getPrincipal();
-                String username = String.valueOf(principal);
-                User user = myUserRepository.findByUsername(username);
-                if(user == null) {
-                    throw new UsernameNotFoundException("No user for principal "+principal);
-                }
-                if(!authentication.getCredentials().equals(user.getPassword())) {
-                    throw new BadCredentialsException("Invalid password");
-                }
-                return new TestingAuthenticationToken(principal, null, "ROLE_USER");
-            }
-        };
-    }
+	@Bean
+	public AuthenticationProvider authenticationProvider() {
+		Assert.notNull(myUserRepository);
+		return new AuthenticationProvider() {
+			public boolean supports(Class<?> authentication) {
+				return true;
+			}
+
+			public Authentication authenticate(Authentication authentication)
+					throws AuthenticationException {
+				Object principal = authentication.getPrincipal();
+				String username = String.valueOf(principal);
+				User user = myUserRepository.findByUsername(username);
+				if (user == null) {
+					throw new UsernameNotFoundException("No user for principal "
+							+ principal);
+				}
+				if (!authentication.getCredentials().equals(user.getPassword())) {
+					throw new BadCredentialsException("Invalid password");
+				}
+				return new TestingAuthenticationToken(principal, null, "ROLE_USER");
+			}
+		};
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/domain/User.java b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/domain/User.java
index 1ba7afcf8e..97a4c580a4 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/domain/User.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/domain/User.java
@@ -27,36 +27,36 @@ import javax.persistence.Id;
 @Entity
 public class User {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
 
-    private String username;
+	private String username;
 
-    private String password;
+	private String password;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public void setUsername(String username) {
-        this.username = username;
-    }
+	public void setUsername(String username) {
+		this.username = username;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 
 }
\ No newline at end of file
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/repo/UserRepository.java b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/repo/UserRepository.java
index 915182caf3..dc2ac5d01e 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/issue50/repo/UserRepository.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/issue50/repo/UserRepository.java
@@ -25,6 +25,6 @@ import org.springframework.security.config.annotation.issue50.domain.User;
  */
 public interface UserRepository extends CrudRepository<User, String> {
 
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    User findByUsername(String username);
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	User findByUsername(String username);
 }
\ No newline at end of file
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTestsConfigs.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTestsConfigs.java
index 8e248b4f48..9d9b82513b 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTestsConfigs.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTestsConfigs.java
@@ -18,7 +18,6 @@ package org.springframework.security.config.annotation.web;
 import javax.sql.DataSource;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
@@ -34,41 +33,46 @@ import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
  */
 public class WebSecurityConfigurerAdapterTestsConfigs {
 
-    // necessary because groovy resolves incorrect method when using generics
-    @EnableWebSecurity
-    static class MessageSourcesPopulatedConfig extends WebSecurityConfigurerAdapter {
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .antMatcher("/role1/**")
-                .authorizeRequests()
-                    .anyRequest().hasRole("1");
-        }
+	// necessary because groovy resolves incorrect method when using generics
+	@EnableWebSecurity
+	static class MessageSourcesPopulatedConfig extends WebSecurityConfigurerAdapter {
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.antMatcher("/role1/**")
+				.authorizeRequests()
+					.anyRequest().hasRole("1");
+		}
+		// @formatter:on
 
-        @Bean
-        public BaseLdapPathContextSource contextSource() throws Exception {
-            DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:33389/dc=springframework,dc=org");
-            contextSource.setUserDn("uid=admin,ou=system");
-            contextSource.setPassword("secret");
-            return contextSource;
-        }
+		@Bean
+		public BaseLdapPathContextSource contextSource() throws Exception {
+			DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
+					"ldap://127.0.0.1:33389/dc=springframework,dc=org");
+			contextSource.setUserDn("uid=admin,ou=system");
+			contextSource.setPassword("secret");
+			return contextSource;
+		}
 
-        @Bean
-        public DataSource dataSource() {
-            EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-            return builder.setType(EmbeddedDatabaseType.HSQL).build();
-        }
+		@Bean
+		public DataSource dataSource() {
+			EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+			return builder.setType(EmbeddedDatabaseType.HSQL).build();
+		}
 
-        @Override
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication().and()
-                .jdbcAuthentication()
-                    .dataSource(dataSource())
-                    .and()
-                .ldapAuthentication()
-                    .userDnPatterns("uid={0},ou=people")
-                    .contextSource(contextSource());
-        }
-    }
+		// @formatter:off
+		@Override
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication().and()
+				.jdbcAuthentication()
+					.dataSource(dataSource())
+					.and()
+				.ldapAuthentication()
+					.userDnPatterns("uid={0},ou=people")
+					.contextSource(contextSource());
+		}
+		// @formatter:on
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java
index ea13fe7245..944c67b191 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java
@@ -15,19 +15,20 @@
  */
 package org.springframework.security.config.annotation.web.builders;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.BaseWebConfig;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.UrlAuthorizationConfigurer;
 
 @EnableWebSecurity
 public class DisableUseExpressionsConfig extends BaseWebConfig {
-    protected void configure(HttpSecurity http) throws Exception {
-        // This config is also on UrlAuthorizationConfigurer javadoc
-        http
-            .apply(new UrlAuthorizationConfigurer<HttpSecurity>()).getRegistry()
-                .antMatchers("/users**","/sessions/**").hasRole("USER")
-                .antMatchers("/signup").hasRole("ANONYMOUS")
-                .anyRequest().hasRole("USER");
-    }
+	// @formatter:off
+	protected void configure(HttpSecurity http) throws Exception {
+		// This config is also on UrlAuthorizationConfigurer javadoc
+		http
+			.apply(new UrlAuthorizationConfigurer<HttpSecurity>()).getRegistry()
+				.antMatchers("/users**","/sessions/**").hasRole("USER")
+				.antMatchers("/signup").hasRole("ANONYMOUS")
+				.anyRequest().hasRole("USER");
+	}
+	// @formatter:on
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/AuthorizedRequestsWithPostProcessorConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/AuthorizedRequestsWithPostProcessorConfig.java
index b0349e343c..9c4e847521 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/AuthorizedRequestsWithPostProcessorConfig.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/AuthorizedRequestsWithPostProcessorConfig.java
@@ -17,7 +17,6 @@ package org.springframework.security.config.annotation.web.configurers;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.event.AuthorizedEvent;
 import org.springframework.security.config.annotation.ObjectPostProcessor;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -26,25 +25,28 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 
 @EnableWebSecurity
-public class AuthorizedRequestsWithPostProcessorConfig extends WebSecurityConfigurerAdapter {
-    static ApplicationListener<AuthorizedEvent> AL;
+public class AuthorizedRequestsWithPostProcessorConfig extends
+		WebSecurityConfigurerAdapter {
+	static ApplicationListener<AuthorizedEvent> AL;
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .anyRequest().permitAll()
-                .withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
-                    public <O extends FilterSecurityInterceptor> O postProcess(
-                            O fsi) {
-                        fsi.setPublishAuthorizationSuccess(true);
-                        return fsi;
-                    }
-                });
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.anyRequest().permitAll()
+				.withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
+					public <O extends FilterSecurityInterceptor> O postProcess(
+							O fsi) {
+						fsi.setPublishAuthorizationSuccess(true);
+						return fsi;
+					}
+				});
+	}
+	// @formatter:on
 
-    @Bean
-    public ApplicationListener<AuthorizedEvent> applicationListener() {
-        return AL;
-    }
+	@Bean
+	public ApplicationListener<AuthorizedEvent> applicationListener() {
+		return AL;
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerConfigs.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerConfigs.java
index 2fda9f92f4..544cf72292 100644
--- a/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerConfigs.java
+++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerConfigs.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.config.annotation.web.configurers;
 
-
 import java.util.Arrays;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,111 +42,122 @@ import org.springframework.security.web.access.expression.WebSecurityExpressionR
  */
 public class ExpressionUrlAuthorizationConfigurerConfigs {
 
-    /**
-     * Ensure that All additional properties properly compile and chain properly
-     */
-    @EnableWebSecurity
-    static class AllPropertiesWorkConfig extends WebSecurityConfigurerAdapter {
+	/**
+	 * Ensure that All additional properties properly compile and chain properly
+	 */
+	@EnableWebSecurity
+	static class AllPropertiesWorkConfig extends WebSecurityConfigurerAdapter {
 
-        @SuppressWarnings("rawtypes")
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            SecurityExpressionHandler<FilterInvocation> handler = new DefaultWebSecurityExpressionHandler();
-            WebExpressionVoter expressionVoter = new WebExpressionVoter();
-            AffirmativeBased adm = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(expressionVoter));
-            http
-                .authorizeRequests()
-                    .expressionHandler(handler)
-                    .accessDecisionManager(adm)
-                    .filterSecurityInterceptorOncePerRequest(true)
-                    .antMatchers("/a","/b").hasRole("ADMIN")
-                    .anyRequest().permitAll()
-                    .and()
-                .formLogin();
-        }
-    }
+		// @formatter:off
+		@SuppressWarnings("rawtypes")
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			SecurityExpressionHandler<FilterInvocation> handler = new DefaultWebSecurityExpressionHandler();
+			WebExpressionVoter expressionVoter = new WebExpressionVoter();
+			AffirmativeBased adm = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(expressionVoter));
+			http
+				.authorizeRequests()
+					.expressionHandler(handler)
+					.accessDecisionManager(adm)
+					.filterSecurityInterceptorOncePerRequest(true)
+					.antMatchers("/a","/b").hasRole("ADMIN")
+					.anyRequest().permitAll()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
+	}
 
-    @EnableWebSecurity
-    static class UseBeansInExpressions extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class UseBeansInExpressions extends WebSecurityConfigurerAdapter {
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .antMatchers("/user/**").hasRole("USER")
-                    .antMatchers("/allow/**").access("@permission.check(authentication,'user')")
-                    .anyRequest().access("@permission.check(authentication,'admin')");
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.antMatchers("/user/**").hasRole("USER")
+					.antMatchers("/allow/**").access("@permission.check(authentication,'user')")
+					.anyRequest().access("@permission.check(authentication,'admin')");
+		}
+		// @formatter:on
 
-        @Bean
-        public Checker permission() {
-            return new Checker();
-        }
+		@Bean
+		public Checker permission() {
+			return new Checker();
+		}
 
-        static class Checker {
-            public boolean check(Authentication authentication, String customArg) {
-                return authentication.getName().contains(customArg);
-            }
-        }
-    }
+		static class Checker {
+			public boolean check(Authentication authentication, String customArg) {
+				return authentication.getName().contains(customArg);
+			}
+		}
+	}
 
-    @EnableWebSecurity
-    static class CustomExpressionRootConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class CustomExpressionRootConfig extends WebSecurityConfigurerAdapter {
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .expressionHandler(expressionHandler())
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .antMatchers("/user/**").hasRole("USER")
-                    .antMatchers("/allow/**").access("check('user')")
-                    .anyRequest().access("check('admin')");
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.expressionHandler(expressionHandler())
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.antMatchers("/user/**").hasRole("USER")
+					.antMatchers("/allow/**").access("check('user')")
+					.anyRequest().access("check('admin')");
+		}
+		// @formatter:on
 
-        @Bean
-        public CustomExpressionHandler expressionHandler() {
-            return new CustomExpressionHandler();
-        }
+		@Bean
+		public CustomExpressionHandler expressionHandler() {
+			return new CustomExpressionHandler();
+		}
 
-        static class CustomExpressionHandler extends DefaultWebSecurityExpressionHandler {
+		static class CustomExpressionHandler extends DefaultWebSecurityExpressionHandler {
 
-            @Override
-            protected SecurityExpressionOperations createSecurityExpressionRoot(
-                    Authentication authentication, FilterInvocation fi) {
-                WebSecurityExpressionRoot root = new CustomExpressionRoot(authentication, fi);
-                root.setPermissionEvaluator(getPermissionEvaluator());
-                root.setTrustResolver(new AuthenticationTrustResolverImpl());
-                root.setRoleHierarchy(getRoleHierarchy());
-                return root;
-            }
-        }
+			@Override
+			protected SecurityExpressionOperations createSecurityExpressionRoot(
+					Authentication authentication, FilterInvocation fi) {
+				WebSecurityExpressionRoot root = new CustomExpressionRoot(authentication,
+						fi);
+				root.setPermissionEvaluator(getPermissionEvaluator());
+				root.setTrustResolver(new AuthenticationTrustResolverImpl());
+				root.setRoleHierarchy(getRoleHierarchy());
+				return root;
+			}
+		}
 
-        static class CustomExpressionRoot extends WebSecurityExpressionRoot {
+		static class CustomExpressionRoot extends WebSecurityExpressionRoot {
 
-            public CustomExpressionRoot(Authentication a, FilterInvocation fi) {
-                super(a, fi);
-            }
+			public CustomExpressionRoot(Authentication a, FilterInvocation fi) {
+				super(a, fi);
+			}
 
-            public boolean check(String customArg) {
-                Authentication auth = this.getAuthentication();
-                return auth.getName().contains(customArg);
-            }
-        }
-    }
+			public boolean check(String customArg) {
+				Authentication auth = this.getAuthentication();
+				return auth.getName().contains(customArg);
+			}
+		}
+	}
 }
diff --git a/config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy b/config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy
index 42c8d9b49a..d8def9663a 100644
--- a/config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy
+++ b/config/src/test/groovy/org/springframework/security/config/http/FormLoginBeanDefinitionParserTests.groovy
@@ -10,104 +10,104 @@ import org.springframework.mock.web.MockHttpServletResponse
  */
 class FormLoginBeanDefinitionParserTests extends AbstractHttpConfigTests {
 
-	def 'form-login default login page'() {
-		setup:
-			MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
-			MockHttpServletResponse response = new MockHttpServletResponse()
-			MockFilterChain chain = new MockFilterChain()
-			httpAutoConfig {
-				csrf(disabled:true)
-			}
-			createAppContext()
-		when:
-			springSecurityFilterChain.doFilter(request,response,chain)
-		then:
-			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
+    def 'form-login default login page'() {
+        setup:
+            MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
+            MockHttpServletResponse response = new MockHttpServletResponse()
+            MockFilterChain chain = new MockFilterChain()
+            httpAutoConfig {
+                csrf(disabled:true)
+            }
+            createAppContext()
+        when:
+            springSecurityFilterChain.doFilter(request,response,chain)
+        then:
+            response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
  <table>
-	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
-	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
+    <tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form></body></html>"""
-	}
+    }
 
-	def 'form-login default login page custom attributes'() {
-		setup:
-			MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
-			MockHttpServletResponse response = new MockHttpServletResponse()
-			MockFilterChain chain = new MockFilterChain()
-			httpAutoConfig {
-				'form-login'('login-processing-url':'/login_custom','username-parameter':'custom_user','password-parameter':'custom_password')
-				csrf(disabled:true)
-			}
-			createAppContext()
-		when:
-			springSecurityFilterChain.doFilter(request,response,chain)
-		then:
-			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.custom_user.focus();'>
+    def 'form-login default login page custom attributes'() {
+        setup:
+            MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
+            MockHttpServletResponse response = new MockHttpServletResponse()
+            MockFilterChain chain = new MockFilterChain()
+            httpAutoConfig {
+                'form-login'('login-processing-url':'/login_custom','username-parameter':'custom_user','password-parameter':'custom_password')
+                csrf(disabled:true)
+            }
+            createAppContext()
+        when:
+            springSecurityFilterChain.doFilter(request,response,chain)
+        then:
+            response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.custom_user.focus();'>
 <h3>Login with Username and Password</h3><form name='f' action='/login_custom' method='POST'>
  <table>
-	<tr><td>User:</td><td><input type='text' name='custom_user' value=''></td></tr>
-	<tr><td>Password:</td><td><input type='password' name='custom_password'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>User:</td><td><input type='text' name='custom_user' value=''></td></tr>
+    <tr><td>Password:</td><td><input type='password' name='custom_password'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form></body></html>"""
-	}
+    }
 
-	def 'openid-login default login page'() {
-		setup:
-			MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
-			MockHttpServletResponse response = new MockHttpServletResponse()
-			MockFilterChain chain = new MockFilterChain()
-			httpAutoConfig {
-				'openid-login'()
-				csrf(disabled:true)
-			}
-			createAppContext()
-		when:
-			springSecurityFilterChain.doFilter(request,response,chain)
-		then:
-			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
+    def 'openid-login default login page'() {
+        setup:
+            MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
+            MockHttpServletResponse response = new MockHttpServletResponse()
+            MockFilterChain chain = new MockFilterChain()
+            httpAutoConfig {
+                'openid-login'()
+                csrf(disabled:true)
+            }
+            createAppContext()
+        when:
+            springSecurityFilterChain.doFilter(request,response,chain)
+        then:
+            response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
  <table>
-	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
-	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
+    <tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form><h3>Login with OpenID Identity</h3><form name='oidf' action='/login/openid' method='POST'>
  <table>
-	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form></body></html>"""
-	}
+    }
 
-	def 'openid-login default login page custom attributes'() {
-		setup:
-			MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
-			MockHttpServletResponse response = new MockHttpServletResponse()
-			MockFilterChain chain = new MockFilterChain()
-			httpAutoConfig {
-				'openid-login'('login-processing-url':'/login_custom')
-				csrf(disabled:true)
-			}
-			createAppContext()
-		when:
-			springSecurityFilterChain.doFilter(request,response,chain)
-		then:
-			response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
+    def 'openid-login default login page custom attributes'() {
+        setup:
+            MockHttpServletRequest request = new MockHttpServletRequest(method:'GET',requestURI:'/login')
+            MockHttpServletResponse response = new MockHttpServletResponse()
+            MockFilterChain chain = new MockFilterChain()
+            httpAutoConfig {
+                'openid-login'('login-processing-url':'/login_custom')
+                csrf(disabled:true)
+            }
+            createAppContext()
+        when:
+            springSecurityFilterChain.doFilter(request,response,chain)
+        then:
+            response.getContentAsString() == """<html><head><title>Login Page</title></head><body onload='document.f.username.focus();'>
 <h3>Login with Username and Password</h3><form name='f' action='/login' method='POST'>
  <table>
-	<tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
-	<tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>User:</td><td><input type='text' name='username' value=''></td></tr>
+    <tr><td>Password:</td><td><input type='password' name='password'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form><h3>Login with OpenID Identity</h3><form name='oidf' action='/login_custom' method='POST'>
  <table>
-	<tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
-	<tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
+    <tr><td>Identity:</td><td><input type='text' size='30' name='openid_identifier'/></td></tr>
+    <tr><td colspan='2'><input name="submit" type="submit" value="Login"/></td></tr>
   </table>
 </form></body></html>"""
-	}
+    }
 }
diff --git a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java
index 95d2a95312..5c815ce08d 100644
--- a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java
+++ b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java
@@ -9,20 +9,22 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class BeanNameCollectingPostProcessor implements BeanPostProcessor {
-    Set<String> beforeInitPostProcessedBeans = new HashSet<String>();
-    Set<String> afterInitPostProcessedBeans = new HashSet<String>();
+	Set<String> beforeInitPostProcessedBeans = new HashSet<String>();
+	Set<String> afterInitPostProcessedBeans = new HashSet<String>();
 
-    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-        if (beanName != null) {
-            beforeInitPostProcessedBeans.add(beanName);
-        }
-        return bean;
-    }
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+			throws BeansException {
+		if (beanName != null) {
+			beforeInitPostProcessedBeans.add(beanName);
+		}
+		return bean;
+	}
 
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        if (beanName != null) {
-            afterInitPostProcessedBeans.add(beanName);
-        }
-        return bean;
-    }
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
+		if (beanName != null) {
+			afterInitPostProcessedBeans.add(beanName);
+		}
+		return bean;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/CollectingAppListener.java b/config/src/test/java/org/springframework/security/CollectingAppListener.java
index f70d3252ea..091bdcfd84 100644
--- a/config/src/test/java/org/springframework/security/CollectingAppListener.java
+++ b/config/src/test/java/org/springframework/security/CollectingAppListener.java
@@ -15,39 +15,39 @@ import org.springframework.security.authentication.event.AbstractAuthenticationF
  * @since 3.1
  */
 public class CollectingAppListener implements ApplicationListener {
-    Set<ApplicationEvent> events = new HashSet<ApplicationEvent>();
-    Set<AbstractAuthenticationEvent> authenticationEvents = new HashSet<AbstractAuthenticationEvent>();
-    Set<AbstractAuthenticationFailureEvent> authenticationFailureEvents = new HashSet<AbstractAuthenticationFailureEvent>();
-    Set<AbstractAuthorizationEvent> authorizationEvents = new HashSet<AbstractAuthorizationEvent>();
+	Set<ApplicationEvent> events = new HashSet<ApplicationEvent>();
+	Set<AbstractAuthenticationEvent> authenticationEvents = new HashSet<AbstractAuthenticationEvent>();
+	Set<AbstractAuthenticationFailureEvent> authenticationFailureEvents = new HashSet<AbstractAuthenticationFailureEvent>();
+	Set<AbstractAuthorizationEvent> authorizationEvents = new HashSet<AbstractAuthorizationEvent>();
 
-    public void onApplicationEvent(ApplicationEvent event) {
-        if (event instanceof AbstractAuthenticationEvent) {
-            events.add(event);
-            authenticationEvents.add((AbstractAuthenticationEvent) event);
-        }
-        if (event instanceof AbstractAuthenticationFailureEvent) {
-            events.add(event);
-            authenticationFailureEvents.add((AbstractAuthenticationFailureEvent) event);
-        }
-        if (event instanceof AbstractAuthorizationEvent) {
-            events.add(event);
-            authorizationEvents.add((AbstractAuthorizationEvent) event);
-        }
-    }
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event instanceof AbstractAuthenticationEvent) {
+			events.add(event);
+			authenticationEvents.add((AbstractAuthenticationEvent) event);
+		}
+		if (event instanceof AbstractAuthenticationFailureEvent) {
+			events.add(event);
+			authenticationFailureEvents.add((AbstractAuthenticationFailureEvent) event);
+		}
+		if (event instanceof AbstractAuthorizationEvent) {
+			events.add(event);
+			authorizationEvents.add((AbstractAuthorizationEvent) event);
+		}
+	}
 
-    public Set<ApplicationEvent> getEvents() {
-        return events;
-    }
+	public Set<ApplicationEvent> getEvents() {
+		return events;
+	}
 
-    public Set<AbstractAuthenticationEvent> getAuthenticationEvents() {
-        return authenticationEvents;
-    }
+	public Set<AbstractAuthenticationEvent> getAuthenticationEvents() {
+		return authenticationEvents;
+	}
 
-    public Set<AbstractAuthenticationFailureEvent> getAuthenticationFailureEvents() {
-        return authenticationFailureEvents;
-    }
+	public Set<AbstractAuthenticationFailureEvent> getAuthenticationFailureEvents() {
+		return authenticationFailureEvents;
+	}
 
-    public Set<AbstractAuthorizationEvent> getAuthorizationEvents() {
-        return authorizationEvents;
-    }
+	public Set<AbstractAuthorizationEvent> getAuthorizationEvents() {
+		return authorizationEvents;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/ConfigTestUtils.java b/config/src/test/java/org/springframework/security/config/ConfigTestUtils.java
index 92a9740137..e6263534ec 100644
--- a/config/src/test/java/org/springframework/security/config/ConfigTestUtils.java
+++ b/config/src/test/java/org/springframework/security/config/ConfigTestUtils.java
@@ -1,15 +1,14 @@
 package org.springframework.security.config;
 
 public abstract class ConfigTestUtils {
-    public static final String AUTH_PROVIDER_XML =
-        "<authentication-manager alias='authManager'>" +
-        "    <authentication-provider>" +
-        "        <user-service id='us'>" +
-        "            <user name='bob' password='bobspassword' authorities='ROLE_A,ROLE_B' />" +
-        "            <user name='bill' password='billspassword' authorities='ROLE_A,ROLE_B,AUTH_OTHER' />" +
-        "            <user name='admin' password='password' authorities='ROLE_ADMIN,ROLE_USER' />" +
-        "            <user name='user' password='password' authorities='ROLE_USER' />" +
-        "        </user-service>" +
-        "    </authentication-provider>" +
-        "</authentication-manager>";
+	public static final String AUTH_PROVIDER_XML = "<authentication-manager alias='authManager'>"
+			+ "    <authentication-provider>"
+			+ "        <user-service id='us'>"
+			+ "            <user name='bob' password='bobspassword' authorities='ROLE_A,ROLE_B' />"
+			+ "            <user name='bill' password='billspassword' authorities='ROLE_A,ROLE_B,AUTH_OTHER' />"
+			+ "            <user name='admin' password='password' authorities='ROLE_ADMIN,ROLE_USER' />"
+			+ "            <user name='user' password='password' authorities='ROLE_USER' />"
+			+ "        </user-service>"
+			+ "    </authentication-provider>"
+			+ "</authentication-manager>";
 }
diff --git a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
index f4767054e3..0620ddf1c7 100644
--- a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
+++ b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
@@ -20,53 +20,49 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.Assert;
 
-
 /**
  * Populates a database with test data for JDBC testing.
  *
  * @author Ben Alex
  */
 public class DataSourcePopulator implements InitializingBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    JdbcTemplate template;
+	JdbcTemplate template;
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(template, "dataSource required");
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(template, "dataSource required");
 
-        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
-        template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
-        template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
+		template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+		template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
+		template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
 
-        /*
-           Passwords encoded using MD5, NOT in Base64 format, with null as salt
-           Encoded password for rod is "koala"
-           Encoded password for dianne is "emu"
-           Encoded password for scott is "wombat"
-           Encoded password for peter is "opal" (but user is disabled)
-           Encoded password for bill is "wombat"
-           Encoded password for bob is "wombat"
-           Encoded password for jane is "wombat"
+		/*
+		 * Passwords encoded using MD5, NOT in Base64 format, with null as salt Encoded
+		 * password for rod is "koala" Encoded password for dianne is "emu" Encoded
+		 * password for scott is "wombat" Encoded password for peter is "opal" (but user
+		 * is disabled) Encoded password for bill is "wombat" Encoded password for bob is
+		 * "wombat" Encoded password for jane is "wombat"
+		 */
+		template.execute("INSERT INTO USERS VALUES('rod','koala',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('dianne','65d15fe9156f9c4bbffd98085992a44e',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('scott','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('peter','22b5c9accc6e1ba628cedc63a72d57f8',FALSE);");
+		template.execute("INSERT INTO USERS VALUES('bill','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('bob','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('jane','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
+	}
 
-         */
-        template.execute("INSERT INTO USERS VALUES('rod','koala',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('dianne','65d15fe9156f9c4bbffd98085992a44e',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('scott','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('peter','22b5c9accc6e1ba628cedc63a72d57f8',FALSE);");
-        template.execute("INSERT INTO USERS VALUES('bill','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('bob','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('jane','2b58af6dddbd072ed27ffc86725d7d3a',TRUE);");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
-    }
-
-    public void setDataSource(DataSource dataSource) {
-        this.template = new JdbcTemplate(dataSource);
-    }
+	public void setDataSource(DataSource dataSource) {
+		this.template = new JdbcTemplate(dataSource);
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java
index b203a1067f..84961af278 100644
--- a/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java
+++ b/config/src/test/java/org/springframework/security/config/FilterChainProxyConfigTests.java
@@ -50,107 +50,119 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @author Ben Alex
  */
 public class FilterChainProxyConfigTests {
-    private ClassPathXmlApplicationContext appCtx;
+	private ClassPathXmlApplicationContext appCtx;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void loadContext() {
-        System.setProperty("sec1235.pattern1", "/login");
-        System.setProperty("sec1235.pattern2", "/logout");
-        appCtx = new ClassPathXmlApplicationContext("org/springframework/security/util/filtertest-valid.xml");
-    }
+	@Before
+	public void loadContext() {
+		System.setProperty("sec1235.pattern1", "/login");
+		System.setProperty("sec1235.pattern2", "/logout");
+		appCtx = new ClassPathXmlApplicationContext(
+				"org/springframework/security/util/filtertest-valid.xml");
+	}
 
-    @After
-    public void closeContext() {
-        if (appCtx != null) {
-            appCtx.close();
-        }
-    }
+	@After
+	public void closeContext() {
+		if (appCtx != null) {
+			appCtx.close();
+		}
+	}
 
-    @Test
-    public void normalOperation() throws Exception {
-        FilterChainProxy filterChainProxy = appCtx.getBean("filterChain", FilterChainProxy.class);
-        doNormalOperation(filterChainProxy);
-    }
+	@Test
+	public void normalOperation() throws Exception {
+		FilterChainProxy filterChainProxy = appCtx.getBean("filterChain",
+				FilterChainProxy.class);
+		doNormalOperation(filterChainProxy);
+	}
 
-    @Test
-    public void normalOperationWithNewConfig() throws Exception {
-        FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxy", FilterChainProxy.class);
-        checkPathAndFilterOrder(filterChainProxy);
-        doNormalOperation(filterChainProxy);
-    }
+	@Test
+	public void normalOperationWithNewConfig() throws Exception {
+		FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxy",
+				FilterChainProxy.class);
+		checkPathAndFilterOrder(filterChainProxy);
+		doNormalOperation(filterChainProxy);
+	}
 
-    @Test
-    public void normalOperationWithNewConfigRegex() throws Exception {
-        FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyRegex", FilterChainProxy.class);
-        checkPathAndFilterOrder(filterChainProxy);
-        doNormalOperation(filterChainProxy);
-    }
+	@Test
+	public void normalOperationWithNewConfigRegex() throws Exception {
+		FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyRegex",
+				FilterChainProxy.class);
+		checkPathAndFilterOrder(filterChainProxy);
+		doNormalOperation(filterChainProxy);
+	}
 
-    @Test
-    public void normalOperationWithNewConfigNonNamespace() throws Exception {
-        FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyNonNamespace", FilterChainProxy.class);
-        checkPathAndFilterOrder(filterChainProxy);
-        doNormalOperation(filterChainProxy);
-    }
+	@Test
+	public void normalOperationWithNewConfigNonNamespace() throws Exception {
+		FilterChainProxy filterChainProxy = appCtx.getBean(
+				"newFilterChainProxyNonNamespace", FilterChainProxy.class);
+		checkPathAndFilterOrder(filterChainProxy);
+		doNormalOperation(filterChainProxy);
+	}
 
-    @Test
-    public void pathWithNoMatchHasNoFilters() throws Exception {
-        FilterChainProxy filterChainProxy = appCtx.getBean("newFilterChainProxyNoDefaultPath", FilterChainProxy.class);
-        assertEquals(null, filterChainProxy.getFilters("/nomatch"));
-    }
+	@Test
+	public void pathWithNoMatchHasNoFilters() throws Exception {
+		FilterChainProxy filterChainProxy = appCtx.getBean(
+				"newFilterChainProxyNoDefaultPath", FilterChainProxy.class);
+		assertEquals(null, filterChainProxy.getFilters("/nomatch"));
+	}
 
-    // SEC-1235
-    @Test
-    public void mixingPatternsAndPlaceholdersDoesntCauseOrderingIssues() throws Exception {
-        FilterChainProxy fcp = appCtx.getBean("sec1235FilterChainProxy", FilterChainProxy.class);
+	// SEC-1235
+	@Test
+	public void mixingPatternsAndPlaceholdersDoesntCauseOrderingIssues() throws Exception {
+		FilterChainProxy fcp = appCtx.getBean("sec1235FilterChainProxy",
+				FilterChainProxy.class);
 
-        List<SecurityFilterChain> chains = fcp.getFilterChains();
-        assertEquals("/login*", getPattern(chains.get(0)));
-        assertEquals("/logout", getPattern(chains.get(1)));
-        assertTrue(((DefaultSecurityFilterChain)chains.get(2)).getRequestMatcher() instanceof AnyRequestMatcher);
-    }
+		List<SecurityFilterChain> chains = fcp.getFilterChains();
+		assertEquals("/login*", getPattern(chains.get(0)));
+		assertEquals("/logout", getPattern(chains.get(1)));
+		assertTrue(((DefaultSecurityFilterChain) chains.get(2)).getRequestMatcher() instanceof AnyRequestMatcher);
+	}
 
-    private String getPattern(SecurityFilterChain chain) {
-        return ((AntPathRequestMatcher)((DefaultSecurityFilterChain)chain).getRequestMatcher()).getPattern();
-    }
+	private String getPattern(SecurityFilterChain chain) {
+		return ((AntPathRequestMatcher) ((DefaultSecurityFilterChain) chain)
+				.getRequestMatcher()).getPattern();
+	}
 
-    private void checkPathAndFilterOrder(FilterChainProxy filterChainProxy) throws Exception {
-        List<Filter> filters = filterChainProxy.getFilters("/foo/blah;x=1");
-        assertEquals(1, filters.size());
-        assertTrue(filters.get(0) instanceof SecurityContextHolderAwareRequestFilter);
+	private void checkPathAndFilterOrder(FilterChainProxy filterChainProxy)
+			throws Exception {
+		List<Filter> filters = filterChainProxy.getFilters("/foo/blah;x=1");
+		assertEquals(1, filters.size());
+		assertTrue(filters.get(0) instanceof SecurityContextHolderAwareRequestFilter);
 
-        filters = filterChainProxy.getFilters("/some;x=2,y=3/other/path;z=4/blah");
-        assertNotNull(filters);
-        assertEquals(3, filters.size());
-        assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter);
-        assertTrue(filters.get(1) instanceof SecurityContextHolderAwareRequestFilter);
-        assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter);
+		filters = filterChainProxy.getFilters("/some;x=2,y=3/other/path;z=4/blah");
+		assertNotNull(filters);
+		assertEquals(3, filters.size());
+		assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter);
+		assertTrue(filters.get(1) instanceof SecurityContextHolderAwareRequestFilter);
+		assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter);
 
-        filters = filterChainProxy.getFilters("/do/not/filter;x=7");
-        assertEquals(0, filters.size());
+		filters = filterChainProxy.getFilters("/do/not/filter;x=7");
+		assertEquals(0, filters.size());
 
-        filters = filterChainProxy.getFilters("/another/nonspecificmatch");
-        assertEquals(3, filters.size());
-        assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter);
-        assertTrue(filters.get(1) instanceof UsernamePasswordAuthenticationFilter);
-        assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter);
-    }
+		filters = filterChainProxy.getFilters("/another/nonspecificmatch");
+		assertEquals(3, filters.size());
+		assertTrue(filters.get(0) instanceof SecurityContextPersistenceFilter);
+		assertTrue(filters.get(1) instanceof UsernamePasswordAuthenticationFilter);
+		assertTrue(filters.get(2) instanceof SecurityContextHolderAwareRequestFilter);
+	}
 
-    private void doNormalOperation(FilterChainProxy filterChainProxy) throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/foo/secure/super/somefile.html");
+	private void doNormalOperation(FilterChainProxy filterChainProxy) throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/foo/secure/super/somefile.html");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain chain = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain chain = mock(FilterChain.class);
 
-        filterChainProxy.doFilter(request, response, chain);
-        verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+		filterChainProxy.doFilter(request, response, chain);
+		verify(chain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
 
-        request.setServletPath("/a/path/which/doesnt/match/any/filter.html");
-        chain = mock(FilterChain.class);
-        filterChainProxy.doFilter(request, response, chain);
-        verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		request.setServletPath("/a/path/which/doesnt/match/any/filter.html");
+		chain = mock(FilterChain.class);
+		filterChainProxy.doFilter(request, response, chain);
+		verify(chain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
index 4061080d6e..3175fda7e3 100644
--- a/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
+++ b/config/src/test/java/org/springframework/security/config/InvalidConfigurationTests.java
@@ -11,54 +11,56 @@ import org.springframework.security.config.authentication.AuthenticationManagerF
 import org.springframework.security.config.util.InMemoryXmlApplicationContext;
 
 /**
- * Tests which make sure invalid configurations are rejected by the namespace. In particular invalid top-level
- * elements. These are likely to fail after the namespace has been updated using trang, but the spring-security.xsl
- * transform has not been applied.
+ * Tests which make sure invalid configurations are rejected by the namespace. In
+ * particular invalid top-level elements. These are likely to fail after the namespace has
+ * been updated using trang, but the spring-security.xsl transform has not been applied.
  *
  * @author Luke Taylor
  */
 public class InvalidConfigurationTests {
-    private InMemoryXmlApplicationContext appContext;
+	private InMemoryXmlApplicationContext appContext;
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+	}
 
-    // Parser should throw a SAXParseException
-    @Test(expected=XmlBeanDefinitionStoreException.class)
-    public void passwordEncoderCannotAppearAtTopLevel() {
-        setContext("<password-encoder hash='md5'/>");
-    }
+	// Parser should throw a SAXParseException
+	@Test(expected = XmlBeanDefinitionStoreException.class)
+	public void passwordEncoderCannotAppearAtTopLevel() {
+		setContext("<password-encoder hash='md5'/>");
+	}
 
-    @Test(expected=XmlBeanDefinitionStoreException.class)
-    public void authenticationProviderCannotAppearAtTopLevel() {
-        setContext("<authentication-provider ref='blah'/>");
-    }
+	@Test(expected = XmlBeanDefinitionStoreException.class)
+	public void authenticationProviderCannotAppearAtTopLevel() {
+		setContext("<authentication-provider ref='blah'/>");
+	}
 
-    @Test
-    public void missingAuthenticationManagerGivesSensibleErrorMessage() {
-        try {
-            setContext("<http auto-config='true' />");
-        } catch (BeanCreationException e) {
-            Throwable cause = ultimateCause(e);
-            assertTrue(cause instanceof NoSuchBeanDefinitionException);
-            NoSuchBeanDefinitionException nsbe = (NoSuchBeanDefinitionException) cause;
-            assertEquals(BeanIds.AUTHENTICATION_MANAGER, nsbe.getBeanName());
-            assertTrue(nsbe.getMessage().endsWith(AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE));
-        }
-    }
+	@Test
+	public void missingAuthenticationManagerGivesSensibleErrorMessage() {
+		try {
+			setContext("<http auto-config='true' />");
+		}
+		catch (BeanCreationException e) {
+			Throwable cause = ultimateCause(e);
+			assertTrue(cause instanceof NoSuchBeanDefinitionException);
+			NoSuchBeanDefinitionException nsbe = (NoSuchBeanDefinitionException) cause;
+			assertEquals(BeanIds.AUTHENTICATION_MANAGER, nsbe.getBeanName());
+			assertTrue(nsbe.getMessage().endsWith(
+					AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE));
+		}
+	}
 
-    private Throwable ultimateCause(Throwable e) {
-        if (e.getCause() == null) {
-            return e;
-        }
-        return ultimateCause(e.getCause());
-    }
+	private Throwable ultimateCause(Throwable e) {
+		if (e.getCause() == null) {
+			return e;
+		}
+		return ultimateCause(e.getCause());
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java b/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
index aa6c3305a1..6a6d1d5eea 100644
--- a/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
+++ b/config/src/test/java/org/springframework/security/config/MockAfterInvocationProvider.java
@@ -9,17 +9,18 @@ import org.springframework.security.core.Authentication;
 
 public class MockAfterInvocationProvider implements AfterInvocationProvider {
 
-    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config, Object returnedObject)
-            throws AccessDeniedException {
-        return returnedObject;
-    }
+	public Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config, Object returnedObject)
+			throws AccessDeniedException {
+		return returnedObject;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return true;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return true;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/MockTransactionManager.java b/config/src/test/java/org/springframework/security/config/MockTransactionManager.java
index c57af303e2..26e6677704 100644
--- a/config/src/test/java/org/springframework/security/config/MockTransactionManager.java
+++ b/config/src/test/java/org/springframework/security/config/MockTransactionManager.java
@@ -11,13 +11,14 @@ import org.springframework.transaction.TransactionStatus;
  * @author Luke Taylor
  */
 public class MockTransactionManager implements PlatformTransactionManager {
-    public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
-        return mock(TransactionStatus.class);
-    }
+	public TransactionStatus getTransaction(TransactionDefinition definition)
+			throws TransactionException {
+		return mock(TransactionStatus.class);
+	}
 
-    public void commit(TransactionStatus status) throws TransactionException {
-    }
+	public void commit(TransactionStatus status) throws TransactionException {
+	}
 
-    public void rollback(TransactionStatus status) throws TransactionException {
-    }
+	public void rollback(TransactionStatus status) throws TransactionException {
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java b/config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
index c7107db622..5d282b7a9e 100644
--- a/config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
+++ b/config/src/test/java/org/springframework/security/config/MockUserServiceBeanPostProcessor.java
@@ -4,21 +4,25 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 
 /**
- * Test bean post processor which injects a message into a PostProcessedMockUserDetailsService.
+ * Test bean post processor which injects a message into a
+ * PostProcessedMockUserDetailsService.
  *
  * @author Luke Taylor
  */
 public class MockUserServiceBeanPostProcessor implements BeanPostProcessor {
 
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        return bean;
-    }
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
+		return bean;
+	}
 
-    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-        if (bean instanceof PostProcessedMockUserDetailsService) {
-            ((PostProcessedMockUserDetailsService)bean).setPostProcessorWasHere("Hello from the post processor!");
-        }
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+			throws BeansException {
+		if (bean instanceof PostProcessedMockUserDetailsService) {
+			((PostProcessedMockUserDetailsService) bean)
+					.setPostProcessorWasHere("Hello from the post processor!");
+		}
 
-        return bean;
-    }
+		return bean;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
index d600291aca..e2f26e1b39 100644
--- a/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
+++ b/config/src/test/java/org/springframework/security/config/PostProcessedMockUserDetailsService.java
@@ -4,21 +4,21 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 public class PostProcessedMockUserDetailsService implements UserDetailsService {
-    private String postProcessorWasHere;
+	private String postProcessorWasHere;
 
-    public PostProcessedMockUserDetailsService() {
-        this.postProcessorWasHere = "Post processor hasn't been yet";
-    }
+	public PostProcessedMockUserDetailsService() {
+		this.postProcessorWasHere = "Post processor hasn't been yet";
+	}
 
-    public String getPostProcessorWasHere() {
-        return postProcessorWasHere;
-    }
+	public String getPostProcessorWasHere() {
+		return postProcessorWasHere;
+	}
 
-    public void setPostProcessorWasHere(String postProcessorWasHere) {
-        this.postProcessorWasHere = postProcessorWasHere;
-    }
+	public void setPostProcessorWasHere(String postProcessorWasHere) {
+		this.postProcessorWasHere = postProcessorWasHere;
+	}
 
-    public UserDetails loadUserByUsername(String username) {
-        throw new UnsupportedOperationException("Not for actual use");
-    }
+	public UserDetails loadUserByUsername(String username) {
+		throw new UnsupportedOperationException("Not for actual use");
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java
index 6dbddd7f51..ad85bcf7ca 100644
--- a/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java
+++ b/config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java
@@ -24,115 +24,112 @@ import org.springframework.util.ClassUtils;
  * @since 3.0
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ClassUtils.class})
+@PrepareForTest({ ClassUtils.class })
 public class SecurityNamespaceHandlerTests {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-    private static final String XML_AUTHENTICATION_MANAGER =
-            "<authentication-manager>"+
-            "  <authentication-provider>"+
-            "    <user-service id='us'>"+
-            "      <user name='bob' password='bobspassword' authorities='ROLE_A' />" +
-            "    </user-service>"+
-            "  </authentication-provider>"+
-            "</authentication-manager>";
-    private static final String XML_HTTP_BLOCK = "<http auto-config='true'/>";
-    private static final String FILTER_CHAIN_PROXY_CLASSNAME = "org.springframework.security.web.FilterChainProxy";
+	private static final String XML_AUTHENTICATION_MANAGER = "<authentication-manager>"
+			+ "  <authentication-provider>" + "    <user-service id='us'>"
+			+ "      <user name='bob' password='bobspassword' authorities='ROLE_A' />"
+			+ "    </user-service>" + "  </authentication-provider>"
+			+ "</authentication-manager>";
+	private static final String XML_HTTP_BLOCK = "<http auto-config='true'/>";
+	private static final String FILTER_CHAIN_PROXY_CLASSNAME = "org.springframework.security.web.FilterChainProxy";
 
-    @Test
-    public void constructionSucceeds() {
-        new SecurityNamespaceHandler();
-        // Shameless class coverage stats boosting
-        new BeanIds() {};
-        new Elements() {};
-    }
+	@Test
+	public void constructionSucceeds() {
+		new SecurityNamespaceHandler();
+		// Shameless class coverage stats boosting
+		new BeanIds() {
+		};
+		new Elements() {
+		};
+	}
 
-    @Test
-    public void pre32SchemaAreNotSupported() throws Exception {
-        try {
-            new InMemoryXmlApplicationContext(
-                    "<user-service id='us'>" +
-                    "  <user name='bob' password='bobspassword' authorities='ROLE_A' />" +
-                    "</user-service>", "3.0.3", null
-            );
-            fail("Expected BeanDefinitionParsingException");
-        } catch (BeanDefinitionParsingException expected) {
-            assertTrue(expected.getMessage().contains("You cannot use a spring-security-2.0.xsd"));
-        }
-    }
+	@Test
+	public void pre32SchemaAreNotSupported() throws Exception {
+		try {
+			new InMemoryXmlApplicationContext(
+					"<user-service id='us'>"
+							+ "  <user name='bob' password='bobspassword' authorities='ROLE_A' />"
+							+ "</user-service>", "3.0.3", null);
+			fail("Expected BeanDefinitionParsingException");
+		}
+		catch (BeanDefinitionParsingException expected) {
+			assertTrue(expected.getMessage().contains(
+					"You cannot use a spring-security-2.0.xsd"));
+		}
+	}
 
-    // SEC-1868
-    @Test
-    public void initDoesNotLogErrorWhenFilterChainProxyFailsToLoad() throws Exception {
-        String className = "javax.servlet.Filter";
-        spy(ClassUtils.class);
-        doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class,"forName",eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
+	// SEC-1868
+	@Test
+	public void initDoesNotLogErrorWhenFilterChainProxyFailsToLoad() throws Exception {
+		String className = "javax.servlet.Filter";
+		spy(ClassUtils.class);
+		doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class, "forName",
+				eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
 
-        Log logger = mock(Log.class);
-        SecurityNamespaceHandler handler = new SecurityNamespaceHandler();
-        WhiteboxImpl.setInternalState(handler, Log.class, logger);
+		Log logger = mock(Log.class);
+		SecurityNamespaceHandler handler = new SecurityNamespaceHandler();
+		WhiteboxImpl.setInternalState(handler, Log.class, logger);
 
-        handler.init();
+		handler.init();
 
-        verifyStatic();
-        ClassUtils.forName(eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
-        verifyZeroInteractions(logger);
-    }
+		verifyStatic();
+		ClassUtils.forName(eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
+		verifyZeroInteractions(logger);
+	}
 
-    @Test
-    public void filterNoClassDefFoundError() throws Exception {
-        String className = "javax.servlet.Filter";
-        thrown.expect(BeanDefinitionParsingException.class);
-        thrown.expectMessage("NoClassDefFoundError: "+className);
-        spy(ClassUtils.class);
-        doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class,"forName",eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
-        new InMemoryXmlApplicationContext(
-                XML_AUTHENTICATION_MANAGER +
-                XML_HTTP_BLOCK);
-    }
+	@Test
+	public void filterNoClassDefFoundError() throws Exception {
+		String className = "javax.servlet.Filter";
+		thrown.expect(BeanDefinitionParsingException.class);
+		thrown.expectMessage("NoClassDefFoundError: " + className);
+		spy(ClassUtils.class);
+		doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class, "forName",
+				eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
+		new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER + XML_HTTP_BLOCK);
+	}
 
-    @Test
-    public void filterNoClassDefFoundErrorNoHttpBlock() throws Exception {
-        String className = "javax.servlet.Filter";
-        spy(ClassUtils.class);
-        doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class,"forName",eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
-        new InMemoryXmlApplicationContext(
-                XML_AUTHENTICATION_MANAGER);
-        // should load just fine since no http block
-    }
+	@Test
+	public void filterNoClassDefFoundErrorNoHttpBlock() throws Exception {
+		String className = "javax.servlet.Filter";
+		spy(ClassUtils.class);
+		doThrow(new NoClassDefFoundError(className)).when(ClassUtils.class, "forName",
+				eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
+		new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER);
+		// should load just fine since no http block
+	}
 
-    @Test
-    public void filterChainProxyClassNotFoundException() throws Exception {
-        String className = FILTER_CHAIN_PROXY_CLASSNAME;
-        thrown.expect(BeanDefinitionParsingException.class);
-        thrown.expectMessage("ClassNotFoundException: "+className);
-        spy(ClassUtils.class);
-        doThrow(new ClassNotFoundException(className)).when(ClassUtils.class,"forName",eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
-        new InMemoryXmlApplicationContext(
-                XML_AUTHENTICATION_MANAGER +
-                XML_HTTP_BLOCK);
-    }
+	@Test
+	public void filterChainProxyClassNotFoundException() throws Exception {
+		String className = FILTER_CHAIN_PROXY_CLASSNAME;
+		thrown.expect(BeanDefinitionParsingException.class);
+		thrown.expectMessage("ClassNotFoundException: " + className);
+		spy(ClassUtils.class);
+		doThrow(new ClassNotFoundException(className)).when(ClassUtils.class, "forName",
+				eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
+		new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER + XML_HTTP_BLOCK);
+	}
 
-    @Test
-    public void filterChainProxyClassNotFoundExceptionNoHttpBlock() throws Exception {
-        String className = FILTER_CHAIN_PROXY_CLASSNAME;
-        spy(ClassUtils.class);
-        doThrow(new ClassNotFoundException(className)).when(ClassUtils.class,"forName",eq(FILTER_CHAIN_PROXY_CLASSNAME),any(ClassLoader.class));
-        new InMemoryXmlApplicationContext(
-                XML_AUTHENTICATION_MANAGER);
-        // should load just fine since no http block
-    }
+	@Test
+	public void filterChainProxyClassNotFoundExceptionNoHttpBlock() throws Exception {
+		String className = FILTER_CHAIN_PROXY_CLASSNAME;
+		spy(ClassUtils.class);
+		doThrow(new ClassNotFoundException(className)).when(ClassUtils.class, "forName",
+				eq(FILTER_CHAIN_PROXY_CLASSNAME), any(ClassLoader.class));
+		new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER);
+		// should load just fine since no http block
+	}
 
-
-
-    @Test
-    public void websocketNotFoundExceptionNoMessageBlock() throws Exception {
-        String className = FILTER_CHAIN_PROXY_CLASSNAME;
-        spy(ClassUtils.class);
-        doThrow(new ClassNotFoundException(className)).when(ClassUtils.class,"forName",eq(Message.class.getName()),any(ClassLoader.class));
-        new InMemoryXmlApplicationContext(
-                XML_AUTHENTICATION_MANAGER);
-        // should load just fine since no websocket block
-    }
+	@Test
+	public void websocketNotFoundExceptionNoMessageBlock() throws Exception {
+		String className = FILTER_CHAIN_PROXY_CLASSNAME;
+		spy(ClassUtils.class);
+		doThrow(new ClassNotFoundException(className)).when(ClassUtils.class, "forName",
+				eq(Message.class.getName()), any(ClassLoader.class));
+		new InMemoryXmlApplicationContext(XML_AUTHENTICATION_MANAGER);
+		// should load just fine since no websocket block
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/TestBusinessBean.java b/config/src/test/java/org/springframework/security/config/TestBusinessBean.java
index 9b6f0968e7..b456693821 100644
--- a/config/src/test/java/org/springframework/security/config/TestBusinessBean.java
+++ b/config/src/test/java/org/springframework/security/config/TestBusinessBean.java
@@ -5,13 +5,13 @@ package org.springframework.security.config;
  */
 public interface TestBusinessBean {
 
-    void setInteger(int i);
+	void setInteger(int i);
 
-    int getInteger();
+	int getInteger();
 
-    void setString(String s);
+	void setString(String s);
 
-    void doSomething();
+	void doSomething();
 
-    void unprotected();
+	void unprotected();
 }
diff --git a/config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java b/config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
index c5acb05afd..230ba5fac1 100644
--- a/config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
+++ b/config/src/test/java/org/springframework/security/config/TestBusinessBeanImpl.java
@@ -7,28 +7,29 @@ import org.springframework.transaction.annotation.Transactional;
 /**
  * @author Luke Taylor
  */
-public class TestBusinessBeanImpl implements TestBusinessBean, ApplicationListener<SessionCreationEvent> {
-    public void setInteger(int i) {
-    }
+public class TestBusinessBeanImpl implements TestBusinessBean,
+		ApplicationListener<SessionCreationEvent> {
+	public void setInteger(int i) {
+	}
 
-    public int getInteger() {
-        return 1314;
-    }
+	public int getInteger() {
+		return 1314;
+	}
 
-    public void setString(String s) {
-    }
+	public void setString(String s) {
+	}
 
-    public String getString() {
-        return "A string.";
-    }
+	public String getString() {
+		return "A string.";
+	}
 
-    public void doSomething() {
-    }
+	public void doSomething() {
+	}
 
-    public void unprotected() {
-    }
+	public void unprotected() {
+	}
 
-    public void onApplicationEvent(SessionCreationEvent event) {
-        System.out.println(event);
-    }
+	public void onApplicationEvent(SessionCreationEvent event) {
+		System.out.println(event);
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/TransactionalTestBusinessBean.java b/config/src/test/java/org/springframework/security/config/TransactionalTestBusinessBean.java
index feabc99365..ca15a3c3a6 100644
--- a/config/src/test/java/org/springframework/security/config/TransactionalTestBusinessBean.java
+++ b/config/src/test/java/org/springframework/security/config/TransactionalTestBusinessBean.java
@@ -6,20 +6,20 @@ import org.springframework.transaction.annotation.Transactional;
  * @author Luke Taylor
  */
 public class TransactionalTestBusinessBean implements TestBusinessBean {
-    public void setInteger(int i) {
-    }
+	public void setInteger(int i) {
+	}
 
-    public int getInteger() {
-        return 0;
-    }
+	public int getInteger() {
+		return 0;
+	}
 
-    public void setString(String s) {
-    }
+	public void setString(String s) {
+	}
 
-    @Transactional
-    public void doSomething() {
-    }
+	@Transactional
+	public void doSomething() {
+	}
 
-    public void unprotected() {
-    }
+	public void unprotected() {
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java
index ca5899556a..84d143e09c 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java
@@ -55,84 +55,83 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 @WebAppConfiguration
 public class WebMvcSecurityConfigurationTests {
 
-    @Autowired
-    WebApplicationContext context;
+	@Autowired
+	WebApplicationContext context;
 
-    MockMvc mockMvc;
+	MockMvc mockMvc;
 
-    Authentication authentication;
+	Authentication authentication;
 
-    @Before
-    public void setup() {
-        mockMvc = MockMvcBuilders.webAppContextSetup(context).build();
-        authentication = new TestingAuthenticationToken("user","password", AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-    }
+	@Before
+	public void setup() {
+		mockMvc = MockMvcBuilders.webAppContextSetup(context).build();
+		authentication = new TestingAuthenticationToken("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(authentication);
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void authenticationPrincipalResolved() throws Exception {
-        mockMvc
-                .perform(get("/authentication-principal"))
-                .andExpect(assertResult(authentication.getPrincipal()))
-                .andExpect(view().name("authentication-principal-view"));
-    }
+	@Test
+	public void authenticationPrincipalResolved() throws Exception {
+		mockMvc.perform(get("/authentication-principal"))
+				.andExpect(assertResult(authentication.getPrincipal()))
+				.andExpect(view().name("authentication-principal-view"));
+	}
 
-    @Test
-    public void deprecatedAuthenticationPrincipalResolved() throws Exception {
-        mockMvc
-                .perform(get("/deprecated-authentication-principal"))
-                .andExpect(assertResult(authentication.getPrincipal()))
-                .andExpect(view().name("deprecated-authentication-principal-view"));
-    }
+	@Test
+	public void deprecatedAuthenticationPrincipalResolved() throws Exception {
+		mockMvc.perform(get("/deprecated-authentication-principal"))
+				.andExpect(assertResult(authentication.getPrincipal()))
+				.andExpect(view().name("deprecated-authentication-principal-view"));
+	}
 
-    @Test
-    public void csrfToken() throws Exception {
-        CsrfToken csrfToken = new DefaultCsrfToken("headerName", "paramName", "token");
-        MockHttpServletRequestBuilder request =
-                get("/csrf")
-                .requestAttr(CsrfToken.class.getName(), csrfToken);
+	@Test
+	public void csrfToken() throws Exception {
+		CsrfToken csrfToken = new DefaultCsrfToken("headerName", "paramName", "token");
+		MockHttpServletRequestBuilder request = get("/csrf").requestAttr(
+				CsrfToken.class.getName(), csrfToken);
 
-        mockMvc
-                .perform(request)
-                .andExpect(assertResult(csrfToken));
-    }
+		mockMvc.perform(request).andExpect(assertResult(csrfToken));
+	}
 
-    private ResultMatcher assertResult(Object expected) {
-        return model().attribute("result", expected);
-    }
+	private ResultMatcher assertResult(Object expected) {
+		return model().attribute("result", expected);
+	}
 
-    @Controller
-    static class TestController {
+	@Controller
+	static class TestController {
 
-        @RequestMapping("/authentication-principal")
-        public ModelAndView authenticationPrincipal(@AuthenticationPrincipal String principal) {
-            return new ModelAndView("authentication-principal-view", "result", principal);
-        }
+		@RequestMapping("/authentication-principal")
+		public ModelAndView authenticationPrincipal(
+				@AuthenticationPrincipal String principal) {
+			return new ModelAndView("authentication-principal-view", "result", principal);
+		}
 
-        @RequestMapping("/deprecated-authentication-principal")
-        public ModelAndView deprecatedAuthenticationPrincipal(@org.springframework.security.web.bind.annotation.AuthenticationPrincipal String principal) {
-            return new ModelAndView("deprecated-authentication-principal-view", "result", principal);
-        }
+		@RequestMapping("/deprecated-authentication-principal")
+		public ModelAndView deprecatedAuthenticationPrincipal(
+				@org.springframework.security.web.bind.annotation.AuthenticationPrincipal String principal) {
+			return new ModelAndView("deprecated-authentication-principal-view", "result",
+					principal);
+		}
 
-        @RequestMapping("/csrf")
-        public ModelAndView csrf(CsrfToken token) {
-            return new ModelAndView("view", "result", token);
-        }
-    }
+		@RequestMapping("/csrf")
+		public ModelAndView csrf(CsrfToken token) {
+			return new ModelAndView("view", "result", token);
+		}
+	}
 
-    @Configuration
-    @EnableWebMvc
-    @EnableWebSecurity
-    static class Config {
-        @Bean
-        public TestController testController() {
-            return new TestController();
-        }
-    }
+	@Configuration
+	@EnableWebMvc
+	@EnableWebSecurity
+	static class Config {
+		@Bean
+		public TestController testController() {
+			return new TestController();
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java
index 250946e604..f09df67bc5 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java
@@ -36,64 +36,65 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
  *
  */
 public class CsrfConfigurerNoWebMvcTests {
-    ConfigurableApplicationContext context;
+	ConfigurableApplicationContext context;
 
-    @After
-    public void teardown() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void teardown() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void missingDispatcherServletPreventsCsrfRequestDataValueProcessor() {
-        loadContext(EnableWebConfig.class);
+	@Test
+	public void missingDispatcherServletPreventsCsrfRequestDataValueProcessor() {
+		loadContext(EnableWebConfig.class);
 
-        assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue();
-    }
+		assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue();
+	}
 
-    @Test
-    public void findDispatcherServletPreventsCsrfRequestDataValueProcessor() {
-        loadContext(EnableWebMvcConfig.class);
+	@Test
+	public void findDispatcherServletPreventsCsrfRequestDataValueProcessor() {
+		loadContext(EnableWebMvcConfig.class);
 
-        assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue();
-    }
+		assertThat(context.containsBeanDefinition("requestDataValueProcessor")).isTrue();
+	}
 
-    @Test
-    public void overrideCsrfRequestDataValueProcessor() {
-        loadContext(EnableWebOverrideRequestDataConfig.class);
+	@Test
+	public void overrideCsrfRequestDataValueProcessor() {
+		loadContext(EnableWebOverrideRequestDataConfig.class);
 
-        assertThat(context.getBean(RequestDataValueProcessor.class).getClass()).isNotEqualTo(CsrfRequestDataValueProcessor.class);
-    }
+		assertThat(context.getBean(RequestDataValueProcessor.class).getClass())
+				.isNotEqualTo(CsrfRequestDataValueProcessor.class);
+	}
 
-    @EnableWebSecurity
-    static class EnableWebConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class EnableWebConfig extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-        }
-    }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+		}
+	}
 
-    @EnableWebSecurity
-    static class EnableWebOverrideRequestDataConfig {
-        @Bean
-        public RequestDataValueProcessor requestDataValueProcessor() {
-            return mock(RequestDataValueProcessor.class);
-        }
-    }
+	@EnableWebSecurity
+	static class EnableWebOverrideRequestDataConfig {
+		@Bean
+		public RequestDataValueProcessor requestDataValueProcessor() {
+			return mock(RequestDataValueProcessor.class);
+		}
+	}
 
-    @EnableWebSecurity
-    static class EnableWebMvcConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class EnableWebMvcConfig extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-        }
-    }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+		}
+	}
 
-    private void loadContext(Class<?> configs) {
-        AnnotationConfigApplicationContext annotationConfigApplicationContext = new AnnotationConfigApplicationContext();
-        annotationConfigApplicationContext.register(configs);
-        annotationConfigApplicationContext.refresh();
-        this.context = annotationConfigApplicationContext;
-    }
+	private void loadContext(Class<?> configs) {
+		AnnotationConfigApplicationContext annotationConfigApplicationContext = new AnnotationConfigApplicationContext();
+		annotationConfigApplicationContext.register(configs);
+		annotationConfigApplicationContext.refresh();
+		this.context = annotationConfigApplicationContext;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java
index d86f24f579..69f105963e 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java
@@ -52,96 +52,104 @@ import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
 import org.springframework.util.ReflectionUtils;
 
-
 /**
  *
  * @author Rob Winch
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ReflectionUtils.class, Method.class})
+@PrepareForTest({ ReflectionUtils.class, Method.class })
 public class SessionManagementConfigurerServlet31Tests {
-    @Mock
-    Method method;
+	@Mock
+	Method method;
 
-    MockHttpServletRequest request;
-    MockHttpServletResponse response;
-    MockFilterChain chain;
+	MockHttpServletRequest request;
+	MockHttpServletResponse response;
+	MockFilterChain chain;
 
-    ConfigurableApplicationContext context;
+	ConfigurableApplicationContext context;
 
-    Filter springSecurityFilterChain;
+	Filter springSecurityFilterChain;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        chain = new MockFilterChain();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		chain = new MockFilterChain();
+	}
 
-    @After
-    public void teardown() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void teardown() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void changeSessionIdDefaultsInServlet31Plus() throws Exception {
-        spy(ReflectionUtils.class);
-        Method method = mock(Method.class);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession();
-        request.setServletPath("/login");
-        request.setMethod("POST");
-        request.setParameter("username", "user");
-        request.setParameter("password", "password");
-        HttpSessionCsrfTokenRepository repository = new HttpSessionCsrfTokenRepository();
-        CsrfToken token = repository.generateToken(request);
-        repository.saveToken(token, request, response);
-        request.setParameter(token.getParameterName(),token.getToken());
-        when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId")).thenReturn(method);
+	@Test
+	public void changeSessionIdDefaultsInServlet31Plus() throws Exception {
+		spy(ReflectionUtils.class);
+		Method method = mock(Method.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.getSession();
+		request.setServletPath("/login");
+		request.setMethod("POST");
+		request.setParameter("username", "user");
+		request.setParameter("password", "password");
+		HttpSessionCsrfTokenRepository repository = new HttpSessionCsrfTokenRepository();
+		CsrfToken token = repository.generateToken(request);
+		repository.saveToken(token, request, response);
+		request.setParameter(token.getParameterName(), token.getToken());
+		when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId"))
+				.thenReturn(method);
 
-        loadConfig(SessionManagementDefaultSessionFixationServlet31Config.class);
+		loadConfig(SessionManagementDefaultSessionFixationServlet31Config.class);
 
-        springSecurityFilterChain.doFilter(request,response,chain);
+		springSecurityFilterChain.doFilter(request, response, chain);
 
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
-    }
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
+	}
 
-    @EnableWebSecurity
-    static class SessionManagementDefaultSessionFixationServlet31Config extends WebSecurityConfigurerAdapter {
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .formLogin()
-                    .and()
-                .sessionManagement();
-        }
+	@EnableWebSecurity
+	static class SessionManagementDefaultSessionFixationServlet31Config extends
+			WebSecurityConfigurerAdapter {
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.formLogin()
+					.and()
+				.sessionManagement();
+		}
+		// @formatter:on
 
-        @Override
-        protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Override
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 
-    private void loadConfig(Class<?>...classes) {
-        AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-        context.register(classes);
-        context.refresh();
-        this.context = context;
-        this.springSecurityFilterChain = this.context.getBean("springSecurityFilterChain",Filter.class);
-    }
+	private void loadConfig(Class<?>... classes) {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.register(classes);
+		context.refresh();
+		this.context = context;
+		this.springSecurityFilterChain = this.context.getBean(
+				"springSecurityFilterChain", Filter.class);
+	}
 
-    private void login(Authentication auth) {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(requestResponseHolder);
+	private void login(Authentication auth) {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(
+				request, response);
+		repo.loadContext(requestResponseHolder);
 
-        SecurityContextImpl securityContextImpl = new SecurityContextImpl();
-        securityContextImpl.setAuthentication(auth);
-        repo.saveContext(securityContextImpl, requestResponseHolder.getRequest(), requestResponseHolder.getResponse());
-    }
+		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
+		securityContextImpl.setAuthentication(auth);
+		repo.saveContext(securityContextImpl, requestResponseHolder.getRequest(),
+				requestResponseHolder.getResponse());
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java
index ab14622986..5992b86f72 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistryTests.java
@@ -36,298 +36,270 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MessageSecurityMetadataSourceRegistryTests {
-    @Mock
-    private MessageMatcher<Object> matcher;
+	@Mock
+	private MessageMatcher<Object> matcher;
 
-    private MessageSecurityMetadataSourceRegistry messages;
+	private MessageSecurityMetadataSourceRegistry messages;
 
-    private Message<String> message;
+	private Message<String> message;
 
-    @Before
-    public void setup() {
-        messages = new MessageSecurityMetadataSourceRegistry();
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "location")
-                .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE)
-                .build();
-    }
+	@Before
+	public void setup() {
+		messages = new MessageSecurityMetadataSourceRegistry();
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "location")
+				.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+						SimpMessageType.MESSAGE).build();
+	}
 
-    // See https://github.com/spring-projects/spring-security/commit/3f30529039c76facf335d6ca69d18d8ae287f3f9#commitcomment-7412712
-    // https://jira.spring.io/browse/SPR-11660
-    @Test
-    public void simpDestMatchersCustom() {
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2")
-                .build();
-        messages
-                .simpDestPathMatcher(new AntPathMatcher("."))
-                .simpDestMatchers("price.stock.*").permitAll();
+	// See
+	// https://github.com/spring-projects/spring-security/commit/3f30529039c76facf335d6ca69d18d8ae287f3f9#commitcomment-7412712
+	// https://jira.spring.io/browse/SPR-11660
+	@Test
+	public void simpDestMatchersCustom() {
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+						"price.stock.1.2").build();
+		messages.simpDestPathMatcher(new AntPathMatcher("."))
+				.simpDestMatchers("price.stock.*").permitAll();
 
-        assertThat(getAttribute()).isNull();
+		assertThat(getAttribute()).isNull();
 
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2")
-                .build();
-        messages
-                .simpDestPathMatcher(new AntPathMatcher("."))
-                .simpDestMatchers("price.stock.**").permitAll();
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+						"price.stock.1.2").build();
+		messages.simpDestPathMatcher(new AntPathMatcher("."))
+				.simpDestMatchers("price.stock.**").permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestMatchersCustomSetAfterMatchersDoesNotMatter() {
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2")
-                .build();
-        messages
-                .simpDestMatchers("price.stock.*").permitAll()
-                .simpDestPathMatcher(new AntPathMatcher("."));
+	@Test
+	public void simpDestMatchersCustomSetAfterMatchersDoesNotMatter() {
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+						"price.stock.1.2").build();
+		messages.simpDestMatchers("price.stock.*").permitAll()
+				.simpDestPathMatcher(new AntPathMatcher("."));
 
-        assertThat(getAttribute()).isNull();
+		assertThat(getAttribute()).isNull();
 
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "price.stock.1.2")
-                .build();
-        messages
-                .simpDestMatchers("price.stock.**").permitAll()
-                .simpDestPathMatcher(new AntPathMatcher("."));
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+						"price.stock.1.2").build();
+		messages.simpDestMatchers("price.stock.**").permitAll()
+				.simpDestPathMatcher(new AntPathMatcher("."));
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void pathMatcherNull() {
-        messages.simpDestPathMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void pathMatcherNull() {
+		messages.simpDestPathMatcher(null);
+	}
 
-    @Test
-    public void matchersFalse() {
-        messages
-                .matchers(matcher).permitAll();
+	@Test
+	public void matchersFalse() {
+		messages.matchers(matcher).permitAll();
 
-        assertThat(getAttribute()).isNull();
-    }
+		assertThat(getAttribute()).isNull();
+	}
 
-    @Test
-    public void matchersTrue() {
-        when(matcher.matches(message)).thenReturn(true);
-        messages
-                .matchers(matcher).permitAll();
+	@Test
+	public void matchersTrue() {
+		when(matcher.matches(message)).thenReturn(true);
+		messages.matchers(matcher).permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestMatchersExact() {
-        messages
-                .simpDestMatchers("location").permitAll();
+	@Test
+	public void simpDestMatchersExact() {
+		messages.simpDestMatchers("location").permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestMatchersMulti() {
-        messages
-                .simpDestMatchers("admin/**","api/**").hasRole("ADMIN")
-                .simpDestMatchers("location").permitAll();
+	@Test
+	public void simpDestMatchersMulti() {
+		messages.simpDestMatchers("admin/**", "api/**").hasRole("ADMIN")
+				.simpDestMatchers("location").permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestMatchersRole() {
-        messages
-                .simpDestMatchers("admin/**","location/**").hasRole("ADMIN")
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersRole() {
+		messages.simpDestMatchers("admin/**", "location/**").hasRole("ADMIN")
+				.anyMessage().denyAll();
 
-        assertThat(getAttribute()).isEqualTo("hasRole('ROLE_ADMIN')");
-    }
+		assertThat(getAttribute()).isEqualTo("hasRole('ROLE_ADMIN')");
+	}
 
-    @Test
-    public void simpDestMatchersAnyRole() {
-        messages
-                .simpDestMatchers("admin/**","location/**").hasAnyRole("ADMIN", "ROOT")
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersAnyRole() {
+		messages.simpDestMatchers("admin/**", "location/**").hasAnyRole("ADMIN", "ROOT")
+				.anyMessage().denyAll();
 
-        assertThat(getAttribute()).isEqualTo("hasAnyRole('ROLE_ADMIN','ROLE_ROOT')");
-    }
+		assertThat(getAttribute()).isEqualTo("hasAnyRole('ROLE_ADMIN','ROLE_ROOT')");
+	}
 
-    @Test
-    public void simpDestMatchersAuthority() {
-        messages
-                .simpDestMatchers("admin/**","location/**").hasAuthority("ROLE_ADMIN")
-                .anyMessage().fullyAuthenticated();
+	@Test
+	public void simpDestMatchersAuthority() {
+		messages.simpDestMatchers("admin/**", "location/**").hasAuthority("ROLE_ADMIN")
+				.anyMessage().fullyAuthenticated();
 
-        assertThat(getAttribute()).isEqualTo("hasAuthority('ROLE_ADMIN')");
-    }
+		assertThat(getAttribute()).isEqualTo("hasAuthority('ROLE_ADMIN')");
+	}
 
-    @Test
-    public void simpDestMatchersAccess() {
-        String expected = "hasRole('ROLE_ADMIN') and fullyAuthenticated";
-        messages
-                .simpDestMatchers("admin/**","location/**").access(expected)
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersAccess() {
+		String expected = "hasRole('ROLE_ADMIN') and fullyAuthenticated";
+		messages.simpDestMatchers("admin/**", "location/**").access(expected)
+				.anyMessage().denyAll();
 
-        assertThat(getAttribute()).isEqualTo(expected);
-    }
+		assertThat(getAttribute()).isEqualTo(expected);
+	}
 
-    @Test
-    public void simpDestMatchersAnyAuthority() {
-        messages
-                .simpDestMatchers("admin/**","location/**").hasAnyAuthority("ROLE_ADMIN", "ROLE_ROOT")
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersAnyAuthority() {
+		messages.simpDestMatchers("admin/**", "location/**")
+				.hasAnyAuthority("ROLE_ADMIN", "ROLE_ROOT").anyMessage().denyAll();
 
-        assertThat(getAttribute()).isEqualTo("hasAnyAuthority('ROLE_ADMIN','ROLE_ROOT')");
-    }
+		assertThat(getAttribute()).isEqualTo("hasAnyAuthority('ROLE_ADMIN','ROLE_ROOT')");
+	}
 
-    @Test
-    public void simpDestMatchersRememberMe() {
-        messages
-                .simpDestMatchers("admin/**","location/**").rememberMe()
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersRememberMe() {
+		messages.simpDestMatchers("admin/**", "location/**").rememberMe().anyMessage()
+				.denyAll();
 
-        assertThat(getAttribute()).isEqualTo("rememberMe");
-    }
+		assertThat(getAttribute()).isEqualTo("rememberMe");
+	}
 
-    @Test
-    public void simpDestMatchersAnonymous() {
-        messages
-                .simpDestMatchers("admin/**","location/**").anonymous()
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersAnonymous() {
+		messages.simpDestMatchers("admin/**", "location/**").anonymous().anyMessage()
+				.denyAll();
 
-        assertThat(getAttribute()).isEqualTo("anonymous");
-    }
+		assertThat(getAttribute()).isEqualTo("anonymous");
+	}
 
-    @Test
-    public void simpDestMatchersFullyAuthenticated() {
-        messages
-                .simpDestMatchers("admin/**","location/**").fullyAuthenticated()
-                .anyMessage().denyAll();
+	@Test
+	public void simpDestMatchersFullyAuthenticated() {
+		messages.simpDestMatchers("admin/**", "location/**").fullyAuthenticated()
+				.anyMessage().denyAll();
 
-        assertThat(getAttribute()).isEqualTo("fullyAuthenticated");
-    }
+		assertThat(getAttribute()).isEqualTo("fullyAuthenticated");
+	}
 
-    @Test
-    public void simpDestMatchersDenyAll() {
-        messages
-                .simpDestMatchers("admin/**","location/**").denyAll()
-                .anyMessage().permitAll();
+	@Test
+	public void simpDestMatchersDenyAll() {
+		messages.simpDestMatchers("admin/**", "location/**").denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void simpDestMessageMatchersNotMatch() {
-        messages
-                .simpMessageDestMatchers("admin/**").denyAll()
-                .anyMessage().permitAll();
+	@Test
+	public void simpDestMessageMatchersNotMatch() {
+		messages.simpMessageDestMatchers("admin/**").denyAll().anyMessage().permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestMessageMatchersMatch() {
-        messages
-                .simpMessageDestMatchers("location/**").denyAll()
-                .anyMessage().permitAll();
+	@Test
+	public void simpDestMessageMatchersMatch() {
+		messages.simpMessageDestMatchers("location/**").denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void simpDestSubscribeMatchersNotMatch() {
-        messages
-                .simpSubscribeDestMatchers("location/**").denyAll()
-                .anyMessage().permitAll();
+	@Test
+	public void simpDestSubscribeMatchersNotMatch() {
+		messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpDestSubscribeMatchersMatch() {
-        message = MessageBuilder.fromMessage(message)
-                    .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE)
-                    .build();
+	@Test
+	public void simpDestSubscribeMatchersMatch() {
+		message = MessageBuilder
+				.fromMessage(message)
+				.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+						SimpMessageType.SUBSCRIBE).build();
 
-        messages
-                .simpSubscribeDestMatchers("location/**").denyAll()
-                .anyMessage().permitAll();
+		messages.simpSubscribeDestMatchers("location/**").denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void nullDestMatcherNotMatches() {
-         messages
-             .nullDestMatcher().denyAll()
-             .anyMessage().permitAll();
+	@Test
+	public void nullDestMatcherNotMatches() {
+		messages.nullDestMatcher().denyAll().anyMessage().permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void nullDestMatcherMatch() {
-        message = MessageBuilder
-                .withPayload("Hi")
-                .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT)
-                .build();
+	@Test
+	public void nullDestMatcherMatch() {
+		message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+						SimpMessageType.CONNECT).build();
 
-         messages
-             .nullDestMatcher().denyAll()
-             .anyMessage().permitAll();
+		messages.nullDestMatcher().denyAll().anyMessage().permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void simpTypeMatchersMatch() {
-         messages
-             .simpTypeMatchers(SimpMessageType.MESSAGE).denyAll()
-             .anyMessage().permitAll();
+	@Test
+	public void simpTypeMatchersMatch() {
+		messages.simpTypeMatchers(SimpMessageType.MESSAGE).denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void simpTypeMatchersMatchMulti() {
-         messages
-             .simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.MESSAGE).denyAll()
-             .anyMessage().permitAll();
+	@Test
+	public void simpTypeMatchersMatchMulti() {
+		messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.MESSAGE)
+				.denyAll().anyMessage().permitAll();
 
-        assertThat(getAttribute()).isEqualTo("denyAll");
-    }
+		assertThat(getAttribute()).isEqualTo("denyAll");
+	}
 
-    @Test
-    public void simpTypeMatchersNotMatch() {
-         messages
-             .simpTypeMatchers(SimpMessageType.CONNECT).denyAll()
-             .anyMessage().permitAll();
+	@Test
+	public void simpTypeMatchersNotMatch() {
+		messages.simpTypeMatchers(SimpMessageType.CONNECT).denyAll().anyMessage()
+				.permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    @Test
-    public void simpTypeMatchersNotMatchMulti() {
-         messages
-             .simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.DISCONNECT).denyAll()
-             .anyMessage().permitAll();
+	@Test
+	public void simpTypeMatchersNotMatchMulti() {
+		messages.simpTypeMatchers(SimpMessageType.CONNECT, SimpMessageType.DISCONNECT)
+				.denyAll().anyMessage().permitAll();
 
-        assertThat(getAttribute()).isEqualTo("permitAll");
-    }
+		assertThat(getAttribute()).isEqualTo("permitAll");
+	}
 
-    private String getAttribute() {
-        MessageSecurityMetadataSource source = messages.createMetadataSource();
-        Collection<ConfigAttribute> attrs = source.getAttributes(message);
-        if(attrs == null) {
-            return null;
-        }
-        assertThat(attrs.size()).isEqualTo(1);
-        return attrs.iterator().next().toString();
-    }
+	private String getAttribute() {
+		MessageSecurityMetadataSource source = messages.createMetadataSource();
+		Collection<ConfigAttribute> attrs = source.getAttributes(message);
+		if (attrs == null) {
+			return null;
+		}
+		assertThat(attrs.size()).isEqualTo(1);
+		return attrs.iterator().next().toString();
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java
index 4c8c8fa360..455220da51 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java
@@ -68,124 +68,127 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
 public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests {
-    AnnotationConfigWebApplicationContext context;
+	AnnotationConfigWebApplicationContext context;
 
-    TestingAuthenticationToken messageUser;
+	TestingAuthenticationToken messageUser;
 
-    CsrfToken token;
+	CsrfToken token;
 
-    String sessionAttr;
+	String sessionAttr;
 
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("header", "param", "token");
-        sessionAttr = "sessionAttr";
-        messageUser = new TestingAuthenticationToken("user","pass","ROLE_USER");
-    }
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("header", "param", "token");
+		sessionAttr = "sessionAttr";
+		messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
+	}
 
-    @After
-    public void cleanup() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void cleanup() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void securityMappings() {
-        loadConfig(WebSocketSecurityConfig.class);
+	@Test
+	public void securityMappings() {
+		loadConfig(WebSocketSecurityConfig.class);
 
-        clientInboundChannel().send(message("/user/queue/errors",SimpMessageType.SUBSCRIBE));
+		clientInboundChannel().send(
+				message("/user/queue/errors", SimpMessageType.SUBSCRIBE));
 
-        try {
-            clientInboundChannel().send(message("/denyAll", SimpMessageType.MESSAGE));
-            fail("Expected Exception");
-        } catch(MessageDeliveryException expected) {
-            assertThat(expected.getCause()).isInstanceOf(AccessDeniedException.class);
-        }
-    }
+		try {
+			clientInboundChannel().send(message("/denyAll", SimpMessageType.MESSAGE));
+			fail("Expected Exception");
+		}
+		catch (MessageDeliveryException expected) {
+			assertThat(expected.getCause()).isInstanceOf(AccessDeniedException.class);
+		}
+	}
 
+	private void loadConfig(Class<?>... configs) {
+		context = new AnnotationConfigWebApplicationContext();
+		context.register(configs);
+		context.register(WebSocketConfig.class, SyncExecutorConfig.class);
+		context.setServletConfig(new MockServletConfig());
+		context.refresh();
+	}
 
-    private void loadConfig(Class<?>... configs) {
-        context = new AnnotationConfigWebApplicationContext();
-        context.register(configs);
-        context.register(WebSocketConfig.class,SyncExecutorConfig.class);
-        context.setServletConfig(new MockServletConfig());
-        context.refresh();
-    }
+	private MessageChannel clientInboundChannel() {
+		return context.getBean("clientInboundChannel", MessageChannel.class);
+	}
 
-    private MessageChannel clientInboundChannel() {
-        return context.getBean("clientInboundChannel", MessageChannel.class);
-    }
+	private Message<String> message(String destination, SimpMessageType type) {
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type);
+		return message(headers, destination);
+	}
 
-    private Message<String> message(String destination, SimpMessageType type) {
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(type);
-        return message(headers, destination);
-    }
+	private Message<String> message(SimpMessageHeaderAccessor headers, String destination) {
+		headers.setSessionId("123");
+		headers.setSessionAttributes(new HashMap<String, Object>());
+		if (destination != null) {
+			headers.setDestination(destination);
+		}
+		if (messageUser != null) {
+			headers.setUser(messageUser);
+		}
+		return new GenericMessage<String>("hi", headers.getMessageHeaders());
+	}
 
-    private Message<String> message(SimpMessageHeaderAccessor headers, String destination) {
-        headers.setSessionId("123");
-        headers.setSessionAttributes(new HashMap<String, Object>());
-        if(destination != null) {
-            headers.setDestination(destination);
-        }
-        if(messageUser != null) {
-            headers.setUser(messageUser);
-        }
-        return new GenericMessage<String>("hi",headers.getMessageHeaders());
-    }
+	@Controller
+	static class MyController {
 
-    @Controller
-    static class MyController {
+		@MessageMapping("/authentication")
+		public void authentication(@AuthenticationPrincipal String un) {
+			// ... do something ...
+		}
+	}
 
-        @MessageMapping("/authentication")
-        public void authentication(@AuthenticationPrincipal String un) {
-            // ... do something ...
-        }
-    }
+	@Configuration
+	static class WebSocketSecurityConfig extends
+			AbstractSecurityWebSocketMessageBrokerConfigurer {
 
-    @Configuration
-    static class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
+		@Override
+		protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+			messages.nullDestMatcher().authenticated()
+					// <1>
+					.simpSubscribeDestMatchers("/user/queue/errors").permitAll()
+					// <2>
+					.simpDestMatchers("/app/**").hasRole("USER")
+					// <3>
+					.simpSubscribeDestMatchers("/user/**", "/topic/friends/*")
+					.hasRole("USER") // <4>
+					.simpTypeMatchers(MESSAGE, SUBSCRIBE).denyAll() // <5>
+					.anyMessage().denyAll(); // <6>
 
-        @Override
-        protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-            messages
-                    .nullDestMatcher().authenticated() // <1>
-                    .simpSubscribeDestMatchers("/user/queue/errors").permitAll() // <2>
-                    .simpDestMatchers("/app/**").hasRole("USER") // <3>
-                    .simpSubscribeDestMatchers("/user/**", "/topic/friends/*").hasRole("USER") // <4>
-                    .simpTypeMatchers(MESSAGE, SUBSCRIBE).denyAll() // <5>
-                    .anyMessage().denyAll(); // <6>
+		}
+	}
 
-        }
-    }
+	@Configuration
+	@EnableWebSocketMessageBroker
+	static class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
-    @Configuration
-    @EnableWebSocketMessageBroker
-    static class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+		public void registerStompEndpoints(StompEndpointRegistry registry) {
+			registry.addEndpoint("/chat").withSockJS();
+		}
 
-        public void registerStompEndpoints(StompEndpointRegistry registry) {
-            registry
-                    .addEndpoint("/chat")
-                    .withSockJS();
-        }
+		@Override
+		public void configureMessageBroker(MessageBrokerRegistry registry) {
+			registry.enableSimpleBroker("/queue/", "/topic/");
+			registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
+		}
 
-        @Override
-        public void configureMessageBroker(MessageBrokerRegistry registry) {
-            registry.enableSimpleBroker("/queue/", "/topic/");
-            registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
-        }
+		@Bean
+		public MyController myController() {
+			return new MyController();
+		}
+	}
 
-        @Bean
-        public MyController myController() {
-            return new MyController();
-        }
-    }
-
-    @Configuration
-    static class SyncExecutorConfig {
-        @Bean
-        public static SyncExecutorSubscribableChannelPostProcessor postProcessor() {
-            return new SyncExecutorSubscribableChannelPostProcessor();
-        }
-    }
+	@Configuration
+	static class SyncExecutorConfig {
+		@Bean
+		public static SyncExecutorSubscribableChannelPostProcessor postProcessor() {
+			return new SyncExecutorSubscribableChannelPostProcessor();
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
index 399e617d41..f13edd902e 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.config.annotation.web.socket;
 
-
 import org.junit.After;
 import org.junit.Before;
 
@@ -67,380 +66,387 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
 public class AbstractSecurityWebSocketMessageBrokerConfigurerTests {
-    AnnotationConfigWebApplicationContext context;
-
-    TestingAuthenticationToken messageUser;
-
-    CsrfToken token;
-
-    String sessionAttr;
-
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("header", "param", "token");
-        sessionAttr = "sessionAttr";
-        messageUser = new TestingAuthenticationToken("user","pass","ROLE_USER");
-    }
-
-    @After
-    public void cleanup() {
-        if(context != null) {
-            context.close();
-        }
-    }
-
-    @Test
-    public void simpleRegistryMappings() {
-        loadConfig(SockJsSecurityConfig.class);
-
-        clientInboundChannel().send(message("/permitAll"));
-
-        try {
-            clientInboundChannel().send(message("/denyAll"));
-            fail("Expected Exception");
-        } catch(MessageDeliveryException expected) {
-            assertThat(expected.getCause()).isInstanceOf(AccessDeniedException.class);
-        }
-    }
-
-    @Test
-    public void annonymousSupported() {
-        loadConfig(SockJsSecurityConfig.class);
-
-        messageUser = null;
-        clientInboundChannel().send(message("/permitAll"));
-    }
-
-    @Test
-    public void addsAuthenticationPrincipalResolver() throws InterruptedException {
-        loadConfig(SockJsSecurityConfig.class);
-
-        MessageChannel messageChannel = clientInboundChannel();
-        Message<String> message = message("/permitAll/authentication");
-        messageChannel.send(message);
-
-        assertThat(context.getBean(MyController.class).authenticationPrincipal).isEqualTo((String) messageUser.getPrincipal());
-    }
-
-    @Test
-    public void addsAuthenticationPrincipalResolverWhenNoAuthorization() throws InterruptedException {
-        loadConfig(NoInboundSecurityConfig.class);
-
-        MessageChannel messageChannel = clientInboundChannel();
-        Message<String> message = message("/permitAll/authentication");
-        messageChannel.send(message);
-
-        assertThat(context.getBean(MyController.class).authenticationPrincipal).isEqualTo((String) messageUser.getPrincipal());
-    }
-
-    @Test
-    public void addsCsrfProtectionWhenNoAuthorization() throws InterruptedException {
-        loadConfig(NoInboundSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/authentication");
-        MessageChannel messageChannel = clientInboundChannel();
-
-        try {
-            messageChannel.send(message);
-            fail("Expected Exception");
-        } catch(MessageDeliveryException success) {
-            assertThat(success.getCause()).isInstanceOf(MissingCsrfTokenException.class);
-        }
-    }
-
-    @Test
-    public void csrfProtectionForConnect() throws InterruptedException {
-        loadConfig(SockJsSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/authentication");
-        MessageChannel messageChannel = clientInboundChannel();
-
-        try {
-            messageChannel.send(message);
-            fail("Expected Exception");
-        } catch(MessageDeliveryException success) {
-            assertThat(success.getCause()).isInstanceOf(MissingCsrfTokenException.class);
-        }
-    }
-
-    @Test
-    public void csrfProtectionDisabledForConnect() throws InterruptedException {
-        loadConfig(CsrfDisabledSockJsSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/permitAll/connect");
-        MessageChannel messageChannel = clientInboundChannel();
-
-        messageChannel.send(message);
-    }
-
-    @Test
-    public void messagesConnectUseCsrfTokenHandshakeInterceptor() throws Exception {
-
-        loadConfig(SockJsSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/authentication");
-        MockHttpServletRequest request = sockjsHttpRequest("/chat");
-        HttpRequestHandler handler = handler(request);
-
-        handler.handleRequest(request, new MockHttpServletResponse());
-
-        assertHandshake(request);
-    }
-
-    @Test
-    public void messagesConnectUseCsrfTokenHandshakeInterceptorMultipleMappings() throws Exception {
-        loadConfig(SockJsSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/authentication");
-        MockHttpServletRequest request = sockjsHttpRequest("/other");
-        HttpRequestHandler handler = handler(request);
-
-        handler.handleRequest(request, new MockHttpServletResponse());
-
-        assertHandshake(request);
-    }
-
-    @Test
-    public void messagesConnectWebSocketUseCsrfTokenHandshakeInterceptor() throws Exception {
-        loadConfig(WebSocketSecurityConfig.class);
-
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        Message<?> message = message(headers, "/authentication");
-        MockHttpServletRequest request = websocketHttpRequest("/websocket");
-        HttpRequestHandler handler = handler(request);
-
-        handler.handleRequest(request, new MockHttpServletResponse());
-
-        assertHandshake(request);
-    }
-
-    private void assertHandshake(HttpServletRequest request) {
-        TestHandshakeHandler handshakeHandler = context.getBean(TestHandshakeHandler.class);
-        assertThat(handshakeHandler.attributes.get(CsrfToken.class.getName())).isSameAs(token);
-        assertThat(handshakeHandler.attributes.get(sessionAttr)).isEqualTo(request.getSession().getAttribute(sessionAttr));
-    }
-
-    private HttpRequestHandler handler(HttpServletRequest request) throws Exception {
-        HandlerMapping handlerMapping = context.getBean(HandlerMapping.class);
-        return (HttpRequestHandler) handlerMapping.getHandler(request).getHandler();
-    }
-
-    private MockHttpServletRequest websocketHttpRequest(String mapping) {
-        MockHttpServletRequest request = sockjsHttpRequest(mapping);
-        request.setRequestURI(mapping);
-        return request;
-    }
-
-    private MockHttpServletRequest sockjsHttpRequest(String mapping) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setMethod("GET");
-        request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/289/tpyx6mde/websocket");
-        request.setRequestURI(mapping + "/289/tpyx6mde/websocket");
-        request.getSession().setAttribute(sessionAttr,"sessionValue");
-
-        request.setAttribute(CsrfToken.class.getName(), token);
-        return request;
-    }
-
-    private Message<String> message(String destination) {
-        SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create();
-        return message(headers, destination);
-    }
-
-    private Message<String> message(SimpMessageHeaderAccessor headers, String destination) {
-        headers.setSessionId("123");
-        headers.setSessionAttributes(new HashMap<String, Object>());
-        if(destination != null) {
-            headers.setDestination(destination);
-        }
-        if(messageUser != null) {
-            headers.setUser(messageUser);
-        }
-        return new GenericMessage<String>("hi",headers.getMessageHeaders());
-    }
-
-    private MessageChannel clientInboundChannel() {
-        return context.getBean("clientInboundChannel", MessageChannel.class);
-    }
-
-    private void loadConfig(Class<?>... configs) {
-        context = new AnnotationConfigWebApplicationContext();
-        context.register(configs);
-        context.setServletConfig(new MockServletConfig());
-        context.refresh();
-    }
-
-
-    @Controller
-    static class MyController {
-
-        String authenticationPrincipal;
-        MyCustomArgument myCustomArgument;
-
-
-        @MessageMapping("/authentication")
-        public void authentication(@AuthenticationPrincipal String un) {
-            this.authenticationPrincipal = un;
-        }
-
-        @MessageMapping("/myCustom")
-        public void myCustom(MyCustomArgument myCustomArgument) {
-            this.myCustomArgument = myCustomArgument;
-        }
-    }
-
-    static class MyCustomArgument {
-        MyCustomArgument(String notDefaultConstr) {}
-    }
-
-    static class MyCustomArgumentResolver implements HandlerMethodArgumentResolver {
-
-        public boolean supportsParameter(MethodParameter parameter) {
-            return parameter.getParameterType().isAssignableFrom(MyCustomArgument.class);
-        }
-
-        public Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
-            return new MyCustomArgument("");
-        }
-    }
-
-    static class TestHandshakeHandler implements HandshakeHandler {
-        Map<String, Object> attributes;
-
-        public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
-            this.attributes = attributes;
-            if(wsHandler instanceof SockJsWebSocketHandler) {
-                // work around SPR-12716
-                SockJsWebSocketHandler sockJs = (SockJsWebSocketHandler) wsHandler;
-                WebSocketServerSockJsSession session = (WebSocketServerSockJsSession) ReflectionTestUtils.getField(sockJs, "sockJsSession");
-                this.attributes = session.getAttributes();
-            }
-            return true;
-        }
-    }
-
-    @Configuration
-    @EnableWebSocketMessageBroker
-    @Import(SyncExecutorConfig.class)
-    static class SockJsSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
-
-        public void registerStompEndpoints(StompEndpointRegistry registry) {
-            registry
-                    .addEndpoint("/other")
-                        .setHandshakeHandler(testHandshakeHandler())
-                        .withSockJS()
-                            .setInterceptors(new HttpSessionHandshakeInterceptor());
-
-            registry
-                    .addEndpoint("/chat")
-                        .setHandshakeHandler(testHandshakeHandler())
-                        .withSockJS()
-                            .setInterceptors(new HttpSessionHandshakeInterceptor());
-        }
-
-        @Override
-        protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-            messages
-                    .simpDestMatchers("/permitAll/**").permitAll()
-                    .anyMessage().denyAll();
-        }
-
-        @Override
-        public void configureMessageBroker(MessageBrokerRegistry registry) {
-            registry.enableSimpleBroker("/queue/", "/topic/");
-            registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
-        }
-
-        @Bean
-        public MyController myController() {
-            return new MyController();
-        }
-
-        @Bean
-        public TestHandshakeHandler testHandshakeHandler() {
-            return new TestHandshakeHandler();
-        }
-    }
-
-
-
-    @Configuration
-    @EnableWebSocketMessageBroker
-    @Import(SyncExecutorConfig.class)
-    static class NoInboundSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
-
-        public void registerStompEndpoints(StompEndpointRegistry registry) {
-            registry
-                    .addEndpoint("/other")
-                    .withSockJS()
-                    .setInterceptors(new HttpSessionHandshakeInterceptor());
-
-            registry
-                    .addEndpoint("/chat")
-                    .withSockJS()
-                    .setInterceptors(new HttpSessionHandshakeInterceptor());
-        }
-
-        @Override
-        protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-        }
-
-        @Override
-        public void configureMessageBroker(MessageBrokerRegistry registry) {
-            registry.enableSimpleBroker("/queue/", "/topic/");
-            registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
-        }
-
-        @Bean
-        public MyController myController() {
-            return new MyController();
-        }
-    }
-
-    @Configuration
-    static class CsrfDisabledSockJsSecurityConfig extends SockJsSecurityConfig {
-
-        @Override
-        protected boolean sameOriginDisabled() {
-            return true;
-        }
-    }
-
-    @Configuration
-    @EnableWebSocketMessageBroker
-    @Import(SyncExecutorConfig.class)
-    static class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
-
-        public void registerStompEndpoints(StompEndpointRegistry registry) {
-            registry
-                    .addEndpoint("/websocket")
-                        .setHandshakeHandler(testHandshakeHandler())
-                        .addInterceptors(new HttpSessionHandshakeInterceptor());
-        }
-
-        @Override
-        protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-            messages
-                    .simpDestMatchers("/permitAll/**").permitAll()
-                    .anyMessage().denyAll();
-        }
-
-        @Bean
-        public TestHandshakeHandler testHandshakeHandler() {
-            return new TestHandshakeHandler();
-        }
-    }
-
-    @Configuration
-    static class SyncExecutorConfig {
-        @Bean
-        public static SyncExecutorSubscribableChannelPostProcessor postProcessor() {
-            return new SyncExecutorSubscribableChannelPostProcessor();
-        }
-    }
+	AnnotationConfigWebApplicationContext context;
+
+	TestingAuthenticationToken messageUser;
+
+	CsrfToken token;
+
+	String sessionAttr;
+
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("header", "param", "token");
+		sessionAttr = "sessionAttr";
+		messageUser = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
+	}
+
+	@After
+	public void cleanup() {
+		if (context != null) {
+			context.close();
+		}
+	}
+
+	@Test
+	public void simpleRegistryMappings() {
+		loadConfig(SockJsSecurityConfig.class);
+
+		clientInboundChannel().send(message("/permitAll"));
+
+		try {
+			clientInboundChannel().send(message("/denyAll"));
+			fail("Expected Exception");
+		}
+		catch (MessageDeliveryException expected) {
+			assertThat(expected.getCause()).isInstanceOf(AccessDeniedException.class);
+		}
+	}
+
+	@Test
+	public void annonymousSupported() {
+		loadConfig(SockJsSecurityConfig.class);
+
+		messageUser = null;
+		clientInboundChannel().send(message("/permitAll"));
+	}
+
+	@Test
+	public void addsAuthenticationPrincipalResolver() throws InterruptedException {
+		loadConfig(SockJsSecurityConfig.class);
+
+		MessageChannel messageChannel = clientInboundChannel();
+		Message<String> message = message("/permitAll/authentication");
+		messageChannel.send(message);
+
+		assertThat(context.getBean(MyController.class).authenticationPrincipal)
+				.isEqualTo((String) messageUser.getPrincipal());
+	}
+
+	@Test
+	public void addsAuthenticationPrincipalResolverWhenNoAuthorization()
+			throws InterruptedException {
+		loadConfig(NoInboundSecurityConfig.class);
+
+		MessageChannel messageChannel = clientInboundChannel();
+		Message<String> message = message("/permitAll/authentication");
+		messageChannel.send(message);
+
+		assertThat(context.getBean(MyController.class).authenticationPrincipal)
+				.isEqualTo((String) messageUser.getPrincipal());
+	}
+
+	@Test
+	public void addsCsrfProtectionWhenNoAuthorization() throws InterruptedException {
+		loadConfig(NoInboundSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/authentication");
+		MessageChannel messageChannel = clientInboundChannel();
+
+		try {
+			messageChannel.send(message);
+			fail("Expected Exception");
+		}
+		catch (MessageDeliveryException success) {
+			assertThat(success.getCause()).isInstanceOf(MissingCsrfTokenException.class);
+		}
+	}
+
+	@Test
+	public void csrfProtectionForConnect() throws InterruptedException {
+		loadConfig(SockJsSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/authentication");
+		MessageChannel messageChannel = clientInboundChannel();
+
+		try {
+			messageChannel.send(message);
+			fail("Expected Exception");
+		}
+		catch (MessageDeliveryException success) {
+			assertThat(success.getCause()).isInstanceOf(MissingCsrfTokenException.class);
+		}
+	}
+
+	@Test
+	public void csrfProtectionDisabledForConnect() throws InterruptedException {
+		loadConfig(CsrfDisabledSockJsSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/permitAll/connect");
+		MessageChannel messageChannel = clientInboundChannel();
+
+		messageChannel.send(message);
+	}
+
+	@Test
+	public void messagesConnectUseCsrfTokenHandshakeInterceptor() throws Exception {
+
+		loadConfig(SockJsSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/authentication");
+		MockHttpServletRequest request = sockjsHttpRequest("/chat");
+		HttpRequestHandler handler = handler(request);
+
+		handler.handleRequest(request, new MockHttpServletResponse());
+
+		assertHandshake(request);
+	}
+
+	@Test
+	public void messagesConnectUseCsrfTokenHandshakeInterceptorMultipleMappings()
+			throws Exception {
+		loadConfig(SockJsSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/authentication");
+		MockHttpServletRequest request = sockjsHttpRequest("/other");
+		HttpRequestHandler handler = handler(request);
+
+		handler.handleRequest(request, new MockHttpServletResponse());
+
+		assertHandshake(request);
+	}
+
+	@Test
+	public void messagesConnectWebSocketUseCsrfTokenHandshakeInterceptor()
+			throws Exception {
+		loadConfig(WebSocketSecurityConfig.class);
+
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor
+				.create(SimpMessageType.CONNECT);
+		Message<?> message = message(headers, "/authentication");
+		MockHttpServletRequest request = websocketHttpRequest("/websocket");
+		HttpRequestHandler handler = handler(request);
+
+		handler.handleRequest(request, new MockHttpServletResponse());
+
+		assertHandshake(request);
+	}
+
+	private void assertHandshake(HttpServletRequest request) {
+		TestHandshakeHandler handshakeHandler = context
+				.getBean(TestHandshakeHandler.class);
+		assertThat(handshakeHandler.attributes.get(CsrfToken.class.getName())).isSameAs(
+				token);
+		assertThat(handshakeHandler.attributes.get(sessionAttr)).isEqualTo(
+				request.getSession().getAttribute(sessionAttr));
+	}
+
+	private HttpRequestHandler handler(HttpServletRequest request) throws Exception {
+		HandlerMapping handlerMapping = context.getBean(HandlerMapping.class);
+		return (HttpRequestHandler) handlerMapping.getHandler(request).getHandler();
+	}
+
+	private MockHttpServletRequest websocketHttpRequest(String mapping) {
+		MockHttpServletRequest request = sockjsHttpRequest(mapping);
+		request.setRequestURI(mapping);
+		return request;
+	}
+
+	private MockHttpServletRequest sockjsHttpRequest(String mapping) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		request.setAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE,
+				"/289/tpyx6mde/websocket");
+		request.setRequestURI(mapping + "/289/tpyx6mde/websocket");
+		request.getSession().setAttribute(sessionAttr, "sessionValue");
+
+		request.setAttribute(CsrfToken.class.getName(), token);
+		return request;
+	}
+
+	private Message<String> message(String destination) {
+		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create();
+		return message(headers, destination);
+	}
+
+	private Message<String> message(SimpMessageHeaderAccessor headers, String destination) {
+		headers.setSessionId("123");
+		headers.setSessionAttributes(new HashMap<String, Object>());
+		if (destination != null) {
+			headers.setDestination(destination);
+		}
+		if (messageUser != null) {
+			headers.setUser(messageUser);
+		}
+		return new GenericMessage<String>("hi", headers.getMessageHeaders());
+	}
+
+	private MessageChannel clientInboundChannel() {
+		return context.getBean("clientInboundChannel", MessageChannel.class);
+	}
+
+	private void loadConfig(Class<?>... configs) {
+		context = new AnnotationConfigWebApplicationContext();
+		context.register(configs);
+		context.setServletConfig(new MockServletConfig());
+		context.refresh();
+	}
+
+	@Controller
+	static class MyController {
+
+		String authenticationPrincipal;
+		MyCustomArgument myCustomArgument;
+
+		@MessageMapping("/authentication")
+		public void authentication(@AuthenticationPrincipal String un) {
+			this.authenticationPrincipal = un;
+		}
+
+		@MessageMapping("/myCustom")
+		public void myCustom(MyCustomArgument myCustomArgument) {
+			this.myCustomArgument = myCustomArgument;
+		}
+	}
+
+	static class MyCustomArgument {
+		MyCustomArgument(String notDefaultConstr) {
+		}
+	}
+
+	static class MyCustomArgumentResolver implements HandlerMethodArgumentResolver {
+
+		public boolean supportsParameter(MethodParameter parameter) {
+			return parameter.getParameterType().isAssignableFrom(MyCustomArgument.class);
+		}
+
+		public Object resolveArgument(MethodParameter parameter, Message<?> message)
+				throws Exception {
+			return new MyCustomArgument("");
+		}
+	}
+
+	static class TestHandshakeHandler implements HandshakeHandler {
+		Map<String, Object> attributes;
+
+		public boolean doHandshake(ServerHttpRequest request,
+				ServerHttpResponse response, WebSocketHandler wsHandler,
+				Map<String, Object> attributes) throws HandshakeFailureException {
+			this.attributes = attributes;
+			if (wsHandler instanceof SockJsWebSocketHandler) {
+				// work around SPR-12716
+				SockJsWebSocketHandler sockJs = (SockJsWebSocketHandler) wsHandler;
+				WebSocketServerSockJsSession session = (WebSocketServerSockJsSession) ReflectionTestUtils
+						.getField(sockJs, "sockJsSession");
+				this.attributes = session.getAttributes();
+			}
+			return true;
+		}
+	}
+
+	@Configuration
+	@EnableWebSocketMessageBroker
+	@Import(SyncExecutorConfig.class)
+	static class SockJsSecurityConfig extends
+			AbstractSecurityWebSocketMessageBrokerConfigurer {
+
+		public void registerStompEndpoints(StompEndpointRegistry registry) {
+			registry.addEndpoint("/other").setHandshakeHandler(testHandshakeHandler())
+					.withSockJS().setInterceptors(new HttpSessionHandshakeInterceptor());
+
+			registry.addEndpoint("/chat").setHandshakeHandler(testHandshakeHandler())
+					.withSockJS().setInterceptors(new HttpSessionHandshakeInterceptor());
+		}
+
+		@Override
+		protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+			messages.simpDestMatchers("/permitAll/**").permitAll().anyMessage().denyAll();
+		}
+
+		@Override
+		public void configureMessageBroker(MessageBrokerRegistry registry) {
+			registry.enableSimpleBroker("/queue/", "/topic/");
+			registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
+		}
+
+		@Bean
+		public MyController myController() {
+			return new MyController();
+		}
+
+		@Bean
+		public TestHandshakeHandler testHandshakeHandler() {
+			return new TestHandshakeHandler();
+		}
+	}
+
+	@Configuration
+	@EnableWebSocketMessageBroker
+	@Import(SyncExecutorConfig.class)
+	static class NoInboundSecurityConfig extends
+			AbstractSecurityWebSocketMessageBrokerConfigurer {
+
+		public void registerStompEndpoints(StompEndpointRegistry registry) {
+			registry.addEndpoint("/other").withSockJS()
+					.setInterceptors(new HttpSessionHandshakeInterceptor());
+
+			registry.addEndpoint("/chat").withSockJS()
+					.setInterceptors(new HttpSessionHandshakeInterceptor());
+		}
+
+		@Override
+		protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+		}
+
+		@Override
+		public void configureMessageBroker(MessageBrokerRegistry registry) {
+			registry.enableSimpleBroker("/queue/", "/topic/");
+			registry.setApplicationDestinationPrefixes("/permitAll", "/denyAll");
+		}
+
+		@Bean
+		public MyController myController() {
+			return new MyController();
+		}
+	}
+
+	@Configuration
+	static class CsrfDisabledSockJsSecurityConfig extends SockJsSecurityConfig {
+
+		@Override
+		protected boolean sameOriginDisabled() {
+			return true;
+		}
+	}
+
+	@Configuration
+	@EnableWebSocketMessageBroker
+	@Import(SyncExecutorConfig.class)
+	static class WebSocketSecurityConfig extends
+			AbstractSecurityWebSocketMessageBrokerConfigurer {
+
+		public void registerStompEndpoints(StompEndpointRegistry registry) {
+			registry.addEndpoint("/websocket")
+					.setHandshakeHandler(testHandshakeHandler())
+					.addInterceptors(new HttpSessionHandshakeInterceptor());
+		}
+
+		@Override
+		protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+			messages.simpDestMatchers("/permitAll/**").permitAll().anyMessage().denyAll();
+		}
+
+		@Bean
+		public TestHandshakeHandler testHandshakeHandler() {
+			return new TestHandshakeHandler();
+		}
+	}
+
+	@Configuration
+	static class SyncExecutorConfig {
+		@Bean
+		public static SyncExecutorSubscribableChannelPostProcessor postProcessor() {
+			return new SyncExecutorSubscribableChannelPostProcessor();
+		}
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
index f3582ebc89..6e8f9d65e3 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/SyncExecutorSubscribableChannelPostProcessor.java
@@ -24,17 +24,19 @@ import org.springframework.messaging.support.ExecutorSubscribableChannel;
  */
 public class SyncExecutorSubscribableChannelPostProcessor implements BeanPostProcessor {
 
-    public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-        if(bean instanceof ExecutorSubscribableChannel) {
-            ExecutorSubscribableChannel original = (ExecutorSubscribableChannel) bean;
-            ExecutorSubscribableChannel channel = new ExecutorSubscribableChannel();
-            channel.setInterceptors(original.getInterceptors());
-            return channel;
-        }
-        return bean;
-    }
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+			throws BeansException {
+		if (bean instanceof ExecutorSubscribableChannel) {
+			ExecutorSubscribableChannel original = (ExecutorSubscribableChannel) bean;
+			ExecutorSubscribableChannel channel = new ExecutorSubscribableChannel();
+			channel.setInterceptors(original.getInterceptors());
+			return channel;
+		}
+		return bean;
+	}
 
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        return bean;
-    }
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
+		return bean;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
index 43c97f9b09..0c132eabef 100644
--- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
@@ -21,61 +21,63 @@ import org.springframework.security.util.FieldUtils;
  * @author Luke Taylor
  */
 public class AuthenticationManagerBeanDefinitionParserTests {
-    private static final String CONTEXT =
-              "<authentication-manager id='am'>" +
-              "    <authentication-provider>" +
-              "        <user-service>" +
-              "            <user name='bob' password='bobspassword' authorities='ROLE_A,ROLE_B' />" +
-              "        </user-service>" +
-              "    </authentication-provider>" +
-              "</authentication-manager>";
-    private AbstractXmlApplicationContext appContext;
+	private static final String CONTEXT = "<authentication-manager id='am'>"
+			+ "    <authentication-provider>"
+			+ "        <user-service>"
+			+ "            <user name='bob' password='bobspassword' authorities='ROLE_A,ROLE_B' />"
+			+ "        </user-service>" + "    </authentication-provider>"
+			+ "</authentication-manager>";
+	private AbstractXmlApplicationContext appContext;
 
-    @Test
-    // SEC-1225
-    public void providersAreRegisteredAsTopLevelBeans() throws Exception {
-        setContext(CONTEXT);
-        assertEquals(1, appContext.getBeansOfType(AuthenticationProvider.class).size());
-    }
+	@Test
+	// SEC-1225
+	public void providersAreRegisteredAsTopLevelBeans() throws Exception {
+		setContext(CONTEXT);
+		assertEquals(1, appContext.getBeansOfType(AuthenticationProvider.class).size());
+	}
 
-    @Test
-    public void eventsArePublishedByDefault() throws Exception {
-        setContext(CONTEXT);
-        AuthListener listener = new AuthListener();
-        appContext.addApplicationListener(listener);
+	@Test
+	public void eventsArePublishedByDefault() throws Exception {
+		setContext(CONTEXT);
+		AuthListener listener = new AuthListener();
+		appContext.addApplicationListener(listener);
 
-        ProviderManager pm = (ProviderManager) appContext.getBeansOfType(ProviderManager.class).values().toArray()[0];
-        Object eventPublisher = FieldUtils.getFieldValue(pm, "eventPublisher");
-        assertNotNull(eventPublisher);
-        assertTrue(eventPublisher instanceof DefaultAuthenticationEventPublisher);
+		ProviderManager pm = (ProviderManager) appContext
+				.getBeansOfType(ProviderManager.class).values().toArray()[0];
+		Object eventPublisher = FieldUtils.getFieldValue(pm, "eventPublisher");
+		assertNotNull(eventPublisher);
+		assertTrue(eventPublisher instanceof DefaultAuthenticationEventPublisher);
 
-        pm.authenticate(new UsernamePasswordAuthenticationToken("bob", "bobspassword"));
-        assertEquals(1, listener.events.size());
-    }
+		pm.authenticate(new UsernamePasswordAuthenticationToken("bob", "bobspassword"));
+		assertEquals(1, listener.events.size());
+	}
 
-    @Test
-    public void credentialsAreClearedByDefault() throws Exception {
-        setContext(CONTEXT);
-        ProviderManager pm = (ProviderManager) appContext.getBeansOfType(ProviderManager.class).values().toArray()[0];
-        assertTrue(pm.isEraseCredentialsAfterAuthentication());
-    }
+	@Test
+	public void credentialsAreClearedByDefault() throws Exception {
+		setContext(CONTEXT);
+		ProviderManager pm = (ProviderManager) appContext
+				.getBeansOfType(ProviderManager.class).values().toArray()[0];
+		assertTrue(pm.isEraseCredentialsAfterAuthentication());
+	}
 
-    @Test
-    public void clearCredentialsPropertyIsRespected() throws Exception {
-        setContext("<authentication-manager erase-credentials='false'/>");
-        ProviderManager pm = (ProviderManager) appContext.getBeansOfType(ProviderManager.class).values().toArray()[0];
-        assertFalse(pm.isEraseCredentialsAfterAuthentication());
-    }
+	@Test
+	public void clearCredentialsPropertyIsRespected() throws Exception {
+		setContext("<authentication-manager erase-credentials='false'/>");
+		ProviderManager pm = (ProviderManager) appContext
+				.getBeansOfType(ProviderManager.class).values().toArray()[0];
+		assertFalse(pm.isEraseCredentialsAfterAuthentication());
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 
-    private static class AuthListener implements ApplicationListener<AbstractAuthenticationEvent> {
-        List<AbstractAuthenticationEvent> events = new ArrayList<AbstractAuthenticationEvent>();
+	private static class AuthListener implements
+			ApplicationListener<AbstractAuthenticationEvent> {
+		List<AbstractAuthenticationEvent> events = new ArrayList<AbstractAuthenticationEvent>();
 
-        public void onApplicationEvent(AbstractAuthenticationEvent event) {
-            events.add(event);
-        }
-    }
+		public void onApplicationEvent(AbstractAuthenticationEvent event) {
+			events.add(event);
+		}
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java
index d88dde9e13..a53c853874 100644
--- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParserTests.java
@@ -24,166 +24,167 @@ import java.util.List;
  * @author Luke Taylor
  */
 public class AuthenticationProviderBeanDefinitionParserTests {
-    private AbstractXmlApplicationContext appContext;
-    private UsernamePasswordAuthenticationToken bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
+	private AbstractXmlApplicationContext appContext;
+	private UsernamePasswordAuthenticationToken bob = new UsernamePasswordAuthenticationToken(
+			"bob", "bobspassword");
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+	}
 
-    @Test
-    public void worksWithEmbeddedUserService() {
-        setContext(" <authentication-provider>" +
-                "        <user-service>" +
-                "            <user name='bob' password='bobspassword' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void worksWithEmbeddedUserService() {
+		setContext(" <authentication-provider>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='bobspassword' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
+		getProvider().authenticate(bob);
+	}
 
-    @Test
-    public void externalUserServiceRefWorks() throws Exception {
-        appContext = new InMemoryXmlApplicationContext(
-                "    <authentication-manager>" +
-                "        <authentication-provider user-service-ref='myUserService' />" +
-                "    </authentication-manager>" +
-                "    <user-service id='myUserService'>" +
-                "       <user name='bob' password='bobspassword' authorities='ROLE_A' />" +
-                "    </user-service>");
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void externalUserServiceRefWorks() throws Exception {
+		appContext = new InMemoryXmlApplicationContext(
+				"    <authentication-manager>"
+						+ "        <authentication-provider user-service-ref='myUserService' />"
+						+ "    </authentication-manager>"
+						+ "    <user-service id='myUserService'>"
+						+ "       <user name='bob' password='bobspassword' authorities='ROLE_A' />"
+						+ "    </user-service>");
+		getProvider().authenticate(bob);
+	}
 
-    @Test
-    public void providerWithBCryptPasswordEncoderWorks() throws Exception {
-        setContext(" <authentication-provider>" +
-                "        <password-encoder hash='bcrypt'/>" +
-                "        <user-service>" +
-                "            <user name='bob' password='$2a$05$dRmjl1T05J7rvCPD2NgsHesCEJHww3pdmesUhjM3PD4m/gaEYyx/G' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
+	@Test
+	public void providerWithBCryptPasswordEncoderWorks() throws Exception {
+		setContext(" <authentication-provider>"
+				+ "        <password-encoder hash='bcrypt'/>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='$2a$05$dRmjl1T05J7rvCPD2NgsHesCEJHww3pdmesUhjM3PD4m/gaEYyx/G' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
 
-        getProvider().authenticate(bob);
-    }
+		getProvider().authenticate(bob);
+	}
 
-    @Test(expected=BeanDefinitionParsingException.class)
-    public void bCryptAndSaltSourceRaisesException() throws Exception {
-        appContext = new InMemoryXmlApplicationContext("" +
-                " <authentication-manager>" +
-                "    <authentication-provider>" +
-                "        <password-encoder hash='bcrypt'>" +
-                "            <salt-source ref='saltSource'/>" +
-                "        </password-encoder>" +
-                "        <user-service>" +
-                "            <user name='bob' password='$2a$05$dRmjl1T05J7rvCPD2NgsHesCEJHww3pdmesUhjM3PD4m/gaEYyx/G' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>" +
-                " </authentication-manager>" +
-                " <b:bean id='saltSource'  class='" + ReflectionSaltSource.class.getName() +"'>" +
-                "     <b:property name='userPropertyToUse' value='username'/>" +
-                " </b:bean>");
-    }
-    @Test
-    public void providerWithMd5PasswordEncoderWorks() throws Exception {
-        setContext(" <authentication-provider>" +
-                "        <password-encoder hash='md5'/>" +
-                "        <user-service>" +
-                "            <user name='bob' password='12b141f35d58b8b3a46eea65e6ac179e' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
+	@Test(expected = BeanDefinitionParsingException.class)
+	public void bCryptAndSaltSourceRaisesException() throws Exception {
+		appContext = new InMemoryXmlApplicationContext(
+				""
+						+ " <authentication-manager>"
+						+ "    <authentication-provider>"
+						+ "        <password-encoder hash='bcrypt'>"
+						+ "            <salt-source ref='saltSource'/>"
+						+ "        </password-encoder>"
+						+ "        <user-service>"
+						+ "            <user name='bob' password='$2a$05$dRmjl1T05J7rvCPD2NgsHesCEJHww3pdmesUhjM3PD4m/gaEYyx/G' authorities='ROLE_A' />"
+						+ "        </user-service>" + "    </authentication-provider>"
+						+ " </authentication-manager>"
+						+ " <b:bean id='saltSource'  class='"
+						+ ReflectionSaltSource.class.getName() + "'>"
+						+ "     <b:property name='userPropertyToUse' value='username'/>"
+						+ " </b:bean>");
+	}
 
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void providerWithMd5PasswordEncoderWorks() throws Exception {
+		setContext(" <authentication-provider>"
+				+ "        <password-encoder hash='md5'/>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='12b141f35d58b8b3a46eea65e6ac179e' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
 
-    @Test
-    public void providerWithShaPasswordEncoderWorks() throws Exception {
-        setContext(" <authentication-provider>" +
-                "        <password-encoder hash='{sha}'/>" +
-                "        <user-service>" +
-                "            <user name='bob' password='{SSHA}PpuEwfdj7M1rs0C2W4ssSM2XEN/Y6S5U' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
+		getProvider().authenticate(bob);
+	}
 
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void providerWithShaPasswordEncoderWorks() throws Exception {
+		setContext(" <authentication-provider>"
+				+ "        <password-encoder hash='{sha}'/>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='{SSHA}PpuEwfdj7M1rs0C2W4ssSM2XEN/Y6S5U' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
 
-    @Test
-    public void providerWithSha256PasswordEncoderIsSupported() throws Exception {
-        setContext(" <authentication-provider>" +
-                "        <password-encoder hash='sha-256'/>" +
-                "        <user-service>" +
-                "            <user name='bob' password='notused' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
+		getProvider().authenticate(bob);
+	}
 
-        ShaPasswordEncoder encoder = (ShaPasswordEncoder) FieldUtils.getFieldValue(getProvider(), "passwordEncoder");
-        assertEquals("SHA-256", encoder.getAlgorithm());
-    }
+	@Test
+	public void providerWithSha256PasswordEncoderIsSupported() throws Exception {
+		setContext(" <authentication-provider>"
+				+ "        <password-encoder hash='sha-256'/>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='notused' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
 
-    @Test
-    public void passwordIsBase64EncodedWhenBase64IsEnabled() throws Exception {
-        setContext(" <authentication-provider>" +
-                "        <password-encoder hash='md5' base64='true'/>" +
-                "        <user-service>" +
-                "            <user name='bob' password='ErFB811YuLOkbupl5qwXng==' authorities='ROLE_A' />" +
-                "        </user-service>" +
-                "    </authentication-provider>");
+		ShaPasswordEncoder encoder = (ShaPasswordEncoder) FieldUtils.getFieldValue(
+				getProvider(), "passwordEncoder");
+		assertEquals("SHA-256", encoder.getAlgorithm());
+	}
 
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void passwordIsBase64EncodedWhenBase64IsEnabled() throws Exception {
+		setContext(" <authentication-provider>"
+				+ "        <password-encoder hash='md5' base64='true'/>"
+				+ "        <user-service>"
+				+ "            <user name='bob' password='ErFB811YuLOkbupl5qwXng==' authorities='ROLE_A' />"
+				+ "        </user-service>" + "    </authentication-provider>");
 
-    @Test
-    public void externalUserServicePasswordEncoderAndSaltSourceWork() throws Exception {
-        appContext = new InMemoryXmlApplicationContext(
-                "    <authentication-manager>" +
-                "      <authentication-provider user-service-ref='customUserService'>" +
-                "        <password-encoder ref='customPasswordEncoder'>" +
-                "            <salt-source ref='saltSource'/>" +
-                "        </password-encoder>" +
-                "      </authentication-provider>" +
-                "    </authentication-manager>" +
+		getProvider().authenticate(bob);
+	}
 
-                "    <b:bean id='customPasswordEncoder' " +
-                            "class='org.springframework.security.authentication.encoding.Md5PasswordEncoder'/>" +
-                "    <b:bean id='saltSource' " +
-                "           class='" + ReflectionSaltSource.class.getName() +"'>" +
-                "         <b:property name='userPropertyToUse' value='username'/>" +
-                "    </b:bean>" +
-                "    <b:bean id='customUserService' " +
-                "           class='org.springframework.security.provisioning.InMemoryUserDetailsManager'>" +
-                "        <b:constructor-arg>" +
-                "            <b:props>" +
-                "                <b:prop key='bob'>f117f0862384e9497ff4f470e3522606,ROLE_A</b:prop>" +
-                "            </b:props>" +
-                "        </b:constructor-arg>" +
-                "    </b:bean>");
-        getProvider().authenticate(bob);
-    }
+	@Test
+	public void externalUserServicePasswordEncoderAndSaltSourceWork() throws Exception {
+		appContext = new InMemoryXmlApplicationContext(
+				"    <authentication-manager>"
+						+ "      <authentication-provider user-service-ref='customUserService'>"
+						+ "        <password-encoder ref='customPasswordEncoder'>"
+						+ "            <salt-source ref='saltSource'/>"
+						+ "        </password-encoder>"
+						+ "      </authentication-provider>"
+						+ "    </authentication-manager>"
+						+
 
-    // SEC-1466
-    @Test(expected=BeanDefinitionParsingException.class)
-    public void exernalProviderDoesNotSupportChildElements() throws Exception {
-        appContext = new InMemoryXmlApplicationContext(
-                "    <authentication-manager>" +
-                "      <authentication-provider ref='aProvider'> " +
-                "        <password-encoder ref='customPasswordEncoder'/>" +
-                "      </authentication-provider>" +
-                "    </authentication-manager>" +
-                "    <b:bean id='aProvider' class='org.springframework.security.authentication.TestingAuthenticationProvider'/>" +
-                "    <b:bean id='customPasswordEncoder' " +
-                "        class='org.springframework.security.authentication.encoding.Md5PasswordEncoder'/>");
-    }
+						"    <b:bean id='customPasswordEncoder' "
+						+ "class='org.springframework.security.authentication.encoding.Md5PasswordEncoder'/>"
+						+ "    <b:bean id='saltSource' "
+						+ "           class='"
+						+ ReflectionSaltSource.class.getName()
+						+ "'>"
+						+ "         <b:property name='userPropertyToUse' value='username'/>"
+						+ "    </b:bean>"
+						+ "    <b:bean id='customUserService' "
+						+ "           class='org.springframework.security.provisioning.InMemoryUserDetailsManager'>"
+						+ "        <b:constructor-arg>"
+						+ "            <b:props>"
+						+ "                <b:prop key='bob'>f117f0862384e9497ff4f470e3522606,ROLE_A</b:prop>"
+						+ "            </b:props>" + "        </b:constructor-arg>"
+						+ "    </b:bean>");
+		getProvider().authenticate(bob);
+	}
 
-    private AuthenticationProvider getProvider() {
-        List<AuthenticationProvider> providers =
-                ((ProviderManager)appContext.getBean(BeanIds.AUTHENTICATION_MANAGER)).getProviders();
+	// SEC-1466
+	@Test(expected = BeanDefinitionParsingException.class)
+	public void exernalProviderDoesNotSupportChildElements() throws Exception {
+		appContext = new InMemoryXmlApplicationContext(
+				"    <authentication-manager>"
+						+ "      <authentication-provider ref='aProvider'> "
+						+ "        <password-encoder ref='customPasswordEncoder'/>"
+						+ "      </authentication-provider>"
+						+ "    </authentication-manager>"
+						+ "    <b:bean id='aProvider' class='org.springframework.security.authentication.TestingAuthenticationProvider'/>"
+						+ "    <b:bean id='customPasswordEncoder' "
+						+ "        class='org.springframework.security.authentication.encoding.Md5PasswordEncoder'/>");
+	}
 
-        return providers.get(0);
-    }
+	private AuthenticationProvider getProvider() {
+		List<AuthenticationProvider> providers = ((ProviderManager) appContext
+				.getBean(BeanIds.AUTHENTICATION_MANAGER)).getProviders();
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext("<authentication-manager>" + context + "</authentication-manager>");
-    }
+		return providers.get(0);
+	}
+
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext("<authentication-manager>"
+				+ context + "</authentication-manager>");
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java
index e47639cff3..687691d7dc 100644
--- a/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParserTests.java
@@ -25,116 +25,127 @@ import org.w3c.dom.Element;
  * @author Luke Taylor
  */
 public class JdbcUserServiceBeanDefinitionParserTests {
-    private static String USER_CACHE_XML = "<b:bean id='userCache' class='org.springframework.security.authentication.dao.MockUserCache'/>";
+	private static String USER_CACHE_XML = "<b:bean id='userCache' class='org.springframework.security.authentication.dao.MockUserCache'/>";
 
-    private static String DATA_SOURCE =
-            "    <b:bean id='populator' class='org.springframework.security.config.DataSourcePopulator'>" +
-            "        <b:property name='dataSource' ref='dataSource'/>" +
-            "    </b:bean>" +
+	private static String DATA_SOURCE = "    <b:bean id='populator' class='org.springframework.security.config.DataSourcePopulator'>"
+			+ "        <b:property name='dataSource' ref='dataSource'/>"
+			+ "    </b:bean>"
+			+
 
-            "    <b:bean id='dataSource' class='org.springframework.security.TestDataSource'>" +
-            "        <b:constructor-arg value='jdbcnamespaces'/>" +
-            "    </b:bean>";
+			"    <b:bean id='dataSource' class='org.springframework.security.TestDataSource'>"
+			+ "        <b:constructor-arg value='jdbcnamespaces'/>" + "    </b:bean>";
 
-    private InMemoryXmlApplicationContext appContext;
+	private InMemoryXmlApplicationContext appContext;
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+	}
 
-    @Test
-    public void beanNameIsCorrect() throws Exception {
-        assertEquals(JdbcUserDetailsManager.class.getName(), new JdbcUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class)));
-    }
+	@Test
+	public void beanNameIsCorrect() throws Exception {
+		assertEquals(JdbcUserDetailsManager.class.getName(),
+				new JdbcUserServiceBeanDefinitionParser()
+						.getBeanClassName(mock(Element.class)));
+	}
 
-    @Test
-    public void validUsernameIsFound() {
-        setContext("<jdbc-user-service data-source-ref='dataSource'/>" + DATA_SOURCE);
-        JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean(BeanIds.USER_DETAILS_SERVICE);
-        assertNotNull(mgr.loadUserByUsername("rod"));
-    }
+	@Test
+	public void validUsernameIsFound() {
+		setContext("<jdbc-user-service data-source-ref='dataSource'/>" + DATA_SOURCE);
+		JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext
+				.getBean(BeanIds.USER_DETAILS_SERVICE);
+		assertNotNull(mgr.loadUserByUsername("rod"));
+	}
 
-    @Test
-    public void beanIdIsParsedCorrectly() {
-        setContext("<jdbc-user-service id='myUserService' data-source-ref='dataSource'/>" + DATA_SOURCE);
-        assertTrue(appContext.getBean("myUserService") instanceof JdbcUserDetailsManager);
-    }
+	@Test
+	public void beanIdIsParsedCorrectly() {
+		setContext("<jdbc-user-service id='myUserService' data-source-ref='dataSource'/>"
+				+ DATA_SOURCE);
+		assertTrue(appContext.getBean("myUserService") instanceof JdbcUserDetailsManager);
+	}
 
-    @Test
-    public void usernameAndAuthorityQueriesAreParsedCorrectly() throws Exception {
-        String userQuery = "select username, password, true from users where username = ?";
-        String authoritiesQuery = "select username, authority from authorities where username = ? and 1 = 1";
-        setContext("<jdbc-user-service id='myUserService' " +
-                "data-source-ref='dataSource' " +
-                "users-by-username-query='"+ userQuery +"' " +
-                "authorities-by-username-query='" + authoritiesQuery + "'/>" + DATA_SOURCE);
-        JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService");
-        assertEquals(userQuery, FieldUtils.getFieldValue(mgr, "usersByUsernameQuery"));
-        assertEquals(authoritiesQuery, FieldUtils.getFieldValue(mgr, "authoritiesByUsernameQuery"));
-        assertTrue(mgr.loadUserByUsername("rod") != null);
-    }
+	@Test
+	public void usernameAndAuthorityQueriesAreParsedCorrectly() throws Exception {
+		String userQuery = "select username, password, true from users where username = ?";
+		String authoritiesQuery = "select username, authority from authorities where username = ? and 1 = 1";
+		setContext("<jdbc-user-service id='myUserService' "
+				+ "data-source-ref='dataSource' " + "users-by-username-query='"
+				+ userQuery + "' " + "authorities-by-username-query='" + authoritiesQuery
+				+ "'/>" + DATA_SOURCE);
+		JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext
+				.getBean("myUserService");
+		assertEquals(userQuery, FieldUtils.getFieldValue(mgr, "usersByUsernameQuery"));
+		assertEquals(authoritiesQuery,
+				FieldUtils.getFieldValue(mgr, "authoritiesByUsernameQuery"));
+		assertTrue(mgr.loadUserByUsername("rod") != null);
+	}
 
-    @Test
-    public void groupQueryIsParsedCorrectly() throws Exception {
-        setContext("<jdbc-user-service id='myUserService' " +
-                "data-source-ref='dataSource' " +
-                "group-authorities-by-username-query='blah blah'/>" + DATA_SOURCE);
-        JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService");
-        assertEquals("blah blah", FieldUtils.getFieldValue(mgr, "groupAuthoritiesByUsernameQuery"));
-        assertTrue((Boolean)FieldUtils.getFieldValue(mgr, "enableGroups"));
-    }
+	@Test
+	public void groupQueryIsParsedCorrectly() throws Exception {
+		setContext("<jdbc-user-service id='myUserService' "
+				+ "data-source-ref='dataSource' "
+				+ "group-authorities-by-username-query='blah blah'/>" + DATA_SOURCE);
+		JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext
+				.getBean("myUserService");
+		assertEquals("blah blah",
+				FieldUtils.getFieldValue(mgr, "groupAuthoritiesByUsernameQuery"));
+		assertTrue((Boolean) FieldUtils.getFieldValue(mgr, "enableGroups"));
+	}
 
-    @Test
-    public void cacheRefIsparsedCorrectly() {
-        setContext("<jdbc-user-service id='myUserService' cache-ref='userCache' data-source-ref='dataSource'/>"
-                + DATA_SOURCE +USER_CACHE_XML);
-        CachingUserDetailsService cachingUserService =
-            (CachingUserDetailsService) appContext.getBean("myUserService" + AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX);
-        assertSame(cachingUserService.getUserCache(), appContext.getBean("userCache"));
-        assertNotNull(cachingUserService.loadUserByUsername("rod"));
-        assertNotNull(cachingUserService.loadUserByUsername("rod"));
-    }
+	@Test
+	public void cacheRefIsparsedCorrectly() {
+		setContext("<jdbc-user-service id='myUserService' cache-ref='userCache' data-source-ref='dataSource'/>"
+				+ DATA_SOURCE + USER_CACHE_XML);
+		CachingUserDetailsService cachingUserService = (CachingUserDetailsService) appContext
+				.getBean("myUserService"
+						+ AbstractUserDetailsServiceBeanDefinitionParser.CACHING_SUFFIX);
+		assertSame(cachingUserService.getUserCache(), appContext.getBean("userCache"));
+		assertNotNull(cachingUserService.loadUserByUsername("rod"));
+		assertNotNull(cachingUserService.loadUserByUsername("rod"));
+	}
 
-    @Test
-    public void isSupportedByAuthenticationProviderElement() {
-        setContext(
-                "<authentication-manager>" +
-                "  <authentication-provider>" +
-                "    <jdbc-user-service data-source-ref='dataSource'/>" +
-                "  </authentication-provider>" +
-                "</authentication-manager>" + DATA_SOURCE);
-        AuthenticationManager mgr = (AuthenticationManager) appContext.getBean(BeanIds.AUTHENTICATION_MANAGER);
-        mgr.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala"));
-    }
+	@Test
+	public void isSupportedByAuthenticationProviderElement() {
+		setContext("<authentication-manager>" + "  <authentication-provider>"
+				+ "    <jdbc-user-service data-source-ref='dataSource'/>"
+				+ "  </authentication-provider>" + "</authentication-manager>"
+				+ DATA_SOURCE);
+		AuthenticationManager mgr = (AuthenticationManager) appContext
+				.getBean(BeanIds.AUTHENTICATION_MANAGER);
+		mgr.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala"));
+	}
 
-    @Test
-    public void cacheIsInjectedIntoAuthenticationProvider() {
-        setContext(
-                "<authentication-manager>" +
-                "  <authentication-provider>" +
-                "    <jdbc-user-service cache-ref='userCache' data-source-ref='dataSource'/>" +
-                "  </authentication-provider>" +
-                "</authentication-manager>" + DATA_SOURCE + USER_CACHE_XML);
-        ProviderManager mgr = (ProviderManager) appContext.getBean(BeanIds.AUTHENTICATION_MANAGER);
-        DaoAuthenticationProvider provider = (DaoAuthenticationProvider) mgr.getProviders().get(0);
-        assertSame(provider.getUserCache(), appContext.getBean("userCache"));
-        provider.authenticate(new UsernamePasswordAuthenticationToken("rod","koala"));
-        assertNotNull("Cache should contain user after authentication", provider.getUserCache().getUserFromCache("rod"));
-    }
+	@Test
+	public void cacheIsInjectedIntoAuthenticationProvider() {
+		setContext("<authentication-manager>"
+				+ "  <authentication-provider>"
+				+ "    <jdbc-user-service cache-ref='userCache' data-source-ref='dataSource'/>"
+				+ "  </authentication-provider>" + "</authentication-manager>"
+				+ DATA_SOURCE + USER_CACHE_XML);
+		ProviderManager mgr = (ProviderManager) appContext
+				.getBean(BeanIds.AUTHENTICATION_MANAGER);
+		DaoAuthenticationProvider provider = (DaoAuthenticationProvider) mgr
+				.getProviders().get(0);
+		assertSame(provider.getUserCache(), appContext.getBean("userCache"));
+		provider.authenticate(new UsernamePasswordAuthenticationToken("rod", "koala"));
+		assertNotNull("Cache should contain user after authentication", provider
+				.getUserCache().getUserFromCache("rod"));
+	}
 
-    @Test
-    public void rolePrefixIsUsedWhenSet() {
-        setContext("<jdbc-user-service id='myUserService' role-prefix='PREFIX_' data-source-ref='dataSource'/>" + DATA_SOURCE);
-        JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext.getBean("myUserService");
-        UserDetails rod = mgr.loadUserByUsername("rod");
-        assertTrue(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains("PREFIX_ROLE_SUPERVISOR"));
-    }
+	@Test
+	public void rolePrefixIsUsedWhenSet() {
+		setContext("<jdbc-user-service id='myUserService' role-prefix='PREFIX_' data-source-ref='dataSource'/>"
+				+ DATA_SOURCE);
+		JdbcUserDetailsManager mgr = (JdbcUserDetailsManager) appContext
+				.getBean("myUserService");
+		UserDetails rod = mgr.loadUserByUsername("rod");
+		assertTrue(AuthorityUtils.authorityListToSet(rod.getAuthorities()).contains(
+				"PREFIX_ROLE_SUPERVISOR"));
+	}
 
-
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java
index 1d55b9f5ac..fc48ac663c 100644
--- a/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParserTests.java
@@ -15,115 +15,117 @@ import org.junit.After;
  * @author Luke Taylor
  */
 public class UserServiceBeanDefinitionParserTests {
-    private AbstractXmlApplicationContext appContext;
+	private AbstractXmlApplicationContext appContext;
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+	}
 
-    @Test
-    public void userServiceWithValidPropertiesFileWorksSuccessfully() {
-        setContext(
-                "<user-service id='service' " +
-                        "properties='classpath:org/springframework/security/config/users.properties'/>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        userService.loadUserByUsername("bob");
-        userService.loadUserByUsername("joe");
-    }
+	@Test
+	public void userServiceWithValidPropertiesFileWorksSuccessfully() {
+		setContext("<user-service id='service' "
+				+ "properties='classpath:org/springframework/security/config/users.properties'/>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		userService.loadUserByUsername("bob");
+		userService.loadUserByUsername("joe");
+	}
 
-    @Test
-    public void userServiceWithEmbeddedUsersWorksSuccessfully() {
-        setContext(
-                "<user-service id='service'>" +
-                "    <user name='joe' password='joespassword' authorities='ROLE_A'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        userService.loadUserByUsername("joe");
-    }
+	@Test
+	public void userServiceWithEmbeddedUsersWorksSuccessfully() {
+		setContext("<user-service id='service'>"
+				+ "    <user name='joe' password='joespassword' authorities='ROLE_A'/>"
+				+ "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		userService.loadUserByUsername("joe");
+	}
 
-    @Test
-    public void namePasswordAndAuthoritiesSupportPlaceholders() {
-        System.setProperty("principal.name", "joe");
-        System.setProperty("principal.pass", "joespassword");
-        System.setProperty("principal.authorities", "ROLE_A,ROLE_B");
-        setContext(
-                "<b:bean class='org.springframework.beans.factory.config.PropertyPlaceholderConfigurer'/>" +
-                "<user-service id='service'>" +
-                "    <user name='${principal.name}' password='${principal.pass}' authorities='${principal.authorities}'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        UserDetails joe = userService.loadUserByUsername("joe");
-        assertEquals("joespassword", joe.getPassword());
-        assertEquals(2, joe.getAuthorities().size());
-    }
+	@Test
+	public void namePasswordAndAuthoritiesSupportPlaceholders() {
+		System.setProperty("principal.name", "joe");
+		System.setProperty("principal.pass", "joespassword");
+		System.setProperty("principal.authorities", "ROLE_A,ROLE_B");
+		setContext("<b:bean class='org.springframework.beans.factory.config.PropertyPlaceholderConfigurer'/>"
+				+ "<user-service id='service'>"
+				+ "    <user name='${principal.name}' password='${principal.pass}' authorities='${principal.authorities}'/>"
+				+ "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		UserDetails joe = userService.loadUserByUsername("joe");
+		assertEquals("joespassword", joe.getPassword());
+		assertEquals(2, joe.getAuthorities().size());
+	}
 
-    @Test
-    public void embeddedUsersWithNoPasswordIsGivenGeneratedValue() {
-        setContext(
-                "<user-service id='service'>" +
-                "    <user name='joe' authorities='ROLE_A'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        UserDetails joe = userService.loadUserByUsername("joe");
-        assertTrue(joe.getPassword().length() > 0);
-        Long.parseLong(joe.getPassword());
-    }
+	@Test
+	public void embeddedUsersWithNoPasswordIsGivenGeneratedValue() {
+		setContext("<user-service id='service'>"
+				+ "    <user name='joe' authorities='ROLE_A'/>" + "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		UserDetails joe = userService.loadUserByUsername("joe");
+		assertTrue(joe.getPassword().length() > 0);
+		Long.parseLong(joe.getPassword());
+	}
 
-    @Test
-    public void worksWithOpenIDUrlsAsNames() {
-        setContext(
-                "<user-service id='service'>" +
-                "    <user name='http://joe.myopenid.com/' authorities='ROLE_A'/>" +
-                "    <user name='https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9' authorities='ROLE_A'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        assertEquals("http://joe.myopenid.com/", userService.loadUserByUsername("http://joe.myopenid.com/").getUsername());
-        assertEquals("https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9",
-                userService.loadUserByUsername("https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9").getUsername());
-    }
+	@Test
+	public void worksWithOpenIDUrlsAsNames() {
+		setContext("<user-service id='service'>"
+				+ "    <user name='http://joe.myopenid.com/' authorities='ROLE_A'/>"
+				+ "    <user name='https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9' authorities='ROLE_A'/>"
+				+ "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		assertEquals("http://joe.myopenid.com/",
+				userService.loadUserByUsername("http://joe.myopenid.com/").getUsername());
+		assertEquals(
+				"https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9",
+				userService.loadUserByUsername(
+						"https://www.google.com/accounts/o8/id?id=MPtOaenBIk5yzW9n7n9")
+						.getUsername());
+	}
 
-    @Test
-    public void disabledAndEmbeddedFlagsAreSupported() {
-        setContext(
-                "<user-service id='service'>" +
-                "    <user name='joe' password='joespassword' authorities='ROLE_A' locked='true'/>" +
-                "    <user name='Bob' password='bobspassword' authorities='ROLE_A' disabled='true'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        UserDetails joe = userService.loadUserByUsername("joe");
-        assertFalse(joe.isAccountNonLocked());
-        // Check case-sensitive lookup SEC-1432
-        UserDetails bob = userService.loadUserByUsername("Bob");
-        assertFalse(bob.isEnabled());
-    }
+	@Test
+	public void disabledAndEmbeddedFlagsAreSupported() {
+		setContext("<user-service id='service'>"
+				+ "    <user name='joe' password='joespassword' authorities='ROLE_A' locked='true'/>"
+				+ "    <user name='Bob' password='bobspassword' authorities='ROLE_A' disabled='true'/>"
+				+ "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		UserDetails joe = userService.loadUserByUsername("joe");
+		assertFalse(joe.isAccountNonLocked());
+		// Check case-sensitive lookup SEC-1432
+		UserDetails bob = userService.loadUserByUsername("Bob");
+		assertFalse(bob.isEnabled());
+	}
 
-    @Test(expected=FatalBeanException.class)
-    public void userWithBothPropertiesAndEmbeddedUsersThrowsException() {
-        setContext(
-                "<user-service id='service' properties='doesntmatter.props'>" +
-                "    <user name='joe' password='joespassword' authorities='ROLE_A'/>" +
-                "</user-service>");
-        UserDetailsService userService = (UserDetailsService) appContext.getBean("service");
-        userService.loadUserByUsername("Joe");
-    }
+	@Test(expected = FatalBeanException.class)
+	public void userWithBothPropertiesAndEmbeddedUsersThrowsException() {
+		setContext("<user-service id='service' properties='doesntmatter.props'>"
+				+ "    <user name='joe' password='joespassword' authorities='ROLE_A'/>"
+				+ "</user-service>");
+		UserDetailsService userService = (UserDetailsService) appContext
+				.getBean("service");
+		userService.loadUserByUsername("Joe");
+	}
 
-    @Test(expected= FatalBeanException.class)
-    public void multipleTopLevelUseWithoutIdThrowsException() {
-        setContext(
-                "<user-service properties='classpath:org/springframework/security/config/users.properties'/>" +
-                "<user-service properties='classpath:org/springframework/security/config/users.properties'/>");
+	@Test(expected = FatalBeanException.class)
+	public void multipleTopLevelUseWithoutIdThrowsException() {
+		setContext("<user-service properties='classpath:org/springframework/security/config/users.properties'/>"
+				+ "<user-service properties='classpath:org/springframework/security/config/users.properties'/>");
 
-    }
+	}
 
-    @Test(expected= FatalBeanException.class)
-    public void userServiceWithMissingPropertiesFileThrowsException() {
-        setContext("<user-service id='service' properties='classpath:doesntexist.properties'/>");
-    }
+	@Test(expected = FatalBeanException.class)
+	public void userServiceWithMissingPropertiesFileThrowsException() {
+		setContext("<user-service id='service' properties='classpath:doesntexist.properties'/>");
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java b/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java
index 3a20fedb02..a81cc6e69c 100644
--- a/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java
+++ b/config/src/test/java/org/springframework/security/config/http/DefaultFilterChainValidatorTests.java
@@ -46,49 +46,56 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultFilterChainValidatorTests {
-    private DefaultFilterChainValidator validator;
-    private FilterChainProxy fcp;
-    @Mock
-    private Log logger;
-    @Mock
-    private DefaultFilterInvocationSecurityMetadataSource metadataSource;
-    @Mock
-    private AccessDecisionManager accessDecisionManager;
+	private DefaultFilterChainValidator validator;
+	private FilterChainProxy fcp;
+	@Mock
+	private Log logger;
+	@Mock
+	private DefaultFilterInvocationSecurityMetadataSource metadataSource;
+	@Mock
+	private AccessDecisionManager accessDecisionManager;
 
-    private FilterSecurityInterceptor fsi;
+	private FilterSecurityInterceptor fsi;
 
-    @Before
-    public void setUp() throws Exception {
-        AnonymousAuthenticationFilter aaf = new AnonymousAuthenticationFilter("anonymous");
-        fsi = new FilterSecurityInterceptor();
-        fsi.setAccessDecisionManager(accessDecisionManager);
-        fsi.setSecurityMetadataSource(metadataSource);
-        AuthenticationEntryPoint authenticationEntryPoint = new LoginUrlAuthenticationEntryPoint("/login");
-        ExceptionTranslationFilter etf = new ExceptionTranslationFilter(authenticationEntryPoint);
-        DefaultSecurityFilterChain securityChain = new DefaultSecurityFilterChain(AnyRequestMatcher.INSTANCE, aaf, etf, fsi);
-        fcp = new FilterChainProxy(securityChain);
-        validator = new DefaultFilterChainValidator();
-        Whitebox.setInternalState(validator, "logger", logger);
-    }
+	@Before
+	public void setUp() throws Exception {
+		AnonymousAuthenticationFilter aaf = new AnonymousAuthenticationFilter("anonymous");
+		fsi = new FilterSecurityInterceptor();
+		fsi.setAccessDecisionManager(accessDecisionManager);
+		fsi.setSecurityMetadataSource(metadataSource);
+		AuthenticationEntryPoint authenticationEntryPoint = new LoginUrlAuthenticationEntryPoint(
+				"/login");
+		ExceptionTranslationFilter etf = new ExceptionTranslationFilter(
+				authenticationEntryPoint);
+		DefaultSecurityFilterChain securityChain = new DefaultSecurityFilterChain(
+				AnyRequestMatcher.INSTANCE, aaf, etf, fsi);
+		fcp = new FilterChainProxy(securityChain);
+		validator = new DefaultFilterChainValidator();
+		Whitebox.setInternalState(validator, "logger", logger);
+	}
 
-    // SEC-1878
-    @SuppressWarnings("unchecked")
-    @Test
-    public void validateCheckLoginPageIsntProtectedThrowsIllegalArgumentException() {
-        IllegalArgumentException toBeThrown = new IllegalArgumentException("failed to eval expression");
-        doThrow(toBeThrown).when(accessDecisionManager).decide(any(Authentication.class), anyObject(), any(Collection.class));
-        validator.validate(fcp);
-        verify(logger).info("Unable to check access to the login page to determine if anonymous access is allowed. This might be an error, but can happen under normal circumstances.", toBeThrown);
-    }
+	// SEC-1878
+	@SuppressWarnings("unchecked")
+	@Test
+	public void validateCheckLoginPageIsntProtectedThrowsIllegalArgumentException() {
+		IllegalArgumentException toBeThrown = new IllegalArgumentException(
+				"failed to eval expression");
+		doThrow(toBeThrown).when(accessDecisionManager).decide(any(Authentication.class),
+				anyObject(), any(Collection.class));
+		validator.validate(fcp);
+		verify(logger)
+				.info("Unable to check access to the login page to determine if anonymous access is allowed. This might be an error, but can happen under normal circumstances.",
+						toBeThrown);
+	}
 
-    // SEC-1957
-    @Test
-    public void validateCustomMetadataSource() {
-        FilterInvocationSecurityMetadataSource customMetaDataSource = mock(FilterInvocationSecurityMetadataSource.class);
-        fsi.setSecurityMetadataSource(customMetaDataSource);
+	// SEC-1957
+	@Test
+	public void validateCustomMetadataSource() {
+		FilterInvocationSecurityMetadataSource customMetaDataSource = mock(FilterInvocationSecurityMetadataSource.class);
+		fsi.setSecurityMetadataSource(customMetaDataSource);
 
-        validator.validate(fcp);
+		validator.validate(fcp);
 
-        verify(customMetaDataSource).getAttributes(any());
-    }
+		verify(customMetaDataSource).getAttributes(any());
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java
index 1a089baec1..6f0f56da46 100644
--- a/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/http/FilterSecurityMetadataSourceBeanDefinitionParserTests.java
@@ -26,87 +26,89 @@ import org.springframework.security.web.access.intercept.DefaultFilterInvocation
  * @author Luke Taylor
  */
 public class FilterSecurityMetadataSourceBeanDefinitionParserTests {
-    private AbstractXmlApplicationContext appContext;
+	private AbstractXmlApplicationContext appContext;
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-            appContext = null;
-        }
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+			appContext = null;
+		}
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 
+	@Test
+	public void parsingMinimalConfigurationIsSuccessful() {
+		setContext("<filter-security-metadata-source id='fids' use-expressions='false'>"
+				+ "   <intercept-url pattern='/**' access='ROLE_A'/>"
+				+ "</filter-security-metadata-source>");
+		DefaultFilterInvocationSecurityMetadataSource fids = (DefaultFilterInvocationSecurityMetadataSource) appContext
+				.getBean("fids");
+		Collection<ConfigAttribute> cad = fids.getAttributes(createFilterInvocation(
+				"/anything", "GET"));
+		assertNotNull(cad);
+		assertTrue(cad.contains(new SecurityConfig("ROLE_A")));
+	}
 
-    @Test
-    public void parsingMinimalConfigurationIsSuccessful() {
-        setContext(
-                "<filter-security-metadata-source id='fids' use-expressions='false'>" +
-                "   <intercept-url pattern='/**' access='ROLE_A'/>" +
-                "</filter-security-metadata-source>");
-        DefaultFilterInvocationSecurityMetadataSource fids = (DefaultFilterInvocationSecurityMetadataSource) appContext.getBean("fids");
-        Collection<ConfigAttribute> cad = fids.getAttributes(createFilterInvocation("/anything", "GET"));
-        assertNotNull(cad);
-        assertTrue(cad.contains(new SecurityConfig("ROLE_A")));
-    }
+	@Test
+	public void expressionsAreSupported() {
+		setContext("<filter-security-metadata-source id='fids'>"
+				+ "   <intercept-url pattern='/**' access=\"hasRole('ROLE_A')\" />"
+				+ "</filter-security-metadata-source>");
 
-    @Test
-    public void expressionsAreSupported() {
-        setContext(
-                "<filter-security-metadata-source id='fids'>" +
-                "   <intercept-url pattern='/**' access=\"hasRole('ROLE_A')\" />" +
-                "</filter-security-metadata-source>");
+		ExpressionBasedFilterInvocationSecurityMetadataSource fids = (ExpressionBasedFilterInvocationSecurityMetadataSource) appContext
+				.getBean("fids");
+		ConfigAttribute[] cad = fids.getAttributes(
+				createFilterInvocation("/anything", "GET")).toArray(
+				new ConfigAttribute[0]);
+		assertEquals(1, cad.length);
+		assertEquals("hasRole('ROLE_A')", cad[0].toString());
+	}
 
-        ExpressionBasedFilterInvocationSecurityMetadataSource fids =
-            (ExpressionBasedFilterInvocationSecurityMetadataSource) appContext.getBean("fids");
-        ConfigAttribute[] cad = fids.getAttributes(createFilterInvocation("/anything", "GET")).toArray(new ConfigAttribute[0]);
-        assertEquals(1, cad.length);
-        assertEquals("hasRole('ROLE_A')", cad[0].toString());
-    }
+	// SEC-1201
+	@Test
+	public void interceptUrlsSupportPropertyPlaceholders() {
+		System.setProperty("secure.url", "/secure");
+		System.setProperty("secure.role", "ROLE_A");
+		setContext("<b:bean class='org.springframework.beans.factory.config.PropertyPlaceholderConfigurer'/>"
+				+ "<filter-security-metadata-source id='fids' use-expressions='false'>"
+				+ "   <intercept-url pattern='${secure.url}' access='${secure.role}'/>"
+				+ "</filter-security-metadata-source>");
+		DefaultFilterInvocationSecurityMetadataSource fids = (DefaultFilterInvocationSecurityMetadataSource) appContext
+				.getBean("fids");
+		Collection<ConfigAttribute> cad = fids.getAttributes(createFilterInvocation(
+				"/secure", "GET"));
+		assertNotNull(cad);
+		assertEquals(1, cad.size());
+		assertTrue(cad.contains(new SecurityConfig("ROLE_A")));
+	}
 
-    // SEC-1201
-    @Test
-    public void interceptUrlsSupportPropertyPlaceholders() {
-        System.setProperty("secure.url", "/secure");
-        System.setProperty("secure.role", "ROLE_A");
-        setContext(
-                "<b:bean class='org.springframework.beans.factory.config.PropertyPlaceholderConfigurer'/>" +
-                "<filter-security-metadata-source id='fids' use-expressions='false'>" +
-                "   <intercept-url pattern='${secure.url}' access='${secure.role}'/>" +
-                "</filter-security-metadata-source>");
-        DefaultFilterInvocationSecurityMetadataSource fids = (DefaultFilterInvocationSecurityMetadataSource) appContext.getBean("fids");
-        Collection<ConfigAttribute> cad = fids.getAttributes(createFilterInvocation("/secure", "GET"));
-        assertNotNull(cad);
-        assertEquals(1, cad.size());
-        assertTrue(cad.contains(new SecurityConfig("ROLE_A")));
-    }
+	@Test
+	public void parsingWithinFilterSecurityInterceptorIsSuccessful() {
+		setContext("<http auto-config='true' use-expressions='false'/>"
+				+ "<b:bean id='fsi' class='org.springframework.security.web.access.intercept.FilterSecurityInterceptor' autowire='byType'>"
+				+ "   <b:property name='securityMetadataSource'>"
+				+ "       <filter-security-metadata-source use-expressions='false'>"
+				+ "           <intercept-url pattern='/secure/extreme/**' access='ROLE_SUPERVISOR'/>"
+				+ "           <intercept-url pattern='/secure/**' access='ROLE_USER'/>"
+				+ "           <intercept-url pattern='/**' access='ROLE_USER'/>"
+				+ "       </filter-security-metadata-source>" + "   </b:property>"
+				+ "   <b:property name='authenticationManager' ref='"
+				+ BeanIds.AUTHENTICATION_MANAGER + "'/>" + "</b:bean>"
+				+ ConfigTestUtils.AUTH_PROVIDER_XML);
+	}
 
-    @Test
-    public void parsingWithinFilterSecurityInterceptorIsSuccessful() {
-        setContext(
-                "<http auto-config='true' use-expressions='false'/>" +
-                "<b:bean id='fsi' class='org.springframework.security.web.access.intercept.FilterSecurityInterceptor' autowire='byType'>" +
-                "   <b:property name='securityMetadataSource'>" +
-                "       <filter-security-metadata-source use-expressions='false'>" +
-                "           <intercept-url pattern='/secure/extreme/**' access='ROLE_SUPERVISOR'/>" +
-                "           <intercept-url pattern='/secure/**' access='ROLE_USER'/>" +
-                "           <intercept-url pattern='/**' access='ROLE_USER'/>" +
-                "       </filter-security-metadata-source>" +
-                "   </b:property>" +
-                "   <b:property name='authenticationManager' ref='" + BeanIds.AUTHENTICATION_MANAGER +"'/>"+
-                "</b:bean>" + ConfigTestUtils.AUTH_PROVIDER_XML);
-    }
+	private FilterInvocation createFilterInvocation(String path, String method) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI(null);
+		request.setMethod(method);
 
-    private FilterInvocation createFilterInvocation(String path, String method) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI(null);
-        request.setMethod(method);
+		request.setServletPath(path);
 
-        request.setServletPath(path);
-
-        return new FilterInvocation(request, new MockHttpServletResponse(), new MockFilterChain());
-    }
+		return new FilterInvocation(request, new MockHttpServletResponse(),
+				new MockFilterChain());
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java
index 006ef5aa56..f73c9345a1 100644
--- a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java
+++ b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java
@@ -56,105 +56,102 @@ import org.springframework.util.ReflectionUtils;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ReflectionUtils.class, Method.class})
+@PrepareForTest({ ReflectionUtils.class, Method.class })
 public class SessionManagementConfigServlet31Tests {
-    private static final String XML_AUTHENTICATION_MANAGER =
-            "<authentication-manager>"+
-            "  <authentication-provider>"+
-            "    <user-service>"+
-            "      <user name='user' password='password' authorities='ROLE_USER' />" +
-            "    </user-service>"+
-            "  </authentication-provider>"+
-            "</authentication-manager>";
+	private static final String XML_AUTHENTICATION_MANAGER = "<authentication-manager>"
+			+ "  <authentication-provider>" + "    <user-service>"
+			+ "      <user name='user' password='password' authorities='ROLE_USER' />"
+			+ "    </user-service>" + "  </authentication-provider>"
+			+ "</authentication-manager>";
 
-    @Mock
-    Method method;
+	@Mock
+	Method method;
 
-    MockHttpServletRequest request;
-    MockHttpServletResponse response;
-    MockFilterChain chain;
+	MockHttpServletRequest request;
+	MockHttpServletResponse response;
+	MockFilterChain chain;
 
-    ConfigurableApplicationContext context;
+	ConfigurableApplicationContext context;
 
-    Filter springSecurityFilterChain;
+	Filter springSecurityFilterChain;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        chain = new MockFilterChain();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		chain = new MockFilterChain();
+	}
 
-    @After
-    public void teardown() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void teardown() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void changeSessionIdDefaultsInServlet31Plus() throws Exception {
-        spy(ReflectionUtils.class);
-        Method method = mock(Method.class);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession();
-        request.setServletPath("/login");
-        request.setMethod("POST");
-        request.setParameter("username", "user");
-        request.setParameter("password", "password");
-        when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId")).thenReturn(method);
+	@Test
+	public void changeSessionIdDefaultsInServlet31Plus() throws Exception {
+		spy(ReflectionUtils.class);
+		Method method = mock(Method.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.getSession();
+		request.setServletPath("/login");
+		request.setMethod("POST");
+		request.setParameter("username", "user");
+		request.setParameter("password", "password");
+		when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId"))
+				.thenReturn(method);
 
-        loadContext("<http>\n" +
-                "        <form-login/>\n" +
-                "        <session-management/>\n" +
-                "        <csrf disabled='true'/>\n" +
-                "    </http>" +
-                XML_AUTHENTICATION_MANAGER);
+		loadContext("<http>\n" + "        <form-login/>\n"
+				+ "        <session-management/>\n" + "        <csrf disabled='true'/>\n"
+				+ "    </http>" + XML_AUTHENTICATION_MANAGER);
 
-        springSecurityFilterChain.doFilter(request,response,chain);
+		springSecurityFilterChain.doFilter(request, response, chain);
 
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
-    }
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
+	}
 
+	@Test
+	public void changeSessionId() throws Exception {
+		spy(ReflectionUtils.class);
+		Method method = mock(Method.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.getSession();
+		request.setServletPath("/login");
+		request.setMethod("POST");
+		request.setParameter("username", "user");
+		request.setParameter("password", "password");
+		when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId"))
+				.thenReturn(method);
 
-    @Test
-    public void changeSessionId() throws Exception {
-        spy(ReflectionUtils.class);
-        Method method = mock(Method.class);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession();
-        request.setServletPath("/login");
-        request.setMethod("POST");
-        request.setParameter("username", "user");
-        request.setParameter("password", "password");
-        when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId")).thenReturn(method);
+		loadContext("<http>\n"
+				+ "        <form-login/>\n"
+				+ "        <session-management session-fixation-protection='changeSessionId'/>\n"
+				+ "        <csrf disabled='true'/>\n" + "    </http>"
+				+ XML_AUTHENTICATION_MANAGER);
 
-        loadContext("<http>\n" +
-                "        <form-login/>\n" +
-                "        <session-management session-fixation-protection='changeSessionId'/>\n" +
-                "        <csrf disabled='true'/>\n" +
-                "    </http>" +
-                XML_AUTHENTICATION_MANAGER);
+		springSecurityFilterChain.doFilter(request, response, chain);
 
-        springSecurityFilterChain.doFilter(request,response,chain);
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
+	}
 
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), any(HttpServletRequest.class));
-    }
+	private void loadContext(String context) {
+		this.context = new InMemoryXmlApplicationContext(context);
+		this.springSecurityFilterChain = this.context.getBean(
+				"springSecurityFilterChain", Filter.class);
+	}
 
-    private void loadContext(String context) {
-        this.context = new InMemoryXmlApplicationContext(context);
-        this.springSecurityFilterChain = this.context.getBean("springSecurityFilterChain",Filter.class);
-    }
+	private void login(Authentication auth) {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(
+				request, response);
+		repo.loadContext(requestResponseHolder);
 
-    private void login(Authentication auth) {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(requestResponseHolder);
-
-        SecurityContextImpl securityContextImpl = new SecurityContextImpl();
-        securityContextImpl.setAuthentication(auth);
-        repo.saveContext(securityContextImpl, requestResponseHolder.getRequest(), requestResponseHolder.getResponse());
-    }
+		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
+		securityContextImpl.setAuthentication(auth);
+		repo.saveContext(securityContextImpl, requestResponseHolder.getRequest(),
+				requestResponseHolder.getResponse());
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java
index c4b372ee43..94407dc07e 100644
--- a/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java
+++ b/config/src/test/java/org/springframework/security/config/http/WebConfigUtilsTest.java
@@ -24,19 +24,20 @@ import org.powermock.core.classloader.annotations.PrepareOnlyThisForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.springframework.beans.factory.xml.ParserContext;
 
-
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(ParserContext.class)
 public class WebConfigUtilsTest {
-    public final static String URL = "/url";
+	public final static String URL = "/url";
 
-    @Mock
-    private ParserContext parserContext;
+	@Mock
+	private ParserContext parserContext;
 
-    // SEC-1980
-    @Test
-    public void validateHttpRedirectSpELNoParserWarning() {
-        WebConfigUtils.validateHttpRedirect("#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}", parserContext, "fakeSource");
-        verifyZeroInteractions(parserContext);
-    }
+	// SEC-1980
+	@Test
+	public void validateHttpRedirectSpELNoParserWarning() {
+		WebConfigUtils.validateHttpRedirect(
+				"#{T(org.springframework.security.config.http.WebConfigUtilsTest).URL}",
+				parserContext, "fakeSource");
+		verifyZeroInteractions(parserContext);
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java
index 2f5e415bda..d1c1f2271b 100644
--- a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java
@@ -49,391 +49,406 @@ import org.springframework.security.util.FieldUtils;
  * @author Luke Taylor
  */
 public class GlobalMethodSecurityBeanDefinitionParserTests {
-    private final UsernamePasswordAuthenticationToken bob = new UsernamePasswordAuthenticationToken("bob","bobspassword");
+	private final UsernamePasswordAuthenticationToken bob = new UsernamePasswordAuthenticationToken(
+			"bob", "bobspassword");
 
-    private AbstractXmlApplicationContext appContext;
+	private AbstractXmlApplicationContext appContext;
 
-    private BusinessService target;
+	private BusinessService target;
 
-    public void loadContext() {
-        setContext(
-                "<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>" +
-                "<global-method-security order='1001' proxy-target-class='false' >" +
-                "    <protect-pointcut expression='execution(* *.someUser*(..))' access='ROLE_USER'/>" +
-                "    <protect-pointcut expression='execution(* *.someAdmin*(..))' access='ROLE_ADMIN'/>" +
-                "</global-method-security>" + ConfigTestUtils.AUTH_PROVIDER_XML
-                    );
-        target = (BusinessService) appContext.getBean("target");
-   }
+	public void loadContext() {
+		setContext("<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>"
+				+ "<global-method-security order='1001' proxy-target-class='false' >"
+				+ "    <protect-pointcut expression='execution(* *.someUser*(..))' access='ROLE_USER'/>"
+				+ "    <protect-pointcut expression='execution(* *.someAdmin*(..))' access='ROLE_ADMIN'/>"
+				+ "</global-method-security>" + ConfigTestUtils.AUTH_PROVIDER_XML);
+		target = (BusinessService) appContext.getBean("target");
+	}
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-            appContext = null;
-        }
-        SecurityContextHolder.clearContext();
-        target = null;
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+			appContext = null;
+		}
+		SecurityContextHolder.clearContext();
+		target = null;
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
-        loadContext();
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
+		loadContext();
 
-        target.someUserMethod1();
-    }
+		target.someUserMethod1();
+	}
 
-    @Test
-    public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
-        loadContext();
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password");
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
+		loadContext();
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"user", "password");
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someUserMethod1();
+		target.someUserMethod1();
 
-        // SEC-1213. Check the order
-        Advisor[] advisors = ((Advised)target).getAdvisors();
-        assertEquals(1, advisors.length);
-        assertEquals(1001, ((MethodSecurityMetadataSourceAdvisor)advisors[0]).getOrder());
-    }
+		// SEC-1213. Check the order
+		Advisor[] advisors = ((Advised) target).getAdvisors();
+		assertEquals(1, advisors.length);
+		assertEquals(1001, ((MethodSecurityMetadataSourceAdvisor) advisors[0]).getOrder());
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
-        loadContext();
-        TestingAuthenticationToken token = new TestingAuthenticationToken("Test", "Password", "ROLE_SOMEOTHERROLE");
-        token.setAuthenticated(true);
+	@Test(expected = AccessDeniedException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
+		loadContext();
+		TestingAuthenticationToken token = new TestingAuthenticationToken("Test",
+				"Password", "ROLE_SOMEOTHERROLE");
+		token.setAuthenticated(true);
 
-        SecurityContextHolder.getContext().setAuthentication(token);
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someAdminMethod();
-    }
+		target.someAdminMethod();
+	}
 
-    @Test
-    public void doesntInterfereWithBeanPostProcessing() {
-        setContext(
-                "<b:bean id='myUserService' class='org.springframework.security.config.PostProcessedMockUserDetailsService'/>" +
-                "<global-method-security />" +
-                "<authentication-manager>" +
-                "   <authentication-provider user-service-ref='myUserService'/>" +
-                "</authentication-manager>" +
-                "<b:bean id='beanPostProcessor' class='org.springframework.security.config.MockUserServiceBeanPostProcessor'/>"
-        );
+	@Test
+	public void doesntInterfereWithBeanPostProcessing() {
+		setContext("<b:bean id='myUserService' class='org.springframework.security.config.PostProcessedMockUserDetailsService'/>"
+				+ "<global-method-security />"
+				+ "<authentication-manager>"
+				+ "   <authentication-provider user-service-ref='myUserService'/>"
+				+ "</authentication-manager>"
+				+ "<b:bean id='beanPostProcessor' class='org.springframework.security.config.MockUserServiceBeanPostProcessor'/>");
 
-        PostProcessedMockUserDetailsService service = (PostProcessedMockUserDetailsService)appContext.getBean("myUserService");
+		PostProcessedMockUserDetailsService service = (PostProcessedMockUserDetailsService) appContext
+				.getBean("myUserService");
 
-        assertEquals("Hello from the post processor!", service.getPostProcessorWasHere());
-    }
+		assertEquals("Hello from the post processor!", service.getPostProcessorWasHere());
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void worksWithAspectJAutoproxy() {
-        setContext(
-                "<global-method-security>" +
-                "  <protect-pointcut expression='execution(* org.springframework.security.config.*Service.*(..))'" +
-                "       access='ROLE_SOMETHING' />" +
-                "</global-method-security>" +
-                "<b:bean id='myUserService' class='org.springframework.security.config.PostProcessedMockUserDetailsService'/>" +
-                "<aop:aspectj-autoproxy />" +
-                "<authentication-manager>" +
-                "   <authentication-provider user-service-ref='myUserService'/>" +
-                "</authentication-manager>"
-        );
+	@Test(expected = AccessDeniedException.class)
+	public void worksWithAspectJAutoproxy() {
+		setContext("<global-method-security>"
+				+ "  <protect-pointcut expression='execution(* org.springframework.security.config.*Service.*(..))'"
+				+ "       access='ROLE_SOMETHING' />"
+				+ "</global-method-security>"
+				+ "<b:bean id='myUserService' class='org.springframework.security.config.PostProcessedMockUserDetailsService'/>"
+				+ "<aop:aspectj-autoproxy />" + "<authentication-manager>"
+				+ "   <authentication-provider user-service-ref='myUserService'/>"
+				+ "</authentication-manager>");
 
-        UserDetailsService service = (UserDetailsService) appContext.getBean("myUserService");
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+		UserDetailsService service = (UserDetailsService) appContext
+				.getBean("myUserService");
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        service.loadUserByUsername("notused");
-    }
+		service.loadUserByUsername("notused");
+	}
 
-    @Test
-    public void supportsMethodArgumentsInPointcut() {
-        setContext(
-                "<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>" +
-                "<global-method-security>" +
-                "   <protect-pointcut expression='execution(* org.springframework.security.access.annotation.BusinessService.someOther(String))' access='ROLE_ADMIN'/>" +
-                "   <protect-pointcut expression='execution(* org.springframework.security.access.annotation.BusinessService.*(..))' access='ROLE_USER'/>" +
-                "</global-method-security>" + ConfigTestUtils.AUTH_PROVIDER_XML
-        );
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("user", "password"));
-        target = (BusinessService) appContext.getBean("target");
-        // someOther(int) should not be matched by someOther(String), but should require ROLE_USER
-        target.someOther(0);
+	@Test
+	public void supportsMethodArgumentsInPointcut() {
+		setContext("<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>"
+				+ "<global-method-security>"
+				+ "   <protect-pointcut expression='execution(* org.springframework.security.access.annotation.BusinessService.someOther(String))' access='ROLE_ADMIN'/>"
+				+ "   <protect-pointcut expression='execution(* org.springframework.security.access.annotation.BusinessService.*(..))' access='ROLE_USER'/>"
+				+ "</global-method-security>" + ConfigTestUtils.AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("user", "password"));
+		target = (BusinessService) appContext.getBean("target");
+		// someOther(int) should not be matched by someOther(String), but should require
+		// ROLE_USER
+		target.someOther(0);
 
-        try {
-            // String version should required admin role
-            target.someOther("somestring");
-            fail("Expected AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-        }
-    }
+		try {
+			// String version should required admin role
+			target.someOther("somestring");
+			fail("Expected AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
+	}
 
-    @Test
-    public void supportsBooleanPointcutExpressions() {
-        setContext(
-                "<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>" +
-                "<global-method-security>" +
-                "   <protect-pointcut expression=" +
-                "     'execution(* org.springframework.security.access.annotation.BusinessService.*(..)) " +
-                "       and not execution(* org.springframework.security.access.annotation.BusinessService.someOther(String)))' " +
-                "               access='ROLE_USER'/>" +
-                "</global-method-security>" + AUTH_PROVIDER_XML
-        );
-        target = (BusinessService) appContext.getBean("target");
-        // String method should not be protected
-        target.someOther("somestring");
+	@Test
+	public void supportsBooleanPointcutExpressions() {
+		setContext("<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>"
+				+ "<global-method-security>"
+				+ "   <protect-pointcut expression="
+				+ "     'execution(* org.springframework.security.access.annotation.BusinessService.*(..)) "
+				+ "       and not execution(* org.springframework.security.access.annotation.BusinessService.someOther(String)))' "
+				+ "               access='ROLE_USER'/>"
+				+ "</global-method-security>"
+				+ AUTH_PROVIDER_XML);
+		target = (BusinessService) appContext.getBean("target");
+		// String method should not be protected
+		target.someOther("somestring");
 
-        // All others should require ROLE_USER
-        try {
-            target.someOther(0);
-            fail("Expected AuthenticationCredentialsNotFoundException");
-        } catch (AuthenticationCredentialsNotFoundException expected) {
-        }
+		// All others should require ROLE_USER
+		try {
+			target.someOther(0);
+			fail("Expected AuthenticationCredentialsNotFoundException");
+		}
+		catch (AuthenticationCredentialsNotFoundException expected) {
+		}
 
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("user", "password"));
-        target.someOther(0);
-    }
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("user", "password"));
+		target.someOther(0);
+	}
 
-    @Test(expected=BeanDefinitionParsingException.class)
-    public void duplicateElementCausesError() {
-        setContext(
-                "<global-method-security />" +
-                "<global-method-security />"
-        );
-    }
+	@Test(expected = BeanDefinitionParsingException.class)
+	public void duplicateElementCausesError() {
+		setContext("<global-method-security />" + "<global-method-security />");
+	}
 
-    // SEC-936
-    @Test(expected=AccessDeniedException.class)
-    public void worksWithoutTargetOrClass() {
-        setContext(
-                "<global-method-security secured-annotations='enabled'/>" +
-                "<b:bean id='businessService' class='org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean'>" +
-                "    <b:property name='serviceUrl' value='http://localhost:8080/SomeService'/>" +
-                "    <b:property name='serviceInterface' value='org.springframework.security.access.annotation.BusinessService'/>" +
-                "</b:bean>" + AUTH_PROVIDER_XML
-                );
+	// SEC-936
+	@Test(expected = AccessDeniedException.class)
+	public void worksWithoutTargetOrClass() {
+		setContext("<global-method-security secured-annotations='enabled'/>"
+				+ "<b:bean id='businessService' class='org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean'>"
+				+ "    <b:property name='serviceUrl' value='http://localhost:8080/SomeService'/>"
+				+ "    <b:property name='serviceInterface' value='org.springframework.security.access.annotation.BusinessService'/>"
+				+ "</b:bean>" + AUTH_PROVIDER_XML);
 
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
-        SecurityContextHolder.getContext().setAuthentication(token);
-        target = (BusinessService) appContext.getBean("businessService");
-        target.someUserMethod1();
-    }
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
+		SecurityContextHolder.getContext().setAuthentication(token);
+		target = (BusinessService) appContext.getBean("businessService");
+		target.someUserMethod1();
+	}
 
-    // Expression configuration tests
+	// Expression configuration tests
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void expressionVoterAndAfterInvocationProviderUseSameExpressionHandlerInstance() throws Exception {
-        setContext("<global-method-security pre-post-annotations='enabled'/>" + AUTH_PROVIDER_XML);
-        AffirmativeBased adm = (AffirmativeBased) appContext.getBeansOfType(AffirmativeBased.class).values().toArray()[0];
-        List voters = (List) FieldUtils.getFieldValue(adm, "decisionVoters");
-        PreInvocationAuthorizationAdviceVoter mev = (PreInvocationAuthorizationAdviceVoter) voters.get(0);
-        MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor)
-            appContext.getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values().toArray()[0];
-        AfterInvocationProviderManager pm = (AfterInvocationProviderManager) ((MethodSecurityInterceptor)msi.getAdvice()).getAfterInvocationManager();
-        PostInvocationAdviceProvider aip = (PostInvocationAdviceProvider) pm.getProviders().get(0);
-        assertTrue(FieldUtils.getFieldValue(mev, "preAdvice.expressionHandler") == FieldUtils.getFieldValue(aip, "postAdvice.expressionHandler"));
-    }
+	@SuppressWarnings("unchecked")
+	@Test
+	public void expressionVoterAndAfterInvocationProviderUseSameExpressionHandlerInstance()
+			throws Exception {
+		setContext("<global-method-security pre-post-annotations='enabled'/>"
+				+ AUTH_PROVIDER_XML);
+		AffirmativeBased adm = (AffirmativeBased) appContext
+				.getBeansOfType(AffirmativeBased.class).values().toArray()[0];
+		List voters = (List) FieldUtils.getFieldValue(adm, "decisionVoters");
+		PreInvocationAuthorizationAdviceVoter mev = (PreInvocationAuthorizationAdviceVoter) voters
+				.get(0);
+		MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) appContext
+				.getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values()
+				.toArray()[0];
+		AfterInvocationProviderManager pm = (AfterInvocationProviderManager) ((MethodSecurityInterceptor) msi
+				.getAdvice()).getAfterInvocationManager();
+		PostInvocationAdviceProvider aip = (PostInvocationAdviceProvider) pm
+				.getProviders().get(0);
+		assertTrue(FieldUtils.getFieldValue(mev, "preAdvice.expressionHandler") == FieldUtils
+				.getFieldValue(aip, "postAdvice.expressionHandler"));
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void accessIsDeniedForHasRoleExpression() {
-        setContext(
-                "<global-method-security pre-post-annotations='enabled'/>" +
-                "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
-                AUTH_PROVIDER_XML);
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        target = (BusinessService) appContext.getBean("target");
-        target.someAdminMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void accessIsDeniedForHasRoleExpression() {
+		setContext("<global-method-security pre-post-annotations='enabled'/>"
+				+ "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		target = (BusinessService) appContext.getBean("target");
+		target.someAdminMethod();
+	}
 
-    @Test
-    public void beanNameExpressionPropertyIsSupported() {
-        setContext(
-                "<global-method-security pre-post-annotations='enabled' proxy-target-class='true'/>" +
-                "<b:bean id='number' class='java.lang.Integer'>" +
-                "    <b:constructor-arg value='1294'/>" +
-                "</b:bean>" +
-                "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
-                AUTH_PROVIDER_XML);
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        ExpressionProtectedBusinessServiceImpl target = (ExpressionProtectedBusinessServiceImpl) appContext.getBean("target");
-        target.methodWithBeanNamePropertyAccessExpression("x");
-    }
+	@Test
+	public void beanNameExpressionPropertyIsSupported() {
+		setContext("<global-method-security pre-post-annotations='enabled' proxy-target-class='true'/>"
+				+ "<b:bean id='number' class='java.lang.Integer'>"
+				+ "    <b:constructor-arg value='1294'/>"
+				+ "</b:bean>"
+				+ "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		ExpressionProtectedBusinessServiceImpl target = (ExpressionProtectedBusinessServiceImpl) appContext
+				.getBean("target");
+		target.methodWithBeanNamePropertyAccessExpression("x");
+	}
 
-    @Test
-    public void preAndPostFilterAnnotationsWorkWithLists() {
-        setContext(
-                "<global-method-security pre-post-annotations='enabled'/>" +
-                "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
-                AUTH_PROVIDER_XML);
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        target = (BusinessService) appContext.getBean("target");
-        List<String> arg = new ArrayList<String>();
-        arg.add("joe");
-        arg.add("bob");
-        arg.add("sam");
-        List<?> result = target.methodReturningAList(arg);
-        // Expression is (filterObject == name or filterObject == 'sam'), so "joe" should be gone after pre-filter
-        // PostFilter should remove sam from the return object
-        assertEquals(1, result.size());
-        assertEquals("bob", result.get(0));
-    }
+	@Test
+	public void preAndPostFilterAnnotationsWorkWithLists() {
+		setContext("<global-method-security pre-post-annotations='enabled'/>"
+				+ "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		target = (BusinessService) appContext.getBean("target");
+		List<String> arg = new ArrayList<String>();
+		arg.add("joe");
+		arg.add("bob");
+		arg.add("sam");
+		List<?> result = target.methodReturningAList(arg);
+		// Expression is (filterObject == name or filterObject == 'sam'), so "joe" should
+		// be gone after pre-filter
+		// PostFilter should remove sam from the return object
+		assertEquals(1, result.size());
+		assertEquals("bob", result.get(0));
+	}
 
-    @Test
-    public void prePostFilterAnnotationWorksWithArrays() {
-        setContext(
-                "<global-method-security pre-post-annotations='enabled'/>" +
-                "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>" +
-                AUTH_PROVIDER_XML);
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        target = (BusinessService) appContext.getBean("target");
-        Object[] arg = new String[] {"joe", "bob", "sam"};
-        Object[] result = target.methodReturningAnArray(arg);
-        assertEquals(1, result.length);
-        assertEquals("bob", result[0]);
-    }
+	@Test
+	public void prePostFilterAnnotationWorksWithArrays() {
+		setContext("<global-method-security pre-post-annotations='enabled'/>"
+				+ "<b:bean id='target' class='org.springframework.security.access.annotation.ExpressionProtectedBusinessServiceImpl'/>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		target = (BusinessService) appContext.getBean("target");
+		Object[] arg = new String[] { "joe", "bob", "sam" };
+		Object[] result = target.methodReturningAnArray(arg);
+		assertEquals(1, result.length);
+		assertEquals("bob", result[0]);
+	}
 
-    // SEC-1392
-    @Test
-    public void customPermissionEvaluatorIsSupported() throws Exception {
-        setContext(
-                "<global-method-security pre-post-annotations='enabled'>" +
-                "   <expression-handler ref='expressionHandler'/>" +
-                "</global-method-security>" +
-                "<b:bean id='expressionHandler' class='org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler'>" +
-                "   <b:property name='permissionEvaluator' ref='myPermissionEvaluator'/>" +
-                "</b:bean>" +
-                "<b:bean id='myPermissionEvaluator' class='org.springframework.security.config.method.TestPermissionEvaluator'/>" +
-                AUTH_PROVIDER_XML);
-    }
+	// SEC-1392
+	@Test
+	public void customPermissionEvaluatorIsSupported() throws Exception {
+		setContext("<global-method-security pre-post-annotations='enabled'>"
+				+ "   <expression-handler ref='expressionHandler'/>"
+				+ "</global-method-security>"
+				+ "<b:bean id='expressionHandler' class='org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler'>"
+				+ "   <b:property name='permissionEvaluator' ref='myPermissionEvaluator'/>"
+				+ "</b:bean>"
+				+ "<b:bean id='myPermissionEvaluator' class='org.springframework.security.config.method.TestPermissionEvaluator'/>"
+				+ AUTH_PROVIDER_XML);
+	}
 
-    // SEC-1450
-    @Test(expected=AuthenticationException.class)
-    @SuppressWarnings("unchecked")
-    public void genericsAreMatchedByProtectPointcut() throws Exception {
-        setContext(
-                "<b:bean id='target' class='org.springframework.security.config.method.GlobalMethodSecurityBeanDefinitionParserTests$ConcreteFoo'/>" +
-                "<global-method-security>" +
-                "   <protect-pointcut expression='execution(* org..*Foo.foo(..))' access='ROLE_USER'/>" +
-                "</global-method-security>" + AUTH_PROVIDER_XML
-        );
-        Foo foo = (Foo) appContext.getBean("target");
-        foo.foo(new SecurityConfig("A"));
-    }
+	// SEC-1450
+	@Test(expected = AuthenticationException.class)
+	@SuppressWarnings("unchecked")
+	public void genericsAreMatchedByProtectPointcut() throws Exception {
+		setContext("<b:bean id='target' class='org.springframework.security.config.method.GlobalMethodSecurityBeanDefinitionParserTests$ConcreteFoo'/>"
+				+ "<global-method-security>"
+				+ "   <protect-pointcut expression='execution(* org..*Foo.foo(..))' access='ROLE_USER'/>"
+				+ "</global-method-security>" + AUTH_PROVIDER_XML);
+		Foo foo = (Foo) appContext.getBean("target");
+		foo.foo(new SecurityConfig("A"));
+	}
 
-    // SEC-1448
-    @Test
-    @SuppressWarnings("unchecked")
-    public void genericsMethodArgumentNamesAreResolved() throws Exception {
-        setContext(
-                "<b:bean id='target' class='" + ConcreteFoo.class.getName()  + "'/>" +
-                "<global-method-security pre-post-annotations='enabled'/>" + AUTH_PROVIDER_XML
-        );
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        Foo foo = (Foo) appContext.getBean("target");
-        foo.foo(new SecurityConfig("A"));
-    }
+	// SEC-1448
+	@Test
+	@SuppressWarnings("unchecked")
+	public void genericsMethodArgumentNamesAreResolved() throws Exception {
+		setContext("<b:bean id='target' class='" + ConcreteFoo.class.getName() + "'/>"
+				+ "<global-method-security pre-post-annotations='enabled'/>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		Foo foo = (Foo) appContext.getBean("target");
+		foo.foo(new SecurityConfig("A"));
+	}
 
-    @Test
-    public void runAsManagerIsSetCorrectly() throws Exception {
-        StaticApplicationContext parent = new StaticApplicationContext();
-        MutablePropertyValues props = new MutablePropertyValues();
-        props.addPropertyValue("key", "blah");
-        parent.registerSingleton("runAsMgr", RunAsManagerImpl.class, props);
-        parent.refresh();
+	@Test
+	public void runAsManagerIsSetCorrectly() throws Exception {
+		StaticApplicationContext parent = new StaticApplicationContext();
+		MutablePropertyValues props = new MutablePropertyValues();
+		props.addPropertyValue("key", "blah");
+		parent.registerSingleton("runAsMgr", RunAsManagerImpl.class, props);
+		parent.refresh();
 
-        setContext("<global-method-security run-as-manager-ref='runAsMgr'/>" + AUTH_PROVIDER_XML, parent);
-        RunAsManagerImpl ram = (RunAsManagerImpl) appContext.getBean("runAsMgr");
-        MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor)
-            appContext.getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values().toArray()[0];
-        assertSame(ram, FieldUtils.getFieldValue(msi.getAdvice(), "runAsManager"));
-    }
+		setContext("<global-method-security run-as-manager-ref='runAsMgr'/>"
+				+ AUTH_PROVIDER_XML, parent);
+		RunAsManagerImpl ram = (RunAsManagerImpl) appContext.getBean("runAsMgr");
+		MethodSecurityMetadataSourceAdvisor msi = (MethodSecurityMetadataSourceAdvisor) appContext
+				.getBeansOfType(MethodSecurityMetadataSourceAdvisor.class).values()
+				.toArray()[0];
+		assertSame(ram, FieldUtils.getFieldValue(msi.getAdvice(), "runAsManager"));
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void supportsExternalMetadataSource() throws Exception {
-        setContext(
-                "<b:bean id='target' class='" + ConcreteFoo.class.getName()  + "'/>" +
-                "<method-security-metadata-source id='mds'>" +
-                "      <protect method='"+ Foo.class.getName() + ".foo' access='ROLE_ADMIN'/>" +
-                "</method-security-metadata-source>" +
-                "<global-method-security pre-post-annotations='enabled' metadata-source-ref='mds'/>" + AUTH_PROVIDER_XML
-        );
-        // External MDS should take precedence over PreAuthorize
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        Foo foo = (Foo) appContext.getBean("target");
-        try {
-            foo.foo(new SecurityConfig("A"));
-            fail("Bob can't invoke admin methods");
-        } catch (AccessDeniedException expected) {
-        }
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("admin", "password"));
-        foo.foo(new SecurityConfig("A"));
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void supportsExternalMetadataSource() throws Exception {
+		setContext("<b:bean id='target' class='"
+				+ ConcreteFoo.class.getName()
+				+ "'/>"
+				+ "<method-security-metadata-source id='mds'>"
+				+ "      <protect method='"
+				+ Foo.class.getName()
+				+ ".foo' access='ROLE_ADMIN'/>"
+				+ "</method-security-metadata-source>"
+				+ "<global-method-security pre-post-annotations='enabled' metadata-source-ref='mds'/>"
+				+ AUTH_PROVIDER_XML);
+		// External MDS should take precedence over PreAuthorize
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		Foo foo = (Foo) appContext.getBean("target");
+		try {
+			foo.foo(new SecurityConfig("A"));
+			fail("Bob can't invoke admin methods");
+		}
+		catch (AccessDeniedException expected) {
+		}
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("admin", "password"));
+		foo.foo(new SecurityConfig("A"));
+	}
 
-    @Test
-    public void supportsCustomAuthenticationManager() throws Exception {
-        setContext(
-                "<b:bean id='target' class='" + ConcreteFoo.class.getName()  + "'/>" +
-                "<method-security-metadata-source id='mds'>" +
-                "      <protect method='"+ Foo.class.getName() + ".foo' access='ROLE_ADMIN'/>" +
-                "</method-security-metadata-source>" +
-                "<global-method-security pre-post-annotations='enabled' metadata-source-ref='mds' authentication-manager-ref='customAuthMgr'/>" +
-                "<b:bean id='customAuthMgr' class='org.springframework.security.config.method.GlobalMethodSecurityBeanDefinitionParserTests$CustomAuthManager'>" +
-                "      <b:constructor-arg value='authManager'/>" +
-                "</b:bean>" +
-                AUTH_PROVIDER_XML
-        );
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        Foo foo = (Foo) appContext.getBean("target");
-        try {
-            foo.foo(new SecurityConfig("A"));
-            fail("Bob can't invoke admin methods");
-        } catch (AccessDeniedException expected) {
-        }
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("admin", "password"));
-        foo.foo(new SecurityConfig("A"));
-    }
+	@Test
+	public void supportsCustomAuthenticationManager() throws Exception {
+		setContext("<b:bean id='target' class='"
+				+ ConcreteFoo.class.getName()
+				+ "'/>"
+				+ "<method-security-metadata-source id='mds'>"
+				+ "      <protect method='"
+				+ Foo.class.getName()
+				+ ".foo' access='ROLE_ADMIN'/>"
+				+ "</method-security-metadata-source>"
+				+ "<global-method-security pre-post-annotations='enabled' metadata-source-ref='mds' authentication-manager-ref='customAuthMgr'/>"
+				+ "<b:bean id='customAuthMgr' class='org.springframework.security.config.method.GlobalMethodSecurityBeanDefinitionParserTests$CustomAuthManager'>"
+				+ "      <b:constructor-arg value='authManager'/>" + "</b:bean>"
+				+ AUTH_PROVIDER_XML);
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		Foo foo = (Foo) appContext.getBean("target");
+		try {
+			foo.foo(new SecurityConfig("A"));
+			fail("Bob can't invoke admin methods");
+		}
+		catch (AccessDeniedException expected) {
+		}
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("admin", "password"));
+		foo.foo(new SecurityConfig("A"));
+	}
 
-    static class CustomAuthManager implements AuthenticationManager, ApplicationContextAware {
-        private String beanName;
-        private AuthenticationManager authenticationManager;
+	static class CustomAuthManager implements AuthenticationManager,
+			ApplicationContextAware {
+		private String beanName;
+		private AuthenticationManager authenticationManager;
 
-        CustomAuthManager(String beanName) {
-            this.beanName = beanName;
-        }
+		CustomAuthManager(String beanName) {
+			this.beanName = beanName;
+		}
 
-        public Authentication authenticate(Authentication authentication)
-                throws AuthenticationException {
-            return authenticationManager.authenticate(authentication);
-        }
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			return authenticationManager.authenticate(authentication);
+		}
 
-        /* (non-Javadoc)
-         * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-         */
-        public void setApplicationContext(ApplicationContext applicationContext)
-                throws BeansException {
-            this.authenticationManager = applicationContext.getBean(beanName,AuthenticationManager.class);
-        }
-    }
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.springframework.context.ApplicationContextAware#setApplicationContext(org
+		 * .springframework.context.ApplicationContext)
+		 */
+		public void setApplicationContext(ApplicationContext applicationContext)
+				throws BeansException {
+			this.authenticationManager = applicationContext.getBean(beanName,
+					AuthenticationManager.class);
+		}
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 
-    private void setContext(String context, ApplicationContext parent) {
-        appContext = new InMemoryXmlApplicationContext(context, parent);
-    }
+	private void setContext(String context, ApplicationContext parent) {
+		appContext = new InMemoryXmlApplicationContext(context, parent);
+	}
 
-    interface Foo<T extends ConfigAttribute> {
-        void foo(T action);
-    }
+	interface Foo<T extends ConfigAttribute> {
+		void foo(T action);
+	}
 
-    public static class ConcreteFoo implements Foo<SecurityConfig> {
-        @PreAuthorize("#action.attribute == 'A'")
-        public void foo(SecurityConfig action) {
-        }
-    }
+	public static class ConcreteFoo implements Foo<SecurityConfig> {
+		@PreAuthorize("#action.attribute == 'A'")
+		public void foo(SecurityConfig action) {
+		}
+	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java
index 1a7e02b3a2..33ef295ac0 100644
--- a/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java
+++ b/config/src/test/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecoratorTests.java
@@ -27,69 +27,73 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:org/springframework/security/config/method-security.xml")
-public class InterceptMethodsBeanDefinitionDecoratorTests implements ApplicationContextAware {
-    @Autowired
-    @Qualifier("target")
-    private TestBusinessBean target;
-    @Autowired
-    @Qualifier("transactionalTarget")
-    private TestBusinessBean transactionalTarget;
-    private ApplicationContext appContext;
+public class InterceptMethodsBeanDefinitionDecoratorTests implements
+		ApplicationContextAware {
+	@Autowired
+	@Qualifier("target")
+	private TestBusinessBean target;
+	@Autowired
+	@Qualifier("transactionalTarget")
+	private TestBusinessBean transactionalTarget;
+	private ApplicationContext appContext;
 
-    @BeforeClass
-    public static void loadContext() {
-        // Set value for placeholder
-        System.setProperty("admin.role", "ROLE_ADMIN");
-    }
+	@BeforeClass
+	public static void loadContext() {
+		// Set value for placeholder
+		System.setProperty("admin.role", "ROLE_ADMIN");
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void targetDoesntLoseApplicationListenerInterface() {
-        assertEquals(1, appContext.getBeansOfType(ApplicationListener.class).size());
-        assertEquals(1, appContext.getBeanNamesForType(ApplicationListener.class).length);
-        appContext.publishEvent(new AuthenticationSuccessEvent(new TestingAuthenticationToken("user", "")));
+	@Test
+	public void targetDoesntLoseApplicationListenerInterface() {
+		assertEquals(1, appContext.getBeansOfType(ApplicationListener.class).size());
+		assertEquals(1, appContext.getBeanNamesForType(ApplicationListener.class).length);
+		appContext.publishEvent(new AuthenticationSuccessEvent(
+				new TestingAuthenticationToken("user", "")));
 
-        assertTrue(target instanceof ApplicationListener<?>);
-    }
+		assertTrue(target instanceof ApplicationListener<?>);
+	}
 
-    @Test
-    public void targetShouldAllowUnprotectedMethodInvocationWithNoContext() {
-        target.unprotected();
-    }
+	@Test
+	public void targetShouldAllowUnprotectedMethodInvocationWithNoContext() {
+		target.unprotected();
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
-        target.doSomething();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
+		target.doSomething();
+	}
 
-    @Test
-    public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.doSomething();
-    }
+		target.doSomething();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test(expected = AccessDeniedException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.doSomething();
-    }
+		target.doSomething();
+	}
 
-    @Test(expected = AuthenticationException.class)
-    public void transactionalMethodsShouldBeSecured() throws Exception {
-        transactionalTarget.doSomething();
-    }
+	@Test(expected = AuthenticationException.class)
+	public void transactionalMethodsShouldBeSecured() throws Exception {
+		transactionalTarget.doSomething();
+	}
 
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.appContext = applicationContext;
-    }
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		this.appContext = applicationContext;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
index c966999908..3dd9c88a57 100644
--- a/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/method/Jsr250AnnotationDrivenBeanDefinitionParserTests.java
@@ -16,66 +16,66 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @author Luke Taylor
  */
 public class Jsr250AnnotationDrivenBeanDefinitionParserTests {
-    private InMemoryXmlApplicationContext appContext;
+	private InMemoryXmlApplicationContext appContext;
 
-    private BusinessService target;
+	private BusinessService target;
 
-    @Before
-    public void loadContext() {
-        appContext = new InMemoryXmlApplicationContext(
-                "<b:bean id='target' class='org.springframework.security.access.annotation.Jsr250BusinessServiceImpl'/>" +
-                "<global-method-security jsr250-annotations='enabled'/>" + ConfigTestUtils.AUTH_PROVIDER_XML
-                );
-        target = (BusinessService) appContext.getBean("target");
-    }
+	@Before
+	public void loadContext() {
+		appContext = new InMemoryXmlApplicationContext(
+				"<b:bean id='target' class='org.springframework.security.access.annotation.Jsr250BusinessServiceImpl'/>"
+						+ "<global-method-security jsr250-annotations='enabled'/>"
+						+ ConfigTestUtils.AUTH_PROVIDER_XML);
+		target = (BusinessService) appContext.getBean("target");
+	}
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
-        target.someUserMethod1();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
+		target.someUserMethod1();
+	}
 
-    @Test
-    public void permitAllShouldBeDefaultAttribute() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void permitAllShouldBeDefaultAttribute() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someOther(0);
-    }
+		target.someOther(0);
+	}
 
-    @Test
-    public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someUserMethod1();
-    }
+		target.someUserMethod1();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test(expected = AccessDeniedException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_SOMEOTHERROLE"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someAdminMethod();
-    }
+		target.someAdminMethod();
+	}
 
+	@Test
+	public void hasAnyRoleAddsDefaultPrefix() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-    @Test
-    public void hasAnyRoleAddsDefaultPrefix() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
-
-        target.rolesAllowedUser();
-    }
+		target.rolesAllowedUser();
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java b/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java
index 5ad0c54ea1..737cbbc6ea 100644
--- a/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java
+++ b/config/src/test/java/org/springframework/security/config/method/Sec2196Tests.java
@@ -30,50 +30,50 @@ import org.springframework.security.core.context.SecurityContextHolder;
  */
 public class Sec2196Tests {
 
-    private ConfigurableApplicationContext context;
+	private ConfigurableApplicationContext context;
 
-    @Test(expected = AccessDeniedException.class)
-    public void genericMethodsProtected() {
-        loadContext("<global-method-security secured-annotations=\"enabled\" pre-post-annotations=\"enabled\"/>"
-                + "<b:bean class='" + Service.class.getName() + "'/>");
+	@Test(expected = AccessDeniedException.class)
+	public void genericMethodsProtected() {
+		loadContext("<global-method-security secured-annotations=\"enabled\" pre-post-annotations=\"enabled\"/>"
+				+ "<b:bean class='" + Service.class.getName() + "'/>");
 
-        SecurityContextHolder.getContext().setAuthentication(
-                new TestingAuthenticationToken("test", "pass", "ROLE_USER"));
-        Service service = context.getBean(Service.class);
-        service.save(new User());
-    }
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("test", "pass", "ROLE_USER"));
+		Service service = context.getBean(Service.class);
+		service.save(new User());
+	}
 
-    @Test
-    public void genericMethodsAllowed() {
-        loadContext("<global-method-security secured-annotations=\"enabled\" pre-post-annotations=\"enabled\"/>"
-                + "<b:bean class='" + Service.class.getName() + "'/>");
+	@Test
+	public void genericMethodsAllowed() {
+		loadContext("<global-method-security secured-annotations=\"enabled\" pre-post-annotations=\"enabled\"/>"
+				+ "<b:bean class='" + Service.class.getName() + "'/>");
 
-        SecurityContextHolder.getContext().setAuthentication(
-                new TestingAuthenticationToken("test", "pass", "saveUsers"));
-        Service service = context.getBean(Service.class);
-        service.save(new User());
-    }
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("test", "pass", "saveUsers"));
+		Service service = context.getBean(Service.class);
+		service.save(new User());
+	}
 
-    private void loadContext(String context) {
-        this.context = new InMemoryXmlApplicationContext(context);
-    }
+	private void loadContext(String context) {
+		this.context = new InMemoryXmlApplicationContext(context);
+	}
 
-    @After
-    public void closeAppContext() {
-        if (context != null) {
-            context.close();
-            context = null;
-        }
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void closeAppContext() {
+		if (context != null) {
+			context.close();
+			context = null;
+		}
+		SecurityContextHolder.clearContext();
+	}
 
-    public static class Service {
-        @PreAuthorize("hasAuthority('saveUsers')")
-        public <T extends User> T save(T dto) {
-            return dto;
-        }
-    }
+	public static class Service {
+		@PreAuthorize("hasAuthority('saveUsers')")
+		public <T extends User> T save(T dto) {
+			return dto;
+		}
+	}
 
-    static class User {
-    }
+	static class User {
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java
index d9148f5ea8..5f7ac9fc25 100644
--- a/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/method/SecuredAnnotationDrivenBeanDefinitionParserTests.java
@@ -23,83 +23,86 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @author Ben Alex
  */
 public class SecuredAnnotationDrivenBeanDefinitionParserTests {
-    private InMemoryXmlApplicationContext appContext;
+	private InMemoryXmlApplicationContext appContext;
 
-    private BusinessService target;
+	private BusinessService target;
 
-    @Before
-    public void loadContext() {
-        SecurityContextHolder.clearContext();
-        appContext = new InMemoryXmlApplicationContext(
-                "<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>" +
-                "<global-method-security secured-annotations='enabled'/>" + ConfigTestUtils.AUTH_PROVIDER_XML
-                );
-        target = (BusinessService) appContext.getBean("target");
-    }
+	@Before
+	public void loadContext() {
+		SecurityContextHolder.clearContext();
+		appContext = new InMemoryXmlApplicationContext(
+				"<b:bean id='target' class='org.springframework.security.access.annotation.BusinessServiceImpl'/>"
+						+ "<global-method-security secured-annotations='enabled'/>"
+						+ ConfigTestUtils.AUTH_PROVIDER_XML);
+		target = (BusinessService) appContext.getBean("target");
+	}
 
-    @After
-    public void closeAppContext() {
-        if (appContext != null) {
-            appContext.close();
-        }
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void closeAppContext() {
+		if (appContext != null) {
+			appContext.close();
+		}
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
-        target.someUserMethod1();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithNoContext() {
+		target.someUserMethod1();
+	}
 
-    @Test
-    public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void targetShouldAllowProtectedMethodInvocationWithCorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someUserMethod1();
-    }
+		target.someUserMethod1();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_SOMEOTHER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test(expected = AccessDeniedException.class)
+	public void targetShouldPreventProtectedMethodInvocationWithIncorrectRole() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_SOMEOTHER"));
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        target.someAdminMethod();
-    }
+		target.someAdminMethod();
+	}
 
-    // SEC-1387
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void targetIsSerializableBeforeUse() throws Exception {
-        BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target);
-        chompedTarget.someAdminMethod();
-    }
+	// SEC-1387
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void targetIsSerializableBeforeUse() throws Exception {
+		BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target);
+		chompedTarget.someAdminMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void targetIsSerializableAfterUse() throws Exception {
-        try {
-            target.someAdminMethod();
-        } catch (AuthenticationCredentialsNotFoundException expected) {
-        }
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("u","p","ROLE_A"));
+	@Test(expected = AccessDeniedException.class)
+	public void targetIsSerializableAfterUse() throws Exception {
+		try {
+			target.someAdminMethod();
+		}
+		catch (AuthenticationCredentialsNotFoundException expected) {
+		}
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("u", "p", "ROLE_A"));
 
-        BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target);
-        chompedTarget.someAdminMethod();
-    }
+		BusinessService chompedTarget = (BusinessService) serializeAndDeserialize(target);
+		chompedTarget.someAdminMethod();
+	}
 
-    private Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        ObjectOutputStream oos = new ObjectOutputStream(baos);
-        oos.writeObject(o);
-        oos.flush();
-        baos.flush();
-        byte[] bytes = baos.toByteArray();
+	private Object serializeAndDeserialize(Object o) throws IOException,
+			ClassNotFoundException {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		ObjectOutputStream oos = new ObjectOutputStream(baos);
+		oos.writeObject(o);
+		oos.flush();
+		baos.flush();
+		byte[] bytes = baos.toByteArray();
 
-        ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-        ObjectInputStream ois = new ObjectInputStream(is);
-        Object o2 = ois.readObject();
+		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+		ObjectInputStream ois = new ObjectInputStream(is);
+		Object o2 = ois.readObject();
 
-        return o2;
-    }
+		return o2;
+	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/TestPermissionEvaluator.java b/config/src/test/java/org/springframework/security/config/method/TestPermissionEvaluator.java
index 541d926a59..655378b038 100644
--- a/config/src/test/java/org/springframework/security/config/method/TestPermissionEvaluator.java
+++ b/config/src/test/java/org/springframework/security/config/method/TestPermissionEvaluator.java
@@ -7,13 +7,14 @@ import org.springframework.security.core.Authentication;
 
 public class TestPermissionEvaluator implements PermissionEvaluator {
 
-    public boolean hasPermission(Authentication authentication, Object targetDomainObject, Object permission) {
-        return false;
-    }
+	public boolean hasPermission(Authentication authentication,
+			Object targetDomainObject, Object permission) {
+		return false;
+	}
 
-    public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType,
-            Object permission) {
-        return false;
-    }
+	public boolean hasPermission(Authentication authentication, Serializable targetId,
+			String targetType, Object permission) {
+		return false;
+	}
 
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/sec2136/JpaPermissionEvaluator.java b/config/src/test/java/org/springframework/security/config/method/sec2136/JpaPermissionEvaluator.java
index c4edf57cda..059730678f 100644
--- a/config/src/test/java/org/springframework/security/config/method/sec2136/JpaPermissionEvaluator.java
+++ b/config/src/test/java/org/springframework/security/config/method/sec2136/JpaPermissionEvaluator.java
@@ -29,20 +29,20 @@ import org.springframework.security.core.Authentication;
  *
  */
 public class JpaPermissionEvaluator implements PermissionEvaluator {
-    @Autowired
-    private EntityManager entityManager;
+	@Autowired
+	private EntityManager entityManager;
 
-    public JpaPermissionEvaluator() {
-        System.out.println("initializing "+this);
-    }
+	public JpaPermissionEvaluator() {
+		System.out.println("initializing " + this);
+	}
 
-    public boolean hasPermission(Authentication authentication,
-            Object targetDomainObject, Object permission) {
-        return true;
-    }
+	public boolean hasPermission(Authentication authentication,
+			Object targetDomainObject, Object permission) {
+		return true;
+	}
 
-    public boolean hasPermission(Authentication authentication,
-            Serializable targetId, String targetType, Object permission) {
-        return true;
-    }
+	public boolean hasPermission(Authentication authentication, Serializable targetId,
+			String targetType, Object permission) {
+		return true;
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/sec2136/Sec2136Tests.java b/config/src/test/java/org/springframework/security/config/method/sec2136/Sec2136Tests.java
index 95aff97909..dc25106eba 100644
--- a/config/src/test/java/org/springframework/security/config/method/sec2136/Sec2136Tests.java
+++ b/config/src/test/java/org/springframework/security/config/method/sec2136/Sec2136Tests.java
@@ -29,8 +29,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration("sec2136.xml")
 public class Sec2136Tests {
 
-    @Test
-    public void configurationLoads() {
+	@Test
+	public void configurationLoads() {
 
-    }
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java b/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java
index ae8a13905e..e43999af9a 100644
--- a/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java
+++ b/config/src/test/java/org/springframework/security/config/method/sec2499/Sec2499Tests.java
@@ -25,26 +25,27 @@ import org.springframework.context.support.GenericXmlApplicationContext;
  *
  */
 public class Sec2499Tests {
-    private GenericXmlApplicationContext parent;
+	private GenericXmlApplicationContext parent;
 
-    private GenericXmlApplicationContext child;
+	private GenericXmlApplicationContext child;
 
-    @After
-    public void cleanup() {
-        if(parent != null) {
-            parent.close();
-        }
-        if(child != null) {
-            child.close();
-        }
-    }
+	@After
+	public void cleanup() {
+		if (parent != null) {
+			parent.close();
+		}
+		if (child != null) {
+			child.close();
+		}
+	}
 
-    @Test
-    public void methodExpressionHandlerInParentContextLoads() {
-        parent = new GenericXmlApplicationContext("org/springframework/security/config/method/sec2499/parent.xml");
-        child = new GenericXmlApplicationContext();
-        child.load("org/springframework/security/config/method/sec2499/child.xml");
-        child.setParent(parent);
-        child.refresh();
-    }
+	@Test
+	public void methodExpressionHandlerInParentContextLoads() {
+		parent = new GenericXmlApplicationContext(
+				"org/springframework/security/config/method/sec2499/parent.xml");
+		child = new GenericXmlApplicationContext();
+		child.load("org/springframework/security/config/method/sec2499/child.xml");
+		child.setParent(parent);
+		child.refresh();
+	}
 }
\ No newline at end of file
diff --git a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
index 8d511a50b5..51b0b0c4d5 100644
--- a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
+++ b/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
@@ -25,49 +25,49 @@ import org.springframework.security.util.InMemoryResource;
  * @author Luke Taylor
  */
 public class InMemoryXmlApplicationContext extends AbstractXmlApplicationContext {
-    private static final String BEANS_OPENING =
-                    "<b:beans xmlns='http://www.springframework.org/schema/security'\n" +
-                    "    xmlns:context='http://www.springframework.org/schema/context'\n" +
-                    "    xmlns:b='http://www.springframework.org/schema/beans'\n" +
-                    "    xmlns:aop='http://www.springframework.org/schema/aop'\n" +
-                    "    xmlns:websocket='http://www.springframework.org/schema/websocket'\n" +
-                    "    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n" +
-                    "    xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\n" +
-                    "http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\n" +
-                    "http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd\n" +
-                    "http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd\n" +
-                    "http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-";
-    private static final String BEANS_CLOSE = "</b:beans>\n";
+	private static final String BEANS_OPENING = "<b:beans xmlns='http://www.springframework.org/schema/security'\n"
+			+ "    xmlns:context='http://www.springframework.org/schema/context'\n"
+			+ "    xmlns:b='http://www.springframework.org/schema/beans'\n"
+			+ "    xmlns:aop='http://www.springframework.org/schema/aop'\n"
+			+ "    xmlns:websocket='http://www.springframework.org/schema/websocket'\n"
+			+ "    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
+			+ "    xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\n"
+			+ "http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\n"
+			+ "http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd\n"
+			+ "http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd\n"
+			+ "http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-";
+	private static final String BEANS_CLOSE = "</b:beans>\n";
 
-    Resource inMemoryXml;
+	Resource inMemoryXml;
 
-    public InMemoryXmlApplicationContext(String xml) {
-        this(xml, "4.0", null);
-    }
+	public InMemoryXmlApplicationContext(String xml) {
+		this(xml, "4.0", null);
+	}
 
-    public InMemoryXmlApplicationContext(String xml, ApplicationContext parent) {
-        this(xml, "4.0", parent);
-    }
+	public InMemoryXmlApplicationContext(String xml, ApplicationContext parent) {
+		this(xml, "4.0", parent);
+	}
 
-    public InMemoryXmlApplicationContext(String xml, String secVersion, ApplicationContext parent) {
-        String fullXml = BEANS_OPENING + secVersion + ".xsd'>\n" + xml + BEANS_CLOSE;
-        inMemoryXml = new InMemoryResource(fullXml);
-        setAllowBeanDefinitionOverriding(true);
-        setParent(parent);
-        refresh();
-    }
+	public InMemoryXmlApplicationContext(String xml, String secVersion,
+			ApplicationContext parent) {
+		String fullXml = BEANS_OPENING + secVersion + ".xsd'>\n" + xml + BEANS_CLOSE;
+		inMemoryXml = new InMemoryResource(fullXml);
+		setAllowBeanDefinitionOverriding(true);
+		setParent(parent);
+		refresh();
+	}
 
-    @Override
-    protected DefaultListableBeanFactory createBeanFactory() {
-        return new DefaultListableBeanFactory(getInternalParentBeanFactory()) {
-            @Override
-            protected boolean allowAliasOverriding() {
-                return true;
-            }
-        };
-    }
+	@Override
+	protected DefaultListableBeanFactory createBeanFactory() {
+		return new DefaultListableBeanFactory(getInternalParentBeanFactory()) {
+			@Override
+			protected boolean allowAliasOverriding() {
+				return true;
+			}
+		};
+	}
 
-    protected Resource[] getConfigResources() {
-        return new Resource[] {inMemoryXml};
-    }
+	protected Resource[] getConfigResources() {
+		return new Resource[] { inMemoryXml };
+	}
 }
diff --git a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
index 532df87ca3..871591343b 100644
--- a/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
+++ b/config/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
@@ -18,105 +18,98 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @author Ben Alex
  */
 public class MethodSecurityInterceptorWithAopConfigTests {
-    static final String AUTH_PROVIDER_XML =
-        "<authentication-manager>" +
-        "    <authentication-provider>" +
-        "        <user-service>" +
-        "            <user name='bob' password='bobspassword' authorities='ROLE_USER,ROLE_ADMIN' />" +
-        "            <user name='bill' password='billspassword' authorities='ROLE_USER' />" +
-        "        </user-service>" +
-        "    </authentication-provider>" +
-        "</authentication-manager>";
+	static final String AUTH_PROVIDER_XML = "<authentication-manager>"
+			+ "    <authentication-provider>"
+			+ "        <user-service>"
+			+ "            <user name='bob' password='bobspassword' authorities='ROLE_USER,ROLE_ADMIN' />"
+			+ "            <user name='bill' password='billspassword' authorities='ROLE_USER' />"
+			+ "        </user-service>" + "    </authentication-provider>"
+			+ "</authentication-manager>";
 
-    static final String ACCESS_MANAGER_XML =
-        "<b:bean id='accessDecisionManager' class='org.springframework.security.access.vote.AffirmativeBased'>" +
-        "   <b:constructor-arg>" +
-        "       <b:list><b:bean class='org.springframework.security.access.vote.RoleVoter'/></b:list>" +
-        "   </b:constructor-arg>" +
-        "</b:bean>";
+	static final String ACCESS_MANAGER_XML = "<b:bean id='accessDecisionManager' class='org.springframework.security.access.vote.AffirmativeBased'>"
+			+ "   <b:constructor-arg>"
+			+ "       <b:list><b:bean class='org.springframework.security.access.vote.RoleVoter'/></b:list>"
+			+ "   </b:constructor-arg>" + "</b:bean>";
 
-    static final String TARGET_BEAN_AND_INTERCEPTOR =
-        "<b:bean id='target' class='org.springframework.security.TargetObject'/>" +
-        "<b:bean id='securityInterceptor' class='org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor' autowire='byType' >" +
-        "     <b:property name='securityMetadataSource'>" +
-        "         <method-security-metadata-source>" +
-        "             <protect method='org.springframework.security.ITargetObject.makeLower*' access='ROLE_A'/>" +
-        "             <protect method='org.springframework.security.ITargetObject.makeUpper*' access='ROLE_A'/>" +
-        "             <protect method='org.springframework.security.ITargetObject.computeHashCode*' access='ROLE_B'/>" +
-        "         </method-security-metadata-source>" +
-        "     </b:property>" +
-        "</b:bean>";
+	static final String TARGET_BEAN_AND_INTERCEPTOR = "<b:bean id='target' class='org.springframework.security.TargetObject'/>"
+			+ "<b:bean id='securityInterceptor' class='org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor' autowire='byType' >"
+			+ "     <b:property name='securityMetadataSource'>"
+			+ "         <method-security-metadata-source>"
+			+ "             <protect method='org.springframework.security.ITargetObject.makeLower*' access='ROLE_A'/>"
+			+ "             <protect method='org.springframework.security.ITargetObject.makeUpper*' access='ROLE_A'/>"
+			+ "             <protect method='org.springframework.security.ITargetObject.computeHashCode*' access='ROLE_B'/>"
+			+ "         </method-security-metadata-source>"
+			+ "     </b:property>"
+			+ "</b:bean>";
 
-    private AbstractXmlApplicationContext appContext;
+	private AbstractXmlApplicationContext appContext;
 
-    @Before
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void closeAppContext() {
-        SecurityContextHolder.clearContext();
-        if (appContext != null) {
-            appContext.close();
-            appContext = null;
-        }
-    }
+	@After
+	public void closeAppContext() {
+		SecurityContextHolder.clearContext();
+		if (appContext != null) {
+			appContext.close();
+			appContext = null;
+		}
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void securityInterceptorIsAppliedWhenUsedWithAopConfig() {
-        setContext(
-                "<aop:config>" +
-                "     <aop:pointcut id='targetMethods' expression='execution(* org.springframework.security.TargetObject.*(..))'/>" +
-                "     <aop:advisor advice-ref='securityInterceptor' pointcut-ref='targetMethods' />" +
-                "</aop:config>" +
-                TARGET_BEAN_AND_INTERCEPTOR +
-                AUTH_PROVIDER_XML + ACCESS_MANAGER_XML);
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void securityInterceptorIsAppliedWhenUsedWithAopConfig() {
+		setContext("<aop:config>"
+				+ "     <aop:pointcut id='targetMethods' expression='execution(* org.springframework.security.TargetObject.*(..))'/>"
+				+ "     <aop:advisor advice-ref='securityInterceptor' pointcut-ref='targetMethods' />"
+				+ "</aop:config>" + TARGET_BEAN_AND_INTERCEPTOR + AUTH_PROVIDER_XML
+				+ ACCESS_MANAGER_XML);
 
-        ITargetObject target = (ITargetObject) appContext.getBean("target");
+		ITargetObject target = (ITargetObject) appContext.getBean("target");
 
-        // Check both against interface and class
-        try {
-            target.makeLowerCase("TEST");
-            fail("AuthenticationCredentialsNotFoundException expected");
-        } catch (AuthenticationCredentialsNotFoundException expected) {
-        }
+		// Check both against interface and class
+		try {
+			target.makeLowerCase("TEST");
+			fail("AuthenticationCredentialsNotFoundException expected");
+		}
+		catch (AuthenticationCredentialsNotFoundException expected) {
+		}
 
-        target.makeUpperCase("test");
-    }
+		target.makeUpperCase("test");
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void securityInterceptorIsAppliedWhenUsedWithBeanNameAutoProxyCreator() {
-        setContext(
-                "<b:bean id='autoProxyCreator' class='org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator'>" +
-                "   <b:property name='interceptorNames'>" +
-                "       <b:list>" +
-                "          <b:value>securityInterceptor</b:value>" +
-                "       </b:list>" +
-                "   </b:property>" +
-                "   <b:property name='beanNames'>" +
-                "       <b:list>" +
-                "          <b:value>target</b:value>" +
-                "       </b:list>" +
-                "   </b:property>" +
-                "   <b:property name='proxyTargetClass' value='false'/>" +
-                "</b:bean>" +
-                TARGET_BEAN_AND_INTERCEPTOR +
-                AUTH_PROVIDER_XML + ACCESS_MANAGER_XML);
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void securityInterceptorIsAppliedWhenUsedWithBeanNameAutoProxyCreator() {
+		setContext("<b:bean id='autoProxyCreator' class='org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator'>"
+				+ "   <b:property name='interceptorNames'>"
+				+ "       <b:list>"
+				+ "          <b:value>securityInterceptor</b:value>"
+				+ "       </b:list>"
+				+ "   </b:property>"
+				+ "   <b:property name='beanNames'>"
+				+ "       <b:list>"
+				+ "          <b:value>target</b:value>"
+				+ "       </b:list>"
+				+ "   </b:property>"
+				+ "   <b:property name='proxyTargetClass' value='false'/>"
+				+ "</b:bean>"
+				+ TARGET_BEAN_AND_INTERCEPTOR + AUTH_PROVIDER_XML + ACCESS_MANAGER_XML);
 
-        ITargetObject target = (ITargetObject) appContext.getBean("target");
+		ITargetObject target = (ITargetObject) appContext.getBean("target");
 
-        try {
-            target.makeLowerCase("TEST");
-            fail("AuthenticationCredentialsNotFoundException expected");
-        } catch (AuthenticationCredentialsNotFoundException expected) {
-        }
+		try {
+			target.makeLowerCase("TEST");
+			fail("AuthenticationCredentialsNotFoundException expected");
+		}
+		catch (AuthenticationCredentialsNotFoundException expected) {
+		}
 
-        target.makeUpperCase("test");
+		target.makeUpperCase("test");
 
-    }
+	}
 
-    private void setContext(String context) {
-        appContext = new InMemoryXmlApplicationContext(context);
-    }
+	private void setContext(String context) {
+		appContext = new InMemoryXmlApplicationContext(context);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java
index 1e58227975..f62f52a476 100644
--- a/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java
+++ b/core/src/main/java/org/springframework/security/access/AccessDecisionManager.java
@@ -26,44 +26,51 @@ import org.springframework.security.core.Authentication;
  * @author Ben Alex
  */
 public interface AccessDecisionManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Resolves an access control decision for the passed parameters.
-     *
-     * @param authentication the caller invoking the method (not null)
-     * @param object the secured object being called
-     * @param configAttributes the configuration attributes associated with the secured object being invoked
-     *
-     * @throws AccessDeniedException if access is denied as the authentication does not hold a required authority or
-     *         ACL privilege
-     * @throws InsufficientAuthenticationException if access is denied as the authentication does not provide a
-     *         sufficient level of trust
-     */
-    void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes)
-        throws AccessDeniedException, InsufficientAuthenticationException;
+	/**
+	 * Resolves an access control decision for the passed parameters.
+	 *
+	 * @param authentication the caller invoking the method (not null)
+	 * @param object the secured object being called
+	 * @param configAttributes the configuration attributes associated with the secured
+	 * object being invoked
+	 *
+	 * @throws AccessDeniedException if access is denied as the authentication does not
+	 * hold a required authority or ACL privilege
+	 * @throws InsufficientAuthenticationException if access is denied as the
+	 * authentication does not provide a sufficient level of trust
+	 */
+	void decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> configAttributes) throws AccessDeniedException,
+			InsufficientAuthenticationException;
 
-    /**
-     * Indicates whether this <code>AccessDecisionManager</code> is able to process authorization requests
-     * presented with the passed <code>ConfigAttribute</code>.<p>This allows the
-     * <code>AbstractSecurityInterceptor</code> to check every configuration attribute can be consumed by the
-     * configured <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
-     * <code>AfterInvocationManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return true if this <code>AccessDecisionManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>AccessDecisionManager</code> is able to process
+	 * authorization requests presented with the passed <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>AbstractSecurityInterceptor</code> to check every
+	 * configuration attribute can be consumed by the configured
+	 * <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
+	 * <code>AfterInvocationManager</code>.
+	 * </p>
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <code>AbstractSecurityInterceptor</code>
+	 *
+	 * @return true if this <code>AccessDecisionManager</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 
-    /**
-     * Indicates whether the <code>AccessDecisionManager</code> implementation is able to provide access
-     * control decisions for the indicated secured object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return <code>true</code> if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the <code>AccessDecisionManager</code> implementation is able to
+	 * provide access control decisions for the indicated secured object type.
+	 *
+	 * @param clazz the class that is being queried
+	 *
+	 * @return <code>true</code> if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 }
diff --git a/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java b/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java
index cfc3715a3b..0c2c9b5aa6 100644
--- a/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java
+++ b/core/src/main/java/org/springframework/security/access/AccessDecisionVoter.java
@@ -19,71 +19,81 @@ import java.util.Collection;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Indicates a class is responsible for voting on authorization decisions.
  * <p>
- * The coordination of voting (ie polling {@code AccessDecisionVoter}s,
- * tallying their responses, and making the final authorization decision) is
- * performed by an {@link org.springframework.security.access.AccessDecisionManager}.
+ * The coordination of voting (ie polling {@code AccessDecisionVoter}s, tallying their
+ * responses, and making the final authorization decision) is performed by an
+ * {@link org.springframework.security.access.AccessDecisionManager}.
  *
  * @author Ben Alex
  */
 public interface AccessDecisionVoter<S> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    int ACCESS_GRANTED = 1;
-    int ACCESS_ABSTAIN = 0;
-    int ACCESS_DENIED = -1;
+	int ACCESS_GRANTED = 1;
+	int ACCESS_ABSTAIN = 0;
+	int ACCESS_DENIED = -1;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Indicates whether this {@code AccessDecisionVoter} is able to vote on the passed {@code ConfigAttribute}.
-     * <p>
-     * This allows the {@code AbstractSecurityInterceptor} to check every configuration attribute can be consumed by
-     * the configured {@code AccessDecisionManager} and/or {@code RunAsManager} and/or {@code AfterInvocationManager}.
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        {@code AbstractSecurityInterceptor}
-     *
-     * @return true if this {@code AccessDecisionVoter} can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this {@code AccessDecisionVoter} is able to vote on the passed
+	 * {@code ConfigAttribute}.
+	 * <p>
+	 * This allows the {@code AbstractSecurityInterceptor} to check every configuration
+	 * attribute can be consumed by the configured {@code AccessDecisionManager} and/or
+	 * {@code RunAsManager} and/or {@code AfterInvocationManager}.
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * {@code AbstractSecurityInterceptor}
+	 *
+	 * @return true if this {@code AccessDecisionVoter} can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 
-    /**
-     * Indicates whether the {@code AccessDecisionVoter} implementation is able to provide access control
-     * votes for the indicated secured object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return true if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the {@code AccessDecisionVoter} implementation is able to provide
+	 * access control votes for the indicated secured object type.
+	 *
+	 * @param clazz the class that is being queried
+	 *
+	 * @return true if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 
-    /**
-     * Indicates whether or not access is granted.
-     * <p>
-     * The decision must be affirmative ({@code ACCESS_GRANTED}), negative ({@code ACCESS_DENIED})
-     * or the {@code AccessDecisionVoter} can abstain ({@code ACCESS_ABSTAIN}) from voting.
-     * Under no circumstances should implementing classes return any other value. If a weighting of results is desired,
-     * this should be handled in a custom {@link org.springframework.security.access.AccessDecisionManager} instead.
-     * <p>
-     * Unless an {@code AccessDecisionVoter} is specifically intended to vote on an access control
-     * decision due to a passed method invocation or configuration attribute parameter, it must return
-     * {@code ACCESS_ABSTAIN}. This prevents the coordinating {@code AccessDecisionManager} from counting
-     * votes from those {@code AccessDecisionVoter}s without a legitimate interest in the access control
-     * decision.
-     * <p>
-     * Whilst the secured object (such as a {@code MethodInvocation}) is passed as a parameter to maximise flexibility
-     * in making access control decisions, implementing classes should not modify it or cause the represented invocation
-     * to take place (for example, by calling {@code MethodInvocation.proceed()}).
-     *
-     * @param authentication the caller making the invocation
-     * @param object the secured object being invoked
-     * @param attributes the configuration attributes associated with the secured object
-     *
-     * @return either {@link #ACCESS_GRANTED}, {@link #ACCESS_ABSTAIN} or {@link #ACCESS_DENIED}
-     */
-    int vote(Authentication authentication, S object, Collection<ConfigAttribute> attributes);
+	/**
+	 * Indicates whether or not access is granted.
+	 * <p>
+	 * The decision must be affirmative ({@code ACCESS_GRANTED}), negative (
+	 * {@code ACCESS_DENIED}) or the {@code AccessDecisionVoter} can abstain (
+	 * {@code ACCESS_ABSTAIN}) from voting. Under no circumstances should implementing
+	 * classes return any other value. If a weighting of results is desired, this should
+	 * be handled in a custom
+	 * {@link org.springframework.security.access.AccessDecisionManager} instead.
+	 * <p>
+	 * Unless an {@code AccessDecisionVoter} is specifically intended to vote on an access
+	 * control decision due to a passed method invocation or configuration attribute
+	 * parameter, it must return {@code ACCESS_ABSTAIN}. This prevents the coordinating
+	 * {@code AccessDecisionManager} from counting votes from those
+	 * {@code AccessDecisionVoter}s without a legitimate interest in the access control
+	 * decision.
+	 * <p>
+	 * Whilst the secured object (such as a {@code MethodInvocation}) is passed as a
+	 * parameter to maximise flexibility in making access control decisions, implementing
+	 * classes should not modify it or cause the represented invocation to take place (for
+	 * example, by calling {@code MethodInvocation.proceed()}).
+	 *
+	 * @param authentication the caller making the invocation
+	 * @param object the secured object being invoked
+	 * @param attributes the configuration attributes associated with the secured object
+	 *
+	 * @return either {@link #ACCESS_GRANTED}, {@link #ACCESS_ABSTAIN} or
+	 * {@link #ACCESS_DENIED}
+	 */
+	int vote(Authentication authentication, S object,
+			Collection<ConfigAttribute> attributes);
 }
diff --git a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
index 42d9fb3669..2b51fcacfa 100644
--- a/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
+++ b/core/src/main/java/org/springframework/security/access/AccessDeniedException.java
@@ -16,32 +16,32 @@
 package org.springframework.security.access;
 
 /**
- * Thrown if an {@link org.springframework.security.core.Authentication Authentication} object does not hold a
- * required authority.
+ * Thrown if an {@link org.springframework.security.core.Authentication Authentication}
+ * object does not hold a required authority.
  *
  * @author Ben Alex
  */
 public class AccessDeniedException extends RuntimeException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>AccessDeniedException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public AccessDeniedException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AccessDeniedException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AccessDeniedException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>AccessDeniedException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AccessDeniedException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>AccessDeniedException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AccessDeniedException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java b/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java
index 8dc0b56596..50502013fd 100644
--- a/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java
+++ b/core/src/main/java/org/springframework/security/access/AfterInvocationProvider.java
@@ -20,39 +20,45 @@ import java.util.Collection;
 import org.springframework.security.access.intercept.AfterInvocationProviderManager;
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Indicates a class is responsible for participating in an {@link AfterInvocationProviderManager} decision.
+ * Indicates a class is responsible for participating in an
+ * {@link AfterInvocationProviderManager} decision.
  *
  * @author Ben Alex
  */
 public interface AfterInvocationProvider {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> attributes,
-        Object returnedObject) throws AccessDeniedException;
+	Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes, Object returnedObject)
+			throws AccessDeniedException;
 
-    /**
-     * Indicates whether this <code>AfterInvocationProvider</code> is able to participate in a decision
-     * involving the passed <code>ConfigAttribute</code>.<p>This allows the
-     * <code>AbstractSecurityInterceptor</code> to check every configuration attribute can be consumed by the
-     * configured <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
-     * <code>AccessDecisionManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return true if this <code>AfterInvocationProvider</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>AfterInvocationProvider</code> is able to participate
+	 * in a decision involving the passed <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>AbstractSecurityInterceptor</code> to check every
+	 * configuration attribute can be consumed by the configured
+	 * <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
+	 * <code>AccessDecisionManager</code>.
+	 * </p>
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <code>AbstractSecurityInterceptor</code>
+	 *
+	 * @return true if this <code>AfterInvocationProvider</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 
-    /**
-     * Indicates whether the <code>AfterInvocationProvider</code> is able to provide "after invocation"
-     * processing for the indicated secured object type.
-     *
-     * @param clazz the class of secure object that is being queried
-     *
-     * @return true if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the <code>AfterInvocationProvider</code> is able to provide
+	 * "after invocation" processing for the indicated secured object type.
+	 *
+	 * @param clazz the class of secure object that is being queried
+	 *
+	 * @return true if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 }
diff --git a/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java
index 43f2d0a97d..c00771ddef 100644
--- a/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java
+++ b/core/src/main/java/org/springframework/security/access/AuthorizationServiceException.java
@@ -18,32 +18,33 @@ package org.springframework.security.access;
 /**
  * Thrown if an authorization request could not be processed due to a system problem.
  * <p>
- * This might be thrown if an <code>AccessDecisionManager</code> implementation could not locate a required method
- * argument, for example.
+ * This might be thrown if an <code>AccessDecisionManager</code> implementation could not
+ * locate a required method argument, for example.
  *
  * @author Ben Alex
  */
 public class AuthorizationServiceException extends AccessDeniedException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>AuthorizationServiceException</code> with the
-     * specified message.
-     *
-     * @param msg the detail message
-     */
-    public AuthorizationServiceException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AuthorizationServiceException</code> with the specified
+	 * message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AuthorizationServiceException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>AuthorizationServiceException</code> with the
-     * specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AuthorizationServiceException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>AuthorizationServiceException</code> with the specified message
+	 * and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AuthorizationServiceException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java
index 4b1e9e823f..5b657f022b 100644
--- a/core/src/main/java/org/springframework/security/access/ConfigAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/ConfigAttribute.java
@@ -19,37 +19,42 @@ import java.io.Serializable;
 
 import org.springframework.security.access.intercept.RunAsManager;
 
-
 /**
  * Stores a security system related configuration attribute.
  *
  * <p>
- * When an {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor}
- * is set up, a list of configuration attributes is defined for secure object
- * patterns. These configuration attributes have special meaning to a {@link RunAsManager},
+ * When an
+ * {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor} is
+ * set up, a list of configuration attributes is defined for secure object patterns. These
+ * configuration attributes have special meaning to a {@link RunAsManager},
  * {@link AccessDecisionManager} or <code>AccessDecisionManager</code> delegate.
  *
  * <p>
- * Stored at runtime with other <code>ConfigAttribute</code>s for the same secure object target.
+ * Stored at runtime with other <code>ConfigAttribute</code>s for the same secure object
+ * target.
  *
  * @author Ben Alex
  */
 public interface ConfigAttribute extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * If the <code>ConfigAttribute</code> can be represented as a <code>String</code> and that
-     * <code>String</code> is sufficient in precision to be relied upon as a configuration parameter by a {@link
-     * RunAsManager}, {@link AccessDecisionManager} or <code>AccessDecisionManager</code> delegate, this method should
-     * return such a <code>String</code>.
-     * <p>
-     * If the <code>ConfigAttribute</code> cannot be expressed with sufficient precision as a <code>String</code>,
-     * <code>null</code> should be returned. Returning <code>null</code> will require any relying classes to
-     * specifically support the <code>ConfigAttribute</code> implementation, so returning <code>null</code> should
-     * be avoided unless actually required.
-     *
-     * @return a representation of the configuration attribute (or <code>null</code> if the configuration attribute
-     *         cannot be expressed as a <code>String</code> with sufficient precision).
-     */
-    String getAttribute();
+	/**
+	 * If the <code>ConfigAttribute</code> can be represented as a <code>String</code> and
+	 * that <code>String</code> is sufficient in precision to be relied upon as a
+	 * configuration parameter by a {@link RunAsManager}, {@link AccessDecisionManager} or
+	 * <code>AccessDecisionManager</code> delegate, this method should return such a
+	 * <code>String</code>.
+	 * <p>
+	 * If the <code>ConfigAttribute</code> cannot be expressed with sufficient precision
+	 * as a <code>String</code>, <code>null</code> should be returned. Returning
+	 * <code>null</code> will require any relying classes to specifically support the
+	 * <code>ConfigAttribute</code> implementation, so returning <code>null</code> should
+	 * be avoided unless actually required.
+	 *
+	 * @return a representation of the configuration attribute (or <code>null</code> if
+	 * the configuration attribute cannot be expressed as a <code>String</code> with
+	 * sufficient precision).
+	 */
+	String getAttribute();
 }
diff --git a/core/src/main/java/org/springframework/security/access/PermissionCacheOptimizer.java b/core/src/main/java/org/springframework/security/access/PermissionCacheOptimizer.java
index c022982970..7f493b72b8 100644
--- a/core/src/main/java/org/springframework/security/access/PermissionCacheOptimizer.java
+++ b/core/src/main/java/org/springframework/security/access/PermissionCacheOptimizer.java
@@ -12,12 +12,14 @@ import org.springframework.security.core.Authentication;
  * @since 3.1
  */
 public interface PermissionCacheOptimizer extends AopInfrastructureBean {
-    /**
-     * Optimises the permission cache for anticipated operation on the supplied collection of objects.
-     * Usually this will entail batch loading of permissions for the objects in the collection.
-     *
-     * @param a the user for whom permissions should be obtained.
-     * @param objects the (non-null) collection of domain objects for which permissions should be retrieved.
-     */
-    void cachePermissionsFor(Authentication a, Collection<?> objects);
+	/**
+	 * Optimises the permission cache for anticipated operation on the supplied collection
+	 * of objects. Usually this will entail batch loading of permissions for the objects
+	 * in the collection.
+	 *
+	 * @param a the user for whom permissions should be obtained.
+	 * @param objects the (non-null) collection of domain objects for which permissions
+	 * should be retrieved.
+	 */
+	void cachePermissionsFor(Authentication a, Collection<?> objects);
 }
diff --git a/core/src/main/java/org/springframework/security/access/PermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/PermissionEvaluator.java
index 28d6044bc0..05aceaa073 100644
--- a/core/src/main/java/org/springframework/security/access/PermissionEvaluator.java
+++ b/core/src/main/java/org/springframework/security/access/PermissionEvaluator.java
@@ -6,34 +6,39 @@ import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.security.core.Authentication;
 
 /**
- * Strategy used in expression evaluation to determine whether a user has a permission or permissions
- * for a given domain object.
+ * Strategy used in expression evaluation to determine whether a user has a permission or
+ * permissions for a given domain object.
  *
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface PermissionEvaluator extends AopInfrastructureBean {
-    /**
-     *
-     * @param authentication represents the user in question. Should not be null.
-     * @param targetDomainObject the domain object for which permissions should be checked. May be null
-     *          in which case implementations should return false, as the null condition can be checked explicitly
-     *          in the expression.
-     * @param permission a representation of the permission object as supplied by the expression system. Not null.
-     * @return true if the permission is granted, false otherwise
-     */
-    boolean hasPermission(Authentication authentication, Object targetDomainObject, Object permission);
+	/**
+	 *
+	 * @param authentication represents the user in question. Should not be null.
+	 * @param targetDomainObject the domain object for which permissions should be
+	 * checked. May be null in which case implementations should return false, as the null
+	 * condition can be checked explicitly in the expression.
+	 * @param permission a representation of the permission object as supplied by the
+	 * expression system. Not null.
+	 * @return true if the permission is granted, false otherwise
+	 */
+	boolean hasPermission(Authentication authentication, Object targetDomainObject,
+			Object permission);
 
-    /**
-     * Alternative method for evaluating a permission where only the identifier of the target object
-     * is available, rather than the target instance itself.
-     *
-     * @param authentication represents the user in question. Should not be null.
-     * @param targetId the identifier for the object instance (usually a Long)
-     * @param targetType a String representing the target's type (usually a Java classname). Not null.
-     * @param permission a representation of the permission object as supplied by the expression system. Not null.
-     * @return true if the permission is granted, false otherwise
-     */
-    boolean hasPermission(Authentication authentication, Serializable targetId, String targetType, Object permission);
+	/**
+	 * Alternative method for evaluating a permission where only the identifier of the
+	 * target object is available, rather than the target instance itself.
+	 *
+	 * @param authentication represents the user in question. Should not be null.
+	 * @param targetId the identifier for the object instance (usually a Long)
+	 * @param targetType a String representing the target's type (usually a Java
+	 * classname). Not null.
+	 * @param permission a representation of the permission object as supplied by the
+	 * expression system. Not null.
+	 * @return true if the permission is granted, false otherwise
+	 */
+	boolean hasPermission(Authentication authentication, Serializable targetId,
+			String targetType, Object permission);
 }
diff --git a/core/src/main/java/org/springframework/security/access/SecurityConfig.java b/core/src/main/java/org/springframework/security/access/SecurityConfig.java
index 4ae6ecefc6..be9a53a291 100644
--- a/core/src/main/java/org/springframework/security/access/SecurityConfig.java
+++ b/core/src/main/java/org/springframework/security/access/SecurityConfig.java
@@ -27,53 +27,57 @@ import org.springframework.util.StringUtils;
  * @author Ben Alex
  */
 public class SecurityConfig implements ConfigAttribute {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String attrib;
+	private final String attrib;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SecurityConfig(String config) {
-        Assert.hasText(config, "You must provide a configuration attribute");
-        this.attrib = config;
-    }
+	public SecurityConfig(String config) {
+		Assert.hasText(config, "You must provide a configuration attribute");
+		this.attrib = config;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object obj) {
-        if (obj instanceof ConfigAttribute) {
-            ConfigAttribute attr = (ConfigAttribute) obj;
+	public boolean equals(Object obj) {
+		if (obj instanceof ConfigAttribute) {
+			ConfigAttribute attr = (ConfigAttribute) obj;
 
-            return this.attrib.equals(attr.getAttribute());
-        }
+			return this.attrib.equals(attr.getAttribute());
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public String getAttribute() {
-        return this.attrib;
-    }
+	public String getAttribute() {
+		return this.attrib;
+	}
 
-    public int hashCode() {
-        return this.attrib.hashCode();
-    }
+	public int hashCode() {
+		return this.attrib.hashCode();
+	}
 
-    public String toString() {
-        return this.attrib;
-    }
+	public String toString() {
+		return this.attrib;
+	}
 
-    public static List<ConfigAttribute> createListFromCommaDelimitedString(String access) {
-        return createList(StringUtils.commaDelimitedListToStringArray(access));
-    }
+	public static List<ConfigAttribute> createListFromCommaDelimitedString(String access) {
+		return createList(StringUtils.commaDelimitedListToStringArray(access));
+	}
 
-    public static List<ConfigAttribute> createList(String... attributeNames) {
-        Assert.notNull(attributeNames, "You must supply an array of attribute names");
-        List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(attributeNames.length);
+	public static List<ConfigAttribute> createList(String... attributeNames) {
+		Assert.notNull(attributeNames, "You must supply an array of attribute names");
+		List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(
+				attributeNames.length);
 
-        for (String attribute : attributeNames) {
-            attributes.add(new SecurityConfig(attribute.trim()));
-        }
+		for (String attribute : attributeNames) {
+			attributes.add(new SecurityConfig(attribute.trim()));
+		}
 
-        return attributes;
-    }
+		return attributes;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java
index efc018df06..b368accaa0 100644
--- a/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/SecurityMetadataSource.java
@@ -20,46 +20,48 @@ import java.util.Collection;
 import org.springframework.aop.framework.AopInfrastructureBean;
 import org.springframework.security.access.intercept.AbstractSecurityInterceptor;
 
-
 /**
- * Implemented by classes that store and can identify the {@link ConfigAttribute}s that applies to a given secure object
- * invocation.
+ * Implemented by classes that store and can identify the {@link ConfigAttribute}s that
+ * applies to a given secure object invocation.
  *
  * @author Ben Alex
  */
 public interface SecurityMetadataSource extends AopInfrastructureBean {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Accesses the {@code ConfigAttribute}s that apply to a given secure object.
-     *
-     * @param object the object being secured
-     *
-     * @return the attributes that apply to the passed in secured object. Should return an empty collection if there
-     *         are no applicable attributes.
-     *
-     * @throws IllegalArgumentException if the passed object is not of a type supported by the
-     *         <code>SecurityMetadataSource</code> implementation
-     */
-    Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException;
+	/**
+	 * Accesses the {@code ConfigAttribute}s that apply to a given secure object.
+	 *
+	 * @param object the object being secured
+	 *
+	 * @return the attributes that apply to the passed in secured object. Should return an
+	 * empty collection if there are no applicable attributes.
+	 *
+	 * @throws IllegalArgumentException if the passed object is not of a type supported by
+	 * the <code>SecurityMetadataSource</code> implementation
+	 */
+	Collection<ConfigAttribute> getAttributes(Object object)
+			throws IllegalArgumentException;
 
-    /**
-     * If available, returns all of the {@code ConfigAttribute}s defined by the implementing class.
-     * <p>
-     * This is used by the {@link AbstractSecurityInterceptor} to perform startup time validation of each
-     * {@code ConfigAttribute} configured against it.
-     *
-     * @return the {@code ConfigAttribute}s or {@code null} if unsupported
-     */
-    Collection<ConfigAttribute> getAllConfigAttributes();
+	/**
+	 * If available, returns all of the {@code ConfigAttribute}s defined by the
+	 * implementing class.
+	 * <p>
+	 * This is used by the {@link AbstractSecurityInterceptor} to perform startup time
+	 * validation of each {@code ConfigAttribute} configured against it.
+	 *
+	 * @return the {@code ConfigAttribute}s or {@code null} if unsupported
+	 */
+	Collection<ConfigAttribute> getAllConfigAttributes();
 
-    /**
-     * Indicates whether the {@code SecurityMetadataSource} implementation is able to provide
-     * {@code ConfigAttribute}s for the indicated secure object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return true if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the {@code SecurityMetadataSource} implementation is able to
+	 * provide {@code ConfigAttribute}s for the indicated secure object type.
+	 *
+	 * @param clazz the class that is being queried
+	 *
+	 * @return true if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 }
diff --git a/core/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java b/core/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java
index ac7bfac65e..200a325f98 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/AnnotationMetadataExtractor.java
@@ -6,8 +6,8 @@ import java.lang.annotation.Annotation;
 import java.util.*;
 
 /**
- * Strategy to process a custom security annotation to extract the relevant {@code ConfigAttribute}s for
- * securing a method.
+ * Strategy to process a custom security annotation to extract the relevant
+ * {@code ConfigAttribute}s for securing a method.
  * <p>
  * Used by {@code SecuredAnnotationSecurityMetadataSource}.
  *
@@ -15,5 +15,5 @@ import java.util.*;
  */
 public interface AnnotationMetadataExtractor<A extends Annotation> {
 
-    Collection<? extends ConfigAttribute> extractAttributes(A securityAnnotation);
+	Collection<? extends ConfigAttribute> extractAttributes(A securityAnnotation);
 }
diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java
index 80fec3b793..3dbf99210a 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java
@@ -29,83 +29,85 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource;
 
-
 /**
  * Sources method security metadata from major JSR 250 security annotations.
  *
  * @author Ben Alex
  * @since 2.0
  */
-public class Jsr250MethodSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource {
+public class Jsr250MethodSecurityMetadataSource extends
+		AbstractFallbackMethodSecurityMetadataSource {
 
-    private String defaultRolePrefix = "ROLE_";
+	private String defaultRolePrefix = "ROLE_";
 
-    /**
-     * <p>
-     * Sets the default prefix to be added to {@link RolesAllowed}. For example, if {@code @RolesAllowed("ADMIN")} or {@code @RolesAllowed("ADMIN")} is used,
-     * then the role ROLE_ADMIN will be used when the defaultRolePrefix is "ROLE_" (default).
-     * </p>
-     *
-     * <p>
-     * If null or empty, then no default role prefix is used.
-     * </p>
-     *
-     * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
-     */
-    public void setDefaultRolePrefix(String defaultRolePrefix) {
-        this.defaultRolePrefix = defaultRolePrefix;
-    }
+	/**
+	 * <p>
+	 * Sets the default prefix to be added to {@link RolesAllowed}. For example, if
+	 * {@code @RolesAllowed("ADMIN")} or {@code @RolesAllowed("ADMIN")} is used, then the
+	 * role ROLE_ADMIN will be used when the defaultRolePrefix is "ROLE_" (default).
+	 * </p>
+	 *
+	 * <p>
+	 * If null or empty, then no default role prefix is used.
+	 * </p>
+	 *
+	 * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
+	 */
+	public void setDefaultRolePrefix(String defaultRolePrefix) {
+		this.defaultRolePrefix = defaultRolePrefix;
+	}
 
-    protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
-        return processAnnotations(clazz.getAnnotations());
-    }
+	protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
+		return processAnnotations(clazz.getAnnotations());
+	}
 
-    protected Collection<ConfigAttribute> findAttributes(Method method, Class<?> targetClass) {
-        return processAnnotations(AnnotationUtils.getAnnotations(method));
-    }
+	protected Collection<ConfigAttribute> findAttributes(Method method,
+			Class<?> targetClass) {
+		return processAnnotations(AnnotationUtils.getAnnotations(method));
+	}
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        return null;
-    }
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		return null;
+	}
 
-    private List<ConfigAttribute> processAnnotations(Annotation[] annotations) {
-        if (annotations == null || annotations.length == 0) {
-            return null;
-        }
-        List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>();
+	private List<ConfigAttribute> processAnnotations(Annotation[] annotations) {
+		if (annotations == null || annotations.length == 0) {
+			return null;
+		}
+		List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>();
 
-        for (Annotation a: annotations) {
-            if (a instanceof DenyAll) {
-                attributes.add(Jsr250SecurityConfig.DENY_ALL_ATTRIBUTE);
-                return attributes;
-            }
-            if (a instanceof PermitAll) {
-                attributes.add(Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE);
-                return attributes;
-            }
-            if (a instanceof RolesAllowed) {
-                RolesAllowed ra = (RolesAllowed) a;
+		for (Annotation a : annotations) {
+			if (a instanceof DenyAll) {
+				attributes.add(Jsr250SecurityConfig.DENY_ALL_ATTRIBUTE);
+				return attributes;
+			}
+			if (a instanceof PermitAll) {
+				attributes.add(Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE);
+				return attributes;
+			}
+			if (a instanceof RolesAllowed) {
+				RolesAllowed ra = (RolesAllowed) a;
 
-                for (String allowed : ra.value()) {
-                    String defaultedAllowed = getRoleWithDefaultPrefix(allowed);
-                    attributes.add(new Jsr250SecurityConfig(defaultedAllowed));
-                }
-                return attributes;
-            }
-        }
-        return null;
-    }
+				for (String allowed : ra.value()) {
+					String defaultedAllowed = getRoleWithDefaultPrefix(allowed);
+					attributes.add(new Jsr250SecurityConfig(defaultedAllowed));
+				}
+				return attributes;
+			}
+		}
+		return null;
+	}
 
-    private String getRoleWithDefaultPrefix(String role) {
-        if(role == null) {
-            return role;
-        }
-        if(defaultRolePrefix == null || defaultRolePrefix.length() == 0) {
-            return role;
-        }
-        if(role.startsWith(defaultRolePrefix)) {
-            return role;
-        }
-        return defaultRolePrefix + role;
-    }
+	private String getRoleWithDefaultPrefix(String role) {
+		if (role == null) {
+			return role;
+		}
+		if (defaultRolePrefix == null || defaultRolePrefix.length() == 0) {
+			return role;
+		}
+		if (role.startsWith(defaultRolePrefix)) {
+			return role;
+		}
+		return defaultRolePrefix + role;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java
index f69cccf4c8..1706253ebc 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250SecurityConfig.java
@@ -12,11 +12,13 @@ import javax.annotation.security.DenyAll;
  * @since 2.0
  */
 public class Jsr250SecurityConfig extends SecurityConfig {
-    public static final Jsr250SecurityConfig PERMIT_ALL_ATTRIBUTE = new Jsr250SecurityConfig(PermitAll.class.getName());
-    public static final Jsr250SecurityConfig DENY_ALL_ATTRIBUTE = new Jsr250SecurityConfig(DenyAll.class.getName());
+	public static final Jsr250SecurityConfig PERMIT_ALL_ATTRIBUTE = new Jsr250SecurityConfig(
+			PermitAll.class.getName());
+	public static final Jsr250SecurityConfig DENY_ALL_ATTRIBUTE = new Jsr250SecurityConfig(
+			DenyAll.class.getName());
 
-    public Jsr250SecurityConfig(String role) {
-        super(role);
-    }
+	public Jsr250SecurityConfig(String role) {
+		super(role);
+	}
 
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java
index 82f6948782..f54e49028e 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250Voter.java
@@ -15,61 +15,62 @@ import org.springframework.security.core.GrantedAuthority;
  */
 public class Jsr250Voter implements AccessDecisionVoter<Object> {
 
-    /**
-     * The specified config attribute is supported if its an instance of a {@link Jsr250SecurityConfig}.
-     *
-     * @param configAttribute The config attribute.
-     * @return whether the config attribute is supported.
-     */
-    public boolean supports(ConfigAttribute configAttribute) {
-        return configAttribute instanceof Jsr250SecurityConfig;
-    }
+	/**
+	 * The specified config attribute is supported if its an instance of a
+	 * {@link Jsr250SecurityConfig}.
+	 *
+	 * @param configAttribute The config attribute.
+	 * @return whether the config attribute is supported.
+	 */
+	public boolean supports(ConfigAttribute configAttribute) {
+		return configAttribute instanceof Jsr250SecurityConfig;
+	}
 
-    /**
-     * All classes are supported.
-     *
-     * @param clazz the class.
-     * @return true
-     */
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	/**
+	 * All classes are supported.
+	 *
+	 * @param clazz the class.
+	 * @return true
+	 */
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
-    /**
-     * Votes according to JSR 250.
-     * <p>
-     * If no JSR-250 attributes are found, it will abstain, otherwise it will grant or deny access
-     * based on the attributes that are found.
-     *
-     * @param authentication The authentication object.
-     * @param object         The access object.
-     * @param definition     The configuration definition.
-     * @return The vote.
-     */
-    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> definition) {
-        boolean jsr250AttributeFound = false;
+	/**
+	 * Votes according to JSR 250.
+	 * <p>
+	 * If no JSR-250 attributes are found, it will abstain, otherwise it will grant or
+	 * deny access based on the attributes that are found.
+	 *
+	 * @param authentication The authentication object.
+	 * @param object The access object.
+	 * @param definition The configuration definition.
+	 * @return The vote.
+	 */
+	public int vote(Authentication authentication, Object object,
+			Collection<ConfigAttribute> definition) {
+		boolean jsr250AttributeFound = false;
 
-        for (ConfigAttribute attribute : definition) {
-            if (Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE.equals(attribute)) {
-                return ACCESS_GRANTED;
-            }
+		for (ConfigAttribute attribute : definition) {
+			if (Jsr250SecurityConfig.PERMIT_ALL_ATTRIBUTE.equals(attribute)) {
+				return ACCESS_GRANTED;
+			}
 
-            if (Jsr250SecurityConfig.DENY_ALL_ATTRIBUTE.equals(attribute)) {
-                return ACCESS_DENIED;
-            }
+			if (Jsr250SecurityConfig.DENY_ALL_ATTRIBUTE.equals(attribute)) {
+				return ACCESS_DENIED;
+			}
 
-            if (supports(attribute)) {
-                jsr250AttributeFound = true;
-                // Attempt to find a matching granted authority
-                for (GrantedAuthority authority : authentication.getAuthorities()) {
-                    if (attribute.getAttribute().equals(authority.getAuthority())) {
-                        return ACCESS_GRANTED;
-                    }
-                }
-            }
-        }
+			if (supports(attribute)) {
+				jsr250AttributeFound = true;
+				// Attempt to find a matching granted authority
+				for (GrantedAuthority authority : authentication.getAuthorities()) {
+					if (attribute.getAttribute().equals(authority.getAuthority())) {
+						return ACCESS_GRANTED;
+					}
+				}
+			}
+		}
 
-        return jsr250AttributeFound ? ACCESS_DENIED : ACCESS_ABSTAIN;
-    }
+		return jsr250AttributeFound ? ACCESS_DENIED : ACCESS_ABSTAIN;
+	}
 }
-
diff --git a/core/src/main/java/org/springframework/security/access/annotation/Secured.java b/core/src/main/java/org/springframework/security/access/annotation/Secured.java
index 8cd792d76c..ef5e12d8a6 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/Secured.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/Secured.java
@@ -25,31 +25,34 @@ import java.lang.annotation.Target;
 /**
  * Java 5 annotation for describing service layer security attributes.
  *
- * <p>The <code>Secured</code> annotation is used to define a list of security
- * configuration attributes for business methods.  This annotation can be used
- * as a Java 5 alternative to XML configuration.
- * <p>For example:
+ * <p>
+ * The <code>Secured</code> annotation is used to define a list of security configuration
+ * attributes for business methods. This annotation can be used as a Java 5 alternative to
+ * XML configuration.
+ * <p>
+ * For example:
+ * 
  * <pre>
- *     &#64;Secured ({"ROLE_USER"})
- *     public void create(Contact contact);
- *
- *     &#64;Secured ({"ROLE_USER", "ROLE_ADMIN"})
- *     public void update(Contact contact);
- *
- *     &#64;Secured ({"ROLE_ADMIN"})
- *     public void delete(Contact contact);
+ * &#064;Secured({ &quot;ROLE_USER&quot; })
+ * public void create(Contact contact);
+ * 
+ * &#064;Secured({ &quot;ROLE_USER&quot;, &quot;ROLE_ADMIN&quot; })
+ * public void update(Contact contact);
+ * 
+ * &#064;Secured({ &quot;ROLE_ADMIN&quot; })
+ * public void delete(Contact contact);
  * </pre>
  * @author Mark St.Godard
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface Secured {
-    /**
-     * Returns the list of security configuration attributes (e.g. ROLE_USER, ROLE_ADMIN).
-     *
-     * @return String[] The secure method attributes
-     */
-    public String[] value();
+	/**
+	 * Returns the list of security configuration attributes (e.g. ROLE_USER, ROLE_ADMIN).
+	 *
+	 * @return String[] The secure method attributes
+	 */
+	public String[] value();
 }
diff --git a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java
index f9a8d4267a..63a333fe86 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java
@@ -26,65 +26,70 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource;
 import org.springframework.util.Assert;
 
-
 /**
  * Sources method security metadata from Spring Security's {@link Secured} annotation.
  * <p>
- * Can also be used with custom security annotations by injecting an {@link AnnotationMetadataExtractor}.
- * The annotation type will then be obtained from the generic parameter type supplied to this interface
+ * Can also be used with custom security annotations by injecting an
+ * {@link AnnotationMetadataExtractor}. The annotation type will then be obtained from the
+ * generic parameter type supplied to this interface
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
-public class SecuredAnnotationSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource {
-    private AnnotationMetadataExtractor annotationExtractor;
-    private Class<? extends Annotation> annotationType;
+@SuppressWarnings({ "unchecked" })
+public class SecuredAnnotationSecurityMetadataSource extends
+		AbstractFallbackMethodSecurityMetadataSource {
+	private AnnotationMetadataExtractor annotationExtractor;
+	private Class<? extends Annotation> annotationType;
 
-    public SecuredAnnotationSecurityMetadataSource() {
-        this(new SecuredAnnotationMetadataExtractor());
-    }
+	public SecuredAnnotationSecurityMetadataSource() {
+		this(new SecuredAnnotationMetadataExtractor());
+	}
 
-    public SecuredAnnotationSecurityMetadataSource(AnnotationMetadataExtractor annotationMetadataExtractor) {
-        Assert.notNull(annotationMetadataExtractor);
-        annotationExtractor = annotationMetadataExtractor;
-        annotationType = (Class<? extends Annotation>) GenericTypeResolver.resolveTypeArgument(
-                annotationExtractor.getClass(), AnnotationMetadataExtractor.class);
-        Assert.notNull(annotationType, annotationExtractor.getClass().getName()
-                + " must supply a generic parameter for AnnotationMetadataExtractor");
-    }
+	public SecuredAnnotationSecurityMetadataSource(
+			AnnotationMetadataExtractor annotationMetadataExtractor) {
+		Assert.notNull(annotationMetadataExtractor);
+		annotationExtractor = annotationMetadataExtractor;
+		annotationType = (Class<? extends Annotation>) GenericTypeResolver
+				.resolveTypeArgument(annotationExtractor.getClass(),
+						AnnotationMetadataExtractor.class);
+		Assert.notNull(annotationType, annotationExtractor.getClass().getName()
+				+ " must supply a generic parameter for AnnotationMetadataExtractor");
+	}
 
-    protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
-        return processAnnotation(AnnotationUtils.findAnnotation(clazz, annotationType));
-    }
+	protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
+		return processAnnotation(AnnotationUtils.findAnnotation(clazz, annotationType));
+	}
 
-    protected Collection<ConfigAttribute> findAttributes(Method method, Class<?> targetClass) {
-        return processAnnotation(AnnotationUtils.findAnnotation(method, annotationType));
-    }
+	protected Collection<ConfigAttribute> findAttributes(Method method,
+			Class<?> targetClass) {
+		return processAnnotation(AnnotationUtils.findAnnotation(method, annotationType));
+	}
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        return null;
-    }
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		return null;
+	}
 
-    private Collection<ConfigAttribute> processAnnotation(Annotation a) {
-        if (a == null) {
-            return null;
-        }
+	private Collection<ConfigAttribute> processAnnotation(Annotation a) {
+		if (a == null) {
+			return null;
+		}
 
-        return annotationExtractor.extractAttributes(a);
-    }
+		return annotationExtractor.extractAttributes(a);
+	}
 }
 
 class SecuredAnnotationMetadataExtractor implements AnnotationMetadataExtractor<Secured> {
 
-    public Collection<ConfigAttribute> extractAttributes(Secured secured) {
-        String[] attributeTokens = secured.value();
-        List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(attributeTokens.length);
+	public Collection<ConfigAttribute> extractAttributes(Secured secured) {
+		String[] attributeTokens = secured.value();
+		List<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(
+				attributeTokens.length);
 
-        for(String token : attributeTokens) {
-            attributes.add(new SecurityConfig(token));
-        }
+		for (String token : attributeTokens) {
+			attributes.add(new SecurityConfig(token));
+		}
 
-        return attributes;
-    }
+		return attributes;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/annotation/package-info.java b/core/src/main/java/org/springframework/security/access/annotation/package-info.java
index cd5b575676..5e281880dd 100644
--- a/core/src/main/java/org/springframework/security/access/annotation/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/annotation/package-info.java
@@ -2,3 +2,4 @@
  * Support for JSR-250 and Spring Security {@code @Secured} annotations.  
  */
 package org.springframework.security.access.annotation;
+
diff --git a/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java b/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java
index 64dd6530d3..cb694c8c92 100644
--- a/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java
+++ b/core/src/main/java/org/springframework/security/access/event/AbstractAuthorizationEvent.java
@@ -17,21 +17,21 @@ package org.springframework.security.access.event;
 
 import org.springframework.context.ApplicationEvent;
 
-
 /**
  * Abstract superclass for all security interception related events.
  *
  * @author Ben Alex
  */
 public abstract class AbstractAuthorizationEvent extends ApplicationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Construct the event, passing in the secure object being intercepted.
-     *
-     * @param secureObject the secure object
-     */
-    public AbstractAuthorizationEvent(Object secureObject) {
-        super(secureObject);
-    }
+	/**
+	 * Construct the event, passing in the secure object being intercepted.
+	 *
+	 * @param secureObject the secure object
+	 */
+	public AbstractAuthorizationEvent(Object secureObject) {
+		super(secureObject);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java
index 17d5cb4cda..7489515ce2 100644
--- a/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java
+++ b/core/src/main/java/org/springframework/security/access/event/AuthenticationCredentialsNotFoundEvent.java
@@ -20,48 +20,53 @@ import java.util.Collection;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 
-
 /**
- * Indicates a secure object invocation failed because the <code>Authentication</code> could not be obtained from
- * the <code>SecurityContextHolder</code>.
+ * Indicates a secure object invocation failed because the <code>Authentication</code>
+ * could not be obtained from the <code>SecurityContextHolder</code>.
  *
  * @author Ben Alex
  */
 public class AuthenticationCredentialsNotFoundEvent extends AbstractAuthorizationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationCredentialsNotFoundException credentialsNotFoundException;
-    private Collection<ConfigAttribute> configAttribs;
+	private AuthenticationCredentialsNotFoundException credentialsNotFoundException;
+	private Collection<ConfigAttribute> configAttribs;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Construct the event.
-     *
-     * @param secureObject the secure object
-     * @param attributes that apply to the secure object
-     * @param credentialsNotFoundException exception returned to the caller (contains reason)
-     *
-     */
-    public AuthenticationCredentialsNotFoundEvent(Object secureObject, Collection<ConfigAttribute> attributes,
-            AuthenticationCredentialsNotFoundException credentialsNotFoundException) {
-        super(secureObject);
+	/**
+	 * Construct the event.
+	 *
+	 * @param secureObject the secure object
+	 * @param attributes that apply to the secure object
+	 * @param credentialsNotFoundException exception returned to the caller (contains
+	 * reason)
+	 *
+	 */
+	public AuthenticationCredentialsNotFoundEvent(Object secureObject,
+			Collection<ConfigAttribute> attributes,
+			AuthenticationCredentialsNotFoundException credentialsNotFoundException) {
+		super(secureObject);
 
-        if ((attributes == null) || (credentialsNotFoundException == null)) {
-            throw new IllegalArgumentException("All parameters are required and cannot be null");
-        }
+		if ((attributes == null) || (credentialsNotFoundException == null)) {
+			throw new IllegalArgumentException(
+					"All parameters are required and cannot be null");
+		}
 
-        this.configAttribs = attributes;
-        this.credentialsNotFoundException = credentialsNotFoundException;
-    }
+		this.configAttribs = attributes;
+		this.credentialsNotFoundException = credentialsNotFoundException;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<ConfigAttribute> getConfigAttributes() {
-        return configAttribs;
-    }
+	public Collection<ConfigAttribute> getConfigAttributes() {
+		return configAttribs;
+	}
 
-    public AuthenticationCredentialsNotFoundException getCredentialsNotFoundException() {
-        return credentialsNotFoundException;
-    }
+	public AuthenticationCredentialsNotFoundException getCredentialsNotFoundException() {
+		return credentialsNotFoundException;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java
index f3e685a6ed..f2614485fa 100644
--- a/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java
+++ b/core/src/main/java/org/springframework/security/access/event/AuthorizationFailureEvent.java
@@ -21,61 +21,68 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Indicates a secure object invocation failed because the principal could not
- * be authorized for the request.
+ * Indicates a secure object invocation failed because the principal could not be
+ * authorized for the request.
  *
- * <p>This event might be thrown as a result of either an
- * {@link org.springframework.security.access.AccessDecisionManager AccessDecisionManager} or an
- * {@link org.springframework.security.access.intercept.AfterInvocationManager AfterInvocationManager}.
+ * <p>
+ * This event might be thrown as a result of either an
+ * {@link org.springframework.security.access.AccessDecisionManager AccessDecisionManager}
+ * or an {@link org.springframework.security.access.intercept.AfterInvocationManager
+ * AfterInvocationManager}.
  *
  * @author Ben Alex
  */
 public class AuthorizationFailureEvent extends AbstractAuthorizationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AccessDeniedException accessDeniedException;
-    private Authentication authentication;
-    private Collection<ConfigAttribute> configAttributes;
+	private AccessDeniedException accessDeniedException;
+	private Authentication authentication;
+	private Collection<ConfigAttribute> configAttributes;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Construct the event.
-     *
-     * @param secureObject the secure object
-     * @param attributes that apply to the secure object
-     * @param authentication that was found in the <code>SecurityContextHolder</code>
-     * @param accessDeniedException that was returned by the
-     *        <code>AccessDecisionManager</code>
-     *
-     * @throws IllegalArgumentException if any null arguments are presented.
-     */
-    public AuthorizationFailureEvent(Object secureObject, Collection<ConfigAttribute> attributes,
-        Authentication authentication, AccessDeniedException accessDeniedException) {
-        super(secureObject);
+	/**
+	 * Construct the event.
+	 *
+	 * @param secureObject the secure object
+	 * @param attributes that apply to the secure object
+	 * @param authentication that was found in the <code>SecurityContextHolder</code>
+	 * @param accessDeniedException that was returned by the
+	 * <code>AccessDecisionManager</code>
+	 *
+	 * @throws IllegalArgumentException if any null arguments are presented.
+	 */
+	public AuthorizationFailureEvent(Object secureObject,
+			Collection<ConfigAttribute> attributes, Authentication authentication,
+			AccessDeniedException accessDeniedException) {
+		super(secureObject);
 
-        if ((attributes == null) || (authentication == null) || (accessDeniedException == null)) {
-            throw new IllegalArgumentException("All parameters are required and cannot be null");
-        }
+		if ((attributes == null) || (authentication == null)
+				|| (accessDeniedException == null)) {
+			throw new IllegalArgumentException(
+					"All parameters are required and cannot be null");
+		}
 
-        this.configAttributes = attributes;
-        this.authentication = authentication;
-        this.accessDeniedException = accessDeniedException;
-    }
+		this.configAttributes = attributes;
+		this.authentication = authentication;
+		this.accessDeniedException = accessDeniedException;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public AccessDeniedException getAccessDeniedException() {
-        return accessDeniedException;
-    }
+	public AccessDeniedException getAccessDeniedException() {
+		return accessDeniedException;
+	}
 
-    public Authentication getAuthentication() {
-        return authentication;
-    }
+	public Authentication getAuthentication() {
+		return authentication;
+	}
 
-    public Collection<ConfigAttribute> getConfigAttributes() {
-        return configAttributes;
-    }
+	public Collection<ConfigAttribute> getConfigAttributes() {
+		return configAttributes;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java
index 1f18725e36..5e85a2cbbd 100644
--- a/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java
+++ b/core/src/main/java/org/springframework/security/access/event/AuthorizedEvent.java
@@ -20,47 +20,53 @@ import java.util.Collection;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Event indicating a secure object was invoked successfully.<P>Published just before the secure object attempts to
- * proceed.</p>
+ * Event indicating a secure object was invoked successfully.
+ * <P>
+ * Published just before the secure object attempts to proceed.
+ * </p>
  *
  * @author Ben Alex
  */
 public class AuthorizedEvent extends AbstractAuthorizationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Authentication authentication;
-    private Collection<ConfigAttribute> configAttributes;
+	private Authentication authentication;
+	private Collection<ConfigAttribute> configAttributes;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Construct the event.
-     *
-     * @param secureObject the secure object
-     * @param attributes that apply to the secure object
-     * @param authentication that successfully called the secure object
-     *
-     */
-    public AuthorizedEvent(Object secureObject, Collection<ConfigAttribute> attributes, Authentication authentication) {
-        super(secureObject);
+	/**
+	 * Construct the event.
+	 *
+	 * @param secureObject the secure object
+	 * @param attributes that apply to the secure object
+	 * @param authentication that successfully called the secure object
+	 *
+	 */
+	public AuthorizedEvent(Object secureObject, Collection<ConfigAttribute> attributes,
+			Authentication authentication) {
+		super(secureObject);
 
-        if ((attributes == null) || (authentication == null)) {
-            throw new IllegalArgumentException("All parameters are required and cannot be null");
-        }
+		if ((attributes == null) || (authentication == null)) {
+			throw new IllegalArgumentException(
+					"All parameters are required and cannot be null");
+		}
 
-        this.configAttributes = attributes;
-        this.authentication = authentication;
-    }
+		this.configAttributes = attributes;
+		this.authentication = authentication;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication getAuthentication() {
-        return authentication;
-    }
+	public Authentication getAuthentication() {
+		return authentication;
+	}
 
-    public Collection<ConfigAttribute> getConfigAttributes() {
-        return configAttributes;
-    }
+	public Collection<ConfigAttribute> getConfigAttributes() {
+		return configAttributes;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/LoggerListener.java b/core/src/main/java/org/springframework/security/access/event/LoggerListener.java
index 7411498781..532c2f8a67 100644
--- a/core/src/main/java/org/springframework/security/access/event/LoggerListener.java
+++ b/core/src/main/java/org/springframework/security/access/event/LoggerListener.java
@@ -19,61 +19,68 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
 
-
 /**
  * Outputs interceptor-related application events to Commons Logging.
  * <p>
- * All failures are logged at the warning level, with success events logged at the information level,
- * and public invocation events logged at the debug level.
+ * All failures are logged at the warning level, with success events logged at the
+ * information level, and public invocation events logged at the debug level.
  * </p>
  *
  * @author Ben Alex
  */
 public class LoggerListener implements ApplicationListener<AbstractAuthorizationEvent> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(LoggerListener.class);
+	private static final Log logger = LogFactory.getLog(LoggerListener.class);
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void onApplicationEvent(AbstractAuthorizationEvent event) {
-        if (event instanceof AuthenticationCredentialsNotFoundEvent) {
-            AuthenticationCredentialsNotFoundEvent authEvent = (AuthenticationCredentialsNotFoundEvent) event;
+	public void onApplicationEvent(AbstractAuthorizationEvent event) {
+		if (event instanceof AuthenticationCredentialsNotFoundEvent) {
+			AuthenticationCredentialsNotFoundEvent authEvent = (AuthenticationCredentialsNotFoundEvent) event;
 
-            if (logger.isWarnEnabled()) {
-                logger.warn("Security interception failed due to: " + authEvent.getCredentialsNotFoundException()
-                    + "; secure object: " + authEvent.getSource() + "; configuration attributes: "
-                    + authEvent.getConfigAttributes());
-            }
-        }
+			if (logger.isWarnEnabled()) {
+				logger.warn("Security interception failed due to: "
+						+ authEvent.getCredentialsNotFoundException()
+						+ "; secure object: " + authEvent.getSource()
+						+ "; configuration attributes: "
+						+ authEvent.getConfigAttributes());
+			}
+		}
 
-        if (event instanceof AuthorizationFailureEvent) {
-            AuthorizationFailureEvent authEvent = (AuthorizationFailureEvent) event;
+		if (event instanceof AuthorizationFailureEvent) {
+			AuthorizationFailureEvent authEvent = (AuthorizationFailureEvent) event;
 
-            if (logger.isWarnEnabled()) {
-                logger.warn("Security authorization failed due to: " + authEvent.getAccessDeniedException()
-                    + "; authenticated principal: " + authEvent.getAuthentication()
-                    + "; secure object: " + authEvent.getSource()
-                    + "; configuration attributes: " + authEvent.getConfigAttributes());
-            }
-        }
+			if (logger.isWarnEnabled()) {
+				logger.warn("Security authorization failed due to: "
+						+ authEvent.getAccessDeniedException()
+						+ "; authenticated principal: " + authEvent.getAuthentication()
+						+ "; secure object: " + authEvent.getSource()
+						+ "; configuration attributes: "
+						+ authEvent.getConfigAttributes());
+			}
+		}
 
-        if (event instanceof AuthorizedEvent) {
-            AuthorizedEvent authEvent = (AuthorizedEvent) event;
+		if (event instanceof AuthorizedEvent) {
+			AuthorizedEvent authEvent = (AuthorizedEvent) event;
 
-            if (logger.isInfoEnabled()) {
-                logger.info("Security authorized for authenticated principal: " + authEvent.getAuthentication()
-                    + "; secure object: " + authEvent.getSource() + "; configuration attributes: "
-                    + authEvent.getConfigAttributes());
-            }
-        }
+			if (logger.isInfoEnabled()) {
+				logger.info("Security authorized for authenticated principal: "
+						+ authEvent.getAuthentication() + "; secure object: "
+						+ authEvent.getSource() + "; configuration attributes: "
+						+ authEvent.getConfigAttributes());
+			}
+		}
 
-        if (event instanceof PublicInvocationEvent) {
-            PublicInvocationEvent authEvent = (PublicInvocationEvent) event;
+		if (event instanceof PublicInvocationEvent) {
+			PublicInvocationEvent authEvent = (PublicInvocationEvent) event;
 
-            if (logger.isInfoEnabled()) {
-                logger.info("Security interception not required for public secure object: " + authEvent.getSource());
-            }
-        }
-    }
+			if (logger.isInfoEnabled()) {
+				logger.info("Security interception not required for public secure object: "
+						+ authEvent.getSource());
+			}
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java b/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java
index e53b494646..7dea4926d2 100644
--- a/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java
+++ b/core/src/main/java/org/springframework/security/access/event/PublicInvocationEvent.java
@@ -16,22 +16,28 @@
 package org.springframework.security.access.event;
 
 /**
- * Event that is generated whenever a public secure object is invoked.<p>A public secure object is a secure object
- * that has no <code>ConfigAttribute</code>s defined. A public secure object will not cause the
- * <code>SecurityContextHolder</code> to be inspected or authenticated, and no authorization will take place.</p>
- *  <p>Published just before the secure object attempts to proceed.</p>
+ * Event that is generated whenever a public secure object is invoked.
+ * <p>
+ * A public secure object is a secure object that has no <code>ConfigAttribute</code>s
+ * defined. A public secure object will not cause the <code>SecurityContextHolder</code>
+ * to be inspected or authenticated, and no authorization will take place.
+ * </p>
+ * <p>
+ * Published just before the secure object attempts to proceed.
+ * </p>
  *
  * @author Ben Alex
  */
 public class PublicInvocationEvent extends AbstractAuthorizationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-/**
-     * Construct the event, passing in the public secure object.
-     *
-     * @param secureObject the public secure object
-     */
-    public PublicInvocationEvent(Object secureObject) {
-        super(secureObject);
-    }
+	/**
+	 * Construct the event, passing in the public secure object.
+	 *
+	 * @param secureObject the public secure object
+	 */
+	public PublicInvocationEvent(Object secureObject) {
+		super(secureObject);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/event/package-info.java b/core/src/main/java/org/springframework/security/access/event/package-info.java
index 777c2da534..440f6a717e 100644
--- a/core/src/main/java/org/springframework/security/access/event/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/event/package-info.java
@@ -2,3 +2,4 @@
  * Authorization event and listener classes.
  */
 package org.springframework.security.access.event;
+
diff --git a/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java
index 87245969c5..7e8761dbec 100644
--- a/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandler.java
@@ -14,84 +14,95 @@ import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
 /**
- * Base implementation of the facade which isolates Spring Security's requirements for evaluating security expressions
- * from the implementation of the underlying expression objects.
+ * Base implementation of the facade which isolates Spring Security's requirements for
+ * evaluating security expressions from the implementation of the underlying expression
+ * objects.
  *
  * @author Luke Taylor
  * @since 3.1
  */
-public abstract class AbstractSecurityExpressionHandler<T> implements SecurityExpressionHandler<T>, ApplicationContextAware {
-    private ExpressionParser expressionParser = new SpelExpressionParser();
-    private BeanResolver br;
-    private RoleHierarchy roleHierarchy;
-    private PermissionEvaluator permissionEvaluator = new DenyAllPermissionEvaluator();
+public abstract class AbstractSecurityExpressionHandler<T> implements
+		SecurityExpressionHandler<T>, ApplicationContextAware {
+	private ExpressionParser expressionParser = new SpelExpressionParser();
+	private BeanResolver br;
+	private RoleHierarchy roleHierarchy;
+	private PermissionEvaluator permissionEvaluator = new DenyAllPermissionEvaluator();
 
-    public final ExpressionParser getExpressionParser() {
-        return expressionParser;
-    }
+	public final ExpressionParser getExpressionParser() {
+		return expressionParser;
+	}
 
-    public final void setExpressionParser(ExpressionParser expressionParser) {
-        Assert.notNull(expressionParser, "expressionParser cannot be null");
-        this.expressionParser = expressionParser;
-    }
+	public final void setExpressionParser(ExpressionParser expressionParser) {
+		Assert.notNull(expressionParser, "expressionParser cannot be null");
+		this.expressionParser = expressionParser;
+	}
 
-    /**
-     * Invokes the internal template methods to create {@code StandardEvaluationContext} and {@code SecurityExpressionRoot}
-     * objects.
-     *
-     * @param authentication the current authentication object
-     * @param invocation the invocation (filter, method, channel)
-     * @return the context object for use in evaluating the expression, populated with a suitable root object.
-     */
-    public final EvaluationContext createEvaluationContext(Authentication authentication, T invocation) {
-        SecurityExpressionOperations root = createSecurityExpressionRoot(authentication, invocation);
-        StandardEvaluationContext ctx = createEvaluationContextInternal(authentication, invocation);
-        ctx.setBeanResolver(br);
-        ctx.setRootObject(root);
+	/**
+	 * Invokes the internal template methods to create {@code StandardEvaluationContext}
+	 * and {@code SecurityExpressionRoot} objects.
+	 *
+	 * @param authentication the current authentication object
+	 * @param invocation the invocation (filter, method, channel)
+	 * @return the context object for use in evaluating the expression, populated with a
+	 * suitable root object.
+	 */
+	public final EvaluationContext createEvaluationContext(Authentication authentication,
+			T invocation) {
+		SecurityExpressionOperations root = createSecurityExpressionRoot(authentication,
+				invocation);
+		StandardEvaluationContext ctx = createEvaluationContextInternal(authentication,
+				invocation);
+		ctx.setBeanResolver(br);
+		ctx.setRootObject(root);
 
-        return ctx;
-    }
+		return ctx;
+	}
 
-    /**
-     * Override to create a custom instance of {@code StandardEvaluationContext}.
-     * <p>
-     * The returned object will have a {@code SecurityExpressionRootPropertyAccessor} added, allowing beans in
-     * the {@code ApplicationContext} to be accessed via expression properties.
-     *
-     * @param authentication the current authentication object
-     * @param invocation the invocation (filter, method, channel)
-     * @return A {@code StandardEvaluationContext} or potentially a custom subclass if overridden.
-     */
-    protected StandardEvaluationContext createEvaluationContextInternal(Authentication authentication, T invocation) {
-        return new StandardEvaluationContext();
-    }
+	/**
+	 * Override to create a custom instance of {@code StandardEvaluationContext}.
+	 * <p>
+	 * The returned object will have a {@code SecurityExpressionRootPropertyAccessor}
+	 * added, allowing beans in the {@code ApplicationContext} to be accessed via
+	 * expression properties.
+	 *
+	 * @param authentication the current authentication object
+	 * @param invocation the invocation (filter, method, channel)
+	 * @return A {@code StandardEvaluationContext} or potentially a custom subclass if
+	 * overridden.
+	 */
+	protected StandardEvaluationContext createEvaluationContextInternal(
+			Authentication authentication, T invocation) {
+		return new StandardEvaluationContext();
+	}
 
-    /**
-     * Implement in order to create a root object of the correct type for the supported invocation type.
-     *
-     * @param authentication the current authentication object
-     * @param invocation the invocation (filter, method, channel)
-     * @return the object wh
-     */
-    protected abstract SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, T invocation);
+	/**
+	 * Implement in order to create a root object of the correct type for the supported
+	 * invocation type.
+	 *
+	 * @param authentication the current authentication object
+	 * @param invocation the invocation (filter, method, channel)
+	 * @return the object wh
+	 */
+	protected abstract SecurityExpressionOperations createSecurityExpressionRoot(
+			Authentication authentication, T invocation);
 
-    protected RoleHierarchy getRoleHierarchy() {
-        return roleHierarchy;
-    }
+	protected RoleHierarchy getRoleHierarchy() {
+		return roleHierarchy;
+	}
 
-    public void setRoleHierarchy(RoleHierarchy roleHierarchy) {
-        this.roleHierarchy = roleHierarchy;
-    }
+	public void setRoleHierarchy(RoleHierarchy roleHierarchy) {
+		this.roleHierarchy = roleHierarchy;
+	}
 
-    protected PermissionEvaluator getPermissionEvaluator() {
-        return permissionEvaluator;
-    }
+	protected PermissionEvaluator getPermissionEvaluator() {
+		return permissionEvaluator;
+	}
 
-    public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) {
-        this.permissionEvaluator = permissionEvaluator;
-    }
+	public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) {
+		this.permissionEvaluator = permissionEvaluator;
+	}
 
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        br = new BeanFactoryResolver(applicationContext);
-    }
+	public void setApplicationContext(ApplicationContext applicationContext) {
+		br = new BeanFactoryResolver(applicationContext);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java b/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java
index 75d3702672..24970d2b1d 100644
--- a/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java
+++ b/core/src/main/java/org/springframework/security/access/expression/DenyAllPermissionEvaluator.java
@@ -8,32 +8,34 @@ import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.core.Authentication;
 
 /**
- * A null PermissionEvaluator which denies all access. Used by default for situations when permission
- * evaluation should not be required.
+ * A null PermissionEvaluator which denies all access. Used by default for situations when
+ * permission evaluation should not be required.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class DenyAllPermissionEvaluator implements PermissionEvaluator {
 
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    /**
-     * @return false always
-     */
-    public boolean hasPermission(Authentication authentication, Object target, Object permission) {
-        logger.warn("Denying user " + authentication.getName() + " permission '" + permission + "' on object " + target);
-        return false;
-    }
+	/**
+	 * @return false always
+	 */
+	public boolean hasPermission(Authentication authentication, Object target,
+			Object permission) {
+		logger.warn("Denying user " + authentication.getName() + " permission '"
+				+ permission + "' on object " + target);
+		return false;
+	}
 
-    /**
-     * @return false always
-     */
-    public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType,
-                    Object permission) {
-        logger.warn("Denying user " + authentication.getName() + " permission '" + permission + "' on object with Id '"
-                        + targetId);
-        return false;
-    }
+	/**
+	 * @return false always
+	 */
+	public boolean hasPermission(Authentication authentication, Serializable targetId,
+			String targetType, Object permission) {
+		logger.warn("Denying user " + authentication.getName() + " permission '"
+				+ permission + "' on object with Id '" + targetId);
+		return false;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java
index d0d3f85339..4b771a9b05 100644
--- a/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java
+++ b/core/src/main/java/org/springframework/security/access/expression/ExpressionUtils.java
@@ -6,11 +6,13 @@ import org.springframework.expression.Expression;
 
 public final class ExpressionUtils {
 
-    public static boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) {
-        try {
-            return ((Boolean) expr.getValue(ctx, Boolean.class)).booleanValue();
-        } catch (EvaluationException e) {
-            throw new IllegalArgumentException("Failed to evaluate expression '" + expr.getExpressionString() + "'", e);
-        }
-    }
+	public static boolean evaluateAsBoolean(Expression expr, EvaluationContext ctx) {
+		try {
+			return ((Boolean) expr.getValue(ctx, Boolean.class)).booleanValue();
+		}
+		catch (EvaluationException e) {
+			throw new IllegalArgumentException("Failed to evaluate expression '"
+					+ expr.getExpressionString() + "'", e);
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionHandler.java
index fc5f703d74..d0d807cf97 100644
--- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionHandler.java
@@ -6,20 +6,21 @@ import org.springframework.expression.ExpressionParser;
 import org.springframework.security.core.Authentication;
 
 /**
- * Facade which isolates Spring Security's requirements for evaluating security expressions
- * from the implementation of the underlying expression objects
+ * Facade which isolates Spring Security's requirements for evaluating security
+ * expressions from the implementation of the underlying expression objects
  *
  * @author Luke Taylor
  * @since 3.1
  */
 public interface SecurityExpressionHandler<T> extends AopInfrastructureBean {
-    /**
-     * @return an expression parser for the expressions used by the implementation.
-     */
-    ExpressionParser getExpressionParser();
+	/**
+	 * @return an expression parser for the expressions used by the implementation.
+	 */
+	ExpressionParser getExpressionParser();
 
-    /**
-     * Provides an evaluation context in which to evaluate security expressions for the invocation type.
-     */
-    EvaluationContext createEvaluationContext(Authentication authentication, T invocation);
+	/**
+	 * Provides an evaluation context in which to evaluate security expressions for the
+	 * invocation type.
+	 */
+	EvaluationContext createEvaluationContext(Authentication authentication, T invocation);
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
index 61f8f7749f..8267bed48c 100644
--- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
+++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
@@ -3,8 +3,7 @@ package org.springframework.security.access.expression;
 import org.springframework.security.core.Authentication;
 
 /**
- * Standard interface for expression root objects used with expression-based
- * security.
+ * Standard interface for expression root objects used with expression-based security.
  *
  * @author Andrei Stefan
  * @author Luke Taylor
@@ -12,91 +11,108 @@ import org.springframework.security.core.Authentication;
  */
 public interface SecurityExpressionOperations {
 
-    /**
-     * Gets the {@link Authentication} used for evaluating the expressions
-     * @return the {@link Authentication} for evaluating the expressions
-     */
-    Authentication getAuthentication();
+	/**
+	 * Gets the {@link Authentication} used for evaluating the expressions
+	 * @return the {@link Authentication} for evaluating the expressions
+	 */
+	Authentication getAuthentication();
 
-    /**
-     * Determines if the {@link #getAuthentication()} has a particular authority within {@link Authentication#getAuthorities()}. This is a synonym for {@link #hasAuthority(String)}.
-     * @param authority the authority to test (i.e. "ROLE_USER")
-     * @return true if the authority is found, else false
-     */
-    boolean hasAuthority(String authority);
+	/**
+	 * Determines if the {@link #getAuthentication()} has a particular authority within
+	 * {@link Authentication#getAuthorities()}. This is a synonym for
+	 * {@link #hasAuthority(String)}.
+	 * @param authority the authority to test (i.e. "ROLE_USER")
+	 * @return true if the authority is found, else false
+	 */
+	boolean hasAuthority(String authority);
 
-    /**
-     * Determines if the {@link #getAuthentication()} has any of the specified authorities within {@link Authentication#getAuthorities()}. This is a synonym for {@link #hasAnyRole(String...)}.
-     * @param authorities the authorities to test (i.e. "ROLE_USER", "ROLE_ADMIN")
-     * @return true if any of the authorities is found, else false
-     */
-    boolean hasAnyAuthority(String... authorities);
+	/**
+	 * Determines if the {@link #getAuthentication()} has any of the specified authorities
+	 * within {@link Authentication#getAuthorities()}. This is a synonym for
+	 * {@link #hasAnyRole(String...)}.
+	 * @param authorities the authorities to test (i.e. "ROLE_USER", "ROLE_ADMIN")
+	 * @return true if any of the authorities is found, else false
+	 */
+	boolean hasAnyAuthority(String... authorities);
 
-    /**
-     * Determines if the {@link #getAuthentication()} has a particular authority within {@link Authentication#getAuthorities()}. This is a synonym for {@link #hasAuthority(String)}.
-     * @param authority the authority to test (i.e. "ROLE_USER")
-     * @return true if the authority is found, else false
-     */
-    boolean hasRole(String role);
+	/**
+	 * Determines if the {@link #getAuthentication()} has a particular authority within
+	 * {@link Authentication#getAuthorities()}. This is a synonym for
+	 * {@link #hasAuthority(String)}.
+	 * @param authority the authority to test (i.e. "ROLE_USER")
+	 * @return true if the authority is found, else false
+	 */
+	boolean hasRole(String role);
 
-    /**
-     * Determines if the {@link #getAuthentication()} has any of the specified authorities within {@link Authentication#getAuthorities()}. This is a synonym for {@link #hasAnyAuthority(String...)}.
-     * @param authorities the authorities to test (i.e. "ROLE_USER", "ROLE_ADMIN")
-     * @return true if any of the authorities is found, else false
-     */
-    boolean hasAnyRole(String... roles);
+	/**
+	 * Determines if the {@link #getAuthentication()} has any of the specified authorities
+	 * within {@link Authentication#getAuthorities()}. This is a synonym for
+	 * {@link #hasAnyAuthority(String...)}.
+	 * @param authorities the authorities to test (i.e. "ROLE_USER", "ROLE_ADMIN")
+	 * @return true if any of the authorities is found, else false
+	 */
+	boolean hasAnyRole(String... roles);
 
-    /**
-     * Always grants access.
-     * @return true
-     */
-    boolean permitAll();
+	/**
+	 * Always grants access.
+	 * @return true
+	 */
+	boolean permitAll();
 
-    /**
-     * Always denies access
-     * @return false
-     */
-    boolean denyAll();
+	/**
+	 * Always denies access
+	 * @return false
+	 */
+	boolean denyAll();
 
-    /**
-     * Determines if the {@link #getAuthentication()} is anonymous
-     * @return true if the user is anonymous, else false
-     */
-    boolean isAnonymous();
+	/**
+	 * Determines if the {@link #getAuthentication()} is anonymous
+	 * @return true if the user is anonymous, else false
+	 */
+	boolean isAnonymous();
 
-    /**
-     * Determines ifthe {@link #getAuthentication()} is authenticated
-     * @return true if the {@link #getAuthentication()} is authenticated, else false
-     */
-    boolean isAuthenticated();
+	/**
+	 * Determines ifthe {@link #getAuthentication()} is authenticated
+	 * @return true if the {@link #getAuthentication()} is authenticated, else false
+	 */
+	boolean isAuthenticated();
 
-    /**
-     * Determines if the {@link #getAuthentication()} was authenticated using remember me
-     * @return true if the {@link #getAuthentication()} authenticated using remember me, else false
-     */
-    boolean isRememberMe();
+	/**
+	 * Determines if the {@link #getAuthentication()} was authenticated using remember me
+	 * @return true if the {@link #getAuthentication()} authenticated using remember me,
+	 * else false
+	 */
+	boolean isRememberMe();
 
-    /**
-     * Determines if the {@link #getAuthentication()} authenticated without the use of remember me
-     * @return true if the {@link #getAuthentication()} authenticated without the use of remember me, else false
-     */
-    boolean isFullyAuthenticated();
+	/**
+	 * Determines if the {@link #getAuthentication()} authenticated without the use of
+	 * remember me
+	 * @return true if the {@link #getAuthentication()} authenticated without the use of
+	 * remember me, else false
+	 */
+	boolean isFullyAuthenticated();
 
-    /**
-     * Determines if the {@link #getAuthentication()} has permission to access the target given the permission
-     * @param target the target domain object to check permission on
-     * @param permission the permission to check on the domain object (i.e. "read", "write", etc).
-     * @return true if permission is granted to the {@link #getAuthentication()}, else false
-     */
-    boolean hasPermission(Object target, Object permission);
+	/**
+	 * Determines if the {@link #getAuthentication()} has permission to access the target
+	 * given the permission
+	 * @param target the target domain object to check permission on
+	 * @param permission the permission to check on the domain object (i.e. "read",
+	 * "write", etc).
+	 * @return true if permission is granted to the {@link #getAuthentication()}, else
+	 * false
+	 */
+	boolean hasPermission(Object target, Object permission);
 
-    /**
-     * Determines if the {@link #getAuthentication()} has permission to access the domain object with a given id, type, and permission.
-     * @param targetId the identifier of the domain object to determine access
-     * @param targetType the type (i.e. com.example.domain.Message)
-     * @param permission the perission to check on the domain object (i.e. "read", "write", etc)
-     * @return true if permission is granted to the {@link #getAuthentication()}, else false
-     */
-    boolean hasPermission(Object targetId, String targetType, Object permission);
+	/**
+	 * Determines if the {@link #getAuthentication()} has permission to access the domain
+	 * object with a given id, type, and permission.
+	 * @param targetId the identifier of the domain object to determine access
+	 * @param targetType the type (i.e. com.example.domain.Message)
+	 * @param permission the perission to check on the domain object (i.e. "read",
+	 * "write", etc)
+	 * @return true if permission is granted to the {@link #getAuthentication()}, else
+	 * false
+	 */
+	boolean hasPermission(Object targetId, String targetType, Object permission);
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java
index 2887144560..7c2b7f7c12 100644
--- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java
+++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java
@@ -12,7 +12,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Base root object for use in Spring Security expression evaluations.
  *
@@ -20,171 +19,176 @@ import org.springframework.security.core.authority.AuthorityUtils;
  * @since 3.0
  */
 public abstract class SecurityExpressionRoot implements SecurityExpressionOperations {
-    protected final Authentication authentication;
-    private AuthenticationTrustResolver trustResolver;
-    private RoleHierarchy roleHierarchy;
-    private Set<String> roles;
-    private String defaultRolePrefix = "ROLE_";
+	protected final Authentication authentication;
+	private AuthenticationTrustResolver trustResolver;
+	private RoleHierarchy roleHierarchy;
+	private Set<String> roles;
+	private String defaultRolePrefix = "ROLE_";
 
-    /** Allows "permitAll" expression */
-    public final boolean permitAll = true;
+	/** Allows "permitAll" expression */
+	public final boolean permitAll = true;
 
-    /** Allows "denyAll" expression */
-    public final boolean denyAll = false;
-    private PermissionEvaluator permissionEvaluator;
-    public final String read = "read";
-    public final String write = "write";
-    public final String create = "create";
-    public final String delete = "delete";
-    public final String admin = "administration";
+	/** Allows "denyAll" expression */
+	public final boolean denyAll = false;
+	private PermissionEvaluator permissionEvaluator;
+	public final String read = "read";
+	public final String write = "write";
+	public final String create = "create";
+	public final String delete = "delete";
+	public final String admin = "administration";
 
-    /**
-     * Creates a new instance
-     * @param authentication the {@link Authentication} to use. Cannot be null.
-     */
-    public SecurityExpressionRoot(Authentication authentication) {
-        if (authentication == null) {
-            throw new IllegalArgumentException("Authentication object cannot be null");
-        }
-        this.authentication = authentication;
-    }
+	/**
+	 * Creates a new instance
+	 * @param authentication the {@link Authentication} to use. Cannot be null.
+	 */
+	public SecurityExpressionRoot(Authentication authentication) {
+		if (authentication == null) {
+			throw new IllegalArgumentException("Authentication object cannot be null");
+		}
+		this.authentication = authentication;
+	}
 
-    public final boolean hasAuthority(String authority) {
-        return hasAnyAuthority(authority);
-    }
+	public final boolean hasAuthority(String authority) {
+		return hasAnyAuthority(authority);
+	}
 
-    public final boolean hasAnyAuthority(String... authorities) {
-        return hasAnyAuthorityName(null, authorities);
-    }
+	public final boolean hasAnyAuthority(String... authorities) {
+		return hasAnyAuthorityName(null, authorities);
+	}
 
-    public final boolean hasRole(String role) {
-        return hasAnyRole(role);
-    }
+	public final boolean hasRole(String role) {
+		return hasAnyRole(role);
+	}
 
-    public final boolean hasAnyRole(String... roles) {
-        return hasAnyAuthorityName(defaultRolePrefix, roles);
-    }
+	public final boolean hasAnyRole(String... roles) {
+		return hasAnyAuthorityName(defaultRolePrefix, roles);
+	}
 
-    private boolean hasAnyAuthorityName(String prefix, String... roles) {
-        Set<String> roleSet = getAuthoritySet();
+	private boolean hasAnyAuthorityName(String prefix, String... roles) {
+		Set<String> roleSet = getAuthoritySet();
 
-        for (String role : roles) {
-            String defaultedRole = getRoleWithDefaultPrefix(prefix, role);
-            if (roleSet.contains(defaultedRole)) {
-                return true;
-            }
-        }
+		for (String role : roles) {
+			String defaultedRole = getRoleWithDefaultPrefix(prefix, role);
+			if (roleSet.contains(defaultedRole)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public final Authentication getAuthentication() {
-        return authentication;
-    }
+	public final Authentication getAuthentication() {
+		return authentication;
+	}
 
-    public final boolean permitAll() {
-        return true;
-    }
+	public final boolean permitAll() {
+		return true;
+	}
 
-    public final boolean denyAll() {
-        return false;
-    }
+	public final boolean denyAll() {
+		return false;
+	}
 
-    public final boolean isAnonymous() {
-        return trustResolver.isAnonymous(authentication);
-    }
+	public final boolean isAnonymous() {
+		return trustResolver.isAnonymous(authentication);
+	}
 
-    public final boolean isAuthenticated() {
-        return !isAnonymous();
-    }
+	public final boolean isAuthenticated() {
+		return !isAnonymous();
+	}
 
-    public final boolean isRememberMe() {
-        return trustResolver.isRememberMe(authentication);
-    }
+	public final boolean isRememberMe() {
+		return trustResolver.isRememberMe(authentication);
+	}
 
-    public final boolean isFullyAuthenticated() {
-        return !trustResolver.isAnonymous(authentication) && !trustResolver.isRememberMe(authentication);
-    }
+	public final boolean isFullyAuthenticated() {
+		return !trustResolver.isAnonymous(authentication)
+				&& !trustResolver.isRememberMe(authentication);
+	}
 
-    /**
-     * Convenience method to access {@link Authentication#getPrincipal()} from {@link #getAuthentication()}
-     * @return
-     */
-    public Object getPrincipal() {
-        return authentication.getPrincipal();
-    }
+	/**
+	 * Convenience method to access {@link Authentication#getPrincipal()} from
+	 * {@link #getAuthentication()}
+	 * @return
+	 */
+	public Object getPrincipal() {
+		return authentication.getPrincipal();
+	}
 
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        this.trustResolver = trustResolver;
-    }
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		this.trustResolver = trustResolver;
+	}
 
-    public void setRoleHierarchy(RoleHierarchy roleHierarchy) {
-        this.roleHierarchy = roleHierarchy;
-    }
+	public void setRoleHierarchy(RoleHierarchy roleHierarchy) {
+		this.roleHierarchy = roleHierarchy;
+	}
 
-    /**
-     * <p>
-     * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
-     * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN") is passed in,
-     * then the role ROLE_ADMIN will be used when the defaultRolePrefix is "ROLE_" (default).
-     * </p>
-     *
-     * <p>
-     * If null or empty, then no default role prefix is used.
-     * </p>
-     *
-     * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
-     */
-    public void setDefaultRolePrefix(String defaultRolePrefix) {
-        this.defaultRolePrefix = defaultRolePrefix;
-    }
+	/**
+	 * <p>
+	 * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
+	 * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
+	 * is passed in, then the role ROLE_ADMIN will be used when the defaultRolePrefix is
+	 * "ROLE_" (default).
+	 * </p>
+	 *
+	 * <p>
+	 * If null or empty, then no default role prefix is used.
+	 * </p>
+	 *
+	 * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
+	 */
+	public void setDefaultRolePrefix(String defaultRolePrefix) {
+		this.defaultRolePrefix = defaultRolePrefix;
+	}
 
-    private Set<String> getAuthoritySet() {
-        if (roles == null) {
-            roles = new HashSet<String>();
-            Collection<? extends GrantedAuthority> userAuthorities = authentication.getAuthorities();
+	private Set<String> getAuthoritySet() {
+		if (roles == null) {
+			roles = new HashSet<String>();
+			Collection<? extends GrantedAuthority> userAuthorities = authentication
+					.getAuthorities();
 
-            if (roleHierarchy != null) {
-                userAuthorities = roleHierarchy.getReachableGrantedAuthorities(userAuthorities);
-            }
+			if (roleHierarchy != null) {
+				userAuthorities = roleHierarchy
+						.getReachableGrantedAuthorities(userAuthorities);
+			}
 
-            roles = AuthorityUtils.authorityListToSet(userAuthorities);
-        }
+			roles = AuthorityUtils.authorityListToSet(userAuthorities);
+		}
 
-        return roles;
-    }
+		return roles;
+	}
 
+	public boolean hasPermission(Object target, Object permission) {
+		return permissionEvaluator.hasPermission(authentication, target, permission);
+	}
 
-    public boolean hasPermission(Object target, Object permission) {
-        return permissionEvaluator.hasPermission(authentication, target, permission);
-    }
+	public boolean hasPermission(Object targetId, String targetType, Object permission) {
+		return permissionEvaluator.hasPermission(authentication, (Serializable) targetId,
+				targetType, permission);
+	}
 
-    public boolean hasPermission(Object targetId, String targetType, Object permission) {
-        return permissionEvaluator.hasPermission(authentication, (Serializable)targetId, targetType, permission);
-    }
+	public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) {
+		this.permissionEvaluator = permissionEvaluator;
+	}
 
-    public void setPermissionEvaluator(PermissionEvaluator permissionEvaluator) {
-        this.permissionEvaluator = permissionEvaluator;
-    }
-
-    /**
-     * Prefixes role with defaultRolePrefix if defaultRolePrefix is non-null and
-     * if role does not already start with defaultRolePrefix.
-     *
-     * @param defaultRolePrefix
-     * @param role
-     * @return
-     */
-    private static String getRoleWithDefaultPrefix(String defaultRolePrefix, String role) {
-        if(role == null) {
-            return role;
-        }
-        if(defaultRolePrefix == null || defaultRolePrefix.length() == 0) {
-            return role;
-        }
-        if(role.startsWith(defaultRolePrefix)) {
-            return role;
-        }
-        return defaultRolePrefix + role;
-    }
+	/**
+	 * Prefixes role with defaultRolePrefix if defaultRolePrefix is non-null and if role
+	 * does not already start with defaultRolePrefix.
+	 *
+	 * @param defaultRolePrefix
+	 * @param role
+	 * @return
+	 */
+	private static String getRoleWithDefaultPrefix(String defaultRolePrefix, String role) {
+		if (role == null) {
+			return role;
+		}
+		if (defaultRolePrefix == null || defaultRolePrefix.length() == 0) {
+			return role;
+		}
+		if (role.startsWith(defaultRolePrefix)) {
+			return role;
+		}
+		return defaultRolePrefix + role;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
index f0f1c05183..d92dda23c2 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
@@ -7,7 +7,8 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.util.Assert;
 
 /**
- * Contains both filtering and authorization expression meta-data for Spring-EL based access control.
+ * Contains both filtering and authorization expression meta-data for Spring-EL based
+ * access control.
  * <p>
  * Base class for pre or post-invocation phases of a method invocation.
  * <p>
@@ -17,34 +18,41 @@ import org.springframework.util.Assert;
  * @since 3.0
  */
 abstract class AbstractExpressionBasedMethodConfigAttribute implements ConfigAttribute {
-    private final Expression filterExpression;
-    private final Expression authorizeExpression;
+	private final Expression filterExpression;
+	private final Expression authorizeExpression;
 
-    /**
-     * Parses the supplied expressions as Spring-EL.
-     */
-    AbstractExpressionBasedMethodConfigAttribute(String filterExpression, String authorizeExpression) throws ParseException {
-        Assert.isTrue(filterExpression != null || authorizeExpression != null, "Filter and authorization Expressions cannot both be null");
-        SpelExpressionParser parser = new SpelExpressionParser();
-        this.filterExpression = filterExpression == null ? null : parser.parseExpression(filterExpression);
-        this.authorizeExpression = authorizeExpression == null ? null : parser.parseExpression(authorizeExpression);
-    }
+	/**
+	 * Parses the supplied expressions as Spring-EL.
+	 */
+	AbstractExpressionBasedMethodConfigAttribute(String filterExpression,
+			String authorizeExpression) throws ParseException {
+		Assert.isTrue(filterExpression != null || authorizeExpression != null,
+				"Filter and authorization Expressions cannot both be null");
+		SpelExpressionParser parser = new SpelExpressionParser();
+		this.filterExpression = filterExpression == null ? null : parser
+				.parseExpression(filterExpression);
+		this.authorizeExpression = authorizeExpression == null ? null : parser
+				.parseExpression(authorizeExpression);
+	}
 
-    AbstractExpressionBasedMethodConfigAttribute(Expression filterExpression, Expression authorizeExpression) throws ParseException {
-        Assert.isTrue(filterExpression != null || authorizeExpression != null, "Filter and authorization Expressions cannot both be null");
-        this.filterExpression = filterExpression == null ? null : filterExpression;
-        this.authorizeExpression = authorizeExpression == null ? null : authorizeExpression;
-    }
+	AbstractExpressionBasedMethodConfigAttribute(Expression filterExpression,
+			Expression authorizeExpression) throws ParseException {
+		Assert.isTrue(filterExpression != null || authorizeExpression != null,
+				"Filter and authorization Expressions cannot both be null");
+		this.filterExpression = filterExpression == null ? null : filterExpression;
+		this.authorizeExpression = authorizeExpression == null ? null
+				: authorizeExpression;
+	}
 
-    Expression getFilterExpression() {
-        return filterExpression;
-    }
+	Expression getFilterExpression() {
+		return filterExpression;
+	}
 
-    Expression getAuthorizeExpression() {
-        return authorizeExpression;
-    }
+	Expression getAuthorizeExpression() {
+		return authorizeExpression;
+	}
 
-    public String getAttribute() {
-        return null;
-    }
+	public String getAttribute() {
+		return null;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
index c9698c4dcd..e4bdc39248 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
@@ -25,170 +25,189 @@ import org.springframework.util.Assert;
 /**
  * The standard implementation of {@code MethodSecurityExpressionHandler}.
  * <p>
- * A single instance should usually be shared amongst the beans that require expression support.
+ * A single instance should usually be shared amongst the beans that require expression
+ * support.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class DefaultMethodSecurityExpressionHandler extends AbstractSecurityExpressionHandler<MethodInvocation> implements MethodSecurityExpressionHandler {
+public class DefaultMethodSecurityExpressionHandler extends
+		AbstractSecurityExpressionHandler<MethodInvocation> implements
+		MethodSecurityExpressionHandler {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
-    private ParameterNameDiscoverer parameterNameDiscoverer = new DefaultSecurityParameterNameDiscoverer();
-    private PermissionCacheOptimizer permissionCacheOptimizer = null;
-    private String defaultRolePrefix = "ROLE_";
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private ParameterNameDiscoverer parameterNameDiscoverer = new DefaultSecurityParameterNameDiscoverer();
+	private PermissionCacheOptimizer permissionCacheOptimizer = null;
+	private String defaultRolePrefix = "ROLE_";
 
-    public DefaultMethodSecurityExpressionHandler() {
-    }
+	public DefaultMethodSecurityExpressionHandler() {
+	}
 
-    /**
-     * Uses a {@link MethodSecurityEvaluationContext} as the <tt>EvaluationContext</tt> implementation.
-     */
-    public StandardEvaluationContext createEvaluationContextInternal(Authentication auth, MethodInvocation mi) {
-        return new MethodSecurityEvaluationContext(auth, mi, parameterNameDiscoverer);
-    }
+	/**
+	 * Uses a {@link MethodSecurityEvaluationContext} as the <tt>EvaluationContext</tt>
+	 * implementation.
+	 */
+	public StandardEvaluationContext createEvaluationContextInternal(Authentication auth,
+			MethodInvocation mi) {
+		return new MethodSecurityEvaluationContext(auth, mi, parameterNameDiscoverer);
+	}
 
-    /**
-     * Creates the root object for expression evaluation.
-     */
-    protected MethodSecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, MethodInvocation invocation) {
-        MethodSecurityExpressionRoot root = new MethodSecurityExpressionRoot(authentication);
-        root.setThis(invocation.getThis());
-        root.setPermissionEvaluator(getPermissionEvaluator());
-        root.setTrustResolver(trustResolver);
-        root.setRoleHierarchy(getRoleHierarchy());
-        root.setDefaultRolePrefix(defaultRolePrefix);
+	/**
+	 * Creates the root object for expression evaluation.
+	 */
+	protected MethodSecurityExpressionOperations createSecurityExpressionRoot(
+			Authentication authentication, MethodInvocation invocation) {
+		MethodSecurityExpressionRoot root = new MethodSecurityExpressionRoot(
+				authentication);
+		root.setThis(invocation.getThis());
+		root.setPermissionEvaluator(getPermissionEvaluator());
+		root.setTrustResolver(trustResolver);
+		root.setRoleHierarchy(getRoleHierarchy());
+		root.setDefaultRolePrefix(defaultRolePrefix);
 
-        return root;
-    }
+		return root;
+	}
 
-    /**
-     * Filters the {@code filterTarget} object (which must be either a collection or an array), by evaluating the
-     * supplied expression.
-     * <p>
-     * If a {@code Collection} is used, the original instance will be modified to contain the elements for which
-     * the permission expression evaluates to {@code true}. For an array, a new array instance will be returned.
-     */
-    @SuppressWarnings("unchecked")
-    public Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx) {
-        MethodSecurityExpressionOperations rootObject = (MethodSecurityExpressionOperations) ctx.getRootObject().getValue();
-        final boolean debug = logger.isDebugEnabled();
-        List retainList;
+	/**
+	 * Filters the {@code filterTarget} object (which must be either a collection or an
+	 * array), by evaluating the supplied expression.
+	 * <p>
+	 * If a {@code Collection} is used, the original instance will be modified to contain
+	 * the elements for which the permission expression evaluates to {@code true}. For an
+	 * array, a new array instance will be returned.
+	 */
+	@SuppressWarnings("unchecked")
+	public Object filter(Object filterTarget, Expression filterExpression,
+			EvaluationContext ctx) {
+		MethodSecurityExpressionOperations rootObject = (MethodSecurityExpressionOperations) ctx
+				.getRootObject().getValue();
+		final boolean debug = logger.isDebugEnabled();
+		List retainList;
 
-        if (debug) {
-            logger.debug("Filtering with expression: " + filterExpression.getExpressionString());
-        }
+		if (debug) {
+			logger.debug("Filtering with expression: "
+					+ filterExpression.getExpressionString());
+		}
 
-        if (filterTarget instanceof Collection) {
-            Collection collection = (Collection)filterTarget;
-            retainList = new ArrayList(collection.size());
+		if (filterTarget instanceof Collection) {
+			Collection collection = (Collection) filterTarget;
+			retainList = new ArrayList(collection.size());
 
-            if (debug) {
-                logger.debug("Filtering collection with " + collection.size() + " elements");
-            }
+			if (debug) {
+				logger.debug("Filtering collection with " + collection.size()
+						+ " elements");
+			}
 
-            if (permissionCacheOptimizer != null) {
-                permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), collection);
-            }
+			if (permissionCacheOptimizer != null) {
+				permissionCacheOptimizer.cachePermissionsFor(
+						rootObject.getAuthentication(), collection);
+			}
 
-            for (Object filterObject : (Collection)filterTarget) {
-                rootObject.setFilterObject(filterObject);
+			for (Object filterObject : (Collection) filterTarget) {
+				rootObject.setFilterObject(filterObject);
 
-                if (ExpressionUtils.evaluateAsBoolean(filterExpression, ctx)) {
-                    retainList.add(filterObject);
-                }
-            }
+				if (ExpressionUtils.evaluateAsBoolean(filterExpression, ctx)) {
+					retainList.add(filterObject);
+				}
+			}
 
-            if (debug) {
-                logger.debug("Retaining elements: " + retainList);
-            }
+			if (debug) {
+				logger.debug("Retaining elements: " + retainList);
+			}
 
-            collection.clear();
-            collection.addAll(retainList);
+			collection.clear();
+			collection.addAll(retainList);
 
-            return filterTarget;
-        }
+			return filterTarget;
+		}
 
-        if (filterTarget.getClass().isArray()) {
-            Object[] array = (Object[])filterTarget;
-            retainList = new ArrayList(array.length);
+		if (filterTarget.getClass().isArray()) {
+			Object[] array = (Object[]) filterTarget;
+			retainList = new ArrayList(array.length);
 
-            if (debug) {
-                logger.debug("Filtering array with " + array.length + " elements");
-            }
+			if (debug) {
+				logger.debug("Filtering array with " + array.length + " elements");
+			}
 
-            if (permissionCacheOptimizer != null) {
-                permissionCacheOptimizer.cachePermissionsFor(rootObject.getAuthentication(), Arrays.asList(array));
-            }
+			if (permissionCacheOptimizer != null) {
+				permissionCacheOptimizer.cachePermissionsFor(
+						rootObject.getAuthentication(), Arrays.asList(array));
+			}
 
-            for (Object o : array) {
-                rootObject.setFilterObject(o);
+			for (Object o : array) {
+				rootObject.setFilterObject(o);
 
-                if (ExpressionUtils.evaluateAsBoolean(filterExpression, ctx)) {
-                    retainList.add(o);
-                }
-            }
+				if (ExpressionUtils.evaluateAsBoolean(filterExpression, ctx)) {
+					retainList.add(o);
+				}
+			}
 
-            if (debug) {
-                logger.debug("Retaining elements: " + retainList);
-            }
+			if (debug) {
+				logger.debug("Retaining elements: " + retainList);
+			}
 
-            Object[] filtered = (Object[]) Array.newInstance(filterTarget.getClass().getComponentType(),
-                            retainList.size());
-            for (int i = 0; i < retainList.size(); i++) {
-                filtered[i] = retainList.get(i);
-            }
+			Object[] filtered = (Object[]) Array.newInstance(filterTarget.getClass()
+					.getComponentType(), retainList.size());
+			for (int i = 0; i < retainList.size(); i++) {
+				filtered[i] = retainList.get(i);
+			}
 
-            return filtered;
-        }
+			return filtered;
+		}
 
-        throw new IllegalArgumentException("Filter target must be a collection or array type, but was " + filterTarget);
-    }
+		throw new IllegalArgumentException(
+				"Filter target must be a collection or array type, but was "
+						+ filterTarget);
+	}
 
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 
-    /**
-     * Sets the {@link ParameterNameDiscoverer} to use. The default is {@link DefaultSecurityParameterNameDiscoverer}.
-     * @param parameterNameDiscoverer
-     */
-    public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
-        this.parameterNameDiscoverer = parameterNameDiscoverer;
-    }
+	/**
+	 * Sets the {@link ParameterNameDiscoverer} to use. The default is
+	 * {@link DefaultSecurityParameterNameDiscoverer}.
+	 * @param parameterNameDiscoverer
+	 */
+	public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
+		this.parameterNameDiscoverer = parameterNameDiscoverer;
+	}
 
-    public void setPermissionCacheOptimizer(PermissionCacheOptimizer permissionCacheOptimizer) {
-        this.permissionCacheOptimizer = permissionCacheOptimizer;
-    }
+	public void setPermissionCacheOptimizer(
+			PermissionCacheOptimizer permissionCacheOptimizer) {
+		this.permissionCacheOptimizer = permissionCacheOptimizer;
+	}
 
-    public void setReturnObject(Object returnObject, EvaluationContext ctx) {
-        ((MethodSecurityExpressionOperations)ctx.getRootObject().getValue()).setReturnObject(returnObject);
-    }
+	public void setReturnObject(Object returnObject, EvaluationContext ctx) {
+		((MethodSecurityExpressionOperations) ctx.getRootObject().getValue())
+				.setReturnObject(returnObject);
+	}
 
-    /**
-     * <p>
-     * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
-     * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN") is passed in,
-     * then the role ROLE_ADMIN will be used when the defaultRolePrefix is "ROLE_" (default).
-     * </p>
-     *
-     * <p>
-     * If null or empty, then no default role prefix is used.
-     * </p>
-     *
-     * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
-     */
-    public void setDefaultRolePrefix(String defaultRolePrefix) {
-        this.defaultRolePrefix = defaultRolePrefix;
-    }
+	/**
+	 * <p>
+	 * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
+	 * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
+	 * is passed in, then the role ROLE_ADMIN will be used when the defaultRolePrefix is
+	 * "ROLE_" (default).
+	 * </p>
+	 *
+	 * <p>
+	 * If null or empty, then no default role prefix is used.
+	 * </p>
+	 *
+	 * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
+	 */
+	public void setDefaultRolePrefix(String defaultRolePrefix) {
+		this.defaultRolePrefix = defaultRolePrefix;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
index e201374b55..ce7bfa09ca 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
@@ -23,63 +23,78 @@ import org.springframework.security.access.prepost.PreInvocationAttribute;
 import org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;
 
 /**
- * {@link PrePostInvocationAttributeFactory} which interprets the annotation value as
- * an expression to be evaluated at runtime.
+ * {@link PrePostInvocationAttributeFactory} which interprets the annotation value as an
+ * expression to be evaluated at runtime.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.0
  */
-public class ExpressionBasedAnnotationAttributeFactory implements PrePostInvocationAttributeFactory {
-    private final Object parserLock = new Object();
-    private ExpressionParser parser;
-    private MethodSecurityExpressionHandler handler;
+public class ExpressionBasedAnnotationAttributeFactory implements
+		PrePostInvocationAttributeFactory {
+	private final Object parserLock = new Object();
+	private ExpressionParser parser;
+	private MethodSecurityExpressionHandler handler;
 
-    public ExpressionBasedAnnotationAttributeFactory(MethodSecurityExpressionHandler handler) {
-        this.handler = handler;
-    }
+	public ExpressionBasedAnnotationAttributeFactory(
+			MethodSecurityExpressionHandler handler) {
+		this.handler = handler;
+	}
 
-    public PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute, String filterObject, String preAuthorizeAttribute) {
-        try {
-            // TODO: Optimization of permitAll
-            ExpressionParser parser = getParser();
-            Expression preAuthorizeExpression = preAuthorizeAttribute == null ? parser.parseExpression("permitAll") : parser.parseExpression(preAuthorizeAttribute);
-            Expression preFilterExpression = preFilterAttribute == null ? null : parser.parseExpression(preFilterAttribute);
-            return new PreInvocationExpressionAttribute(preFilterExpression, filterObject, preAuthorizeExpression);
-        } catch (ParseException e) {
-            throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
-        }
-    }
+	public PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute,
+			String filterObject, String preAuthorizeAttribute) {
+		try {
+			// TODO: Optimization of permitAll
+			ExpressionParser parser = getParser();
+			Expression preAuthorizeExpression = preAuthorizeAttribute == null ? parser
+					.parseExpression("permitAll") : parser
+					.parseExpression(preAuthorizeAttribute);
+			Expression preFilterExpression = preFilterAttribute == null ? null : parser
+					.parseExpression(preFilterAttribute);
+			return new PreInvocationExpressionAttribute(preFilterExpression,
+					filterObject, preAuthorizeExpression);
+		}
+		catch (ParseException e) {
+			throw new IllegalArgumentException("Failed to parse expression '"
+					+ e.getExpressionString() + "'", e);
+		}
+	}
 
-    public PostInvocationAttribute createPostInvocationAttribute(String postFilterAttribute, String postAuthorizeAttribute) {
-        try {
-            ExpressionParser parser = getParser();
-            Expression postAuthorizeExpression = postAuthorizeAttribute == null ? null : parser.parseExpression(postAuthorizeAttribute);
-            Expression postFilterExpression = postFilterAttribute == null ? null : parser.parseExpression(postFilterAttribute);
+	public PostInvocationAttribute createPostInvocationAttribute(
+			String postFilterAttribute, String postAuthorizeAttribute) {
+		try {
+			ExpressionParser parser = getParser();
+			Expression postAuthorizeExpression = postAuthorizeAttribute == null ? null
+					: parser.parseExpression(postAuthorizeAttribute);
+			Expression postFilterExpression = postFilterAttribute == null ? null : parser
+					.parseExpression(postFilterAttribute);
 
-            if (postFilterExpression != null || postAuthorizeExpression != null) {
-                return new PostInvocationExpressionAttribute(postFilterExpression, postAuthorizeExpression);
-            }
-        } catch (ParseException e) {
-            throw new IllegalArgumentException("Failed to parse expression '" + e.getExpressionString() + "'", e);
-        }
+			if (postFilterExpression != null || postAuthorizeExpression != null) {
+				return new PostInvocationExpressionAttribute(postFilterExpression,
+						postAuthorizeExpression);
+			}
+		}
+		catch (ParseException e) {
+			throw new IllegalArgumentException("Failed to parse expression '"
+					+ e.getExpressionString() + "'", e);
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Delay the lookup of the {@link ExpressionParser} to prevent SEC-2136
-     *
-     * @return
-     */
-    private ExpressionParser getParser() {
-        if(this.parser != null) {
-            return this.parser;
-        }
-        synchronized(parserLock) {
-            this.parser = handler.getExpressionParser();
-            this.handler = null;
-        }
-        return this.parser;
-    }
+	/**
+	 * Delay the lookup of the {@link ExpressionParser} to prevent SEC-2136
+	 *
+	 * @return
+	 */
+	private ExpressionParser getParser() {
+		if (this.parser != null) {
+			return this.parser;
+		}
+		synchronized (parserLock) {
+			this.parser = handler.getExpressionParser();
+			this.handler = null;
+		}
+		return this.parser;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java
index 890e1ed278..5433e11fa0 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPostInvocationAdvice.java
@@ -16,45 +16,52 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  * @since 3.0
  */
-public class ExpressionBasedPostInvocationAdvice implements PostInvocationAuthorizationAdvice{
-    protected final Log logger = LogFactory.getLog(getClass());
+public class ExpressionBasedPostInvocationAdvice implements
+		PostInvocationAuthorizationAdvice {
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final MethodSecurityExpressionHandler expressionHandler;
+	private final MethodSecurityExpressionHandler expressionHandler;
 
-    public ExpressionBasedPostInvocationAdvice(MethodSecurityExpressionHandler expressionHandler) {
-        this.expressionHandler = expressionHandler;
-    }
+	public ExpressionBasedPostInvocationAdvice(
+			MethodSecurityExpressionHandler expressionHandler) {
+		this.expressionHandler = expressionHandler;
+	}
 
-    public Object after(Authentication authentication, MethodInvocation mi,
-            PostInvocationAttribute postAttr, Object returnedObject) throws AccessDeniedException{
-        PostInvocationExpressionAttribute pia = (PostInvocationExpressionAttribute) postAttr;
-        EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi);
-        Expression postFilter = pia.getFilterExpression();
-        Expression postAuthorize = pia.getAuthorizeExpression();
+	public Object after(Authentication authentication, MethodInvocation mi,
+			PostInvocationAttribute postAttr, Object returnedObject)
+			throws AccessDeniedException {
+		PostInvocationExpressionAttribute pia = (PostInvocationExpressionAttribute) postAttr;
+		EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication,
+				mi);
+		Expression postFilter = pia.getFilterExpression();
+		Expression postAuthorize = pia.getAuthorizeExpression();
 
-        if (postFilter != null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Applying PostFilter expression " + postFilter);
-            }
+		if (postFilter != null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Applying PostFilter expression " + postFilter);
+			}
 
-            if (returnedObject != null) {
-                returnedObject = expressionHandler.filter(returnedObject, postFilter, ctx);
-            } else {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Return object is null, filtering will be skipped");
-                }
-            }
-        }
+			if (returnedObject != null) {
+				returnedObject = expressionHandler
+						.filter(returnedObject, postFilter, ctx);
+			}
+			else {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Return object is null, filtering will be skipped");
+				}
+			}
+		}
 
-        expressionHandler.setReturnObject(returnedObject, ctx);
+		expressionHandler.setReturnObject(returnedObject, ctx);
 
-        if (postAuthorize != null && !ExpressionUtils.evaluateAsBoolean(postAuthorize, ctx)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("PostAuthorize expression rejected access");
-            }
-            throw new AccessDeniedException("Access is denied");
-        }
+		if (postAuthorize != null
+				&& !ExpressionUtils.evaluateAsBoolean(postAuthorize, ctx)) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("PostAuthorize expression rejected access");
+			}
+			throw new AccessDeniedException("Access is denied");
+		}
 
-        return returnedObject;
-    }
+		return returnedObject;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java
index 4a61308793..c8173a7a89 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedPreInvocationAdvice.java
@@ -19,58 +19,65 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  * @since 3.0
  */
-public class ExpressionBasedPreInvocationAdvice implements PreInvocationAuthorizationAdvice {
-    private MethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
+public class ExpressionBasedPreInvocationAdvice implements
+		PreInvocationAuthorizationAdvice {
+	private MethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
 
-    public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute attr) {
-        PreInvocationExpressionAttribute preAttr = (PreInvocationExpressionAttribute) attr;
-        EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, mi);
-        Expression preFilter = preAttr.getFilterExpression();
-        Expression preAuthorize = preAttr.getAuthorizeExpression();
+	public boolean before(Authentication authentication, MethodInvocation mi,
+			PreInvocationAttribute attr) {
+		PreInvocationExpressionAttribute preAttr = (PreInvocationExpressionAttribute) attr;
+		EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication,
+				mi);
+		Expression preFilter = preAttr.getFilterExpression();
+		Expression preAuthorize = preAttr.getAuthorizeExpression();
 
-        if (preFilter != null) {
-            Object filterTarget = findFilterTarget(preAttr.getFilterTarget(), ctx, mi);
+		if (preFilter != null) {
+			Object filterTarget = findFilterTarget(preAttr.getFilterTarget(), ctx, mi);
 
-            expressionHandler.filter(filterTarget, preFilter, ctx);
-        }
+			expressionHandler.filter(filterTarget, preFilter, ctx);
+		}
 
-        if (preAuthorize == null) {
-            return true;
-        }
+		if (preAuthorize == null) {
+			return true;
+		}
 
-        return ExpressionUtils.evaluateAsBoolean(preAuthorize, ctx);
-    }
+		return ExpressionUtils.evaluateAsBoolean(preAuthorize, ctx);
+	}
 
-    private Object findFilterTarget(String filterTargetName, EvaluationContext ctx, MethodInvocation mi) {
-        Object filterTarget = null;
+	private Object findFilterTarget(String filterTargetName, EvaluationContext ctx,
+			MethodInvocation mi) {
+		Object filterTarget = null;
 
-        if (filterTargetName.length() > 0) {
-            filterTarget = ctx.lookupVariable(filterTargetName);
-            if (filterTarget == null) {
-                throw new IllegalArgumentException("Filter target was null, or no argument with name "
-                        + filterTargetName + " found in method");
-            }
-        } else if (mi.getArguments().length == 1) {
-            Object arg = mi.getArguments()[0];
-            if (arg.getClass().isArray() || arg instanceof Collection<?>) {
-                filterTarget = arg;
-            }
-            if (filterTarget == null) {
-                throw new IllegalArgumentException("A PreFilter expression was set but the method argument type" +
-                        arg.getClass() + " is not filterable");
-            }
-        }
+		if (filterTargetName.length() > 0) {
+			filterTarget = ctx.lookupVariable(filterTargetName);
+			if (filterTarget == null) {
+				throw new IllegalArgumentException(
+						"Filter target was null, or no argument with name "
+								+ filterTargetName + " found in method");
+			}
+		}
+		else if (mi.getArguments().length == 1) {
+			Object arg = mi.getArguments()[0];
+			if (arg.getClass().isArray() || arg instanceof Collection<?>) {
+				filterTarget = arg;
+			}
+			if (filterTarget == null) {
+				throw new IllegalArgumentException(
+						"A PreFilter expression was set but the method argument type"
+								+ arg.getClass() + " is not filterable");
+			}
+		}
 
-        if (filterTarget.getClass().isArray()) {
-            throw new IllegalArgumentException("Pre-filtering on array types is not supported. " +
-                    "Using a Collection will solve this problem");
-        }
+		if (filterTarget.getClass().isArray()) {
+			throw new IllegalArgumentException(
+					"Pre-filtering on array types is not supported. "
+							+ "Using a Collection will solve this problem");
+		}
 
-        return filterTarget;
-    }
+		return filterTarget;
+	}
 
-
-    public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
-        this.expressionHandler = expressionHandler;
-    }
+	public void setExpressionHandler(MethodSecurityExpressionHandler expressionHandler) {
+		this.expressionHandler = expressionHandler;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java
index c218f24f90..1ac2e0c7eb 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java
@@ -14,88 +14,91 @@ import org.springframework.security.core.parameters.DefaultSecurityParameterName
 
 /**
  * Internal security-specific EvaluationContext implementation which lazily adds the
- * method parameter values as variables (with the corresponding parameter names) if
- * and when they are required.
+ * method parameter values as variables (with the corresponding parameter names) if and
+ * when they are required.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 class MethodSecurityEvaluationContext extends StandardEvaluationContext {
-    private static final Log logger = LogFactory.getLog(MethodSecurityEvaluationContext.class);
+	private static final Log logger = LogFactory
+			.getLog(MethodSecurityEvaluationContext.class);
 
-    private ParameterNameDiscoverer parameterNameDiscoverer;
-    private final MethodInvocation mi;
-    private boolean argumentsAdded;
+	private ParameterNameDiscoverer parameterNameDiscoverer;
+	private final MethodInvocation mi;
+	private boolean argumentsAdded;
 
-    /**
-     * Intended for testing. Don't use in practice as it creates a new parameter resolver
-     * for each instance. Use the constructor which takes the resolver, as an argument thus
-     * allowing for caching.
-     */
-    public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi) {
-        this(user, mi, new DefaultSecurityParameterNameDiscoverer());
-    }
+	/**
+	 * Intended for testing. Don't use in practice as it creates a new parameter resolver
+	 * for each instance. Use the constructor which takes the resolver, as an argument
+	 * thus allowing for caching.
+	 */
+	public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi) {
+		this(user, mi, new DefaultSecurityParameterNameDiscoverer());
+	}
 
-    public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi,
-                    ParameterNameDiscoverer parameterNameDiscoverer) {
-        this.mi = mi;
-        this.parameterNameDiscoverer = parameterNameDiscoverer;
-    }
+	public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi,
+			ParameterNameDiscoverer parameterNameDiscoverer) {
+		this.mi = mi;
+		this.parameterNameDiscoverer = parameterNameDiscoverer;
+	}
 
-    @Override
-    public Object lookupVariable(String name) {
-        Object variable = super.lookupVariable(name);
+	@Override
+	public Object lookupVariable(String name) {
+		Object variable = super.lookupVariable(name);
 
-        if (variable != null) {
-            return variable;
-        }
+		if (variable != null) {
+			return variable;
+		}
 
-        if (!argumentsAdded) {
-            addArgumentsAsVariables();
-            argumentsAdded = true;
-        }
+		if (!argumentsAdded) {
+			addArgumentsAsVariables();
+			argumentsAdded = true;
+		}
 
-        variable = super.lookupVariable(name);
+		variable = super.lookupVariable(name);
 
-        if (variable != null) {
-            return variable;
-        }
+		if (variable != null) {
+			return variable;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
-        this.parameterNameDiscoverer = parameterNameDiscoverer;
-    }
+	public void setParameterNameDiscoverer(ParameterNameDiscoverer parameterNameDiscoverer) {
+		this.parameterNameDiscoverer = parameterNameDiscoverer;
+	}
 
-    private void addArgumentsAsVariables() {
-        Object[] args = mi.getArguments();
+	private void addArgumentsAsVariables() {
+		Object[] args = mi.getArguments();
 
-        if (args.length == 0) {
-            return;
-        }
+		if (args.length == 0) {
+			return;
+		}
 
-        Object targetObject = mi.getThis();
-        // SEC-1454
-        Class<?> targetClass = AopProxyUtils.ultimateTargetClass(targetObject);
+		Object targetObject = mi.getThis();
+		// SEC-1454
+		Class<?> targetClass = AopProxyUtils.ultimateTargetClass(targetObject);
 
-        if (targetClass == null) {
-            // TODO: Spring should do this, but there's a bug in ultimateTargetClass() which returns null
-            targetClass = targetObject.getClass();
-        }
+		if (targetClass == null) {
+			// TODO: Spring should do this, but there's a bug in ultimateTargetClass()
+			// which returns null
+			targetClass = targetObject.getClass();
+		}
 
-        Method method = AopUtils.getMostSpecificMethod(mi.getMethod(), targetClass);
-        String[] paramNames = parameterNameDiscoverer.getParameterNames(method);
+		Method method = AopUtils.getMostSpecificMethod(mi.getMethod(), targetClass);
+		String[] paramNames = parameterNameDiscoverer.getParameterNames(method);
 
-        if (paramNames == null) {
-            logger.warn("Unable to resolve method parameter names for method: " + method
-                    + ". Debug symbol information is required if you are using parameter names in expressions.");
-            return;
-        }
+		if (paramNames == null) {
+			logger.warn("Unable to resolve method parameter names for method: "
+					+ method
+					+ ". Debug symbol information is required if you are using parameter names in expressions.");
+			return;
+		}
 
-        for(int i=0; i < args.length; i++) {
-            super.setVariable(paramNames[i], args[i]);
-        }
-    }
+		for (int i = 0; i < args.length; i++) {
+			super.setVariable(paramNames[i], args[i]);
+		}
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionHandler.java
index 4560009d88..7de7a6c481 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionHandler.java
@@ -6,33 +6,36 @@ import org.springframework.expression.Expression;
 import org.springframework.security.access.expression.SecurityExpressionHandler;
 
 /**
- * Extended expression-handler facade which adds methods which are specific to securing method invocations.
+ * Extended expression-handler facade which adds methods which are specific to securing
+ * method invocations.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public interface MethodSecurityExpressionHandler extends SecurityExpressionHandler<MethodInvocation> {
-    /**
-     * Filters a target collection or array.
-     * Only applies to method invocations.
-     *
-     * @param filterTarget the array or collection to be filtered.
-     * @param filterExpression the expression which should be used as the filter condition. If it returns false on
-     *          evaluation, the object will be removed from the returned collection
-     * @param ctx the current evaluation context (as created through a call to
-     *            {@link #createEvaluationContext(org.springframework.security.core.Authentication, Object)}
-     * @return the filtered collection or array
-     */
-    Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx);
+public interface MethodSecurityExpressionHandler extends
+		SecurityExpressionHandler<MethodInvocation> {
+	/**
+	 * Filters a target collection or array. Only applies to method invocations.
+	 *
+	 * @param filterTarget the array or collection to be filtered.
+	 * @param filterExpression the expression which should be used as the filter
+	 * condition. If it returns false on evaluation, the object will be removed from the
+	 * returned collection
+	 * @param ctx the current evaluation context (as created through a call to
+	 * {@link #createEvaluationContext(org.springframework.security.core.Authentication, Object)}
+	 * @return the filtered collection or array
+	 */
+	Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx);
 
-    /**
-     * Used to inform the expression system of the return object for the given evaluation context.
-     * Only applies to method invocations.
-     *
-     * @param returnObject the return object value
-     * @param ctx the context within which the object should be set (as created through a call to
-     *            {@link #createEvaluationContext(org.springframework.security.core.Authentication, Object)}
-     */
-    void setReturnObject(Object returnObject, EvaluationContext ctx);
+	/**
+	 * Used to inform the expression system of the return object for the given evaluation
+	 * context. Only applies to method invocations.
+	 *
+	 * @param returnObject the return object value
+	 * @param ctx the context within which the object should be set (as created through a
+	 * call to
+	 * {@link #createEvaluationContext(org.springframework.security.core.Authentication, Object)}
+	 */
+	void setReturnObject(Object returnObject, EvaluationContext ctx);
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionOperations.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionOperations.java
index d2cd4c0f69..059b940952 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionOperations.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionOperations.java
@@ -22,13 +22,13 @@ import org.springframework.security.access.expression.SecurityExpressionOperatio
  * @since 3.1.1
  */
 public interface MethodSecurityExpressionOperations extends SecurityExpressionOperations {
-    void setFilterObject(Object filterObject);
+	void setFilterObject(Object filterObject);
 
-    Object getFilterObject();
+	Object getFilterObject();
 
-    void setReturnObject(Object returnObject);
+	void setReturnObject(Object returnObject);
 
-    Object getReturnObject();
+	Object getReturnObject();
 
-    Object getThis();
+	Object getThis();
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java
index ccf5f4543e..74e4fb0d28 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRoot.java
@@ -3,49 +3,50 @@ package org.springframework.security.access.expression.method;
 import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Extended expression root object which contains extra method-specific functionality.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-class MethodSecurityExpressionRoot extends SecurityExpressionRoot implements MethodSecurityExpressionOperations {
-    private Object filterObject;
-    private Object returnObject;
-    private Object target;
+class MethodSecurityExpressionRoot extends SecurityExpressionRoot implements
+		MethodSecurityExpressionOperations {
+	private Object filterObject;
+	private Object returnObject;
+	private Object target;
 
-    MethodSecurityExpressionRoot(Authentication a) {
-        super(a);
-    }
+	MethodSecurityExpressionRoot(Authentication a) {
+		super(a);
+	}
 
-    public void setFilterObject(Object filterObject) {
-        this.filterObject = filterObject;
-    }
+	public void setFilterObject(Object filterObject) {
+		this.filterObject = filterObject;
+	}
 
-    public Object getFilterObject() {
-        return filterObject;
-    }
+	public Object getFilterObject() {
+		return filterObject;
+	}
 
-    public void setReturnObject(Object returnObject) {
-        this.returnObject = returnObject;
-    }
+	public void setReturnObject(Object returnObject) {
+		this.returnObject = returnObject;
+	}
 
-    public Object getReturnObject() {
-        return returnObject;
-    }
+	public Object getReturnObject() {
+		return returnObject;
+	}
 
-    /**
-     * Sets the "this" property for use in expressions. Typically this will be the "this" property of
-     * the {@code JoinPoint} representing the method invocation which is being protected.
-     *
-     * @param target the target object on which the method in is being invoked.
-     */
-    void setThis(Object target) {
-        this.target = target;
-    }
+	/**
+	 * Sets the "this" property for use in expressions. Typically this will be the "this"
+	 * property of the {@code JoinPoint} representing the method invocation which is being
+	 * protected.
+	 *
+	 * @param target the target object on which the method in is being invoked.
+	 */
+	void setThis(Object target) {
+		this.target = target;
+	}
 
-    public Object getThis() {
-        return target;
-    }
+	public Object getThis() {
+		return target;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
index 7b30564d0a..4db743649d 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
@@ -9,26 +9,29 @@ import org.springframework.security.access.prepost.PostInvocationAttribute;
  * @author Luke Taylor
  * @since 3.0
  */
-class PostInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute
-        implements PostInvocationAttribute {
+class PostInvocationExpressionAttribute extends
+		AbstractExpressionBasedMethodConfigAttribute implements PostInvocationAttribute {
 
-    PostInvocationExpressionAttribute(String filterExpression, String authorizeExpression)
-            throws ParseException {
-        super(filterExpression, authorizeExpression);
-    }
+	PostInvocationExpressionAttribute(String filterExpression, String authorizeExpression)
+			throws ParseException {
+		super(filterExpression, authorizeExpression);
+	}
 
-    PostInvocationExpressionAttribute(Expression filterExpression, Expression authorizeExpression)
-                    throws ParseException {
-        super(filterExpression, authorizeExpression);
-    }
+	PostInvocationExpressionAttribute(Expression filterExpression,
+			Expression authorizeExpression) throws ParseException {
+		super(filterExpression, authorizeExpression);
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        Expression authorize = getAuthorizeExpression();
-        Expression filter = getFilterExpression();
-        sb.append("[authorize: '").append(authorize == null ? "null" : authorize.getExpressionString());
-        sb.append("', filter: '").append(filter == null ? "null" : filter.getExpressionString()).append("']");
-        return sb.toString();
-    }
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		Expression authorize = getAuthorizeExpression();
+		Expression filter = getFilterExpression();
+		sb.append("[authorize: '").append(
+				authorize == null ? "null" : authorize.getExpressionString());
+		sb.append("', filter: '")
+				.append(filter == null ? "null" : filter.getExpressionString())
+				.append("']");
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
index 6728e133ae..85245b74ad 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
@@ -9,42 +9,45 @@ import org.springframework.security.access.prepost.PreInvocationAttribute;
  * @author Luke Taylor
  * @since 3.0
  */
-class PreInvocationExpressionAttribute extends AbstractExpressionBasedMethodConfigAttribute
-        implements PreInvocationAttribute {
+class PreInvocationExpressionAttribute extends
+		AbstractExpressionBasedMethodConfigAttribute implements PreInvocationAttribute {
 
-    private final String filterTarget;
+	private final String filterTarget;
 
-    PreInvocationExpressionAttribute(String filterExpression, String filterTarget, String authorizeExpression)
-            throws ParseException {
-        super(filterExpression, authorizeExpression);
+	PreInvocationExpressionAttribute(String filterExpression, String filterTarget,
+			String authorizeExpression) throws ParseException {
+		super(filterExpression, authorizeExpression);
 
-        this.filterTarget = filterTarget;
-    }
+		this.filterTarget = filterTarget;
+	}
 
-    PreInvocationExpressionAttribute(Expression filterExpression, String filterTarget, Expression authorizeExpression)
-            throws ParseException {
-        super(filterExpression, authorizeExpression);
+	PreInvocationExpressionAttribute(Expression filterExpression, String filterTarget,
+			Expression authorizeExpression) throws ParseException {
+		super(filterExpression, authorizeExpression);
 
-        this.filterTarget = filterTarget;
-    }
+		this.filterTarget = filterTarget;
+	}
 
-    /**
-     * The parameter name of the target argument (must be a Collection) to which filtering will be applied.
-     *
-     * @return the method parameter name
-     */
-    String getFilterTarget() {
-        return filterTarget;
-    }
+	/**
+	 * The parameter name of the target argument (must be a Collection) to which filtering
+	 * will be applied.
+	 *
+	 * @return the method parameter name
+	 */
+	String getFilterTarget() {
+		return filterTarget;
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        Expression authorize = getAuthorizeExpression();
-        Expression filter = getFilterExpression();
-        sb.append("[authorize: '").append(authorize == null ? "null" : authorize.getExpressionString());
-        sb.append("', filter: '").append(filter == null ? "null" : filter.getExpressionString());
-        sb.append("', filterTarget: '").append(filterTarget).append("']");
-        return sb.toString();
-    }
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		Expression authorize = getAuthorizeExpression();
+		Expression filter = getFilterExpression();
+		sb.append("[authorize: '").append(
+				authorize == null ? "null" : authorize.getExpressionString());
+		sb.append("', filter: '").append(
+				filter == null ? "null" : filter.getExpressionString());
+		sb.append("', filterTarget: '").append(filterTarget).append("']");
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/package-info.java b/core/src/main/java/org/springframework/security/access/expression/method/package-info.java
index 0908dfe789..f1ff063e63 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/package-info.java
@@ -4,3 +4,4 @@
  * @since 3.0
  */
 package org.springframework.security.access.expression.method;
+
diff --git a/core/src/main/java/org/springframework/security/access/expression/package-info.java b/core/src/main/java/org/springframework/security/access/expression/package-info.java
index d37860e9f2..0b23339f20 100644
--- a/core/src/main/java/org/springframework/security/access/expression/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/expression/package-info.java
@@ -5,3 +5,4 @@
  * @since 3.0
  */
 package org.springframework.security.access.expression;
+
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java
index 663d1e6572..27e6cc8af1 100755
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/CycleInRoleHierarchyException.java
@@ -21,10 +21,10 @@ package org.springframework.security.access.hierarchicalroles;
  */
 public class CycleInRoleHierarchyException extends RuntimeException {
 
-    private static final long serialVersionUID = -4970510612118296707L;
+	private static final long serialVersionUID = -4970510612118296707L;
 
-    public CycleInRoleHierarchyException() {
-        super("Exception thrown because of a cycle in the role hierarchy definition!");
-    }
+	public CycleInRoleHierarchyException() {
+		super("Exception thrown because of a cycle in the role hierarchy definition!");
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/NullRoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/NullRoleHierarchy.java
index 8003c6767b..2cabb17d3e 100644
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/NullRoleHierarchy.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/NullRoleHierarchy.java
@@ -11,8 +11,9 @@ import org.springframework.security.core.GrantedAuthority;
  */
 public final class NullRoleHierarchy implements RoleHierarchy {
 
-    public Collection<? extends GrantedAuthority> getReachableGrantedAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        return authorities;
-    }
+	public Collection<? extends GrantedAuthority> getReachableGrantedAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		return authorities;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
index 9e86c520d4..bc538c4bad 100755
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
@@ -25,21 +25,21 @@ import org.springframework.security.core.GrantedAuthority;
  */
 public interface RoleHierarchy {
 
-    /**
-     * Returns an array of all reachable authorities.
-     * <p>
-     * Reachable authorities are the directly assigned authorities plus all
-     * authorities that are (transitively) reachable from them in the role
-     * hierarchy.
-     * <p>
-     * Example:<br>
-     * Role hierarchy: ROLE_A > ROLE_B and ROLE_B > ROLE_C.<br>
-     * Directly assigned authority: ROLE_A.<br>
-     * Reachable authorities: ROLE_A, ROLE_B, ROLE_C.
-     *
-     * @param authorities - List of the directly assigned authorities.
-     * @return List of all reachable authorities given the assigned authorities.
-     */
-    public Collection<? extends GrantedAuthority> getReachableGrantedAuthorities(Collection<? extends GrantedAuthority> authorities);
+	/**
+	 * Returns an array of all reachable authorities.
+	 * <p>
+	 * Reachable authorities are the directly assigned authorities plus all authorities
+	 * that are (transitively) reachable from them in the role hierarchy.
+	 * <p>
+	 * Example:<br>
+	 * Role hierarchy: ROLE_A > ROLE_B and ROLE_B > ROLE_C.<br>
+	 * Directly assigned authority: ROLE_A.<br>
+	 * Reachable authorities: ROLE_A, ROLE_B, ROLE_C.
+	 *
+	 * @param authorities - List of the directly assigned authorities.
+	 * @return List of all reachable authorities given the assigned authorities.
+	 */
+	public Collection<? extends GrantedAuthority> getReachableGrantedAuthorities(
+			Collection<? extends GrantedAuthority> authorities);
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java
index 862a07406b..fc725f1cd6 100644
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapper.java
@@ -9,13 +9,14 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class RoleHierarchyAuthoritiesMapper implements GrantedAuthoritiesMapper {
-    private final RoleHierarchy roleHierarchy;
+	private final RoleHierarchy roleHierarchy;
 
-    public RoleHierarchyAuthoritiesMapper(RoleHierarchy roleHierarchy) {
-        this.roleHierarchy = roleHierarchy;
-    }
+	public RoleHierarchyAuthoritiesMapper(RoleHierarchy roleHierarchy) {
+		this.roleHierarchy = roleHierarchy;
+	}
 
-    public Collection<? extends GrantedAuthority> mapAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        return roleHierarchy.getReachableGrantedAuthorities(authorities);
-    }
+	public Collection<? extends GrantedAuthority> mapAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		return roleHierarchy.getReachableGrantedAuthorities(authorities);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
index abf1dc8654..c04d1ca35c 100755
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
@@ -14,7 +14,6 @@
 
 package org.springframework.security.access.hierarchicalroles;
 
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.core.GrantedAuthority;
@@ -30,33 +29,39 @@ import java.util.regex.Pattern;
  * This class defines a role hierarchy for use with the UserDetailsServiceWrapper.
  * </p>
  * <p>
- * Here is an example configuration of a role hierarchy (hint: read the "&gt;" sign as "includes"):
-<pre>
-        &lt;property name="hierarchy"&gt;
-            &lt;value&gt;
-                ROLE_A &gt; ROLE_B
-                ROLE_B &gt; ROLE_AUTHENTICATED
-                ROLE_AUTHENTICATED &gt; ROLE_UNAUTHENTICATED
-            &lt;/value&gt;
-        &lt;/property&gt;
-</pre>
-</p>
+ * Here is an example configuration of a role hierarchy (hint: read the "&gt;" sign as
+ * "includes"):
+ * 
+ * <pre>
+ *         &lt;property name="hierarchy"&gt;
+ *             &lt;value&gt;
+ *                 ROLE_A &gt; ROLE_B
+ *                 ROLE_B &gt; ROLE_AUTHENTICATED
+ *                 ROLE_AUTHENTICATED &gt; ROLE_UNAUTHENTICATED
+ *             &lt;/value&gt;
+ *         &lt;/property&gt;
+ * </pre>
+ * 
+ * </p>
  * <p>
  * Explanation of the above:<br>
- * In effect every user with ROLE_A also has ROLE_B, ROLE_AUTHENTICATED and ROLE_UNAUTHENTICATED;<br>
+ * In effect every user with ROLE_A also has ROLE_B, ROLE_AUTHENTICATED and
+ * ROLE_UNAUTHENTICATED;<br>
  * every user with ROLE_B also has ROLE_AUTHENTICATED and ROLE_UNAUTHENTICATED;<br>
  * every user with ROLE_AUTHENTICATED also has ROLE_UNAUTHENTICATED.
  * </p>
  * <p>
- * Hierarchical Roles will dramatically shorten your access rules (and also make the access rules much more elegant).
+ * Hierarchical Roles will dramatically shorten your access rules (and also make the
+ * access rules much more elegant).
  * </p>
  * <p>
- * Consider this access rule for Spring Security's RoleVoter (background: every user that is authenticated should be
- * able to log out):<br>
+ * Consider this access rule for Spring Security's RoleVoter (background: every user that
+ * is authenticated should be able to log out):<br>
  * /logout.html=ROLE_A,ROLE_B,ROLE_AUTHENTICATED<br>
  * With hierarchical roles this can now be shortened to:<br>
  * /logout.html=ROLE_AUTHENTICATED<br>
- * In addition to shorter rules this will also make your access rules more readable and your intentions clearer.
+ * In addition to shorter rules this will also make your access rules more readable and
+ * your intentions clearer.
  * </p>
  *
  * @author Michael Mayr
@@ -64,166 +69,176 @@ import java.util.regex.Pattern;
  */
 public class RoleHierarchyImpl implements RoleHierarchy {
 
-    private static final Log logger = LogFactory.getLog(RoleHierarchyImpl.class);
+	private static final Log logger = LogFactory.getLog(RoleHierarchyImpl.class);
 
-    private String roleHierarchyStringRepresentation = null;
+	private String roleHierarchyStringRepresentation = null;
 
-    /**
-     * rolesReachableInOneStepMap is a Map that under the key of a specific role name contains a set of all roles
-     * reachable from this role in 1 step
-     */
-    private Map<GrantedAuthority, Set<GrantedAuthority>> rolesReachableInOneStepMap = null;
+	/**
+	 * rolesReachableInOneStepMap is a Map that under the key of a specific role name
+	 * contains a set of all roles reachable from this role in 1 step
+	 */
+	private Map<GrantedAuthority, Set<GrantedAuthority>> rolesReachableInOneStepMap = null;
 
-    /**
-     * rolesReachableInOneOrMoreStepsMap is a Map that under the key of a specific role name contains a set of all
-     * roles reachable from this role in 1 or more steps
-     */
-    private Map<GrantedAuthority, Set<GrantedAuthority>> rolesReachableInOneOrMoreStepsMap = null;
+	/**
+	 * rolesReachableInOneOrMoreStepsMap is a Map that under the key of a specific role
+	 * name contains a set of all roles reachable from this role in 1 or more steps
+	 */
+	private Map<GrantedAuthority, Set<GrantedAuthority>> rolesReachableInOneOrMoreStepsMap = null;
 
-    /**
-     * Set the role hierarchy and pre-calculate for every role the set of all reachable roles, i.e. all roles lower in
-     * the hierarchy of every given role. Pre-calculation is done for performance reasons (reachable roles can then be
-     * calculated in O(1) time).
-     * During pre-calculation, cycles in role hierarchy are detected and will cause a
-     * <tt>CycleInRoleHierarchyException</tt> to be thrown.
-     *
-     * @param roleHierarchyStringRepresentation - String definition of the role hierarchy.
-     */
-    public void setHierarchy(String roleHierarchyStringRepresentation) {
-        this.roleHierarchyStringRepresentation = roleHierarchyStringRepresentation;
+	/**
+	 * Set the role hierarchy and pre-calculate for every role the set of all reachable
+	 * roles, i.e. all roles lower in the hierarchy of every given role. Pre-calculation
+	 * is done for performance reasons (reachable roles can then be calculated in O(1)
+	 * time). During pre-calculation, cycles in role hierarchy are detected and will cause
+	 * a <tt>CycleInRoleHierarchyException</tt> to be thrown.
+	 *
+	 * @param roleHierarchyStringRepresentation - String definition of the role hierarchy.
+	 */
+	public void setHierarchy(String roleHierarchyStringRepresentation) {
+		this.roleHierarchyStringRepresentation = roleHierarchyStringRepresentation;
 
-        logger.debug("setHierarchy() - The following role hierarchy was set: " + roleHierarchyStringRepresentation);
+		logger.debug("setHierarchy() - The following role hierarchy was set: "
+				+ roleHierarchyStringRepresentation);
 
-        buildRolesReachableInOneStepMap();
-        buildRolesReachableInOneOrMoreStepsMap();
-    }
+		buildRolesReachableInOneStepMap();
+		buildRolesReachableInOneOrMoreStepsMap();
+	}
 
-    public Collection<GrantedAuthority> getReachableGrantedAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        if (authorities == null || authorities.isEmpty()) {
-            return AuthorityUtils.NO_AUTHORITIES;
-        }
+	public Collection<GrantedAuthority> getReachableGrantedAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		if (authorities == null || authorities.isEmpty()) {
+			return AuthorityUtils.NO_AUTHORITIES;
+		}
 
-        Set<GrantedAuthority> reachableRoles = new HashSet<GrantedAuthority>();
+		Set<GrantedAuthority> reachableRoles = new HashSet<GrantedAuthority>();
 
-        for (GrantedAuthority authority : authorities) {
-            addReachableRoles(reachableRoles, authority);
-            Set<GrantedAuthority> additionalReachableRoles = getRolesReachableInOneOrMoreSteps(authority);
-            if (additionalReachableRoles != null) {
-                reachableRoles.addAll(additionalReachableRoles);
-            }
-        }
+		for (GrantedAuthority authority : authorities) {
+			addReachableRoles(reachableRoles, authority);
+			Set<GrantedAuthority> additionalReachableRoles = getRolesReachableInOneOrMoreSteps(authority);
+			if (additionalReachableRoles != null) {
+				reachableRoles.addAll(additionalReachableRoles);
+			}
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("getReachableGrantedAuthorities() - From the roles " + authorities
-                    + " one can reach " + reachableRoles + " in zero or more steps.");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("getReachableGrantedAuthorities() - From the roles "
+					+ authorities + " one can reach " + reachableRoles
+					+ " in zero or more steps.");
+		}
 
-        List<GrantedAuthority> reachableRoleList = new ArrayList<GrantedAuthority>(reachableRoles.size());
-        reachableRoleList.addAll(reachableRoles);
+		List<GrantedAuthority> reachableRoleList = new ArrayList<GrantedAuthority>(
+				reachableRoles.size());
+		reachableRoleList.addAll(reachableRoles);
 
-        return reachableRoleList;
-    }
+		return reachableRoleList;
+	}
 
-    // SEC-863
-    private void addReachableRoles(Set<GrantedAuthority> reachableRoles,
-            GrantedAuthority authority) {
+	// SEC-863
+	private void addReachableRoles(Set<GrantedAuthority> reachableRoles,
+			GrantedAuthority authority) {
 
-        for (GrantedAuthority testAuthority : reachableRoles) {
-            String testKey = testAuthority.getAuthority();
-            if ((testKey != null) && (testKey.equals(authority.getAuthority()))) {
-                return;
-            }
-        }
-        reachableRoles.add(authority);
-    }
+		for (GrantedAuthority testAuthority : reachableRoles) {
+			String testKey = testAuthority.getAuthority();
+			if ((testKey != null) && (testKey.equals(authority.getAuthority()))) {
+				return;
+			}
+		}
+		reachableRoles.add(authority);
+	}
 
-    // SEC-863
-    private Set<GrantedAuthority> getRolesReachableInOneOrMoreSteps(
-            GrantedAuthority authority) {
+	// SEC-863
+	private Set<GrantedAuthority> getRolesReachableInOneOrMoreSteps(
+			GrantedAuthority authority) {
 
-        if (authority.getAuthority() == null) {
-            return null;
-        }
+		if (authority.getAuthority() == null) {
+			return null;
+		}
 
-        for (GrantedAuthority testAuthority : rolesReachableInOneOrMoreStepsMap.keySet()) {
-            String testKey = testAuthority.getAuthority();
-            if ((testKey != null) && (testKey.equals(authority.getAuthority()))) {
-                return rolesReachableInOneOrMoreStepsMap.get(testAuthority);
-            }
-        }
+		for (GrantedAuthority testAuthority : rolesReachableInOneOrMoreStepsMap.keySet()) {
+			String testKey = testAuthority.getAuthority();
+			if ((testKey != null) && (testKey.equals(authority.getAuthority()))) {
+				return rolesReachableInOneOrMoreStepsMap.get(testAuthority);
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Parse input and build the map for the roles reachable in one step: the higher role will become a key that
-     * references a set of the reachable lower roles.
-     */
-    private void buildRolesReachableInOneStepMap() {
-        Pattern pattern = Pattern.compile("(\\s*([^\\s>]+)\\s*>\\s*([^\\s>]+))");
+	/**
+	 * Parse input and build the map for the roles reachable in one step: the higher role
+	 * will become a key that references a set of the reachable lower roles.
+	 */
+	private void buildRolesReachableInOneStepMap() {
+		Pattern pattern = Pattern.compile("(\\s*([^\\s>]+)\\s*>\\s*([^\\s>]+))");
 
-        Matcher roleHierarchyMatcher = pattern.matcher(roleHierarchyStringRepresentation);
-        rolesReachableInOneStepMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
+		Matcher roleHierarchyMatcher = pattern.matcher(roleHierarchyStringRepresentation);
+		rolesReachableInOneStepMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
 
-        while (roleHierarchyMatcher.find()) {
-            GrantedAuthority higherRole = new SimpleGrantedAuthority(roleHierarchyMatcher.group(2));
-            GrantedAuthority lowerRole = new SimpleGrantedAuthority(roleHierarchyMatcher.group(3));
-            Set<GrantedAuthority> rolesReachableInOneStepSet;
+		while (roleHierarchyMatcher.find()) {
+			GrantedAuthority higherRole = new SimpleGrantedAuthority(
+					roleHierarchyMatcher.group(2));
+			GrantedAuthority lowerRole = new SimpleGrantedAuthority(
+					roleHierarchyMatcher.group(3));
+			Set<GrantedAuthority> rolesReachableInOneStepSet;
 
-            if (!rolesReachableInOneStepMap.containsKey(higherRole)) {
-                rolesReachableInOneStepSet = new HashSet<GrantedAuthority>();
-                rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet);
-            } else {
-                rolesReachableInOneStepSet = rolesReachableInOneStepMap.get(higherRole);
-            }
-            addReachableRoles(rolesReachableInOneStepSet, lowerRole);
+			if (!rolesReachableInOneStepMap.containsKey(higherRole)) {
+				rolesReachableInOneStepSet = new HashSet<GrantedAuthority>();
+				rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet);
+			}
+			else {
+				rolesReachableInOneStepSet = rolesReachableInOneStepMap.get(higherRole);
+			}
+			addReachableRoles(rolesReachableInOneStepSet, lowerRole);
 
-            logger.debug("buildRolesReachableInOneStepMap() - From role "
-                    + higherRole + " one can reach role " + lowerRole + " in one step.");
-        }
-    }
+			logger.debug("buildRolesReachableInOneStepMap() - From role " + higherRole
+					+ " one can reach role " + lowerRole + " in one step.");
+		}
+	}
 
-    /**
-     * For every higher role from rolesReachableInOneStepMap store all roles that are reachable from it in the map of
-     * roles reachable in one or more steps. (Or throw a CycleInRoleHierarchyException if a cycle in the role
-     * hierarchy definition is detected)
-     */
-    private void buildRolesReachableInOneOrMoreStepsMap() {
-        rolesReachableInOneOrMoreStepsMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
-        // iterate over all higher roles from rolesReachableInOneStepMap
+	/**
+	 * For every higher role from rolesReachableInOneStepMap store all roles that are
+	 * reachable from it in the map of roles reachable in one or more steps. (Or throw a
+	 * CycleInRoleHierarchyException if a cycle in the role hierarchy definition is
+	 * detected)
+	 */
+	private void buildRolesReachableInOneOrMoreStepsMap() {
+		rolesReachableInOneOrMoreStepsMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
+		// iterate over all higher roles from rolesReachableInOneStepMap
 
-        for(GrantedAuthority role : rolesReachableInOneStepMap.keySet()) {
-            Set<GrantedAuthority> rolesToVisitSet = new HashSet<GrantedAuthority>();
+		for (GrantedAuthority role : rolesReachableInOneStepMap.keySet()) {
+			Set<GrantedAuthority> rolesToVisitSet = new HashSet<GrantedAuthority>();
 
-            if (rolesReachableInOneStepMap.containsKey(role)) {
-                rolesToVisitSet.addAll(rolesReachableInOneStepMap.get(role));
-            }
+			if (rolesReachableInOneStepMap.containsKey(role)) {
+				rolesToVisitSet.addAll(rolesReachableInOneStepMap.get(role));
+			}
 
-            Set<GrantedAuthority> visitedRolesSet = new HashSet<GrantedAuthority>();
+			Set<GrantedAuthority> visitedRolesSet = new HashSet<GrantedAuthority>();
 
-            while (!rolesToVisitSet.isEmpty()) {
-                // take a role from the rolesToVisit set
-                GrantedAuthority aRole = rolesToVisitSet.iterator().next();
-                rolesToVisitSet.remove(aRole);
-                addReachableRoles(visitedRolesSet, aRole);
-                if (rolesReachableInOneStepMap.containsKey(aRole)) {
-                    Set<GrantedAuthority> newReachableRoles = rolesReachableInOneStepMap.get(aRole);
+			while (!rolesToVisitSet.isEmpty()) {
+				// take a role from the rolesToVisit set
+				GrantedAuthority aRole = rolesToVisitSet.iterator().next();
+				rolesToVisitSet.remove(aRole);
+				addReachableRoles(visitedRolesSet, aRole);
+				if (rolesReachableInOneStepMap.containsKey(aRole)) {
+					Set<GrantedAuthority> newReachableRoles = rolesReachableInOneStepMap
+							.get(aRole);
 
-                    // definition of a cycle: you can reach the role you are starting from
-                    if (rolesToVisitSet.contains(role) || visitedRolesSet.contains(role)) {
-                        throw new CycleInRoleHierarchyException();
-                    } else {
-                         // no cycle
-                        rolesToVisitSet.addAll(newReachableRoles);
-                    }
-                }
-            }
-            rolesReachableInOneOrMoreStepsMap.put(role, visitedRolesSet);
+					// definition of a cycle: you can reach the role you are starting from
+					if (rolesToVisitSet.contains(role) || visitedRolesSet.contains(role)) {
+						throw new CycleInRoleHierarchyException();
+					}
+					else {
+						// no cycle
+						rolesToVisitSet.addAll(newReachableRoles);
+					}
+				}
+			}
+			rolesReachableInOneOrMoreStepsMap.put(role, visitedRolesSet);
 
-            logger.debug("buildRolesReachableInOneOrMoreStepsMap() - From role "
-                    + role + " one can reach " + visitedRolesSet + " in one or more steps.");
-        }
+			logger.debug("buildRolesReachableInOneOrMoreStepsMap() - From role " + role
+					+ " one can reach " + visitedRolesSet + " in one or more steps.");
+		}
 
-    }
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/package-info.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/package-info.java
index ddce6ad472..7a787d628a 100644
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/package-info.java
@@ -2,3 +2,4 @@
  * Role hierarchy implementation.
  */
 package org.springframework.security.access.hierarchicalroles;
+
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java
index 51365ec993..135327daf2 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java
@@ -49,424 +49,467 @@ import org.springframework.util.Assert;
 /**
  * Abstract class that implements security interception for secure objects.
  * <p>
- * The <code>AbstractSecurityInterceptor</code> will ensure the proper startup configuration of the security
- * interceptor. It will also implement the proper handling of secure object invocations, namely:
+ * The <code>AbstractSecurityInterceptor</code> will ensure the proper startup
+ * configuration of the security interceptor. It will also implement the proper handling
+ * of secure object invocations, namely:
  * <ol>
  * <li>Obtain the {@link Authentication} object from the {@link SecurityContextHolder}.</li>
- * <li>Determine if the request relates to a secured or public invocation by looking up the secure object request
- * against the {@link SecurityMetadataSource}.</li>
- * <li>For an invocation that is secured (there is a list of <code>ConfigAttribute</code>s for the secure
- * object invocation):
+ * <li>Determine if the request relates to a secured or public invocation by looking up
+ * the secure object request against the {@link SecurityMetadataSource}.</li>
+ * <li>For an invocation that is secured (there is a list of <code>ConfigAttribute</code>s
+ * for the secure object invocation):
  * <ol type="a">
- * <li>If either the {@link org.springframework.security.core.Authentication#isAuthenticated()}
- * returns <code>false</code>, or the {@link #alwaysReauthenticate} is
- * <code>true</code>, authenticate the request against the configured {@link AuthenticationManager}.
- * When authenticated, replace the <code>Authentication</code> object on the
+ * <li>If either the
+ * {@link org.springframework.security.core.Authentication#isAuthenticated()} returns
+ * <code>false</code>, or the {@link #alwaysReauthenticate} is <code>true</code>,
+ * authenticate the request against the configured {@link AuthenticationManager}. When
+ * authenticated, replace the <code>Authentication</code> object on the
  * <code>SecurityContextHolder</code> with the returned value.</li>
  * <li>Authorize the request against the configured {@link AccessDecisionManager}.</li>
  * <li>Perform any run-as replacement via the configured {@link RunAsManager}.</li>
- * <li>Pass control back to the concrete subclass, which will actually proceed with executing the object.
- * A {@link InterceptorStatusToken} is returned so that after the subclass has finished proceeding with
- * execution of the object, its finally clause can ensure the <code>AbstractSecurityInterceptor</code>
- * is re-called and tidies up correctly using {@link #finallyInvocation(InterceptorStatusToken)}.</li>
- * <li>The concrete subclass will re-call the <code>AbstractSecurityInterceptor</code> via the
- * {@link #afterInvocation(InterceptorStatusToken, Object)} method.</li>
- * <li>If the <code>RunAsManager</code> replaced the <code>Authentication</code> object, return the
- * <code>SecurityContextHolder</code> to the object that existed after the call to
- * <code>AuthenticationManager</code>.</li>
- * <li>If an <code>AfterInvocationManager</code> is defined, invoke the
- * invocation manager and allow it to replace the object due to be returned to
- * the caller.</li>
+ * <li>Pass control back to the concrete subclass, which will actually proceed with
+ * executing the object. A {@link InterceptorStatusToken} is returned so that after the
+ * subclass has finished proceeding with execution of the object, its finally clause can
+ * ensure the <code>AbstractSecurityInterceptor</code> is re-called and tidies up
+ * correctly using {@link #finallyInvocation(InterceptorStatusToken)}.</li>
+ * <li>The concrete subclass will re-call the <code>AbstractSecurityInterceptor</code> via
+ * the {@link #afterInvocation(InterceptorStatusToken, Object)} method.</li>
+ * <li>If the <code>RunAsManager</code> replaced the <code>Authentication</code> object,
+ * return the <code>SecurityContextHolder</code> to the object that existed after the call
+ * to <code>AuthenticationManager</code>.</li>
+ * <li>If an <code>AfterInvocationManager</code> is defined, invoke the invocation manager
+ * and allow it to replace the object due to be returned to the caller.</li>
  * </ol>
  * </li>
- * <li>For an invocation that is public (there are no <code>ConfigAttribute</code>s for the secure object
- * invocation):
+ * <li>For an invocation that is public (there are no <code>ConfigAttribute</code>s for
+ * the secure object invocation):
  * <ol type="a">
- * <li>As described above, the concrete subclass will be returned an <code>InterceptorStatusToken</code> which is
- * subsequently re-presented to the <code>AbstractSecurityInterceptor</code> after the secure object has been executed.
- * The <code>AbstractSecurityInterceptor</code> will take no further action when its
+ * <li>As described above, the concrete subclass will be returned an
+ * <code>InterceptorStatusToken</code> which is subsequently re-presented to the
+ * <code>AbstractSecurityInterceptor</code> after the secure object has been executed. The
+ * <code>AbstractSecurityInterceptor</code> will take no further action when its
  * {@link #afterInvocation(InterceptorStatusToken, Object)} is called.</li>
  * </ol>
  * </li>
- * <li>Control again returns to the concrete subclass, along with the <code>Object</code> that should be returned to
- * the caller. The subclass will then return that result or exception to the original caller.</li>
+ * <li>Control again returns to the concrete subclass, along with the <code>Object</code>
+ * that should be returned to the caller. The subclass will then return that result or
+ * exception to the original caller.</li>
  * </ol>
  *
  * @author Ben Alex
  * @author Rob Winch
  */
-public abstract class AbstractSecurityInterceptor implements InitializingBean, ApplicationEventPublisherAware,
-        MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
-
-    protected final Log logger = LogFactory.getLog(getClass());
-
-    //~ Instance fields ================================================================================================
-
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private ApplicationEventPublisher eventPublisher;
-    private AccessDecisionManager accessDecisionManager;
-    private AfterInvocationManager afterInvocationManager;
-    private AuthenticationManager authenticationManager = new NoOpAuthenticationManager();
-    private RunAsManager runAsManager = new NullRunAsManager();
-
-    private boolean alwaysReauthenticate = false;
-    private boolean rejectPublicInvocations = false;
-    private boolean validateConfigAttributes = true;
-    private boolean publishAuthorizationSuccess = false;
-
-    //~ Methods ========================================================================================================
-
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(getSecureObjectClass(), "Subclass must provide a non-null response to getSecureObjectClass()");
-        Assert.notNull(this.messages, "A message source must be set");
-        Assert.notNull(this.authenticationManager, "An AuthenticationManager is required");
-        Assert.notNull(this.accessDecisionManager, "An AccessDecisionManager is required");
-        Assert.notNull(this.runAsManager, "A RunAsManager is required");
-        Assert.notNull(this.obtainSecurityMetadataSource(), "An SecurityMetadataSource is required");
-        Assert.isTrue(this.obtainSecurityMetadataSource().supports(getSecureObjectClass()),
-                "SecurityMetadataSource does not support secure object class: " + getSecureObjectClass());
-        Assert.isTrue(this.runAsManager.supports(getSecureObjectClass()),
-                "RunAsManager does not support secure object class: " + getSecureObjectClass());
-        Assert.isTrue(this.accessDecisionManager.supports(getSecureObjectClass()),
-                "AccessDecisionManager does not support secure object class: " + getSecureObjectClass());
-
-        if (this.afterInvocationManager != null) {
-            Assert.isTrue(this.afterInvocationManager.supports(getSecureObjectClass()),
-                    "AfterInvocationManager does not support secure object class: " + getSecureObjectClass());
-        }
-
-        if (this.validateConfigAttributes) {
-            Collection<ConfigAttribute> attributeDefs = this.obtainSecurityMetadataSource().getAllConfigAttributes();
-
-            if (attributeDefs == null) {
-                logger.warn("Could not validate configuration attributes as the SecurityMetadataSource did not return "
-                        + "any attributes from getAllConfigAttributes()");
-                return;
-            }
-
-            Set<ConfigAttribute> unsupportedAttrs = new HashSet<ConfigAttribute>();
-
-            for (ConfigAttribute attr : attributeDefs) {
-                if (!this.runAsManager.supports(attr) && !this.accessDecisionManager.supports(attr)
-                        && ((this.afterInvocationManager == null) || !this.afterInvocationManager.supports(attr))) {
-                    unsupportedAttrs.add(attr);
-                }
-            }
-
-            if (unsupportedAttrs.size() != 0) {
-                throw new IllegalArgumentException("Unsupported configuration attributes: " + unsupportedAttrs);
-            }
-
-            logger.debug("Validated configuration attributes");
-        }
-    }
-
-    protected InterceptorStatusToken beforeInvocation(Object object) {
-        Assert.notNull(object, "Object was null");
-        final boolean debug = logger.isDebugEnabled();
-
-        if (!getSecureObjectClass().isAssignableFrom(object.getClass())) {
-            throw new IllegalArgumentException("Security invocation attempted for object "
-                    + object.getClass().getName()
-                    + " but AbstractSecurityInterceptor only configured to support secure objects of type: "
-                    + getSecureObjectClass());
-        }
-
-        Collection<ConfigAttribute> attributes = this.obtainSecurityMetadataSource().getAttributes(object);
-
-        if (attributes == null || attributes.isEmpty()) {
-            if (rejectPublicInvocations) {
-                throw new IllegalArgumentException("Secure object invocation " + object +
-                        " was denied as public invocations are not allowed via this interceptor. "
-                                + "This indicates a configuration error because the "
-                                + "rejectPublicInvocations property is set to 'true'");
-            }
-
-            if (debug) {
-                logger.debug("Public object - authentication not attempted");
-            }
-
-            publishEvent(new PublicInvocationEvent(object));
-
-            return null; // no further work post-invocation
-        }
-
-        if (debug) {
-            logger.debug("Secure object: " + object + "; Attributes: " + attributes);
-        }
-
-        if (SecurityContextHolder.getContext().getAuthentication() == null) {
-            credentialsNotFound(messages.getMessage("AbstractSecurityInterceptor.authenticationNotFound",
-                    "An Authentication object was not found in the SecurityContext"), object, attributes);
-        }
-
-        Authentication authenticated = authenticateIfRequired();
-
-        // Attempt authorization
-        try {
-            this.accessDecisionManager.decide(authenticated, object, attributes);
-        }
-        catch (AccessDeniedException accessDeniedException) {
-            publishEvent(new AuthorizationFailureEvent(object, attributes, authenticated, accessDeniedException));
-
-            throw accessDeniedException;
-        }
-
-        if (debug) {
-            logger.debug("Authorization successful");
-        }
-
-        if (publishAuthorizationSuccess) {
-            publishEvent(new AuthorizedEvent(object, attributes, authenticated));
-        }
-
-        // Attempt to run as a different user
-        Authentication runAs = this.runAsManager.buildRunAs(authenticated, object, attributes);
-
-        if (runAs == null) {
-            if (debug) {
-                logger.debug("RunAsManager did not change Authentication object");
-            }
-
-            // no further work post-invocation
-            return new InterceptorStatusToken(SecurityContextHolder.getContext(), false, attributes, object);
-        } else {
-            if (debug) {
-                logger.debug("Switching to RunAs Authentication: " + runAs);
-            }
-
-            SecurityContext origCtx = SecurityContextHolder.getContext();
-            SecurityContextHolder.setContext(SecurityContextHolder.createEmptyContext());
-            SecurityContextHolder.getContext().setAuthentication(runAs);
-
-            // need to revert to token.Authenticated post-invocation
-            return new InterceptorStatusToken(origCtx, true, attributes, object);
-        }
-    }
-
-    /**
-     * Cleans up the work of the <tt>AbstractSecurityInterceptor</tt> after the secure object invocation has been
-     * completed. This method should be invoked after the secure object invocation and before afterInvocation regardless
-     * of the secure object invocation returning successfully (i.e. it should be done in a finally block).
-     *
-     * @param token as returned by the {@link #beforeInvocation(Object)} method
-     */
-    protected void finallyInvocation(InterceptorStatusToken token) {
-        if (token != null && token.isContextHolderRefreshRequired()) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Reverting to original Authentication: " + token.getSecurityContext().getAuthentication());
-            }
-
-            SecurityContextHolder.setContext(token.getSecurityContext());
-        }
-    }
-
-    /**
-     * Completes the work of the <tt>AbstractSecurityInterceptor</tt> after the secure object invocation has been
-     * completed.
-     *
-     * @param token as returned by the {@link #beforeInvocation(Object)}} method
-     * @param returnedObject any object returned from the secure object invocation (may be <tt>null</tt>)
-     * @return the object the secure object invocation should ultimately return to its caller (may be <tt>null</tt>)
-     */
-    protected Object afterInvocation(InterceptorStatusToken token, Object returnedObject) {
-        if (token == null) {
-            // public object
-            return returnedObject;
-        }
-
-        finallyInvocation(token); // continue to clean in this method for passivity
-
-        if (afterInvocationManager != null) {
-            // Attempt after invocation handling
-            try {
-                returnedObject = afterInvocationManager.decide(token.getSecurityContext().getAuthentication(),
-                        token.getSecureObject(),
-                        token.getAttributes(), returnedObject);
-            }
-            catch (AccessDeniedException accessDeniedException) {
-                AuthorizationFailureEvent event = new AuthorizationFailureEvent(token.getSecureObject(), token
-                        .getAttributes(), token.getSecurityContext().getAuthentication(), accessDeniedException);
-                publishEvent(event);
-
-                throw accessDeniedException;
-            }
-        }
-
-        return returnedObject;
-    }
-
-    /**
-     * Checks the current authentication token and passes it to the AuthenticationManager if
-     * {@link org.springframework.security.core.Authentication#isAuthenticated()} returns false or the property
-     * <tt>alwaysReauthenticate</tt> has been set to true.
-     *
-     * @return an authenticated <tt>Authentication</tt> object.
-     */
-    private Authentication authenticateIfRequired() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-
-        if (authentication.isAuthenticated() && !alwaysReauthenticate) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Previously Authenticated: " + authentication);
-            }
-
-            return authentication;
-        }
-
-        authentication = authenticationManager.authenticate(authentication);
-
-        // We don't authenticated.setAuthentication(true), because each provider should do that
-        if (logger.isDebugEnabled()) {
-            logger.debug("Successfully Authenticated: " + authentication);
-        }
-
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        return authentication;
-    }
-
-    /**
-     * Helper method which generates an exception containing the passed reason,
-     * and publishes an event to the application context.
-     * <p>
-     * Always throws an exception.
-     *
-     * @param reason        to be provided in the exception detail
-     * @param secureObject  that was being called
-     * @param configAttribs that were defined for the secureObject
-     */
-    private void credentialsNotFound(String reason, Object secureObject, Collection<ConfigAttribute> configAttribs) {
-        AuthenticationCredentialsNotFoundException exception = new AuthenticationCredentialsNotFoundException(reason);
-
-        AuthenticationCredentialsNotFoundEvent event = new AuthenticationCredentialsNotFoundEvent(secureObject,
-                configAttribs, exception);
-        publishEvent(event);
-
-        throw exception;
-    }
-
-    public AccessDecisionManager getAccessDecisionManager() {
-        return accessDecisionManager;
-    }
-
-    public AfterInvocationManager getAfterInvocationManager() {
-        return afterInvocationManager;
-    }
-
-    public AuthenticationManager getAuthenticationManager() {
-        return this.authenticationManager;
-    }
-
-    public RunAsManager getRunAsManager() {
-        return runAsManager;
-    }
-
-    /**
-     * Indicates the type of secure objects the subclass will be presenting to
-     * the abstract parent for processing. This is used to ensure collaborators
-     * wired to the {@code AbstractSecurityInterceptor} all support the
-     * indicated secure object class.
-     *
-     * @return the type of secure object the subclass provides services for
-     */
-    public abstract Class<?> getSecureObjectClass();
-
-    public boolean isAlwaysReauthenticate() {
-        return alwaysReauthenticate;
-    }
-
-    public boolean isRejectPublicInvocations() {
-        return rejectPublicInvocations;
-    }
-
-    public boolean isValidateConfigAttributes() {
-        return validateConfigAttributes;
-    }
-
-    public abstract SecurityMetadataSource obtainSecurityMetadataSource();
-
-    public void setAccessDecisionManager(AccessDecisionManager accessDecisionManager) {
-        this.accessDecisionManager = accessDecisionManager;
-    }
-
-    public void setAfterInvocationManager(AfterInvocationManager afterInvocationManager) {
-        this.afterInvocationManager = afterInvocationManager;
-    }
-
-    /**
-     * Indicates whether the <code>AbstractSecurityInterceptor</code> should
-     * ignore the {@link Authentication#isAuthenticated()} property. Defaults to
-     * <code>false</code>, meaning by default the
-     * <code>Authentication.isAuthenticated()</code> property is trusted and
-     * re-authentication will not occur if the principal has already been
-     * authenticated.
-     *
-     * @param alwaysReauthenticate <code>true</code> to force <code>AbstractSecurityInterceptor</code> to
-     * disregard the value of <code>Authentication.isAuthenticated()</code> and always re-authenticate the request
-     * (defaults to <code>false</code>).
-     */
-    public void setAlwaysReauthenticate(boolean alwaysReauthenticate) {
-        this.alwaysReauthenticate = alwaysReauthenticate;
-    }
-
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.eventPublisher = applicationEventPublisher;
-    }
-
-    public void setAuthenticationManager(AuthenticationManager newManager) {
-        this.authenticationManager = newManager;
-    }
-
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
-
-    /**
-     * Only {@code AuthorizationFailureEvent} will be published.
-     * If you set this property to {@code true}, {@code AuthorizedEvent}s will also be published.
-     *
-     * @param publishAuthorizationSuccess default value is {@code false}
-     */
-    public void setPublishAuthorizationSuccess(boolean publishAuthorizationSuccess) {
-        this.publishAuthorizationSuccess = publishAuthorizationSuccess;
-    }
-
-    /**
-     * By rejecting public invocations (and setting this property to <tt>true</tt>), essentially you are ensuring
-     * that every secure object invocation advised by <code>AbstractSecurityInterceptor</code> has a configuration
-     * attribute defined. This is useful to ensure a "fail safe" mode where undeclared secure objects will be rejected
-     * and configuration omissions detected early. An <tt>IllegalArgumentException</tt> will be thrown by the
-     * <tt>AbstractSecurityInterceptor</tt> if you set this property to <tt>true</tt> and an attempt is made to invoke
-     * a secure object that has no configuration attributes.
-     *
-     * @param rejectPublicInvocations set to <code>true</code> to reject invocations of secure objects that have no
-     * configuration attributes (by default it is <code>false</code> which treats undeclared secure objects
-     * as "public" or unauthorized).
-     */
-    public void setRejectPublicInvocations(boolean rejectPublicInvocations) {
-        this.rejectPublicInvocations = rejectPublicInvocations;
-    }
-
-    public void setRunAsManager(RunAsManager runAsManager) {
-        this.runAsManager = runAsManager;
-    }
-
-    public void setValidateConfigAttributes(boolean validateConfigAttributes) {
-        this.validateConfigAttributes = validateConfigAttributes;
-    }
-
-    private void publishEvent(ApplicationEvent event) {
-        if (this.eventPublisher != null) {
-            this.eventPublisher.publishEvent(event);
-        }
-    }
-
-    private static class NoOpAuthenticationManager implements AuthenticationManager {
-
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            throw new AuthenticationServiceException("Cannot authenticate " + authentication);
-        }
-    }
+public abstract class AbstractSecurityInterceptor implements InitializingBean,
+		ApplicationEventPublisherAware, MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private ApplicationEventPublisher eventPublisher;
+	private AccessDecisionManager accessDecisionManager;
+	private AfterInvocationManager afterInvocationManager;
+	private AuthenticationManager authenticationManager = new NoOpAuthenticationManager();
+	private RunAsManager runAsManager = new NullRunAsManager();
+
+	private boolean alwaysReauthenticate = false;
+	private boolean rejectPublicInvocations = false;
+	private boolean validateConfigAttributes = true;
+	private boolean publishAuthorizationSuccess = false;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(getSecureObjectClass(),
+				"Subclass must provide a non-null response to getSecureObjectClass()");
+		Assert.notNull(this.messages, "A message source must be set");
+		Assert.notNull(this.authenticationManager, "An AuthenticationManager is required");
+		Assert.notNull(this.accessDecisionManager, "An AccessDecisionManager is required");
+		Assert.notNull(this.runAsManager, "A RunAsManager is required");
+		Assert.notNull(this.obtainSecurityMetadataSource(),
+				"An SecurityMetadataSource is required");
+		Assert.isTrue(this.obtainSecurityMetadataSource()
+				.supports(getSecureObjectClass()),
+				"SecurityMetadataSource does not support secure object class: "
+						+ getSecureObjectClass());
+		Assert.isTrue(this.runAsManager.supports(getSecureObjectClass()),
+				"RunAsManager does not support secure object class: "
+						+ getSecureObjectClass());
+		Assert.isTrue(this.accessDecisionManager.supports(getSecureObjectClass()),
+				"AccessDecisionManager does not support secure object class: "
+						+ getSecureObjectClass());
+
+		if (this.afterInvocationManager != null) {
+			Assert.isTrue(this.afterInvocationManager.supports(getSecureObjectClass()),
+					"AfterInvocationManager does not support secure object class: "
+							+ getSecureObjectClass());
+		}
+
+		if (this.validateConfigAttributes) {
+			Collection<ConfigAttribute> attributeDefs = this
+					.obtainSecurityMetadataSource().getAllConfigAttributes();
+
+			if (attributeDefs == null) {
+				logger.warn("Could not validate configuration attributes as the SecurityMetadataSource did not return "
+						+ "any attributes from getAllConfigAttributes()");
+				return;
+			}
+
+			Set<ConfigAttribute> unsupportedAttrs = new HashSet<ConfigAttribute>();
+
+			for (ConfigAttribute attr : attributeDefs) {
+				if (!this.runAsManager.supports(attr)
+						&& !this.accessDecisionManager.supports(attr)
+						&& ((this.afterInvocationManager == null) || !this.afterInvocationManager
+								.supports(attr))) {
+					unsupportedAttrs.add(attr);
+				}
+			}
+
+			if (unsupportedAttrs.size() != 0) {
+				throw new IllegalArgumentException(
+						"Unsupported configuration attributes: " + unsupportedAttrs);
+			}
+
+			logger.debug("Validated configuration attributes");
+		}
+	}
+
+	protected InterceptorStatusToken beforeInvocation(Object object) {
+		Assert.notNull(object, "Object was null");
+		final boolean debug = logger.isDebugEnabled();
+
+		if (!getSecureObjectClass().isAssignableFrom(object.getClass())) {
+			throw new IllegalArgumentException(
+					"Security invocation attempted for object "
+							+ object.getClass().getName()
+							+ " but AbstractSecurityInterceptor only configured to support secure objects of type: "
+							+ getSecureObjectClass());
+		}
+
+		Collection<ConfigAttribute> attributes = this.obtainSecurityMetadataSource()
+				.getAttributes(object);
+
+		if (attributes == null || attributes.isEmpty()) {
+			if (rejectPublicInvocations) {
+				throw new IllegalArgumentException(
+						"Secure object invocation "
+								+ object
+								+ " was denied as public invocations are not allowed via this interceptor. "
+								+ "This indicates a configuration error because the "
+								+ "rejectPublicInvocations property is set to 'true'");
+			}
+
+			if (debug) {
+				logger.debug("Public object - authentication not attempted");
+			}
+
+			publishEvent(new PublicInvocationEvent(object));
+
+			return null; // no further work post-invocation
+		}
+
+		if (debug) {
+			logger.debug("Secure object: " + object + "; Attributes: " + attributes);
+		}
+
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			credentialsNotFound(messages.getMessage(
+					"AbstractSecurityInterceptor.authenticationNotFound",
+					"An Authentication object was not found in the SecurityContext"),
+					object, attributes);
+		}
+
+		Authentication authenticated = authenticateIfRequired();
+
+		// Attempt authorization
+		try {
+			this.accessDecisionManager.decide(authenticated, object, attributes);
+		}
+		catch (AccessDeniedException accessDeniedException) {
+			publishEvent(new AuthorizationFailureEvent(object, attributes, authenticated,
+					accessDeniedException));
+
+			throw accessDeniedException;
+		}
+
+		if (debug) {
+			logger.debug("Authorization successful");
+		}
+
+		if (publishAuthorizationSuccess) {
+			publishEvent(new AuthorizedEvent(object, attributes, authenticated));
+		}
+
+		// Attempt to run as a different user
+		Authentication runAs = this.runAsManager.buildRunAs(authenticated, object,
+				attributes);
+
+		if (runAs == null) {
+			if (debug) {
+				logger.debug("RunAsManager did not change Authentication object");
+			}
+
+			// no further work post-invocation
+			return new InterceptorStatusToken(SecurityContextHolder.getContext(), false,
+					attributes, object);
+		}
+		else {
+			if (debug) {
+				logger.debug("Switching to RunAs Authentication: " + runAs);
+			}
+
+			SecurityContext origCtx = SecurityContextHolder.getContext();
+			SecurityContextHolder.setContext(SecurityContextHolder.createEmptyContext());
+			SecurityContextHolder.getContext().setAuthentication(runAs);
+
+			// need to revert to token.Authenticated post-invocation
+			return new InterceptorStatusToken(origCtx, true, attributes, object);
+		}
+	}
+
+	/**
+	 * Cleans up the work of the <tt>AbstractSecurityInterceptor</tt> after the secure
+	 * object invocation has been completed. This method should be invoked after the
+	 * secure object invocation and before afterInvocation regardless of the secure object
+	 * invocation returning successfully (i.e. it should be done in a finally block).
+	 *
+	 * @param token as returned by the {@link #beforeInvocation(Object)} method
+	 */
+	protected void finallyInvocation(InterceptorStatusToken token) {
+		if (token != null && token.isContextHolderRefreshRequired()) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Reverting to original Authentication: "
+						+ token.getSecurityContext().getAuthentication());
+			}
+
+			SecurityContextHolder.setContext(token.getSecurityContext());
+		}
+	}
+
+	/**
+	 * Completes the work of the <tt>AbstractSecurityInterceptor</tt> after the secure
+	 * object invocation has been completed.
+	 *
+	 * @param token as returned by the {@link #beforeInvocation(Object)} method
+	 * @param returnedObject any object returned from the secure object invocation (may be
+	 * <tt>null</tt>)
+	 * @return the object the secure object invocation should ultimately return to its
+	 * caller (may be <tt>null</tt>)
+	 */
+	protected Object afterInvocation(InterceptorStatusToken token, Object returnedObject) {
+		if (token == null) {
+			// public object
+			return returnedObject;
+		}
+
+		finallyInvocation(token); // continue to clean in this method for passivity
+
+		if (afterInvocationManager != null) {
+			// Attempt after invocation handling
+			try {
+				returnedObject = afterInvocationManager.decide(token.getSecurityContext()
+						.getAuthentication(), token.getSecureObject(), token
+						.getAttributes(), returnedObject);
+			}
+			catch (AccessDeniedException accessDeniedException) {
+				AuthorizationFailureEvent event = new AuthorizationFailureEvent(
+						token.getSecureObject(), token.getAttributes(), token
+								.getSecurityContext().getAuthentication(),
+						accessDeniedException);
+				publishEvent(event);
+
+				throw accessDeniedException;
+			}
+		}
+
+		return returnedObject;
+	}
+
+	/**
+	 * Checks the current authentication token and passes it to the AuthenticationManager
+	 * if {@link org.springframework.security.core.Authentication#isAuthenticated()}
+	 * returns false or the property <tt>alwaysReauthenticate</tt> has been set to true.
+	 *
+	 * @return an authenticated <tt>Authentication</tt> object.
+	 */
+	private Authentication authenticateIfRequired() {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+
+		if (authentication.isAuthenticated() && !alwaysReauthenticate) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Previously Authenticated: " + authentication);
+			}
+
+			return authentication;
+		}
+
+		authentication = authenticationManager.authenticate(authentication);
+
+		// We don't authenticated.setAuthentication(true), because each provider should do
+		// that
+		if (logger.isDebugEnabled()) {
+			logger.debug("Successfully Authenticated: " + authentication);
+		}
+
+		SecurityContextHolder.getContext().setAuthentication(authentication);
+
+		return authentication;
+	}
+
+	/**
+	 * Helper method which generates an exception containing the passed reason, and
+	 * publishes an event to the application context.
+	 * <p>
+	 * Always throws an exception.
+	 *
+	 * @param reason to be provided in the exception detail
+	 * @param secureObject that was being called
+	 * @param configAttribs that were defined for the secureObject
+	 */
+	private void credentialsNotFound(String reason, Object secureObject,
+			Collection<ConfigAttribute> configAttribs) {
+		AuthenticationCredentialsNotFoundException exception = new AuthenticationCredentialsNotFoundException(
+				reason);
+
+		AuthenticationCredentialsNotFoundEvent event = new AuthenticationCredentialsNotFoundEvent(
+				secureObject, configAttribs, exception);
+		publishEvent(event);
+
+		throw exception;
+	}
+
+	public AccessDecisionManager getAccessDecisionManager() {
+		return accessDecisionManager;
+	}
+
+	public AfterInvocationManager getAfterInvocationManager() {
+		return afterInvocationManager;
+	}
+
+	public AuthenticationManager getAuthenticationManager() {
+		return this.authenticationManager;
+	}
+
+	public RunAsManager getRunAsManager() {
+		return runAsManager;
+	}
+
+	/**
+	 * Indicates the type of secure objects the subclass will be presenting to the
+	 * abstract parent for processing. This is used to ensure collaborators wired to the
+	 * {@code AbstractSecurityInterceptor} all support the indicated secure object class.
+	 *
+	 * @return the type of secure object the subclass provides services for
+	 */
+	public abstract Class<?> getSecureObjectClass();
+
+	public boolean isAlwaysReauthenticate() {
+		return alwaysReauthenticate;
+	}
+
+	public boolean isRejectPublicInvocations() {
+		return rejectPublicInvocations;
+	}
+
+	public boolean isValidateConfigAttributes() {
+		return validateConfigAttributes;
+	}
+
+	public abstract SecurityMetadataSource obtainSecurityMetadataSource();
+
+	public void setAccessDecisionManager(AccessDecisionManager accessDecisionManager) {
+		this.accessDecisionManager = accessDecisionManager;
+	}
+
+	public void setAfterInvocationManager(AfterInvocationManager afterInvocationManager) {
+		this.afterInvocationManager = afterInvocationManager;
+	}
+
+	/**
+	 * Indicates whether the <code>AbstractSecurityInterceptor</code> should ignore the
+	 * {@link Authentication#isAuthenticated()} property. Defaults to <code>false</code>,
+	 * meaning by default the <code>Authentication.isAuthenticated()</code> property is
+	 * trusted and re-authentication will not occur if the principal has already been
+	 * authenticated.
+	 *
+	 * @param alwaysReauthenticate <code>true</code> to force
+	 * <code>AbstractSecurityInterceptor</code> to disregard the value of
+	 * <code>Authentication.isAuthenticated()</code> and always re-authenticate the
+	 * request (defaults to <code>false</code>).
+	 */
+	public void setAlwaysReauthenticate(boolean alwaysReauthenticate) {
+		this.alwaysReauthenticate = alwaysReauthenticate;
+	}
+
+	public void setApplicationEventPublisher(
+			ApplicationEventPublisher applicationEventPublisher) {
+		this.eventPublisher = applicationEventPublisher;
+	}
+
+	public void setAuthenticationManager(AuthenticationManager newManager) {
+		this.authenticationManager = newManager;
+	}
+
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
+
+	/**
+	 * Only {@code AuthorizationFailureEvent} will be published. If you set this property
+	 * to {@code true}, {@code AuthorizedEvent}s will also be published.
+	 *
+	 * @param publishAuthorizationSuccess default value is {@code false}
+	 */
+	public void setPublishAuthorizationSuccess(boolean publishAuthorizationSuccess) {
+		this.publishAuthorizationSuccess = publishAuthorizationSuccess;
+	}
+
+	/**
+	 * By rejecting public invocations (and setting this property to <tt>true</tt>),
+	 * essentially you are ensuring that every secure object invocation advised by
+	 * <code>AbstractSecurityInterceptor</code> has a configuration attribute defined.
+	 * This is useful to ensure a "fail safe" mode where undeclared secure objects will be
+	 * rejected and configuration omissions detected early. An
+	 * <tt>IllegalArgumentException</tt> will be thrown by the
+	 * <tt>AbstractSecurityInterceptor</tt> if you set this property to <tt>true</tt> and
+	 * an attempt is made to invoke a secure object that has no configuration attributes.
+	 *
+	 * @param rejectPublicInvocations set to <code>true</code> to reject invocations of
+	 * secure objects that have no configuration attributes (by default it is
+	 * <code>false</code> which treats undeclared secure objects as "public" or
+	 * unauthorized).
+	 */
+	public void setRejectPublicInvocations(boolean rejectPublicInvocations) {
+		this.rejectPublicInvocations = rejectPublicInvocations;
+	}
+
+	public void setRunAsManager(RunAsManager runAsManager) {
+		this.runAsManager = runAsManager;
+	}
+
+	public void setValidateConfigAttributes(boolean validateConfigAttributes) {
+		this.validateConfigAttributes = validateConfigAttributes;
+	}
+
+	private void publishEvent(ApplicationEvent event) {
+		if (this.eventPublisher != null) {
+			this.eventPublisher.publishEvent(event);
+		}
+	}
+
+	private static class NoOpAuthenticationManager implements AuthenticationManager {
+
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			throw new AuthenticationServiceException("Cannot authenticate "
+					+ authentication);
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
index 59142472f0..51c05feccc 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationManager.java
@@ -22,68 +22,77 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 /**
- * Reviews the <code>Object</code> returned from a secure object invocation,
- * being able to modify the <code>Object</code> or throw an {@link
- * AccessDeniedException}.
+ * Reviews the <code>Object</code> returned from a secure object invocation, being able to
+ * modify the <code>Object</code> or throw an {@link AccessDeniedException}.
  * <p>
- * Typically used to ensure the principal is permitted to access the domain
- * object instance returned by a service layer bean. Can also be used to
- * mutate the domain object instance so the principal is only able to access
- * authorised bean properties or <code>Collection</code> elements.
+ * Typically used to ensure the principal is permitted to access the domain object
+ * instance returned by a service layer bean. Can also be used to mutate the domain object
+ * instance so the principal is only able to access authorised bean properties or
+ * <code>Collection</code> elements.
  * <p>
- * Special consideration should be given to using an
- * <code>AfterInvocationManager</code> on bean methods that modify a database.
- * Typically an <code>AfterInvocationManager</code> is used with read-only
- * methods, such as <code>public DomainObject getById(id)</code>. If used with
- * methods that modify a database, a transaction manager should be used to
- * ensure any <code>AccessDeniedException</code> will cause a rollback of the
- * changes made by the transaction.
+ * Special consideration should be given to using an <code>AfterInvocationManager</code>
+ * on bean methods that modify a database. Typically an
+ * <code>AfterInvocationManager</code> is used with read-only methods, such as
+ * <code>public DomainObject getById(id)</code>. If used with methods that modify a
+ * database, a transaction manager should be used to ensure any
+ * <code>AccessDeniedException</code> will cause a rollback of the changes made by the
+ * transaction.
  * </p>
  *
  * @author Ben Alex
  */
 public interface AfterInvocationManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Given the details of a secure object invocation including its returned <code>Object</code>, make an
-     * access control decision or optionally modify the returned <code>Object</code>.
-     *
-     * @param authentication the caller that invoked the method
-     * @param object the secured object that was called
-     * @param attributes the configuration attributes associated with the secured object that was invoked
-     * @param returnedObject the <code>Object</code> that was returned from the secure object invocation
-     *
-     * @return the <code>Object</code> that will ultimately be returned to the caller (if an implementation does not
-     *         wish to modify the object to be returned to the caller, the implementation should simply return the
-     *         same object it was passed by the <code>returnedObject</code> method argument)
-     *
-     * @throws AccessDeniedException if access is denied
-     */
-    Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> attributes,
-        Object returnedObject) throws AccessDeniedException;
+	/**
+	 * Given the details of a secure object invocation including its returned
+	 * <code>Object</code>, make an access control decision or optionally modify the
+	 * returned <code>Object</code>.
+	 *
+	 * @param authentication the caller that invoked the method
+	 * @param object the secured object that was called
+	 * @param attributes the configuration attributes associated with the secured object
+	 * that was invoked
+	 * @param returnedObject the <code>Object</code> that was returned from the secure
+	 * object invocation
+	 *
+	 * @return the <code>Object</code> that will ultimately be returned to the caller (if
+	 * an implementation does not wish to modify the object to be returned to the caller,
+	 * the implementation should simply return the same object it was passed by the
+	 * <code>returnedObject</code> method argument)
+	 *
+	 * @throws AccessDeniedException if access is denied
+	 */
+	Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes, Object returnedObject)
+			throws AccessDeniedException;
 
-    /**
-     * Indicates whether this <code>AfterInvocationManager</code> is able to process "after invocation"
-     * requests presented with the passed <code>ConfigAttribute</code>.<p>This allows the
-     * <code>AbstractSecurityInterceptor</code> to check every configuration attribute can be consumed by the
-     * configured <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
-     * <code>AfterInvocationManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return true if this <code>AfterInvocationManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>AfterInvocationManager</code> is able to process
+	 * "after invocation" requests presented with the passed <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>AbstractSecurityInterceptor</code> to check every
+	 * configuration attribute can be consumed by the configured
+	 * <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
+	 * <code>AfterInvocationManager</code>.
+	 * </p>
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <code>AbstractSecurityInterceptor</code>
+	 *
+	 * @return true if this <code>AfterInvocationManager</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 
-    /**
-     * Indicates whether the <code>AfterInvocationManager</code> implementation is able to provide access
-     * control decisions for the indicated secured object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return <code>true</code> if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the <code>AfterInvocationManager</code> implementation is able to
+	 * provide access control decisions for the indicated secured object type.
+	 *
+	 * @param clazz the class that is being queried
+	 *
+	 * @return <code>true</code> if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
index e3b71d4b5d..b440f47e74 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java
@@ -28,101 +28,112 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
-
 /**
  * Provider-based implementation of {@link AfterInvocationManager}.
  * <p>
- * Handles configuration of a bean context defined list of  {@link AfterInvocationProvider}s.
+ * Handles configuration of a bean context defined list of {@link AfterInvocationProvider}
+ * s.
  * <p>
  * Every <code>AfterInvocationProvider</code> will be polled when the
- * {@link #decide(Authentication, Object, Collection, Object)} method is called. The <code>Object</code> returned
- * from each provider will be presented to the successive provider for processing. This means each provider
- * <b>must</b> ensure they return the <code>Object</code>, even if they are not interested in the "after invocation"
- * decision (perhaps as the secure object invocation did not include a configuration attribute a given provider is
- * configured to respond to).
+ * {@link #decide(Authentication, Object, Collection, Object)} method is called. The
+ * <code>Object</code> returned from each provider will be presented to the successive
+ * provider for processing. This means each provider <b>must</b> ensure they return the
+ * <code>Object</code>, even if they are not interested in the "after invocation" decision
+ * (perhaps as the secure object invocation did not include a configuration attribute a
+ * given provider is configured to respond to).
  *
  * @author Ben Alex
  */
-public class AfterInvocationProviderManager implements AfterInvocationManager, InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+public class AfterInvocationProviderManager implements AfterInvocationManager,
+		InitializingBean {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(AfterInvocationProviderManager.class);
+	protected static final Log logger = LogFactory
+			.getLog(AfterInvocationProviderManager.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private List<AfterInvocationProvider> providers;
+	private List<AfterInvocationProvider> providers;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        checkIfValidList(this.providers);
-    }
+	public void afterPropertiesSet() throws Exception {
+		checkIfValidList(this.providers);
+	}
 
-    private void checkIfValidList(List<?> listToCheck) {
-        if ((listToCheck == null) || (listToCheck.size() == 0)) {
-            throw new IllegalArgumentException("A list of AfterInvocationProviders is required");
-        }
-    }
+	private void checkIfValidList(List<?> listToCheck) {
+		if ((listToCheck == null) || (listToCheck.size() == 0)) {
+			throw new IllegalArgumentException(
+					"A list of AfterInvocationProviders is required");
+		}
+	}
 
-    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-            Object returnedObject) throws AccessDeniedException {
+	public Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config, Object returnedObject)
+			throws AccessDeniedException {
 
-        Object result = returnedObject;
+		Object result = returnedObject;
 
-        for(AfterInvocationProvider provider : providers) {
-            result = provider.decide(authentication, object, config, result);
-        }
+		for (AfterInvocationProvider provider : providers) {
+			result = provider.decide(authentication, object, config, result);
+		}
 
-        return result;
-    }
+		return result;
+	}
 
-    public List<AfterInvocationProvider> getProviders() {
-        return this.providers;
-    }
+	public List<AfterInvocationProvider> getProviders() {
+		return this.providers;
+	}
 
-    public void setProviders(List<?> newList) {
-        checkIfValidList(newList);
-        providers = new ArrayList<AfterInvocationProvider>(newList.size());
+	public void setProviders(List<?> newList) {
+		checkIfValidList(newList);
+		providers = new ArrayList<AfterInvocationProvider>(newList.size());
 
-        for(Object currentObject : newList) {
-            Assert.isInstanceOf(AfterInvocationProvider.class, currentObject, "AfterInvocationProvider " +
-                    currentObject.getClass().getName() + " must implement AfterInvocationProvider");
-            providers.add((AfterInvocationProvider) currentObject);
-        }
-    }
+		for (Object currentObject : newList) {
+			Assert.isInstanceOf(AfterInvocationProvider.class, currentObject,
+					"AfterInvocationProvider " + currentObject.getClass().getName()
+							+ " must implement AfterInvocationProvider");
+			providers.add((AfterInvocationProvider) currentObject);
+		}
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        for(AfterInvocationProvider provider : providers) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Evaluating " + attribute + " against " + provider);
-            }
+	public boolean supports(ConfigAttribute attribute) {
+		for (AfterInvocationProvider provider : providers) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Evaluating " + attribute + " against " + provider);
+			}
 
-            if (provider.supports(attribute)) {
-                return true;
-            }
-        }
+			if (provider.supports(attribute)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Iterates through all <code>AfterInvocationProvider</code>s and ensures each can support the presented
-     * class.
-     * <p>
-     * If one or more providers cannot support the presented class, <code>false</code> is returned.
-     *
-     * @param clazz the secure object class being queries
-     *
-     * @return if the <code>AfterInvocationProviderManager</code> can support the secure object class, which requires
-     *         every one of its <code>AfterInvocationProvider</code>s to support the secure object class
-     */
-    public boolean supports(Class<?> clazz) {
-        for (AfterInvocationProvider provider : providers) {
-            if (!provider.supports(clazz)) {
-                return false;
-            }
-        }
+	/**
+	 * Iterates through all <code>AfterInvocationProvider</code>s and ensures each can
+	 * support the presented class.
+	 * <p>
+	 * If one or more providers cannot support the presented class, <code>false</code> is
+	 * returned.
+	 *
+	 * @param clazz the secure object class being queries
+	 *
+	 * @return if the <code>AfterInvocationProviderManager</code> can support the secure
+	 * object class, which requires every one of its <code>AfterInvocationProvider</code>s
+	 * to support the secure object class
+	 */
+	public boolean supports(Class<?> clazz) {
+		for (AfterInvocationProvider provider : providers) {
+			if (!provider.supports(clazz)) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
index 4102e52298..34e85776d6 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/InterceptorStatusToken.java
@@ -21,7 +21,6 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 
-
 /**
  * A return object received by {@link AbstractSecurityInterceptor} subclasses.
  * <p>
@@ -32,38 +31,42 @@ import org.springframework.security.core.context.SecurityContext;
  * @author Ben Alex
  */
 public class InterceptorStatusToken {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private SecurityContext securityContext;
-    private Collection<ConfigAttribute> attr;
-    private Object secureObject;
-    private boolean contextHolderRefreshRequired;
+	private SecurityContext securityContext;
+	private Collection<ConfigAttribute> attr;
+	private Object secureObject;
+	private boolean contextHolderRefreshRequired;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public InterceptorStatusToken(SecurityContext securityContext, boolean contextHolderRefreshRequired,
-            Collection<ConfigAttribute> attributes, Object secureObject) {
-        this.securityContext = securityContext;
-        this.contextHolderRefreshRequired = contextHolderRefreshRequired;
-        this.attr = attributes;
-        this.secureObject = secureObject;
-    }
+	public InterceptorStatusToken(SecurityContext securityContext,
+			boolean contextHolderRefreshRequired, Collection<ConfigAttribute> attributes,
+			Object secureObject) {
+		this.securityContext = securityContext;
+		this.contextHolderRefreshRequired = contextHolderRefreshRequired;
+		this.attr = attributes;
+		this.secureObject = secureObject;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<ConfigAttribute> getAttributes() {
-        return attr;
-    }
+	public Collection<ConfigAttribute> getAttributes() {
+		return attr;
+	}
 
-    public SecurityContext getSecurityContext() {
-        return securityContext;
-    }
+	public SecurityContext getSecurityContext() {
+		return securityContext;
+	}
 
-    public Object getSecureObject() {
-        return secureObject;
-    }
+	public Object getSecureObject() {
+		return secureObject;
+	}
 
-    public boolean isContextHolderRefreshRequired() {
-        return contextHolderRefreshRequired;
-    }
+	public boolean isContextHolderRefreshRequired() {
+		return contextHolderRefreshRequired;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java
index 227fce3e8b..61ffce239e 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/MethodInvocationPrivilegeEvaluator.java
@@ -26,70 +26,83 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
-
 /**
- * Allows users to determine whether they have "before invocation" privileges for a given method invocation.
+ * Allows users to determine whether they have "before invocation" privileges for a given
+ * method invocation.
  * <p>
- * Of course, if an {@link org.springframework.security.access.intercept.AfterInvocationManager} is used to authorize the
- * <em>result</em> of a method invocation, this class cannot assist determine whether or not the
- * <code>AfterInvocationManager</code> will enable
- * access. Instead this class aims to allow applications to determine whether or not the current principal would be
- * allowed to at least attempt to invoke the method, irrespective of the "after" invocation handling.</p>
+ * Of course, if an
+ * {@link org.springframework.security.access.intercept.AfterInvocationManager} is used to
+ * authorize the <em>result</em> of a method invocation, this class cannot assist
+ * determine whether or not the <code>AfterInvocationManager</code> will enable access.
+ * Instead this class aims to allow applications to determine whether or not the current
+ * principal would be allowed to at least attempt to invoke the method, irrespective of
+ * the "after" invocation handling.
+ * </p>
  *
  * @author Ben Alex
  */
 public class MethodInvocationPrivilegeEvaluator implements InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(MethodInvocationPrivilegeEvaluator.class);
+	protected static final Log logger = LogFactory
+			.getLog(MethodInvocationPrivilegeEvaluator.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AbstractSecurityInterceptor securityInterceptor;
+	private AbstractSecurityInterceptor securityInterceptor;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(securityInterceptor, "SecurityInterceptor required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(securityInterceptor, "SecurityInterceptor required");
+	}
 
-    public boolean isAllowed(MethodInvocation mi, Authentication authentication) {
-        Assert.notNull(mi, "MethodInvocation required");
-        Assert.notNull(mi.getMethod(), "MethodInvocation must provide a non-null getMethod()");
+	public boolean isAllowed(MethodInvocation mi, Authentication authentication) {
+		Assert.notNull(mi, "MethodInvocation required");
+		Assert.notNull(mi.getMethod(),
+				"MethodInvocation must provide a non-null getMethod()");
 
-        Collection<ConfigAttribute> attrs = securityInterceptor.obtainSecurityMetadataSource().getAttributes(mi);
+		Collection<ConfigAttribute> attrs = securityInterceptor
+				.obtainSecurityMetadataSource().getAttributes(mi);
 
-        if (attrs == null) {
-            if (securityInterceptor.isRejectPublicInvocations()) {
-                return false;
-            }
+		if (attrs == null) {
+			if (securityInterceptor.isRejectPublicInvocations()) {
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        if (authentication == null || authentication.getAuthorities().isEmpty()) {
-            return false;
-        }
+		if (authentication == null || authentication.getAuthorities().isEmpty()) {
+			return false;
+		}
 
-        try {
-            securityInterceptor.getAccessDecisionManager().decide(authentication, mi, attrs);
-        } catch (AccessDeniedException unauthorized) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(mi.toString() + " denied for " + authentication.toString(), unauthorized);
-            }
+		try {
+			securityInterceptor.getAccessDecisionManager().decide(authentication, mi,
+					attrs);
+		}
+		catch (AccessDeniedException unauthorized) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(mi.toString() + " denied for " + authentication.toString(),
+						unauthorized);
+			}
 
-            return false;
-        }
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    public void setSecurityInterceptor(AbstractSecurityInterceptor securityInterceptor) {
-        Assert.notNull(securityInterceptor, "AbstractSecurityInterceptor cannot be null");
-        Assert.isTrue(MethodInvocation.class.equals(securityInterceptor.getSecureObjectClass()),
-            "AbstractSecurityInterceptor does not support MethodInvocations");
-        Assert.notNull(securityInterceptor.getAccessDecisionManager(),
-            "AbstractSecurityInterceptor must provide a non-null AccessDecisionManager");
-        this.securityInterceptor = securityInterceptor;
-    }
+	public void setSecurityInterceptor(AbstractSecurityInterceptor securityInterceptor) {
+		Assert.notNull(securityInterceptor, "AbstractSecurityInterceptor cannot be null");
+		Assert.isTrue(
+				MethodInvocation.class.equals(securityInterceptor.getSecureObjectClass()),
+				"AbstractSecurityInterceptor does not support MethodInvocations");
+		Assert.notNull(securityInterceptor.getAccessDecisionManager(),
+				"AbstractSecurityInterceptor must provide a non-null AccessDecisionManager");
+		this.securityInterceptor = securityInterceptor;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
index 0be87631b4..4449cb73d8 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/NullRunAsManager.java
@@ -20,26 +20,28 @@ import java.util.Collection;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Implementation of a {@link RunAsManager} that does nothing.
  * <p>
- * This class should be used if you do not require run-as authentication replacement functionality.
+ * This class should be used if you do not require run-as authentication replacement
+ * functionality.
  *
  * @author Ben Alex
  */
 final class NullRunAsManager implements RunAsManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication buildRunAs(Authentication authentication, Object object, Collection<ConfigAttribute> config) {
-        return null;
-    }
+	public Authentication buildRunAs(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config) {
+		return null;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return false;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return false;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
index df4bfda511..66f2c52838 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProvider.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.access.intercept;
 
-
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
@@ -30,51 +29,62 @@ import org.springframework.context.support.MessageSourceAccessor;
 
 import org.springframework.util.Assert;
 
-
 /**
- * An {@link AuthenticationProvider} implementation that can authenticate a {@link RunAsUserToken}.<P>Configured in
- * the bean context with a key that should match the key used by adapters to generate the <code>RunAsUserToken</code>.
- * It treats as valid any <code>RunAsUserToken</code> instance presenting a hash code that matches the
- * <code>RunAsImplAuthenticationProvider</code>-configured key.</p>
- *  <P>If the key does not match, a <code>BadCredentialsException</code> is thrown.</p>
+ * An {@link AuthenticationProvider} implementation that can authenticate a
+ * {@link RunAsUserToken}.
+ * <P>
+ * Configured in the bean context with a key that should match the key used by adapters to
+ * generate the <code>RunAsUserToken</code>. It treats as valid any
+ * <code>RunAsUserToken</code> instance presenting a hash code that matches the
+ * <code>RunAsImplAuthenticationProvider</code>-configured key.
+ * </p>
+ * <P>
+ * If the key does not match, a <code>BadCredentialsException</code> is thrown.
+ * </p>
  */
-public class RunAsImplAuthenticationProvider implements InitializingBean, AuthenticationProvider, MessageSourceAware {
-    //~ Instance fields ================================================================================================
+public class RunAsImplAuthenticationProvider implements InitializingBean,
+		AuthenticationProvider, MessageSourceAware {
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private String key;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private String key;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(key, "A Key is required and should match that configured for the RunAsManagerImpl");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(key,
+				"A Key is required and should match that configured for the RunAsManagerImpl");
+	}
 
-    public Authentication authenticate(Authentication authentication)
-        throws AuthenticationException {
-        RunAsUserToken token = (RunAsUserToken) authentication;
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		RunAsUserToken token = (RunAsUserToken) authentication;
 
-        if (token.getKeyHash() == key.hashCode()) {
-            return authentication;
-        } else {
-            throw new BadCredentialsException(messages.getMessage("RunAsImplAuthenticationProvider.incorrectKey",
-                    "The presented RunAsUserToken does not contain the expected key"));
-        }
-    }
+		if (token.getKeyHash() == key.hashCode()) {
+			return authentication;
+		}
+		else {
+			throw new BadCredentialsException(messages.getMessage(
+					"RunAsImplAuthenticationProvider.incorrectKey",
+					"The presented RunAsUserToken does not contain the expected key"));
+		}
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+	public void setKey(String key) {
+		this.key = key;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return RunAsUserToken.class.isAssignableFrom(authentication);
-    }
+	public boolean supports(Class<?> authentication) {
+		return RunAsUserToken.class.isAssignableFrom(authentication);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
index dbcbbe5eaa..e3e11d953e 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManager.java
@@ -21,82 +21,87 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 /**
- * Creates a new temporary {@link Authentication} object for the current secure
- * object invocation only.
+ * Creates a new temporary {@link Authentication} object for the current secure object
+ * invocation only.
  *
  * <p>
- * This interface permits implementations to replace the
- * <code>Authentication</code> object that applies to the current secure
- * object invocation only. The {@link
- * org.springframework.security.access.intercept.AbstractSecurityInterceptor} will replace
- * the <code>Authentication</code> object held in the
- * {@link org.springframework.security.core.context.SecurityContext SecurityContext}
- * for the duration of  the secure object callback only, returning it to
- * the original <code>Authentication</code> object when the callback ends.
+ * This interface permits implementations to replace the <code>Authentication</code>
+ * object that applies to the current secure object invocation only. The
+ * {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor} will
+ * replace the <code>Authentication</code> object held in the
+ * {@link org.springframework.security.core.context.SecurityContext SecurityContext} for
+ * the duration of the secure object callback only, returning it to the original
+ * <code>Authentication</code> object when the callback ends.
  * </p>
  *
  * <p>
- * 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
- * layer is private, and is only expected to be called by objects within the
- * public facing layer. The objects in this private layer still need security
- * (otherwise they would be public methods) and they also need security in
- * such a manner that prevents them being called directly by external callers.
- * The objects in the private layer would be configured to require granted
- * authorities never granted to external callers. The
- * <code>RunAsManager</code> interface provides a mechanism to elevate
- * security in this manner.
+ * 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 layer is private, and is only
+ * expected to be called by objects within the public facing layer. The objects in this
+ * private layer still need security (otherwise they would be public methods) and they
+ * also need security in such a manner that prevents them being called directly by
+ * external callers. The objects in the private layer would be configured to require
+ * granted authorities never granted to external callers. The <code>RunAsManager</code>
+ * interface provides a mechanism to elevate security in this manner.
  * </p>
  *
  * <p>
  * It is expected implementations will provide a corresponding concrete
- * <code>Authentication</code> and <code>AuthenticationProvider</code> so that
- * the replacement <code>Authentication</code> object can be authenticated.
- * Some form of security will need to be implemented to ensure the
- * <code>AuthenticationProvider</code> only accepts
- * <code>Authentication</code> objects created by an authorized concrete
+ * <code>Authentication</code> and <code>AuthenticationProvider</code> so that the
+ * replacement <code>Authentication</code> object can be authenticated. Some form of
+ * security will need to be implemented to ensure the <code>AuthenticationProvider</code>
+ * only accepts <code>Authentication</code> objects created by an authorized concrete
  * implementation of <code>RunAsManager</code>.
  * </p>
  *
  * @author Ben Alex
  */
 public interface RunAsManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns a replacement <code>Authentication</code> object for the current secure object invocation, or
-     * <code>null</code> if replacement not required.
-     *
-     * @param authentication the caller invoking the secure object
-     * @param object the secured object being called
-     * @param attributes the configuration attributes associated with the secure object being invoked
-     *
-     * @return a replacement object to be used for duration of the secure object invocation, or <code>null</code> if
-     *         the <code>Authentication</code> should be left as is
-     */
-    Authentication buildRunAs(Authentication authentication, Object object, Collection<ConfigAttribute> attributes);
+	/**
+	 * Returns a replacement <code>Authentication</code> object for the current secure
+	 * object invocation, or <code>null</code> if replacement not required.
+	 *
+	 * @param authentication the caller invoking the secure object
+	 * @param object the secured object being called
+	 * @param attributes the configuration attributes associated with the secure object
+	 * being invoked
+	 *
+	 * @return a replacement object to be used for duration of the secure object
+	 * invocation, or <code>null</code> if the <code>Authentication</code> should be left
+	 * as is
+	 */
+	Authentication buildRunAs(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes);
 
-    /**
-     * Indicates whether this <code>RunAsManager</code> is able to process the passed
-     * <code>ConfigAttribute</code>.<p>This allows the <code>AbstractSecurityInterceptor</code> to check every
-     * configuration attribute can be consumed by the configured <code>AccessDecisionManager</code> and/or
-     * <code>RunAsManager</code> and/or <code>AfterInvocationManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>AbstractSecurityInterceptor</code>
-     *
-     * @return <code>true</code> if this <code>RunAsManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>RunAsManager</code> is able to process the passed
+	 * <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>AbstractSecurityInterceptor</code> to check every
+	 * configuration attribute can be consumed by the configured
+	 * <code>AccessDecisionManager</code> and/or <code>RunAsManager</code> and/or
+	 * <code>AfterInvocationManager</code>.
+	 * </p>
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <code>AbstractSecurityInterceptor</code>
+	 *
+	 * @return <code>true</code> if this <code>RunAsManager</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 
-    /**
-     * Indicates whether the <code>RunAsManager</code> implementation is able to provide run-as replacement for
-     * the indicated secure object type.
-     *
-     * @param clazz the class that is being queried
-     *
-     * @return true if the implementation can process the indicated class
-     */
-    boolean supports(Class<?> clazz);
+	/**
+	 * Indicates whether the <code>RunAsManager</code> implementation is able to provide
+	 * run-as replacement for the indicated secure object type.
+	 *
+	 * @param clazz the class that is being queried
+	 *
+	 * @return true if the implementation can process the indicated class
+	 */
+	boolean supports(Class<?> clazz);
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
index 665bb69e00..3f8e58a721 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
@@ -26,96 +26,108 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.util.Assert;
 
-
 /**
  * Basic concrete implementation of a {@link RunAsManager}.
  * <p>
- * Is activated if any {@link ConfigAttribute#getAttribute()} is prefixed  with <Code>RUN_AS_</code>.
- * If found, it generates a new {@link RunAsUserToken} containing the same principal, credentials and granted
- * authorities as the original {@link Authentication} object, along with {@link SimpleGrantedAuthority}s for each
- * <code>RUN_AS_</code> indicated. The created <code>SimpleGrantedAuthority</code>s will be prefixed with a special
- * prefix indicating that it is a role (default prefix value is <code>ROLE_</code>), and then the remainder of the
- * <code>RUN_AS_</code> keyword. For example, <code>RUN_AS_FOO</code> will result in the creation of a granted
- * authority of <code>ROLE_RUN_AS_FOO</code>.
+ * Is activated if any {@link ConfigAttribute#getAttribute()} is prefixed with
+ * <Code>RUN_AS_</code>. If found, it generates a new {@link RunAsUserToken} containing
+ * the same principal, credentials and granted authorities as the original
+ * {@link Authentication} object, along with {@link SimpleGrantedAuthority}s for each
+ * <code>RUN_AS_</code> indicated. The created <code>SimpleGrantedAuthority</code>s will
+ * be prefixed with a special prefix indicating that it is a role (default prefix value is
+ * <code>ROLE_</code>), and then the remainder of the <code>RUN_AS_</code> keyword. For
+ * example, <code>RUN_AS_FOO</code> will result in the creation of a granted authority of
+ * <code>ROLE_RUN_AS_FOO</code>.
  * <p>
- * The role prefix may be overridden from the default, to match that used elsewhere, for example when using an
- * existing role database with another prefix. An empty role prefix may also be specified. Note however that there are
- * potential issues with using an empty role prefix since different categories of  {@link ConfigAttribute} can not be
- * properly discerned based on the prefix, with possible consequences when performing voting and other actions.
- * However, this option may be of some use when using pre-existing role names without a prefix, and no ability exists to
- * prefix them with a role prefix on reading them in, such as provided for example in
+ * The role prefix may be overridden from the default, to match that used elsewhere, for
+ * example when using an existing role database with another prefix. An empty role prefix
+ * may also be specified. Note however that there are potential issues with using an empty
+ * role prefix since different categories of {@link ConfigAttribute} can not be properly
+ * discerned based on the prefix, with possible consequences when performing voting and
+ * other actions. However, this option may be of some use when using pre-existing role
+ * names without a prefix, and no ability exists to prefix them with a role prefix on
+ * reading them in, such as provided for example in
  * {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
  *
  * @author Ben Alex
  * @author colin sampaleanu
  */
 public class RunAsManagerImpl implements RunAsManager, InitializingBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String key;
-    private String rolePrefix = "ROLE_";
+	private String key;
+	private String rolePrefix = "ROLE_";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(key, "A Key is required and should match that configured for the RunAsImplAuthenticationProvider");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(
+				key,
+				"A Key is required and should match that configured for the RunAsImplAuthenticationProvider");
+	}
 
-    public Authentication buildRunAs(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-        List<GrantedAuthority> newAuthorities = new ArrayList<GrantedAuthority>();
+	public Authentication buildRunAs(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) {
+		List<GrantedAuthority> newAuthorities = new ArrayList<GrantedAuthority>();
 
-        for (ConfigAttribute attribute : attributes) {
-            if (this.supports(attribute)) {
-                GrantedAuthority extraAuthority = new SimpleGrantedAuthority(getRolePrefix() + attribute.getAttribute());
-                newAuthorities.add(extraAuthority);
-            }
-        }
+		for (ConfigAttribute attribute : attributes) {
+			if (this.supports(attribute)) {
+				GrantedAuthority extraAuthority = new SimpleGrantedAuthority(
+						getRolePrefix() + attribute.getAttribute());
+				newAuthorities.add(extraAuthority);
+			}
+		}
 
-        if (newAuthorities.size() == 0) {
-            return null;
-        }
+		if (newAuthorities.size() == 0) {
+			return null;
+		}
 
-        // Add existing authorities
-        newAuthorities.addAll(authentication.getAuthorities());
+		// Add existing authorities
+		newAuthorities.addAll(authentication.getAuthorities());
 
-        return new RunAsUserToken(this.key, authentication.getPrincipal(), authentication.getCredentials(),
-                newAuthorities, authentication.getClass());
-    }
+		return new RunAsUserToken(this.key, authentication.getPrincipal(),
+				authentication.getCredentials(), newAuthorities,
+				authentication.getClass());
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public String getRolePrefix() {
-        return rolePrefix;
-    }
+	public String getRolePrefix() {
+		return rolePrefix;
+	}
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+	public void setKey(String key) {
+		this.key = key;
+	}
 
-    /**
-     * Allows the default role prefix of <code>ROLE_</code> to be overridden. May be set to an empty value,
-     * although this is usually not desirable.
-     *
-     * @param rolePrefix the new prefix
-     */
-    public void setRolePrefix(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-    }
+	/**
+	 * Allows the default role prefix of <code>ROLE_</code> to be overridden. May be set
+	 * to an empty value, although this is usually not desirable.
+	 *
+	 * @param rolePrefix the new prefix
+	 */
+	public void setRolePrefix(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute.getAttribute() != null && attribute.getAttribute().startsWith("RUN_AS_");
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return attribute.getAttribute() != null
+				&& attribute.getAttribute().startsWith("RUN_AS_");
+	}
 
-    /**
-     * This implementation supports any type of class, because it does not query the presented secure object.
-     *
-     * @param clazz the secure object
-     *
-     * @return always <code>true</code>
-     */
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	/**
+	 * This implementation supports any type of class, because it does not query the
+	 * presented secure object.
+	 *
+	 * @param clazz the secure object
+	 *
+	 * @return always <code>true</code>
+	 */
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
index 47d58e209f..748c098e73 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
@@ -22,58 +22,63 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
- * An immutable {@link org.springframework.security.core.Authentication}  implementation that supports {@link RunAsManagerImpl}.
+ * An immutable {@link org.springframework.security.core.Authentication} implementation
+ * that supports {@link RunAsManagerImpl}.
  *
  * @author Ben Alex
  */
 public class RunAsUserToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Class<? extends Authentication> originalAuthentication;
-    private final Object credentials;
-    private final Object principal;
-    private final int keyHash;
+	private final Class<? extends Authentication> originalAuthentication;
+	private final Object credentials;
+	private final Object principal;
+	private final int keyHash;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public RunAsUserToken(String key, Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities,
-            Class<? extends Authentication> originalAuthentication) {
-        super(authorities);
-        this.keyHash = key.hashCode();
-        this.principal = principal;
-        this.credentials = credentials;
-        this.originalAuthentication = originalAuthentication;
-        setAuthenticated(true);
-    }
+	public RunAsUserToken(String key, Object principal, Object credentials,
+			Collection<? extends GrantedAuthority> authorities,
+			Class<? extends Authentication> originalAuthentication) {
+		super(authorities);
+		this.keyHash = key.hashCode();
+		this.principal = principal;
+		this.credentials = credentials;
+		this.originalAuthentication = originalAuthentication;
+		setAuthenticated(true);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Object getCredentials() {
-        return this.credentials;
-    }
+	public Object getCredentials() {
+		return this.credentials;
+	}
 
-    public int getKeyHash() {
-        return this.keyHash;
-    }
+	public int getKeyHash() {
+		return this.keyHash;
+	}
 
-    public Class<? extends Authentication> getOriginalAuthentication() {
-        return this.originalAuthentication;
-    }
+	public Class<? extends Authentication> getOriginalAuthentication() {
+		return this.originalAuthentication;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder(super.toString());
-        String className = this.originalAuthentication == null ? null : this.originalAuthentication.getName();
-        sb.append("; Original Class: ").append(className);
+	public String toString() {
+		StringBuilder sb = new StringBuilder(super.toString());
+		String className = this.originalAuthentication == null ? null
+				: this.originalAuthentication.getName();
+		sb.append("; Original Class: ").append(className);
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java
index f7eac2621d..5deb43d83c 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptor.java
@@ -23,60 +23,65 @@ import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
-
 /**
  * Provides security interception of AOP Alliance based method invocations.
  * <p>
- * The <code>SecurityMetadataSource</code> required by this security interceptor is of type {@link
- * MethodSecurityMetadataSource}. This is shared with the AspectJ based security interceptor
- * (<code>AspectJSecurityInterceptor</code>), since both work with Java <code>Method</code>s.
+ * The <code>SecurityMetadataSource</code> required by this security interceptor is of
+ * type {@link MethodSecurityMetadataSource}. This is shared with the AspectJ based
+ * security interceptor (<code>AspectJSecurityInterceptor</code>), since both work with
+ * Java <code>Method</code>s.
  * <p>
  * Refer to {@link AbstractSecurityInterceptor} for details on the workflow.
  *
  * @author Ben Alex
  * @author Rob Winch
  */
-public class MethodSecurityInterceptor extends AbstractSecurityInterceptor implements MethodInterceptor {
-    //~ Instance fields ================================================================================================
+public class MethodSecurityInterceptor extends AbstractSecurityInterceptor implements
+		MethodInterceptor {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private MethodSecurityMetadataSource securityMetadataSource;
+	private MethodSecurityMetadataSource securityMetadataSource;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Class<?> getSecureObjectClass() {
-        return MethodInvocation.class;
-    }
+	public Class<?> getSecureObjectClass() {
+		return MethodInvocation.class;
+	}
 
-    /**
-     * This method should be used to enforce security on a <code>MethodInvocation</code>.
-     *
-     * @param mi The method being invoked which requires a security decision
-     *
-     * @return The returned value from the method invocation (possibly modified by the {@code AfterInvocationManager}).
-     *
-     * @throws Throwable if any error occurs
-     */
-    public Object invoke(MethodInvocation mi) throws Throwable {
-        InterceptorStatusToken token = super.beforeInvocation(mi);
+	/**
+	 * This method should be used to enforce security on a <code>MethodInvocation</code>.
+	 *
+	 * @param mi The method being invoked which requires a security decision
+	 *
+	 * @return The returned value from the method invocation (possibly modified by the
+	 * {@code AfterInvocationManager}).
+	 *
+	 * @throws Throwable if any error occurs
+	 */
+	public Object invoke(MethodInvocation mi) throws Throwable {
+		InterceptorStatusToken token = super.beforeInvocation(mi);
 
-        Object result;
-        try {
-            result = mi.proceed();
-        } finally {
-            super.finallyInvocation(token);
-        }
-        return super.afterInvocation(token, result);
-    }
+		Object result;
+		try {
+			result = mi.proceed();
+		}
+		finally {
+			super.finallyInvocation(token);
+		}
+		return super.afterInvocation(token, result);
+	}
 
-    public MethodSecurityMetadataSource getSecurityMetadataSource() {
-        return this.securityMetadataSource;
-    }
+	public MethodSecurityMetadataSource getSecurityMetadataSource() {
+		return this.securityMetadataSource;
+	}
 
-    public SecurityMetadataSource obtainSecurityMetadataSource() {
-        return this.securityMetadataSource;
-    }
+	public SecurityMetadataSource obtainSecurityMetadataSource() {
+		return this.securityMetadataSource;
+	}
 
-    public void setSecurityMetadataSource(MethodSecurityMetadataSource newSource) {
-        this.securityMetadataSource = newSource;
-    }
+	public void setSecurityMetadataSource(MethodSecurityMetadataSource newSource) {
+		this.securityMetadataSource = newSource;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java
index d7e3054ed8..7a73ae9736 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisor.java
@@ -32,90 +32,106 @@ import org.springframework.security.access.method.MethodSecurityMetadataSource;
 import org.springframework.util.Assert;
 
 /**
- * Advisor driven by a {@link MethodSecurityMetadataSource}, used to exclude a {@link MethodSecurityInterceptor} from
- * public (non-secure) methods.
+ * Advisor driven by a {@link MethodSecurityMetadataSource}, used to exclude a
+ * {@link MethodSecurityInterceptor} from public (non-secure) methods.
  * <p>
- * Because the AOP framework caches advice calculations, this is normally faster than just letting the
- * <code>MethodSecurityInterceptor</code> run and find out itself that it has no work to do.
+ * Because the AOP framework caches advice calculations, this is normally faster than just
+ * letting the <code>MethodSecurityInterceptor</code> run and find out itself that it has
+ * no work to do.
  * <p>
- * This class also allows the use of Spring's {@code DefaultAdvisorAutoProxyCreator}, which makes
- * configuration easier than setup a <code>ProxyFactoryBean</code> for each object requiring security. Note that
- * autoproxying is not supported for BeanFactory implementations, as post-processing is automatic only for application
- * contexts.
+ * This class also allows the use of Spring's {@code DefaultAdvisorAutoProxyCreator},
+ * which makes configuration easier than setup a <code>ProxyFactoryBean</code> for each
+ * object requiring security. Note that autoproxying is not supported for BeanFactory
+ * implementations, as post-processing is automatic only for application contexts.
  * <p>
  * Based on Spring's TransactionAttributeSourceAdvisor.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
-    //~ Instance fields ================================================================================================
+public class MethodSecurityMetadataSourceAdvisor extends AbstractPointcutAdvisor
+		implements BeanFactoryAware {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private transient MethodSecurityMetadataSource attributeSource;
-    private transient MethodSecurityInterceptor interceptor;
-    private final Pointcut pointcut = new MethodSecurityMetadataSourcePointcut();
-    private BeanFactory beanFactory;
-    private final String adviceBeanName;
-    private final String metadataSourceBeanName;
-    private transient volatile Object adviceMonitor = new Object();
+	private transient MethodSecurityMetadataSource attributeSource;
+	private transient MethodSecurityInterceptor interceptor;
+	private final Pointcut pointcut = new MethodSecurityMetadataSourcePointcut();
+	private BeanFactory beanFactory;
+	private final String adviceBeanName;
+	private final String metadataSourceBeanName;
+	private transient volatile Object adviceMonitor = new Object();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Alternative constructor for situations where we want the advisor decoupled from the advice. Instead the advice
-     * bean name should be set. This prevents eager instantiation of the interceptor
-     * (and hence the AuthenticationManager). See SEC-773, for example. The metadataSourceBeanName is used rather than
-     * a direct reference to support serialization via a bean factory lookup.
-     *
-     * @param adviceBeanName name of the MethodSecurityInterceptor bean
-     * @param attributeSource the SecurityMetadataSource (should be the same as the one used on the interceptor)
-     * @param attributeSourceBeanName the bean name of the attributeSource (required for serialization)
-     */
-    public MethodSecurityMetadataSourceAdvisor(String adviceBeanName, MethodSecurityMetadataSource attributeSource,
-            String attributeSourceBeanName) {
-        Assert.notNull(adviceBeanName, "The adviceBeanName cannot be null");
-        Assert.notNull(attributeSource, "The attributeSource cannot be null");
-        Assert.notNull(attributeSourceBeanName, "The attributeSourceBeanName cannot be null");
+	/**
+	 * Alternative constructor for situations where we want the advisor decoupled from the
+	 * advice. Instead the advice bean name should be set. This prevents eager
+	 * instantiation of the interceptor (and hence the AuthenticationManager). See
+	 * SEC-773, for example. The metadataSourceBeanName is used rather than a direct
+	 * reference to support serialization via a bean factory lookup.
+	 *
+	 * @param adviceBeanName name of the MethodSecurityInterceptor bean
+	 * @param attributeSource the SecurityMetadataSource (should be the same as the one
+	 * used on the interceptor)
+	 * @param attributeSourceBeanName the bean name of the attributeSource (required for
+	 * serialization)
+	 */
+	public MethodSecurityMetadataSourceAdvisor(String adviceBeanName,
+			MethodSecurityMetadataSource attributeSource, String attributeSourceBeanName) {
+		Assert.notNull(adviceBeanName, "The adviceBeanName cannot be null");
+		Assert.notNull(attributeSource, "The attributeSource cannot be null");
+		Assert.notNull(attributeSourceBeanName,
+				"The attributeSourceBeanName cannot be null");
 
-        this.adviceBeanName = adviceBeanName;
-        this.attributeSource = attributeSource;
-        this.metadataSourceBeanName = attributeSourceBeanName;
-    }
+		this.adviceBeanName = adviceBeanName;
+		this.attributeSource = attributeSource;
+		this.metadataSourceBeanName = attributeSourceBeanName;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Pointcut getPointcut() {
-        return pointcut;
-    }
+	public Pointcut getPointcut() {
+		return pointcut;
+	}
 
-    public Advice getAdvice() {
-        synchronized (this.adviceMonitor) {
-            if (interceptor == null) {
-                Assert.notNull(adviceBeanName, "'adviceBeanName' must be set for use with bean factory lookup.");
-                Assert.state(beanFactory != null, "BeanFactory must be set to resolve 'adviceBeanName'");
-                interceptor = beanFactory.getBean(this.adviceBeanName, MethodSecurityInterceptor.class);
-            }
-            return interceptor;
-        }
-    }
+	public Advice getAdvice() {
+		synchronized (this.adviceMonitor) {
+			if (interceptor == null) {
+				Assert.notNull(adviceBeanName,
+						"'adviceBeanName' must be set for use with bean factory lookup.");
+				Assert.state(beanFactory != null,
+						"BeanFactory must be set to resolve 'adviceBeanName'");
+				interceptor = beanFactory.getBean(this.adviceBeanName,
+						MethodSecurityInterceptor.class);
+			}
+			return interceptor;
+		}
+	}
 
-    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-        this.beanFactory = beanFactory;
-    }
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		this.beanFactory = beanFactory;
+	}
 
-    private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
-        ois.defaultReadObject();
-        adviceMonitor = new Object();
-        attributeSource = beanFactory.getBean(metadataSourceBeanName, MethodSecurityMetadataSource.class);
-    }
+	private void readObject(ObjectInputStream ois) throws IOException,
+			ClassNotFoundException {
+		ois.defaultReadObject();
+		adviceMonitor = new Object();
+		attributeSource = beanFactory.getBean(metadataSourceBeanName,
+				MethodSecurityMetadataSource.class);
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    class MethodSecurityMetadataSourcePointcut extends StaticMethodMatcherPointcut implements Serializable {
-        @SuppressWarnings("unchecked")
-        public boolean matches(Method m, Class targetClass) {
-            Collection attributes = attributeSource.getAttributes(m, targetClass);
-            return attributes != null && !attributes.isEmpty();
-        }
-    }
+	class MethodSecurityMetadataSourcePointcut extends StaticMethodMatcherPointcut
+			implements Serializable {
+		@SuppressWarnings("unchecked")
+		public boolean matches(Method m, Class targetClass) {
+			Collection attributes = attributeSource.getAttributes(m, targetClass);
+			return attributes != null && !attributes.isEmpty();
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/package-info.java b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/package-info.java
index 313fffbd95..f76564cc70 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aopalliance/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aopalliance/package-info.java
@@ -2,3 +2,4 @@
  * Enforces security for AOP Alliance <code>MethodInvocation</code>s, such as via Spring AOP.
  */
 package org.springframework.security.access.intercept.aopalliance;
+
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java
index 6fabacdb25..1cc7940803 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJCallback.java
@@ -16,15 +16,15 @@
 package org.springframework.security.access.intercept.aspectj;
 
 /**
- * Called by the {@link AspectJMethodSecurityInterceptor} when it wishes for the
- * AspectJ processing to continue. Typically implemented in the
- * <code>around()</code> advice as a simple <code>return proceed();</code>
- * statement.
+ * Called by the {@link AspectJMethodSecurityInterceptor} when it wishes for the AspectJ
+ * processing to continue. Typically implemented in the <code>around()</code> advice as a
+ * simple <code>return proceed();</code> statement.
  *
  * @author Ben Alex
  */
 public interface AspectJCallback {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    Object proceedWithObject();
+	Object proceedWithObject();
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptor.java
index a6bb9509d2..8fd3087b35 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptor.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptor.java
@@ -5,11 +5,13 @@ import org.springframework.security.access.intercept.InterceptorStatusToken;
 import org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor;
 
 /**
- * AspectJ {@code JoinPoint} security interceptor which wraps the {@code JoinPoint} in a {@code MethodInvocation}
- * adapter to make it compatible with security infrastructure classes which only support {@code MethodInvocation}s.
+ * AspectJ {@code JoinPoint} security interceptor which wraps the {@code JoinPoint} in a
+ * {@code MethodInvocation} adapter to make it compatible with security infrastructure
+ * classes which only support {@code MethodInvocation}s.
  * <p>
- * One of the {@code invoke} methods should be called from the {@code around()} advice in your aspect.
- * Alternatively you can use one of the pre-defined aspects from the aspects module.
+ * One of the {@code invoke} methods should be called from the {@code around()} advice in
+ * your aspect. Alternatively you can use one of the pre-defined aspects from the aspects
+ * module.
  *
  * @author Luke Taylor
  * @author Rob Winch
@@ -17,36 +19,38 @@ import org.springframework.security.access.intercept.aopalliance.MethodSecurityI
  */
 public final class AspectJMethodSecurityInterceptor extends MethodSecurityInterceptor {
 
-    /**
-     * Method that is suitable for user with @Aspect notation.
-     *
-     * @param jp The AspectJ joint point being invoked which requires a security decision
-     * @return The returned value from the method invocation
-     * @throws Throwable if the invocation throws one
-     */
-    public Object invoke(JoinPoint jp) throws Throwable {
-        return super.invoke(new MethodInvocationAdapter(jp));
-    }
+	/**
+	 * Method that is suitable for user with @Aspect notation.
+	 *
+	 * @param jp The AspectJ joint point being invoked which requires a security decision
+	 * @return The returned value from the method invocation
+	 * @throws Throwable if the invocation throws one
+	 */
+	public Object invoke(JoinPoint jp) throws Throwable {
+		return super.invoke(new MethodInvocationAdapter(jp));
+	}
 
-    /**
-     * Method that is suitable for user with traditional AspectJ-code aspects.
-     *
-     * @param jp The AspectJ joint point being invoked which requires a security decision
-     * @param advisorProceed the advice-defined anonymous class that implements {@code AspectJCallback} containing
-     *        a simple {@code return proceed();} statement
-     *
-     * @return The returned value from the method invocation
-     */
-    public Object invoke(JoinPoint jp, AspectJCallback advisorProceed) {
-        InterceptorStatusToken token = super.beforeInvocation(new MethodInvocationAdapter(jp));
+	/**
+	 * Method that is suitable for user with traditional AspectJ-code aspects.
+	 *
+	 * @param jp The AspectJ joint point being invoked which requires a security decision
+	 * @param advisorProceed the advice-defined anonymous class that implements
+	 * {@code AspectJCallback} containing a simple {@code return proceed();} statement
+	 *
+	 * @return The returned value from the method invocation
+	 */
+	public Object invoke(JoinPoint jp, AspectJCallback advisorProceed) {
+		InterceptorStatusToken token = super
+				.beforeInvocation(new MethodInvocationAdapter(jp));
 
-        Object result;
-        try {
-            result = advisorProceed.proceedWithObject();
-        }finally {
-            super.finallyInvocation(token);
-        }
+		Object result;
+		try {
+			result = advisorProceed.proceedWithObject();
+		}
+		finally {
+			super.finallyInvocation(token);
+		}
 
-        return super.afterInvocation(token, result);
-    }
+		return super.afterInvocation(token, result);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java
index 271df0a7c9..895c45bde3 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/MethodInvocationAdapter.java
@@ -18,64 +18,69 @@ import org.springframework.util.ClassUtils;
  * @since 3.0.3
  */
 public final class MethodInvocationAdapter implements MethodInvocation {
-    private final ProceedingJoinPoint jp;
-    private final Method method;
-    private final Object target;
+	private final ProceedingJoinPoint jp;
+	private final Method method;
+	private final Object target;
 
-    MethodInvocationAdapter(JoinPoint jp) {
-        this.jp = (ProceedingJoinPoint)jp;
-        if (jp.getTarget() != null) {
-            target = jp.getTarget();
-        } else {
-            // SEC-1295: target may be null if an ITD is in use
-            target = jp.getSignature().getDeclaringType();
-        }
-        String targetMethodName = jp.getStaticPart().getSignature().getName();
-        Class<?>[] types = ((CodeSignature) jp.getStaticPart().getSignature()).getParameterTypes();
-        Class<?> declaringType = jp.getStaticPart().getSignature().getDeclaringType();
+	MethodInvocationAdapter(JoinPoint jp) {
+		this.jp = (ProceedingJoinPoint) jp;
+		if (jp.getTarget() != null) {
+			target = jp.getTarget();
+		}
+		else {
+			// SEC-1295: target may be null if an ITD is in use
+			target = jp.getSignature().getDeclaringType();
+		}
+		String targetMethodName = jp.getStaticPart().getSignature().getName();
+		Class<?>[] types = ((CodeSignature) jp.getStaticPart().getSignature())
+				.getParameterTypes();
+		Class<?> declaringType = jp.getStaticPart().getSignature().getDeclaringType();
 
-        method = findMethod(targetMethodName, declaringType, types);
+		method = findMethod(targetMethodName, declaringType, types);
 
-        if(method == null) {
-            throw new IllegalArgumentException("Could not obtain target method from JoinPoint: '"+ jp + "'");
-        }
-    }
+		if (method == null) {
+			throw new IllegalArgumentException(
+					"Could not obtain target method from JoinPoint: '" + jp + "'");
+		}
+	}
 
-    private Method findMethod(String name, Class<?> declaringType, Class<?>[] params) {
-        Method method = null;
+	private Method findMethod(String name, Class<?> declaringType, Class<?>[] params) {
+		Method method = null;
 
-        try {
-            method = declaringType.getMethod(name, params);
-        } catch (NoSuchMethodException ignored) {
-        }
+		try {
+			method = declaringType.getMethod(name, params);
+		}
+		catch (NoSuchMethodException ignored) {
+		}
 
-        if (method == null) {
-            try {
-                method = declaringType.getDeclaredMethod(name, params);
-            } catch (NoSuchMethodException ignored) {
-            }
-        }
+		if (method == null) {
+			try {
+				method = declaringType.getDeclaredMethod(name, params);
+			}
+			catch (NoSuchMethodException ignored) {
+			}
+		}
 
-        return method;
-    }
+		return method;
+	}
 
-    public Method getMethod() {
-        return method;
-    }
+	public Method getMethod() {
+		return method;
+	}
 
-    public Object[] getArguments() {
-        return jp.getArgs();
-    }
+	public Object[] getArguments() {
+		return jp.getArgs();
+	}
 
-    public AccessibleObject getStaticPart() {
-        return method;
-    }
+	public AccessibleObject getStaticPart() {
+		return method;
+	}
 
-    public Object getThis() {
-        return target;
-    }
+	public Object getThis() {
+		return target;
+	}
 
-    public Object proceed() throws Throwable {
-        return jp.proceed();
-    }
+	public Object proceed() throws Throwable {
+		return jp.proceed();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/intercept/aspectj/package-info.java b/core/src/main/java/org/springframework/security/access/intercept/aspectj/package-info.java
index 2782ae9c0a..33394413bd 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/aspectj/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/aspectj/package-info.java
@@ -2,3 +2,4 @@
  * Enforces security for AspectJ <code>JointPoint</code>s, delegating secure object callbacks to the calling aspect.
  */
 package org.springframework.security.access.intercept.aspectj;
+
diff --git a/core/src/main/java/org/springframework/security/access/intercept/package-info.java b/core/src/main/java/org/springframework/security/access/intercept/package-info.java
index b67b8a732d..43b81cdf64 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/package-info.java
@@ -19,3 +19,4 @@
  * for the type of resources the secure object represents.
  */
 package org.springframework.security.access.intercept;
+
diff --git a/core/src/main/java/org/springframework/security/access/method/AbstractFallbackMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/AbstractFallbackMethodSecurityMetadataSource.java
index 5dfd646dfb..7e615ebbce 100644
--- a/core/src/main/java/org/springframework/security/access/method/AbstractFallbackMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/AbstractFallbackMethodSecurityMetadataSource.java
@@ -7,81 +7,87 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.security.access.ConfigAttribute;
 
 /**
- * Abstract implementation of {@link MethodSecurityMetadataSource} that supports both Spring AOP and AspectJ and
- * performs attribute resolution from: 1. specific target method; 2. target class;  3. declaring method;
- * 4. declaring class/interface. Use with {@link DelegatingMethodSecurityMetadataSource} for caching support.
+ * Abstract implementation of {@link MethodSecurityMetadataSource} that supports both
+ * Spring AOP and AspectJ and performs attribute resolution from: 1. specific target
+ * method; 2. target class; 3. declaring method; 4. declaring class/interface. Use with
+ * {@link DelegatingMethodSecurityMetadataSource} for caching support.
  * <p>
- * This class mimics the behaviour of Spring's <tt>AbstractFallbackTransactionAttributeSource</tt> class.
+ * This class mimics the behaviour of Spring's
+ * <tt>AbstractFallbackTransactionAttributeSource</tt> class.
  * <p>
- * Note that this class cannot extract security metadata where that metadata is expressed by way of
- * a target method/class (i.e. #1 and #2 above) AND the target method/class is encapsulated in another
- * proxy object. Spring Security does not walk a proxy chain to locate the concrete/final target object.
- * Consider making Spring Security your final advisor (so it advises the final target, as opposed to
- * another proxy), move the metadata to declared methods or interfaces the proxy implements, or provide
- * your own replacement <tt>MethodSecurityMetadataSource</tt>.
+ * Note that this class cannot extract security metadata where that metadata is expressed
+ * by way of a target method/class (i.e. #1 and #2 above) AND the target method/class is
+ * encapsulated in another proxy object. Spring Security does not walk a proxy chain to
+ * locate the concrete/final target object. Consider making Spring Security your final
+ * advisor (so it advises the final target, as opposed to another proxy), move the
+ * metadata to declared methods or interfaces the proxy implements, or provide your own
+ * replacement <tt>MethodSecurityMetadataSource</tt>.
  *
  * @author Ben Alex
  * @author Luke taylor
  * @since 2.0
  */
-public abstract class AbstractFallbackMethodSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
+public abstract class AbstractFallbackMethodSecurityMetadataSource extends
+		AbstractMethodSecurityMetadataSource {
 
-    public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
-        // The method may be on an interface, but we need attributes from the target class.
-        // If the target class is null, the method will be unchanged.
-        Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);
-        // First try is the method in the target class.
-        Collection<ConfigAttribute> attr = findAttributes(specificMethod, targetClass);
-        if (attr != null) {
-            return attr;
-        }
+	public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
+		// The method may be on an interface, but we need attributes from the target
+		// class.
+		// If the target class is null, the method will be unchanged.
+		Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);
+		// First try is the method in the target class.
+		Collection<ConfigAttribute> attr = findAttributes(specificMethod, targetClass);
+		if (attr != null) {
+			return attr;
+		}
 
-        // Second try is the config attribute on the target class.
-        attr = findAttributes(specificMethod.getDeclaringClass());
-        if (attr != null) {
-            return attr;
-        }
+		// Second try is the config attribute on the target class.
+		attr = findAttributes(specificMethod.getDeclaringClass());
+		if (attr != null) {
+			return attr;
+		}
 
-        if (specificMethod != method || targetClass == null) {
-            // Fallback is to look at the original method.
-            attr = findAttributes(method, method.getDeclaringClass());
-            if (attr != null) {
-                return attr;
-            }
-            // Last fallback is the class of the original method.
-            return findAttributes(method.getDeclaringClass());
-        }
-        return Collections.emptyList();
-    }
+		if (specificMethod != method || targetClass == null) {
+			// Fallback is to look at the original method.
+			attr = findAttributes(method, method.getDeclaringClass());
+			if (attr != null) {
+				return attr;
+			}
+			// Last fallback is the class of the original method.
+			return findAttributes(method.getDeclaringClass());
+		}
+		return Collections.emptyList();
+	}
 
-    /**
-     * Obtains the security metadata applicable to the specified method invocation.
-     *
-     * <p>
-     * Note that the {@link Method#getDeclaringClass()} may not equal the <code>targetClass</code>.
-     * Both parameters are provided to assist subclasses which may wish to provide advanced
-     * capabilities related to method metadata being "registered" against a method even if the
-     * target class does not declare the method (i.e. the subclass may only inherit the method).
-     *
-     * @param method the method for the current invocation (never <code>null</code>)
-     * @param targetClass the target class for the invocation (may be <code>null</code>)
-     * @return the security metadata (or null if no metadata applies)
-     */
-    protected abstract Collection<ConfigAttribute> findAttributes(Method method, Class<?> targetClass);
-
-    /**
-     * Obtains the security metadata registered against the specified class.
-     *
-     * <p>
-     * Subclasses should only return metadata expressed at a class level. Subclasses should NOT
-     * aggregate metadata for each method registered against a class, as the abstract superclass
-     * will separate invoke {@link #findAttributes(Method, Class)} for individual methods as
-     * appropriate.
-     *
-     * @param clazz the target class for the invocation (never <code>null</code>)
-     * @return the security metadata (or null if no metadata applies)
-     */
-    protected abstract Collection<ConfigAttribute> findAttributes(Class<?> clazz);
+	/**
+	 * Obtains the security metadata applicable to the specified method invocation.
+	 *
+	 * <p>
+	 * Note that the {@link Method#getDeclaringClass()} may not equal the
+	 * <code>targetClass</code>. Both parameters are provided to assist subclasses which
+	 * may wish to provide advanced capabilities related to method metadata being
+	 * "registered" against a method even if the target class does not declare the method
+	 * (i.e. the subclass may only inherit the method).
+	 *
+	 * @param method the method for the current invocation (never <code>null</code>)
+	 * @param targetClass the target class for the invocation (may be <code>null</code>)
+	 * @return the security metadata (or null if no metadata applies)
+	 */
+	protected abstract Collection<ConfigAttribute> findAttributes(Method method,
+			Class<?> targetClass);
 
+	/**
+	 * Obtains the security metadata registered against the specified class.
+	 *
+	 * <p>
+	 * Subclasses should only return metadata expressed at a class level. Subclasses
+	 * should NOT aggregate metadata for each method registered against a class, as the
+	 * abstract superclass will separate invoke {@link #findAttributes(Method, Class)} for
+	 * individual methods as appropriate.
+	 *
+	 * @param clazz the target class for the invocation (never <code>null</code>)
+	 * @return the security metadata (or null if no metadata applies)
+	 */
+	protected abstract Collection<ConfigAttribute> findAttributes(Class<?> clazz);
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
index 7fa9082b79..8b2c4d59b0 100644
--- a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
@@ -23,43 +23,45 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.security.access.ConfigAttribute;
 
-
 /**
- * Abstract implementation of <tt>MethodSecurityMetadataSource</tt> which resolves the secured object type to
- * a MethodInvocation.
+ * Abstract implementation of <tt>MethodSecurityMetadataSource</tt> which resolves the
+ * secured object type to a MethodInvocation.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public abstract class AbstractMethodSecurityMetadataSource implements MethodSecurityMetadataSource {
+public abstract class AbstractMethodSecurityMetadataSource implements
+		MethodSecurityMetadataSource {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final Collection<ConfigAttribute> getAttributes(Object object) {
-        if (object instanceof MethodInvocation) {
-            MethodInvocation mi = (MethodInvocation) object;
-            Object target = mi.getThis();
-            Class<?> targetClass = null;
+	public final Collection<ConfigAttribute> getAttributes(Object object) {
+		if (object instanceof MethodInvocation) {
+			MethodInvocation mi = (MethodInvocation) object;
+			Object target = mi.getThis();
+			Class<?> targetClass = null;
 
-            if (target != null) {
-                targetClass = target instanceof Class<?> ? (Class<?>)target : AopProxyUtils.ultimateTargetClass(target);
-            }
-            Collection<ConfigAttribute> attrs = getAttributes(mi.getMethod(), targetClass);
-            if(attrs != null && !attrs.isEmpty()) {
-                return attrs;
-            }
-            if(target != null && !(target instanceof Class<?>)) {
-                attrs = getAttributes(mi.getMethod(), target.getClass());
-            }
-            return attrs;
-        }
+			if (target != null) {
+				targetClass = target instanceof Class<?> ? (Class<?>) target
+						: AopProxyUtils.ultimateTargetClass(target);
+			}
+			Collection<ConfigAttribute> attrs = getAttributes(mi.getMethod(), targetClass);
+			if (attrs != null && !attrs.isEmpty()) {
+				return attrs;
+			}
+			if (target != null && !(target instanceof Class<?>)) {
+				attrs = getAttributes(mi.getMethod(), target.getClass());
+			}
+			return attrs;
+		}
 
-        throw new IllegalArgumentException("Object must be a non-null MethodInvocation");
-    }
+		throw new IllegalArgumentException("Object must be a non-null MethodInvocation");
+	}
 
-    public final boolean supports(Class<?> clazz) {
-        return (MethodInvocation.class.isAssignableFrom(clazz));
-    }
+	public final boolean supports(Class<?> clazz) {
+		return (MethodInvocation.class.isAssignableFrom(clazz));
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
index 553c8f5a03..29244a56d9 100644
--- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
@@ -14,101 +14,111 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Automatically tries a series of method definition sources, relying on the first source of metadata
- * that provides a non-null/non-empty response. Provides automatic caching of the retrieved metadata.
+ * Automatically tries a series of method definition sources, relying on the first source
+ * of metadata that provides a non-null/non-empty response. Provides automatic caching of
+ * the retrieved metadata.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public final class DelegatingMethodSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
-    private final static List<ConfigAttribute> NULL_CONFIG_ATTRIBUTE = Collections.emptyList();
+public final class DelegatingMethodSecurityMetadataSource extends
+		AbstractMethodSecurityMetadataSource {
+	private final static List<ConfigAttribute> NULL_CONFIG_ATTRIBUTE = Collections
+			.emptyList();
 
-    private final List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
-    private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache =
-        new HashMap<DefaultCacheKey, Collection<ConfigAttribute>>();
+	private final List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
+	private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache = new HashMap<DefaultCacheKey, Collection<ConfigAttribute>>();
 
-    //~ Constructor ====================================================================================================
+	// ~ Constructor
+	// ====================================================================================================
 
-    public DelegatingMethodSecurityMetadataSource(List<MethodSecurityMetadataSource> methodSecurityMetadataSources) {
-        Assert.notNull(methodSecurityMetadataSources, "MethodSecurityMetadataSources cannot be null");
-        this.methodSecurityMetadataSources = methodSecurityMetadataSources;
-    }
+	public DelegatingMethodSecurityMetadataSource(
+			List<MethodSecurityMetadataSource> methodSecurityMetadataSources) {
+		Assert.notNull(methodSecurityMetadataSources,
+				"MethodSecurityMetadataSources cannot be null");
+		this.methodSecurityMetadataSources = methodSecurityMetadataSources;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
-        DefaultCacheKey cacheKey = new DefaultCacheKey(method, targetClass);
-        synchronized (attributeCache) {
-            Collection<ConfigAttribute> cached = attributeCache.get(cacheKey);
-            // Check for canonical value indicating there is no config attribute,
+	public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
+		DefaultCacheKey cacheKey = new DefaultCacheKey(method, targetClass);
+		synchronized (attributeCache) {
+			Collection<ConfigAttribute> cached = attributeCache.get(cacheKey);
+			// Check for canonical value indicating there is no config attribute,
 
-            if (cached != null) {
-                return cached;
-            }
+			if (cached != null) {
+				return cached;
+			}
 
-            // No cached value, so query the sources to find a result
-            Collection<ConfigAttribute> attributes = null;
-            for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
-                attributes = s.getAttributes(method, targetClass);
-                if (attributes != null && !attributes.isEmpty()) {
-                    break;
-                }
-            }
+			// No cached value, so query the sources to find a result
+			Collection<ConfigAttribute> attributes = null;
+			for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
+				attributes = s.getAttributes(method, targetClass);
+				if (attributes != null && !attributes.isEmpty()) {
+					break;
+				}
+			}
 
-            // Put it in the cache.
-            if (attributes == null || attributes.isEmpty()) {
-                this.attributeCache.put(cacheKey, NULL_CONFIG_ATTRIBUTE);
-                return NULL_CONFIG_ATTRIBUTE;
-            }
+			// Put it in the cache.
+			if (attributes == null || attributes.isEmpty()) {
+				this.attributeCache.put(cacheKey, NULL_CONFIG_ATTRIBUTE);
+				return NULL_CONFIG_ATTRIBUTE;
+			}
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Caching method [" + cacheKey + "] with attributes " + attributes);
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Caching method [" + cacheKey + "] with attributes "
+						+ attributes);
+			}
 
-            this.attributeCache.put(cacheKey, attributes);
+			this.attributeCache.put(cacheKey, attributes);
 
-            return attributes;
-        }
-    }
+			return attributes;
+		}
+	}
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        Set<ConfigAttribute> set = new HashSet<ConfigAttribute>();
-        for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
-            Collection<ConfigAttribute> attrs = s.getAllConfigAttributes();
-            if (attrs != null) {
-                set.addAll(attrs);
-            }
-        }
-        return set;
-    }
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		Set<ConfigAttribute> set = new HashSet<ConfigAttribute>();
+		for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) {
+			Collection<ConfigAttribute> attrs = s.getAllConfigAttributes();
+			if (attrs != null) {
+				set.addAll(attrs);
+			}
+		}
+		return set;
+	}
 
-    public List<MethodSecurityMetadataSource> getMethodSecurityMetadataSources() {
-        return methodSecurityMetadataSources;
-    }
+	public List<MethodSecurityMetadataSource> getMethodSecurityMetadataSources() {
+		return methodSecurityMetadataSources;
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private static class DefaultCacheKey {
-        private final Method method;
-        private final Class<?> targetClass;
+	private static class DefaultCacheKey {
+		private final Method method;
+		private final Class<?> targetClass;
 
-        public DefaultCacheKey(Method method, Class<?> targetClass) {
-            this.method = method;
-            this.targetClass = targetClass;
-        }
+		public DefaultCacheKey(Method method, Class<?> targetClass) {
+			this.method = method;
+			this.targetClass = targetClass;
+		}
 
-        public boolean equals(Object other) {
-            DefaultCacheKey otherKey = (DefaultCacheKey) other;
-            return (this.method.equals(otherKey.method) &&
-                    ObjectUtils.nullSafeEquals(this.targetClass, otherKey.targetClass));
-        }
+		public boolean equals(Object other) {
+			DefaultCacheKey otherKey = (DefaultCacheKey) other;
+			return (this.method.equals(otherKey.method) && ObjectUtils.nullSafeEquals(
+					this.targetClass, otherKey.targetClass));
+		}
 
-        public int hashCode() {
-            return this.method.hashCode() * 21 + (this.targetClass != null ? this.targetClass.hashCode() : 0);
-        }
+		public int hashCode() {
+			return this.method.hashCode() * 21
+					+ (this.targetClass != null ? this.targetClass.hashCode() : 0);
+		}
 
-        public String toString() {
-            return "CacheKey[" + (targetClass == null ? "-" : targetClass.getName()) + "; " + method + "]";
-        }
-    }
+		public String toString() {
+			return "CacheKey[" + (targetClass == null ? "-" : targetClass.getName())
+					+ "; " + method + "]";
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java
index 9f6edcc2c8..5e49f33319 100644
--- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java
@@ -30,260 +30,286 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-
 /**
  * Stores a list of <tt>ConfigAttribute</tt>s for a method or class signature.
  *
  * <p>
- * This class is the preferred implementation of {@link MethodSecurityMetadataSource} for XML-based
- * definition of method security metadata. To assist in XML-based definition, wildcard support
- * is provided.
+ * This class is the preferred implementation of {@link MethodSecurityMetadataSource} for
+ * XML-based definition of method security metadata. To assist in XML-based definition,
+ * wildcard support is provided.
  * </p>
  *
  * @author Ben Alex
  * @since 2.0
  */
-public class MapBasedMethodSecurityMetadataSource extends AbstractFallbackMethodSecurityMetadataSource
-        implements BeanClassLoaderAware {
+public class MapBasedMethodSecurityMetadataSource extends
+		AbstractFallbackMethodSecurityMetadataSource implements BeanClassLoaderAware {
 
-    //~ Instance fields ================================================================================================
-    private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
+	// ~ Instance fields
+	// ================================================================================================
+	private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader();
 
-    /** Map from RegisteredMethod to ConfigAttribute list */
-    protected final Map<RegisteredMethod, List<ConfigAttribute>> methodMap = new HashMap<RegisteredMethod, List<ConfigAttribute>>();
+	/** Map from RegisteredMethod to ConfigAttribute list */
+	protected final Map<RegisteredMethod, List<ConfigAttribute>> methodMap = new HashMap<RegisteredMethod, List<ConfigAttribute>>();
 
-    /** Map from RegisteredMethod to name pattern used for registration */
-    private final Map<RegisteredMethod, String> nameMap = new HashMap<RegisteredMethod, String>();
+	/** Map from RegisteredMethod to name pattern used for registration */
+	private final Map<RegisteredMethod, String> nameMap = new HashMap<RegisteredMethod, String>();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public MapBasedMethodSecurityMetadataSource() {
-    }
+	public MapBasedMethodSecurityMetadataSource() {
+	}
 
-    /**
-     * Creates the <tt>MapBasedMethodSecurityMetadataSource</tt> from a
-     * @param methodMap map of method names to <tt>ConfigAttribute</tt>s.
-     */
-    public MapBasedMethodSecurityMetadataSource(Map<String, List<ConfigAttribute>> methodMap) {
-        for (Map.Entry<String, List<ConfigAttribute>> entry : methodMap.entrySet()) {
-            addSecureMethod(entry.getKey(), entry.getValue());
-        }
-    }
+	/**
+	 * Creates the <tt>MapBasedMethodSecurityMetadataSource</tt> from a
+	 * @param methodMap map of method names to <tt>ConfigAttribute</tt>s.
+	 */
+	public MapBasedMethodSecurityMetadataSource(
+			Map<String, List<ConfigAttribute>> methodMap) {
+		for (Map.Entry<String, List<ConfigAttribute>> entry : methodMap.entrySet()) {
+			addSecureMethod(entry.getKey(), entry.getValue());
+		}
+	}
 
-    /**
-     * Implementation does not support class-level attributes.
-     */
-    protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
-        return null;
-    }
+	/**
+	 * Implementation does not support class-level attributes.
+	 */
+	protected Collection<ConfigAttribute> findAttributes(Class<?> clazz) {
+		return null;
+	}
 
-    /**
-     * Will walk the method inheritance tree to find the most specific declaration applicable.
-     */
-    protected Collection<ConfigAttribute> findAttributes(Method method, Class<?> targetClass) {
-        if (targetClass == null) {
-            return null;
-        }
+	/**
+	 * Will walk the method inheritance tree to find the most specific declaration
+	 * applicable.
+	 */
+	protected Collection<ConfigAttribute> findAttributes(Method method,
+			Class<?> targetClass) {
+		if (targetClass == null) {
+			return null;
+		}
 
-        return findAttributesSpecifiedAgainst(method, targetClass);
-    }
+		return findAttributesSpecifiedAgainst(method, targetClass);
+	}
 
-    private List<ConfigAttribute> findAttributesSpecifiedAgainst(Method method, Class<?> clazz) {
-        RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz);
-        if (methodMap.containsKey(registeredMethod)) {
-            return (List<ConfigAttribute>) methodMap.get(registeredMethod);
-        }
-        // Search superclass
-        if (clazz.getSuperclass() != null) {
-            return findAttributesSpecifiedAgainst(method, clazz.getSuperclass());
-        }
-        return null;
-    }
+	private List<ConfigAttribute> findAttributesSpecifiedAgainst(Method method,
+			Class<?> clazz) {
+		RegisteredMethod registeredMethod = new RegisteredMethod(method, clazz);
+		if (methodMap.containsKey(registeredMethod)) {
+			return (List<ConfigAttribute>) methodMap.get(registeredMethod);
+		}
+		// Search superclass
+		if (clazz.getSuperclass() != null) {
+			return findAttributesSpecifiedAgainst(method, clazz.getSuperclass());
+		}
+		return null;
+	}
 
-    /**
-     * Add configuration attributes for a secure method. Method names can end or start with <code>&#42</code>
-     * for matching multiple methods.
-     *
-     * @param name type and method name, separated by a dot
-     * @param attr the security attributes associated with the method
-     */
-    private void addSecureMethod(String name, List<ConfigAttribute> attr) {
-        int lastDotIndex = name.lastIndexOf(".");
+	/**
+	 * Add configuration attributes for a secure method. Method names can end or start
+	 * with <code>&#42</code> for matching multiple methods.
+	 *
+	 * @param name type and method name, separated by a dot
+	 * @param attr the security attributes associated with the method
+	 */
+	private void addSecureMethod(String name, List<ConfigAttribute> attr) {
+		int lastDotIndex = name.lastIndexOf(".");
 
-        if (lastDotIndex == -1) {
-            throw new IllegalArgumentException("'" + name + "' is not a valid method name: format is FQN.methodName");
-        }
+		if (lastDotIndex == -1) {
+			throw new IllegalArgumentException("'" + name
+					+ "' is not a valid method name: format is FQN.methodName");
+		}
 
-        String methodName = name.substring(lastDotIndex + 1);
-        Assert.hasText(methodName, "Method not found for '" + name + "'");
+		String methodName = name.substring(lastDotIndex + 1);
+		Assert.hasText(methodName, "Method not found for '" + name + "'");
 
-        String typeName = name.substring(0, lastDotIndex);
-        Class<?> type = ClassUtils.resolveClassName(typeName, this.beanClassLoader);
+		String typeName = name.substring(0, lastDotIndex);
+		Class<?> type = ClassUtils.resolveClassName(typeName, this.beanClassLoader);
 
-        addSecureMethod(type, methodName, attr);
-    }
+		addSecureMethod(type, methodName, attr);
+	}
 
-    /**
-     * Add configuration attributes for a secure method. Mapped method names can end or start with <code>&#42</code>
-     * for matching multiple methods.
-     *
-     * @param javaType target interface or class the security configuration attribute applies to
-     * @param mappedName mapped method name, which the javaType has declared or inherited
-     * @param attr required authorities associated with the method
-     */
-    public void addSecureMethod(Class<?> javaType, String mappedName, List<ConfigAttribute> attr) {
-        String name = javaType.getName() + '.' + mappedName;
+	/**
+	 * Add configuration attributes for a secure method. Mapped method names can end or
+	 * start with <code>&#42</code> for matching multiple methods.
+	 *
+	 * @param javaType target interface or class the security configuration attribute
+	 * applies to
+	 * @param mappedName mapped method name, which the javaType has declared or inherited
+	 * @param attr required authorities associated with the method
+	 */
+	public void addSecureMethod(Class<?> javaType, String mappedName,
+			List<ConfigAttribute> attr) {
+		String name = javaType.getName() + '.' + mappedName;
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Request to add secure method [" + name + "] with attributes [" + attr + "]");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Request to add secure method [" + name + "] with attributes ["
+					+ attr + "]");
+		}
 
-        Method[] methods = javaType.getMethods();
-        List<Method> matchingMethods = new ArrayList<Method>();
+		Method[] methods = javaType.getMethods();
+		List<Method> matchingMethods = new ArrayList<Method>();
 
-        for (Method m : methods) {
-            if (m.getName().equals(mappedName) || isMatch(m.getName(), mappedName)) {
-                matchingMethods.add(m);
-            }
-        }
+		for (Method m : methods) {
+			if (m.getName().equals(mappedName) || isMatch(m.getName(), mappedName)) {
+				matchingMethods.add(m);
+			}
+		}
 
-        if (matchingMethods.isEmpty()) {
-            throw new IllegalArgumentException("Couldn't find method '" + mappedName + "' on '" + javaType + "'");
-        }
+		if (matchingMethods.isEmpty()) {
+			throw new IllegalArgumentException("Couldn't find method '" + mappedName
+					+ "' on '" + javaType + "'");
+		}
 
-        // register all matching methods
-        for (Method method : matchingMethods) {
-            RegisteredMethod registeredMethod = new RegisteredMethod(method, javaType);
-            String regMethodName = (String) this.nameMap.get(registeredMethod);
+		// register all matching methods
+		for (Method method : matchingMethods) {
+			RegisteredMethod registeredMethod = new RegisteredMethod(method, javaType);
+			String regMethodName = (String) this.nameMap.get(registeredMethod);
 
-            if ((regMethodName == null) || (!regMethodName.equals(name) && (regMethodName.length() <= name.length()))) {
-                // no already registered method name, or more specific
-                // method name specification now -> (re-)register method
-                if (regMethodName != null) {
-                    logger.debug("Replacing attributes for secure method [" + method + "]: current name [" + name
-                        + "] is more specific than [" + regMethodName + "]");
-                }
+			if ((regMethodName == null)
+					|| (!regMethodName.equals(name) && (regMethodName.length() <= name
+							.length()))) {
+				// no already registered method name, or more specific
+				// method name specification now -> (re-)register method
+				if (regMethodName != null) {
+					logger.debug("Replacing attributes for secure method [" + method
+							+ "]: current name [" + name + "] is more specific than ["
+							+ regMethodName + "]");
+				}
 
-                this.nameMap.put(registeredMethod, name);
-                addSecureMethod(registeredMethod, attr);
-            } else {
-                logger.debug("Keeping attributes for secure method [" + method + "]: current name [" + name
-                    + "] is not more specific than [" + regMethodName + "]");
-            }
-        }
-    }
+				this.nameMap.put(registeredMethod, name);
+				addSecureMethod(registeredMethod, attr);
+			}
+			else {
+				logger.debug("Keeping attributes for secure method [" + method
+						+ "]: current name [" + name + "] is not more specific than ["
+						+ regMethodName + "]");
+			}
+		}
+	}
 
-    /**
-     * Adds configuration attributes for a specific method, for example where the method has been
-     * matched using a pointcut expression. If a match already exists in the map for the method, then
-     * the existing match will be retained, so that if this method is called for a more general pointcut
-     * it will not override a more specific one which has already been added.
-     * <p>
-     * This method should only be called during initialization of the {@code BeanFactory}.
-     */
-    public void addSecureMethod(Class<?> javaType, Method method, List<ConfigAttribute> attr) {
-        RegisteredMethod key = new RegisteredMethod(method, javaType);
+	/**
+	 * Adds configuration attributes for a specific method, for example where the method
+	 * has been matched using a pointcut expression. If a match already exists in the map
+	 * for the method, then the existing match will be retained, so that if this method is
+	 * called for a more general pointcut it will not override a more specific one which
+	 * has already been added.
+	 * <p>
+	 * This method should only be called during initialization of the {@code BeanFactory}.
+	 */
+	public void addSecureMethod(Class<?> javaType, Method method,
+			List<ConfigAttribute> attr) {
+		RegisteredMethod key = new RegisteredMethod(method, javaType);
 
-        if (methodMap.containsKey(key)) {
-            logger.debug("Method [" + method + "] is already registered with attributes [" + methodMap.get(key) + "]");
-            return;
-        }
+		if (methodMap.containsKey(key)) {
+			logger.debug("Method [" + method
+					+ "] is already registered with attributes [" + methodMap.get(key)
+					+ "]");
+			return;
+		}
 
-        methodMap.put(key, attr);
-    }
+		methodMap.put(key, attr);
+	}
 
-    /**
-     * Add configuration attributes for a secure method.
-     *
-     * @param method the method to be secured
-     * @param attr required authorities associated with the method
-     */
-    private void addSecureMethod(RegisteredMethod method, List<ConfigAttribute> attr) {
-        Assert.notNull(method, "RegisteredMethod required");
-        Assert.notNull(attr, "Configuration attribute required");
-        if (logger.isInfoEnabled()) {
-            logger.info("Adding secure method [" + method + "] with attributes [" + attr + "]");
-        }
-        this.methodMap.put(method, attr);
-    }
+	/**
+	 * Add configuration attributes for a secure method.
+	 *
+	 * @param method the method to be secured
+	 * @param attr required authorities associated with the method
+	 */
+	private void addSecureMethod(RegisteredMethod method, List<ConfigAttribute> attr) {
+		Assert.notNull(method, "RegisteredMethod required");
+		Assert.notNull(attr, "Configuration attribute required");
+		if (logger.isInfoEnabled()) {
+			logger.info("Adding secure method [" + method + "] with attributes [" + attr
+					+ "]");
+		}
+		this.methodMap.put(method, attr);
+	}
 
-    /**
-     * Obtains the configuration attributes explicitly defined against this bean.
-     *
-     * @return the attributes explicitly defined against this bean
-     */
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
+	/**
+	 * Obtains the configuration attributes explicitly defined against this bean.
+	 *
+	 * @return the attributes explicitly defined against this bean
+	 */
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
 
-        for (List<ConfigAttribute> attributeList : methodMap.values()) {
-            allAttributes.addAll(attributeList);
-        }
+		for (List<ConfigAttribute> attributeList : methodMap.values()) {
+			allAttributes.addAll(attributeList);
+		}
 
-        return allAttributes;
-    }
+		return allAttributes;
+	}
 
-    /**
-     * Return if the given method name matches the mapped name. The default implementation checks for "xxx" and
-     * "xxx" matches.
-     *
-     * @param methodName the method name of the class
-     * @param mappedName the name in the descriptor
-     *
-     * @return if the names match
-     */
-    private boolean isMatch(String methodName, String mappedName) {
-        return (mappedName.endsWith("*") && methodName.startsWith(mappedName.substring(0, mappedName.length() - 1)))
-        || (mappedName.startsWith("*") && methodName.endsWith(mappedName.substring(1, mappedName.length())));
-    }
+	/**
+	 * Return if the given method name matches the mapped name. The default implementation
+	 * checks for "xxx" and "xxx" matches.
+	 *
+	 * @param methodName the method name of the class
+	 * @param mappedName the name in the descriptor
+	 *
+	 * @return if the names match
+	 */
+	private boolean isMatch(String methodName, String mappedName) {
+		return (mappedName.endsWith("*") && methodName.startsWith(mappedName.substring(0,
+				mappedName.length() - 1)))
+				|| (mappedName.startsWith("*") && methodName.endsWith(mappedName
+						.substring(1, mappedName.length())));
+	}
 
-    public void setBeanClassLoader(ClassLoader beanClassLoader) {
-        Assert.notNull(beanClassLoader, "Bean class loader required");
-        this.beanClassLoader = beanClassLoader;
-    }
+	public void setBeanClassLoader(ClassLoader beanClassLoader) {
+		Assert.notNull(beanClassLoader, "Bean class loader required");
+		this.beanClassLoader = beanClassLoader;
+	}
 
-    /**
-     * @return map size (for unit tests and diagnostics)
-     */
-    public int getMethodMapSize() {
-        return methodMap.size();
-    }
+	/**
+	 * @return map size (for unit tests and diagnostics)
+	 */
+	public int getMethodMapSize() {
+		return methodMap.size();
+	}
 
-    /**
-     * Stores both the Java Method as well as the Class we obtained the Method from. This is necessary because Method only
-     * provides us access to the declaring class. It doesn't provide a way for us to introspect which Class the Method
-     * was registered against. If a given Class inherits and redeclares a method (i.e. calls super();) the registered Class
-     * and declaring Class are the same. If a given class merely inherits but does not redeclare a method, the registered
-     * Class will be the Class we're invoking against and the Method will provide details of the declared class.
-     */
-    private class RegisteredMethod {
-        private final Method method;
-        private final Class<?> registeredJavaType;
+	/**
+	 * Stores both the Java Method as well as the Class we obtained the Method from. This
+	 * is necessary because Method only provides us access to the declaring class. It
+	 * doesn't provide a way for us to introspect which Class the Method was registered
+	 * against. If a given Class inherits and redeclares a method (i.e. calls super();)
+	 * the registered Class and declaring Class are the same. If a given class merely
+	 * inherits but does not redeclare a method, the registered Class will be the Class
+	 * we're invoking against and the Method will provide details of the declared class.
+	 */
+	private class RegisteredMethod {
+		private final Method method;
+		private final Class<?> registeredJavaType;
 
-        public RegisteredMethod(Method method, Class<?> registeredJavaType) {
-            Assert.notNull(method, "Method required");
-            Assert.notNull(registeredJavaType, "Registered Java Type required");
-            this.method = method;
-            this.registeredJavaType = registeredJavaType;
-        }
+		public RegisteredMethod(Method method, Class<?> registeredJavaType) {
+			Assert.notNull(method, "Method required");
+			Assert.notNull(registeredJavaType, "Registered Java Type required");
+			this.method = method;
+			this.registeredJavaType = registeredJavaType;
+		}
 
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj != null && obj instanceof RegisteredMethod) {
-                RegisteredMethod rhs = (RegisteredMethod) obj;
-                return method.equals(rhs.method) && registeredJavaType.equals(rhs.registeredJavaType);
-            }
-            return false;
-        }
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (obj != null && obj instanceof RegisteredMethod) {
+				RegisteredMethod rhs = (RegisteredMethod) obj;
+				return method.equals(rhs.method)
+						&& registeredJavaType.equals(rhs.registeredJavaType);
+			}
+			return false;
+		}
 
-        public int hashCode() {
-            return method.hashCode() * registeredJavaType.hashCode();
-        }
+		public int hashCode() {
+			return method.hashCode() * registeredJavaType.hashCode();
+		}
 
-        public String toString() {
-            return "RegisteredMethod[" + registeredJavaType.getName() + "; " + method + "]";
-        }
-    }
+		public String toString() {
+			return "RegisteredMethod[" + registeredJavaType.getName() + "; " + method
+					+ "]";
+		}
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java
index b8308c3d01..02e046e72c 100644
--- a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java
@@ -21,13 +21,12 @@ import java.util.Collection;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityMetadataSource;
 
-
 /**
- * Interface for <code>SecurityMetadataSource</code> implementations
- * that are designed to perform lookups keyed on <code>Method</code>s.
+ * Interface for <code>SecurityMetadataSource</code> implementations that are designed to
+ * perform lookups keyed on <code>Method</code>s.
  *
  * @author Ben Alex
  */
 public interface MethodSecurityMetadataSource extends SecurityMetadataSource {
-    public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass);
+	public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass);
 }
diff --git a/core/src/main/java/org/springframework/security/access/method/P.java b/core/src/main/java/org/springframework/security/access/method/P.java
index 350964a1c7..2c30e2fecc 100644
--- a/core/src/main/java/org/springframework/security/access/method/P.java
+++ b/core/src/main/java/org/springframework/security/access/method/P.java
@@ -24,10 +24,9 @@ import java.lang.annotation.Target;
 import org.springframework.security.core.parameters.AnnotationParameterNameDiscoverer;
 
 /**
- * An annotation that can be used along with
- * {@link AnnotationParameterNameDiscoverer} to specify parameter names. This is
- * useful for interfaces prior to JDK 8 which cannot contain the parameter
- * names.
+ * An annotation that can be used along with {@link AnnotationParameterNameDiscoverer} to
+ * specify parameter names. This is useful for interfaces prior to JDK 8 which cannot
+ * contain the parameter names.
  *
  * @see AnnotationParameterNameDiscoverer
  *
@@ -39,9 +38,9 @@ import org.springframework.security.core.parameters.AnnotationParameterNameDisco
 @Documented
 public @interface P {
 
-    /**
-     * The parameter name
-     * @return
-     */
-    String value();
+	/**
+	 * The parameter name
+	 * @return
+	 */
+	String value();
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/access/method/package-info.java b/core/src/main/java/org/springframework/security/access/method/package-info.java
index 7ba2aff4a2..7c3a9f1848 100644
--- a/core/src/main/java/org/springframework/security/access/method/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/method/package-info.java
@@ -3,3 +3,4 @@
  * AOP libraries.
  */
 package org.springframework.security.access.method;
+
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java
index 6a698df580..1dcac06937 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java
@@ -8,18 +8,20 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation for specifying a method access-control expression which will be evaluated after a method has been invoked.
+ * Annotation for specifying a method access-control expression which will be evaluated
+ * after a method has been invoked.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface PostAuthorize {
-    /**
-     * @return the Spring-EL expression to be evaluated after invoking the protected method
-     */
-    public String value();
+	/**
+	 * @return the Spring-EL expression to be evaluated after invoking the protected
+	 * method
+	 */
+	public String value();
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java
index 7fe04dab55..d844ce454f 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java
@@ -8,18 +8,20 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation for specifying a method filtering expression which will be evaluated after a method has been invoked.
+ * Annotation for specifying a method filtering expression which will be evaluated after a
+ * method has been invoked.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface PostFilter {
-    /**
-     * @return the Spring-EL expression to be evaluated after invoking the protected method
-     */
-    public String value();
+	/**
+	 * @return the Spring-EL expression to be evaluated after invoking the protected
+	 * method
+	 */
+	public String value();
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
index 55a6d88e0c..bc31adb92c 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAdviceProvider.java
@@ -11,48 +11,53 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 /**
- * <tt>AfterInvocationProvider</tt> which delegates to a {@link PostInvocationAuthorizationAdvice} instance
- * passing it the <tt>PostInvocationAttribute</tt> created from @PostAuthorize and @PostFilter annotations.
+ * <tt>AfterInvocationProvider</tt> which delegates to a
+ * {@link PostInvocationAuthorizationAdvice} instance passing it the
+ * <tt>PostInvocationAttribute</tt> created from @PostAuthorize and @PostFilter
+ * annotations.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class PostInvocationAdviceProvider implements AfterInvocationProvider {
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final PostInvocationAuthorizationAdvice postAdvice;
+	private final PostInvocationAuthorizationAdvice postAdvice;
 
-    public PostInvocationAdviceProvider(PostInvocationAuthorizationAdvice postAdvice) {
-        this.postAdvice = postAdvice;
-    }
+	public PostInvocationAdviceProvider(PostInvocationAuthorizationAdvice postAdvice) {
+		this.postAdvice = postAdvice;
+	}
 
-    public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config, Object returnedObject)
-            throws AccessDeniedException {
+	public Object decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> config, Object returnedObject)
+			throws AccessDeniedException {
 
-        PostInvocationAttribute pia = findPostInvocationAttribute(config);
+		PostInvocationAttribute pia = findPostInvocationAttribute(config);
 
-        if (pia == null) {
-            return returnedObject;
-        }
+		if (pia == null) {
+			return returnedObject;
+		}
 
-        return postAdvice.after(authentication, (MethodInvocation)object, pia, returnedObject);
-    }
+		return postAdvice.after(authentication, (MethodInvocation) object, pia,
+				returnedObject);
+	}
 
-    private PostInvocationAttribute findPostInvocationAttribute(Collection<ConfigAttribute> config) {
-        for (ConfigAttribute attribute : config) {
-            if (attribute instanceof PostInvocationAttribute) {
-                return (PostInvocationAttribute)attribute;
-            }
-        }
+	private PostInvocationAttribute findPostInvocationAttribute(
+			Collection<ConfigAttribute> config) {
+		for (ConfigAttribute attribute : config) {
+			if (attribute instanceof PostInvocationAttribute) {
+				return (PostInvocationAttribute) attribute;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof PostInvocationAttribute;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return attribute instanceof PostInvocationAttribute;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return clazz.isAssignableFrom(MethodInvocation.class);
-    }
+	public boolean supports(Class<?> clazz) {
+		return clazz.isAssignableFrom(MethodInvocation.class);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAttribute.java b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAttribute.java
index 9474f05533..2be8b145a4 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAttribute.java
@@ -3,7 +3,8 @@ package org.springframework.security.access.prepost;
 import org.springframework.security.access.ConfigAttribute;
 
 /**
- * Marker interface for attributes which are created from combined @PostFilter and @PostAuthorize annotations.
+ * Marker interface for attributes which are created from combined @PostFilter and @PostAuthorize
+ * annotations.
  * <p>
  * Consumed by a {@link PostInvocationAuthorizationAdvice}.
  *
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAuthorizationAdvice.java b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAuthorizationAdvice.java
index e968bb8079..fb55535183 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAuthorizationAdvice.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PostInvocationAuthorizationAdvice.java
@@ -13,6 +13,7 @@ import org.springframework.security.core.Authentication;
  */
 public interface PostInvocationAuthorizationAdvice extends AopInfrastructureBean {
 
-    Object after(Authentication authentication, MethodInvocation mi,
-            PostInvocationAttribute pia, Object returnedObject) throws AccessDeniedException;
+	Object after(Authentication authentication, MethodInvocation mi,
+			PostInvocationAttribute pia, Object returnedObject)
+			throws AccessDeniedException;
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreAuthorize.java b/core/src/main/java/org/springframework/security/access/prepost/PreAuthorize.java
index e9aec5943d..e87ddf55f2 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PreAuthorize.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PreAuthorize.java
@@ -8,19 +8,20 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation for specifying a method access-control expression which will be evaluated to decide whether a
- * method invocation is allowed or not.
+ * Annotation for specifying a method access-control expression which will be evaluated to
+ * decide whether a method invocation is allowed or not.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface PreAuthorize {
-    /**
-     * @return the Spring-EL expression to be evaluated before invoking the protected method
-     */
-    String value();
+	/**
+	 * @return the Spring-EL expression to be evaluated before invoking the protected
+	 * method
+	 */
+	String value();
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java
index f156439b9f..bed6fa629d 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java
@@ -8,35 +8,39 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotation for specifying a method filtering expression which will be evaluated before a method has been invoked.
- * The name of the argument to be filtered is specified using the <tt>filterTarget</tt> attribute. This must be a
- * Java Collection implementation which supports the {@link java.util.Collection#remove(Object) remove} method.
- * Pre-filtering isn't supported on array types and will fail if the value of named filter target argument is null
- * at runtime.
+ * Annotation for specifying a method filtering expression which will be evaluated before
+ * a method has been invoked. The name of the argument to be filtered is specified using
+ * the <tt>filterTarget</tt> attribute. This must be a Java Collection implementation
+ * which supports the {@link java.util.Collection#remove(Object) remove} method.
+ * Pre-filtering isn't supported on array types and will fail if the value of named filter
+ * target argument is null at runtime.
  * <p>
- * For methods which have a single argument which is a collection type, this argument will be used as the filter
- * target.
+ * For methods which have a single argument which is a collection type, this argument will
+ * be used as the filter target.
  * <p>
- * The annotation value contains the expression which will be evaluated for each element in the collection. If the
- * expression evaluates to false, the element will be removed. The reserved name "filterObject" can be used within the
- * expression to refer to the current object which is being evaluated.
+ * The annotation value contains the expression which will be evaluated for each element
+ * in the collection. If the expression evaluates to false, the element will be removed.
+ * The reserved name "filterObject" can be used within the expression to refer to the
+ * current object which is being evaluated.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface PreFilter {
-    /**
-     * @return the Spring-EL expression to be evaluated before invoking the protected method
-     */
-    public String value();
+	/**
+	 * @return the Spring-EL expression to be evaluated before invoking the protected
+	 * method
+	 */
+	public String value();
 
-    /**
-     * @return the name of the parameter which should be filtered (must be a non-null collection instance)
-     * If the method contains a single collection argument, then this attribute can be omitted.
-     */
-    public String filterTarget() default "";
+	/**
+	 * @return the name of the parameter which should be filtered (must be a non-null
+	 * collection instance) If the method contains a single collection argument, then this
+	 * attribute can be omitted.
+	 */
+	public String filterTarget() default "";
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAttribute.java b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAttribute.java
index 622695f45e..772ee3ebe5 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAttribute.java
@@ -3,13 +3,14 @@ package org.springframework.security.access.prepost;
 import org.springframework.security.access.ConfigAttribute;
 
 /**
- * Marker interface for attributes which are created from combined @PreFilter and @PreAuthorize annotations.
+ * Marker interface for attributes which are created from combined @PreFilter and @PreAuthorize
+ * annotations.
  * <p>
  * Consumed by a {@link PreInvocationAuthorizationAdvice}.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public interface PreInvocationAttribute extends ConfigAttribute{
+public interface PreInvocationAttribute extends ConfigAttribute {
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdvice.java b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdvice.java
index 490fac6e67..ba16d63b43 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdvice.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdvice.java
@@ -12,14 +12,17 @@ import org.springframework.security.core.Authentication;
  */
 public interface PreInvocationAuthorizationAdvice extends AopInfrastructureBean {
 
-    /**
-     * The "before" advice which should be executed to perform any filtering necessary and to decide whether
-     * the method call is authorised.
-     *
-     * @param authentication the information on the principal on whose account the decision should be made
-     * @param mi the method invocation being attempted
-     * @param preInvocationAttribute the attribute built from the @PreFilter and @PostFilter annotations.
-     * @return true if authorised, false otherwise
-     */
-    boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preInvocationAttribute);
+	/**
+	 * The "before" advice which should be executed to perform any filtering necessary and
+	 * to decide whether the method call is authorised.
+	 *
+	 * @param authentication the information on the principal on whose account the
+	 * decision should be made
+	 * @param mi the method invocation being attempted
+	 * @param preInvocationAttribute the attribute built from the @PreFilter and @PostFilter
+	 * annotations.
+	 * @return true if authorised, false otherwise
+	 */
+	boolean before(Authentication authentication, MethodInvocation mi,
+			PreInvocationAttribute preInvocationAttribute);
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java
index ea526d1f62..279173e353 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoter.java
@@ -10,59 +10,63 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 /**
- * Voter which performs the actions using a PreInvocationAuthorizationAdvice implementation
- * generated from @PreFilter and @PreAuthorize annotations.
+ * Voter which performs the actions using a PreInvocationAuthorizationAdvice
+ * implementation generated from @PreFilter and @PreAuthorize annotations.
  * <p>
- * In practice, if these annotations are being used, they will normally contain all the necessary
- * access control logic, so a voter-based system is not really necessary and a single <tt>AccessDecisionManager</tt>
- * which contained the same logic would suffice. However, this class fits in readily with the traditional
- * voter-based <tt>AccessDecisionManager</tt> implementations used by Spring Security.
+ * In practice, if these annotations are being used, they will normally contain all the
+ * necessary access control logic, so a voter-based system is not really necessary and a
+ * single <tt>AccessDecisionManager</tt> which contained the same logic would suffice.
+ * However, this class fits in readily with the traditional voter-based
+ * <tt>AccessDecisionManager</tt> implementations used by Spring Security.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class PreInvocationAuthorizationAdviceVoter implements AccessDecisionVoter<MethodInvocation> {
-    protected final Log logger = LogFactory.getLog(getClass());
+public class PreInvocationAuthorizationAdviceVoter implements
+		AccessDecisionVoter<MethodInvocation> {
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final PreInvocationAuthorizationAdvice preAdvice;
+	private final PreInvocationAuthorizationAdvice preAdvice;
 
-    public PreInvocationAuthorizationAdviceVoter(PreInvocationAuthorizationAdvice pre) {
-        this.preAdvice = pre;
-    }
+	public PreInvocationAuthorizationAdviceVoter(PreInvocationAuthorizationAdvice pre) {
+		this.preAdvice = pre;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof PreInvocationAttribute;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return attribute instanceof PreInvocationAttribute;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return MethodInvocation.class.isAssignableFrom(clazz);
-    }
+	public boolean supports(Class<?> clazz) {
+		return MethodInvocation.class.isAssignableFrom(clazz);
+	}
 
-    public int vote(Authentication authentication, MethodInvocation method, Collection<ConfigAttribute> attributes) {
+	public int vote(Authentication authentication, MethodInvocation method,
+			Collection<ConfigAttribute> attributes) {
 
-        // Find prefilter and preauth (or combined) attributes
-        // if both null, abstain
-        // else call advice with them
+		// Find prefilter and preauth (or combined) attributes
+		// if both null, abstain
+		// else call advice with them
 
-        PreInvocationAttribute preAttr = findPreInvocationAttribute(attributes);
+		PreInvocationAttribute preAttr = findPreInvocationAttribute(attributes);
 
-        if (preAttr == null) {
-            // No expression based metadata, so abstain
-            return ACCESS_ABSTAIN;
-        }
+		if (preAttr == null) {
+			// No expression based metadata, so abstain
+			return ACCESS_ABSTAIN;
+		}
 
-        boolean allowed = preAdvice.before(authentication, method, preAttr);
+		boolean allowed = preAdvice.before(authentication, method, preAttr);
 
-        return allowed ? ACCESS_GRANTED : ACCESS_DENIED;
-    }
+		return allowed ? ACCESS_GRANTED : ACCESS_DENIED;
+	}
 
-    private PreInvocationAttribute findPreInvocationAttribute(Collection<ConfigAttribute> config) {
-        for (ConfigAttribute attribute : config) {
-            if (attribute instanceof PreInvocationAttribute) {
-                return (PreInvocationAttribute)attribute;
-            }
-        }
+	private PreInvocationAttribute findPreInvocationAttribute(
+			Collection<ConfigAttribute> config) {
+		for (ConfigAttribute attribute : config) {
+			if (attribute instanceof PreInvocationAttribute) {
+				return (PreInvocationAttribute) attribute;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
index d8f852e9f8..a337b7d55f 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
@@ -10,114 +10,131 @@ import org.springframework.security.access.method.AbstractMethodSecurityMetadata
 import org.springframework.util.ClassUtils;
 
 /**
- * <tt>MethodSecurityMetadataSource</tt> which extracts metadata from the @PreFilter and @PreAuthorize annotations
- * placed on a method. This class is merely responsible for locating the relevant annotations (if any). It delegates
- * the actual <tt>ConfigAttribute</tt> creation to its {@link PrePostInvocationAttributeFactory}, thus
- * decoupling itself from the mechanism which will enforce the annotations' behaviour.
+ * <tt>MethodSecurityMetadataSource</tt> which extracts metadata from the @PreFilter and @PreAuthorize
+ * annotations placed on a method. This class is merely responsible for locating the
+ * relevant annotations (if any). It delegates the actual <tt>ConfigAttribute</tt>
+ * creation to its {@link PrePostInvocationAttributeFactory}, thus decoupling itself from
+ * the mechanism which will enforce the annotations' behaviour.
  * <p>
- * Annotations may be specified on classes or methods, and method-specific annotations will take precedence.
- * If you use any annotation and do not specify a pre-authorization condition, then the method will be
- * allowed as if a @PreAuthorize("permitAll") were present.
+ * Annotations may be specified on classes or methods, and method-specific annotations
+ * will take precedence. If you use any annotation and do not specify a pre-authorization
+ * condition, then the method will be allowed as if a @PreAuthorize("permitAll") were
+ * present.
  * <p>
- * Since we are handling multiple annotations here, it's possible that we may have to combine annotations defined in
- * multiple locations for a single method - they may be defined on the method itself, or at interface or class level.
+ * Since we are handling multiple annotations here, it's possible that we may have to
+ * combine annotations defined in multiple locations for a single method - they may be
+ * defined on the method itself, or at interface or class level.
  *
  * @see PreInvocationAuthorizationAdviceVoter
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class PrePostAnnotationSecurityMetadataSource extends AbstractMethodSecurityMetadataSource {
+public class PrePostAnnotationSecurityMetadataSource extends
+		AbstractMethodSecurityMetadataSource {
 
-    private final PrePostInvocationAttributeFactory attributeFactory;
+	private final PrePostInvocationAttributeFactory attributeFactory;
 
-    public PrePostAnnotationSecurityMetadataSource(PrePostInvocationAttributeFactory attributeFactory) {
-        this.attributeFactory = attributeFactory;
-    }
+	public PrePostAnnotationSecurityMetadataSource(
+			PrePostInvocationAttributeFactory attributeFactory) {
+		this.attributeFactory = attributeFactory;
+	}
 
-    public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
-        if (method.getDeclaringClass() == Object.class) {
-            return Collections.emptyList();
-        }
+	public Collection<ConfigAttribute> getAttributes(Method method, Class<?> targetClass) {
+		if (method.getDeclaringClass() == Object.class) {
+			return Collections.emptyList();
+		}
 
-        logger.trace("Looking for Pre/Post annotations for method '" +
-                method.getName() + "' on target class '" + targetClass + "'");
-        PreFilter preFilter = findAnnotation(method, targetClass, PreFilter.class);
-        PreAuthorize preAuthorize = findAnnotation(method, targetClass, PreAuthorize.class);
-        PostFilter postFilter = findAnnotation(method, targetClass, PostFilter.class);
-     // TODO: Can we check for void methods and throw an exception here?
-        PostAuthorize postAuthorize = findAnnotation(method, targetClass, PostAuthorize.class);
+		logger.trace("Looking for Pre/Post annotations for method '" + method.getName()
+				+ "' on target class '" + targetClass + "'");
+		PreFilter preFilter = findAnnotation(method, targetClass, PreFilter.class);
+		PreAuthorize preAuthorize = findAnnotation(method, targetClass,
+				PreAuthorize.class);
+		PostFilter postFilter = findAnnotation(method, targetClass, PostFilter.class);
+		// TODO: Can we check for void methods and throw an exception here?
+		PostAuthorize postAuthorize = findAnnotation(method, targetClass,
+				PostAuthorize.class);
 
-        if (preFilter == null && preAuthorize == null && postFilter == null && postAuthorize == null ) {
-            // There is no meta-data so return
-            logger.trace("No expression annotations found");
-            return Collections.emptyList();
-        }
+		if (preFilter == null && preAuthorize == null && postFilter == null
+				&& postAuthorize == null) {
+			// There is no meta-data so return
+			logger.trace("No expression annotations found");
+			return Collections.emptyList();
+		}
 
-        String preFilterAttribute = preFilter == null ? null : preFilter.value();
-        String filterObject = preFilter == null ? null : preFilter.filterTarget();
-        String preAuthorizeAttribute = preAuthorize == null ? null : preAuthorize.value();
-        String postFilterAttribute = postFilter == null ? null : postFilter.value();
-        String postAuthorizeAttribute = postAuthorize == null ? null : postAuthorize.value();
+		String preFilterAttribute = preFilter == null ? null : preFilter.value();
+		String filterObject = preFilter == null ? null : preFilter.filterTarget();
+		String preAuthorizeAttribute = preAuthorize == null ? null : preAuthorize.value();
+		String postFilterAttribute = postFilter == null ? null : postFilter.value();
+		String postAuthorizeAttribute = postAuthorize == null ? null : postAuthorize
+				.value();
 
-        ArrayList<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>(2);
+		ArrayList<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>(2);
 
-        PreInvocationAttribute pre = attributeFactory.createPreInvocationAttribute(preFilterAttribute, filterObject, preAuthorizeAttribute);
+		PreInvocationAttribute pre = attributeFactory.createPreInvocationAttribute(
+				preFilterAttribute, filterObject, preAuthorizeAttribute);
 
-        if (pre != null) {
-            attrs.add(pre);
-        }
+		if (pre != null) {
+			attrs.add(pre);
+		}
 
-        PostInvocationAttribute post = attributeFactory.createPostInvocationAttribute(postFilterAttribute, postAuthorizeAttribute);
+		PostInvocationAttribute post = attributeFactory.createPostInvocationAttribute(
+				postFilterAttribute, postAuthorizeAttribute);
 
-        if (post != null) {
-            attrs.add(post);
-        }
+		if (post != null) {
+			attrs.add(post);
+		}
 
-        attrs.trimToSize();
+		attrs.trimToSize();
 
-        return attrs;
-    }
+		return attrs;
+	}
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        return null;
-    }
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		return null;
+	}
 
-    /**
-     * See {@link org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource#getAttributes(Method, Class)}
-     * for the logic of this method. The ordering here is slightly different in that we consider method-specific
-     * annotations on an interface before class-level ones.
-     */
-    private <A  extends Annotation> A findAnnotation(Method method, Class<?> targetClass, Class<A> annotationClass) {
-        // The method may be on an interface, but we need attributes from the target class.
-        // If the target class is null, the method will be unchanged.
-        Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass);
-        A annotation = AnnotationUtils.findAnnotation(specificMethod, annotationClass);
+	/**
+	 * See
+	 * {@link org.springframework.security.access.method.AbstractFallbackMethodSecurityMetadataSource#getAttributes(Method, Class)}
+	 * for the logic of this method. The ordering here is slightly different in that we
+	 * consider method-specific annotations on an interface before class-level ones.
+	 */
+	private <A extends Annotation> A findAnnotation(Method method, Class<?> targetClass,
+			Class<A> annotationClass) {
+		// The method may be on an interface, but we need attributes from the target
+		// class.
+		// If the target class is null, the method will be unchanged.
+		Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass);
+		A annotation = AnnotationUtils.findAnnotation(specificMethod, annotationClass);
 
-        if (annotation != null) {
-            logger.debug(annotation + " found on specific method: " + specificMethod);
-            return annotation;
-        }
+		if (annotation != null) {
+			logger.debug(annotation + " found on specific method: " + specificMethod);
+			return annotation;
+		}
 
-        // Check the original (e.g. interface) method
-        if (specificMethod != method) {
-            annotation = AnnotationUtils.findAnnotation(method, annotationClass);
+		// Check the original (e.g. interface) method
+		if (specificMethod != method) {
+			annotation = AnnotationUtils.findAnnotation(method, annotationClass);
 
-            if (annotation != null) {
-                logger.debug(annotation + " found on: " + method);
-                return annotation;
-            }
-        }
+			if (annotation != null) {
+				logger.debug(annotation + " found on: " + method);
+				return annotation;
+			}
+		}
 
-        // Check the class-level (note declaringClass, not targetClass, which may not actually implement the method)
-        annotation = AnnotationUtils.findAnnotation(specificMethod.getDeclaringClass(), annotationClass);
+		// Check the class-level (note declaringClass, not targetClass, which may not
+		// actually implement the method)
+		annotation = AnnotationUtils.findAnnotation(specificMethod.getDeclaringClass(),
+				annotationClass);
 
-        if (annotation != null) {
-            logger.debug(annotation + " found on: " + specificMethod.getDeclaringClass().getName());
-            return annotation;
-        }
+		if (annotation != null) {
+			logger.debug(annotation + " found on: "
+					+ specificMethod.getDeclaringClass().getName());
+			return annotation;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java
index c353a073b3..2b4d6217b6 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostInvocationAttributeFactory.java
@@ -9,7 +9,9 @@ import org.springframework.aop.framework.AopInfrastructureBean;
  */
 public interface PrePostInvocationAttributeFactory extends AopInfrastructureBean {
 
-    PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute, String filterObject, String preAuthorizeAttribute);
+	PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute,
+			String filterObject, String preAuthorizeAttribute);
 
-    PostInvocationAttribute createPostInvocationAttribute(String postFilterAttribute, String postAuthorizeAttribute);
+	PostInvocationAttribute createPostInvocationAttribute(String postFilterAttribute,
+			String postAuthorizeAttribute);
 }
diff --git a/core/src/main/java/org/springframework/security/access/prepost/package-info.java b/core/src/main/java/org/springframework/security/access/prepost/package-info.java
index d283b8c2a4..962df68ee4 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/package-info.java
@@ -6,3 +6,4 @@
  * are liable to change without notice.
  */
 package org.springframework.security.access.prepost;
+
diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
index 4ad1bd05e6..4242aa64ed 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java
@@ -34,83 +34,88 @@ import org.springframework.util.Assert;
 /**
  * Abstract implementation of {@link AccessDecisionManager}.
  * <p/>
- * Handles configuration of a bean context defined list of
- * {@link AccessDecisionVoter}s and the access control behaviour if all voters
- * abstain from voting (defaults to deny access).
+ * Handles configuration of a bean context defined list of {@link AccessDecisionVoter}s
+ * and the access control behaviour if all voters abstain from voting (defaults to deny
+ * access).
  * </p>
  */
-public abstract class AbstractAccessDecisionManager implements AccessDecisionManager, InitializingBean,
-        MessageSourceAware {
-    //~ Instance fields ================================================================================================
-    protected final Log logger = LogFactory.getLog(getClass());
+public abstract class AbstractAccessDecisionManager implements AccessDecisionManager,
+		InitializingBean, MessageSourceAware {
+	// ~ Instance fields
+	// ================================================================================================
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private List<AccessDecisionVoter<? extends Object>> decisionVoters;
+	private List<AccessDecisionVoter<? extends Object>> decisionVoters;
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-    private boolean allowIfAllAbstainDecisions = false;
+	private boolean allowIfAllAbstainDecisions = false;
 
-    protected AbstractAccessDecisionManager(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
-        Assert.notEmpty(decisionVoters, "A list of AccessDecisionVoters is required");
-        this.decisionVoters = decisionVoters;
-    }
+	protected AbstractAccessDecisionManager(
+			List<AccessDecisionVoter<? extends Object>> decisionVoters) {
+		Assert.notEmpty(decisionVoters, "A list of AccessDecisionVoters is required");
+		this.decisionVoters = decisionVoters;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notEmpty(this.decisionVoters, "A list of AccessDecisionVoters is required");
-        Assert.notNull(this.messages, "A message source must be set");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notEmpty(this.decisionVoters, "A list of AccessDecisionVoters is required");
+		Assert.notNull(this.messages, "A message source must be set");
+	}
 
-    protected final void checkAllowIfAllAbstainDecisions() {
-        if (!this.isAllowIfAllAbstainDecisions()) {
-            throw new AccessDeniedException(messages.getMessage("AbstractAccessDecisionManager.accessDenied",
-                    "Access is denied"));
-        }
-    }
+	protected final void checkAllowIfAllAbstainDecisions() {
+		if (!this.isAllowIfAllAbstainDecisions()) {
+			throw new AccessDeniedException(messages.getMessage(
+					"AbstractAccessDecisionManager.accessDenied", "Access is denied"));
+		}
+	}
 
-    public List<AccessDecisionVoter<? extends Object>> getDecisionVoters() {
-        return this.decisionVoters;
-    }
+	public List<AccessDecisionVoter<? extends Object>> getDecisionVoters() {
+		return this.decisionVoters;
+	}
 
-    public boolean isAllowIfAllAbstainDecisions() {
-        return allowIfAllAbstainDecisions;
-    }
+	public boolean isAllowIfAllAbstainDecisions() {
+		return allowIfAllAbstainDecisions;
+	}
 
-    public void setAllowIfAllAbstainDecisions(boolean allowIfAllAbstainDecisions) {
-        this.allowIfAllAbstainDecisions = allowIfAllAbstainDecisions;
-    }
+	public void setAllowIfAllAbstainDecisions(boolean allowIfAllAbstainDecisions) {
+		this.allowIfAllAbstainDecisions = allowIfAllAbstainDecisions;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        for (AccessDecisionVoter voter : this.decisionVoters) {
-            if (voter.supports(attribute)) {
-                return true;
-            }
-        }
+	public boolean supports(ConfigAttribute attribute) {
+		for (AccessDecisionVoter voter : this.decisionVoters) {
+			if (voter.supports(attribute)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Iterates through all <code>AccessDecisionVoter</code>s and ensures each can support the presented class.
-     * <p/>
-     * If one or more voters cannot support the presented class, <code>false</code> is returned.
-     * </p>
-     *
-     * @param clazz the type of secured object being presented
-     * @return true if this type is supported
-     */
-    public boolean supports(Class<?> clazz) {
-        for (AccessDecisionVoter voter : this.decisionVoters) {
-            if (!voter.supports(clazz)) {
-                return false;
-            }
-        }
+	/**
+	 * Iterates through all <code>AccessDecisionVoter</code>s and ensures each can support
+	 * the presented class.
+	 * <p/>
+	 * If one or more voters cannot support the presented class, <code>false</code> is
+	 * returned.
+	 * </p>
+	 *
+	 * @param clazz the type of secured object being presented
+	 * @return true if this type is supported
+	 */
+	public boolean supports(Class<?> clazz) {
+		for (AccessDecisionVoter voter : this.decisionVoters) {
+			if (!voter.supports(clazz)) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java
index b24ef142da..eb4bbf6564 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAclVoter.java
@@ -19,55 +19,58 @@ import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AuthorizationServiceException;
 import org.springframework.util.Assert;
 
-
 /**
- * Provides helper methods for writing domain object ACL voters.
- * Not bound to any particular ACL system.
+ * Provides helper methods for writing domain object ACL voters. Not bound to any
+ * particular ACL system.
  *
  * @author Ben Alex
  */
 public abstract class AbstractAclVoter implements AccessDecisionVoter<MethodInvocation> {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Class<?> processDomainObjectClass;
+	private Class<?> processDomainObjectClass;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    protected Object getDomainObjectInstance(MethodInvocation invocation) {
-        Object[] args;
-        Class<?>[] params;
+	protected Object getDomainObjectInstance(MethodInvocation invocation) {
+		Object[] args;
+		Class<?>[] params;
 
-        params = invocation.getMethod().getParameterTypes();
-        args = invocation.getArguments();
+		params = invocation.getMethod().getParameterTypes();
+		args = invocation.getArguments();
 
-        for (int i = 0; i < params.length; i++) {
-            if (processDomainObjectClass.isAssignableFrom(params[i])) {
-                return args[i];
-            }
-        }
+		for (int i = 0; i < params.length; i++) {
+			if (processDomainObjectClass.isAssignableFrom(params[i])) {
+				return args[i];
+			}
+		}
 
-        throw new AuthorizationServiceException("MethodInvocation: " + invocation
-            + " did not provide any argument of type: " + processDomainObjectClass);
-    }
+		throw new AuthorizationServiceException("MethodInvocation: " + invocation
+				+ " did not provide any argument of type: " + processDomainObjectClass);
+	}
 
-    public Class<?> getProcessDomainObjectClass() {
-        return processDomainObjectClass;
-    }
+	public Class<?> getProcessDomainObjectClass() {
+		return processDomainObjectClass;
+	}
 
-    public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
-        Assert.notNull(processDomainObjectClass, "processDomainObjectClass cannot be set to null");
-        this.processDomainObjectClass = processDomainObjectClass;
-    }
+	public void setProcessDomainObjectClass(Class<?> processDomainObjectClass) {
+		Assert.notNull(processDomainObjectClass,
+				"processDomainObjectClass cannot be set to null");
+		this.processDomainObjectClass = processDomainObjectClass;
+	}
 
-    /**
-     * This implementation supports only <code>MethodSecurityInterceptor</code>, because it queries the
-     * presented <code>MethodInvocation</code>.
-     *
-     * @param clazz the secure object
-     *
-     * @return <code>true</code> if the secure object is <code>MethodInvocation</code>, <code>false</code> otherwise
-     */
-    public boolean supports(Class<?> clazz) {
-        return (MethodInvocation.class.isAssignableFrom(clazz));
-    }
+	/**
+	 * This implementation supports only <code>MethodSecurityInterceptor</code>, because
+	 * it queries the presented <code>MethodInvocation</code>.
+	 *
+	 * @param clazz the secure object
+	 *
+	 * @return <code>true</code> if the secure object is <code>MethodInvocation</code>,
+	 * <code>false</code> otherwise
+	 */
+	public boolean supports(Class<?> clazz) {
+		return (MethodInvocation.class.isAssignableFrom(clazz));
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
index b1699e796a..4d8f5910a5 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java
@@ -22,62 +22,69 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Simple concrete implementation of  {@link org.springframework.security.access.AccessDecisionManager} that grants access if any
- * <code>AccessDecisionVoter</code> returns an affirmative response.
+ * Simple concrete implementation of
+ * {@link org.springframework.security.access.AccessDecisionManager} that grants access if
+ * any <code>AccessDecisionVoter</code> returns an affirmative response.
  */
 public class AffirmativeBased extends AbstractAccessDecisionManager {
 
-    public AffirmativeBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
-        super(decisionVoters);
-    }
+	public AffirmativeBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
+		super(decisionVoters);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * This concrete implementation simply polls all configured  {@link AccessDecisionVoter}s and grants access
-     * if any <code>AccessDecisionVoter</code> voted affirmatively. Denies access only if there was a deny vote AND no
-     * affirmative votes.<p>If every <code>AccessDecisionVoter</code> abstained from voting, the decision will
-     * be based on the {@link #isAllowIfAllAbstainDecisions()} property (defaults to false).</p>
-     *
-     * @param authentication the caller invoking the method
-     * @param object the secured object
-     * @param configAttributes the configuration attributes associated with the method being invoked
-     *
-     * @throws AccessDeniedException if access is denied
-     */
-    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes)
-            throws AccessDeniedException {
-        int deny = 0;
+	/**
+	 * This concrete implementation simply polls all configured
+	 * {@link AccessDecisionVoter}s and grants access if any
+	 * <code>AccessDecisionVoter</code> voted affirmatively. Denies access only if there
+	 * was a deny vote AND no affirmative votes.
+	 * <p>
+	 * If every <code>AccessDecisionVoter</code> abstained from voting, the decision will
+	 * be based on the {@link #isAllowIfAllAbstainDecisions()} property (defaults to
+	 * false).
+	 * </p>
+	 *
+	 * @param authentication the caller invoking the method
+	 * @param object the secured object
+	 * @param configAttributes the configuration attributes associated with the method
+	 * being invoked
+	 *
+	 * @throws AccessDeniedException if access is denied
+	 */
+	public void decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> configAttributes) throws AccessDeniedException {
+		int deny = 0;
 
-        for (AccessDecisionVoter voter : getDecisionVoters()) {
-            int result = voter.vote(authentication, object, configAttributes);
+		for (AccessDecisionVoter voter : getDecisionVoters()) {
+			int result = voter.vote(authentication, object, configAttributes);
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Voter: " + voter + ", returned: " + result);
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Voter: " + voter + ", returned: " + result);
+			}
 
-            switch (result) {
-            case AccessDecisionVoter.ACCESS_GRANTED:
-                return;
+			switch (result) {
+			case AccessDecisionVoter.ACCESS_GRANTED:
+				return;
 
-            case AccessDecisionVoter.ACCESS_DENIED:
-                deny++;
+			case AccessDecisionVoter.ACCESS_DENIED:
+				deny++;
 
-                break;
+				break;
 
-            default:
-                break;
-            }
-        }
+			default:
+				break;
+			}
+		}
 
-        if (deny > 0) {
-            throw new AccessDeniedException(messages.getMessage("AbstractAccessDecisionManager.accessDenied",
-                    "Access is denied"));
-        }
+		if (deny > 0) {
+			throw new AccessDeniedException(messages.getMessage(
+					"AbstractAccessDecisionManager.accessDenied", "Access is denied"));
+		}
 
-        // To get this far, every AccessDecisionVoter abstained
-        checkAllowIfAllAbstainDecisions();
-    }
+		// To get this far, every AccessDecisionVoter abstained
+		checkAllowIfAllAbstainDecisions();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
index f08df32c74..5a14fdc0ce 100644
--- a/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/AuthenticatedVoter.java
@@ -24,96 +24,109 @@ import org.springframework.security.authentication.AuthenticationTrustResolverIm
 import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
-
 /**
- * Votes if a {@link ConfigAttribute#getAttribute()} of <code>IS_AUTHENTICATED_FULLY</code> or
- * <code>IS_AUTHENTICATED_REMEMBERED</code> or <code>IS_AUTHENTICATED_ANONYMOUSLY</code> is present. This list is in
- * order of most strict checking to least strict checking.
+ * Votes if a {@link ConfigAttribute#getAttribute()} of
+ * <code>IS_AUTHENTICATED_FULLY</code> or <code>IS_AUTHENTICATED_REMEMBERED</code> or
+ * <code>IS_AUTHENTICATED_ANONYMOUSLY</code> is present. This list is in order of most
+ * strict checking to least strict checking.
  * <p>
- * The current <code>Authentication</code> will be inspected to determine if the principal has a particular
- * level of authentication. The "FULLY" authenticated option means the user is authenticated fully (i.e. {@link
- * org.springframework.security.authentication.AuthenticationTrustResolver#isAnonymous(Authentication)} is false and {@link
- * org.springframework.security.authentication.AuthenticationTrustResolver#isRememberMe(Authentication)} is false). The "REMEMBERED" will grant
- * access if the principal was either authenticated via remember-me OR is fully authenticated. The "ANONYMOUSLY" will
- * grant access if the principal was authenticated via remember-me, OR anonymously, OR via full authentication.
+ * The current <code>Authentication</code> will be inspected to determine if the principal
+ * has a particular level of authentication. The "FULLY" authenticated option means the
+ * user is authenticated fully (i.e.
+ * {@link org.springframework.security.authentication.AuthenticationTrustResolver#isAnonymous(Authentication)}
+ * is false and
+ * {@link org.springframework.security.authentication.AuthenticationTrustResolver#isRememberMe(Authentication)}
+ * is false). The "REMEMBERED" will grant access if the principal was either authenticated
+ * via remember-me OR is fully authenticated. The "ANONYMOUSLY" will grant access if the
+ * principal was authenticated via remember-me, OR anonymously, OR via full
+ * authentication.
  * <p>
  * All comparisons and prefixes are case sensitive.
  *
  * @author Ben Alex
  */
 public class AuthenticatedVoter implements AccessDecisionVoter<Object> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    public static final String IS_AUTHENTICATED_FULLY = "IS_AUTHENTICATED_FULLY";
-    public static final String IS_AUTHENTICATED_REMEMBERED = "IS_AUTHENTICATED_REMEMBERED";
-    public static final String IS_AUTHENTICATED_ANONYMOUSLY = "IS_AUTHENTICATED_ANONYMOUSLY";
-    //~ Instance fields ================================================================================================
+	public static final String IS_AUTHENTICATED_FULLY = "IS_AUTHENTICATED_FULLY";
+	public static final String IS_AUTHENTICATED_REMEMBERED = "IS_AUTHENTICATED_REMEMBERED";
+	public static final String IS_AUTHENTICATED_ANONYMOUSLY = "IS_AUTHENTICATED_ANONYMOUSLY";
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private boolean isFullyAuthenticated(Authentication authentication) {
-        return (!authenticationTrustResolver.isAnonymous(authentication) &&
-                !authenticationTrustResolver.isRememberMe(authentication));
-    }
+	private boolean isFullyAuthenticated(Authentication authentication) {
+		return (!authenticationTrustResolver.isAnonymous(authentication) && !authenticationTrustResolver
+				.isRememberMe(authentication));
+	}
 
-    public void setAuthenticationTrustResolver(AuthenticationTrustResolver authenticationTrustResolver) {
-        Assert.notNull(authenticationTrustResolver, "AuthenticationTrustResolver cannot be set to null");
-        this.authenticationTrustResolver = authenticationTrustResolver;
-    }
+	public void setAuthenticationTrustResolver(
+			AuthenticationTrustResolver authenticationTrustResolver) {
+		Assert.notNull(authenticationTrustResolver,
+				"AuthenticationTrustResolver cannot be set to null");
+		this.authenticationTrustResolver = authenticationTrustResolver;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        if ((attribute.getAttribute() != null)
-            && (IS_AUTHENTICATED_FULLY.equals(attribute.getAttribute())
-            || IS_AUTHENTICATED_REMEMBERED.equals(attribute.getAttribute())
-            || IS_AUTHENTICATED_ANONYMOUSLY.equals(attribute.getAttribute()))) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		if ((attribute.getAttribute() != null)
+				&& (IS_AUTHENTICATED_FULLY.equals(attribute.getAttribute())
+						|| IS_AUTHENTICATED_REMEMBERED.equals(attribute.getAttribute()) || IS_AUTHENTICATED_ANONYMOUSLY
+							.equals(attribute.getAttribute()))) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 
-    /**
-     * This implementation supports any type of class, because it does not query the presented secure object.
-     *
-     * @param clazz the secure object type
-     *
-     * @return always {@code true}
-     */
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	/**
+	 * This implementation supports any type of class, because it does not query the
+	 * presented secure object.
+	 *
+	 * @param clazz the secure object type
+	 *
+	 * @return always {@code true}
+	 */
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
-    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-        int result = ACCESS_ABSTAIN;
+	public int vote(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) {
+		int result = ACCESS_ABSTAIN;
 
-        for (ConfigAttribute attribute : attributes) {
-            if (this.supports(attribute)) {
-                result = ACCESS_DENIED;
+		for (ConfigAttribute attribute : attributes) {
+			if (this.supports(attribute)) {
+				result = ACCESS_DENIED;
 
-                if (IS_AUTHENTICATED_FULLY.equals(attribute.getAttribute())) {
-                    if (isFullyAuthenticated(authentication)) {
-                        return ACCESS_GRANTED;
-                    }
-                }
+				if (IS_AUTHENTICATED_FULLY.equals(attribute.getAttribute())) {
+					if (isFullyAuthenticated(authentication)) {
+						return ACCESS_GRANTED;
+					}
+				}
 
-                if (IS_AUTHENTICATED_REMEMBERED.equals(attribute.getAttribute())) {
-                    if (authenticationTrustResolver.isRememberMe(authentication)
-                        || isFullyAuthenticated(authentication)) {
-                        return ACCESS_GRANTED;
-                    }
-                }
+				if (IS_AUTHENTICATED_REMEMBERED.equals(attribute.getAttribute())) {
+					if (authenticationTrustResolver.isRememberMe(authentication)
+							|| isFullyAuthenticated(authentication)) {
+						return ACCESS_GRANTED;
+					}
+				}
 
-                if (IS_AUTHENTICATED_ANONYMOUSLY.equals(attribute.getAttribute())) {
-                    if (authenticationTrustResolver.isAnonymous(authentication) || isFullyAuthenticated(authentication)
-                        || authenticationTrustResolver.isRememberMe(authentication)) {
-                        return ACCESS_GRANTED;
-                    }
-                }
-            }
-        }
+				if (IS_AUTHENTICATED_ANONYMOUSLY.equals(attribute.getAttribute())) {
+					if (authenticationTrustResolver.isAnonymous(authentication)
+							|| isFullyAuthenticated(authentication)
+							|| authenticationTrustResolver.isRememberMe(authentication)) {
+						return ACCESS_GRANTED;
+					}
+				}
+			}
+		}
 
-        return result;
-    }
+		return result;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java
index 716744fbbc..672b9e3726 100644
--- a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java
@@ -23,97 +23,106 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
 /**
- * Simple concrete implementation of  {@link org.springframework.security.access.AccessDecisionManager} that uses a
+ * Simple concrete implementation of
+ * {@link org.springframework.security.access.AccessDecisionManager} that uses a
  * consensus-based approach.
  * <p>
- * "Consensus" here means majority-rule (ignoring abstains) rather than unanimous agreement (ignoring abstains).
- * If you require unanimity, please see {@link UnanimousBased}.
+ * "Consensus" here means majority-rule (ignoring abstains) rather than unanimous
+ * agreement (ignoring abstains). If you require unanimity, please see
+ * {@link UnanimousBased}.
  */
 public class ConsensusBased extends AbstractAccessDecisionManager {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private boolean allowIfEqualGrantedDeniedDecisions = true;
+	private boolean allowIfEqualGrantedDeniedDecisions = true;
 
-    public ConsensusBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
-        super(decisionVoters);
-    }
+	public ConsensusBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
+		super(decisionVoters);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * This concrete implementation simply polls all configured  {@link AccessDecisionVoter}s and upon
-     * completion determines the consensus of granted against denied responses.
-     * <p>
-     * If there were an equal number of grant and deny votes, the decision will be based on the
-     * {@link #isAllowIfEqualGrantedDeniedDecisions()} property (defaults to true).
-     * <p>
-     * If every <code>AccessDecisionVoter</code> abstained from voting, the decision will be based on the
-     * {@link #isAllowIfAllAbstainDecisions()} property (defaults to false).
-     *
-     * @param authentication the caller invoking the method
-     * @param object the secured object
-     * @param configAttributes the configuration attributes associated with the method being invoked
-     *
-     * @throws AccessDeniedException if access is denied
-     */
-    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes)
-            throws AccessDeniedException {
-        int grant = 0;
-        int deny = 0;
-        int abstain = 0;
+	/**
+	 * This concrete implementation simply polls all configured
+	 * {@link AccessDecisionVoter}s and upon completion determines the consensus of
+	 * granted against denied responses.
+	 * <p>
+	 * If there were an equal number of grant and deny votes, the decision will be based
+	 * on the {@link #isAllowIfEqualGrantedDeniedDecisions()} property (defaults to true).
+	 * <p>
+	 * If every <code>AccessDecisionVoter</code> abstained from voting, the decision will
+	 * be based on the {@link #isAllowIfAllAbstainDecisions()} property (defaults to
+	 * false).
+	 *
+	 * @param authentication the caller invoking the method
+	 * @param object the secured object
+	 * @param configAttributes the configuration attributes associated with the method
+	 * being invoked
+	 *
+	 * @throws AccessDeniedException if access is denied
+	 */
+	public void decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> configAttributes) throws AccessDeniedException {
+		int grant = 0;
+		int deny = 0;
+		int abstain = 0;
 
-        for (AccessDecisionVoter voter :  getDecisionVoters()) {
-            int result = voter.vote(authentication, object, configAttributes);
+		for (AccessDecisionVoter voter : getDecisionVoters()) {
+			int result = voter.vote(authentication, object, configAttributes);
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Voter: " + voter + ", returned: " + result);
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Voter: " + voter + ", returned: " + result);
+			}
 
-            switch (result) {
-            case AccessDecisionVoter.ACCESS_GRANTED:
-                grant++;
+			switch (result) {
+			case AccessDecisionVoter.ACCESS_GRANTED:
+				grant++;
 
-                break;
+				break;
 
-            case AccessDecisionVoter.ACCESS_DENIED:
-                deny++;
+			case AccessDecisionVoter.ACCESS_DENIED:
+				deny++;
 
-                break;
+				break;
 
-            default:
-                abstain++;
+			default:
+				abstain++;
 
-                break;
-            }
-        }
+				break;
+			}
+		}
 
-        if (grant > deny) {
-            return;
-        }
+		if (grant > deny) {
+			return;
+		}
 
-        if (deny > grant) {
-            throw new AccessDeniedException(messages.getMessage("AbstractAccessDecisionManager.accessDenied",
-                    "Access is denied"));
-        }
+		if (deny > grant) {
+			throw new AccessDeniedException(messages.getMessage(
+					"AbstractAccessDecisionManager.accessDenied", "Access is denied"));
+		}
 
-        if ((grant == deny) && (grant != 0)) {
-            if (this.allowIfEqualGrantedDeniedDecisions) {
-                return;
-            } else {
-                throw new AccessDeniedException(messages.getMessage("AbstractAccessDecisionManager.accessDenied",
-                        "Access is denied"));
-            }
-        }
+		if ((grant == deny) && (grant != 0)) {
+			if (this.allowIfEqualGrantedDeniedDecisions) {
+				return;
+			}
+			else {
+				throw new AccessDeniedException(messages.getMessage(
+						"AbstractAccessDecisionManager.accessDenied", "Access is denied"));
+			}
+		}
 
-        // To get this far, every AccessDecisionVoter abstained
-        checkAllowIfAllAbstainDecisions();
-    }
+		// To get this far, every AccessDecisionVoter abstained
+		checkAllowIfAllAbstainDecisions();
+	}
 
-    public boolean isAllowIfEqualGrantedDeniedDecisions() {
-        return allowIfEqualGrantedDeniedDecisions;
-    }
+	public boolean isAllowIfEqualGrantedDeniedDecisions() {
+		return allowIfEqualGrantedDeniedDecisions;
+	}
 
-    public void setAllowIfEqualGrantedDeniedDecisions(boolean allowIfEqualGrantedDeniedDecisions) {
-        this.allowIfEqualGrantedDeniedDecisions = allowIfEqualGrantedDeniedDecisions;
-    }
+	public void setAllowIfEqualGrantedDeniedDecisions(
+			boolean allowIfEqualGrantedDeniedDecisions) {
+		this.allowIfEqualGrantedDeniedDecisions = allowIfEqualGrantedDeniedDecisions;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
index 2a4ab0f731..74ea102e76 100644
--- a/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/RoleHierarchyVoter.java
@@ -8,25 +8,27 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
 /**
- * Extended RoleVoter which uses a {@link RoleHierarchy} definition to determine the
- * roles allocated to the current user before voting.
+ * Extended RoleVoter which uses a {@link RoleHierarchy} definition to determine the roles
+ * allocated to the current user before voting.
  *
  * @author Luke Taylor
  * @since 2.0.4
  */
 public class RoleHierarchyVoter extends RoleVoter {
-    private RoleHierarchy roleHierarchy = null;
+	private RoleHierarchy roleHierarchy = null;
 
-    public RoleHierarchyVoter(RoleHierarchy roleHierarchy) {
-        Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
-        this.roleHierarchy = roleHierarchy;
-    }
+	public RoleHierarchyVoter(RoleHierarchy roleHierarchy) {
+		Assert.notNull(roleHierarchy, "RoleHierarchy must not be null");
+		this.roleHierarchy = roleHierarchy;
+	}
 
-    /**
-     * Calls the <tt>RoleHierarchy</tt> to obtain the complete set of user authorities.
-     */
-    @Override
-    Collection<? extends GrantedAuthority> extractAuthorities(Authentication authentication) {
-        return roleHierarchy.getReachableGrantedAuthorities(authentication.getAuthorities());
-    }
+	/**
+	 * Calls the <tt>RoleHierarchy</tt> to obtain the complete set of user authorities.
+	 */
+	@Override
+	Collection<? extends GrantedAuthority> extractAuthorities(
+			Authentication authentication) {
+		return roleHierarchy.getReachableGrantedAuthorities(authentication
+				.getAuthorities());
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
index 29b5af2660..9b8b6ba53a 100644
--- a/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
+++ b/core/src/main/java/org/springframework/security/access/vote/RoleVoter.java
@@ -23,26 +23,25 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 
 /**
- * Votes if any {@link ConfigAttribute#getAttribute()} starts with a prefix
- * indicating that it is a role. The default prefix string is <Code>ROLE_</code>,
- * but this may be overridden to any value. It may also be set to empty, which
- * means that essentially any attribute will be voted on. As described further
- * below, the effect of an empty prefix may not be quite desirable.
+ * Votes if any {@link ConfigAttribute#getAttribute()} starts with a prefix indicating
+ * that it is a role. The default prefix string is <Code>ROLE_</code>, but this may be
+ * overridden to any value. It may also be set to empty, which means that essentially any
+ * attribute will be voted on. As described further below, the effect of an empty prefix
+ * may not be quite desirable.
  * <p>
- * Abstains from voting if no configuration attribute commences with the role
- * prefix. Votes to grant access if there is an exact matching
- * {@link org.springframework.security.core.GrantedAuthority} to a <code>ConfigAttribute</code>
- * starting with the role prefix. Votes to deny access if there is no exact
- * matching <code>GrantedAuthority</code> to a <code>ConfigAttribute</code>
- * starting with the role prefix.
+ * Abstains from voting if no configuration attribute commences with the role prefix.
+ * Votes to grant access if there is an exact matching
+ * {@link org.springframework.security.core.GrantedAuthority} to a
+ * <code>ConfigAttribute</code> starting with the role prefix. Votes to deny access if
+ * there is no exact matching <code>GrantedAuthority</code> to a
+ * <code>ConfigAttribute</code> starting with the role prefix.
  * <p>
- * An empty role prefix means that the voter will vote for every
- * ConfigAttribute. When there are different categories of ConfigAttributes
- * used, this will not be optimal since the voter will be voting for attributes
- * which do not represent roles. However, this option may be of some use when
- * using pre-existing role names without a prefix, and no ability exists to
- * prefix them with a role prefix on reading them in, such as provided for
- * example in {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
+ * An empty role prefix means that the voter will vote for every ConfigAttribute. When
+ * there are different categories of ConfigAttributes used, this will not be optimal since
+ * the voter will be voting for attributes which do not represent roles. However, this
+ * option may be of some use when using pre-existing role names without a prefix, and no
+ * ability exists to prefix them with a role prefix on reading them in, such as provided
+ * for example in {@link org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl}.
  * <p>
  * All comparisons and prefixes are case sensitive.
  *
@@ -50,68 +49,73 @@ import org.springframework.security.core.GrantedAuthority;
  * @author colin sampaleanu
  */
 public class RoleVoter implements AccessDecisionVoter<Object> {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String rolePrefix = "ROLE_";
+	private String rolePrefix = "ROLE_";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String getRolePrefix() {
-        return rolePrefix;
-    }
+	public String getRolePrefix() {
+		return rolePrefix;
+	}
 
-    /**
-     * Allows the default role prefix of <code>ROLE_</code> to be overridden.
-     * May be set to an empty value, although this is usually not desirable.
-     *
-     * @param rolePrefix the new prefix
-     */
-    public void setRolePrefix(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-    }
+	/**
+	 * Allows the default role prefix of <code>ROLE_</code> to be overridden. May be set
+	 * to an empty value, although this is usually not desirable.
+	 *
+	 * @param rolePrefix the new prefix
+	 */
+	public void setRolePrefix(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        if ((attribute.getAttribute() != null) && attribute.getAttribute().startsWith(getRolePrefix())) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		if ((attribute.getAttribute() != null)
+				&& attribute.getAttribute().startsWith(getRolePrefix())) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 
-    /**
-     * This implementation supports any type of class, because it does not query
-     * the presented secure object.
-     *
-     * @param clazz the secure object
-     *
-     * @return always <code>true</code>
-     */
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	/**
+	 * This implementation supports any type of class, because it does not query the
+	 * presented secure object.
+	 *
+	 * @param clazz the secure object
+	 *
+	 * @return always <code>true</code>
+	 */
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
-    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-        int result = ACCESS_ABSTAIN;
-        Collection<? extends GrantedAuthority> authorities = extractAuthorities(authentication);
+	public int vote(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) {
+		int result = ACCESS_ABSTAIN;
+		Collection<? extends GrantedAuthority> authorities = extractAuthorities(authentication);
 
-        for (ConfigAttribute attribute : attributes) {
-            if (this.supports(attribute)) {
-                result = ACCESS_DENIED;
+		for (ConfigAttribute attribute : attributes) {
+			if (this.supports(attribute)) {
+				result = ACCESS_DENIED;
 
-                // Attempt to find a matching granted authority
-                for (GrantedAuthority authority : authorities) {
-                    if (attribute.getAttribute().equals(authority.getAuthority())) {
-                        return ACCESS_GRANTED;
-                    }
-                }
-            }
-        }
+				// Attempt to find a matching granted authority
+				for (GrantedAuthority authority : authorities) {
+					if (attribute.getAttribute().equals(authority.getAuthority())) {
+						return ACCESS_GRANTED;
+					}
+				}
+			}
+		}
 
-        return result;
-    }
+		return result;
+	}
 
-    Collection<? extends GrantedAuthority> extractAuthorities(Authentication authentication) {
-        return authentication.getAuthorities();
-    }
+	Collection<? extends GrantedAuthority> extractAuthorities(
+			Authentication authentication) {
+		return authentication.getAuthorities();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
index 9485b43865..38263aeaff 100644
--- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
+++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java
@@ -24,79 +24,85 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Simple concrete implementation of  {@link org.springframework.security.access.AccessDecisionManager} that requires all
+ * Simple concrete implementation of
+ * {@link org.springframework.security.access.AccessDecisionManager} that requires all
  * voters to abstain or grant access.
  */
 public class UnanimousBased extends AbstractAccessDecisionManager {
 
-    public UnanimousBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
-        super(decisionVoters);
-    }
+	public UnanimousBased(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
+		super(decisionVoters);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * This concrete implementation polls all configured  {@link AccessDecisionVoter}s for each {@link
-     * ConfigAttribute} and grants access if <b>only</b> grant (or abstain) votes were received.
-     * <p>
-     * Other voting implementations usually pass the entire list of <tt>ConfigAttribute</tt>s to the
-     * <code>AccessDecisionVoter</code>. This implementation differs in that each <code>AccessDecisionVoter</code>
-     * knows only about a single <code>ConfigAttribute</code> at a time.
-     * <p>
-     * If every <code>AccessDecisionVoter</code> abstained from voting, the decision will be based on the
-     * {@link #isAllowIfAllAbstainDecisions()} property (defaults to false).
-     *
-     * @param authentication the caller invoking the method
-     * @param object the secured object
-     * @param attributes the configuration attributes associated with the method being invoked
-     *
-     * @throws AccessDeniedException if access is denied
-     */
-    public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> attributes)
-             throws AccessDeniedException {
+	/**
+	 * This concrete implementation polls all configured {@link AccessDecisionVoter}s for
+	 * each {@link ConfigAttribute} and grants access if <b>only</b> grant (or abstain)
+	 * votes were received.
+	 * <p>
+	 * Other voting implementations usually pass the entire list of
+	 * <tt>ConfigAttribute</tt>s to the <code>AccessDecisionVoter</code>. This
+	 * implementation differs in that each <code>AccessDecisionVoter</code> knows only
+	 * about a single <code>ConfigAttribute</code> at a time.
+	 * <p>
+	 * If every <code>AccessDecisionVoter</code> abstained from voting, the decision will
+	 * be based on the {@link #isAllowIfAllAbstainDecisions()} property (defaults to
+	 * false).
+	 *
+	 * @param authentication the caller invoking the method
+	 * @param object the secured object
+	 * @param attributes the configuration attributes associated with the method being
+	 * invoked
+	 *
+	 * @throws AccessDeniedException if access is denied
+	 */
+	public void decide(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) throws AccessDeniedException {
 
-        int grant = 0;
-        int abstain = 0;
+		int grant = 0;
+		int abstain = 0;
 
-        List<ConfigAttribute> singleAttributeList = new ArrayList<ConfigAttribute>(1);
-        singleAttributeList.add(null);
+		List<ConfigAttribute> singleAttributeList = new ArrayList<ConfigAttribute>(1);
+		singleAttributeList.add(null);
 
-        for (ConfigAttribute attribute : attributes) {
-            singleAttributeList.set(0, attribute);
+		for (ConfigAttribute attribute : attributes) {
+			singleAttributeList.set(0, attribute);
 
-            for(AccessDecisionVoter voter : getDecisionVoters()) {
-                int result = voter.vote(authentication, object, singleAttributeList);
+			for (AccessDecisionVoter voter : getDecisionVoters()) {
+				int result = voter.vote(authentication, object, singleAttributeList);
 
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Voter: " + voter + ", returned: " + result);
-                }
+				if (logger.isDebugEnabled()) {
+					logger.debug("Voter: " + voter + ", returned: " + result);
+				}
 
-                switch (result) {
-                case AccessDecisionVoter.ACCESS_GRANTED:
-                    grant++;
+				switch (result) {
+				case AccessDecisionVoter.ACCESS_GRANTED:
+					grant++;
 
-                    break;
+					break;
 
-                case AccessDecisionVoter.ACCESS_DENIED:
-                    throw new AccessDeniedException(messages.getMessage("AbstractAccessDecisionManager.accessDenied",
-                            "Access is denied"));
+				case AccessDecisionVoter.ACCESS_DENIED:
+					throw new AccessDeniedException(messages.getMessage(
+							"AbstractAccessDecisionManager.accessDenied",
+							"Access is denied"));
 
-                default:
-                    abstain++;
+				default:
+					abstain++;
 
-                    break;
-                }
-            }
-        }
+					break;
+				}
+			}
+		}
 
-        // To get this far, there were no deny votes
-        if (grant > 0) {
-            return;
-        }
+		// To get this far, there were no deny votes
+		if (grant > 0) {
+			return;
+		}
 
-        // To get this far, every AccessDecisionVoter abstained
-        checkAllowIfAllAbstainDecisions();
-    }
+		// To get this far, every AccessDecisionVoter abstained
+		checkAllowIfAllAbstainDecisions();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/access/vote/package-info.java b/core/src/main/java/org/springframework/security/access/vote/package-info.java
index 3b32fb6023..6a962b3ba1 100644
--- a/core/src/main/java/org/springframework/security/access/vote/package-info.java
+++ b/core/src/main/java/org/springframework/security/access/vote/package-info.java
@@ -2,3 +2,4 @@
  * Implements a vote-based approach to authorization decisions.
  */
 package org.springframework.security.access.vote;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
index 0450e366cf..4cb4e92037 100644
--- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java
@@ -26,7 +26,6 @@ import org.springframework.security.core.CredentialsContainer;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 /**
  * Base class for <code>Authentication</code> objects.
  * <p>
@@ -35,181 +34,191 @@ import org.springframework.security.core.userdetails.UserDetails;
  * @author Ben Alex
  * @author Luke Taylor
  */
-public abstract class AbstractAuthenticationToken implements Authentication, CredentialsContainer {
-    //~ Instance fields ================================================================================================
+public abstract class AbstractAuthenticationToken implements Authentication,
+		CredentialsContainer {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Object details;
-    private final Collection<GrantedAuthority> authorities;
-    private boolean authenticated = false;
+	private Object details;
+	private final Collection<GrantedAuthority> authorities;
+	private boolean authenticated = false;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates a token with the supplied array of authorities.
-     *
-     * @param authorities the collection of <tt>GrantedAuthority</tt>s for the
-     *                    principal represented by this authentication object.
-     */
-    public AbstractAuthenticationToken(Collection<? extends GrantedAuthority> authorities) {
-        if (authorities == null) {
-            this.authorities = AuthorityUtils.NO_AUTHORITIES;
-            return;
-        }
+	/**
+	 * Creates a token with the supplied array of authorities.
+	 *
+	 * @param authorities the collection of <tt>GrantedAuthority</tt>s for the principal
+	 * represented by this authentication object.
+	 */
+	public AbstractAuthenticationToken(Collection<? extends GrantedAuthority> authorities) {
+		if (authorities == null) {
+			this.authorities = AuthorityUtils.NO_AUTHORITIES;
+			return;
+		}
 
-        for (GrantedAuthority a: authorities) {
-            if (a == null) {
-                throw new IllegalArgumentException("Authorities collection cannot contain any null elements");
-            }
-        }
-        ArrayList<GrantedAuthority> temp = new ArrayList<GrantedAuthority>(authorities.size());
-        temp.addAll(authorities);
-        this.authorities = Collections.unmodifiableList(temp);
-    }
+		for (GrantedAuthority a : authorities) {
+			if (a == null) {
+				throw new IllegalArgumentException(
+						"Authorities collection cannot contain any null elements");
+			}
+		}
+		ArrayList<GrantedAuthority> temp = new ArrayList<GrantedAuthority>(
+				authorities.size());
+		temp.addAll(authorities);
+		this.authorities = Collections.unmodifiableList(temp);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
+	public Collection<GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
 
-    public String getName() {
-        if (this.getPrincipal() instanceof UserDetails) {
-            return ((UserDetails) this.getPrincipal()).getUsername();
-        }
+	public String getName() {
+		if (this.getPrincipal() instanceof UserDetails) {
+			return ((UserDetails) this.getPrincipal()).getUsername();
+		}
 
-        if (getPrincipal() instanceof Principal) {
-            return ((Principal)getPrincipal()).getName();
-        }
+		if (getPrincipal() instanceof Principal) {
+			return ((Principal) getPrincipal()).getName();
+		}
 
-        return (this.getPrincipal() == null) ? "" : this.getPrincipal().toString();
-    }
+		return (this.getPrincipal() == null) ? "" : this.getPrincipal().toString();
+	}
 
-    public boolean isAuthenticated() {
-        return authenticated;
-    }
+	public boolean isAuthenticated() {
+		return authenticated;
+	}
 
-    public void setAuthenticated(boolean authenticated) {
-        this.authenticated = authenticated;
-    }
+	public void setAuthenticated(boolean authenticated) {
+		this.authenticated = authenticated;
+	}
 
-    public Object getDetails() {
-        return details;
-    }
+	public Object getDetails() {
+		return details;
+	}
 
-    public void setDetails(Object details) {
-        this.details = details;
-    }
+	public void setDetails(Object details) {
+		this.details = details;
+	}
 
-    /**
-     * Checks the {@code credentials}, {@code principal} and {@code details} objects, invoking the
-     * {@code eraseCredentials} method on any which implement {@link CredentialsContainer}.
-     */
-    public void eraseCredentials() {
-        eraseSecret(getCredentials());
-        eraseSecret(getPrincipal());
-        eraseSecret(details);
-    }
+	/**
+	 * Checks the {@code credentials}, {@code principal} and {@code details} objects,
+	 * invoking the {@code eraseCredentials} method on any which implement
+	 * {@link CredentialsContainer}.
+	 */
+	public void eraseCredentials() {
+		eraseSecret(getCredentials());
+		eraseSecret(getPrincipal());
+		eraseSecret(details);
+	}
 
-    private void eraseSecret(Object secret) {
-        if (secret instanceof CredentialsContainer) {
-            ((CredentialsContainer)secret).eraseCredentials();
-        }
-    }
+	private void eraseSecret(Object secret) {
+		if (secret instanceof CredentialsContainer) {
+			((CredentialsContainer) secret).eraseCredentials();
+		}
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof AbstractAuthenticationToken)) {
-            return false;
-        }
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof AbstractAuthenticationToken)) {
+			return false;
+		}
 
-        AbstractAuthenticationToken test = (AbstractAuthenticationToken) obj;
+		AbstractAuthenticationToken test = (AbstractAuthenticationToken) obj;
 
-        if (!authorities.equals(test.authorities)) {
-            return false;
-        }
+		if (!authorities.equals(test.authorities)) {
+			return false;
+		}
 
-        if ((this.details == null) && (test.getDetails() != null)) {
-            return false;
-        }
+		if ((this.details == null) && (test.getDetails() != null)) {
+			return false;
+		}
 
-        if ((this.details != null) && (test.getDetails() == null)) {
-            return false;
-        }
+		if ((this.details != null) && (test.getDetails() == null)) {
+			return false;
+		}
 
-        if ((this.details != null) && (!this.details.equals(test.getDetails()))) {
-            return false;
-        }
+		if ((this.details != null) && (!this.details.equals(test.getDetails()))) {
+			return false;
+		}
 
-        if ((this.getCredentials() == null) && (test.getCredentials() != null)) {
-            return false;
-        }
+		if ((this.getCredentials() == null) && (test.getCredentials() != null)) {
+			return false;
+		}
 
-        if ((this.getCredentials() != null) && !this.getCredentials().equals(test.getCredentials())) {
-            return false;
-        }
+		if ((this.getCredentials() != null)
+				&& !this.getCredentials().equals(test.getCredentials())) {
+			return false;
+		}
 
-        if (this.getPrincipal() == null && test.getPrincipal() != null) {
-            return false;
-        }
+		if (this.getPrincipal() == null && test.getPrincipal() != null) {
+			return false;
+		}
 
-        if (this.getPrincipal() != null && !this.getPrincipal().equals(test.getPrincipal())) {
-            return false;
-        }
+		if (this.getPrincipal() != null
+				&& !this.getPrincipal().equals(test.getPrincipal())) {
+			return false;
+		}
 
-        return this.isAuthenticated() == test.isAuthenticated();
-    }
+		return this.isAuthenticated() == test.isAuthenticated();
+	}
 
-    @Override
-    public int hashCode() {
-        int code = 31;
+	@Override
+	public int hashCode() {
+		int code = 31;
 
-        for (GrantedAuthority authority : authorities) {
-            code ^= authority.hashCode();
-        }
+		for (GrantedAuthority authority : authorities) {
+			code ^= authority.hashCode();
+		}
 
-        if (this.getPrincipal() != null) {
-            code ^= this.getPrincipal().hashCode();
-        }
+		if (this.getPrincipal() != null) {
+			code ^= this.getPrincipal().hashCode();
+		}
 
-        if (this.getCredentials() != null) {
-            code ^= this.getCredentials().hashCode();
-        }
+		if (this.getCredentials() != null) {
+			code ^= this.getCredentials().hashCode();
+		}
 
-        if (this.getDetails() != null) {
-            code ^= this.getDetails().hashCode();
-        }
+		if (this.getDetails() != null) {
+			code ^= this.getDetails().hashCode();
+		}
 
-        if (this.isAuthenticated()) {
-            code ^= -37;
-        }
+		if (this.isAuthenticated()) {
+			code ^= -37;
+		}
 
-        return code;
-    }
+		return code;
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append(": ");
-        sb.append("Principal: ").append(this.getPrincipal()).append("; ");
-        sb.append("Credentials: [PROTECTED]; ");
-        sb.append("Authenticated: ").append(this.isAuthenticated()).append("; ");
-        sb.append("Details: ").append(this.getDetails()).append("; ");
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append(": ");
+		sb.append("Principal: ").append(this.getPrincipal()).append("; ");
+		sb.append("Credentials: [PROTECTED]; ");
+		sb.append("Authenticated: ").append(this.isAuthenticated()).append("; ");
+		sb.append("Details: ").append(this.getDetails()).append("; ");
 
-        if (!authorities.isEmpty()) {
-            sb.append("Granted Authorities: ");
+		if (!authorities.isEmpty()) {
+			sb.append("Granted Authorities: ");
 
-            int i = 0;
-            for (GrantedAuthority authority: authorities) {
-                if (i++ > 0) {
-                    sb.append(", ");
-                }
+			int i = 0;
+			for (GrantedAuthority authority : authorities) {
+				if (i++ > 0) {
+					sb.append(", ");
+				}
 
-                sb.append(authority);
-            }
-        } else {
-            sb.append("Not granted any authorities");
-        }
+				sb.append(authority);
+			}
+		}
+		else {
+			sb.append("Not granted any authorities");
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
index 8d35698327..809bbd02c8 100644
--- a/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountExpiredException.java
@@ -16,32 +16,32 @@
 package org.springframework.security.authentication;
 
 /**
- * Thrown if an authentication request is rejected because the account has expired. Makes no assertion as to
- * whether or not the credentials were valid.
+ * Thrown if an authentication request is rejected because the account has expired. Makes
+ * no assertion as to whether or not the credentials were valid.
  *
  * @author Ben Alex
  */
 public class AccountExpiredException extends AccountStatusException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>AccountExpiredException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public AccountExpiredException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>AccountExpiredException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AccountExpiredException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a <code>AccountExpiredException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AccountExpiredException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>AccountExpiredException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AccountExpiredException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
index cc4bff3f8f..f0afed7493 100644
--- a/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountStatusException.java
@@ -3,17 +3,17 @@ package org.springframework.security.authentication;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * Base class for authentication exceptions which are caused by a particular
- * user account status (locked, disabled etc).
+ * Base class for authentication exceptions which are caused by a particular user account
+ * status (locked, disabled etc).
  *
  * @author Luke Taylor
  */
 public abstract class AccountStatusException extends AuthenticationException {
-    public AccountStatusException(String msg) {
-        super(msg);
-    }
+	public AccountStatusException(String msg) {
+		super(msg);
+	}
 
-    public AccountStatusException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	public AccountStatusException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
index ca3f3b391c..08dd9ccd99 100644
--- a/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
+++ b/core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java
@@ -10,25 +10,30 @@ import org.springframework.context.support.MessageSourceAccessor;
  */
 public class AccountStatusUserDetailsChecker implements UserDetailsChecker {
 
-    protected final MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	protected final MessageSourceAccessor messages = SpringSecurityMessageSource
+			.getAccessor();
 
-    public void check(UserDetails user) {
-        if (!user.isAccountNonLocked()) {
-            throw new LockedException(messages.getMessage("AccountStatusUserDetailsChecker.locked", "User account is locked"));
-        }
+	public void check(UserDetails user) {
+		if (!user.isAccountNonLocked()) {
+			throw new LockedException(messages.getMessage(
+					"AccountStatusUserDetailsChecker.locked", "User account is locked"));
+		}
 
-        if (!user.isEnabled()) {
-            throw new DisabledException(messages.getMessage("AccountStatusUserDetailsChecker.disabled", "User is disabled"));
-        }
+		if (!user.isEnabled()) {
+			throw new DisabledException(messages.getMessage(
+					"AccountStatusUserDetailsChecker.disabled", "User is disabled"));
+		}
 
-        if (!user.isAccountNonExpired()) {
-            throw new AccountExpiredException(messages.getMessage("AccountStatusUserDetailsChecker.expired",
-                    "User account has expired"));
-        }
+		if (!user.isAccountNonExpired()) {
+			throw new AccountExpiredException(
+					messages.getMessage("AccountStatusUserDetailsChecker.expired",
+							"User account has expired"));
+		}
 
-        if (!user.isCredentialsNonExpired()) {
-            throw new CredentialsExpiredException(messages.getMessage("AccountStatusUserDetailsChecker.credentialsExpired",
-                    "User credentials have expired"));
-        }
-    }
+		if (!user.isCredentialsNonExpired()) {
+			throw new CredentialsExpiredException(messages.getMessage(
+					"AccountStatusUserDetailsChecker.credentialsExpired",
+					"User credentials have expired"));
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
index 995cebb02e..cd102d1504 100644
--- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationProvider.java
@@ -24,53 +24,58 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.SpringSecurityMessageSource;
 import org.springframework.util.Assert;
 
-
 /**
- * An {@link AuthenticationProvider} implementation that validates {@link AnonymousAuthenticationToken}s.
+ * An {@link AuthenticationProvider} implementation that validates
+ * {@link AnonymousAuthenticationToken}s.
  * <p>
- * To be successfully validated, the {@link AnonymousAuthenticationToken#getKeyHash()} must match this class'
- * {@link #getKey()}.
+ * To be successfully validated, the {@link AnonymousAuthenticationToken#getKeyHash()}
+ * must match this class' {@link #getKey()}.
  *
  * @author Ben Alex
  */
-public class AnonymousAuthenticationProvider implements AuthenticationProvider, MessageSourceAware {
+public class AnonymousAuthenticationProvider implements AuthenticationProvider,
+		MessageSourceAware {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private String key;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private String key;
 
-    public AnonymousAuthenticationProvider(String key) {
-        Assert.hasLength(key, "A Key is required");
-        this.key = key;
-    }
+	public AnonymousAuthenticationProvider(String key) {
+		Assert.hasLength(key, "A Key is required");
+		this.key = key;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication authenticate(Authentication authentication)
-        throws AuthenticationException {
-        if (!supports(authentication.getClass())) {
-            return null;
-        }
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		if (!supports(authentication.getClass())) {
+			return null;
+		}
 
-        if (this.key.hashCode() != ((AnonymousAuthenticationToken) authentication).getKeyHash()) {
-            throw new BadCredentialsException(messages.getMessage("AnonymousAuthenticationProvider.incorrectKey",
-                    "The presented AnonymousAuthenticationToken does not contain the expected key"));
-        }
+		if (this.key.hashCode() != ((AnonymousAuthenticationToken) authentication)
+				.getKeyHash()) {
+			throw new BadCredentialsException(
+					messages.getMessage("AnonymousAuthenticationProvider.incorrectKey",
+							"The presented AnonymousAuthenticationToken does not contain the expected key"));
+		}
 
-        return authentication;
-    }
+		return authentication;
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        Assert.notNull(messageSource, "messageSource cannot be null");
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		Assert.notNull(messageSource, "messageSource cannot be null");
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return (AnonymousAuthenticationToken.class.isAssignableFrom(authentication));
-    }
+	public boolean supports(Class<?> authentication) {
+		return (AnonymousAuthenticationToken.class.isAssignableFrom(authentication));
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
index 9afc10c565..395f8aac80 100644
--- a/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/AnonymousAuthenticationToken.java
@@ -21,77 +21,83 @@ import java.util.List;
 
 import org.springframework.security.core.GrantedAuthority;
 
-
 /**
  * Represents an anonymous <code>Authentication</code>.
  *
  * @author Ben Alex
  */
-public class AnonymousAuthenticationToken extends AbstractAuthenticationToken implements Serializable {
-    //~ Instance fields ================================================================================================
+public class AnonymousAuthenticationToken extends AbstractAuthenticationToken implements
+		Serializable {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private static final long serialVersionUID = 1L;
-    private final Object principal;
-    private final int keyHash;
+	private static final long serialVersionUID = 1L;
+	private final Object principal;
+	private final int keyHash;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor.
-     *
-     * @param key to identify if this object made by an authorised client
-     * @param principal the principal (typically a <code>UserDetails</code>)
-     * @param authorities the authorities granted to the principal
-     *
-     * @throws IllegalArgumentException if a <code>null</code> was passed
-     */
-    public AnonymousAuthenticationToken(String key, Object principal, Collection<? extends GrantedAuthority> authorities) {
-        super(authorities);
+	/**
+	 * Constructor.
+	 *
+	 * @param key to identify if this object made by an authorised client
+	 * @param principal the principal (typically a <code>UserDetails</code>)
+	 * @param authorities the authorities granted to the principal
+	 *
+	 * @throws IllegalArgumentException if a <code>null</code> was passed
+	 */
+	public AnonymousAuthenticationToken(String key, Object principal,
+			Collection<? extends GrantedAuthority> authorities) {
+		super(authorities);
 
-        if ((key == null) || ("".equals(key)) || (principal == null) || "".equals(principal) || (authorities == null)
-            || (authorities.isEmpty())) {
-            throw new IllegalArgumentException("Cannot pass null or empty values to constructor");
-        }
+		if ((key == null) || ("".equals(key)) || (principal == null)
+				|| "".equals(principal) || (authorities == null)
+				|| (authorities.isEmpty())) {
+			throw new IllegalArgumentException(
+					"Cannot pass null or empty values to constructor");
+		}
 
-        this.keyHash = key.hashCode();
-        this.principal = principal;
-        setAuthenticated(true);
-    }
+		this.keyHash = key.hashCode();
+		this.principal = principal;
+		setAuthenticated(true);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object obj) {
-        if (!super.equals(obj)) {
-            return false;
-        }
+	public boolean equals(Object obj) {
+		if (!super.equals(obj)) {
+			return false;
+		}
 
-        if (obj instanceof AnonymousAuthenticationToken) {
-            AnonymousAuthenticationToken test = (AnonymousAuthenticationToken) obj;
+		if (obj instanceof AnonymousAuthenticationToken) {
+			AnonymousAuthenticationToken test = (AnonymousAuthenticationToken) obj;
 
-            if (this.getKeyHash() != test.getKeyHash()) {
-                return false;
-            }
+			if (this.getKeyHash() != test.getKeyHash()) {
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Always returns an empty <code>String</code>
-     *
-     * @return an empty String
-     */
-    public Object getCredentials() {
-        return "";
-    }
+	/**
+	 * Always returns an empty <code>String</code>
+	 *
+	 * @return an empty String
+	 */
+	public Object getCredentials() {
+		return "";
+	}
 
-    public int getKeyHash() {
-        return this.keyHash;
-    }
+	public int getKeyHash() {
+		return this.keyHash;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
index 44b9bea223..7641784e3b 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationCredentialsNotFoundException.java
@@ -19,32 +19,34 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * Thrown if an authentication request is rejected because there is no {@link Authentication} object in the  {@link
- * org.springframework.security.core.context.SecurityContext SecurityContext}.
+ * Thrown if an authentication request is rejected because there is no
+ * {@link Authentication} object in the
+ * {@link org.springframework.security.core.context.SecurityContext SecurityContext}.
  *
  * @author Ben Alex
  */
 public class AuthenticationCredentialsNotFoundException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>AuthenticationCredentialsNotFoundException</code>
-     * with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationCredentialsNotFoundException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AuthenticationCredentialsNotFoundException</code> with the
+	 * specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AuthenticationCredentialsNotFoundException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>AuthenticationCredentialsNotFoundException</code>
-     * with the specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AuthenticationCredentialsNotFoundException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>AuthenticationCredentialsNotFoundException</code> with the
+	 * specified message and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AuthenticationCredentialsNotFoundException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
index b8865e078e..c7a9afe224 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSource.java
@@ -16,20 +16,23 @@
 package org.springframework.security.authentication;
 
 /**
- * Provides a {@link org.springframework.security.core.Authentication#getDetails()} object for
- * a given web request.
+ * Provides a {@link org.springframework.security.core.Authentication#getDetails()} object
+ * for a given web request.
  *
  * @author Ben Alex
  */
 public interface AuthenticationDetailsSource<C, T> {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Called by a class when it wishes a new authentication details instance to be created.
-     *
-     * @param context the request object, which may be used by the authentication details object
-     *
-     * @return a fully-configured authentication details instance
-     */
-    T buildDetails(C context);
+	/**
+	 * Called by a class when it wishes a new authentication details instance to be
+	 * created.
+	 *
+	 * @param context the request object, which may be used by the authentication details
+	 * object
+	 *
+	 * @return a fully-configured authentication details instance
+	 */
+	T buildDetails(C context);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationEventPublisher.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationEventPublisher.java
index b6e630c67e..a038d17b98 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationEventPublisher.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationEventPublisher.java
@@ -10,7 +10,8 @@ import org.springframework.security.core.AuthenticationException;
  */
 public interface AuthenticationEventPublisher {
 
-    void publishAuthenticationSuccess(Authentication authentication);
+	void publishAuthenticationSuccess(Authentication authentication);
 
-    void publishAuthenticationFailure(AuthenticationException exception, Authentication authentication);
+	void publishAuthenticationFailure(AuthenticationException exception,
+			Authentication authentication);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
index 06c4b8f2f9..ce3ea731d6 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationManager.java
@@ -24,30 +24,36 @@ import org.springframework.security.core.AuthenticationException;
  * @author Ben Alex
  */
 public interface AuthenticationManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Attempts to authenticate the passed {@link Authentication} object, returning a fully populated
-     * <code>Authentication</code> object (including granted authorities) if successful.
-     * <p>
-     * An <code>AuthenticationManager</code> must honour the following contract concerning exceptions:
-     * <ul>
-     * <li>A {@link DisabledException} must be thrown if an account is disabled and the
-     * <code>AuthenticationManager</code> can test for this state.</li>
-     * <li>A {@link LockedException} must be thrown if an account is locked and the
-     * <code>AuthenticationManager</code> can test for account locking.</li>
-     * <li>A {@link BadCredentialsException} must be thrown if incorrect credentials are presented. Whilst the
-     * above exceptions are optional, an <code>AuthenticationManager</code> must <B>always</B> test credentials.</li>
-     * </ul>
-     * Exceptions should be tested for and if applicable thrown in the order expressed above (i.e. if an
-     * account is disabled or locked, the authentication request is immediately rejected and the credentials testing
-     * process is not performed). This prevents credentials being tested against  disabled or locked accounts.
-     *
-     * @param authentication the authentication request object
-     *
-     * @return a fully authenticated object including credentials
-     *
-     * @throws AuthenticationException if authentication fails
-     */
-    Authentication authenticate(Authentication authentication) throws AuthenticationException;
+	/**
+	 * Attempts to authenticate the passed {@link Authentication} object, returning a
+	 * fully populated <code>Authentication</code> object (including granted authorities)
+	 * if successful.
+	 * <p>
+	 * An <code>AuthenticationManager</code> must honour the following contract concerning
+	 * exceptions:
+	 * <ul>
+	 * <li>A {@link DisabledException} must be thrown if an account is disabled and the
+	 * <code>AuthenticationManager</code> can test for this state.</li>
+	 * <li>A {@link LockedException} must be thrown if an account is locked and the
+	 * <code>AuthenticationManager</code> can test for account locking.</li>
+	 * <li>A {@link BadCredentialsException} must be thrown if incorrect credentials are
+	 * presented. Whilst the above exceptions are optional, an
+	 * <code>AuthenticationManager</code> must <B>always</B> test credentials.</li>
+	 * </ul>
+	 * Exceptions should be tested for and if applicable thrown in the order expressed
+	 * above (i.e. if an account is disabled or locked, the authentication request is
+	 * immediately rejected and the credentials testing process is not performed). This
+	 * prevents credentials being tested against disabled or locked accounts.
+	 *
+	 * @param authentication the authentication request object
+	 *
+	 * @return a fully authenticated object including credentials
+	 *
+	 * @throws AuthenticationException if authentication fails
+	 */
+	Authentication authenticate(Authentication authentication)
+			throws AuthenticationException;
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
index 38c6a026ba..9d7a2b4ffb 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationProvider.java
@@ -18,49 +18,54 @@ package org.springframework.security.authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Indicates a class can process a specific  {@link
- * org.springframework.security.core.Authentication} implementation.
+ * Indicates a class can process a specific
+ * {@link org.springframework.security.core.Authentication} implementation.
  *
  * @author Ben Alex
  */
 public interface AuthenticationProvider {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Performs authentication with the same contract as {@link
-     * org.springframework.security.authentication.AuthenticationManager#authenticate(Authentication)}.
-     *
-     * @param authentication the authentication request object.
-     *
-     * @return a fully authenticated object including credentials. May return <code>null</code> if the
-     *         <code>AuthenticationProvider</code> is unable to support authentication of the passed
-     *         <code>Authentication</code> object. In such a case, the next <code>AuthenticationProvider</code> that
-     *         supports the presented <code>Authentication</code> class will be tried.
-     *
-     * @throws AuthenticationException if authentication fails.
-     */
-    Authentication authenticate(Authentication authentication)
-        throws AuthenticationException;
+	/**
+	 * Performs authentication with the same contract as
+	 * {@link org.springframework.security.authentication.AuthenticationManager#authenticate(Authentication)}
+	 * .
+	 *
+	 * @param authentication the authentication request object.
+	 *
+	 * @return a fully authenticated object including credentials. May return
+	 * <code>null</code> if the <code>AuthenticationProvider</code> is unable to support
+	 * authentication of the passed <code>Authentication</code> object. In such a case,
+	 * the next <code>AuthenticationProvider</code> that supports the presented
+	 * <code>Authentication</code> class will be tried.
+	 *
+	 * @throws AuthenticationException if authentication fails.
+	 */
+	Authentication authenticate(Authentication authentication)
+			throws AuthenticationException;
 
-    /**
-     * Returns <code>true</code> if this <Code>AuthenticationProvider</code> supports the indicated
-     * <Code>Authentication</code> object.
-     * <p>
-     * Returning <code>true</code> does not guarantee an <code>AuthenticationProvider</code> will be able to
-     * authenticate the presented instance of the <code>Authentication</code> class. It simply indicates it can support
-     * closer evaluation of it. An <code>AuthenticationProvider</code> can still return <code>null</code> from the
-     * {@link #authenticate(Authentication)} method to indicate another <code>AuthenticationProvider</code> should be
-     * tried.
-     * </p>
-     * <p>Selection of an <code>AuthenticationProvider</code> capable of performing authentication is
-     * conducted at runtime the <code>ProviderManager</code>.</p>
-     *
-     * @param authentication
-     *
-     * @return <code>true</code> if the implementation can more closely evaluate the <code>Authentication</code> class
-     *         presented
-     */
-    boolean supports(Class<?> authentication);
+	/**
+	 * Returns <code>true</code> if this <Code>AuthenticationProvider</code> supports the
+	 * indicated <Code>Authentication</code> object.
+	 * <p>
+	 * Returning <code>true</code> does not guarantee an
+	 * <code>AuthenticationProvider</code> will be able to authenticate the presented
+	 * instance of the <code>Authentication</code> class. It simply indicates it can
+	 * support closer evaluation of it. An <code>AuthenticationProvider</code> can still
+	 * return <code>null</code> from the {@link #authenticate(Authentication)} method to
+	 * indicate another <code>AuthenticationProvider</code> should be tried.
+	 * </p>
+	 * <p>
+	 * Selection of an <code>AuthenticationProvider</code> capable of performing
+	 * authentication is conducted at runtime the <code>ProviderManager</code>.
+	 * </p>
+	 *
+	 * @param authentication
+	 *
+	 * @return <code>true</code> if the implementation can more closely evaluate the
+	 * <code>Authentication</code> class presented
+	 */
+	boolean supports(Class<?> authentication);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
index 950fd4586f..07eef80dc7 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationServiceException.java
@@ -20,32 +20,34 @@ import org.springframework.security.core.AuthenticationException;
 /**
  * Thrown if an authentication request could not be processed due to a system problem.
  * <p>
- * This might be thrown if a backend authentication repository is  unavailable, for example.
+ * This might be thrown if a backend authentication repository is unavailable, for
+ * example.
  *
  * @author Ben Alex
  * @see InternalAuthenticationServiceException
  */
 public class AuthenticationServiceException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>AuthenticationServiceException</code> with the
-     * specified message.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationServiceException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>AuthenticationServiceException</code> with the specified
+	 * message.
+	 *
+	 * @param msg the detail message
+	 */
+	public AuthenticationServiceException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>AuthenticationServiceException</code> with the
-     * specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public AuthenticationServiceException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>AuthenticationServiceException</code> with the specified
+	 * message and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public AuthenticationServiceException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
index d680a343e5..82f252b506 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolver.java
@@ -23,36 +23,38 @@ import org.springframework.security.core.Authentication;
  * @author Ben Alex
  */
 public interface AuthenticationTrustResolver {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Indicates whether the passed <code>Authentication</code> token represents an anonymous user. Typically
-     * the framework will call this method if it is trying to decide whether an <code>AccessDeniedException</code>
-     * should result in a final rejection (i.e. as would be the case if the principal was non-anonymous/fully
-     * authenticated) or direct the principal to attempt actual authentication (i.e. as would be the case if the
-     * <code>Authentication</code> was merely anonymous).
-     *
-     * @param authentication to test (may be <code>null</code> in which case the method will always return
-     *        <code>false</code>)
-     *
-     * @return <code>true</code> the passed authentication token represented an anonymous principal, <code>false</code>
-     *         otherwise
-     */
-    boolean isAnonymous(Authentication authentication);
+	/**
+	 * Indicates whether the passed <code>Authentication</code> token represents an
+	 * anonymous user. Typically the framework will call this method if it is trying to
+	 * decide whether an <code>AccessDeniedException</code> should result in a final
+	 * rejection (i.e. as would be the case if the principal was non-anonymous/fully
+	 * authenticated) or direct the principal to attempt actual authentication (i.e. as
+	 * would be the case if the <code>Authentication</code> was merely anonymous).
+	 *
+	 * @param authentication to test (may be <code>null</code> in which case the method
+	 * will always return <code>false</code>)
+	 *
+	 * @return <code>true</code> the passed authentication token represented an anonymous
+	 * principal, <code>false</code> otherwise
+	 */
+	boolean isAnonymous(Authentication authentication);
 
-    /**
-     * Indicates whether the passed <code>Authentication</code> token represents user that has been remembered
-     * (i.e. not a user that has been fully authenticated).
-     * <p>
-     * The method is provided to assist with custom <code>AccessDecisionVoter</code>s and the like that you
-     * might develop. Of course, you don't need to use this method either and can develop your own "trust level"
-     * hierarchy instead.
-     *
-     * @param authentication to test (may be <code>null</code> in which case the method will always return
-     *        <code>false</code>)
-     *
-     * @return <code>true</code> the passed authentication token represented a principal authenticated using a
-     *         remember-me token, <code>false</code> otherwise
-     */
-    boolean isRememberMe(Authentication authentication);
+	/**
+	 * Indicates whether the passed <code>Authentication</code> token represents user that
+	 * has been remembered (i.e. not a user that has been fully authenticated).
+	 * <p>
+	 * The method is provided to assist with custom <code>AccessDecisionVoter</code>s and
+	 * the like that you might develop. Of course, you don't need to use this method
+	 * either and can develop your own "trust level" hierarchy instead.
+	 *
+	 * @param authentication to test (may be <code>null</code> in which case the method
+	 * will always return <code>false</code>)
+	 *
+	 * @return <code>true</code> the passed authentication token represented a principal
+	 * authenticated using a remember-me token, <code>false</code> otherwise
+	 */
+	boolean isRememberMe(Authentication authentication);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
index 8dc03cdfbf..74e3e7c4bc 100644
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationTrustResolverImpl.java
@@ -17,54 +17,56 @@ package org.springframework.security.authentication;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Basic implementation of {@link AuthenticationTrustResolver}.
  * <p>
- * Makes trust decisions based on whether the passed <code>Authentication</code> is an instance of a defined class.
+ * Makes trust decisions based on whether the passed <code>Authentication</code> is an
+ * instance of a defined class.
  * <p>
- * If {@link #anonymousClass} or {@link #rememberMeClass} is <code>null</code>, the corresponding method will
- * always return <code>false</code>.
+ * If {@link #anonymousClass} or {@link #rememberMeClass} is <code>null</code>, the
+ * corresponding method will always return <code>false</code>.
  *
  * @author Ben Alex
  */
 public class AuthenticationTrustResolverImpl implements AuthenticationTrustResolver {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Class<? extends Authentication> anonymousClass = AnonymousAuthenticationToken.class;
-    private Class<? extends Authentication> rememberMeClass = RememberMeAuthenticationToken.class;
+	private Class<? extends Authentication> anonymousClass = AnonymousAuthenticationToken.class;
+	private Class<? extends Authentication> rememberMeClass = RememberMeAuthenticationToken.class;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    Class<? extends Authentication> getAnonymousClass() {
-        return anonymousClass;
-    }
+	Class<? extends Authentication> getAnonymousClass() {
+		return anonymousClass;
+	}
 
-    Class<? extends Authentication> getRememberMeClass() {
-        return rememberMeClass;
-    }
+	Class<? extends Authentication> getRememberMeClass() {
+		return rememberMeClass;
+	}
 
-    public boolean isAnonymous(Authentication authentication) {
-        if ((anonymousClass == null) || (authentication == null)) {
-            return false;
-        }
+	public boolean isAnonymous(Authentication authentication) {
+		if ((anonymousClass == null) || (authentication == null)) {
+			return false;
+		}
 
-        return anonymousClass.isAssignableFrom(authentication.getClass());
-    }
+		return anonymousClass.isAssignableFrom(authentication.getClass());
+	}
 
-    public boolean isRememberMe(Authentication authentication) {
-        if ((rememberMeClass == null) || (authentication == null)) {
-            return false;
-        }
+	public boolean isRememberMe(Authentication authentication) {
+		if ((rememberMeClass == null) || (authentication == null)) {
+			return false;
+		}
 
-        return rememberMeClass.isAssignableFrom(authentication.getClass());
-    }
+		return rememberMeClass.isAssignableFrom(authentication.getClass());
+	}
 
-    public void setAnonymousClass(Class<? extends Authentication> anonymousClass) {
-        this.anonymousClass = anonymousClass;
-    }
+	public void setAnonymousClass(Class<? extends Authentication> anonymousClass) {
+		this.anonymousClass = anonymousClass;
+	}
 
-    public void setRememberMeClass(Class<? extends Authentication> rememberMeClass) {
-        this.rememberMeClass = rememberMeClass;
-    }
+	public void setRememberMeClass(Class<? extends Authentication> rememberMeClass) {
+		this.rememberMeClass = rememberMeClass;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
index 7bfca4bffa..51f63d3814 100644
--- a/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
+++ b/core/src/main/java/org/springframework/security/authentication/BadCredentialsException.java
@@ -18,32 +18,32 @@ package org.springframework.security.authentication;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * Thrown if an authentication request is rejected because the credentials are invalid. For this exception to be
- * thrown, it means the account is neither locked nor disabled.
+ * Thrown if an authentication request is rejected because the credentials are invalid.
+ * For this exception to be thrown, it means the account is neither locked nor disabled.
  *
  * @author Ben Alex
  */
 public class BadCredentialsException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>BadCredentialsException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public BadCredentialsException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>BadCredentialsException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public BadCredentialsException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a <code>BadCredentialsException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public BadCredentialsException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>BadCredentialsException</code> with the specified message and
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public BadCredentialsException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
index 74f5dca95e..1e0e1ffb66 100644
--- a/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
+++ b/core/src/main/java/org/springframework/security/authentication/CredentialsExpiredException.java
@@ -16,32 +16,32 @@
 package org.springframework.security.authentication;
 
 /**
- * Thrown if an authentication request is rejected because the account's credentials have expired. Makes no
- * assertion as to whether or not the credentials were valid.
+ * Thrown if an authentication request is rejected because the account's credentials have
+ * expired. Makes no assertion as to whether or not the credentials were valid.
  *
  * @author Ben Alex
  */
 public class CredentialsExpiredException extends AccountStatusException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>CredentialsExpiredException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public CredentialsExpiredException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>CredentialsExpiredException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public CredentialsExpiredException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a <code>CredentialsExpiredException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public CredentialsExpiredException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>CredentialsExpiredException</code> with the specified message
+	 * and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public CredentialsExpiredException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
index c889978a4f..3976a7e81a 100644
--- a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
+++ b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
@@ -27,109 +27,138 @@ import org.springframework.util.Assert;
 /**
  * The default strategy for publishing authentication events.
  * <p>
- * Maps well-known <tt>AuthenticationException</tt> types to events and publishes them via the
- * application context. If configured as a bean, it will pick up the <tt>ApplicationEventPublisher</tt> automatically.
- * Otherwise, the constructor which takes the publisher as an argument should be used.
+ * Maps well-known <tt>AuthenticationException</tt> types to events and publishes them via
+ * the application context. If configured as a bean, it will pick up the
+ * <tt>ApplicationEventPublisher</tt> automatically. Otherwise, the constructor which
+ * takes the publisher as an argument should be used.
  * <p>
- * The exception-mapping system can be fine-tuned by setting the <tt>additionalExceptionMappings</tt> as a
- * <code>java.util.Properties</code> object. In the properties object, each of the keys represent the fully qualified
- * classname of the exception, and each of the values represent the name of an event class which subclasses
+ * The exception-mapping system can be fine-tuned by setting the
+ * <tt>additionalExceptionMappings</tt> as a <code>java.util.Properties</code> object. In
+ * the properties object, each of the keys represent the fully qualified classname of the
+ * exception, and each of the values represent the name of an event class which subclasses
  * {@link org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent}
- * and provides its constructor. The <tt>additionalExceptionMappings</tt> will be merged with the default ones.
+ * and provides its constructor. The <tt>additionalExceptionMappings</tt> will be merged
+ * with the default ones.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class DefaultAuthenticationEventPublisher implements AuthenticationEventPublisher,
-        ApplicationEventPublisherAware {
-    private final Log logger = LogFactory.getLog(getClass());
+		ApplicationEventPublisherAware {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private ApplicationEventPublisher applicationEventPublisher;
-    private final HashMap<String,Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings
-            = new HashMap<String,Constructor<? extends AbstractAuthenticationEvent>>();
+	private ApplicationEventPublisher applicationEventPublisher;
+	private final HashMap<String, Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings = new HashMap<String, Constructor<? extends AbstractAuthenticationEvent>>();
 
-    public DefaultAuthenticationEventPublisher() {
-        this(null);
-    }
+	public DefaultAuthenticationEventPublisher() {
+		this(null);
+	}
 
-    public DefaultAuthenticationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.applicationEventPublisher = applicationEventPublisher;
+	public DefaultAuthenticationEventPublisher(
+			ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
 
-        addMapping(BadCredentialsException.class.getName(), AuthenticationFailureBadCredentialsEvent.class);
-        addMapping(UsernameNotFoundException.class.getName(), AuthenticationFailureBadCredentialsEvent.class);
-        addMapping(AccountExpiredException.class.getName(), AuthenticationFailureExpiredEvent.class);
-        addMapping(ProviderNotFoundException.class.getName(), AuthenticationFailureProviderNotFoundEvent.class);
-        addMapping(DisabledException.class.getName(), AuthenticationFailureDisabledEvent.class);
-        addMapping(LockedException.class.getName(), AuthenticationFailureLockedEvent.class);
-        addMapping(AuthenticationServiceException.class.getName(), AuthenticationFailureServiceExceptionEvent.class);
-        addMapping(CredentialsExpiredException.class.getName(), AuthenticationFailureCredentialsExpiredEvent.class);
-        addMapping("org.springframework.security.authentication.cas.ProxyUntrustedException",
-                AuthenticationFailureProxyUntrustedEvent.class);
-    }
+		addMapping(BadCredentialsException.class.getName(),
+				AuthenticationFailureBadCredentialsEvent.class);
+		addMapping(UsernameNotFoundException.class.getName(),
+				AuthenticationFailureBadCredentialsEvent.class);
+		addMapping(AccountExpiredException.class.getName(),
+				AuthenticationFailureExpiredEvent.class);
+		addMapping(ProviderNotFoundException.class.getName(),
+				AuthenticationFailureProviderNotFoundEvent.class);
+		addMapping(DisabledException.class.getName(),
+				AuthenticationFailureDisabledEvent.class);
+		addMapping(LockedException.class.getName(),
+				AuthenticationFailureLockedEvent.class);
+		addMapping(AuthenticationServiceException.class.getName(),
+				AuthenticationFailureServiceExceptionEvent.class);
+		addMapping(CredentialsExpiredException.class.getName(),
+				AuthenticationFailureCredentialsExpiredEvent.class);
+		addMapping(
+				"org.springframework.security.authentication.cas.ProxyUntrustedException",
+				AuthenticationFailureProxyUntrustedEvent.class);
+	}
 
-    public void publishAuthenticationSuccess(Authentication authentication) {
-        if (applicationEventPublisher != null) {
-            applicationEventPublisher.publishEvent(new AuthenticationSuccessEvent(authentication));
-        }
-    }
+	public void publishAuthenticationSuccess(Authentication authentication) {
+		if (applicationEventPublisher != null) {
+			applicationEventPublisher.publishEvent(new AuthenticationSuccessEvent(
+					authentication));
+		}
+	}
 
-    public void publishAuthenticationFailure(AuthenticationException exception, Authentication authentication) {
-        Constructor<? extends AbstractAuthenticationEvent> constructor = exceptionMappings.get(exception.getClass().getName());
-        AbstractAuthenticationEvent event = null;
+	public void publishAuthenticationFailure(AuthenticationException exception,
+			Authentication authentication) {
+		Constructor<? extends AbstractAuthenticationEvent> constructor = exceptionMappings
+				.get(exception.getClass().getName());
+		AbstractAuthenticationEvent event = null;
 
-        if (constructor != null) {
-            try {
-                event = constructor.newInstance(authentication, exception);
-            } catch (IllegalAccessException ignored) {}
-            catch (InstantiationException ignored) {}
-            catch (InvocationTargetException ignored) {}
-        }
+		if (constructor != null) {
+			try {
+				event = constructor.newInstance(authentication, exception);
+			}
+			catch (IllegalAccessException ignored) {
+			}
+			catch (InstantiationException ignored) {
+			}
+			catch (InvocationTargetException ignored) {
+			}
+		}
 
-        if (event != null) {
-            if (applicationEventPublisher != null) {
-                applicationEventPublisher.publishEvent(event);
-            }
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug("No event was found for the exception " + exception.getClass().getName());
-            }
-        }
-    }
+		if (event != null) {
+			if (applicationEventPublisher != null) {
+				applicationEventPublisher.publishEvent(event);
+			}
+		}
+		else {
+			if (logger.isDebugEnabled()) {
+				logger.debug("No event was found for the exception "
+						+ exception.getClass().getName());
+			}
+		}
+	}
 
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.applicationEventPublisher = applicationEventPublisher;
-    }
+	public void setApplicationEventPublisher(
+			ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
 
-    /**
-     * Sets additional exception to event mappings. These are automatically merged with the default
-     * exception to event mappings that <code>ProviderManager</code> defines.
-     *
-     * @param additionalExceptionMappings where keys are the fully-qualified string name of the exception class and the
-     * values are the fully-qualified string name of the event class to fire.
-     */
-    @SuppressWarnings({"unchecked"})
-    public void setAdditionalExceptionMappings(Properties additionalExceptionMappings) {
-        Assert.notNull(additionalExceptionMappings, "The exceptionMappings object must not be null");
-        for(Object exceptionClass : additionalExceptionMappings.keySet()) {
-            String eventClass = (String) additionalExceptionMappings.get(exceptionClass);
-            try {
-                Class<?> clazz = getClass().getClassLoader().loadClass(eventClass);
-                Assert.isAssignable(AbstractAuthenticationFailureEvent.class, clazz);
-                addMapping((String) exceptionClass, (Class<? extends AbstractAuthenticationFailureEvent>) clazz);
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException("Failed to load authentication event class " + eventClass);
-            }
-        }
-    }
+	/**
+	 * Sets additional exception to event mappings. These are automatically merged with
+	 * the default exception to event mappings that <code>ProviderManager</code> defines.
+	 *
+	 * @param additionalExceptionMappings where keys are the fully-qualified string name
+	 * of the exception class and the values are the fully-qualified string name of the
+	 * event class to fire.
+	 */
+	@SuppressWarnings({ "unchecked" })
+	public void setAdditionalExceptionMappings(Properties additionalExceptionMappings) {
+		Assert.notNull(additionalExceptionMappings,
+				"The exceptionMappings object must not be null");
+		for (Object exceptionClass : additionalExceptionMappings.keySet()) {
+			String eventClass = (String) additionalExceptionMappings.get(exceptionClass);
+			try {
+				Class<?> clazz = getClass().getClassLoader().loadClass(eventClass);
+				Assert.isAssignable(AbstractAuthenticationFailureEvent.class, clazz);
+				addMapping((String) exceptionClass,
+						(Class<? extends AbstractAuthenticationFailureEvent>) clazz);
+			}
+			catch (ClassNotFoundException e) {
+				throw new RuntimeException("Failed to load authentication event class "
+						+ eventClass);
+			}
+		}
+	}
 
-    private void addMapping(String exceptionClass,
-                            Class<? extends AbstractAuthenticationFailureEvent> eventClass) {
-        try {
-            Constructor<? extends AbstractAuthenticationEvent> constructor =
-                    eventClass.getConstructor(Authentication.class, AuthenticationException.class);
-            exceptionMappings.put(exceptionClass, constructor);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Authentication event class " + eventClass.getName() + " has no suitable constructor");
-        }
-    }
+	private void addMapping(String exceptionClass,
+			Class<? extends AbstractAuthenticationFailureEvent> eventClass) {
+		try {
+			Constructor<? extends AbstractAuthenticationEvent> constructor = eventClass
+					.getConstructor(Authentication.class, AuthenticationException.class);
+			exceptionMappings.put(exceptionClass, constructor);
+		}
+		catch (NoSuchMethodException e) {
+			throw new RuntimeException("Authentication event class "
+					+ eventClass.getName() + " has no suitable constructor");
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/DisabledException.java b/core/src/main/java/org/springframework/security/authentication/DisabledException.java
index 06fae8e8d9..bc211c8c5b 100644
--- a/core/src/main/java/org/springframework/security/authentication/DisabledException.java
+++ b/core/src/main/java/org/springframework/security/authentication/DisabledException.java
@@ -16,31 +16,32 @@
 package org.springframework.security.authentication;
 
 /**
- * Thrown if an authentication request is rejected because the account is disabled. Makes no assertion as to
- * whether or not the credentials were valid.
+ * Thrown if an authentication request is rejected because the account is disabled. Makes
+ * no assertion as to whether or not the credentials were valid.
  *
  * @author Ben Alex
  */
 public class DisabledException extends AccountStatusException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>DisabledException</code> with the specified message.
-     *
-     * @param msg the detail message
-     */
-    public DisabledException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>DisabledException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public DisabledException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a <code>DisabledException</code> with the specified message
-     * and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public DisabledException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>DisabledException</code> with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public DisabledException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
index 8fea87604f..1bfece07c7 100644
--- a/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/authentication/InsufficientAuthenticationException.java
@@ -17,38 +17,41 @@ package org.springframework.security.authentication;
 
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Thrown if an authentication request is rejected because the credentials are not sufficiently trusted.
+ * Thrown if an authentication request is rejected because the credentials are not
+ * sufficiently trusted.
  * <p>
- * {@link org.springframework.security.access.AccessDecisionVoter}s will typically throw this exception if
- * they are dissatisfied with the level of the authentication, such as if performed using a remember-me mechanism or
- * anonymously. The {@code ExceptionTranslationFilter} will then typically cause the {@code AuthenticationEntryPoint}
- * to be called, allowing the principal to authenticate with a stronger level of authentication.
+ * {@link org.springframework.security.access.AccessDecisionVoter}s will typically throw
+ * this exception if they are dissatisfied with the level of the authentication, such as
+ * if performed using a remember-me mechanism or anonymously. The
+ * {@code ExceptionTranslationFilter} will then typically cause the
+ * {@code AuthenticationEntryPoint} to be called, allowing the principal to authenticate
+ * with a stronger level of authentication.
  *
  * @author Ben Alex
  */
 public class InsufficientAuthenticationException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an <code>InsufficientAuthenticationException</code> with the
-     * specified message.
-     *
-     * @param msg the detail message
-     */
-    public InsufficientAuthenticationException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an <code>InsufficientAuthenticationException</code> with the specified
+	 * message.
+	 *
+	 * @param msg the detail message
+	 */
+	public InsufficientAuthenticationException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs an <code>InsufficientAuthenticationException</code> with the
-     * specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public InsufficientAuthenticationException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an <code>InsufficientAuthenticationException</code> with the specified
+	 * message and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public InsufficientAuthenticationException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/InternalAuthenticationServiceException.java b/core/src/main/java/org/springframework/security/authentication/InternalAuthenticationServiceException.java
index 09e8ce3e81..564b357587 100644
--- a/core/src/main/java/org/springframework/security/authentication/InternalAuthenticationServiceException.java
+++ b/core/src/main/java/org/springframework/security/authentication/InternalAuthenticationServiceException.java
@@ -14,27 +14,31 @@ package org.springframework.security.authentication;
 
 /**
  * <p>
- * Thrown if an authentication request could not be processed due to a system problem that occurred internally. It
- * differs from {@link AuthenticationServiceException} in that it would not be thrown if an external system has an
- * internal error or failure. This ensures that we can handle errors that are within our control distinctly from errors
- * of other systems. The advantage to this distinction is that the untrusted external system should not be able to fill
- * up logs and cause excessive IO. However, an internal system should report errors.
+ * Thrown if an authentication request could not be processed due to a system problem that
+ * occurred internally. It differs from {@link AuthenticationServiceException} in that it
+ * would not be thrown if an external system has an internal error or failure. This
+ * ensures that we can handle errors that are within our control distinctly from errors of
+ * other systems. The advantage to this distinction is that the untrusted external system
+ * should not be able to fill up logs and cause excessive IO. However, an internal system
+ * should report errors.
  * </p>
  * <p>
- * This might be thrown if a backend authentication repository is unavailable, for example. However, it would not be
- * thrown in the event that an error occurred when validating an OpenID response with an OpenID Provider.
+ * This might be thrown if a backend authentication repository is unavailable, for
+ * example. However, it would not be thrown in the event that an error occurred when
+ * validating an OpenID response with an OpenID Provider.
  * </p>
  *
  * @author Rob Winch
  *
  */
-public class InternalAuthenticationServiceException extends AuthenticationServiceException {
+public class InternalAuthenticationServiceException extends
+		AuthenticationServiceException {
 
-    public InternalAuthenticationServiceException(String message, Throwable cause) {
-        super(message, cause);
-    }
+	public InternalAuthenticationServiceException(String message, Throwable cause) {
+		super(message, cause);
+	}
 
-    public InternalAuthenticationServiceException(String message) {
-        super(message);
-    }
+	public InternalAuthenticationServiceException(String message) {
+		super(message);
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/authentication/LockedException.java b/core/src/main/java/org/springframework/security/authentication/LockedException.java
index fa102cb5aa..8b8b7ef4fb 100644
--- a/core/src/main/java/org/springframework/security/authentication/LockedException.java
+++ b/core/src/main/java/org/springframework/security/authentication/LockedException.java
@@ -15,33 +15,33 @@
 
 package org.springframework.security.authentication;
 
-
 /**
- * Thrown if an authentication request is rejected because the account is locked. Makes no assertion as to whether
- * or not the credentials were valid.
+ * Thrown if an authentication request is rejected because the account is locked. Makes no
+ * assertion as to whether or not the credentials were valid.
  *
  * @author Ben Alex
  */
 public class LockedException extends AccountStatusException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>LockedException</code> with the specified message.
-     *
-     * @param msg the detail message.
-     */
-    public LockedException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>LockedException</code> with the specified message.
+	 *
+	 * @param msg the detail message.
+	 */
+	public LockedException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a <code>LockedException</code> with the specified message and
-     * root cause.
-     *
-     * @param msg the detail message.
-     * @param t root cause
-     */
-    public LockedException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>LockedException</code> with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message.
+	 * @param t root cause
+	 */
+	public LockedException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java
index 6cbea8c4d2..473436ac9f 100644
--- a/core/src/main/java/org/springframework/security/authentication/ProviderManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/ProviderManager.java
@@ -30,43 +30,53 @@ import org.springframework.security.core.CredentialsContainer;
 import org.springframework.security.core.SpringSecurityMessageSource;
 import org.springframework.util.Assert;
 
-
 /**
- * Iterates an {@link Authentication} request through a list of {@link AuthenticationProvider}s.
+ * Iterates an {@link Authentication} request through a list of
+ * {@link AuthenticationProvider}s.
  *
  * <p>
- * <tt>AuthenticationProvider</tt>s are usually tried in order until one provides a non-null response.
- * A non-null response indicates the provider had authority to decide on the authentication request and no further
- * providers are tried.
- * If a subsequent provider successfully authenticates the request, the earlier authentication exception is disregarded
- * and the successful authentication will be used. If no subsequent provider provides a non-null response, or a new
- * <code>AuthenticationException</code>, the last <code>AuthenticationException</code> received will be used.
- * If no provider returns a non-null response, or indicates it can even process an <code>Authentication</code>,
- * the <code>ProviderManager</code> will throw a <code>ProviderNotFoundException</code>.
- * A parent {@code AuthenticationManager} can also be set, and this will also be tried if none of the configured
- * providers can perform the authentication. This is intended to support namespace configuration options though and
+ * <tt>AuthenticationProvider</tt>s are usually tried in order until one provides a
+ * non-null response. A non-null response indicates the provider had authority to decide
+ * on the authentication request and no further providers are tried. If a subsequent
+ * provider successfully authenticates the request, the earlier authentication exception
+ * is disregarded and the successful authentication will be used. If no subsequent
+ * provider provides a non-null response, or a new <code>AuthenticationException</code>,
+ * the last <code>AuthenticationException</code> received will be used. If no provider
+ * returns a non-null response, or indicates it can even process an
+ * <code>Authentication</code>, the <code>ProviderManager</code> will throw a
+ * <code>ProviderNotFoundException</code>. A parent {@code AuthenticationManager} can also
+ * be set, and this will also be tried if none of the configured providers can perform the
+ * authentication. This is intended to support namespace configuration options though and
  * is not a feature that should normally be required.
  * <p>
- * The exception to this process is when a provider throws an {@link AccountStatusException}, in which case no
- * further providers in the list will be queried.
+ * The exception to this process is when a provider throws an
+ * {@link AccountStatusException}, in which case no further providers in the list will be
+ * queried.
  *
- * Post-authentication, the credentials will be cleared from the returned {@code Authentication} object, if it
- * implements the {@link CredentialsContainer} interface. This behaviour can be controlled by modifying the
- * {@link #setEraseCredentialsAfterAuthentication(boolean) eraseCredentialsAfterAuthentication} property.
+ * Post-authentication, the credentials will be cleared from the returned
+ * {@code Authentication} object, if it implements the {@link CredentialsContainer}
+ * interface. This behaviour can be controlled by modifying the
+ * {@link #setEraseCredentialsAfterAuthentication(boolean)
+ * eraseCredentialsAfterAuthentication} property.
  *
  * <h2>Event Publishing</h2>
  * <p>
- * Authentication event publishing is delegated to the configured {@link AuthenticationEventPublisher} which defaults
- * to a null implementation which doesn't publish events, so if you are configuring the bean yourself you must inject
- * a publisher bean if you want to receive events. The standard implementation is {@link DefaultAuthenticationEventPublisher}
- * which maps common exceptions to events (in the case of authentication failure) and publishes an
- * {@link org.springframework.security.authentication.event.AuthenticationSuccessEvent AuthenticationSuccessEvent} if
- * authentication succeeds. If you are using the namespace then an instance of this bean will be used automatically by
- * the <tt>&lt;http&gt;</tt> configuration, so you will receive events from the web part of your application automatically.
+ * Authentication event publishing is delegated to the configured
+ * {@link AuthenticationEventPublisher} which defaults to a null implementation which
+ * doesn't publish events, so if you are configuring the bean yourself you must inject a
+ * publisher bean if you want to receive events. The standard implementation is
+ * {@link DefaultAuthenticationEventPublisher} which maps common exceptions to events (in
+ * the case of authentication failure) and publishes an
+ * {@link org.springframework.security.authentication.event.AuthenticationSuccessEvent
+ * AuthenticationSuccessEvent} if authentication succeeds. If you are using the namespace
+ * then an instance of this bean will be used automatically by the <tt>&lt;http&gt;</tt>
+ * configuration, so you will receive events from the web part of your application
+ * automatically.
  * <p>
- * Note that the implementation also publishes authentication failure events when it obtains an authentication result
- * (or an exception) from the "parent" {@code AuthenticationManager} if one has been set. So in this situation, the
- * parent should not generally be configured to publish events or there will be duplicates.
+ * Note that the implementation also publishes authentication failure events when it
+ * obtains an authentication result (or an exception) from the "parent"
+ * {@code AuthenticationManager} if one has been set. So in this situation, the parent
+ * should not generally be configured to publish events or there will be duplicates.
  *
  *
  * @author Ben Alex
@@ -74,180 +84,207 @@ import org.springframework.util.Assert;
  *
  * @see DefaultAuthenticationEventPublisher
  */
-public class ProviderManager implements AuthenticationManager, MessageSourceAware, InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+public class ProviderManager implements AuthenticationManager, MessageSourceAware,
+		InitializingBean {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(ProviderManager.class);
+	private static final Log logger = LogFactory.getLog(ProviderManager.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationEventPublisher eventPublisher = new NullEventPublisher();
-    private List<AuthenticationProvider> providers = Collections.emptyList();
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private AuthenticationManager parent;
-    private boolean eraseCredentialsAfterAuthentication = true;
+	private AuthenticationEventPublisher eventPublisher = new NullEventPublisher();
+	private List<AuthenticationProvider> providers = Collections.emptyList();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private AuthenticationManager parent;
+	private boolean eraseCredentialsAfterAuthentication = true;
 
-    public ProviderManager(List<AuthenticationProvider> providers) {
-        this(providers, null);
-    }
+	public ProviderManager(List<AuthenticationProvider> providers) {
+		this(providers, null);
+	}
 
-    public ProviderManager(List<AuthenticationProvider> providers, AuthenticationManager parent) {
-        Assert.notNull(providers, "providers list cannot be null");
-        this.providers = providers;
-        this.parent = parent;
-        checkState();
-    }
+	public ProviderManager(List<AuthenticationProvider> providers,
+			AuthenticationManager parent) {
+		Assert.notNull(providers, "providers list cannot be null");
+		this.providers = providers;
+		this.parent = parent;
+		checkState();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        checkState();
-    }
+	public void afterPropertiesSet() throws Exception {
+		checkState();
+	}
 
-    private void checkState() {
-        if (parent == null && providers.isEmpty()) {
-            throw new IllegalArgumentException("A parent AuthenticationManager or a list " +
-                    "of AuthenticationProviders is required");
-        }
-    }
+	private void checkState() {
+		if (parent == null && providers.isEmpty()) {
+			throw new IllegalArgumentException(
+					"A parent AuthenticationManager or a list "
+							+ "of AuthenticationProviders is required");
+		}
+	}
 
-    /**
-     * Attempts to authenticate the passed {@link Authentication} object.
-     * <p>
-     * The list of {@link AuthenticationProvider}s will be successively tried until an
-     * <code>AuthenticationProvider</code> indicates it is  capable of authenticating the type of
-     * <code>Authentication</code> object passed. Authentication will then be attempted with that
-     * <code>AuthenticationProvider</code>.
-     * <p>
-     * If more than one <code>AuthenticationProvider</code> supports the passed <code>Authentication</code>
-     * object, only the first <code>AuthenticationProvider</code> tried will determine the result. No subsequent
-     * <code>AuthenticationProvider</code>s will be tried.
-     *
-     * @param authentication the authentication request object.
-     *
-     * @return a fully authenticated object including credentials.
-     *
-     * @throws AuthenticationException if authentication fails.
-     */
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        Class<? extends Authentication> toTest = authentication.getClass();
-        AuthenticationException lastException = null;
-        Authentication result = null;
-        boolean debug = logger.isDebugEnabled();
+	/**
+	 * Attempts to authenticate the passed {@link Authentication} object.
+	 * <p>
+	 * The list of {@link AuthenticationProvider}s will be successively tried until an
+	 * <code>AuthenticationProvider</code> indicates it is capable of authenticating the
+	 * type of <code>Authentication</code> object passed. Authentication will then be
+	 * attempted with that <code>AuthenticationProvider</code>.
+	 * <p>
+	 * If more than one <code>AuthenticationProvider</code> supports the passed
+	 * <code>Authentication</code> object, only the first
+	 * <code>AuthenticationProvider</code> tried will determine the result. No subsequent
+	 * <code>AuthenticationProvider</code>s will be tried.
+	 *
+	 * @param authentication the authentication request object.
+	 *
+	 * @return a fully authenticated object including credentials.
+	 *
+	 * @throws AuthenticationException if authentication fails.
+	 */
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		Class<? extends Authentication> toTest = authentication.getClass();
+		AuthenticationException lastException = null;
+		Authentication result = null;
+		boolean debug = logger.isDebugEnabled();
 
-        for (AuthenticationProvider provider : getProviders()) {
-            if (!provider.supports(toTest)) {
-                continue;
-            }
+		for (AuthenticationProvider provider : getProviders()) {
+			if (!provider.supports(toTest)) {
+				continue;
+			}
 
-            if (debug) {
-                logger.debug("Authentication attempt using " + provider.getClass().getName());
-            }
+			if (debug) {
+				logger.debug("Authentication attempt using "
+						+ provider.getClass().getName());
+			}
 
-            try {
-                result = provider.authenticate(authentication);
+			try {
+				result = provider.authenticate(authentication);
 
-                if (result != null) {
-                    copyDetails(authentication, result);
-                    break;
-                }
-            } catch (AccountStatusException e) {
-                prepareException(e, authentication);
-                // SEC-546: Avoid polling additional providers if auth failure is due to invalid account status
-                throw e;
-            } catch (InternalAuthenticationServiceException e) {
-                prepareException(e, authentication);
-                throw e;
-            } catch (AuthenticationException e) {
-                lastException = e;
-            }
-        }
+				if (result != null) {
+					copyDetails(authentication, result);
+					break;
+				}
+			}
+			catch (AccountStatusException e) {
+				prepareException(e, authentication);
+				// SEC-546: Avoid polling additional providers if auth failure is due to
+				// invalid account status
+				throw e;
+			}
+			catch (InternalAuthenticationServiceException e) {
+				prepareException(e, authentication);
+				throw e;
+			}
+			catch (AuthenticationException e) {
+				lastException = e;
+			}
+		}
 
-        if (result == null && parent != null) {
-            // Allow the parent to try.
-            try {
-                result = parent.authenticate(authentication);
-            } catch (ProviderNotFoundException e) {
-                // ignore as we will throw below if no other exception occurred prior to calling parent and the parent
-                // may throw ProviderNotFound even though a provider in the child already handled the request
-            } catch (AuthenticationException e) {
-                lastException = e;
-            }
-        }
+		if (result == null && parent != null) {
+			// Allow the parent to try.
+			try {
+				result = parent.authenticate(authentication);
+			}
+			catch (ProviderNotFoundException e) {
+				// ignore as we will throw below if no other exception occurred prior to
+				// calling parent and the parent
+				// may throw ProviderNotFound even though a provider in the child already
+				// handled the request
+			}
+			catch (AuthenticationException e) {
+				lastException = e;
+			}
+		}
 
-        if (result != null) {
-            if (eraseCredentialsAfterAuthentication && (result instanceof CredentialsContainer)) {
-                // Authentication is complete. Remove credentials and other secret data from authentication
-                ((CredentialsContainer)result).eraseCredentials();
-            }
+		if (result != null) {
+			if (eraseCredentialsAfterAuthentication
+					&& (result instanceof CredentialsContainer)) {
+				// Authentication is complete. Remove credentials and other secret data
+				// from authentication
+				((CredentialsContainer) result).eraseCredentials();
+			}
 
-            eventPublisher.publishAuthenticationSuccess(result);
-            return result;
-        }
+			eventPublisher.publishAuthenticationSuccess(result);
+			return result;
+		}
 
-        // Parent was null, or didn't authenticate (or throw an exception).
+		// Parent was null, or didn't authenticate (or throw an exception).
 
-        if (lastException == null) {
-            lastException = new ProviderNotFoundException(messages.getMessage("ProviderManager.providerNotFound",
-                        new Object[] {toTest.getName()}, "No AuthenticationProvider found for {0}"));
-        }
+		if (lastException == null) {
+			lastException = new ProviderNotFoundException(messages.getMessage(
+					"ProviderManager.providerNotFound",
+					new Object[] { toTest.getName() },
+					"No AuthenticationProvider found for {0}"));
+		}
 
-        prepareException(lastException, authentication);
+		prepareException(lastException, authentication);
 
-        throw lastException;
-    }
+		throw lastException;
+	}
 
-    @SuppressWarnings("deprecation")
-    private void prepareException(AuthenticationException ex, Authentication auth) {
-        eventPublisher.publishAuthenticationFailure(ex, auth);
-    }
+	@SuppressWarnings("deprecation")
+	private void prepareException(AuthenticationException ex, Authentication auth) {
+		eventPublisher.publishAuthenticationFailure(ex, auth);
+	}
 
-    /**
-     * Copies the authentication details from a source Authentication object to a destination one, provided the
-     * latter does not already have one set.
-     *
-     * @param source source authentication
-     * @param dest the destination authentication object
-     */
-    private void copyDetails(Authentication source, Authentication dest) {
-        if ((dest instanceof AbstractAuthenticationToken) && (dest.getDetails() == null)) {
-            AbstractAuthenticationToken token = (AbstractAuthenticationToken) dest;
+	/**
+	 * Copies the authentication details from a source Authentication object to a
+	 * destination one, provided the latter does not already have one set.
+	 *
+	 * @param source source authentication
+	 * @param dest the destination authentication object
+	 */
+	private void copyDetails(Authentication source, Authentication dest) {
+		if ((dest instanceof AbstractAuthenticationToken) && (dest.getDetails() == null)) {
+			AbstractAuthenticationToken token = (AbstractAuthenticationToken) dest;
 
-            token.setDetails(source.getDetails());
-        }
-    }
+			token.setDetails(source.getDetails());
+		}
+	}
 
-    public List<AuthenticationProvider> getProviders() {
-        return providers;
-    }
+	public List<AuthenticationProvider> getProviders() {
+		return providers;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public void setAuthenticationEventPublisher(AuthenticationEventPublisher eventPublisher) {
-        Assert.notNull(eventPublisher, "AuthenticationEventPublisher cannot be null");
-        this.eventPublisher = eventPublisher;
-    }
+	public void setAuthenticationEventPublisher(
+			AuthenticationEventPublisher eventPublisher) {
+		Assert.notNull(eventPublisher, "AuthenticationEventPublisher cannot be null");
+		this.eventPublisher = eventPublisher;
+	}
 
-    /**
-     * If set to, a resulting {@code Authentication} which implements the {@code CredentialsContainer} interface
-     * will have its {@link CredentialsContainer#eraseCredentials() eraseCredentials} method called before it is returned
-     * from the {@code authenticate()} method.
-     *
-     * @param eraseSecretData set to {@literal false} to retain the credentials data in memory.
-     * Defaults to {@literal true}.
-     */
-    public void setEraseCredentialsAfterAuthentication(boolean eraseSecretData) {
-        this.eraseCredentialsAfterAuthentication = eraseSecretData;
-    }
+	/**
+	 * If set to, a resulting {@code Authentication} which implements the
+	 * {@code CredentialsContainer} interface will have its
+	 * {@link CredentialsContainer#eraseCredentials() eraseCredentials} method called
+	 * before it is returned from the {@code authenticate()} method.
+	 *
+	 * @param eraseSecretData set to {@literal false} to retain the credentials data in
+	 * memory. Defaults to {@literal true}.
+	 */
+	public void setEraseCredentialsAfterAuthentication(boolean eraseSecretData) {
+		this.eraseCredentialsAfterAuthentication = eraseSecretData;
+	}
 
-    public boolean isEraseCredentialsAfterAuthentication() {
-        return eraseCredentialsAfterAuthentication;
-    }
+	public boolean isEraseCredentialsAfterAuthentication() {
+		return eraseCredentialsAfterAuthentication;
+	}
 
-    private static final class NullEventPublisher implements AuthenticationEventPublisher {
-        public void publishAuthenticationFailure(AuthenticationException exception, Authentication authentication) {}
-        public void publishAuthenticationSuccess(Authentication authentication) {}
-    }
+	private static final class NullEventPublisher implements AuthenticationEventPublisher {
+		public void publishAuthenticationFailure(AuthenticationException exception,
+				Authentication authentication) {
+		}
+
+		public void publishAuthenticationSuccess(Authentication authentication) {
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
index a1f791685a..02440c27e2 100644
--- a/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/authentication/ProviderNotFoundException.java
@@ -17,24 +17,23 @@ package org.springframework.security.authentication;
 
 import org.springframework.security.core.AuthenticationException;
 
-
-
 /**
- * Thrown by {@link ProviderManager} if no  {@link AuthenticationProvider} could be found that supports the
- * presented {@link org.springframework.security.core.Authentication} object.
+ * Thrown by {@link ProviderManager} if no {@link AuthenticationProvider} could be found
+ * that supports the presented {@link org.springframework.security.core.Authentication}
+ * object.
  *
  * @author Ben Alex
  */
 public class ProviderNotFoundException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>ProviderNotFoundException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public ProviderNotFoundException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>ProviderNotFoundException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public ProviderNotFoundException(String msg) {
+		super(msg);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
index 9714712d44..4baef1709e 100644
--- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java
@@ -24,53 +24,58 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.SpringSecurityMessageSource;
 import org.springframework.util.Assert;
 
-
 /**
- * An {@link AuthenticationProvider} implementation that validates {@link RememberMeAuthenticationToken}s.
+ * An {@link AuthenticationProvider} implementation that validates
+ * {@link RememberMeAuthenticationToken}s.
  * <p>
- * To be successfully validated, the {@link RememberMeAuthenticationToken#getKeyHash()} must match this class'
- * {@link #getKey()}.
+ * To be successfully validated, the {@link RememberMeAuthenticationToken#getKeyHash()}
+ * must match this class' {@link #getKey()}.
  */
-public class RememberMeAuthenticationProvider implements AuthenticationProvider, InitializingBean, MessageSourceAware {
-    //~ Instance fields ================================================================================================
+public class RememberMeAuthenticationProvider implements AuthenticationProvider,
+		InitializingBean, MessageSourceAware {
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private String key;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private String key;
 
+	public RememberMeAuthenticationProvider(String key) {
+		Assert.hasLength(key);
+		this.key = key;
+	}
 
-    public RememberMeAuthenticationProvider(String key) {
-        Assert.hasLength(key);
-        this.key = key;
-    }
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.messages, "A message source must be set");
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.messages, "A message source must be set");
-    }
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		if (!supports(authentication.getClass())) {
+			return null;
+		}
 
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        if (!supports(authentication.getClass())) {
-            return null;
-        }
+		if (this.key.hashCode() != ((RememberMeAuthenticationToken) authentication)
+				.getKeyHash()) {
+			throw new BadCredentialsException(
+					messages.getMessage("RememberMeAuthenticationProvider.incorrectKey",
+							"The presented RememberMeAuthenticationToken does not contain the expected key"));
+		}
 
-        if (this.key.hashCode() != ((RememberMeAuthenticationToken) authentication).getKeyHash()) {
-            throw new BadCredentialsException(messages.getMessage("RememberMeAuthenticationProvider.incorrectKey",
-                    "The presented RememberMeAuthenticationToken does not contain the expected key"));
-        }
+		return authentication;
+	}
 
-        return authentication;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
-
-    public boolean supports(Class<?> authentication) {
-        return (RememberMeAuthenticationToken.class.isAssignableFrom(authentication));
-    }
+	public boolean supports(Class<?> authentication) {
+		return (RememberMeAuthenticationToken.class.isAssignableFrom(authentication));
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
index 2315f0fab8..0cf44b2729 100644
--- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationToken.java
@@ -20,83 +20,88 @@ import java.util.Collection;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
  * Represents a remembered <code>Authentication</code>.
  * <p>
- * A remembered <code>Authentication</code> must provide a fully valid <code>Authentication</code>, including the
- * <code>GrantedAuthority</code>s that apply.
+ * A remembered <code>Authentication</code> must provide a fully valid
+ * <code>Authentication</code>, including the <code>GrantedAuthority</code>s that apply.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
 public class RememberMeAuthenticationToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Object principal;
-    private final int keyHash;
+	private final Object principal;
+	private final int keyHash;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor.
-     *
-     * @param key to identify if this object made by an authorised client
-     * @param principal the principal (typically a <code>UserDetails</code>)
-     * @param authorities the authorities granted to the principal
-     *
-     * @throws IllegalArgumentException if a <code>null</code> was passed
-     */
-    public RememberMeAuthenticationToken(String key, Object principal, Collection<? extends GrantedAuthority> authorities) {
-        super(authorities);
+	/**
+	 * Constructor.
+	 *
+	 * @param key to identify if this object made by an authorised client
+	 * @param principal the principal (typically a <code>UserDetails</code>)
+	 * @param authorities the authorities granted to the principal
+	 *
+	 * @throws IllegalArgumentException if a <code>null</code> was passed
+	 */
+	public RememberMeAuthenticationToken(String key, Object principal,
+			Collection<? extends GrantedAuthority> authorities) {
+		super(authorities);
 
-        if ((key == null) || ("".equals(key)) || (principal == null) || "".equals(principal)) {
-            throw new IllegalArgumentException("Cannot pass null or empty values to constructor");
-        }
+		if ((key == null) || ("".equals(key)) || (principal == null)
+				|| "".equals(principal)) {
+			throw new IllegalArgumentException(
+					"Cannot pass null or empty values to constructor");
+		}
 
-        this.keyHash = key.hashCode();
-        this.principal = principal;
-        setAuthenticated(true);
-    }
+		this.keyHash = key.hashCode();
+		this.principal = principal;
+		setAuthenticated(true);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Always returns an empty <code>String</code>
-     *
-     * @return an empty String
-     */
-    public Object getCredentials() {
-        return "";
-    }
+	/**
+	 * Always returns an empty <code>String</code>
+	 *
+	 * @return an empty String
+	 */
+	public Object getCredentials() {
+		return "";
+	}
 
-    public int getKeyHash() {
-        return this.keyHash;
-    }
+	public int getKeyHash() {
+		return this.keyHash;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 
-    public boolean equals(Object obj) {
-        if (!super.equals(obj)) {
-            return false;
-        }
+	public boolean equals(Object obj) {
+		if (!super.equals(obj)) {
+			return false;
+		}
 
-        if (obj instanceof RememberMeAuthenticationToken) {
-            RememberMeAuthenticationToken test = (RememberMeAuthenticationToken) obj;
+		if (obj instanceof RememberMeAuthenticationToken) {
+			RememberMeAuthenticationToken test = (RememberMeAuthenticationToken) obj;
 
-            if (this.getKeyHash() != test.getKeyHash()) {
-                return false;
-            }
+			if (this.getKeyHash() != test.getKeyHash()) {
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
index f19f8d805c..e216a949fe 100644
--- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationProvider.java
@@ -18,25 +18,29 @@ package org.springframework.security.authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * An {@link AuthenticationProvider} implementation for the  {@link TestingAuthenticationToken}.<p>It simply
- * accepts as valid whatever is contained within the <code>TestingAuthenticationToken</code>.</p>
+ * An {@link AuthenticationProvider} implementation for the
+ * {@link TestingAuthenticationToken}.
  * <p>
- * The purpose of this implementation is to facilitate unit testing. This provider should <b>never be enabled
- * on a production system</b>.
+ * It simply accepts as valid whatever is contained within the
+ * <code>TestingAuthenticationToken</code>.
+ * </p>
+ * <p>
+ * The purpose of this implementation is to facilitate unit testing. This provider should
+ * <b>never be enabled on a production system</b>.
  *
  * @author Ben Alex
  */
 public class TestingAuthenticationProvider implements AuthenticationProvider {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication authenticate(Authentication authentication)
-        throws AuthenticationException {
-        return authentication;
-    }
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		return authentication;
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return TestingAuthenticationToken.class.isAssignableFrom(authentication);
-    }
+	public boolean supports(Class<?> authentication) {
+		return TestingAuthenticationToken.class.isAssignableFrom(authentication);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
index fe2f0b476d..d276ac857b 100644
--- a/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/TestingAuthenticationToken.java
@@ -21,47 +21,52 @@ import java.util.List;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
- * An {@link org.springframework.security.core.Authentication} implementation that is designed for use whilst unit testing.
+ * An {@link org.springframework.security.core.Authentication} implementation that is
+ * designed for use whilst unit testing.
  * <p>
- * The corresponding authentication provider is  {@link TestingAuthenticationProvider}.
+ * The corresponding authentication provider is {@link TestingAuthenticationProvider}.
  *
  * @author Ben Alex
  */
 public class TestingAuthenticationToken extends AbstractAuthenticationToken {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private static final long serialVersionUID = 1L;
-    private final Object credentials;
-    private final Object principal;
+	private static final long serialVersionUID = 1L;
+	private final Object credentials;
+	private final Object principal;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public TestingAuthenticationToken(Object principal, Object credentials) {
-        super(null);
-        this.principal = principal;
-        this.credentials = credentials;
-    }
+	public TestingAuthenticationToken(Object principal, Object credentials) {
+		super(null);
+		this.principal = principal;
+		this.credentials = credentials;
+	}
 
-    public TestingAuthenticationToken(Object principal, Object credentials, String... authorities) {
-        this(principal, credentials, AuthorityUtils.createAuthorityList(authorities));
-        setAuthenticated(true);
-    }
+	public TestingAuthenticationToken(Object principal, Object credentials,
+			String... authorities) {
+		this(principal, credentials, AuthorityUtils.createAuthorityList(authorities));
+		setAuthenticated(true);
+	}
 
-    public TestingAuthenticationToken(Object principal, Object credentials, List<GrantedAuthority> authorities) {
-        super(authorities);
-        this.principal = principal;
-        this.credentials = credentials;
-    }
+	public TestingAuthenticationToken(Object principal, Object credentials,
+			List<GrantedAuthority> authorities) {
+		super(authorities);
+		this.principal = principal;
+		this.credentials = credentials;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Object getCredentials() {
-        return this.credentials;
-    }
+	public Object getCredentials() {
+		return this.credentials;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java
index 2e4181f203..61791d3483 100644
--- a/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/UsernamePasswordAuthenticationToken.java
@@ -20,80 +20,84 @@ import java.util.Collection;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
- * An {@link org.springframework.security.core.Authentication} implementation that is designed for simple presentation
- * of a username and password.
+ * An {@link org.springframework.security.core.Authentication} implementation that is
+ * designed for simple presentation of a username and password.
  * <p>
- * The <code>principal</code> and <code>credentials</code> should be set with an <code>Object</code> that provides
- * the respective property via its <code>Object.toString()</code> method. The simplest such <code>Object</code> to use
- * is <code>String</code>.
+ * The <code>principal</code> and <code>credentials</code> should be set with an
+ * <code>Object</code> that provides the respective property via its
+ * <code>Object.toString()</code> method. The simplest such <code>Object</code> to use is
+ * <code>String</code>.
  *
  * @author Ben Alex
  */
 public class UsernamePasswordAuthenticationToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Object principal;
-    private Object credentials;
+	private final Object principal;
+	private Object credentials;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * This constructor can be safely used by any code that wishes to create a
-     * <code>UsernamePasswordAuthenticationToken</code>, as the {@link
-     * #isAuthenticated()} will return <code>false</code>.
-     *
-     */
-    public UsernamePasswordAuthenticationToken(Object principal, Object credentials) {
-        super(null);
-        this.principal = principal;
-        this.credentials = credentials;
-        setAuthenticated(false);
-    }
+	/**
+	 * This constructor can be safely used by any code that wishes to create a
+	 * <code>UsernamePasswordAuthenticationToken</code>, as the {@link #isAuthenticated()}
+	 * will return <code>false</code>.
+	 *
+	 */
+	public UsernamePasswordAuthenticationToken(Object principal, Object credentials) {
+		super(null);
+		this.principal = principal;
+		this.credentials = credentials;
+		setAuthenticated(false);
+	}
 
-    /**
-     * This constructor should only be used by <code>AuthenticationManager</code> or <code>AuthenticationProvider</code>
-     * implementations that are satisfied with producing a trusted (i.e. {@link #isAuthenticated()} = <code>true</code>)
-     * authentication token.
-     *
-     * @param principal
-     * @param credentials
-     * @param authorities
-     */
-    public UsernamePasswordAuthenticationToken(Object principal, Object credentials, Collection<? extends GrantedAuthority> authorities) {
-        super(authorities);
-        this.principal = principal;
-        this.credentials = credentials;
-        super.setAuthenticated(true); // must use super, as we override
-    }
+	/**
+	 * This constructor should only be used by <code>AuthenticationManager</code> or
+	 * <code>AuthenticationProvider</code> implementations that are satisfied with
+	 * producing a trusted (i.e. {@link #isAuthenticated()} = <code>true</code>)
+	 * authentication token.
+	 *
+	 * @param principal
+	 * @param credentials
+	 * @param authorities
+	 */
+	public UsernamePasswordAuthenticationToken(Object principal, Object credentials,
+			Collection<? extends GrantedAuthority> authorities) {
+		super(authorities);
+		this.principal = principal;
+		this.credentials = credentials;
+		super.setAuthenticated(true); // must use super, as we override
+	}
 
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	public Object getCredentials() {
+		return this.credentials;
+	}
 
-    public Object getCredentials() {
-        return this.credentials;
-    }
+	public Object getPrincipal() {
+		return this.principal;
+	}
 
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
+		if (isAuthenticated) {
+			throw new IllegalArgumentException(
+					"Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
+		}
 
-    public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
-        if (isAuthenticated) {
-            throw new IllegalArgumentException(
-                "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
-        }
+		super.setAuthenticated(false);
+	}
 
-        super.setAuthenticated(false);
-    }
-
-    @Override
-    public void eraseCredentials() {
-        super.eraseCredentials();
-        credentials = null;
-    }
+	@Override
+	public void eraseCredentials() {
+		super.eraseCredentials();
+		credentials = null;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
index 051565762f..5866abe463 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/AbstractUserDetailsAuthenticationProvider.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.authentication.dao;
 
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.authentication.AccountExpiredException;
@@ -37,7 +36,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.cache.NullUserCache;
 
-
 import org.springframework.beans.factory.InitializingBean;
 
 import org.springframework.context.MessageSource;
@@ -46,296 +44,345 @@ import org.springframework.context.support.MessageSourceAccessor;
 
 import org.springframework.util.Assert;
 
-
 /**
- * A base {@link AuthenticationProvider} that allows subclasses to override and work with {@link
- * org.springframework.security.core.userdetails.UserDetails} objects. The class is designed to respond to {@link
- * UsernamePasswordAuthenticationToken} authentication requests.
+ * A base {@link AuthenticationProvider} that allows subclasses to override and work with
+ * {@link org.springframework.security.core.userdetails.UserDetails} objects. The class is
+ * designed to respond to {@link UsernamePasswordAuthenticationToken} authentication
+ * requests.
  *
  * <p>
- * Upon successful validation, a <code>UsernamePasswordAuthenticationToken</code> will be created and returned to the
- * caller. The token will include as its principal either a <code>String</code> representation of the username, or the
- * {@link UserDetails} that was returned from the authentication repository. Using <code>String</code> is appropriate
- * if a container adapter is being used, as it expects <code>String</code> representations of the username.
- * Using <code>UserDetails</code> is appropriate if you require access to additional properties of the authenticated
- * user, such as email addresses, human-friendly names etc. As container adapters are not recommended to be used,
- * and <code>UserDetails</code> implementations provide additional flexibility, by default a <code>UserDetails</code>
- * is returned. To override this
- * default, set the {@link #setForcePrincipalAsString} to <code>true</code>.
+ * Upon successful validation, a <code>UsernamePasswordAuthenticationToken</code> will be
+ * created and returned to the caller. The token will include as its principal either a
+ * <code>String</code> representation of the username, or the {@link UserDetails} that was
+ * returned from the authentication repository. Using <code>String</code> is appropriate
+ * if a container adapter is being used, as it expects <code>String</code> representations
+ * of the username. Using <code>UserDetails</code> is appropriate if you require access to
+ * additional properties of the authenticated user, such as email addresses,
+ * human-friendly names etc. As container adapters are not recommended to be used, and
+ * <code>UserDetails</code> implementations provide additional flexibility, by default a
+ * <code>UserDetails</code> is returned. To override this default, set the
+ * {@link #setForcePrincipalAsString} to <code>true</code>.
  * <p>
- * Caching is handled by storing the <code>UserDetails</code> object being placed in the {@link UserCache}. This
- * ensures that subsequent requests with the same username can be validated without needing to query the {@link
- * UserDetailsService}. It should be noted that if a user appears to present an incorrect password, the {@link
- * UserDetailsService} will be queried to confirm the most up-to-date password was used for comparison.
- * Caching is only likely to be required for stateless applications. In a normal web application, for example,
- * the <tt>SecurityContext</tt> is stored in the user's session and the user isn't reauthenticated on
- * each request. The default cache implementation is therefore {@link NullUserCache}.
+ * Caching is handled by storing the <code>UserDetails</code> object being placed in the
+ * {@link UserCache}. This ensures that subsequent requests with the same username can be
+ * validated without needing to query the {@link UserDetailsService}. It should be noted
+ * that if a user appears to present an incorrect password, the {@link UserDetailsService}
+ * will be queried to confirm the most up-to-date password was used for comparison.
+ * Caching is only likely to be required for stateless applications. In a normal web
+ * application, for example, the <tt>SecurityContext</tt> is stored in the user's session
+ * and the user isn't reauthenticated on each request. The default cache implementation is
+ * therefore {@link NullUserCache}.
  *
  * @author Ben Alex
  */
-public abstract class AbstractUserDetailsAuthenticationProvider implements AuthenticationProvider, InitializingBean,
-        MessageSourceAware {
+public abstract class AbstractUserDetailsAuthenticationProvider implements
+		AuthenticationProvider, InitializingBean, MessageSourceAware {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private UserCache userCache = new NullUserCache();
-    private boolean forcePrincipalAsString = false;
-    protected boolean hideUserNotFoundExceptions = true;
-    private UserDetailsChecker preAuthenticationChecks = new DefaultPreAuthenticationChecks();
-    private UserDetailsChecker postAuthenticationChecks = new DefaultPostAuthenticationChecks();
-    private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private UserCache userCache = new NullUserCache();
+	private boolean forcePrincipalAsString = false;
+	protected boolean hideUserNotFoundExceptions = true;
+	private UserDetailsChecker preAuthenticationChecks = new DefaultPreAuthenticationChecks();
+	private UserDetailsChecker postAuthenticationChecks = new DefaultPostAuthenticationChecks();
+	private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Allows subclasses to perform any additional checks of a returned (or cached) <code>UserDetails</code>
-     * for a given authentication request. Generally a subclass will at least compare the {@link
-     * Authentication#getCredentials()} with a {@link UserDetails#getPassword()}. If custom logic is needed to compare
-     * additional properties of <code>UserDetails</code> and/or <code>UsernamePasswordAuthenticationToken</code>,
-     * these should also appear in this method.
-     *
-     * @param userDetails as retrieved from the {@link #retrieveUser(String, UsernamePasswordAuthenticationToken)} or
-     *        <code>UserCache</code>
-     * @param authentication the current request that needs to be authenticated
-     *
-     * @throws AuthenticationException AuthenticationException if the credentials could not be validated (generally a
-     *         <code>BadCredentialsException</code>, an <code>AuthenticationServiceException</code>)
-     */
-    protected abstract void additionalAuthenticationChecks(UserDetails userDetails,
-        UsernamePasswordAuthenticationToken authentication)
-        throws AuthenticationException;
+	/**
+	 * Allows subclasses to perform any additional checks of a returned (or cached)
+	 * <code>UserDetails</code> for a given authentication request. Generally a subclass
+	 * will at least compare the {@link Authentication#getCredentials()} with a
+	 * {@link UserDetails#getPassword()}. If custom logic is needed to compare additional
+	 * properties of <code>UserDetails</code> and/or
+	 * <code>UsernamePasswordAuthenticationToken</code>, these should also appear in this
+	 * method.
+	 *
+	 * @param userDetails as retrieved from the
+	 * {@link #retrieveUser(String, UsernamePasswordAuthenticationToken)} or
+	 * <code>UserCache</code>
+	 * @param authentication the current request that needs to be authenticated
+	 *
+	 * @throws AuthenticationException AuthenticationException if the credentials could
+	 * not be validated (generally a <code>BadCredentialsException</code>, an
+	 * <code>AuthenticationServiceException</code>)
+	 */
+	protected abstract void additionalAuthenticationChecks(UserDetails userDetails,
+			UsernamePasswordAuthenticationToken authentication)
+			throws AuthenticationException;
 
-    public final void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.userCache, "A user cache must be set");
-        Assert.notNull(this.messages, "A message source must be set");
-        doAfterPropertiesSet();
-    }
+	public final void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.userCache, "A user cache must be set");
+		Assert.notNull(this.messages, "A message source must be set");
+		doAfterPropertiesSet();
+	}
 
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
-            messages.getMessage("AbstractUserDetailsAuthenticationProvider.onlySupports",
-                "Only UsernamePasswordAuthenticationToken is supported"));
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
+				messages.getMessage(
+						"AbstractUserDetailsAuthenticationProvider.onlySupports",
+						"Only UsernamePasswordAuthenticationToken is supported"));
 
-        // Determine username
-        String username = (authentication.getPrincipal() == null) ? "NONE_PROVIDED" : authentication.getName();
+		// Determine username
+		String username = (authentication.getPrincipal() == null) ? "NONE_PROVIDED"
+				: authentication.getName();
 
-        boolean cacheWasUsed = true;
-        UserDetails user = this.userCache.getUserFromCache(username);
+		boolean cacheWasUsed = true;
+		UserDetails user = this.userCache.getUserFromCache(username);
 
-        if (user == null) {
-            cacheWasUsed = false;
+		if (user == null) {
+			cacheWasUsed = false;
 
-            try {
-                user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication);
-            } catch (UsernameNotFoundException notFound) {
-                logger.debug("User '" + username + "' not found");
+			try {
+				user = retrieveUser(username,
+						(UsernamePasswordAuthenticationToken) authentication);
+			}
+			catch (UsernameNotFoundException notFound) {
+				logger.debug("User '" + username + "' not found");
 
-                if (hideUserNotFoundExceptions) {
-                    throw new BadCredentialsException(messages.getMessage(
-                            "AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
-                } else {
-                    throw notFound;
-                }
-            }
+				if (hideUserNotFoundExceptions) {
+					throw new BadCredentialsException(messages.getMessage(
+							"AbstractUserDetailsAuthenticationProvider.badCredentials",
+							"Bad credentials"));
+				}
+				else {
+					throw notFound;
+				}
+			}
 
-            Assert.notNull(user, "retrieveUser returned null - a violation of the interface contract");
-        }
+			Assert.notNull(user,
+					"retrieveUser returned null - a violation of the interface contract");
+		}
 
-        try {
-            preAuthenticationChecks.check(user);
-            additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication);
-        } catch (AuthenticationException exception) {
-            if (cacheWasUsed) {
-                // There was a problem, so try again after checking
-                // we're using latest data (i.e. not from the cache)
-                cacheWasUsed = false;
-                user = retrieveUser(username, (UsernamePasswordAuthenticationToken) authentication);
-                preAuthenticationChecks.check(user);
-                additionalAuthenticationChecks(user, (UsernamePasswordAuthenticationToken) authentication);
-            } else {
-                throw exception;
-            }
-        }
+		try {
+			preAuthenticationChecks.check(user);
+			additionalAuthenticationChecks(user,
+					(UsernamePasswordAuthenticationToken) authentication);
+		}
+		catch (AuthenticationException exception) {
+			if (cacheWasUsed) {
+				// There was a problem, so try again after checking
+				// we're using latest data (i.e. not from the cache)
+				cacheWasUsed = false;
+				user = retrieveUser(username,
+						(UsernamePasswordAuthenticationToken) authentication);
+				preAuthenticationChecks.check(user);
+				additionalAuthenticationChecks(user,
+						(UsernamePasswordAuthenticationToken) authentication);
+			}
+			else {
+				throw exception;
+			}
+		}
 
-        postAuthenticationChecks.check(user);
+		postAuthenticationChecks.check(user);
 
-        if (!cacheWasUsed) {
-            this.userCache.putUserInCache(user);
-        }
+		if (!cacheWasUsed) {
+			this.userCache.putUserInCache(user);
+		}
 
-        Object principalToReturn = user;
+		Object principalToReturn = user;
 
-        if (forcePrincipalAsString) {
-            principalToReturn = user.getUsername();
-        }
+		if (forcePrincipalAsString) {
+			principalToReturn = user.getUsername();
+		}
 
-        return createSuccessAuthentication(principalToReturn, authentication, user);
-    }
+		return createSuccessAuthentication(principalToReturn, authentication, user);
+	}
 
-    /**
-     * Creates a successful {@link Authentication} object.<p>Protected so subclasses can override.</p>
-     *  <p>Subclasses will usually store the original credentials the user supplied (not salted or encoded
-     * passwords) in the returned <code>Authentication</code> object.</p>
-     *
-     * @param principal that should be the principal in the returned object (defined by the {@link
-     *        #isForcePrincipalAsString()} method)
-     * @param authentication that was presented to the provider for validation
-     * @param user that was loaded by the implementation
-     *
-     * @return the successful authentication token
-     */
-    protected Authentication createSuccessAuthentication(Object principal, Authentication authentication,
-            UserDetails user) {
-        // Ensure we return the original credentials the user supplied,
-        // so subsequent attempts are successful even with encoded passwords.
-        // Also ensure we return the original getDetails(), so that future
-        // authentication events after cache expiry contain the details
-        UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(principal,
-                authentication.getCredentials(), authoritiesMapper.mapAuthorities(user.getAuthorities()));
-        result.setDetails(authentication.getDetails());
+	/**
+	 * Creates a successful {@link Authentication} object.
+	 * <p>
+	 * Protected so subclasses can override.
+	 * </p>
+	 * <p>
+	 * Subclasses will usually store the original credentials the user supplied (not
+	 * salted or encoded passwords) in the returned <code>Authentication</code> object.
+	 * </p>
+	 *
+	 * @param principal that should be the principal in the returned object (defined by
+	 * the {@link #isForcePrincipalAsString()} method)
+	 * @param authentication that was presented to the provider for validation
+	 * @param user that was loaded by the implementation
+	 *
+	 * @return the successful authentication token
+	 */
+	protected Authentication createSuccessAuthentication(Object principal,
+			Authentication authentication, UserDetails user) {
+		// Ensure we return the original credentials the user supplied,
+		// so subsequent attempts are successful even with encoded passwords.
+		// Also ensure we return the original getDetails(), so that future
+		// authentication events after cache expiry contain the details
+		UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(
+				principal, authentication.getCredentials(),
+				authoritiesMapper.mapAuthorities(user.getAuthorities()));
+		result.setDetails(authentication.getDetails());
 
-        return result;
-    }
+		return result;
+	}
 
-    protected void doAfterPropertiesSet() throws Exception {}
+	protected void doAfterPropertiesSet() throws Exception {
+	}
 
-    public UserCache getUserCache() {
-        return userCache;
-    }
+	public UserCache getUserCache() {
+		return userCache;
+	}
 
-    public boolean isForcePrincipalAsString() {
-        return forcePrincipalAsString;
-    }
+	public boolean isForcePrincipalAsString() {
+		return forcePrincipalAsString;
+	}
 
-    public boolean isHideUserNotFoundExceptions() {
-        return hideUserNotFoundExceptions;
-    }
+	public boolean isHideUserNotFoundExceptions() {
+		return hideUserNotFoundExceptions;
+	}
 
-    /**
-     * Allows subclasses to actually retrieve the <code>UserDetails</code> from an implementation-specific
-     * location, with the option of throwing an <code>AuthenticationException</code> immediately if the presented
-     * credentials are incorrect (this is especially useful if it is necessary to bind to a resource as the user in
-     * order to obtain or generate a <code>UserDetails</code>).<p>Subclasses are not required to perform any
-     * caching, as the <code>AbstractUserDetailsAuthenticationProvider</code> will by default cache the
-     * <code>UserDetails</code>. The caching of <code>UserDetails</code> does present additional complexity as this
-     * means subsequent requests that rely on the cache will need to still have their credentials validated, even if
-     * the correctness of credentials was assured by subclasses adopting a binding-based strategy in this method.
-     * Accordingly it is important that subclasses either disable caching (if they want to ensure that this method is
-     * the only method that is capable of authenticating a request, as no <code>UserDetails</code> will ever be
-     * cached) or ensure subclasses implement {@link #additionalAuthenticationChecks(UserDetails,
-     * UsernamePasswordAuthenticationToken)} to compare the credentials of a cached <code>UserDetails</code> with
-     * subsequent authentication requests.</p>
-     *  <p>Most of the time subclasses will not perform credentials inspection in this method, instead
-     * performing it in {@link #additionalAuthenticationChecks(UserDetails, UsernamePasswordAuthenticationToken)} so
-     * that code related to credentials validation need not be duplicated across two methods.</p>
-     *
-     * @param username The username to retrieve
-     * @param authentication The authentication request, which subclasses <em>may</em> need to perform a binding-based
-     *        retrieval of the <code>UserDetails</code>
-     *
-     * @return the user information (never <code>null</code> - instead an exception should the thrown)
-     *
-     * @throws AuthenticationException if the credentials could not be validated (generally a
-     *         <code>BadCredentialsException</code>, an <code>AuthenticationServiceException</code> or
-     *         <code>UsernameNotFoundException</code>)
-     */
-    protected abstract UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication)
-        throws AuthenticationException;
+	/**
+	 * Allows subclasses to actually retrieve the <code>UserDetails</code> from an
+	 * implementation-specific location, with the option of throwing an
+	 * <code>AuthenticationException</code> immediately if the presented credentials are
+	 * incorrect (this is especially useful if it is necessary to bind to a resource as
+	 * the user in order to obtain or generate a <code>UserDetails</code>).
+	 * <p>
+	 * Subclasses are not required to perform any caching, as the
+	 * <code>AbstractUserDetailsAuthenticationProvider</code> will by default cache the
+	 * <code>UserDetails</code>. The caching of <code>UserDetails</code> does present
+	 * additional complexity as this means subsequent requests that rely on the cache will
+	 * need to still have their credentials validated, even if the correctness of
+	 * credentials was assured by subclasses adopting a binding-based strategy in this
+	 * method. Accordingly it is important that subclasses either disable caching (if they
+	 * want to ensure that this method is the only method that is capable of
+	 * authenticating a request, as no <code>UserDetails</code> will ever be cached) or
+	 * ensure subclasses implement
+	 * {@link #additionalAuthenticationChecks(UserDetails, UsernamePasswordAuthenticationToken)}
+	 * to compare the credentials of a cached <code>UserDetails</code> with subsequent
+	 * authentication requests.
+	 * </p>
+	 * <p>
+	 * Most of the time subclasses will not perform credentials inspection in this method,
+	 * instead performing it in
+	 * {@link #additionalAuthenticationChecks(UserDetails, UsernamePasswordAuthenticationToken)}
+	 * so that code related to credentials validation need not be duplicated across two
+	 * methods.
+	 * </p>
+	 *
+	 * @param username The username to retrieve
+	 * @param authentication The authentication request, which subclasses <em>may</em>
+	 * need to perform a binding-based retrieval of the <code>UserDetails</code>
+	 *
+	 * @return the user information (never <code>null</code> - instead an exception should
+	 * the thrown)
+	 *
+	 * @throws AuthenticationException if the credentials could not be validated
+	 * (generally a <code>BadCredentialsException</code>, an
+	 * <code>AuthenticationServiceException</code> or
+	 * <code>UsernameNotFoundException</code>)
+	 */
+	protected abstract UserDetails retrieveUser(String username,
+			UsernamePasswordAuthenticationToken authentication)
+			throws AuthenticationException;
 
-    public void setForcePrincipalAsString(boolean forcePrincipalAsString) {
-        this.forcePrincipalAsString = forcePrincipalAsString;
-    }
+	public void setForcePrincipalAsString(boolean forcePrincipalAsString) {
+		this.forcePrincipalAsString = forcePrincipalAsString;
+	}
 
-    /**
-     * By default the <code>AbstractUserDetailsAuthenticationProvider</code> throws a
-     * <code>BadCredentialsException</code> if a username is not found or the password is incorrect. Setting this
-     * property to <code>false</code> will cause <code>UsernameNotFoundException</code>s to be thrown instead for the
-     * former. Note this is considered less secure than throwing <code>BadCredentialsException</code> for both
-     * exceptions.
-     *
-     * @param hideUserNotFoundExceptions set to <code>false</code> if you wish <code>UsernameNotFoundException</code>s
-     *        to be thrown instead of the non-specific <code>BadCredentialsException</code> (defaults to
-     *        <code>true</code>)
-     */
-    public void setHideUserNotFoundExceptions(boolean hideUserNotFoundExceptions) {
-        this.hideUserNotFoundExceptions = hideUserNotFoundExceptions;
-    }
+	/**
+	 * By default the <code>AbstractUserDetailsAuthenticationProvider</code> throws a
+	 * <code>BadCredentialsException</code> if a username is not found or the password is
+	 * incorrect. Setting this property to <code>false</code> will cause
+	 * <code>UsernameNotFoundException</code>s to be thrown instead for the former. Note
+	 * this is considered less secure than throwing <code>BadCredentialsException</code>
+	 * for both exceptions.
+	 *
+	 * @param hideUserNotFoundExceptions set to <code>false</code> if you wish
+	 * <code>UsernameNotFoundException</code>s to be thrown instead of the non-specific
+	 * <code>BadCredentialsException</code> (defaults to <code>true</code>)
+	 */
+	public void setHideUserNotFoundExceptions(boolean hideUserNotFoundExceptions) {
+		this.hideUserNotFoundExceptions = hideUserNotFoundExceptions;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public void setUserCache(UserCache userCache) {
-        this.userCache = userCache;
-    }
+	public void setUserCache(UserCache userCache) {
+		this.userCache = userCache;
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
-    }
+	public boolean supports(Class<?> authentication) {
+		return (UsernamePasswordAuthenticationToken.class
+				.isAssignableFrom(authentication));
+	}
 
-    protected UserDetailsChecker getPreAuthenticationChecks() {
-        return preAuthenticationChecks;
-    }
+	protected UserDetailsChecker getPreAuthenticationChecks() {
+		return preAuthenticationChecks;
+	}
 
-    /**
-     * Sets the policy will be used to verify the status of the loaded <tt>UserDetails</tt> <em>before</em>
-     * validation of the credentials takes place.
-     *
-     * @param preAuthenticationChecks strategy to be invoked prior to authentication.
-     */
-    public void setPreAuthenticationChecks(UserDetailsChecker preAuthenticationChecks) {
-        this.preAuthenticationChecks = preAuthenticationChecks;
-    }
+	/**
+	 * Sets the policy will be used to verify the status of the loaded
+	 * <tt>UserDetails</tt> <em>before</em> validation of the credentials takes place.
+	 *
+	 * @param preAuthenticationChecks strategy to be invoked prior to authentication.
+	 */
+	public void setPreAuthenticationChecks(UserDetailsChecker preAuthenticationChecks) {
+		this.preAuthenticationChecks = preAuthenticationChecks;
+	}
 
-    protected UserDetailsChecker getPostAuthenticationChecks() {
-        return postAuthenticationChecks;
-    }
+	protected UserDetailsChecker getPostAuthenticationChecks() {
+		return postAuthenticationChecks;
+	}
 
-    public void setPostAuthenticationChecks(UserDetailsChecker postAuthenticationChecks) {
-        this.postAuthenticationChecks = postAuthenticationChecks;
-    }
+	public void setPostAuthenticationChecks(UserDetailsChecker postAuthenticationChecks) {
+		this.postAuthenticationChecks = postAuthenticationChecks;
+	}
 
-    public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
-        this.authoritiesMapper = authoritiesMapper;
-    }
+	public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
+		this.authoritiesMapper = authoritiesMapper;
+	}
 
-    private class DefaultPreAuthenticationChecks implements UserDetailsChecker {
-        public void check(UserDetails user) {
-            if (!user.isAccountNonLocked()) {
-                logger.debug("User account is locked");
+	private class DefaultPreAuthenticationChecks implements UserDetailsChecker {
+		public void check(UserDetails user) {
+			if (!user.isAccountNonLocked()) {
+				logger.debug("User account is locked");
 
-                throw new LockedException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.locked",
-                        "User account is locked"));
-            }
+				throw new LockedException(messages.getMessage(
+						"AbstractUserDetailsAuthenticationProvider.locked",
+						"User account is locked"));
+			}
 
-            if (!user.isEnabled()) {
-                logger.debug("User account is disabled");
+			if (!user.isEnabled()) {
+				logger.debug("User account is disabled");
 
-                throw new DisabledException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.disabled",
-                        "User is disabled"));
-            }
+				throw new DisabledException(messages.getMessage(
+						"AbstractUserDetailsAuthenticationProvider.disabled",
+						"User is disabled"));
+			}
 
-            if (!user.isAccountNonExpired()) {
-                logger.debug("User account is expired");
+			if (!user.isAccountNonExpired()) {
+				logger.debug("User account is expired");
 
-                throw new AccountExpiredException(messages.getMessage("AbstractUserDetailsAuthenticationProvider.expired",
-                        "User account has expired"));
-            }
-        }
-    }
+				throw new AccountExpiredException(messages.getMessage(
+						"AbstractUserDetailsAuthenticationProvider.expired",
+						"User account has expired"));
+			}
+		}
+	}
 
-    private class DefaultPostAuthenticationChecks implements UserDetailsChecker {
-        public void check(UserDetails user) {
-            if (!user.isCredentialsNonExpired()) {
-                logger.debug("User account credentials have expired");
+	private class DefaultPostAuthenticationChecks implements UserDetailsChecker {
+		public void check(UserDetails user) {
+			if (!user.isCredentialsNonExpired()) {
+				logger.debug("User account credentials have expired");
 
-                throw new CredentialsExpiredException(messages.getMessage(
-                        "AbstractUserDetailsAuthenticationProvider.credentialsExpired",
-                        "User credentials have expired"));
-            }
-        }
-    }
+				throw new CredentialsExpiredException(messages.getMessage(
+						"AbstractUserDetailsAuthenticationProvider.credentialsExpired",
+						"User credentials have expired"));
+			}
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
index 8e2eb76303..bcad0adf10 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java
@@ -29,172 +29,194 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.Assert;
 
 /**
- * An {@link AuthenticationProvider} implementation that retrieves user details from a {@link UserDetailsService}.
+ * An {@link AuthenticationProvider} implementation that retrieves user details from a
+ * {@link UserDetailsService}.
  *
  * @author Ben Alex
  * @author Rob Winch
  */
 public class DaoAuthenticationProvider extends AbstractUserDetailsAuthenticationProvider {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /**
-     * The plaintext password used to perform {@link PasswordEncoder#isPasswordValid(String, String, Object)} on when the user is
-     * not found to avoid SEC-2056.
-     */
-    private static final String USER_NOT_FOUND_PASSWORD = "userNotFoundPassword";
+	/**
+	 * The plaintext password used to perform
+	 * {@link PasswordEncoder#isPasswordValid(String, String, Object)} on when the user is
+	 * not found to avoid SEC-2056.
+	 */
+	private static final String USER_NOT_FOUND_PASSWORD = "userNotFoundPassword";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PasswordEncoder passwordEncoder;
+	private PasswordEncoder passwordEncoder;
 
-    /**
-     * The password used to perform {@link PasswordEncoder#isPasswordValid(String, String, Object)} on when the user is
-     * not found to avoid SEC-2056. This is necessary, because some {@link PasswordEncoder} implementations will short circuit if the
-     * password is not in a valid format.
-     */
-    private String userNotFoundEncodedPassword;
+	/**
+	 * The password used to perform
+	 * {@link PasswordEncoder#isPasswordValid(String, String, Object)} on when the user is
+	 * not found to avoid SEC-2056. This is necessary, because some
+	 * {@link PasswordEncoder} implementations will short circuit if the password is not
+	 * in a valid format.
+	 */
+	private String userNotFoundEncodedPassword;
 
-    private SaltSource saltSource;
+	private SaltSource saltSource;
 
-    private UserDetailsService userDetailsService;
+	private UserDetailsService userDetailsService;
 
-    public DaoAuthenticationProvider() {
-        setPasswordEncoder(new PlaintextPasswordEncoder());
-    }
+	public DaoAuthenticationProvider() {
+		setPasswordEncoder(new PlaintextPasswordEncoder());
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @SuppressWarnings("deprecation")
-    protected void additionalAuthenticationChecks(UserDetails userDetails,
-            UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
-        Object salt = null;
+	@SuppressWarnings("deprecation")
+	protected void additionalAuthenticationChecks(UserDetails userDetails,
+			UsernamePasswordAuthenticationToken authentication)
+			throws AuthenticationException {
+		Object salt = null;
 
-        if (this.saltSource != null) {
-            salt = this.saltSource.getSalt(userDetails);
-        }
+		if (this.saltSource != null) {
+			salt = this.saltSource.getSalt(userDetails);
+		}
 
-        if (authentication.getCredentials() == null) {
-            logger.debug("Authentication failed: no credentials provided");
+		if (authentication.getCredentials() == null) {
+			logger.debug("Authentication failed: no credentials provided");
 
-            throw new BadCredentialsException(messages.getMessage(
-                    "AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
-        }
+			throw new BadCredentialsException(messages.getMessage(
+					"AbstractUserDetailsAuthenticationProvider.badCredentials",
+					"Bad credentials"));
+		}
 
-        String presentedPassword = authentication.getCredentials().toString();
+		String presentedPassword = authentication.getCredentials().toString();
 
-        if (!passwordEncoder.isPasswordValid(userDetails.getPassword(), presentedPassword, salt)) {
-            logger.debug("Authentication failed: password does not match stored value");
+		if (!passwordEncoder.isPasswordValid(userDetails.getPassword(),
+				presentedPassword, salt)) {
+			logger.debug("Authentication failed: password does not match stored value");
 
-            throw new BadCredentialsException(messages.getMessage(
-                    "AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials"));
-        }
-    }
+			throw new BadCredentialsException(messages.getMessage(
+					"AbstractUserDetailsAuthenticationProvider.badCredentials",
+					"Bad credentials"));
+		}
+	}
 
-    protected void doAfterPropertiesSet() throws Exception {
-        Assert.notNull(this.userDetailsService, "A UserDetailsService must be set");
-    }
+	protected void doAfterPropertiesSet() throws Exception {
+		Assert.notNull(this.userDetailsService, "A UserDetailsService must be set");
+	}
 
-    protected final UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication)
-            throws AuthenticationException {
-        UserDetails loadedUser;
+	protected final UserDetails retrieveUser(String username,
+			UsernamePasswordAuthenticationToken authentication)
+			throws AuthenticationException {
+		UserDetails loadedUser;
 
-        try {
-            loadedUser = this.getUserDetailsService().loadUserByUsername(username);
-        } catch (UsernameNotFoundException notFound) {
-            if(authentication.getCredentials() != null) {
-                String presentedPassword = authentication.getCredentials().toString();
-                passwordEncoder.isPasswordValid(userNotFoundEncodedPassword, presentedPassword, null);
-            }
-            throw notFound;
-        } catch (Exception repositoryProblem) {
-            throw new InternalAuthenticationServiceException(repositoryProblem.getMessage(), repositoryProblem);
-        }
+		try {
+			loadedUser = this.getUserDetailsService().loadUserByUsername(username);
+		}
+		catch (UsernameNotFoundException notFound) {
+			if (authentication.getCredentials() != null) {
+				String presentedPassword = authentication.getCredentials().toString();
+				passwordEncoder.isPasswordValid(userNotFoundEncodedPassword,
+						presentedPassword, null);
+			}
+			throw notFound;
+		}
+		catch (Exception repositoryProblem) {
+			throw new InternalAuthenticationServiceException(
+					repositoryProblem.getMessage(), repositoryProblem);
+		}
 
-        if (loadedUser == null) {
-            throw new InternalAuthenticationServiceException(
-                    "UserDetailsService returned null, which is an interface contract violation");
-        }
-        return loadedUser;
-    }
+		if (loadedUser == null) {
+			throw new InternalAuthenticationServiceException(
+					"UserDetailsService returned null, which is an interface contract violation");
+		}
+		return loadedUser;
+	}
 
-    /**
-     * Sets the PasswordEncoder instance to be used to encode and validate passwords.
-     * If not set, the password will be compared as plain text.
-     * <p>
-     * For systems which are already using salted password which are encoded with a previous release, the encoder
-     * should be of type {@code org.springframework.security.authentication.encoding.PasswordEncoder}. Otherwise,
-     * the recommended approach is to use {@code org.springframework.security.crypto.password.PasswordEncoder}.
-     *
-     * @param passwordEncoder must be an instance of one of the {@code PasswordEncoder} types.
-     */
-    public void setPasswordEncoder(Object passwordEncoder) {
-        Assert.notNull(passwordEncoder, "passwordEncoder cannot be null");
+	/**
+	 * Sets the PasswordEncoder instance to be used to encode and validate passwords. If
+	 * not set, the password will be compared as plain text.
+	 * <p>
+	 * For systems which are already using salted password which are encoded with a
+	 * previous release, the encoder should be of type
+	 * {@code org.springframework.security.authentication.encoding.PasswordEncoder}.
+	 * Otherwise, the recommended approach is to use
+	 * {@code org.springframework.security.crypto.password.PasswordEncoder}.
+	 *
+	 * @param passwordEncoder must be an instance of one of the {@code PasswordEncoder}
+	 * types.
+	 */
+	public void setPasswordEncoder(Object passwordEncoder) {
+		Assert.notNull(passwordEncoder, "passwordEncoder cannot be null");
 
-        if (passwordEncoder instanceof PasswordEncoder) {
-            setPasswordEncoder((PasswordEncoder) passwordEncoder);
-            return;
-        }
+		if (passwordEncoder instanceof PasswordEncoder) {
+			setPasswordEncoder((PasswordEncoder) passwordEncoder);
+			return;
+		}
 
-        if (passwordEncoder instanceof org.springframework.security.crypto.password.PasswordEncoder) {
-            final org.springframework.security.crypto.password.PasswordEncoder delegate =
-                    (org.springframework.security.crypto.password.PasswordEncoder)passwordEncoder;
-            setPasswordEncoder(new PasswordEncoder() {
-                public String encodePassword(String rawPass, Object salt) {
-                    checkSalt(salt);
-                    return delegate.encode(rawPass);
-                }
+		if (passwordEncoder instanceof org.springframework.security.crypto.password.PasswordEncoder) {
+			final org.springframework.security.crypto.password.PasswordEncoder delegate = (org.springframework.security.crypto.password.PasswordEncoder) passwordEncoder;
+			setPasswordEncoder(new PasswordEncoder() {
+				public String encodePassword(String rawPass, Object salt) {
+					checkSalt(salt);
+					return delegate.encode(rawPass);
+				}
 
-                public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-                    checkSalt(salt);
-                    return delegate.matches(rawPass, encPass);
-                }
+				public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+					checkSalt(salt);
+					return delegate.matches(rawPass, encPass);
+				}
 
-                private void checkSalt(Object salt) {
-                    Assert.isNull(salt, "Salt value must be null when used with crypto module PasswordEncoder");
-                }
-            });
+				private void checkSalt(Object salt) {
+					Assert.isNull(salt,
+							"Salt value must be null when used with crypto module PasswordEncoder");
+				}
+			});
 
-            return;
-        }
+			return;
+		}
 
-        throw new IllegalArgumentException("passwordEncoder must be a PasswordEncoder instance");
-    }
+		throw new IllegalArgumentException(
+				"passwordEncoder must be a PasswordEncoder instance");
+	}
 
-    private void setPasswordEncoder(PasswordEncoder passwordEncoder) {
-        Assert.notNull(passwordEncoder, "passwordEncoder cannot be null");
+	private void setPasswordEncoder(PasswordEncoder passwordEncoder) {
+		Assert.notNull(passwordEncoder, "passwordEncoder cannot be null");
 
-        this.userNotFoundEncodedPassword = passwordEncoder.encodePassword(USER_NOT_FOUND_PASSWORD, null);
-        this.passwordEncoder = passwordEncoder;
-    }
+		this.userNotFoundEncodedPassword = passwordEncoder.encodePassword(
+				USER_NOT_FOUND_PASSWORD, null);
+		this.passwordEncoder = passwordEncoder;
+	}
 
-    protected PasswordEncoder getPasswordEncoder() {
-        return passwordEncoder;
-    }
+	protected PasswordEncoder getPasswordEncoder() {
+		return passwordEncoder;
+	}
 
-    /**
-     * The source of salts to use when decoding passwords. <code>null</code>
-     * is a valid value, meaning the <code>DaoAuthenticationProvider</code>
-     * will present <code>null</code> to the relevant <code>PasswordEncoder</code>.
-     * <p>
-     * Instead, it is recommended that you use an encoder which uses a random salt and combines it with
-     * the password field. This is the default approach taken in the
-     * {@code org.springframework.security.crypto.password} package.
-     *
-     * @param saltSource to use when attempting to decode passwords via the <code>PasswordEncoder</code>
-     */
-    public void setSaltSource(SaltSource saltSource) {
-        this.saltSource = saltSource;
-    }
+	/**
+	 * The source of salts to use when decoding passwords. <code>null</code> is a valid
+	 * value, meaning the <code>DaoAuthenticationProvider</code> will present
+	 * <code>null</code> to the relevant <code>PasswordEncoder</code>.
+	 * <p>
+	 * Instead, it is recommended that you use an encoder which uses a random salt and
+	 * combines it with the password field. This is the default approach taken in the
+	 * {@code org.springframework.security.crypto.password} package.
+	 *
+	 * @param saltSource to use when attempting to decode passwords via the
+	 * <code>PasswordEncoder</code>
+	 */
+	public void setSaltSource(SaltSource saltSource) {
+		this.saltSource = saltSource;
+	}
 
-    protected SaltSource getSaltSource() {
-        return saltSource;
-    }
+	protected SaltSource getSaltSource() {
+		return saltSource;
+	}
 
-    public void setUserDetailsService(UserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
+	public void setUserDetailsService(UserDetailsService userDetailsService) {
+		this.userDetailsService = userDetailsService;
+	}
 
-    protected UserDetailsService getUserDetailsService() {
-        return userDetailsService;
-    }
+	protected UserDetailsService getUserDetailsService() {
+		return userDetailsService;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/ReflectionSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/ReflectionSaltSource.java
index c27169e5fd..688cd7507a 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/ReflectionSaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/ReflectionSaltSource.java
@@ -15,11 +15,9 @@
 
 package org.springframework.security.authentication.dao;
 
-
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.BeanUtils;
 import org.springframework.util.ReflectionUtils;
@@ -28,86 +26,96 @@ import org.springframework.util.Assert;
 import java.lang.reflect.Method;
 import java.beans.PropertyDescriptor;
 
-
 /**
- * Obtains a salt from a specified property of the {@link org.springframework.security.core.userdetails.User} object.
+ * Obtains a salt from a specified property of the
+ * {@link org.springframework.security.core.userdetails.User} object.
  * <p>
- * This allows you to subclass <code>User</code> and provide an additional bean getter for a salt. You should use a
- * synthetic value that does not change, such as a database primary key.  Do not use <code>username</code> if it is
- * likely to change.
+ * This allows you to subclass <code>User</code> and provide an additional bean getter for
+ * a salt. You should use a synthetic value that does not change, such as a database
+ * primary key. Do not use <code>username</code> if it is likely to change.
  *
  * @author Ben Alex
  */
 public class ReflectionSaltSource implements SaltSource, InitializingBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String userPropertyToUse;
+	private String userPropertyToUse;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasText(userPropertyToUse, "A userPropertyToUse must be set");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasText(userPropertyToUse, "A userPropertyToUse must be set");
+	}
 
-    /**
-     * Performs reflection on the passed <code>User</code> to obtain the salt.
-     * <p>
-     * The property identified by <code>userPropertyToUse</code> must be available from the passed <code>User</code>
-     * object. If it is not available, an {@link AuthenticationServiceException} will be thrown.
-     *
-     * @param user which contains the method identified by <code>userPropertyToUse</code>
-     *
-     * @return the result of invoking <tt>user.userPropertyToUse()</tt>, or if the method doesn't exist,
-     * <tt>user.getUserPropertyToUse()</tt>.
-     *
-     * @throws AuthenticationServiceException if reflection fails
-     */
-    public Object getSalt(UserDetails user) {
-        Method saltMethod = findSaltMethod(user);
+	/**
+	 * Performs reflection on the passed <code>User</code> to obtain the salt.
+	 * <p>
+	 * The property identified by <code>userPropertyToUse</code> must be available from
+	 * the passed <code>User</code> object. If it is not available, an
+	 * {@link AuthenticationServiceException} will be thrown.
+	 *
+	 * @param user which contains the method identified by <code>userPropertyToUse</code>
+	 *
+	 * @return the result of invoking <tt>user.userPropertyToUse()</tt>, or if the method
+	 * doesn't exist, <tt>user.getUserPropertyToUse()</tt>.
+	 *
+	 * @throws AuthenticationServiceException if reflection fails
+	 */
+	public Object getSalt(UserDetails user) {
+		Method saltMethod = findSaltMethod(user);
 
-        try {
-            return saltMethod.invoke(user);
-        } catch (Exception exception) {
-            throw new AuthenticationServiceException(exception.getMessage(), exception);
-        }
-    }
+		try {
+			return saltMethod.invoke(user);
+		}
+		catch (Exception exception) {
+			throw new AuthenticationServiceException(exception.getMessage(), exception);
+		}
+	}
 
-    private Method findSaltMethod(UserDetails user) {
-        Method saltMethod = ReflectionUtils.findMethod(user.getClass(), userPropertyToUse, new Class[0]);
+	private Method findSaltMethod(UserDetails user) {
+		Method saltMethod = ReflectionUtils.findMethod(user.getClass(),
+				userPropertyToUse, new Class[0]);
 
-        if (saltMethod == null) {
-            PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(user.getClass(), userPropertyToUse);
+		if (saltMethod == null) {
+			PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(user.getClass(),
+					userPropertyToUse);
 
-            if (pd != null) {
-                saltMethod = pd.getReadMethod();
-            }
+			if (pd != null) {
+				saltMethod = pd.getReadMethod();
+			}
 
-            if (saltMethod == null) {
-                throw new AuthenticationServiceException("Unable to find salt method on user Object. Does the class '" +
-                    user.getClass().getName() + "' have a method or getter named '" + userPropertyToUse + "' ?");
-            }
-        }
+			if (saltMethod == null) {
+				throw new AuthenticationServiceException(
+						"Unable to find salt method on user Object. Does the class '"
+								+ user.getClass().getName()
+								+ "' have a method or getter named '" + userPropertyToUse
+								+ "' ?");
+			}
+		}
 
-        return saltMethod;
-    }
+		return saltMethod;
+	}
 
-    protected String getUserPropertyToUse() {
-        return userPropertyToUse;
-    }
+	protected String getUserPropertyToUse() {
+		return userPropertyToUse;
+	}
 
-    /**
-     * The method name to call to obtain the salt. Can be either a method name or a bean property name. If your
-     * <code>UserDetails</code> contains a <code>UserDetails.getSalt()</code> method, you should set this property to
-     * "getSalt" or "salt".
-     *
-     * @param userPropertyToUse the name of the <b>getter</b> to call to obtain the salt from the
-     *        <code>UserDetails</code>
-     */
-    public void setUserPropertyToUse(String userPropertyToUse) {
-        this.userPropertyToUse = userPropertyToUse;
-    }
+	/**
+	 * The method name to call to obtain the salt. Can be either a method name or a bean
+	 * property name. If your <code>UserDetails</code> contains a
+	 * <code>UserDetails.getSalt()</code> method, you should set this property to
+	 * "getSalt" or "salt".
+	 *
+	 * @param userPropertyToUse the name of the <b>getter</b> to call to obtain the salt
+	 * from the <code>UserDetails</code>
+	 */
+	public void setUserPropertyToUse(String userPropertyToUse) {
+		this.userPropertyToUse = userPropertyToUse;
+	}
 
-    public String toString() {
-        return "ReflectionSaltSource[ userPropertyToUse='" + userPropertyToUse + "'; ]";
-    }
+	public String toString() {
+		return "ReflectionSaltSource[ userPropertyToUse='" + userPropertyToUse + "'; ]";
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
index 747b8b9f3d..c18b5a594e 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/SaltSource.java
@@ -17,21 +17,21 @@ package org.springframework.security.authentication.dao;
 
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 /**
  * Provides alternative sources of the salt to use for encoding passwords.
  *
  * @author Ben Alex
  */
 public interface SaltSource {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the salt to use for the indicated user.
-     *
-     * @param user from the <code>AuthenticationDao</code>
-     *
-     * @return the salt to use for this <code>UserDetails</code>
-     */
-    Object getSalt(UserDetails user);
+	/**
+	 * Returns the salt to use for the indicated user.
+	 *
+	 * @param user from the <code>AuthenticationDao</code>
+	 *
+	 * @return the salt to use for this <code>UserDetails</code>
+	 */
+	Object getSalt(UserDetails user);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/SystemWideSaltSource.java b/core/src/main/java/org/springframework/security/authentication/dao/SystemWideSaltSource.java
index f8570517fe..d6f9f272b7 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/SystemWideSaltSource.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/SystemWideSaltSource.java
@@ -17,49 +17,53 @@ package org.springframework.security.authentication.dao;
 
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 import org.springframework.beans.factory.InitializingBean;
 
-
 /**
- * Uses a static system-wide <code>String</code> as the salt.<P>Does not supply a different salt for each {@link
- * org.springframework.security.core.userdetails.User}. This means users sharing the same password will still have the same digested
- * password. Of benefit is the digested passwords will at least be more protected than if stored without any salt.</p>
+ * Uses a static system-wide <code>String</code> as the salt.
+ * <P>
+ * Does not supply a different salt for each
+ * {@link org.springframework.security.core.userdetails.User}. This means users sharing
+ * the same password will still have the same digested password. Of benefit is the
+ * digested passwords will at least be more protected than if stored without any salt.
+ * </p>
  *
  * @author Ben Alex
  */
 public class SystemWideSaltSource implements SaltSource, InitializingBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String systemWideSalt;
+	private String systemWideSalt;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        if ((this.systemWideSalt == null) || "".equals(this.systemWideSalt)) {
-            throw new IllegalArgumentException("A systemWideSalt must be set");
-        }
-    }
+	public void afterPropertiesSet() throws Exception {
+		if ((this.systemWideSalt == null) || "".equals(this.systemWideSalt)) {
+			throw new IllegalArgumentException("A systemWideSalt must be set");
+		}
+	}
 
-    public Object getSalt(UserDetails user) {
-        return this.systemWideSalt;
-    }
+	public Object getSalt(UserDetails user) {
+		return this.systemWideSalt;
+	}
 
-    public String getSystemWideSalt() {
-        return this.systemWideSalt;
-    }
+	public String getSystemWideSalt() {
+		return this.systemWideSalt;
+	}
 
-    public void setSystemWideSalt(String systemWideSalt) {
-        this.systemWideSalt = systemWideSalt;
-    }
+	public void setSystemWideSalt(String systemWideSalt) {
+		this.systemWideSalt = systemWideSalt;
+	}
 
-    /**
-     * Displays the system wide salt
-     * @since 4.0
-     * @return
-     */
-    @Override
-    public String toString() {
-        return systemWideSalt;
-    }
+	/**
+	 * Displays the system wide salt
+	 * @since 4.0
+	 * @return
+	 */
+	@Override
+	public String toString() {
+		return systemWideSalt;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/dao/package-info.java b/core/src/main/java/org/springframework/security/authentication/dao/package-info.java
index b5b557ef24..d61d97b4b8 100644
--- a/core/src/main/java/org/springframework/security/authentication/dao/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/dao/package-info.java
@@ -2,3 +2,4 @@
  * An {@code AuthenticationProvider} which relies upon a data access object.
  */
 package org.springframework.security.authentication.dao;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
index bb0921f3cf..0cf17bb434 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/BaseDigestPasswordEncoder.java
@@ -16,28 +16,33 @@
 package org.springframework.security.authentication.encoding;
 
 /**
- * <p>Convenience base for digest password encoders.</p>
+ * <p>
+ * Convenience base for digest password encoders.
+ * </p>
  *
  * @author colin sampaleanu
  */
 public abstract class BaseDigestPasswordEncoder extends BasePasswordEncoder {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private boolean encodeHashAsBase64 = false;
+	private boolean encodeHashAsBase64 = false;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean getEncodeHashAsBase64() {
-        return encodeHashAsBase64;
-    }
+	public boolean getEncodeHashAsBase64() {
+		return encodeHashAsBase64;
+	}
 
-    /**
-     * The encoded password is normally returned as Hex (32 char) version of the hash bytes. Setting this
-     * property to true will cause the encoded pass to be returned as Base64 text, which will consume 24 characters.
-     *
-     * @param encodeHashAsBase64 set to true for Base64 output
-     */
-    public void setEncodeHashAsBase64(boolean encodeHashAsBase64) {
-        this.encodeHashAsBase64 = encodeHashAsBase64;
-    }
+	/**
+	 * The encoded password is normally returned as Hex (32 char) version of the hash
+	 * bytes. Setting this property to true will cause the encoded pass to be returned as
+	 * Base64 text, which will consume 24 characters.
+	 *
+	 * @param encodeHashAsBase64 set to true for Base64 output
+	 */
+	public void setEncodeHashAsBase64(boolean encodeHashAsBase64) {
+		this.encodeHashAsBase64 = encodeHashAsBase64;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java
index add0da8792..e0bbce11c9 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/BasePasswordEncoder.java
@@ -16,74 +16,89 @@
 package org.springframework.security.authentication.encoding;
 
 /**
- * <p>Convenience base for all password encoders.</p>
+ * <p>
+ * Convenience base for all password encoders.
+ * </p>
  *
  * @author Ben Alex
  */
 public abstract class BasePasswordEncoder implements PasswordEncoder {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Used by subclasses to extract the password and salt from a merged <code>String</code> created using
-     * {@link #mergePasswordAndSalt(String,Object,boolean)}.<p>The first element in the returned array is the
-     * password. The second element is the salt. The salt array element will always be present, even if no salt was
-     * found in the <code>mergedPasswordSalt</code> argument.</p>
-     *
-     * @param mergedPasswordSalt as generated by <code>mergePasswordAndSalt</code>
-     *
-     * @return an array, in which the first element is the password and the second the salt
-     *
-     * @throws IllegalArgumentException if mergedPasswordSalt is null or empty.
-     */
-    protected String[] demergePasswordAndSalt(String mergedPasswordSalt) {
-        if ((mergedPasswordSalt == null) || "".equals(mergedPasswordSalt)) {
-            throw new IllegalArgumentException("Cannot pass a null or empty String");
-        }
+	/**
+	 * Used by subclasses to extract the password and salt from a merged
+	 * <code>String</code> created using
+	 * {@link #mergePasswordAndSalt(String,Object,boolean)}.
+	 * <p>
+	 * The first element in the returned array is the password. The second element is the
+	 * salt. The salt array element will always be present, even if no salt was found in
+	 * the <code>mergedPasswordSalt</code> argument.
+	 * </p>
+	 *
+	 * @param mergedPasswordSalt as generated by <code>mergePasswordAndSalt</code>
+	 *
+	 * @return an array, in which the first element is the password and the second the
+	 * salt
+	 *
+	 * @throws IllegalArgumentException if mergedPasswordSalt is null or empty.
+	 */
+	protected String[] demergePasswordAndSalt(String mergedPasswordSalt) {
+		if ((mergedPasswordSalt == null) || "".equals(mergedPasswordSalt)) {
+			throw new IllegalArgumentException("Cannot pass a null or empty String");
+		}
 
-        String password = mergedPasswordSalt;
-        String salt = "";
+		String password = mergedPasswordSalt;
+		String salt = "";
 
-        int saltBegins = mergedPasswordSalt.lastIndexOf("{");
+		int saltBegins = mergedPasswordSalt.lastIndexOf("{");
 
-        if ((saltBegins != -1) && ((saltBegins + 1) < mergedPasswordSalt.length())) {
-            salt = mergedPasswordSalt.substring(saltBegins + 1, mergedPasswordSalt.length() - 1);
-            password = mergedPasswordSalt.substring(0, saltBegins);
-        }
+		if ((saltBegins != -1) && ((saltBegins + 1) < mergedPasswordSalt.length())) {
+			salt = mergedPasswordSalt.substring(saltBegins + 1,
+					mergedPasswordSalt.length() - 1);
+			password = mergedPasswordSalt.substring(0, saltBegins);
+		}
 
-        return new String[] {password, salt};
-    }
+		return new String[] { password, salt };
+	}
 
-    /**
-     * Used by subclasses to generate a merged password and salt <code>String</code>.<P>The generated password
-     * will be in the form of <code>password{salt}</code>.</p>
-     *  <p>A <code>null</code> can be passed to either method, and will be handled correctly. If the
-     * <code>salt</code> is <code>null</code> or empty, the resulting generated password will simply be the passed
-     * <code>password</code>. The <code>toString</code> method of the <code>salt</code> will be used to represent the
-     * salt.</p>
-     *
-     * @param password the password to be used (can be <code>null</code>)
-     * @param salt the salt to be used (can be <code>null</code>)
-     * @param strict ensures salt doesn't contain the delimiters
-     *
-     * @return a merged password and salt <code>String</code>
-     *
-     * @throws IllegalArgumentException if the salt contains '{' or '}' characters.
-     */
-    protected String mergePasswordAndSalt(String password, Object salt, boolean strict) {
-        if (password == null) {
-            password = "";
-        }
+	/**
+	 * Used by subclasses to generate a merged password and salt <code>String</code>.
+	 * <P>
+	 * The generated password will be in the form of <code>password{salt}</code>.
+	 * </p>
+	 * <p>
+	 * A <code>null</code> can be passed to either method, and will be handled correctly.
+	 * If the <code>salt</code> is <code>null</code> or empty, the resulting generated
+	 * password will simply be the passed <code>password</code>. The <code>toString</code>
+	 * method of the <code>salt</code> will be used to represent the salt.
+	 * </p>
+	 *
+	 * @param password the password to be used (can be <code>null</code>)
+	 * @param salt the salt to be used (can be <code>null</code>)
+	 * @param strict ensures salt doesn't contain the delimiters
+	 *
+	 * @return a merged password and salt <code>String</code>
+	 *
+	 * @throws IllegalArgumentException if the salt contains '{' or '}' characters.
+	 */
+	protected String mergePasswordAndSalt(String password, Object salt, boolean strict) {
+		if (password == null) {
+			password = "";
+		}
 
-        if (strict && (salt != null)) {
-            if ((salt.toString().lastIndexOf("{") != -1) || (salt.toString().lastIndexOf("}") != -1)) {
-                throw new IllegalArgumentException("Cannot use { or } in salt.toString()");
-            }
-        }
+		if (strict && (salt != null)) {
+			if ((salt.toString().lastIndexOf("{") != -1)
+					|| (salt.toString().lastIndexOf("}") != -1)) {
+				throw new IllegalArgumentException("Cannot use { or } in salt.toString()");
+			}
+		}
 
-        if ((salt == null) || "".equals(salt)) {
-            return password;
-        } else {
-            return password + "{" + salt.toString() + "}";
-        }
-    }
+		if ((salt == null) || "".equals(salt)) {
+			return password;
+		}
+		else {
+			return password + "{" + salt.toString() + "}";
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java
index 30a79bc006..befbeb73ca 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/LdapShaPasswordEncoder.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.authentication.encoding;
 
-
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 
@@ -23,148 +22,162 @@ import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.util.Assert;
 
-
 /**
- * A version of {@link ShaPasswordEncoder} which supports Ldap SHA and SSHA (salted-SHA) encodings. The values are
- * base-64 encoded and have the label "{SHA}" (or "{SSHA}") prepended to the encoded hash. These can be made lower-case
- * in the encoded password, if required, by setting the <tt>forceLowerCasePrefix</tt> property to true.
+ * A version of {@link ShaPasswordEncoder} which supports Ldap SHA and SSHA (salted-SHA)
+ * encodings. The values are base-64 encoded and have the label "{SHA}" (or "{SSHA}")
+ * prepended to the encoded hash. These can be made lower-case in the encoded password, if
+ * required, by setting the <tt>forceLowerCasePrefix</tt> property to true.
  *
- * Also supports plain text passwords, so can safely be used in cases when both encoded and non-encoded passwords are in
- * use or when a null implementation is required.
+ * Also supports plain text passwords, so can safely be used in cases when both encoded
+ * and non-encoded passwords are in use or when a null implementation is required.
  *
  * @author Luke Taylor
  */
 public class LdapShaPasswordEncoder implements PasswordEncoder {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /** The number of bytes in a SHA hash */
-    private static final int SHA_LENGTH = 20;
-    private static final String SSHA_PREFIX = "{SSHA}";
-    private static final String SSHA_PREFIX_LC = SSHA_PREFIX.toLowerCase();
-    private static final String SHA_PREFIX = "{SHA}";
-    private static final String SHA_PREFIX_LC = SHA_PREFIX.toLowerCase();
+	/** The number of bytes in a SHA hash */
+	private static final int SHA_LENGTH = 20;
+	private static final String SSHA_PREFIX = "{SSHA}";
+	private static final String SSHA_PREFIX_LC = SSHA_PREFIX.toLowerCase();
+	private static final String SHA_PREFIX = "{SHA}";
+	private static final String SHA_PREFIX_LC = SHA_PREFIX.toLowerCase();
 
-    //~ Instance fields ================================================================================================
-    private boolean forceLowerCasePrefix;
+	// ~ Instance fields
+	// ================================================================================================
+	private boolean forceLowerCasePrefix;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public LdapShaPasswordEncoder() {}
+	public LdapShaPasswordEncoder() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private byte[] combineHashAndSalt(byte[] hash, byte[] salt) {
-        if (salt == null) {
-            return hash;
-        }
+	private byte[] combineHashAndSalt(byte[] hash, byte[] salt) {
+		if (salt == null) {
+			return hash;
+		}
 
-        byte[] hashAndSalt = new byte[hash.length + salt.length];
-        System.arraycopy(hash, 0, hashAndSalt, 0, hash.length);
-        System.arraycopy(salt, 0, hashAndSalt, hash.length, salt.length);
+		byte[] hashAndSalt = new byte[hash.length + salt.length];
+		System.arraycopy(hash, 0, hashAndSalt, 0, hash.length);
+		System.arraycopy(salt, 0, hashAndSalt, hash.length, salt.length);
 
-        return hashAndSalt;
-    }
+		return hashAndSalt;
+	}
 
-    /**
-     * Calculates the hash of password (and salt bytes, if supplied) and returns a base64 encoded concatenation
-     * of the hash and salt, prefixed with {SHA} (or {SSHA} if salt was used).
-     *
-     * @param rawPass the password to be encoded.
-     * @param salt the salt. Must be a byte array or null.
-     *
-     * @return the encoded password in the specified format
-     *
-     */
-    public String encodePassword(String rawPass, Object salt) {
-        MessageDigest sha;
+	/**
+	 * Calculates the hash of password (and salt bytes, if supplied) and returns a base64
+	 * encoded concatenation of the hash and salt, prefixed with {SHA} (or {SSHA} if salt
+	 * was used).
+	 *
+	 * @param rawPass the password to be encoded.
+	 * @param salt the salt. Must be a byte array or null.
+	 *
+	 * @return the encoded password in the specified format
+	 *
+	 */
+	public String encodePassword(String rawPass, Object salt) {
+		MessageDigest sha;
 
-        try {
-            sha = MessageDigest.getInstance("SHA");
-            sha.update(Utf8.encode(rawPass));
-        } catch (java.security.NoSuchAlgorithmException e) {
-            throw new IllegalStateException("No SHA implementation available!");
-        }
+		try {
+			sha = MessageDigest.getInstance("SHA");
+			sha.update(Utf8.encode(rawPass));
+		}
+		catch (java.security.NoSuchAlgorithmException e) {
+			throw new IllegalStateException("No SHA implementation available!");
+		}
 
-        if (salt != null) {
-            Assert.isInstanceOf(byte[].class, salt, "Salt value must be a byte array");
-            sha.update((byte[]) salt);
-        }
+		if (salt != null) {
+			Assert.isInstanceOf(byte[].class, salt, "Salt value must be a byte array");
+			sha.update((byte[]) salt);
+		}
 
-        byte[] hash = combineHashAndSalt(sha.digest(), (byte[]) salt);
+		byte[] hash = combineHashAndSalt(sha.digest(), (byte[]) salt);
 
-        String prefix;
+		String prefix;
 
-        if (salt == null) {
-            prefix = forceLowerCasePrefix ? SHA_PREFIX_LC : SHA_PREFIX;
-        } else {
-            prefix = forceLowerCasePrefix ? SSHA_PREFIX_LC : SSHA_PREFIX;
-        }
+		if (salt == null) {
+			prefix = forceLowerCasePrefix ? SHA_PREFIX_LC : SHA_PREFIX;
+		}
+		else {
+			prefix = forceLowerCasePrefix ? SSHA_PREFIX_LC : SSHA_PREFIX;
+		}
 
-        return prefix + Utf8.decode(Base64.encode(hash));
-    }
+		return prefix + Utf8.decode(Base64.encode(hash));
+	}
 
-    private byte[] extractSalt(String encPass) {
-        String encPassNoLabel = encPass.substring(6);
+	private byte[] extractSalt(String encPass) {
+		String encPassNoLabel = encPass.substring(6);
 
-        byte[] hashAndSalt = Base64.decode(encPassNoLabel.getBytes());
-        int saltLength = hashAndSalt.length - SHA_LENGTH;
-        byte[] salt = new byte[saltLength];
-        System.arraycopy(hashAndSalt, SHA_LENGTH, salt, 0, saltLength);
+		byte[] hashAndSalt = Base64.decode(encPassNoLabel.getBytes());
+		int saltLength = hashAndSalt.length - SHA_LENGTH;
+		byte[] salt = new byte[saltLength];
+		System.arraycopy(hashAndSalt, SHA_LENGTH, salt, 0, saltLength);
 
-        return salt;
-    }
+		return salt;
+	}
 
-    /**
-     * Checks the validity of an unencoded password against an encoded one in the form
-     * "{SSHA}sQuQF8vj8Eg2Y1hPdh3bkQhCKQBgjhQI".
-     *
-     * @param encPass the actual SSHA or SHA encoded password
-     * @param rawPass unencoded password to be verified.
-     * @param salt ignored. If the format is SSHA the salt bytes will be extracted from the encoded password.
-     *
-     * @return true if they match (independent of the case of the prefix).
-     */
-    public boolean isPasswordValid(final String encPass, final String rawPass, Object salt) {
-        String prefix = extractPrefix(encPass);
+	/**
+	 * Checks the validity of an unencoded password against an encoded one in the form
+	 * "{SSHA}sQuQF8vj8Eg2Y1hPdh3bkQhCKQBgjhQI".
+	 *
+	 * @param encPass the actual SSHA or SHA encoded password
+	 * @param rawPass unencoded password to be verified.
+	 * @param salt ignored. If the format is SSHA the salt bytes will be extracted from
+	 * the encoded password.
+	 *
+	 * @return true if they match (independent of the case of the prefix).
+	 */
+	public boolean isPasswordValid(final String encPass, final String rawPass, Object salt) {
+		String prefix = extractPrefix(encPass);
 
-        if (prefix == null) {
-            return encPass.equals(rawPass);
-        }
+		if (prefix == null) {
+			return encPass.equals(rawPass);
+		}
 
-        if (prefix.equals(SSHA_PREFIX) || prefix.equals(SSHA_PREFIX_LC)) {
-            salt = extractSalt(encPass);
-        } else if (!prefix.equals(SHA_PREFIX) && !prefix.equals(SHA_PREFIX_LC)) {
-            throw new IllegalArgumentException("Unsupported password prefix '" + prefix + "'");
-        } else {
-            // Standard SHA
-            salt = null;
-        }
+		if (prefix.equals(SSHA_PREFIX) || prefix.equals(SSHA_PREFIX_LC)) {
+			salt = extractSalt(encPass);
+		}
+		else if (!prefix.equals(SHA_PREFIX) && !prefix.equals(SHA_PREFIX_LC)) {
+			throw new IllegalArgumentException("Unsupported password prefix '" + prefix
+					+ "'");
+		}
+		else {
+			// Standard SHA
+			salt = null;
+		}
 
-        int startOfHash = prefix.length();
+		int startOfHash = prefix.length();
 
-        String encodedRawPass = encodePassword(rawPass, salt).substring(startOfHash);
+		String encodedRawPass = encodePassword(rawPass, salt).substring(startOfHash);
 
-        return PasswordEncoderUtils.equals(encodedRawPass,encPass.substring(startOfHash));
-    }
+		return PasswordEncoderUtils
+				.equals(encodedRawPass, encPass.substring(startOfHash));
+	}
 
-    /**
-     * Returns the hash prefix or null if there isn't one.
-     */
-    private String extractPrefix(String encPass) {
-        if (!encPass.startsWith("{")) {
-            return null;
-        }
+	/**
+	 * Returns the hash prefix or null if there isn't one.
+	 */
+	private String extractPrefix(String encPass) {
+		if (!encPass.startsWith("{")) {
+			return null;
+		}
 
-        int secondBrace = encPass.lastIndexOf('}');
+		int secondBrace = encPass.lastIndexOf('}');
 
-        if (secondBrace < 0) {
-            throw new IllegalArgumentException("Couldn't find closing brace for SHA prefix");
-        }
+		if (secondBrace < 0) {
+			throw new IllegalArgumentException(
+					"Couldn't find closing brace for SHA prefix");
+		}
 
-        return encPass.substring(0, secondBrace + 1);
-    }
+		return encPass.substring(0, secondBrace + 1);
+	}
 
-    public void setForceLowerCasePrefix(boolean forceLowerCasePrefix) {
-        this.forceLowerCasePrefix = forceLowerCasePrefix;
-    }
+	public void setForceLowerCasePrefix(boolean forceLowerCasePrefix) {
+		this.forceLowerCasePrefix = forceLowerCasePrefix;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java
index 6690390ea7..f2ee087d87 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md4.java
@@ -15,165 +15,167 @@
 package org.springframework.security.authentication.encoding;
 
 /**
- * Implementation of the MD4 message digest derived from the RSA Data Security, Inc, MD4 Message-Digest Algorithm.
+ * Implementation of the MD4 message digest derived from the RSA Data Security, Inc, MD4
+ * Message-Digest Algorithm.
  *
  * @author Alan Stewart
  */
 class Md4 {
-    private static final int BLOCK_SIZE = 64;
-    private static final int HASH_SIZE = 16;
-    private final byte[] buffer = new byte[BLOCK_SIZE];
-    private int bufferOffset;
-    private long byteCount;
-    private final int[] state = new int[4];
-    private final int[] tmp = new int[16];
+	private static final int BLOCK_SIZE = 64;
+	private static final int HASH_SIZE = 16;
+	private final byte[] buffer = new byte[BLOCK_SIZE];
+	private int bufferOffset;
+	private long byteCount;
+	private final int[] state = new int[4];
+	private final int[] tmp = new int[16];
 
-    Md4() {
-        reset();
-    }
+	Md4() {
+		reset();
+	}
 
-    public void reset() {
-        bufferOffset = 0;
-        byteCount = 0;
-        state[0] = 0x67452301;
-        state[1] = 0xEFCDAB89;
-        state[2] = 0x98BADCFE;
-        state[3] = 0x10325476;
-    }
+	public void reset() {
+		bufferOffset = 0;
+		byteCount = 0;
+		state[0] = 0x67452301;
+		state[1] = 0xEFCDAB89;
+		state[2] = 0x98BADCFE;
+		state[3] = 0x10325476;
+	}
 
-    public byte[] digest() {
-        byte[] resBuf = new byte[HASH_SIZE];
-        digest(resBuf, 0, HASH_SIZE);
-        return resBuf;
-    }
+	public byte[] digest() {
+		byte[] resBuf = new byte[HASH_SIZE];
+		digest(resBuf, 0, HASH_SIZE);
+		return resBuf;
+	}
 
-    private void digest(byte[] buffer, int off) {
-        for (int i = 0; i < 4; i++) {
-            for (int j = 0; j < 4; j++) {
-                buffer[off + (i * 4 + j)] = (byte) (state[i] >>> (8 * j));
-            }
-        }
-    }
+	private void digest(byte[] buffer, int off) {
+		for (int i = 0; i < 4; i++) {
+			for (int j = 0; j < 4; j++) {
+				buffer[off + (i * 4 + j)] = (byte) (state[i] >>> (8 * j));
+			}
+		}
+	}
 
-    private void digest(byte[] buffer, int offset, int len) {
-        this.buffer[this.bufferOffset++] = (byte) 0x80;
-        int lenOfBitLen = 8;
-        int C = BLOCK_SIZE - lenOfBitLen;
-        if (this.bufferOffset > C) {
-            while (this.bufferOffset < BLOCK_SIZE) {
-                this.buffer[this.bufferOffset++] = (byte) 0x00;
-            }
-            update(this.buffer, 0);
-            this.bufferOffset = 0;
-        }
+	private void digest(byte[] buffer, int offset, int len) {
+		this.buffer[this.bufferOffset++] = (byte) 0x80;
+		int lenOfBitLen = 8;
+		int C = BLOCK_SIZE - lenOfBitLen;
+		if (this.bufferOffset > C) {
+			while (this.bufferOffset < BLOCK_SIZE) {
+				this.buffer[this.bufferOffset++] = (byte) 0x00;
+			}
+			update(this.buffer, 0);
+			this.bufferOffset = 0;
+		}
 
-        while (this.bufferOffset < C) {
-            this.buffer[this.bufferOffset++] = (byte) 0x00;
-        }
+		while (this.bufferOffset < C) {
+			this.buffer[this.bufferOffset++] = (byte) 0x00;
+		}
 
-        long bitCount = byteCount * 8;
-        for (int i = 0; i < 64; i += 8) {
-            this.buffer[this.bufferOffset++] = (byte) (bitCount >>> (i));
-        }
+		long bitCount = byteCount * 8;
+		for (int i = 0; i < 64; i += 8) {
+			this.buffer[this.bufferOffset++] = (byte) (bitCount >>> (i));
+		}
 
-        update(this.buffer, 0);
-        digest(buffer, offset);
-    }
+		update(this.buffer, 0);
+		digest(buffer, offset);
+	}
 
-    public void update(byte[] input, int offset, int length) {
-        byteCount += length;
-        int todo;
-        while (length >= (todo = BLOCK_SIZE - this.bufferOffset)) {
-            System.arraycopy(input, offset, this.buffer, this.bufferOffset, todo);
-            update(this.buffer, 0);
-            length -= todo;
-            offset += todo;
-            this.bufferOffset = 0;
-        }
+	public void update(byte[] input, int offset, int length) {
+		byteCount += length;
+		int todo;
+		while (length >= (todo = BLOCK_SIZE - this.bufferOffset)) {
+			System.arraycopy(input, offset, this.buffer, this.bufferOffset, todo);
+			update(this.buffer, 0);
+			length -= todo;
+			offset += todo;
+			this.bufferOffset = 0;
+		}
 
-        System.arraycopy(input, offset, this.buffer, this.bufferOffset, length);
-        bufferOffset += length;
-    }
+		System.arraycopy(input, offset, this.buffer, this.bufferOffset, length);
+		bufferOffset += length;
+	}
 
-    private void update(byte[] block, int offset) {
-        for (int i = 0; i < 16; i++) {
-            tmp[i] = (block[offset++] & 0xFF) | (block[offset++] & 0xFF) << 8 | (block[offset++] & 0xFF) << 16 | (block[offset++] & 0xFF) << 24;
-        }
+	private void update(byte[] block, int offset) {
+		for (int i = 0; i < 16; i++) {
+			tmp[i] = (block[offset++] & 0xFF) | (block[offset++] & 0xFF) << 8
+					| (block[offset++] & 0xFF) << 16 | (block[offset++] & 0xFF) << 24;
+		}
 
-        int A = state[0];
-        int B = state[1];
-        int C = state[2];
-        int D = state[3];
+		int A = state[0];
+		int B = state[1];
+		int C = state[2];
+		int D = state[3];
 
-        A = FF(A, B, C, D, tmp[0], 3);
-        D = FF(D, A, B, C, tmp[1], 7);
-        C = FF(C, D, A, B, tmp[2], 11);
-        B = FF(B, C, D, A, tmp[3], 19);
-        A = FF(A, B, C, D, tmp[4], 3);
-        D = FF(D, A, B, C, tmp[5], 7);
-        C = FF(C, D, A, B, tmp[6], 11);
-        B = FF(B, C, D, A, tmp[7], 19);
-        A = FF(A, B, C, D, tmp[8], 3);
-        D = FF(D, A, B, C, tmp[9], 7);
-        C = FF(C, D, A, B, tmp[10], 11);
-        B = FF(B, C, D, A, tmp[11], 19);
-        A = FF(A, B, C, D, tmp[12], 3);
-        D = FF(D, A, B, C, tmp[13], 7);
-        C = FF(C, D, A, B, tmp[14], 11);
-        B = FF(B, C, D, A, tmp[15], 19);
+		A = FF(A, B, C, D, tmp[0], 3);
+		D = FF(D, A, B, C, tmp[1], 7);
+		C = FF(C, D, A, B, tmp[2], 11);
+		B = FF(B, C, D, A, tmp[3], 19);
+		A = FF(A, B, C, D, tmp[4], 3);
+		D = FF(D, A, B, C, tmp[5], 7);
+		C = FF(C, D, A, B, tmp[6], 11);
+		B = FF(B, C, D, A, tmp[7], 19);
+		A = FF(A, B, C, D, tmp[8], 3);
+		D = FF(D, A, B, C, tmp[9], 7);
+		C = FF(C, D, A, B, tmp[10], 11);
+		B = FF(B, C, D, A, tmp[11], 19);
+		A = FF(A, B, C, D, tmp[12], 3);
+		D = FF(D, A, B, C, tmp[13], 7);
+		C = FF(C, D, A, B, tmp[14], 11);
+		B = FF(B, C, D, A, tmp[15], 19);
 
-        A = GG(A, B, C, D, tmp[0], 3);
-        D = GG(D, A, B, C, tmp[4], 5);
-        C = GG(C, D, A, B, tmp[8], 9);
-        B = GG(B, C, D, A, tmp[12], 13);
-        A = GG(A, B, C, D, tmp[1], 3);
-        D = GG(D, A, B, C, tmp[5], 5);
-        C = GG(C, D, A, B, tmp[9], 9);
-        B = GG(B, C, D, A, tmp[13], 13);
-        A = GG(A, B, C, D, tmp[2], 3);
-        D = GG(D, A, B, C, tmp[6], 5);
-        C = GG(C, D, A, B, tmp[10], 9);
-        B = GG(B, C, D, A, tmp[14], 13);
-        A = GG(A, B, C, D, tmp[3], 3);
-        D = GG(D, A, B, C, tmp[7], 5);
-        C = GG(C, D, A, B, tmp[11], 9);
-        B = GG(B, C, D, A, tmp[15], 13);
+		A = GG(A, B, C, D, tmp[0], 3);
+		D = GG(D, A, B, C, tmp[4], 5);
+		C = GG(C, D, A, B, tmp[8], 9);
+		B = GG(B, C, D, A, tmp[12], 13);
+		A = GG(A, B, C, D, tmp[1], 3);
+		D = GG(D, A, B, C, tmp[5], 5);
+		C = GG(C, D, A, B, tmp[9], 9);
+		B = GG(B, C, D, A, tmp[13], 13);
+		A = GG(A, B, C, D, tmp[2], 3);
+		D = GG(D, A, B, C, tmp[6], 5);
+		C = GG(C, D, A, B, tmp[10], 9);
+		B = GG(B, C, D, A, tmp[14], 13);
+		A = GG(A, B, C, D, tmp[3], 3);
+		D = GG(D, A, B, C, tmp[7], 5);
+		C = GG(C, D, A, B, tmp[11], 9);
+		B = GG(B, C, D, A, tmp[15], 13);
 
-        A = HH(A, B, C, D, tmp[0], 3);
-        D = HH(D, A, B, C, tmp[8], 9);
-        C = HH(C, D, A, B, tmp[4], 11);
-        B = HH(B, C, D, A, tmp[12], 15);
-        A = HH(A, B, C, D, tmp[2], 3);
-        D = HH(D, A, B, C, tmp[10], 9);
-        C = HH(C, D, A, B, tmp[6], 11);
-        B = HH(B, C, D, A, tmp[14], 15);
-        A = HH(A, B, C, D, tmp[1], 3);
-        D = HH(D, A, B, C, tmp[9], 9);
-        C = HH(C, D, A, B, tmp[5], 11);
-        B = HH(B, C, D, A, tmp[13], 15);
-        A = HH(A, B, C, D, tmp[3], 3);
-        D = HH(D, A, B, C, tmp[11], 9);
-        C = HH(C, D, A, B, tmp[7], 11);
-        B = HH(B, C, D, A, tmp[15], 15);
+		A = HH(A, B, C, D, tmp[0], 3);
+		D = HH(D, A, B, C, tmp[8], 9);
+		C = HH(C, D, A, B, tmp[4], 11);
+		B = HH(B, C, D, A, tmp[12], 15);
+		A = HH(A, B, C, D, tmp[2], 3);
+		D = HH(D, A, B, C, tmp[10], 9);
+		C = HH(C, D, A, B, tmp[6], 11);
+		B = HH(B, C, D, A, tmp[14], 15);
+		A = HH(A, B, C, D, tmp[1], 3);
+		D = HH(D, A, B, C, tmp[9], 9);
+		C = HH(C, D, A, B, tmp[5], 11);
+		B = HH(B, C, D, A, tmp[13], 15);
+		A = HH(A, B, C, D, tmp[3], 3);
+		D = HH(D, A, B, C, tmp[11], 9);
+		C = HH(C, D, A, B, tmp[7], 11);
+		B = HH(B, C, D, A, tmp[15], 15);
 
-        state[0] += A;
-        state[1] += B;
-        state[2] += C;
-        state[3] += D;
-    }
+		state[0] += A;
+		state[1] += B;
+		state[2] += C;
+		state[3] += D;
+	}
 
-    private int FF(int a, int b, int c, int d, int x, int s) {
-        int t = a + ((b & c) | (~b & d)) + x;
-        return t << s | t >>> (32 - s);
-    }
+	private int FF(int a, int b, int c, int d, int x, int s) {
+		int t = a + ((b & c) | (~b & d)) + x;
+		return t << s | t >>> (32 - s);
+	}
 
-    private int GG(int a, int b, int c, int d, int x, int s) {
-        int t = a + ((b & (c | d)) | (c & d)) + x + 0x5A827999;
-        return t << s | t >>> (32 - s);
-    }
+	private int GG(int a, int b, int c, int d, int x, int s) {
+		int t = a + ((b & (c | d)) | (c & d)) + x + 0x5A827999;
+		return t << s | t >>> (32 - s);
+	}
 
-    private int HH(int a, int b, int c, int d, int x, int s) {
-        int t = a + (b ^ c ^ d) + x + 0x6ED9EBA1;
-        return t << s | t >>> (32 - s);
-    }
+	private int HH(int a, int b, int c, int d, int x, int s) {
+		int t = a + (b ^ c ^ d) + x + 0x6ED9EBA1;
+		return t << s | t >>> (32 - s);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java
index 66c696b8a6..85140aa8d2 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md4PasswordEncoder.java
@@ -23,60 +23,64 @@ import org.springframework.security.crypto.codec.Utf8;
 /**
  * MD4 implementation of PasswordEncoder.
  * <p>
- * If a <code>null</code> password is presented, it will be treated as an empty <code>String</code> ("") password.
+ * If a <code>null</code> password is presented, it will be treated as an empty
+ * <code>String</code> ("") password.
  * <p>
  * As MD4 is a one-way hash, the salt can contain any characters.
  * <p>
- * <b>NOTE:</b> This password encoder is only included for backwards compatability with legacy applications, it's not
- * secure, don't use it for anything new!
+ * <b>NOTE:</b> This password encoder is only included for backwards compatability with
+ * legacy applications, it's not secure, don't use it for anything new!
  *
  * @author Alan Stewart
  */
 public class Md4PasswordEncoder extends BaseDigestPasswordEncoder {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Encodes the rawPass using an MD4 message digest. If a salt is specified it will be merged with the password
-     * before encoding.
-     *
-     * @param rawPass The plain text password
-     * @param salt The salt to sprinkle
-     * @return Hex string of password digest (or base64 encoded string if encodeHashAsBase64 is enabled.
-     */
-    public String encodePassword(String rawPass, Object salt) {
-        String saltedPass = mergePasswordAndSalt(rawPass, salt, false);
+	/**
+	 * Encodes the rawPass using an MD4 message digest. If a salt is specified it will be
+	 * merged with the password before encoding.
+	 *
+	 * @param rawPass The plain text password
+	 * @param salt The salt to sprinkle
+	 * @return Hex string of password digest (or base64 encoded string if
+	 * encodeHashAsBase64 is enabled.
+	 */
+	public String encodePassword(String rawPass, Object salt) {
+		String saltedPass = mergePasswordAndSalt(rawPass, salt, false);
 
-        byte[] passBytes = Utf8.encode(saltedPass);
+		byte[] passBytes = Utf8.encode(saltedPass);
 
-        Md4 md4 = new Md4();
-        md4.update(passBytes, 0, passBytes.length);
+		Md4 md4 = new Md4();
+		md4.update(passBytes, 0, passBytes.length);
 
-        byte[] resBuf = md4.digest();
+		byte[] resBuf = md4.digest();
 
-        if (getEncodeHashAsBase64()) {
-            return Utf8.decode(Base64.encode(resBuf));
-        } else {
-            return new String(Hex.encode(resBuf));
-        }
-    }
+		if (getEncodeHashAsBase64()) {
+			return Utf8.decode(Base64.encode(resBuf));
+		}
+		else {
+			return new String(Hex.encode(resBuf));
+		}
+	}
 
-    /**
-     * Takes a previously encoded password and compares it with a raw password after mixing in the salt and
-     * encoding that value.
-     *
-     * @param encPass previously encoded password
-     * @param rawPass plain text password
-     * @param salt salt to mix into password
-     * @return true or false
-     */
-    public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-        String pass1 = "" + encPass;
-        String pass2 = encodePassword(rawPass, salt);
-        return PasswordEncoderUtils.equals(pass1,pass2);
-    }
+	/**
+	 * Takes a previously encoded password and compares it with a raw password after
+	 * mixing in the salt and encoding that value.
+	 *
+	 * @param encPass previously encoded password
+	 * @param rawPass plain text password
+	 * @param salt salt to mix into password
+	 * @return true or false
+	 */
+	public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+		String pass1 = "" + encPass;
+		String pass2 = encodePassword(rawPass, salt);
+		return PasswordEncoderUtils.equals(pass1, pass2);
+	}
 
-    public String getAlgorithm() {
-        return "MD4";
-    }
+	public String getAlgorithm() {
+		return "MD4";
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java
index ee57f00472..eda30e83f0 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/Md5PasswordEncoder.java
@@ -15,13 +15,19 @@
 package org.springframework.security.authentication.encoding;
 
 /**
- * <p>MD5 implementation of PasswordEncoder.</p>
- * <p>If a <code>null</code> password is presented, it will be treated as an empty <code>String</code> ("")
- * password.</p>
- * <P>As MD5 is a one-way hash, the salt can contain any characters.</p>
+ * <p>
+ * MD5 implementation of PasswordEncoder.
+ * </p>
+ * <p>
+ * If a <code>null</code> password is presented, it will be treated as an empty
+ * <code>String</code> ("") password.
+ * </p>
+ * <P>
+ * As MD5 is a one-way hash, the salt can contain any characters.
+ * </p>
  *
- * This is a convenience class that extends the
- * {@link MessageDigestPasswordEncoder} and passes MD5 as the algorithm to use.
+ * This is a convenience class that extends the {@link MessageDigestPasswordEncoder} and
+ * passes MD5 as the algorithm to use.
  *
  * @author Ray Krueger
  * @author colin sampaleanu
@@ -29,7 +35,7 @@ package org.springframework.security.authentication.encoding;
  */
 public class Md5PasswordEncoder extends MessageDigestPasswordEncoder {
 
-    public Md5PasswordEncoder() {
-        super("MD5");
-    }
+	public Md5PasswordEncoder() {
+		super("MD5");
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java
index d8f5973288..9d5885f5db 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/MessageDigestPasswordEncoder.java
@@ -12,17 +12,18 @@ import org.springframework.util.Assert;
 /**
  * Base for digest password encoders.
  * <p>
- * This class can be used stand-alone, or one of the subclasses can be used for compatiblity and convenience.
- * When using this class directly you must specify a
- * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/security/CryptoSpec.html#AppA">
- * Message Digest Algorithm</a> to use as a constructor arg.
+ * This class can be used stand-alone, or one of the subclasses can be used for
+ * compatiblity and convenience. When using this class directly you must specify a <a
+ * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/CryptoSpec.html#AppA"> Message
+ * Digest Algorithm</a> to use as a constructor arg.
  * <p>
- * The encoded password hash is normally returned as Hex (32 char) version of the hash bytes.
- * Setting the <tt>encodeHashAsBase64</tt> property to <tt>true</tt> will cause the encoded pass to be returned
- * as Base64 text, which will consume 24 characters.
- * See {@link BaseDigestPasswordEncoder#setEncodeHashAsBase64(boolean)}
+ * The encoded password hash is normally returned as Hex (32 char) version of the hash
+ * bytes. Setting the <tt>encodeHashAsBase64</tt> property to <tt>true</tt> will cause the
+ * encoded pass to be returned as Base64 text, which will consume 24 characters. See
+ * {@link BaseDigestPasswordEncoder#setEncodeHashAsBase64(boolean)}
  * <p>
  * This {@code PasswordEncoder} can be used directly as in the following example:
+ * 
  * <pre>
  * &lt;bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.MessageDigestPasswordEncoder"&gt;
  *     &lt;constructor-arg value="MD5"/&gt;
@@ -30,7 +31,8 @@ import org.springframework.util.Assert;
  * </pre>
  * <p>
  * If desired, the {@link #setIterations iterations} property can be set to enable
- * "<a href="http://en.wikipedia.org/wiki/Key_strengthening">password stretching</a>" for the digest calculation.
+ * "<a href="http://en.wikipedia.org/wiki/Key_strengthening">password stretching</a>" for
+ * the digest calculation.
  *
  * @author Ray Krueger
  * @author Luke Taylor
@@ -38,106 +40,112 @@ import org.springframework.util.Assert;
  */
 public class MessageDigestPasswordEncoder extends BaseDigestPasswordEncoder {
 
-    private final String algorithm;
-    private int iterations = 1;
+	private final String algorithm;
+	private int iterations = 1;
 
-    /**
-     * The digest algorithm to use
-     * Supports the named <a href="http://java.sun.com/j2se/1.4.2/docs/guide/security/CryptoSpec.html#AppA">
-     * Message Digest Algorithms</a> in the Java environment.
-     *
-     * @param algorithm
-     */
-    public MessageDigestPasswordEncoder(String algorithm) {
-        this(algorithm, false);
-    }
+	/**
+	 * The digest algorithm to use Supports the named <a
+	 * href="http://java.sun.com/j2se/1.4.2/docs/guide/security/CryptoSpec.html#AppA">
+	 * Message Digest Algorithms</a> in the Java environment.
+	 *
+	 * @param algorithm
+	 */
+	public MessageDigestPasswordEncoder(String algorithm) {
+		this(algorithm, false);
+	}
 
-    /**
-     * Convenience constructor for specifying the algorithm and whether or not to enable base64 encoding
-     *
-     * @param algorithm
-     * @param encodeHashAsBase64
-     * @throws IllegalArgumentException if an unknown
-     */
-    public MessageDigestPasswordEncoder(String algorithm, boolean encodeHashAsBase64) throws IllegalArgumentException {
-        this.algorithm = algorithm;
-        setEncodeHashAsBase64(encodeHashAsBase64);
-        //Validity Check
-        getMessageDigest();
-    }
+	/**
+	 * Convenience constructor for specifying the algorithm and whether or not to enable
+	 * base64 encoding
+	 *
+	 * @param algorithm
+	 * @param encodeHashAsBase64
+	 * @throws IllegalArgumentException if an unknown
+	 */
+	public MessageDigestPasswordEncoder(String algorithm, boolean encodeHashAsBase64)
+			throws IllegalArgumentException {
+		this.algorithm = algorithm;
+		setEncodeHashAsBase64(encodeHashAsBase64);
+		// Validity Check
+		getMessageDigest();
+	}
 
-    /**
-     * Encodes the rawPass using a MessageDigest.
-     * If a salt is specified it will be merged with the password before encoding.
-     *
-     * @param rawPass The plain text password
-     * @param salt The salt to sprinkle
-     * @return Hex string of password digest (or base64 encoded string if encodeHashAsBase64 is enabled.
-     */
-    public String encodePassword(String rawPass, Object salt) {
-        String saltedPass = mergePasswordAndSalt(rawPass, salt, false);
+	/**
+	 * Encodes the rawPass using a MessageDigest. If a salt is specified it will be merged
+	 * with the password before encoding.
+	 *
+	 * @param rawPass The plain text password
+	 * @param salt The salt to sprinkle
+	 * @return Hex string of password digest (or base64 encoded string if
+	 * encodeHashAsBase64 is enabled.
+	 */
+	public String encodePassword(String rawPass, Object salt) {
+		String saltedPass = mergePasswordAndSalt(rawPass, salt, false);
 
-        MessageDigest messageDigest = getMessageDigest();
+		MessageDigest messageDigest = getMessageDigest();
 
-        byte[] digest = messageDigest.digest(Utf8.encode(saltedPass));
+		byte[] digest = messageDigest.digest(Utf8.encode(saltedPass));
 
-        // "stretch" the encoded value if configured to do so
-        for (int i = 1; i < iterations; i++) {
-            digest = messageDigest.digest(digest);
-        }
+		// "stretch" the encoded value if configured to do so
+		for (int i = 1; i < iterations; i++) {
+			digest = messageDigest.digest(digest);
+		}
 
-        if (getEncodeHashAsBase64()) {
-            return Utf8.decode(Base64.encode(digest));
-        } else {
-            return new String(Hex.encode(digest));
-        }
-    }
+		if (getEncodeHashAsBase64()) {
+			return Utf8.decode(Base64.encode(digest));
+		}
+		else {
+			return new String(Hex.encode(digest));
+		}
+	}
 
-    /**
-     * Get a MessageDigest instance for the given algorithm.
-     * Throws an IllegalArgumentException if <i>algorithm</i> is unknown
-     *
-     * @return MessageDigest instance
-     * @throws IllegalArgumentException if NoSuchAlgorithmException is thrown
-     */
-    protected final MessageDigest getMessageDigest() throws IllegalArgumentException {
-        try {
-            return MessageDigest.getInstance(algorithm);
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalArgumentException("No such algorithm [" + algorithm + "]");
-        }
-    }
+	/**
+	 * Get a MessageDigest instance for the given algorithm. Throws an
+	 * IllegalArgumentException if <i>algorithm</i> is unknown
+	 *
+	 * @return MessageDigest instance
+	 * @throws IllegalArgumentException if NoSuchAlgorithmException is thrown
+	 */
+	protected final MessageDigest getMessageDigest() throws IllegalArgumentException {
+		try {
+			return MessageDigest.getInstance(algorithm);
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("No such algorithm [" + algorithm + "]");
+		}
+	}
 
-    /**
-     * Takes a previously encoded password and compares it with a rawpassword after mixing in the salt and
-     * encoding that value
-     *
-     * @param encPass previously encoded password
-     * @param rawPass plain text password
-     * @param salt salt to mix into password
-     * @return true or false
-     */
-    public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-        String pass1 = "" + encPass;
-        String pass2 = encodePassword(rawPass, salt);
+	/**
+	 * Takes a previously encoded password and compares it with a rawpassword after mixing
+	 * in the salt and encoding that value
+	 *
+	 * @param encPass previously encoded password
+	 * @param rawPass plain text password
+	 * @param salt salt to mix into password
+	 * @return true or false
+	 */
+	public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+		String pass1 = "" + encPass;
+		String pass2 = encodePassword(rawPass, salt);
 
-        return PasswordEncoderUtils.equals(pass1,pass2);
-    }
+		return PasswordEncoderUtils.equals(pass1, pass2);
+	}
 
-    public String getAlgorithm() {
-        return algorithm;
-    }
+	public String getAlgorithm() {
+		return algorithm;
+	}
 
-    /**
-     * Sets the number of iterations for which the calculated hash value should be "stretched". If this is greater
-     * than one, the initial digest is calculated, the digest function will be called repeatedly on the result for
-     * the additional number of iterations.
-     *
-     * @param iterations the number of iterations which will be executed on the hashed password/salt
-     * value. Defaults to 1.
-     */
-    public void setIterations(int iterations) {
-        Assert.isTrue(iterations > 0, "Iterations value must be greater than zero");
-        this.iterations = iterations;
-    }
+	/**
+	 * Sets the number of iterations for which the calculated hash value should be
+	 * "stretched". If this is greater than one, the initial digest is calculated, the
+	 * digest function will be called repeatedly on the result for the additional number
+	 * of iterations.
+	 *
+	 * @param iterations the number of iterations which will be executed on the hashed
+	 * password/salt value. Defaults to 1.
+	 */
+	public void setIterations(int iterations) {
+		Assert.isTrue(iterations > 0, "Iterations value must be greater than zero");
+		this.iterations = iterations;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
index d813fa4c13..d41901149d 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoder.java
@@ -15,56 +15,76 @@
 
 package org.springframework.security.authentication.encoding;
 
-
 /**
  * Interface for performing authentication operations on a password.
  *
  * @author colin sampaleanu
  * @deprecated It is recommended to use
- *             {@link org.springframework.security.crypto.password.PasswordEncoder}
- *             instead which better accommodates best practice of randomly
- *             generated salt that is included with the password.
+ * {@link org.springframework.security.crypto.password.PasswordEncoder} instead which
+ * better accommodates best practice of randomly generated salt that is included with the
+ * password.
  */
 @Deprecated
 public interface PasswordEncoder {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * <p>Encodes the specified raw password with an implementation specific algorithm.</p>
-     *  <P>This will generally be a one-way message digest such as MD5 or SHA, but may also be a plaintext
-     * variant which does no encoding at all, but rather returns the same password it was fed. The latter is useful to
-     * plug in when the original password must be stored as-is.</p>
-     *  <p>The specified salt will potentially be used by the implementation to "salt" the initial value before
-     * encoding. A salt is usually a user-specific value which is added to the password before the digest is computed.
-     * This means that computation of digests for common dictionary words will be different than those in the backend
-     * store, because the dictionary word digests will not reflect the addition of the salt. If a per-user salt is
-     * used (rather than a system-wide salt), it also means users with the same password will have different digest
-     * encoded passwords in the backend store.</p>
-     *  <P>If a salt value is provided, the same salt value must be use when calling the  {@link
-     * #isPasswordValid(String, String, Object)} method. Note that a specific implementation may choose to ignore the
-     * salt value (via <code>null</code>), or provide its own.</p>
-     *
-     * @param rawPass the password to encode
-     * @param salt optionally used by the implementation to "salt" the raw password before encoding. A
-     *        <code>null</code> value is legal.
-     *
-     * @return encoded password
-     */
-    String encodePassword(String rawPass, Object salt);
+	/**
+	 * <p>
+	 * Encodes the specified raw password with an implementation specific algorithm.
+	 * </p>
+	 * <P>
+	 * This will generally be a one-way message digest such as MD5 or SHA, but may also be
+	 * a plaintext variant which does no encoding at all, but rather returns the same
+	 * password it was fed. The latter is useful to plug in when the original password
+	 * must be stored as-is.
+	 * </p>
+	 * <p>
+	 * The specified salt will potentially be used by the implementation to "salt" the
+	 * initial value before encoding. A salt is usually a user-specific value which is
+	 * added to the password before the digest is computed. This means that computation of
+	 * digests for common dictionary words will be different than those in the backend
+	 * store, because the dictionary word digests will not reflect the addition of the
+	 * salt. If a per-user salt is used (rather than a system-wide salt), it also means
+	 * users with the same password will have different digest encoded passwords in the
+	 * backend store.
+	 * </p>
+	 * <P>
+	 * If a salt value is provided, the same salt value must be use when calling the
+	 * {@link #isPasswordValid(String, String, Object)} method. Note that a specific
+	 * implementation may choose to ignore the salt value (via <code>null</code>), or
+	 * provide its own.
+	 * </p>
+	 *
+	 * @param rawPass the password to encode
+	 * @param salt optionally used by the implementation to "salt" the raw password before
+	 * encoding. A <code>null</code> value is legal.
+	 *
+	 * @return encoded password
+	 */
+	String encodePassword(String rawPass, Object salt);
 
-    /**
-     * <p>Validates a specified "raw" password against an encoded password.</p>
-     *  <P>The encoded password should have previously been generated by {@link #encodePassword(String,
-     * Object)}. This method will encode the <code>rawPass</code> (using the optional <code>salt</code>),  and then
-     * compared it with the presented <code>encPass</code>.</p>
-     *  <p>For a discussion of salts, please refer to {@link #encodePassword(String, Object)}.</p>
-     *
-     * @param encPass a pre-encoded password
-     * @param rawPass a raw password to encode and compare against the pre-encoded password
-     * @param salt optionally used by the implementation to "salt" the raw password before encoding. A
-     *        <code>null</code> value is legal.
-     *
-     * @return true if the password is valid , false otherwise
-     */
-    boolean isPasswordValid(String encPass, String rawPass, Object salt);
+	/**
+	 * <p>
+	 * Validates a specified "raw" password against an encoded password.
+	 * </p>
+	 * <P>
+	 * The encoded password should have previously been generated by
+	 * {@link #encodePassword(String, Object)}. This method will encode the
+	 * <code>rawPass</code> (using the optional <code>salt</code>), and then compared it
+	 * with the presented <code>encPass</code>.
+	 * </p>
+	 * <p>
+	 * For a discussion of salts, please refer to {@link #encodePassword(String, Object)}.
+	 * </p>
+	 *
+	 * @param encPass a pre-encoded password
+	 * @param rawPass a raw password to encode and compare against the pre-encoded
+	 * password
+	 * @param salt optionally used by the implementation to "salt" the raw password before
+	 * encoding. A <code>null</code> value is legal.
+	 *
+	 * @return true if the password is valid , false otherwise
+	 */
+	boolean isPasswordValid(String encPass, String rawPass, Object salt);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoderUtils.java b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoderUtils.java
index ee6cca91cd..e33ca76bb0 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoderUtils.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/PasswordEncoderUtils.java
@@ -11,34 +11,36 @@ import java.io.UnsupportedEncodingException;
  */
 class PasswordEncoderUtils {
 
-    /**
-     * Constant time comparison to prevent against timing attacks.
-     * @param expected
-     * @param actual
-     * @return
-     */
-    static boolean equals(String expected, String actual) {
-        byte[] expectedBytes = bytesUtf8(expected);
-        byte[] actualBytes = bytesUtf8(actual);
-        int expectedLength = expectedBytes == null ? -1 : expectedBytes.length;
-        int actualLength = actualBytes == null ? -1 : actualBytes.length;
-        if (expectedLength != actualLength) {
-            return false;
-        }
+	/**
+	 * Constant time comparison to prevent against timing attacks.
+	 * @param expected
+	 * @param actual
+	 * @return
+	 */
+	static boolean equals(String expected, String actual) {
+		byte[] expectedBytes = bytesUtf8(expected);
+		byte[] actualBytes = bytesUtf8(actual);
+		int expectedLength = expectedBytes == null ? -1 : expectedBytes.length;
+		int actualLength = actualBytes == null ? -1 : actualBytes.length;
+		if (expectedLength != actualLength) {
+			return false;
+		}
 
-        int result = 0;
-        for (int i = 0; i < expectedLength; i++) {
-            result |= expectedBytes[i] ^ actualBytes[i];
-        }
-        return result == 0;
-    }
+		int result = 0;
+		for (int i = 0; i < expectedLength; i++) {
+			result |= expectedBytes[i] ^ actualBytes[i];
+		}
+		return result == 0;
+	}
 
-    private static byte[] bytesUtf8(String s) {
-        if(s == null) {
-            return null;
-        }
+	private static byte[] bytesUtf8(String s) {
+		if (s == null) {
+			return null;
+		}
 
-        return Utf8.encode(s);
-    }
-    private PasswordEncoderUtils() {}
+		return Utf8.encode(s);
+	}
+
+	private PasswordEncoderUtils() {
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java
index 14a996c842..94692b48f7 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoder.java
@@ -18,64 +18,79 @@ package org.springframework.security.authentication.encoding;
 import java.util.Locale;
 
 /**
- * <p>Plaintext implementation of PasswordEncoder.</p>
- *  <P>As callers may wish to extract the password and salts separately from the encoded password, the salt must
- * not contain reserved characters (specifically '{' and '}').</p>
+ * <p>
+ * Plaintext implementation of PasswordEncoder.
+ * </p>
+ * <P>
+ * As callers may wish to extract the password and salts separately from the encoded
+ * password, the salt must not contain reserved characters (specifically '{' and '}').
+ * </p>
  *
  * @author colin sampaleanu
  * @author Ben Alex
  */
 public class PlaintextPasswordEncoder extends BasePasswordEncoder {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private boolean ignorePasswordCase = false;
+	private boolean ignorePasswordCase = false;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String encodePassword(String rawPass, Object salt) {
-        return mergePasswordAndSalt(rawPass, salt, true);
-    }
+	public String encodePassword(String rawPass, Object salt) {
+		return mergePasswordAndSalt(rawPass, salt, true);
+	}
 
-    public boolean isIgnorePasswordCase() {
-        return ignorePasswordCase;
-    }
+	public boolean isIgnorePasswordCase() {
+		return ignorePasswordCase;
+	}
 
-    public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-        String pass1 = encPass + "";
+	public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+		String pass1 = encPass + "";
 
-        // Strict delimiters is false because pass2 never persisted anywhere
-        // and we want to avoid unnecessary exceptions as a result (the
-        // authentication will fail as the encodePassword never allows them)
-        String pass2 = mergePasswordAndSalt(rawPass, salt, false);
+		// Strict delimiters is false because pass2 never persisted anywhere
+		// and we want to avoid unnecessary exceptions as a result (the
+		// authentication will fail as the encodePassword never allows them)
+		String pass2 = mergePasswordAndSalt(rawPass, salt, false);
 
-        if (ignorePasswordCase) {
-            // Note: per String javadoc to get correct results for Locale insensitive, use English
-            pass1 = pass1.toLowerCase(Locale.ENGLISH);
-            pass2 = pass2.toLowerCase(Locale.ENGLISH);
-        }
-        return PasswordEncoderUtils.equals(pass1,pass2);
-    }
+		if (ignorePasswordCase) {
+			// Note: per String javadoc to get correct results for Locale insensitive, use
+			// English
+			pass1 = pass1.toLowerCase(Locale.ENGLISH);
+			pass2 = pass2.toLowerCase(Locale.ENGLISH);
+		}
+		return PasswordEncoderUtils.equals(pass1, pass2);
+	}
 
-    /**
-     * Demerges the previously {@link #encodePassword(String, Object)}<code>String</code>.<P>The resulting
-     * array is guaranteed to always contain two elements. The first is the password, and the second is the salt.</p>
-     *  <P>Throws an exception if <code>null</code> or an empty <code>String</code> is passed to the method.</p>
-     *
-     * @param password from {@link #encodePassword(String, Object)}
-     *
-     * @return an array containing the password and salt
-     */
-    public String[] obtainPasswordAndSalt(String password) {
-        return demergePasswordAndSalt(password);
-    }
+	/**
+	 * Demerges the previously {@link #encodePassword(String, Object)}<code>String</code>.
+	 * <P>
+	 * The resulting array is guaranteed to always contain two elements. The first is the
+	 * password, and the second is the salt.
+	 * </p>
+	 * <P>
+	 * Throws an exception if <code>null</code> or an empty <code>String</code> is passed
+	 * to the method.
+	 * </p>
+	 *
+	 * @param password from {@link #encodePassword(String, Object)}
+	 *
+	 * @return an array containing the password and salt
+	 */
+	public String[] obtainPasswordAndSalt(String password) {
+		return demergePasswordAndSalt(password);
+	}
 
-    /**
-     * Indicates whether the password comparison is case sensitive.<P>Defaults to <code>false</code>, meaning
-     * an exact case match is required.</p>
-     *
-     * @param ignorePasswordCase set to <code>true</code> for less stringent comparison
-     */
-    public void setIgnorePasswordCase(boolean ignorePasswordCase) {
-        this.ignorePasswordCase = ignorePasswordCase;
-    }
+	/**
+	 * Indicates whether the password comparison is case sensitive.
+	 * <P>
+	 * Defaults to <code>false</code>, meaning an exact case match is required.
+	 * </p>
+	 *
+	 * @param ignorePasswordCase set to <code>true</code> for less stringent comparison
+	 */
+	public void setIgnorePasswordCase(boolean ignorePasswordCase) {
+		this.ignorePasswordCase = ignorePasswordCase;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java
index 02658c9c83..08f79463fc 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java
@@ -15,15 +15,21 @@
 package org.springframework.security.authentication.encoding;
 
 /**
- * <p>SHA implementation of PasswordEncoder.</p>
- * <p>If a <code>null</code> password is presented, it will be treated as an empty <code>String</code> ("")
- * password.</p>
- * <p>As SHA is a one-way hash, the salt can contain any characters. The default strength for the SHA encoding is SHA-1.
- * If you wish to use higher strengths use the argumented constructor.
- * {@link #ShaPasswordEncoder(int strength)}
+ * <p>
+ * SHA implementation of PasswordEncoder.
+ * </p>
+ * <p>
+ * If a <code>null</code> password is presented, it will be treated as an empty
+ * <code>String</code> ("") password.
+ * </p>
+ * <p>
+ * As SHA is a one-way hash, the salt can contain any characters. The default strength for
+ * the SHA encoding is SHA-1. If you wish to use higher strengths use the argumented
+ * constructor. {@link #ShaPasswordEncoder(int strength)}
  * </p>
  * <p>
  * The applicationContext example...
+ * 
  * <pre>
  * &lt;bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder"&gt;
  *     &lt;constructor-arg value="256"/>
@@ -36,20 +42,21 @@ package org.springframework.security.authentication.encoding;
  */
 public class ShaPasswordEncoder extends MessageDigestPasswordEncoder {
 
-    /**
-     * Initializes the ShaPasswordEncoder for SHA-1 strength
-     */
-    public ShaPasswordEncoder() {
-        this(1);
-    }
+	/**
+	 * Initializes the ShaPasswordEncoder for SHA-1 strength
+	 */
+	public ShaPasswordEncoder() {
+		this(1);
+	}
 
-    /**
-     * Initialize the ShaPasswordEncoder with a given SHA stength as supported by the JVM
-     * EX: <code>ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);</code> initializes with SHA-256
-     *
-     * @param strength EX: 1, 256, 384, 512
-     */
-    public ShaPasswordEncoder(int strength) {
-        super("SHA-" + strength);
-    }
+	/**
+	 * Initialize the ShaPasswordEncoder with a given SHA stength as supported by the JVM
+	 * EX: <code>ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);</code>
+	 * initializes with SHA-256
+	 *
+	 * @param strength EX: 1, 256, 384, 512
+	 */
+	public ShaPasswordEncoder(int strength) {
+		super("SHA-" + strength);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/package-info.java b/core/src/main/java/org/springframework/security/authentication/encoding/package-info.java
index edcc4ab247..2be06c3281 100644
--- a/core/src/main/java/org/springframework/security/authentication/encoding/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/encoding/package-info.java
@@ -8,3 +8,4 @@
  * can also be used.
  */
 package org.springframework.security.authentication.encoding;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java
index 99bc1caea6..c31c38d9cd 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationEvent.java
@@ -19,29 +19,33 @@ import org.springframework.security.core.Authentication;
 
 import org.springframework.context.ApplicationEvent;
 
-
 /**
- * Represents an application authentication event.<P>The <code>ApplicationEvent</code>'s <code>source</code> will
- * be the <code>Authentication</code> object.</p>
+ * Represents an application authentication event.
+ * <P>
+ * The <code>ApplicationEvent</code>'s <code>source</code> will be the
+ * <code>Authentication</code> object.
+ * </p>
  *
  * @author Ben Alex
  */
 public abstract class AbstractAuthenticationEvent extends ApplicationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AbstractAuthenticationEvent(Authentication authentication) {
-        super(authentication);
-    }
+	public AbstractAuthenticationEvent(Authentication authentication) {
+		super(authentication);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Getters for the <code>Authentication</code> request that caused the event. Also available from
-     * <code>super.getSource()</code>.
-     *
-     * @return the authentication request
-     */
-    public Authentication getAuthentication() {
-        return (Authentication) super.getSource();
-    }
+	/**
+	 * Getters for the <code>Authentication</code> request that caused the event. Also
+	 * available from <code>super.getSource()</code>.
+	 *
+	 * @return the authentication request
+	 */
+	public Authentication getAuthentication() {
+		return (Authentication) super.getSource();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java
index 0a3f652426..37dd2c74c3 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AbstractAuthenticationFailureEvent.java
@@ -20,28 +20,32 @@ import org.springframework.security.core.AuthenticationException;
 
 import org.springframework.util.Assert;
 
-
 /**
  * Abstract application event which indicates authentication failure for some reason.
  *
  * @author Ben Alex
  */
-public abstract class AbstractAuthenticationFailureEvent extends AbstractAuthenticationEvent {
-    //~ Instance fields ================================================================================================
+public abstract class AbstractAuthenticationFailureEvent extends
+		AbstractAuthenticationEvent {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final AuthenticationException exception;
+	private final AuthenticationException exception;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AbstractAuthenticationFailureEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication);
-        Assert.notNull(exception, "AuthenticationException is required");
-        this.exception = exception;
-    }
+	public AbstractAuthenticationFailureEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication);
+		Assert.notNull(exception, "AuthenticationException is required");
+		this.exception = exception;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public AuthenticationException getException() {
-        return exception;
-    }
+	public AuthenticationException getException() {
+		return exception;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java
index 10599f7f33..8f7b3c70a9 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureBadCredentialsEvent.java
@@ -18,16 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to invalid credentials being presented.
+ * Application event which indicates authentication failure due to invalid credentials
+ * being presented.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureBadCredentialsEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureBadCredentialsEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureBadCredentialsEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureBadCredentialsEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java
index 9acf1ce142..a70b8991f7 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureCredentialsExpiredEvent.java
@@ -18,16 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to the user's credentials having expired.
+ * Application event which indicates authentication failure due to the user's credentials
+ * having expired.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureCredentialsExpiredEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureCredentialsExpiredEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureCredentialsExpiredEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureCredentialsExpiredEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java
index b789c9fda5..1f6daea611 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureDisabledEvent.java
@@ -18,16 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to the user's account being disabled.
+ * Application event which indicates authentication failure due to the user's account
+ * being disabled.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureDisabledEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureDisabledEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureDisabledEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureDisabledEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java
index f5f9719859..c0694d8473 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureExpiredEvent.java
@@ -18,16 +18,18 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to the user's account having expired.
+ * Application event which indicates authentication failure due to the user's account
+ * having expired.
  *
  * @author Ben Alex
  */
 public class AuthenticationFailureExpiredEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureExpiredEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureExpiredEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java
index 468153dc97..d7c2509156 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureLockedEvent.java
@@ -18,16 +18,18 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to the user's account having been locked.
+ * Application event which indicates authentication failure due to the user's account
+ * having been locked.
  *
  * @author Ben Alex
  */
 public class AuthenticationFailureLockedEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureLockedEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureLockedEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java
index 8463fcbba0..5d1d029238 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProviderNotFoundEvent.java
@@ -18,17 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to there being no registered
- * <code>AuthenticationProvider</code> that can process the request.
+ * Application event which indicates authentication failure due to there being no
+ * registered <code>AuthenticationProvider</code> that can process the request.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureProviderNotFoundEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureProviderNotFoundEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureProviderNotFoundEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureProviderNotFoundEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java
index 587c14b59e..80f03617b4 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureProxyUntrustedEvent.java
@@ -18,17 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to the CAS user's ticket being generated by an
- * untrusted proxy.
+ * Application event which indicates authentication failure due to the CAS user's ticket
+ * being generated by an untrusted proxy.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureProxyUntrustedEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureProxyUntrustedEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureProxyUntrustedEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureProxyUntrustedEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java
index 9d42895734..ff3049e0ef 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationFailureServiceExceptionEvent.java
@@ -18,17 +18,19 @@ package org.springframework.security.authentication.event;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Application event which indicates authentication failure due to there being a problem internal to the
- * <code>AuthenticationManager</code>.
+ * Application event which indicates authentication failure due to there being a problem
+ * internal to the <code>AuthenticationManager</code>.
  *
  * @author Ben Alex
  */
-public class AuthenticationFailureServiceExceptionEvent extends AbstractAuthenticationFailureEvent {
-    //~ Constructors ===================================================================================================
+public class AuthenticationFailureServiceExceptionEvent extends
+		AbstractAuthenticationFailureEvent {
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationFailureServiceExceptionEvent(Authentication authentication, AuthenticationException exception) {
-        super(authentication, exception);
-    }
+	public AuthenticationFailureServiceExceptionEvent(Authentication authentication,
+			AuthenticationException exception) {
+		super(authentication, exception);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java
index 58f0440097..5168e6dcbe 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/AuthenticationSuccessEvent.java
@@ -17,16 +17,16 @@ package org.springframework.security.authentication.event;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Application event which indicates successful authentication.
  *
  * @author Ben Alex
  */
 public class AuthenticationSuccessEvent extends AbstractAuthenticationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationSuccessEvent(Authentication authentication) {
-        super(authentication);
-    }
+	public AuthenticationSuccessEvent(Authentication authentication) {
+		super(authentication);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java
index 8b76a711b3..8ce3131a50 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java
@@ -19,35 +19,41 @@ import org.springframework.security.core.Authentication;
 
 import org.springframework.util.Assert;
 
-
 /**
- * Indicates an interactive authentication was successful.<P>The <code>ApplicationEvent</code>'s
- * <code>source</code> will be the <code>Authentication</code> object.</p>
+ * Indicates an interactive authentication was successful.
+ * <P>
+ * The <code>ApplicationEvent</code>'s <code>source</code> will be the
+ * <code>Authentication</code> object.
+ * </p>
  *
  * @author Ben Alex
  */
 public class InteractiveAuthenticationSuccessEvent extends AbstractAuthenticationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Class<?> generatedBy;
+	private final Class<?> generatedBy;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public InteractiveAuthenticationSuccessEvent(Authentication authentication, Class<?> generatedBy) {
-        super(authentication);
-        Assert.notNull(generatedBy);
-        this.generatedBy = generatedBy;
-    }
+	public InteractiveAuthenticationSuccessEvent(Authentication authentication,
+			Class<?> generatedBy) {
+		super(authentication);
+		Assert.notNull(generatedBy);
+		this.generatedBy = generatedBy;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Getter for the <code>Class</code> that generated this event. This can be useful for generating
-     * additional logging information.
-     *
-     * @return the class
-     */
-    public Class<?> getGeneratedBy() {
-        return generatedBy;
-    }
+	/**
+	 * Getter for the <code>Class</code> that generated this event. This can be useful for
+	 * generating additional logging information.
+	 *
+	 * @return the class
+	 */
+	public Class<?> getGeneratedBy() {
+		return generatedBy;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java
index 4bdd6e7f86..593db0a8d0 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/LoggerListener.java
@@ -20,7 +20,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationListener;
 import org.springframework.util.ClassUtils;
 
-
 /**
  * Outputs authentication-related application events to Commons Logging.
  * <p>
@@ -29,44 +28,51 @@ import org.springframework.util.ClassUtils;
  * @author Ben Alex
  */
 public class LoggerListener implements ApplicationListener<AbstractAuthenticationEvent> {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(LoggerListener.class);
+	private static final Log logger = LogFactory.getLog(LoggerListener.class);
 
-    /** If set to true, {@link InteractiveAuthenticationSuccessEvent} will be logged (defaults to true) */
-    private boolean logInteractiveAuthenticationSuccessEvents = true;
+	/**
+	 * If set to true, {@link InteractiveAuthenticationSuccessEvent} will be logged
+	 * (defaults to true)
+	 */
+	private boolean logInteractiveAuthenticationSuccessEvents = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void onApplicationEvent(AbstractAuthenticationEvent event) {
-        if (!logInteractiveAuthenticationSuccessEvents && event instanceof InteractiveAuthenticationSuccessEvent) {
-            return;
-        }
+	public void onApplicationEvent(AbstractAuthenticationEvent event) {
+		if (!logInteractiveAuthenticationSuccessEvents
+				&& event instanceof InteractiveAuthenticationSuccessEvent) {
+			return;
+		}
 
-        if (logger.isWarnEnabled()) {
-            final StringBuilder builder = new StringBuilder();
-            builder.append("Authentication event ");
-            builder.append(ClassUtils.getShortName(event.getClass()));
-            builder.append(": ");
-            builder.append(event.getAuthentication().getName());
-            builder.append("; details: ");
-            builder.append(event.getAuthentication().getDetails());
+		if (logger.isWarnEnabled()) {
+			final StringBuilder builder = new StringBuilder();
+			builder.append("Authentication event ");
+			builder.append(ClassUtils.getShortName(event.getClass()));
+			builder.append(": ");
+			builder.append(event.getAuthentication().getName());
+			builder.append("; details: ");
+			builder.append(event.getAuthentication().getDetails());
 
-            if (event instanceof AbstractAuthenticationFailureEvent) {
-                builder.append("; exception: ");
-                builder.append(((AbstractAuthenticationFailureEvent) event).getException().getMessage());
-            }
+			if (event instanceof AbstractAuthenticationFailureEvent) {
+				builder.append("; exception: ");
+				builder.append(((AbstractAuthenticationFailureEvent) event)
+						.getException().getMessage());
+			}
 
-            logger.warn(builder.toString());
-        }
-    }
+			logger.warn(builder.toString());
+		}
+	}
 
-    public boolean isLogInteractiveAuthenticationSuccessEvents() {
-        return logInteractiveAuthenticationSuccessEvents;
-    }
+	public boolean isLogInteractiveAuthenticationSuccessEvents() {
+		return logInteractiveAuthenticationSuccessEvents;
+	}
 
-    public void setLogInteractiveAuthenticationSuccessEvents(
-            boolean logInteractiveAuthenticationSuccessEvents) {
-        this.logInteractiveAuthenticationSuccessEvents = logInteractiveAuthenticationSuccessEvents;
-    }
+	public void setLogInteractiveAuthenticationSuccessEvents(
+			boolean logInteractiveAuthenticationSuccessEvents) {
+		this.logInteractiveAuthenticationSuccessEvents = logInteractiveAuthenticationSuccessEvents;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/event/package-info.java b/core/src/main/java/org/springframework/security/authentication/event/package-info.java
index 1cb37bce74..6ebef32cab 100644
--- a/core/src/main/java/org/springframework/security/authentication/event/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/event/package-info.java
@@ -6,3 +6,4 @@
  */
 
 package org.springframework.security.authentication.event;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java
index b8e686f6d4..8f86b86aa3 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java
@@ -44,26 +44,37 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * An {@link AuthenticationProvider} implementation that retrieves user details from a JAAS login configuration.
+ * An {@link AuthenticationProvider} implementation that retrieves user details from a
+ * JAAS login configuration.
  *
- * <p>This <code>AuthenticationProvider</code> is capable of validating {@link
- * org.springframework.security.authentication.UsernamePasswordAuthenticationToken} requests contain the correct username and
- * password.</p>
- * <p>This implementation is backed by a <a
- * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html">JAAS</a> configuration that is provided by
- * a subclass's implementation of {@link #createLoginContext(CallbackHandler)}.
- *
- * <p>When using JAAS login modules as the authentication source, sometimes the
- * <a href="http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/LoginContext.html">LoginContext</a> will
- * require <i>CallbackHandler</i>s. The AbstractJaasAuthenticationProvider uses an internal
- * <a href="http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/callback/CallbackHandler.html">CallbackHandler
- * </a> to wrap the {@link JaasAuthenticationCallbackHandler}s configured in the ApplicationContext.
- * When the LoginContext calls the internal CallbackHandler, control is passed to each
- * {@link JaasAuthenticationCallbackHandler} for each Callback passed.
+ * <p>
+ * This <code>AuthenticationProvider</code> is capable of validating
+ * {@link org.springframework.security.authentication.UsernamePasswordAuthenticationToken}
+ * requests contain the correct username and password.
  * </p>
- * <p>{@link JaasAuthenticationCallbackHandler}s are passed to the AbstractJaasAuthenticationProvider through the {@link
- * #setCallbackHandlers(org.springframework.security.authentication.jaas.JaasAuthenticationCallbackHandler[]) callbackHandlers}
- * property.
+ * <p>
+ * This implementation is backed by a <a
+ * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html"
+ * >JAAS</a> configuration that is provided by a subclass's implementation of
+ * {@link #createLoginContext(CallbackHandler)}.
+ *
+ * <p>
+ * When using JAAS login modules as the authentication source, sometimes the <a href=
+ * "http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/LoginContext.html"
+ * >LoginContext</a> will require <i>CallbackHandler</i>s. The
+ * AbstractJaasAuthenticationProvider uses an internal <a href=
+ * "http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/callback/CallbackHandler.html"
+ * >CallbackHandler </a> to wrap the {@link JaasAuthenticationCallbackHandler}s configured
+ * in the ApplicationContext. When the LoginContext calls the internal CallbackHandler,
+ * control is passed to each {@link JaasAuthenticationCallbackHandler} for each Callback
+ * passed.
+ * </p>
+ * <p>
+ * {@link JaasAuthenticationCallbackHandler}s are passed to the
+ * AbstractJaasAuthenticationProvider through the
+ * {@link #setCallbackHandlers(org.springframework.security.authentication.jaas.JaasAuthenticationCallbackHandler[])
+ * callbackHandlers} property.
+ * 
  * <pre>
  * &lt;property name="callbackHandlers"&gt;
  *   &lt;list&gt;
@@ -73,15 +84,21 @@ import org.springframework.util.ObjectUtils;
  *  &lt;/list&gt;
  * &lt;/property&gt;
  * </pre>
+ * 
  * </p>
  * <p>
- * After calling LoginContext.login(), the AbstractJaasAuthenticationProvider will retrieve the returned Principals
- * from the Subject (LoginContext.getSubject().getPrincipals). Each returned principal is then passed to the
- * configured {@link AuthorityGranter}s. An AuthorityGranter is a mapping between a returned Principal, and a role
- * name. If an AuthorityGranter wishes to grant an Authorization a role, it returns that role name from it's {@link
- * AuthorityGranter#grant(java.security.Principal)} method. The returned role will be applied to the Authorization
- * object as a {@link GrantedAuthority}.</p>
- * <p>AuthorityGranters are configured in spring xml as follows...
+ * After calling LoginContext.login(), the AbstractJaasAuthenticationProvider will
+ * retrieve the returned Principals from the Subject
+ * (LoginContext.getSubject().getPrincipals). Each returned principal is then passed to
+ * the configured {@link AuthorityGranter}s. An AuthorityGranter is a mapping between a
+ * returned Principal, and a role name. If an AuthorityGranter wishes to grant an
+ * Authorization a role, it returns that role name from it's
+ * {@link AuthorityGranter#grant(java.security.Principal)} method. The returned role will
+ * be applied to the Authorization object as a {@link GrantedAuthority}.
+ * </p>
+ * <p>
+ * AuthorityGranters are configured in spring xml as follows...
+ * 
  * <pre>
  * &lt;property name="authorityGranters"&gt;
  *   &lt;list&gt;
@@ -93,273 +110,302 @@ import org.springframework.util.ObjectUtils;
  * @author Ray Krueger
  * @author Rob Winch
  */
-public abstract class AbstractJaasAuthenticationProvider implements AuthenticationProvider,
-ApplicationEventPublisherAware, InitializingBean, ApplicationListener<SessionDestroyedEvent> {
-    //~ Instance fields ================================================================================================
+public abstract class AbstractJaasAuthenticationProvider implements
+		AuthenticationProvider, ApplicationEventPublisherAware, InitializingBean,
+		ApplicationListener<SessionDestroyedEvent> {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ApplicationEventPublisher applicationEventPublisher;
-    private AuthorityGranter[] authorityGranters;
-    private JaasAuthenticationCallbackHandler[] callbackHandlers;
-    protected final Log log = LogFactory.getLog(getClass());
-    private LoginExceptionResolver loginExceptionResolver = new DefaultLoginExceptionResolver();
-    private String loginContextName = "SPRINGSECURITY";
+	private ApplicationEventPublisher applicationEventPublisher;
+	private AuthorityGranter[] authorityGranters;
+	private JaasAuthenticationCallbackHandler[] callbackHandlers;
+	protected final Log log = LogFactory.getLog(getClass());
+	private LoginExceptionResolver loginExceptionResolver = new DefaultLoginExceptionResolver();
+	private String loginContextName = "SPRINGSECURITY";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Validates the required properties are set. In addition, if
-     * {@link #setCallbackHandlers(JaasAuthenticationCallbackHandler[])} has not
-     * been called with valid handlers, initializes to use
-     * {@link JaasNameCallbackHandler} and {@link JaasPasswordCallbackHandler}.
-     */
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(loginContextName, "loginContextName cannot be null or empty");
-        Assert.notEmpty(authorityGranters, "authorityGranters cannot be null or empty");
-        if (ObjectUtils.isEmpty(callbackHandlers)) {
-            setCallbackHandlers(new JaasAuthenticationCallbackHandler[] { new JaasNameCallbackHandler(),
-                    new JaasPasswordCallbackHandler() });
-        }
-        Assert.notNull(loginExceptionResolver, "loginExceptionResolver cannot be null");
-    }
+	/**
+	 * Validates the required properties are set. In addition, if
+	 * {@link #setCallbackHandlers(JaasAuthenticationCallbackHandler[])} has not been
+	 * called with valid handlers, initializes to use {@link JaasNameCallbackHandler} and
+	 * {@link JaasPasswordCallbackHandler}.
+	 */
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(loginContextName, "loginContextName cannot be null or empty");
+		Assert.notEmpty(authorityGranters, "authorityGranters cannot be null or empty");
+		if (ObjectUtils.isEmpty(callbackHandlers)) {
+			setCallbackHandlers(new JaasAuthenticationCallbackHandler[] {
+					new JaasNameCallbackHandler(), new JaasPasswordCallbackHandler() });
+		}
+		Assert.notNull(loginExceptionResolver, "loginExceptionResolver cannot be null");
+	}
 
-    /**
-     * Attempts to login the user given the Authentication objects principal and credential
-     *
-     * @param auth The Authentication object to be authenticated.
-     *
-     * @return The authenticated Authentication object, with it's grantedAuthorities set.
-     *
-     * @throws AuthenticationException This implementation does not handle 'locked' or 'disabled' accounts. This method
-     *         only throws a AuthenticationServiceException, with the message of the LoginException that will be
-     *         thrown, should the loginContext.login() method fail.
-     */
-    public Authentication authenticate(Authentication auth) throws AuthenticationException {
-        if (!(auth instanceof UsernamePasswordAuthenticationToken)) {
-            return null;
-        }
+	/**
+	 * Attempts to login the user given the Authentication objects principal and
+	 * credential
+	 *
+	 * @param auth The Authentication object to be authenticated.
+	 *
+	 * @return The authenticated Authentication object, with it's grantedAuthorities set.
+	 *
+	 * @throws AuthenticationException This implementation does not handle 'locked' or
+	 * 'disabled' accounts. This method only throws a AuthenticationServiceException, with
+	 * the message of the LoginException that will be thrown, should the
+	 * loginContext.login() method fail.
+	 */
+	public Authentication authenticate(Authentication auth)
+			throws AuthenticationException {
+		if (!(auth instanceof UsernamePasswordAuthenticationToken)) {
+			return null;
+		}
 
-        UsernamePasswordAuthenticationToken request = (UsernamePasswordAuthenticationToken) auth;
-        Set<GrantedAuthority> authorities;
+		UsernamePasswordAuthenticationToken request = (UsernamePasswordAuthenticationToken) auth;
+		Set<GrantedAuthority> authorities;
 
-        try {
-            // Create the LoginContext object, and pass our InternallCallbackHandler
-            LoginContext loginContext = createLoginContext(new InternalCallbackHandler(auth));
+		try {
+			// Create the LoginContext object, and pass our InternallCallbackHandler
+			LoginContext loginContext = createLoginContext(new InternalCallbackHandler(
+					auth));
 
-            // Attempt to login the user, the LoginContext will call our InternalCallbackHandler at this point.
-            loginContext.login();
+			// Attempt to login the user, the LoginContext will call our
+			// InternalCallbackHandler at this point.
+			loginContext.login();
 
-            // Create a set to hold the authorities, and add any that have already been applied.
-            authorities = new HashSet<GrantedAuthority>();
+			// Create a set to hold the authorities, and add any that have already been
+			// applied.
+			authorities = new HashSet<GrantedAuthority>();
 
-            // Get the subject principals and pass them to each of the AuthorityGranters
-            Set<Principal> principals = loginContext.getSubject().getPrincipals();
+			// Get the subject principals and pass them to each of the AuthorityGranters
+			Set<Principal> principals = loginContext.getSubject().getPrincipals();
 
-            for (Principal principal : principals) {
-                for (AuthorityGranter granter : authorityGranters) {
-                    Set<String> roles = granter.grant(principal);
+			for (Principal principal : principals) {
+				for (AuthorityGranter granter : authorityGranters) {
+					Set<String> roles = granter.grant(principal);
 
-                    // If the granter doesn't wish to grant any authorities, it should return null.
-                    if ((roles != null) && !roles.isEmpty()) {
-                        for (String role : roles) {
-                            authorities.add(new JaasGrantedAuthority(role, principal));
-                        }
-                    }
-                }
-            }
+					// If the granter doesn't wish to grant any authorities, it should
+					// return null.
+					if ((roles != null) && !roles.isEmpty()) {
+						for (String role : roles) {
+							authorities.add(new JaasGrantedAuthority(role, principal));
+						}
+					}
+				}
+			}
 
-            //Convert the authorities set back to an array and apply it to the token.
-            JaasAuthenticationToken result = new JaasAuthenticationToken(request.getPrincipal(),
-                    request.getCredentials(), new ArrayList<GrantedAuthority>(authorities), loginContext);
+			// Convert the authorities set back to an array and apply it to the token.
+			JaasAuthenticationToken result = new JaasAuthenticationToken(
+					request.getPrincipal(), request.getCredentials(),
+					new ArrayList<GrantedAuthority>(authorities), loginContext);
 
-            //Publish the success event
-            publishSuccessEvent(result);
+			// Publish the success event
+			publishSuccessEvent(result);
 
-            //we're done, return the token.
-            return result;
+			// we're done, return the token.
+			return result;
 
-        } catch (LoginException loginException) {
-            AuthenticationException ase = loginExceptionResolver.resolveException(loginException);
+		}
+		catch (LoginException loginException) {
+			AuthenticationException ase = loginExceptionResolver
+					.resolveException(loginException);
 
-            publishFailureEvent(request, ase);
-            throw ase;
-        }
-    }
+			publishFailureEvent(request, ase);
+			throw ase;
+		}
+	}
 
-    /**
-     * Creates the LoginContext to be used for authentication.
-     *
-     * @param handler The CallbackHandler that should be used for the LoginContext (never <code>null</code>).
-     * @return the LoginContext to use for authentication.
-     * @throws LoginException
-     */
-    protected abstract LoginContext createLoginContext(CallbackHandler handler) throws LoginException;
+	/**
+	 * Creates the LoginContext to be used for authentication.
+	 *
+	 * @param handler The CallbackHandler that should be used for the LoginContext (never
+	 * <code>null</code>).
+	 * @return the LoginContext to use for authentication.
+	 * @throws LoginException
+	 */
+	protected abstract LoginContext createLoginContext(CallbackHandler handler)
+			throws LoginException;
 
-    /**
-     * Handles the logout by getting the security contexts for the destroyed session and invoking
-     * {@code LoginContext.logout()} for any which contain a {@code JaasAuthenticationToken}.
-     *
-     *
-     * @param event the session event which contains the current session
-     */
-    protected void handleLogout(SessionDestroyedEvent event) {
-        List<SecurityContext> contexts = event.getSecurityContexts();
+	/**
+	 * Handles the logout by getting the security contexts for the destroyed session and
+	 * invoking {@code LoginContext.logout()} for any which contain a
+	 * {@code JaasAuthenticationToken}.
+	 *
+	 *
+	 * @param event the session event which contains the current session
+	 */
+	protected void handleLogout(SessionDestroyedEvent event) {
+		List<SecurityContext> contexts = event.getSecurityContexts();
 
-        if (contexts.isEmpty()) {
-            log.debug("The destroyed session has no SecurityContexts");
+		if (contexts.isEmpty()) {
+			log.debug("The destroyed session has no SecurityContexts");
 
-            return;
-        }
+			return;
+		}
 
-        for(SecurityContext context : contexts) {
-            Authentication auth = context.getAuthentication();
+		for (SecurityContext context : contexts) {
+			Authentication auth = context.getAuthentication();
 
-            if ((auth != null) && (auth instanceof JaasAuthenticationToken)) {
-                JaasAuthenticationToken token = (JaasAuthenticationToken) auth;
+			if ((auth != null) && (auth instanceof JaasAuthenticationToken)) {
+				JaasAuthenticationToken token = (JaasAuthenticationToken) auth;
 
-                try {
-                    LoginContext loginContext = token.getLoginContext();
-                    boolean debug = log.isDebugEnabled();
-                    if (loginContext != null) {
-                        if (debug) {
-                            log.debug("Logging principal: [" + token.getPrincipal() + "] out of LoginContext");
-                        }
-                        loginContext.logout();
-                    } else if (debug) {
-                        log.debug("Cannot logout principal: [" + token.getPrincipal() + "] from LoginContext. "
-                                + "The LoginContext is unavailable");
-                    }
-                } catch (LoginException e) {
-                    log.warn("Error error logging out of LoginContext", e);
-                }
-            }
-        }
-    }
+				try {
+					LoginContext loginContext = token.getLoginContext();
+					boolean debug = log.isDebugEnabled();
+					if (loginContext != null) {
+						if (debug) {
+							log.debug("Logging principal: [" + token.getPrincipal()
+									+ "] out of LoginContext");
+						}
+						loginContext.logout();
+					}
+					else if (debug) {
+						log.debug("Cannot logout principal: [" + token.getPrincipal()
+								+ "] from LoginContext. "
+								+ "The LoginContext is unavailable");
+					}
+				}
+				catch (LoginException e) {
+					log.warn("Error error logging out of LoginContext", e);
+				}
+			}
+		}
+	}
 
-    public void onApplicationEvent(SessionDestroyedEvent event) {
-        handleLogout(event);
-    }
+	public void onApplicationEvent(SessionDestroyedEvent event) {
+		handleLogout(event);
+	}
 
-    /**
-     * Publishes the {@link JaasAuthenticationFailedEvent}. Can be overridden by subclasses for different
-     * functionality
-     *
-     * @param token The authentication token being processed
-     * @param ase The excetion that caused the authentication failure
-     */
-    protected void publishFailureEvent(UsernamePasswordAuthenticationToken token, AuthenticationException ase) {
-        if (applicationEventPublisher != null) {
-            applicationEventPublisher.publishEvent(new JaasAuthenticationFailedEvent(token, ase));
-        }
-    }
+	/**
+	 * Publishes the {@link JaasAuthenticationFailedEvent}. Can be overridden by
+	 * subclasses for different functionality
+	 *
+	 * @param token The authentication token being processed
+	 * @param ase The excetion that caused the authentication failure
+	 */
+	protected void publishFailureEvent(UsernamePasswordAuthenticationToken token,
+			AuthenticationException ase) {
+		if (applicationEventPublisher != null) {
+			applicationEventPublisher.publishEvent(new JaasAuthenticationFailedEvent(
+					token, ase));
+		}
+	}
 
-    /**
-     * Publishes the {@link JaasAuthenticationSuccessEvent}. Can be overridden by subclasses for different
-     * functionality.
-     *
-     * @param token The token being processed
-     */
-    protected void publishSuccessEvent(UsernamePasswordAuthenticationToken token) {
-        if (applicationEventPublisher != null) {
-            applicationEventPublisher.publishEvent(new JaasAuthenticationSuccessEvent(token));
-        }
-    }
+	/**
+	 * Publishes the {@link JaasAuthenticationSuccessEvent}. Can be overridden by
+	 * subclasses for different functionality.
+	 *
+	 * @param token The token being processed
+	 */
+	protected void publishSuccessEvent(UsernamePasswordAuthenticationToken token) {
+		if (applicationEventPublisher != null) {
+			applicationEventPublisher.publishEvent(new JaasAuthenticationSuccessEvent(
+					token));
+		}
+	}
 
-    /**
-     * Returns the AuthorityGrannter array that was passed to the {@link
-     * #setAuthorityGranters(AuthorityGranter[])} method, or null if it none were ever set.
-     *
-     * @return The AuthorityGranter array, or null
-     *
-     * @see #setAuthorityGranters(AuthorityGranter[])
-     */
-    AuthorityGranter[] getAuthorityGranters() {
-        return authorityGranters;
-    }
+	/**
+	 * Returns the AuthorityGrannter array that was passed to the
+	 * {@link #setAuthorityGranters(AuthorityGranter[])} method, or null if it none were
+	 * ever set.
+	 *
+	 * @return The AuthorityGranter array, or null
+	 *
+	 * @see #setAuthorityGranters(AuthorityGranter[])
+	 */
+	AuthorityGranter[] getAuthorityGranters() {
+		return authorityGranters;
+	}
 
-    /**
-     * Set the AuthorityGranters that should be consulted for role names to be granted to the Authentication.
-     *
-     * @param authorityGranters AuthorityGranter array
-     *
-     * @see JaasAuthenticationProvider
-     */
-    public void setAuthorityGranters(AuthorityGranter[] authorityGranters) {
-        this.authorityGranters = authorityGranters;
-    }
+	/**
+	 * Set the AuthorityGranters that should be consulted for role names to be granted to
+	 * the Authentication.
+	 *
+	 * @param authorityGranters AuthorityGranter array
+	 *
+	 * @see JaasAuthenticationProvider
+	 */
+	public void setAuthorityGranters(AuthorityGranter[] authorityGranters) {
+		this.authorityGranters = authorityGranters;
+	}
 
-    /**
-     * Returns the current JaasAuthenticationCallbackHandler array, or null if none are set.
-     *
-     * @return the JAASAuthenticationCallbackHandlers.
-     *
-     * @see #setCallbackHandlers(JaasAuthenticationCallbackHandler[])
-     */
-    JaasAuthenticationCallbackHandler[] getCallbackHandlers() {
-        return callbackHandlers;
-    }
+	/**
+	 * Returns the current JaasAuthenticationCallbackHandler array, or null if none are
+	 * set.
+	 *
+	 * @return the JAASAuthenticationCallbackHandlers.
+	 *
+	 * @see #setCallbackHandlers(JaasAuthenticationCallbackHandler[])
+	 */
+	JaasAuthenticationCallbackHandler[] getCallbackHandlers() {
+		return callbackHandlers;
+	}
 
-    /**
-     * Set the JAASAuthentcationCallbackHandler array to handle callback objects generated by the
-     * LoginContext.login method.
-     *
-     * @param callbackHandlers Array of JAASAuthenticationCallbackHandlers
-     */
-    public void setCallbackHandlers(JaasAuthenticationCallbackHandler[] callbackHandlers) {
-        this.callbackHandlers = callbackHandlers;
-    }
+	/**
+	 * Set the JAASAuthentcationCallbackHandler array to handle callback objects generated
+	 * by the LoginContext.login method.
+	 *
+	 * @param callbackHandlers Array of JAASAuthenticationCallbackHandlers
+	 */
+	public void setCallbackHandlers(JaasAuthenticationCallbackHandler[] callbackHandlers) {
+		this.callbackHandlers = callbackHandlers;
+	}
 
-    String getLoginContextName() {
-        return loginContextName;
-    }
+	String getLoginContextName() {
+		return loginContextName;
+	}
 
-    /**
-     * Set the loginContextName, this name is used as the index to the configuration specified in the
-     * loginConfig property.
-     *
-     * @param loginContextName
-     */
-    public void setLoginContextName(String loginContextName) {
-        this.loginContextName = loginContextName;
-    }
+	/**
+	 * Set the loginContextName, this name is used as the index to the configuration
+	 * specified in the loginConfig property.
+	 *
+	 * @param loginContextName
+	 */
+	public void setLoginContextName(String loginContextName) {
+		this.loginContextName = loginContextName;
+	}
 
-    LoginExceptionResolver getLoginExceptionResolver() {
-        return loginExceptionResolver;
-    }
+	LoginExceptionResolver getLoginExceptionResolver() {
+		return loginExceptionResolver;
+	}
 
-    public void setLoginExceptionResolver(LoginExceptionResolver loginExceptionResolver) {
-        this.loginExceptionResolver = loginExceptionResolver;
-    }
+	public void setLoginExceptionResolver(LoginExceptionResolver loginExceptionResolver) {
+		this.loginExceptionResolver = loginExceptionResolver;
+	}
 
-    public boolean supports(Class<?> aClass) {
-        return UsernamePasswordAuthenticationToken.class.isAssignableFrom(aClass);
-    }
+	public boolean supports(Class<?> aClass) {
+		return UsernamePasswordAuthenticationToken.class.isAssignableFrom(aClass);
+	}
 
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.applicationEventPublisher = applicationEventPublisher;
-    }
+	public void setApplicationEventPublisher(
+			ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
 
-    protected ApplicationEventPublisher getApplicationEventPublisher() {
-        return applicationEventPublisher;
-    }
+	protected ApplicationEventPublisher getApplicationEventPublisher() {
+		return applicationEventPublisher;
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    /**
-     * Wrapper class for JAASAuthenticationCallbackHandlers
-     */
-    private class InternalCallbackHandler implements CallbackHandler {
-        private final Authentication authentication;
+	/**
+	 * Wrapper class for JAASAuthenticationCallbackHandlers
+	 */
+	private class InternalCallbackHandler implements CallbackHandler {
+		private final Authentication authentication;
 
-        public InternalCallbackHandler(Authentication authentication) {
-            this.authentication = authentication;
-        }
+		public InternalCallbackHandler(Authentication authentication) {
+			this.authentication = authentication;
+		}
 
-        public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-            for (JaasAuthenticationCallbackHandler handler : callbackHandlers) {
-                for (Callback callback : callbacks) {
-                    handler.handle(callback, authentication);
-                }
-            }
-        }
-    }
+		public void handle(Callback[] callbacks) throws IOException,
+				UnsupportedCallbackException {
+			for (JaasAuthenticationCallbackHandler handler : callbackHandlers) {
+				for (Callback callback : callbacks) {
+					handler.handle(callback, authentication);
+				}
+			}
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java b/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java
index 93108e6ffa..7a941ba27a 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/AuthorityGranter.java
@@ -19,31 +19,33 @@ import java.security.Principal;
 
 import java.util.Set;
 
-
 /**
  * The AuthorityGranter interface is used to map a given principal to role names.
  * <p>
  * If a Windows NT login module were to be used from JAAS, an AuthrityGranter
- * implementation could be created to map a NT Group Principal to a ROLE_USER
- * role for instance.
+ * implementation could be created to map a NT Group Principal to a ROLE_USER role for
+ * instance.
  *
  * @author Ray Krueger
  */
 public interface AuthorityGranter {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * The grant method is called for each principal returned from the LoginContext subject. If the
-     * AuthorityGranter wishes to grant any authorities, it should return a java.util.Set containing the role names it
-     * wishes to grant, such as ROLE_USER. If the AuthrityGranter does not wish to grant any authorities it should
-     * return null.
-     * <p>
-     * The set may contain any object as all objects in the returned set will be passed to the JaasGrantedAuthority
-     * constructor using toString().
-     *
-     * @param principal One of the principals from the LoginContext.getSubect().getPrincipals() method.
-     *
-     * @return the role names to grant, or null, meaning no roles should be granted to the principal.
-     */
-    Set<String> grant(Principal principal);
+	/**
+	 * The grant method is called for each principal returned from the LoginContext
+	 * subject. If the AuthorityGranter wishes to grant any authorities, it should return
+	 * a java.util.Set containing the role names it wishes to grant, such as ROLE_USER. If
+	 * the AuthrityGranter does not wish to grant any authorities it should return null.
+	 * <p>
+	 * The set may contain any object as all objects in the returned set will be passed to
+	 * the JaasGrantedAuthority constructor using toString().
+	 *
+	 * @param principal One of the principals from the
+	 * LoginContext.getSubect().getPrincipals() method.
+	 *
+	 * @return the role names to grant, or null, meaning no roles should be granted to the
+	 * principal.
+	 */
+	Set<String> grant(Principal principal);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java
index e0f6d45013..8e95131b19 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProvider.java
@@ -25,13 +25,13 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * Creates a LoginContext using the Configuration provided to it. This allows
- * the configuration to be injected regardless of the value of
+ * Creates a LoginContext using the Configuration provided to it. This allows the
+ * configuration to be injected regardless of the value of
  * {@link Configuration#getConfiguration()}.
  * </p>
  * <p>
- * While not bound to any particular Configuration implementation, an in memory version of a JAAS
- * configuration can be represented using {@link InMemoryConfiguration}.
+ * While not bound to any particular Configuration implementation, an in memory version of
+ * a JAAS configuration can be represented using {@link InMemoryConfiguration}.
  * </p>
  * <p>
  * The following JAAS configuration:
@@ -85,39 +85,41 @@ import org.springframework.util.Assert;
  * @see InMemoryConfiguration
  */
 public class DefaultJaasAuthenticationProvider extends AbstractJaasAuthenticationProvider {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Configuration configuration;
+	private Configuration configuration;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        super.afterPropertiesSet();
-        Assert.notNull(configuration, "configuration cannot be null.");
-    }
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		super.afterPropertiesSet();
+		Assert.notNull(configuration, "configuration cannot be null.");
+	}
 
-    /**
-     * Creates a LoginContext using the Configuration that was specified in
-     * {@link #setConfiguration(Configuration)}.
-     */
-    @Override
-    protected LoginContext createLoginContext(CallbackHandler handler) throws LoginException {
-        return new LoginContext(getLoginContextName(), null, handler, getConfiguration());
-    }
+	/**
+	 * Creates a LoginContext using the Configuration that was specified in
+	 * {@link #setConfiguration(Configuration)}.
+	 */
+	@Override
+	protected LoginContext createLoginContext(CallbackHandler handler)
+			throws LoginException {
+		return new LoginContext(getLoginContextName(), null, handler, getConfiguration());
+	}
 
-    protected Configuration getConfiguration() {
-        return configuration;
-    }
+	protected Configuration getConfiguration() {
+		return configuration;
+	}
 
-    /**
-     * Sets the Configuration to use for Authentication. 
-     * 
-     * @param configuration
-     *            the Configuration that is used when
-     *            {@link #createLoginContext(CallbackHandler)} is called.
-     */
-    public void setConfiguration(Configuration configuration) {
-        this.configuration = configuration;
-    }
+	/**
+	 * Sets the Configuration to use for Authentication.
+	 * 
+	 * @param configuration the Configuration that is used when
+	 * {@link #createLoginContext(CallbackHandler)} is called.
+	 */
+	public void setConfiguration(Configuration configuration) {
+		this.configuration = configuration;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java
index 82245efe9c..0b4696f9cc 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/DefaultLoginExceptionResolver.java
@@ -20,16 +20,17 @@ import org.springframework.security.core.AuthenticationException;
 
 import javax.security.auth.login.LoginException;
 
-
 /**
- * This LoginExceptionResolver simply wraps the LoginException with an AuthenticationServiceException.
+ * This LoginExceptionResolver simply wraps the LoginException with an
+ * AuthenticationServiceException.
  *
  * @author Ray Krueger
  */
 public class DefaultLoginExceptionResolver implements LoginExceptionResolver {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public AuthenticationException resolveException(LoginException e) {
-        return new AuthenticationServiceException(e.getMessage(), e);
-    }
+	public AuthenticationException resolveException(LoginException e) {
+		return new AuthenticationServiceException(e.getMessage(), e);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java
index 1a2e3ee83a..fc6296d841 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationCallbackHandler.java
@@ -22,19 +22,17 @@ import java.io.IOException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-
 /**
  * The JaasAuthenticationCallbackHandler is similar to the
- * javax.security.auth.callback.CallbackHandler interface in that it defines a
- * handle method. The JaasAuthenticationCallbackHandler is only asked to
- * handle one Callback instance at at time rather than an array of all
- * Callbacks, as the javax... CallbackHandler defines.
+ * javax.security.auth.callback.CallbackHandler interface in that it defines a handle
+ * method. The JaasAuthenticationCallbackHandler is only asked to handle one Callback
+ * instance at at time rather than an array of all Callbacks, as the javax...
+ * CallbackHandler defines.
  *
  * <p>
- * Before a JaasAuthenticationCallbackHandler is asked to 'handle' any
- * callbacks, it is first passed the Authentication object that the login
- * attempt is for. NOTE: The Authentication object has not been
- * 'authenticated' yet.
+ * Before a JaasAuthenticationCallbackHandler is asked to 'handle' any callbacks, it is
+ * first passed the Authentication object that the login attempt is for. NOTE: The
+ * Authentication object has not been 'authenticated' yet.
  * </p>
  *
  * @author Ray Krueger
@@ -42,25 +40,28 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  * @see JaasNameCallbackHandler
  * @see JaasPasswordCallbackHandler
  * @see <a
- *      href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/CallbackHandler.html">
- *      CallbackHandler</a>
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
+ * @see <a
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/CallbackHandler.html">
+ * CallbackHandler</a>
  */
 public interface JaasAuthenticationCallbackHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Handle the <a
-     * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>. The
-     * handle method will be called for every callback instance sent from the LoginContext. Meaning that The handle
-     * method may be called multiple times for a given JaasAuthenticationCallbackHandler.
-     *
-     * @param callback
-     * @param auth The Authentication object currently being authenticated.
-     *
-     * @throws IOException
-     * @throws UnsupportedCallbackException
-     */
-    void handle(Callback callback, Authentication auth)
-        throws IOException, UnsupportedCallbackException;
+	/**
+	 * Handle the <a href=
+	 * "http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html"
+	 * >Callback</a>. The handle method will be called for every callback instance sent
+	 * from the LoginContext. Meaning that The handle method may be called multiple times
+	 * for a given JaasAuthenticationCallbackHandler.
+	 *
+	 * @param callback
+	 * @param auth The Authentication object currently being authenticated.
+	 *
+	 * @throws IOException
+	 * @throws UnsupportedCallbackException
+	 */
+	void handle(Callback callback, Authentication auth) throws IOException,
+			UnsupportedCallbackException;
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java
index baa5fe5ccc..db45da03f0 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java
@@ -34,51 +34,70 @@ import java.io.IOException;
 import java.net.URL;
 import java.security.Security;
 
-
 /**
- * An {@link AuthenticationProvider} implementation that retrieves user details from a JAAS login configuration.
+ * An {@link AuthenticationProvider} implementation that retrieves user details from a
+ * JAAS login configuration.
  *
- * <p>This <code>AuthenticationProvider</code> is capable of validating {@link
- * org.springframework.security.authentication.UsernamePasswordAuthenticationToken} requests contain the correct username and
- * password.</p>
- * <p>This implementation is backed by a <a
- * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html">JAAS</a> configuration. The
- * loginConfig property must be set to a given JAAS configuration file. This setter accepts a Spring {@link
- * org.springframework.core.io.Resource} instance. It should point to a JAAS configuration file containing an index
- * matching the {@link #setLoginContextName(java.lang.String) loginContextName} property.
+ * <p>
+ * This <code>AuthenticationProvider</code> is capable of validating
+ * {@link org.springframework.security.authentication.UsernamePasswordAuthenticationToken}
+ * requests contain the correct username and password.
  * </p>
  * <p>
- * For example: If this JaasAuthenticationProvider were configured in a Spring WebApplicationContext the xml to
- * set the loginConfiguration could be as follows...
+ * This implementation is backed by a <a
+ * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html"
+ * >JAAS</a> configuration. The loginConfig property must be set to a given JAAS
+ * configuration file. This setter accepts a Spring
+ * {@link org.springframework.core.io.Resource} instance. It should point to a JAAS
+ * configuration file containing an index matching the
+ * {@link #setLoginContextName(java.lang.String) loginContextName} property.
+ * </p>
+ * <p>
+ * For example: If this JaasAuthenticationProvider were configured in a Spring
+ * WebApplicationContext the xml to set the loginConfiguration could be as follows...
+ * 
  * <pre>
  * &lt;property name="loginConfig"&gt;
  *   &lt;value&gt;/WEB-INF/login.conf&lt;/value&gt;
  * &lt;/property&gt;
  * </pre>
+ * 
  * </p>
  * <p>
- * The loginContextName should coincide with a given index in the loginConfig specifed. The loginConfig file
- * used in the JUnit tests appears as the following...
- * <pre> JAASTest {
+ * The loginContextName should coincide with a given index in the loginConfig specifed.
+ * The loginConfig file used in the JUnit tests appears as the following...
+ * 
+ * <pre>
+ * JAASTest {
  *   org.springframework.security.authentication.jaas.TestLoginModule required;
  * };
  * </pre>
- * Using the example login configuration above, the loginContextName property would be set as <i>JAASTest</i>...
+ * 
+ * Using the example login configuration above, the loginContextName property would be set
+ * as <i>JAASTest</i>...
+ * 
  * <pre>
  *  &lt;property name="loginContextName"&gt; &lt;value&gt;JAASTest&lt;/value&gt; &lt;/property&gt;
  * </pre>
+ * 
  * </p>
- *  <p>When using JAAS login modules as the authentication source, sometimes the
- * <a href="http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/LoginContext.html">LoginContext</a> will
- * require <i>CallbackHandler</i>s. The JaasAuthenticationProvider uses an internal
- * <a href="http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/callback/CallbackHandler.html">CallbackHandler
- * </a> to wrap the {@link JaasAuthenticationCallbackHandler}s configured in the ApplicationContext.
- * When the LoginContext calls the internal CallbackHandler, control is passed to each
- * {@link JaasAuthenticationCallbackHandler} for each Callback passed.
+ * <p>
+ * When using JAAS login modules as the authentication source, sometimes the <a href=
+ * "http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/LoginContext.html"
+ * >LoginContext</a> will require <i>CallbackHandler</i>s. The JaasAuthenticationProvider
+ * uses an internal <a href=
+ * "http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/callback/CallbackHandler.html"
+ * >CallbackHandler </a> to wrap the {@link JaasAuthenticationCallbackHandler}s configured
+ * in the ApplicationContext. When the LoginContext calls the internal CallbackHandler,
+ * control is passed to each {@link JaasAuthenticationCallbackHandler} for each Callback
+ * passed.
  * </p>
- * <p>{@link JaasAuthenticationCallbackHandler}s are passed to the JaasAuthenticationProvider through the {@link
- * #setCallbackHandlers(org.springframework.security.authentication.jaas.JaasAuthenticationCallbackHandler[]) callbackHandlers}
- * property.
+ * <p>
+ * {@link JaasAuthenticationCallbackHandler}s are passed to the JaasAuthenticationProvider
+ * through the
+ * {@link #setCallbackHandlers(org.springframework.security.authentication.jaas.JaasAuthenticationCallbackHandler[])
+ * callbackHandlers} property.
+ * 
  * <pre>
  * &lt;property name="callbackHandlers"&gt;
  *   &lt;list&gt;
@@ -88,15 +107,20 @@ import java.security.Security;
  *  &lt;/list&gt;
  * &lt;/property&gt;
  * </pre>
+ * 
  * </p>
  * <p>
- * After calling LoginContext.login(), the JaasAuthenticationProvider will retrieve the returned Principals
- * from the Subject (LoginContext.getSubject().getPrincipals). Each returned principal is then passed to the
- * configured {@link AuthorityGranter}s. An AuthorityGranter is a mapping between a returned Principal, and a role
- * name. If an AuthorityGranter wishes to grant an Authorization a role, it returns that role name from it's {@link
- * AuthorityGranter#grant(java.security.Principal)} method. The returned role will be applied to the Authorization
- * object as a {@link GrantedAuthority}.</p>
- * <p>AuthorityGranters are configured in spring xml as follows...
+ * After calling LoginContext.login(), the JaasAuthenticationProvider will retrieve the
+ * returned Principals from the Subject (LoginContext.getSubject().getPrincipals). Each
+ * returned principal is then passed to the configured {@link AuthorityGranter}s. An
+ * AuthorityGranter is a mapping between a returned Principal, and a role name. If an
+ * AuthorityGranter wishes to grant an Authorization a role, it returns that role name
+ * from it's {@link AuthorityGranter#grant(java.security.Principal)} method. The returned
+ * role will be applied to the Authorization object as a {@link GrantedAuthority}.
+ * </p>
+ * <p>
+ * AuthorityGranters are configured in spring xml as follows...
+ * 
  * <pre>
  * &lt;property name="authorityGranters"&gt;
  *   &lt;list&gt;
@@ -104,146 +128,161 @@ import java.security.Security;
  *   &lt;/list&gt;
  *  &lt;/property&gt;
  * </pre>
+ * 
  * A configuration note: The JaasAuthenticationProvider uses the security properites
- * &quote;login.config.url.X&quote; to configure jaas. If you would like to customize the way Jaas gets configured,
- * create a subclass of this and override the {@link #configureJaas(Resource)} method.
+ * &quote;login.config.url.X&quote; to configure jaas. If you would like to customize the
+ * way Jaas gets configured, create a subclass of this and override the
+ * {@link #configureJaas(Resource)} method.
  * </p>
  *
  * @author Ray Krueger
  * @author Rob Winch
  */
 public class JaasAuthenticationProvider extends AbstractJaasAuthenticationProvider {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    // exists for passivity
-    protected static final Log log = LogFactory.getLog(JaasAuthenticationProvider.class);
+	// exists for passivity
+	protected static final Log log = LogFactory.getLog(JaasAuthenticationProvider.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Resource loginConfig;
-    private boolean refreshConfigurationOnStartup = true;
+	private Resource loginConfig;
+	private boolean refreshConfigurationOnStartup = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        // the superclass is not called because it does additional checks that are non-passive
-        Assert.hasLength(getLoginContextName(), "loginContextName must be set on " + getClass());
-        Assert.notNull(loginConfig, "loginConfig must be set on " + getClass());
-        configureJaas(loginConfig);
+	public void afterPropertiesSet() throws Exception {
+		// the superclass is not called because it does additional checks that are
+		// non-passive
+		Assert.hasLength(getLoginContextName(), "loginContextName must be set on "
+				+ getClass());
+		Assert.notNull(loginConfig, "loginConfig must be set on " + getClass());
+		configureJaas(loginConfig);
 
-        Assert.notNull(
-                Configuration.getConfiguration(),
-                "As per http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/Configuration.html "
-                        + "\"If a Configuration object was set via the Configuration.setConfiguration method, then that object is "
-                        + "returned. Otherwise, a default Configuration object is returned\". Your JRE returned null to "
-                        + "Configuration.getConfiguration().");
-    }
+		Assert.notNull(
+				Configuration.getConfiguration(),
+				"As per http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/Configuration.html "
+						+ "\"If a Configuration object was set via the Configuration.setConfiguration method, then that object is "
+						+ "returned. Otherwise, a default Configuration object is returned\". Your JRE returned null to "
+						+ "Configuration.getConfiguration().");
+	}
 
-    @Override
-    protected LoginContext createLoginContext(CallbackHandler handler) throws LoginException {
-        return new LoginContext(getLoginContextName(), handler);
-    }
+	@Override
+	protected LoginContext createLoginContext(CallbackHandler handler)
+			throws LoginException {
+		return new LoginContext(getLoginContextName(), handler);
+	}
 
-    /**
-     * Hook method for configuring Jaas.
-     *
-     * @param loginConfig URL to Jaas login configuration
-     *
-     * @throws IOException if there is a problem reading the config resource.
-     */
-    protected void configureJaas(Resource loginConfig) throws IOException {
-        configureJaasUsingLoop();
+	/**
+	 * Hook method for configuring Jaas.
+	 *
+	 * @param loginConfig URL to Jaas login configuration
+	 *
+	 * @throws IOException if there is a problem reading the config resource.
+	 */
+	protected void configureJaas(Resource loginConfig) throws IOException {
+		configureJaasUsingLoop();
 
-        if (refreshConfigurationOnStartup) {
-            // Overcome issue in SEC-760
-            Configuration.getConfiguration().refresh();
-        }
-    }
+		if (refreshConfigurationOnStartup) {
+			// Overcome issue in SEC-760
+			Configuration.getConfiguration().refresh();
+		}
+	}
 
-    /**
-     * Loops through the login.config.url.1,login.config.url.2 properties looking for the login configuration.
-     * If it is not set, it will be set to the last available login.config.url.X property.
-     *
-     */
-    private void configureJaasUsingLoop() throws IOException {
-        String loginConfigUrl = convertLoginConfigToUrl();
-        boolean alreadySet = false;
+	/**
+	 * Loops through the login.config.url.1,login.config.url.2 properties looking for the
+	 * login configuration. If it is not set, it will be set to the last available
+	 * login.config.url.X property.
+	 *
+	 */
+	private void configureJaasUsingLoop() throws IOException {
+		String loginConfigUrl = convertLoginConfigToUrl();
+		boolean alreadySet = false;
 
-        int n = 1;
-        final String prefix = "login.config.url.";
-        String existing;
+		int n = 1;
+		final String prefix = "login.config.url.";
+		String existing;
 
-        while ((existing = Security.getProperty(prefix + n)) != null) {
-            alreadySet = existing.equals(loginConfigUrl);
+		while ((existing = Security.getProperty(prefix + n)) != null) {
+			alreadySet = existing.equals(loginConfigUrl);
 
-            if (alreadySet) {
-                break;
-            }
+			if (alreadySet) {
+				break;
+			}
 
-            n++;
-        }
+			n++;
+		}
 
-        if (!alreadySet) {
-            String key = prefix + n;
-            log.debug("Setting security property [" + key + "] to: " + loginConfigUrl);
-            Security.setProperty(key, loginConfigUrl);
-        }
-    }
+		if (!alreadySet) {
+			String key = prefix + n;
+			log.debug("Setting security property [" + key + "] to: " + loginConfigUrl);
+			Security.setProperty(key, loginConfigUrl);
+		}
+	}
 
-    private String convertLoginConfigToUrl() throws IOException {
-        String loginConfigPath;
+	private String convertLoginConfigToUrl() throws IOException {
+		String loginConfigPath;
 
-        try {
-            loginConfigPath = loginConfig.getFile().getAbsolutePath().replace(File.separatorChar, '/');
+		try {
+			loginConfigPath = loginConfig.getFile().getAbsolutePath()
+					.replace(File.separatorChar, '/');
 
-            if (!loginConfigPath.startsWith("/")) {
-                loginConfigPath = "/" + loginConfigPath;
-            }
+			if (!loginConfigPath.startsWith("/")) {
+				loginConfigPath = "/" + loginConfigPath;
+			}
 
-            return new URL("file", "", loginConfigPath).toString();
-        } catch (IOException e) {
-            // SEC-1700:  May be inside a jar
-            return loginConfig.getURL().toString();
-        }
-    }
+			return new URL("file", "", loginConfigPath).toString();
+		}
+		catch (IOException e) {
+			// SEC-1700: May be inside a jar
+			return loginConfig.getURL().toString();
+		}
+	}
 
-    /**
-     * Publishes the {@link JaasAuthenticationFailedEvent}. Can be overridden by subclasses for different
-     * functionality
-     *
-     * @param token The authentication token being processed
-     * @param ase The excetion that caused the authentication failure
-     */
-    protected void publishFailureEvent(UsernamePasswordAuthenticationToken token, AuthenticationException ase) {
-        // exists for passivity (the superclass does a null check before publishing)
-        getApplicationEventPublisher().publishEvent(new JaasAuthenticationFailedEvent(token, ase));
-    }
+	/**
+	 * Publishes the {@link JaasAuthenticationFailedEvent}. Can be overridden by
+	 * subclasses for different functionality
+	 *
+	 * @param token The authentication token being processed
+	 * @param ase The excetion that caused the authentication failure
+	 */
+	protected void publishFailureEvent(UsernamePasswordAuthenticationToken token,
+			AuthenticationException ase) {
+		// exists for passivity (the superclass does a null check before publishing)
+		getApplicationEventPublisher().publishEvent(
+				new JaasAuthenticationFailedEvent(token, ase));
+	}
 
-    public Resource getLoginConfig() {
-        return loginConfig;
-    }
+	public Resource getLoginConfig() {
+		return loginConfig;
+	}
 
-    /**
-     * Set the JAAS login configuration file.
-     *
-     * @param loginConfig
-     *
-     * @see <a href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html">JAAS Reference</a>
-     */
-    public void setLoginConfig(Resource loginConfig) {
-        this.loginConfig = loginConfig;
-    }
+	/**
+	 * Set the JAAS login configuration file.
+	 *
+	 * @param loginConfig
+	 *
+	 * @see <a
+	 * href="http://java.sun.com/j2se/1.5.0/docs/guide/security/jaas/JAASRefGuide.html">JAAS
+	 * Reference</a>
+	 */
+	public void setLoginConfig(Resource loginConfig) {
+		this.loginConfig = loginConfig;
+	}
 
-    /**
-     * If set, a call to {@code Configuration#refresh()} will be made by {@code #configureJaas(Resource) }
-     * method. Defaults to {@code true}.
-     *
-     * @see <a href="https://jira.springsource.org/browse/SEC-1320">SEC-1320</a>
-     *
-     * @param refresh set to {@code false} to disable reloading of the configuration.
-     * May be useful in some environments.
-     */
-    public void setRefreshConfigurationOnStartup(boolean refresh) {
-        this.refreshConfigurationOnStartup = refresh;
-    }
+	/**
+	 * If set, a call to {@code Configuration#refresh()} will be made by
+	 * {@code #configureJaas(Resource) } method. Defaults to {@code true}.
+	 *
+	 * @see <a href="https://jira.springsource.org/browse/SEC-1320">SEC-1320</a>
+	 *
+	 * @param refresh set to {@code false} to disable reloading of the configuration. May
+	 * be useful in some environments.
+	 */
+	public void setRefreshConfigurationOnStartup(boolean refresh) {
+		this.refreshConfigurationOnStartup = refresh;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java
index 59299d858f..3f3906115d 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationToken.java
@@ -17,43 +17,46 @@ package org.springframework.security.authentication.jaas;
 
 import java.util.List;
 
-
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
 import javax.security.auth.login.LoginContext;
 
-
 /**
- * UsernamePasswordAuthenticationToken extension to carry the Jaas LoginContext that the user was logged into
+ * UsernamePasswordAuthenticationToken extension to carry the Jaas LoginContext that the
+ * user was logged into
  *
  * @author Ray Krueger
  */
 public class JaasAuthenticationToken extends UsernamePasswordAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final transient LoginContext loginContext;
+	private final transient LoginContext loginContext;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JaasAuthenticationToken(Object principal, Object credentials, LoginContext loginContext) {
-        super(principal, credentials);
-        this.loginContext = loginContext;
-    }
+	public JaasAuthenticationToken(Object principal, Object credentials,
+			LoginContext loginContext) {
+		super(principal, credentials);
+		this.loginContext = loginContext;
+	}
 
-    public JaasAuthenticationToken(Object principal, Object credentials, List<GrantedAuthority> authorities,
-            LoginContext loginContext) {
-        super(principal, credentials, authorities);
-        this.loginContext = loginContext;
-    }
+	public JaasAuthenticationToken(Object principal, Object credentials,
+			List<GrantedAuthority> authorities, LoginContext loginContext) {
+		super(principal, credentials, authorities);
+		this.loginContext = loginContext;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public LoginContext getLoginContext() {
-        return loginContext;
-    }
+	public LoginContext getLoginContext() {
+		return loginContext;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
index f35e457d85..8ff8e8ae63 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasGrantedAuthority.java
@@ -20,10 +20,9 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
 
 import java.security.Principal;
 
-
 /**
- * {@code GrantedAuthority} which, in addition to the assigned role, holds the principal that an
- * {@link AuthorityGranter} used as a reason to grant this authority.
+ * {@code GrantedAuthority} which, in addition to the assigned role, holds the principal
+ * that an {@link AuthorityGranter} used as a reason to grant this authority.
  *
  * @author Ray Krueger
  *
@@ -31,44 +30,45 @@ import java.security.Principal;
  */
 public final class JaasGrantedAuthority implements GrantedAuthority {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private final String role;
-    private final Principal principal;
+	private final String role;
+	private final Principal principal;
 
-    public JaasGrantedAuthority(String role, Principal principal) {
-        this.role = role;
-        this.principal = principal;
-    }
+	public JaasGrantedAuthority(String role, Principal principal) {
+		this.role = role;
+		this.principal = principal;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Principal getPrincipal() {
-        return principal;
-    }
+	public Principal getPrincipal() {
+		return principal;
+	}
 
-    public String getAuthority() {
-        return role;
-    }
+	public String getAuthority() {
+		return role;
+	}
 
-    public int hashCode() {
-        return 31 ^ principal.hashCode() ^ role.hashCode();
-    }
+	public int hashCode() {
+		return 31 ^ principal.hashCode() ^ role.hashCode();
+	}
 
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
 
-        if (obj instanceof JaasGrantedAuthority) {
-            JaasGrantedAuthority jga = (JaasGrantedAuthority) obj;
-            return this.role.equals(jga.role) && this.principal.equals(jga.principal);
-        }
+		if (obj instanceof JaasGrantedAuthority) {
+			JaasGrantedAuthority jga = (JaasGrantedAuthority) obj;
+			return this.role.equals(jga.role) && this.principal.equals(jga.principal);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public String toString() {
-        return "Jaas Authority [" + role + "," + principal + "]" ;
-    }
+	public String toString() {
+		return "Jaas Authority [" + role + "," + principal + "]";
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java
index 9dda17b5fe..9ff403c6c8 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasNameCallbackHandler.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.authentication.jaas;
 
-
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -25,46 +24,49 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-
 /**
- * The most basic Callbacks to be handled when using a LoginContext from JAAS, are the NameCallback and
- * PasswordCallback. Spring Security provides the JaasNameCallbackHandler specifically tailored to
- * handling the NameCallback. <br>
+ * The most basic Callbacks to be handled when using a LoginContext from JAAS, are the
+ * NameCallback and PasswordCallback. Spring Security provides the JaasNameCallbackHandler
+ * specifically tailored to handling the NameCallback. <br>
  *
  * @author Ray Krueger
  *
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
  * @see <a
- *      href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/NameCallback.html">NameCallback</a>
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
+ * @see <a
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/NameCallback.html">NameCallback</a>
  */
 public class JaasNameCallbackHandler implements JaasAuthenticationCallbackHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * If the callback passed to the 'handle' method is an instance of NameCallback, the
-     * JaasNameCallbackHandler will call, callback.setName(authentication.getPrincipal().toString()).
-     *
-     * @param callback
-     * @param authentication
-     *
-     * @throws IOException
-     * @throws UnsupportedCallbackException
-     */
-    public void handle(Callback callback, Authentication authentication)
-        throws IOException, UnsupportedCallbackException {
-        if (callback instanceof NameCallback) {
-            NameCallback ncb = (NameCallback) callback;
-            String username;
+	/**
+	 * If the callback passed to the 'handle' method is an instance of NameCallback, the
+	 * JaasNameCallbackHandler will call,
+	 * callback.setName(authentication.getPrincipal().toString()).
+	 *
+	 * @param callback
+	 * @param authentication
+	 *
+	 * @throws IOException
+	 * @throws UnsupportedCallbackException
+	 */
+	public void handle(Callback callback, Authentication authentication)
+			throws IOException, UnsupportedCallbackException {
+		if (callback instanceof NameCallback) {
+			NameCallback ncb = (NameCallback) callback;
+			String username;
 
-            Object principal = authentication.getPrincipal();
+			Object principal = authentication.getPrincipal();
 
-            if (principal instanceof UserDetails) {
-                username = ((UserDetails) principal).getUsername();
-            } else {
-                username = principal.toString();
-            }
+			if (principal instanceof UserDetails) {
+				username = ((UserDetails) principal).getUsername();
+			}
+			else {
+				username = principal.toString();
+			}
 
-            ncb.setName(username);
-        }
-    }
+			ncb.setName(username);
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java
index f3cd2b900f..e663dd4b77 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasPasswordCallbackHandler.java
@@ -23,36 +23,39 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-
 /**
- * The most basic Callbacks to be handled when using a LoginContext from JAAS, are the NameCallback and
- * PasswordCallback. Spring Security provides the JaasPasswordCallbackHandler specifically tailored to
- * handling the PasswordCallback. <br>
+ * The most basic Callbacks to be handled when using a LoginContext from JAAS, are the
+ * NameCallback and PasswordCallback. Spring Security provides the
+ * JaasPasswordCallbackHandler specifically tailored to handling the PasswordCallback. <br>
  *
  * @author Ray Krueger
  *
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
- * @see <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/PasswordCallback.html">
- *         PasswordCallback</a>
+ * @see <a
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/Callback.html">Callback</a>
+ * @see <a
+ * href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/callback/PasswordCallback.html">
+ * PasswordCallback</a>
  */
 public class JaasPasswordCallbackHandler implements JaasAuthenticationCallbackHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * If the callback passed to the 'handle' method is an instance of PasswordCallback, the
-     * JaasPasswordCallbackHandler will call, callback.setPassword(authentication.getCredentials().toString()).
-     *
-     * @param callback
-     * @param auth
-     *
-     * @throws IOException
-     * @throws UnsupportedCallbackException
-     */
-    public void handle(Callback callback, Authentication auth)
-        throws IOException, UnsupportedCallbackException {
-        if (callback instanceof PasswordCallback) {
-            PasswordCallback pc = (PasswordCallback) callback;
-            pc.setPassword(auth.getCredentials().toString().toCharArray());
-        }
-    }
+	/**
+	 * If the callback passed to the 'handle' method is an instance of PasswordCallback,
+	 * the JaasPasswordCallbackHandler will call,
+	 * callback.setPassword(authentication.getCredentials().toString()).
+	 *
+	 * @param callback
+	 * @param auth
+	 *
+	 * @throws IOException
+	 * @throws UnsupportedCallbackException
+	 */
+	public void handle(Callback callback, Authentication auth) throws IOException,
+			UnsupportedCallbackException {
+		if (callback instanceof PasswordCallback) {
+			PasswordCallback pc = (PasswordCallback) callback;
+			pc.setPassword(auth.getCredentials().toString().toCharArray());
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java b/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java
index 5a3addbf95..647c0f2656 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/LoginExceptionResolver.java
@@ -19,26 +19,27 @@ import org.springframework.security.core.AuthenticationException;
 
 import javax.security.auth.login.LoginException;
 
-
 /**
- * The JaasAuthenticationProvider takes an instance of LoginExceptionResolver
- * to resolve LoginModule specific exceptions to Spring Security <tt>AuthenticationException</tt>s.
- * For instance, a configured login module could throw a
- * ScrewedUpPasswordException that extends LoginException, in this instance
- * the LoginExceptionResolver implementation would return a {@link
- * org.springframework.security.authentication.BadCredentialsException}.
+ * The JaasAuthenticationProvider takes an instance of LoginExceptionResolver to resolve
+ * LoginModule specific exceptions to Spring Security <tt>AuthenticationException</tt>s.
+ * For instance, a configured login module could throw a ScrewedUpPasswordException that
+ * extends LoginException, in this instance the LoginExceptionResolver implementation
+ * would return a
+ * {@link org.springframework.security.authentication.BadCredentialsException}.
  *
  * @author Ray Krueger
  */
 public interface LoginExceptionResolver {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Translates a Jaas LoginException to an SpringSecurityException.
-     *
-     * @param e The LoginException thrown by the configured LoginModule.
-     *
-     * @return The AuthenticationException that the JaasAuthenticationProvider should throw.
-     */
-    AuthenticationException resolveException(LoginException e);
+	/**
+	 * Translates a Jaas LoginException to an SpringSecurityException.
+	 *
+	 * @param e The LoginException thrown by the configured LoginModule.
+	 *
+	 * @return The AuthenticationException that the JaasAuthenticationProvider should
+	 * throw.
+	 */
+	AuthenticationException resolveException(LoginException e);
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java b/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java
index b3ae120f20..a110cd54d7 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/SecurityContextLoginModule.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.authentication.jaas;
 
-
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
@@ -29,141 +28,156 @@ import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-
 /**
- * An implementation of {@link LoginModule} that uses a Spring Security {@link
- * org.springframework.security.core.context.SecurityContext SecurityContext} to provide authentication.
+ * An implementation of {@link LoginModule} that uses a Spring Security
+ * {@link org.springframework.security.core.context.SecurityContext SecurityContext} to
+ * provide authentication.
  * <p>
- * This LoginModule provides opposite functionality to the {@link JaasAuthenticationProvider} API, and should not
- * really be used in conjunction with it.
+ * This LoginModule provides opposite functionality to the
+ * {@link JaasAuthenticationProvider} API, and should not really be used in conjunction
+ * with it.
  * <p>
- * The {@link JaasAuthenticationProvider} allows Spring Security to authenticate against Jaas.
+ * The {@link JaasAuthenticationProvider} allows Spring Security to authenticate against
+ * Jaas.
  * <p>
- * The SecurityContextLoginModule allows a Jaas based application to authenticate against Spring Security.
- * 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 <tt>ignoreMissingAuthentication</tt> option by setting it
- * to "true". Setting ignoreMissingAuthentication=true will tell the SecurityContextLoginModule to simply return false
- * and be ignored if the authentication is null.
+ * The SecurityContextLoginModule allows a Jaas based application to authenticate against
+ * Spring Security. 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 <tt>ignoreMissingAuthentication</tt> option by setting it to "true".
+ * Setting ignoreMissingAuthentication=true will tell the SecurityContextLoginModule to
+ * simply return false and be ignored if the authentication is null.
  *
  * @author Brian Moseley
  * @author Ray Krueger
  */
 public class SecurityContextLoginModule implements LoginModule {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log log = LogFactory.getLog(SecurityContextLoginModule.class);
+	private static final Log log = LogFactory.getLog(SecurityContextLoginModule.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Authentication authen;
-    private Subject subject;
-    private boolean ignoreMissingAuthentication = false;
+	private Authentication authen;
+	private Subject subject;
+	private boolean ignoreMissingAuthentication = false;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Abort the authentication process by forgetting the Spring Security <code>Authentication</code>.
-     *
-     * @return true if this method succeeded, or false if this <code>LoginModule</code> should be ignored.
-     *
-     * @exception LoginException if the abort fails
-     */
-    public boolean abort() throws LoginException {
-        if (authen == null) {
-            return false;
-        }
+	/**
+	 * Abort the authentication process by forgetting the Spring Security
+	 * <code>Authentication</code>.
+	 *
+	 * @return true if this method succeeded, or false if this <code>LoginModule</code>
+	 * should be ignored.
+	 *
+	 * @exception LoginException if the abort fails
+	 */
+	public boolean abort() throws LoginException {
+		if (authen == null) {
+			return false;
+		}
 
-        authen = null;
+		authen = null;
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Authenticate the <code>Subject</code> (phase two) by adding the Spring Security
-     * <code>Authentication</code> to the <code>Subject</code>'s principals.
-     *
-     * @return true if this method succeeded, or false if this <code>LoginModule</code> should be ignored.
-     *
-     * @exception LoginException if the commit fails
-     */
-    public boolean commit() throws LoginException {
-        if (authen == null) {
-            return false;
-        }
+	/**
+	 * Authenticate the <code>Subject</code> (phase two) by adding the Spring Security
+	 * <code>Authentication</code> to the <code>Subject</code>'s principals.
+	 *
+	 * @return true if this method succeeded, or false if this <code>LoginModule</code>
+	 * should be ignored.
+	 *
+	 * @exception LoginException if the commit fails
+	 */
+	public boolean commit() throws LoginException {
+		if (authen == null) {
+			return false;
+		}
 
-        subject.getPrincipals().add(authen);
+		subject.getPrincipals().add(authen);
 
-        return true;
-    }
+		return true;
+	}
 
-    Authentication getAuthentication() {
-        return authen;
-    }
+	Authentication getAuthentication() {
+		return authen;
+	}
 
-    Subject getSubject() {
-        return subject;
-    }
+	Subject getSubject() {
+		return subject;
+	}
 
-    /**
-     * Initialize this <code>LoginModule</code>. Ignores the callback handler, since the code establishing the
-     * <code>LoginContext</code> likely won't provide one that understands Spring Security. Also ignores the
-     * <code>sharedState</code> and <code>options</code> parameters, since none are recognized.
-     *
-     * @param subject the <code>Subject</code> to be authenticated.
-     * @param callbackHandler is ignored
-     * @param sharedState is ignored
-     * @param options are ignored
-     */
-    @SuppressWarnings("unchecked")
-    public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
-        this.subject = subject;
+	/**
+	 * Initialize this <code>LoginModule</code>. Ignores the callback handler, since the
+	 * code establishing the <code>LoginContext</code> likely won't provide one that
+	 * understands Spring Security. Also ignores the <code>sharedState</code> and
+	 * <code>options</code> parameters, since none are recognized.
+	 *
+	 * @param subject the <code>Subject</code> to be authenticated.
+	 * @param callbackHandler is ignored
+	 * @param sharedState is ignored
+	 * @param options are ignored
+	 */
+	@SuppressWarnings("unchecked")
+	public void initialize(Subject subject, CallbackHandler callbackHandler,
+			Map sharedState, Map options) {
+		this.subject = subject;
 
-        if (options != null) {
-            ignoreMissingAuthentication = "true".equals(options.get("ignoreMissingAuthentication"));
-        }
-    }
+		if (options != null) {
+			ignoreMissingAuthentication = "true".equals(options
+					.get("ignoreMissingAuthentication"));
+		}
+	}
 
-    /**
-     * Authenticate the <code>Subject</code> (phase one) by extracting the Spring Security
-     * <code>Authentication</code> from the current <code>SecurityContext</code>.
-     *
-     * @return true if the authentication succeeded, or false if this <code>LoginModule</code> should be ignored.
-     *
-     * @throws LoginException if the authentication fails
-     */
-    public boolean login() throws LoginException {
-        authen = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Authenticate the <code>Subject</code> (phase one) by extracting the Spring Security
+	 * <code>Authentication</code> from the current <code>SecurityContext</code>.
+	 *
+	 * @return true if the authentication succeeded, or false if this
+	 * <code>LoginModule</code> should be ignored.
+	 *
+	 * @throws LoginException if the authentication fails
+	 */
+	public boolean login() throws LoginException {
+		authen = SecurityContextHolder.getContext().getAuthentication();
 
-        if (authen == null) {
-            String msg = "Login cannot complete, authentication not found in security context";
+		if (authen == null) {
+			String msg = "Login cannot complete, authentication not found in security context";
 
-            if (ignoreMissingAuthentication) {
-                log.warn(msg);
+			if (ignoreMissingAuthentication) {
+				log.warn(msg);
 
-                return false;
-            } else {
-                throw new LoginException(msg);
-            }
-        }
+				return false;
+			}
+			else {
+				throw new LoginException(msg);
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Log out the <code>Subject</code>.
-     *
-     * @return true if this method succeeded, or false if this <code>LoginModule</code> should be ignored.
-     *
-     * @exception LoginException if the logout fails
-     */
-    public boolean logout() throws LoginException {
-        if (authen == null) {
-            return false;
-        }
+	/**
+	 * Log out the <code>Subject</code>.
+	 *
+	 * @return true if this method succeeded, or false if this <code>LoginModule</code>
+	 * should be ignored.
+	 *
+	 * @exception LoginException if the logout fails
+	 */
+	public boolean logout() throws LoginException {
+		if (authen == null) {
+			return false;
+		}
 
-        subject.getPrincipals().remove(authen);
-        authen = null;
+		subject.getPrincipals().remove(authen);
+		authen = null;
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
index 7dbb1ec13a..8c9b0b5f01 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationEvent.java
@@ -19,33 +19,35 @@ import org.springframework.security.core.Authentication;
 
 import org.springframework.context.ApplicationEvent;
 
-
 /**
- * Parent class for events fired by the {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider
+ * Parent class for events fired by the
+ * {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider
  * JaasAuthenticationProvider}.
  *
  * @author Ray Krueger
  */
 public abstract class JaasAuthenticationEvent extends ApplicationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-/**
-     * The Authentication object is stored as the ApplicationEvent 'source'.
-     *
-     * @param auth
-     */
-    public JaasAuthenticationEvent(Authentication auth) {
-        super(auth);
-    }
+	/**
+	 * The Authentication object is stored as the ApplicationEvent 'source'.
+	 *
+	 * @param auth
+	 */
+	public JaasAuthenticationEvent(Authentication auth) {
+		super(auth);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Pre-casted method that returns the 'source' of the event.
-     *
-     * @return the Authentication
-     */
-    public Authentication getAuthentication() {
-        return (Authentication) source;
-    }
+	/**
+	 * Pre-casted method that returns the 'source' of the event.
+	 *
+	 * @return the Authentication
+	 */
+	public Authentication getAuthentication() {
+		return (Authentication) source;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
index c7dcb7e593..7fd8b485de 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationFailedEvent.java
@@ -17,27 +17,30 @@ package org.springframework.security.authentication.jaas.event;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Fired when LoginContext.login throws a LoginException, or if any other exception is thrown during that time.
+ * Fired when LoginContext.login throws a LoginException, or if any other exception is
+ * thrown during that time.
  *
  * @author Ray Krueger
  */
 public class JaasAuthenticationFailedEvent extends JaasAuthenticationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Exception exception;
+	private final Exception exception;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JaasAuthenticationFailedEvent(Authentication auth, Exception exception) {
-        super(auth);
-        this.exception = exception;
-    }
+	public JaasAuthenticationFailedEvent(Authentication auth, Exception exception) {
+		super(auth);
+		this.exception = exception;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Exception getException() {
-        return exception;
-    }
+	public Exception getException() {
+		return exception;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
index 627db4e5a6..d1fccddf81 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/JaasAuthenticationSuccessEvent.java
@@ -17,18 +17,19 @@ package org.springframework.security.authentication.jaas.event;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Fired by the {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider JaasAuthenticationProvider}
- * after successfully logging the user into the LoginContext, handling all callbacks, and calling all
- * AuthorityGranters.
+ * Fired by the
+ * {@link org.springframework.security.authentication.jaas.JaasAuthenticationProvider
+ * JaasAuthenticationProvider} after successfully logging the user into the LoginContext,
+ * handling all callbacks, and calling all AuthorityGranters.
  *
  * @author Ray Krueger
  */
 public class JaasAuthenticationSuccessEvent extends JaasAuthenticationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JaasAuthenticationSuccessEvent(Authentication auth) {
-        super(auth);
-    }
+	public JaasAuthenticationSuccessEvent(Authentication auth) {
+		super(auth);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/event/package-info.java b/core/src/main/java/org/springframework/security/authentication/jaas/event/package-info.java
index 6a99de0391..366ecae3ad 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/event/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/event/package-info.java
@@ -3,3 +3,4 @@
  * provider.
  */
 package org.springframework.security.authentication.jaas.event;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
index 2746364e18..f8bc3bf37f 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
@@ -25,78 +25,78 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * An in memory representation of a JAAS configuration. The constructor accepts
- * a Map where the key represents the name of the login context name and the
- * value is an Array of {@link AppConfigurationEntry} for that login context
- * name. A default Array of {@link AppConfigurationEntry}s can be specified
- * which will be returned if a login context is specified which is undefined.
+ * An in memory representation of a JAAS configuration. The constructor accepts a Map
+ * where the key represents the name of the login context name and the value is an Array
+ * of {@link AppConfigurationEntry} for that login context name. A default Array of
+ * {@link AppConfigurationEntry}s can be specified which will be returned if a login
+ * context is specified which is undefined.
  * </p>
  * 
  * @author Rob Winch
  */
 public class InMemoryConfiguration extends Configuration {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final AppConfigurationEntry[] defaultConfiguration;
-    private final Map<String, AppConfigurationEntry[]> mappedConfigurations;
+	private final AppConfigurationEntry[] defaultConfiguration;
+	private final Map<String, AppConfigurationEntry[]> mappedConfigurations;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates a new instance with only a defaultConfiguration. Any
-     * configuration name will result in defaultConfiguration being returned.
-     * 
-     * @param defaultConfiguration
-     *            The result for any calls to
-     *            {@link #getAppConfigurationEntry(String)}. Can be
-     *            <code>null</code>.
-     */
-    public InMemoryConfiguration(AppConfigurationEntry[] defaultConfiguration) {
-        this(Collections.<String, AppConfigurationEntry[]> emptyMap(), defaultConfiguration);
-    }
+	/**
+	 * Creates a new instance with only a defaultConfiguration. Any configuration name
+	 * will result in defaultConfiguration being returned.
+	 * 
+	 * @param defaultConfiguration The result for any calls to
+	 * {@link #getAppConfigurationEntry(String)}. Can be <code>null</code>.
+	 */
+	public InMemoryConfiguration(AppConfigurationEntry[] defaultConfiguration) {
+		this(Collections.<String, AppConfigurationEntry[]> emptyMap(),
+				defaultConfiguration);
+	}
 
-    /**
-     * Creates a new instance with a mapping of login context name to an array
-     * of {@link AppConfigurationEntry}s.
-     * 
-     * @param mappedConfigurations
-     *            each key represents a login context name and each value is an
-     *            Array of {@link AppConfigurationEntry}s that should be used.
-     */
-    public InMemoryConfiguration(Map<String, AppConfigurationEntry[]> mappedConfigurations) {
-        this(mappedConfigurations, null);
-    }
+	/**
+	 * Creates a new instance with a mapping of login context name to an array of
+	 * {@link AppConfigurationEntry}s.
+	 * 
+	 * @param mappedConfigurations each key represents a login context name and each value
+	 * is an Array of {@link AppConfigurationEntry}s that should be used.
+	 */
+	public InMemoryConfiguration(Map<String, AppConfigurationEntry[]> mappedConfigurations) {
+		this(mappedConfigurations, null);
+	}
 
-    /**
-     * Creates a new instance with a mapping of login context name to an array
-     * of {@link AppConfigurationEntry}s along with a default configuration that
-     * will be used if no mapping is found for the given login context name.
-     * 
-     * @param mappedConfigurations
-     *            each key represents a login context name and each value is an
-     *            Array of {@link AppConfigurationEntry}s that should be used.
-     * @param defaultConfiguration The result for any calls to
-     *            {@link #getAppConfigurationEntry(String)}. Can be
-     *            <code>null</code>.
-     */
-    public InMemoryConfiguration(Map<String, AppConfigurationEntry[]> mappedConfigurations,
-            AppConfigurationEntry[] defaultConfiguration) {
-        Assert.notNull(mappedConfigurations, "mappedConfigurations cannot be null.");
-        this.mappedConfigurations = mappedConfigurations;
-        this.defaultConfiguration = defaultConfiguration;
-    }
+	/**
+	 * Creates a new instance with a mapping of login context name to an array of
+	 * {@link AppConfigurationEntry}s along with a default configuration that will be used
+	 * if no mapping is found for the given login context name.
+	 * 
+	 * @param mappedConfigurations each key represents a login context name and each value
+	 * is an Array of {@link AppConfigurationEntry}s that should be used.
+	 * @param defaultConfiguration The result for any calls to
+	 * {@link #getAppConfigurationEntry(String)}. Can be <code>null</code>.
+	 */
+	public InMemoryConfiguration(
+			Map<String, AppConfigurationEntry[]> mappedConfigurations,
+			AppConfigurationEntry[] defaultConfiguration) {
+		Assert.notNull(mappedConfigurations, "mappedConfigurations cannot be null.");
+		this.mappedConfigurations = mappedConfigurations;
+		this.defaultConfiguration = defaultConfiguration;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
-        AppConfigurationEntry[] mappedResult = mappedConfigurations.get(name);
-        return mappedResult == null ? defaultConfiguration : mappedResult;
-    }
+	@Override
+	public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+		AppConfigurationEntry[] mappedResult = mappedConfigurations.get(name);
+		return mappedResult == null ? defaultConfiguration : mappedResult;
+	}
 
-    /**
-     * Does nothing, but required for JDK5
-     */
-    public void refresh() {
-    }
+	/**
+	 * Does nothing, but required for JDK5
+	 */
+	public void refresh() {
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/memory/package-info.java b/core/src/main/java/org/springframework/security/authentication/jaas/memory/package-info.java
index fd08f58c5a..b6a37d70d4 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/memory/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/memory/package-info.java
@@ -2,3 +2,4 @@
  * An in memory JAAS implementation.
  */
 package org.springframework.security.authentication.jaas.memory;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/package-info.java b/core/src/main/java/org/springframework/security/authentication/jaas/package-info.java
index 0c4538548c..21297796af 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/package-info.java
@@ -2,3 +2,4 @@
  * An authentication provider for JAAS.
  */
 package org.springframework.security.authentication.jaas;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/package-info.java b/core/src/main/java/org/springframework/security/authentication/package-info.java
index 2f49e2ebc5..cf84f89cac 100644
--- a/core/src/main/java/org/springframework/security/authentication/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/package-info.java
@@ -7,3 +7,4 @@
  * AuthenticationProvider}s to which it delegates authentication requests.
  */
 package org.springframework.security.authentication;
+
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
index ab4e013d6d..2622e750bd 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationException.java
@@ -19,27 +19,29 @@ import org.springframework.core.NestedRuntimeException;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
 /**
- * Thrown if a <code>RemoteAuthenticationManager</code> cannot validate the presented authentication request.
+ * Thrown if a <code>RemoteAuthenticationManager</code> cannot validate the presented
+ * authentication request.
  * <p>
  * This is thrown rather than the normal <code>AuthenticationException</code> because
- * <code>AuthenticationException</code> contains additional properties which may cause issues for
- * the remoting protocol.
+ * <code>AuthenticationException</code> contains additional properties which may cause
+ * issues for the remoting protocol.
  *
  * @author Ben Alex
  */
 public class RemoteAuthenticationException extends NestedRuntimeException {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>RemoteAuthenticationException</code> with the
-     * specified message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public RemoteAuthenticationException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>RemoteAuthenticationException</code> with the specified message
+	 * and no root cause.
+	 *
+	 * @param msg the detail message
+	 */
+	public RemoteAuthenticationException(String msg) {
+		super(msg);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
index 5c871354a7..a4e00897db 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManager.java
@@ -19,31 +19,34 @@ import java.util.Collection;
 
 import org.springframework.security.core.GrantedAuthority;
 
-
 /**
  * Allows remote clients to attempt authentication.
  *
  * @author Ben Alex
  */
 public interface RemoteAuthenticationManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Attempts to authenticate the remote client using the presented username and password. If authentication
-     * is successful, a collection of {@code GrantedAuthority} objects will be returned.
-     * <p>
-     * In order to maximise remoting protocol compatibility, a design decision was taken to operate with minimal
-     * arguments and return only the minimal amount of information required for remote clients to enable/disable
-     * relevant user interface commands etc. There is nothing preventing users from implementing their own equivalent
-     * package that works with more complex object types.
-     *
-     * @param username the username the remote client wishes to authenticate with.
-     * @param password the password the remote client wishes to authenticate with.
-     *
-     * @return all of the granted authorities the specified username and password have access to.
-     *
-     * @throws RemoteAuthenticationException if the authentication failed.
-     */
-    Collection<? extends GrantedAuthority> attemptAuthentication(String username, String password)
-        throws RemoteAuthenticationException;
+	/**
+	 * Attempts to authenticate the remote client using the presented username and
+	 * password. If authentication is successful, a collection of {@code GrantedAuthority}
+	 * objects will be returned.
+	 * <p>
+	 * In order to maximise remoting protocol compatibility, a design decision was taken
+	 * to operate with minimal arguments and return only the minimal amount of information
+	 * required for remote clients to enable/disable relevant user interface commands etc.
+	 * There is nothing preventing users from implementing their own equivalent package
+	 * that works with more complex object types.
+	 *
+	 * @param username the username the remote client wishes to authenticate with.
+	 * @param password the password the remote client wishes to authenticate with.
+	 *
+	 * @return all of the granted authorities the specified username and password have
+	 * access to.
+	 *
+	 * @throws RemoteAuthenticationException if the authentication failed.
+	 */
+	Collection<? extends GrantedAuthority> attemptAuthentication(String username,
+			String password) throws RemoteAuthenticationException;
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
index 2983bc78ee..32a24c63e5 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImpl.java
@@ -24,42 +24,46 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
-
 /**
  * Server-side processor of a remote authentication request.
  * <p>
- * This bean requires no security interceptor to protect it. Instead, the bean uses the configured
- * <code>AuthenticationManager</code> to resolve an authentication request.
+ * This bean requires no security interceptor to protect it. Instead, the bean uses the
+ * configured <code>AuthenticationManager</code> to resolve an authentication request.
  *
  * @author Ben Alex
  */
-public class RemoteAuthenticationManagerImpl implements RemoteAuthenticationManager, InitializingBean {
-    //~ Instance fields ================================================================================================
+public class RemoteAuthenticationManagerImpl implements RemoteAuthenticationManager,
+		InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationManager authenticationManager;
+	private AuthenticationManager authenticationManager;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.authenticationManager, "authenticationManager is required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.authenticationManager, "authenticationManager is required");
+	}
 
-    public Collection<? extends GrantedAuthority> attemptAuthentication(String username, String password)
-            throws RemoteAuthenticationException {
-        UsernamePasswordAuthenticationToken request = new UsernamePasswordAuthenticationToken(username, password);
+	public Collection<? extends GrantedAuthority> attemptAuthentication(String username,
+			String password) throws RemoteAuthenticationException {
+		UsernamePasswordAuthenticationToken request = new UsernamePasswordAuthenticationToken(
+				username, password);
 
-        try {
-            return authenticationManager.authenticate(request).getAuthorities();
-        } catch (AuthenticationException authEx) {
-            throw new RemoteAuthenticationException(authEx.getMessage());
-        }
-    }
+		try {
+			return authenticationManager.authenticate(request).getAuthorities();
+		}
+		catch (AuthenticationException authEx) {
+			throw new RemoteAuthenticationException(authEx.getMessage());
+		}
+	}
 
-    protected AuthenticationManager getAuthenticationManager() {
-        return authenticationManager;
-    }
+	protected AuthenticationManager getAuthenticationManager() {
+		return authenticationManager;
+	}
 
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
index f093a903b6..9e3bd914ce 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
@@ -25,54 +25,67 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
 
-
 /**
- * Client-side object which queries a  {@link RemoteAuthenticationManager} to validate an authentication request.
+ * Client-side object which queries a {@link RemoteAuthenticationManager} to validate an
+ * authentication request.
  * <p>
- * A new <code>Authentication</code> object is created by this class comprising the request <code>Authentication</code>
- * object's <code>principal</code>, <code>credentials</code> and the <code>GrantedAuthority</code>[]s returned by the
+ * A new <code>Authentication</code> object is created by this class comprising the
+ * request <code>Authentication</code> object's <code>principal</code>,
+ * <code>credentials</code> and the <code>GrantedAuthority</code>[]s returned by the
  * <code>RemoteAuthenticationManager</code>.
  * <p>
- * The <code>RemoteAuthenticationManager</code> should not require any special username or password setting on
- * the remoting client proxy factory to execute the call. Instead the entire authentication request must be
- * encapsulated solely within the <code>Authentication</code> request object. In practical terms this means the
- * <code>RemoteAuthenticationManager</code> will <b>not</b> be protected by BASIC or any other HTTP-level
- * authentication.</p>
- *  <p>If authentication fails, a <code>RemoteAuthenticationException</code> will be thrown. This exception should
- * be caught and displayed to the user, enabling them to retry with alternative credentials etc.</p>
+ * The <code>RemoteAuthenticationManager</code> should not require any special username or
+ * password setting on the remoting client proxy factory to execute the call. Instead the
+ * entire authentication request must be encapsulated solely within the
+ * <code>Authentication</code> request object. In practical terms this means the
+ * <code>RemoteAuthenticationManager</code> will <b>not</b> be protected by BASIC or any
+ * other HTTP-level authentication.
+ * </p>
+ * <p>
+ * If authentication fails, a <code>RemoteAuthenticationException</code> will be thrown.
+ * This exception should be caught and displayed to the user, enabling them to retry with
+ * alternative credentials etc.
+ * </p>
  *
  * @author Ben Alex
  */
-public class RemoteAuthenticationProvider implements AuthenticationProvider, InitializingBean {
-    //~ Instance fields ================================================================================================
+public class RemoteAuthenticationProvider implements AuthenticationProvider,
+		InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private RemoteAuthenticationManager remoteAuthenticationManager;
+	private RemoteAuthenticationManager remoteAuthenticationManager;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.remoteAuthenticationManager, "remoteAuthenticationManager is mandatory");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.remoteAuthenticationManager,
+				"remoteAuthenticationManager is mandatory");
+	}
 
-    public Authentication authenticate(Authentication authentication)
-        throws AuthenticationException {
-        String username = authentication.getPrincipal().toString();
-        Object credentials = authentication.getCredentials();
-        String password = credentials == null ? null : credentials.toString();
-        Collection<? extends GrantedAuthority> authorities = remoteAuthenticationManager.attemptAuthentication(username, password);
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		String username = authentication.getPrincipal().toString();
+		Object credentials = authentication.getCredentials();
+		String password = credentials == null ? null : credentials.toString();
+		Collection<? extends GrantedAuthority> authorities = remoteAuthenticationManager
+				.attemptAuthentication(username, password);
 
-        return new UsernamePasswordAuthenticationToken(username, password, authorities);
-    }
+		return new UsernamePasswordAuthenticationToken(username, password, authorities);
+	}
 
-    public RemoteAuthenticationManager getRemoteAuthenticationManager() {
-        return remoteAuthenticationManager;
-    }
+	public RemoteAuthenticationManager getRemoteAuthenticationManager() {
+		return remoteAuthenticationManager;
+	}
 
-    public void setRemoteAuthenticationManager(RemoteAuthenticationManager remoteAuthenticationManager) {
-        this.remoteAuthenticationManager = remoteAuthenticationManager;
-    }
+	public void setRemoteAuthenticationManager(
+			RemoteAuthenticationManager remoteAuthenticationManager) {
+		this.remoteAuthenticationManager = remoteAuthenticationManager;
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
-    }
+	public boolean supports(Class<?> authentication) {
+		return (UsernamePasswordAuthenticationToken.class
+				.isAssignableFrom(authentication));
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/package-info.java b/core/src/main/java/org/springframework/security/authentication/rcp/package-info.java
index 507c58f6f4..17ad2ffdde 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/package-info.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/package-info.java
@@ -2,3 +2,4 @@
  * Allows remote clients to authenticate and obtain a populated <code>Authentication</code> object.
  */
 package org.springframework.security.authentication.rcp;
+
diff --git a/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java b/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java
index 85b3c784f8..b985dfbc82 100644
--- a/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java
+++ b/core/src/main/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextSupport.java
@@ -17,31 +17,35 @@ import java.util.concurrent.Callable;
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * An internal support class that wraps {@link Callable} with {@link DelegatingSecurityContextCallable} and
- * {@link Runnable} with {@link DelegatingSecurityContextRunnable}
+ * An internal support class that wraps {@link Callable} with
+ * {@link DelegatingSecurityContextCallable} and {@link Runnable} with
+ * {@link DelegatingSecurityContextRunnable}
  *
  * @author Rob Winch
  * @since 3.2
  */
 abstract class AbstractDelegatingSecurityContextSupport {
 
-    private final SecurityContext securityContext;
+	private final SecurityContext securityContext;
 
-    /**
-     * Creates a new {@link AbstractDelegatingSecurityContextSupport} that uses the specified {@link SecurityContext}.
-     *
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} and
-     * each {@link DelegatingSecurityContextCallable} or null to default to the current {@link SecurityContext}.
-     */
-    AbstractDelegatingSecurityContextSupport(SecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
+	/**
+	 * Creates a new {@link AbstractDelegatingSecurityContextSupport} that uses the
+	 * specified {@link SecurityContext}.
+	 *
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} and each
+	 * {@link DelegatingSecurityContextCallable} or null to default to the current
+	 * {@link SecurityContext}.
+	 */
+	AbstractDelegatingSecurityContextSupport(SecurityContext securityContext) {
+		this.securityContext = securityContext;
+	}
 
-    protected final Runnable wrap(Runnable delegate) {
-        return DelegatingSecurityContextRunnable.create(delegate, securityContext);
-    }
+	protected final Runnable wrap(Runnable delegate) {
+		return DelegatingSecurityContextRunnable.create(delegate, securityContext);
+	}
 
-    protected final <T> Callable<T> wrap(Callable<T> delegate) {
-        return DelegatingSecurityContextCallable.create(delegate, securityContext);
-    }
+	protected final <T> Callable<T> wrap(Callable<T> delegate) {
+		return DelegatingSecurityContextCallable.create(delegate, securityContext);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
index 3b4d428665..3cfba87101 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
@@ -19,68 +19,75 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
 /**
- * Wraps a delegate {@link Callable} with logic for setting up a {@link SecurityContext} before invoking the delegate
- * {@link Callable} and then removing the {@link SecurityContext} after the delegate has completed.
+ * Wraps a delegate {@link Callable} with logic for setting up a {@link SecurityContext}
+ * before invoking the delegate {@link Callable} and then removing the
+ * {@link SecurityContext} after the delegate has completed.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class DelegatingSecurityContextCallable<V> implements Callable<V> {
 
-    private final Callable<V> delegate;
+	private final Callable<V> delegate;
 
-    private final SecurityContext securityContext;
+	private final SecurityContext securityContext;
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextCallable} with a specific {@link SecurityContext}.
-     * @param delegate the delegate {@link DelegatingSecurityContextCallable} to run with the specified
-     * {@link SecurityContext}. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to establish for the delegate {@link Callable}. Cannot be
-     * null.
-     */
-    public DelegatingSecurityContextCallable(Callable<V> delegate, SecurityContext securityContext) {
-        Assert.notNull(delegate, "delegate cannot be null");
-        Assert.notNull(securityContext, "securityContext cannot be null");
-        this.delegate = delegate;
-        this.securityContext = securityContext;
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextCallable} with a specific
+	 * {@link SecurityContext}.
+	 * @param delegate the delegate {@link DelegatingSecurityContextCallable} to run with
+	 * the specified {@link SecurityContext}. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to establish for the delegate
+	 * {@link Callable}. Cannot be null.
+	 */
+	public DelegatingSecurityContextCallable(Callable<V> delegate,
+			SecurityContext securityContext) {
+		Assert.notNull(delegate, "delegate cannot be null");
+		Assert.notNull(securityContext, "securityContext cannot be null");
+		this.delegate = delegate;
+		this.securityContext = securityContext;
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextCallable} with the {@link SecurityContext} from the
-     * {@link SecurityContextHolder}.
-     * @param delegate the delegate {@link Callable} to run under the current {@link SecurityContext}. Cannot be null.
-     */
-    public DelegatingSecurityContextCallable(Callable<V> delegate) {
-        this(delegate, SecurityContextHolder.getContext());
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextCallable} with the
+	 * {@link SecurityContext} from the {@link SecurityContextHolder}.
+	 * @param delegate the delegate {@link Callable} to run under the current
+	 * {@link SecurityContext}. Cannot be null.
+	 */
+	public DelegatingSecurityContextCallable(Callable<V> delegate) {
+		this(delegate, SecurityContextHolder.getContext());
+	}
 
-    public V call() throws Exception {
-        try {
-            SecurityContextHolder.setContext(securityContext);
-            return delegate.call();
-        }
-        finally {
-            SecurityContextHolder.clearContext();
-        }
-    }
+	public V call() throws Exception {
+		try {
+			SecurityContextHolder.setContext(securityContext);
+			return delegate.call();
+		}
+		finally {
+			SecurityContextHolder.clearContext();
+		}
+	}
 
-    public String toString() {
-        return delegate.toString();
-    }
+	public String toString() {
+		return delegate.toString();
+	}
 
-    /**
-     * Creates a {@link DelegatingSecurityContextCallable} and with the given {@link Callable} and
-     * {@link SecurityContext}, but if the securityContext is null will defaults to the current {@link SecurityContext}
-     * on the {@link SecurityContextHolder}
-     *
-     * @param delegate the delegate {@link DelegatingSecurityContextCallable} to run with the specified
-     * {@link SecurityContext}. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to establish for the delegate {@link Callable}. If null,
-     * defaults to {@link SecurityContextHolder#getContext()}
-     * @return
-     */
-    public static <V> Callable<V> create(Callable<V> delegate, SecurityContext securityContext) {
-        return securityContext == null ? new DelegatingSecurityContextCallable<V>(delegate)
-                : new DelegatingSecurityContextCallable<V>(delegate, securityContext);
-    }
+	/**
+	 * Creates a {@link DelegatingSecurityContextCallable} and with the given
+	 * {@link Callable} and {@link SecurityContext}, but if the securityContext is null
+	 * will defaults to the current {@link SecurityContext} on the
+	 * {@link SecurityContextHolder}
+	 *
+	 * @param delegate the delegate {@link DelegatingSecurityContextCallable} to run with
+	 * the specified {@link SecurityContext}. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to establish for the delegate
+	 * {@link Callable}. If null, defaults to {@link SecurityContextHolder#getContext()}
+	 * @return
+	 */
+	public static <V> Callable<V> create(Callable<V> delegate,
+			SecurityContext securityContext) {
+		return securityContext == null ? new DelegatingSecurityContextCallable<V>(
+				delegate) : new DelegatingSecurityContextCallable<V>(delegate,
+				securityContext);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java
index 3cc27db0c5..19ac59cd7e 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutor.java
@@ -19,43 +19,49 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
 /**
- * An {@link Executor} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable}.
+ * An {@link Executor} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class DelegatingSecurityContextExecutor extends AbstractDelegatingSecurityContextSupport implements Executor {
-    private final Executor delegate;
+public class DelegatingSecurityContextExecutor extends
+		AbstractDelegatingSecurityContextSupport implements Executor {
+	private final Executor delegate;
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextExecutor} that uses the specified {@link SecurityContext}.
-     *
-     * @param delegateExecutor the {@link Executor} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} or
-     * null to default to the current {@link SecurityContext}
-     */
-    public DelegatingSecurityContextExecutor(Executor delegateExecutor, SecurityContext securityContext) {
-        super(securityContext);
-        Assert.notNull(delegateExecutor, "delegateExecutor cannot be null");
-        this.delegate = delegateExecutor;
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextExecutor} that uses the specified
+	 * {@link SecurityContext}.
+	 *
+	 * @param delegateExecutor the {@link Executor} to delegate to. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} or null to default to the current
+	 * {@link SecurityContext}
+	 */
+	public DelegatingSecurityContextExecutor(Executor delegateExecutor,
+			SecurityContext securityContext) {
+		super(securityContext);
+		Assert.notNull(delegateExecutor, "delegateExecutor cannot be null");
+		this.delegate = delegateExecutor;
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextExecutor} that uses the current {@link SecurityContext} from the
-     * {@link SecurityContextHolder} at the time the task is submitted.
-     *
-     * @param delegate the {@link Executor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextExecutor(Executor delegate) {
-        this(delegate, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextExecutor} that uses the current
+	 * {@link SecurityContext} from the {@link SecurityContextHolder} at the time the task
+	 * is submitted.
+	 *
+	 * @param delegate the {@link Executor} to delegate to. Cannot be null.
+	 */
+	public DelegatingSecurityContextExecutor(Executor delegate) {
+		this(delegate, null);
+	}
 
-    public final void execute(Runnable task) {
-        task = wrap(task);
-        delegate.execute(task);
-    }
+	public final void execute(Runnable task) {
+		task = wrap(task);
+		delegate.execute(task);
+	}
 
-    protected final Executor getDelegateExecutor() {
-        return delegate;
-    }
+	protected final Executor getDelegateExecutor() {
+		return delegate;
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java
index 8dd5a6b3ea..5786869bab 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java
@@ -27,109 +27,116 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * An {@link ExecutorService} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable} and each
- * {@link Callable} in a {@link DelegatingSecurityContextCallable}.
+ * An {@link ExecutorService} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable} and each {@link Callable} in a
+ * {@link DelegatingSecurityContextCallable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class DelegatingSecurityContextExecutorService extends DelegatingSecurityContextExecutor implements
-        ExecutorService {
-    /**
-     * Creates a new {@link DelegatingSecurityContextExecutorService} that uses the specified {@link SecurityContext}.
-     *
-     * @param delegateExecutorService the {@link ExecutorService} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} and
-     * each {@link DelegatingSecurityContextCallable}.
-     */
-    public DelegatingSecurityContextExecutorService(ExecutorService delegateExecutorService,
-            SecurityContext securityContext) {
-        super(delegateExecutorService, securityContext);
-    }
+public class DelegatingSecurityContextExecutorService extends
+		DelegatingSecurityContextExecutor implements ExecutorService {
+	/**
+	 * Creates a new {@link DelegatingSecurityContextExecutorService} that uses the
+	 * specified {@link SecurityContext}.
+	 *
+	 * @param delegateExecutorService the {@link ExecutorService} to delegate to. Cannot
+	 * be null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} and each
+	 * {@link DelegatingSecurityContextCallable}.
+	 */
+	public DelegatingSecurityContextExecutorService(
+			ExecutorService delegateExecutorService, SecurityContext securityContext) {
+		super(delegateExecutorService, securityContext);
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextExecutorService} that uses the current {@link SecurityContext} from
-     * the {@link SecurityContextHolder}.
-     *
-     * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextExecutorService(ExecutorService delegate) {
-        this(delegate, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextExecutorService} that uses the
+	 * current {@link SecurityContext} from the {@link SecurityContextHolder}.
+	 *
+	 * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be
+	 * null.
+	 */
+	public DelegatingSecurityContextExecutorService(ExecutorService delegate) {
+		this(delegate, null);
+	}
 
-    public final void shutdown() {
-        getDelegate().shutdown();
-    }
+	public final void shutdown() {
+		getDelegate().shutdown();
+	}
 
-    public final List<Runnable> shutdownNow() {
-        return getDelegate().shutdownNow();
-    }
+	public final List<Runnable> shutdownNow() {
+		return getDelegate().shutdownNow();
+	}
 
-    public final boolean isShutdown() {
-        return getDelegate().isShutdown();
-    }
+	public final boolean isShutdown() {
+		return getDelegate().isShutdown();
+	}
 
-    public final boolean isTerminated() {
-        return getDelegate().isTerminated();
-    }
+	public final boolean isTerminated() {
+		return getDelegate().isTerminated();
+	}
 
-    public final boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
-        return getDelegate().awaitTermination(timeout, unit);
-    }
+	public final boolean awaitTermination(long timeout, TimeUnit unit)
+			throws InterruptedException {
+		return getDelegate().awaitTermination(timeout, unit);
+	}
 
-    public final <T> Future<T> submit(Callable<T> task) {
-        task = wrap(task);
-        return getDelegate().submit(task);
-    }
+	public final <T> Future<T> submit(Callable<T> task) {
+		task = wrap(task);
+		return getDelegate().submit(task);
+	}
 
-    public final <T> Future<T> submit(Runnable task, T result) {
-        task = wrap(task);
-        return getDelegate().submit(task, result);
-    }
+	public final <T> Future<T> submit(Runnable task, T result) {
+		task = wrap(task);
+		return getDelegate().submit(task, result);
+	}
 
-    public final Future<?> submit(Runnable task) {
-        task = wrap(task);
-        return getDelegate().submit(task);
-    }
+	public final Future<?> submit(Runnable task) {
+		task = wrap(task);
+		return getDelegate().submit(task);
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public final List invokeAll(Collection tasks) throws InterruptedException {
-        tasks = createTasks(tasks);
-        return getDelegate().invokeAll(tasks);
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public final List invokeAll(Collection tasks) throws InterruptedException {
+		tasks = createTasks(tasks);
+		return getDelegate().invokeAll(tasks);
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public final List invokeAll(Collection tasks, long timeout, TimeUnit unit)
-            throws InterruptedException {
-        tasks = createTasks(tasks);
-        return getDelegate().invokeAll(tasks, timeout, unit);
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public final List invokeAll(Collection tasks, long timeout, TimeUnit unit)
+			throws InterruptedException {
+		tasks = createTasks(tasks);
+		return getDelegate().invokeAll(tasks, timeout, unit);
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public final Object invokeAny(Collection tasks) throws InterruptedException, ExecutionException {
-        tasks = createTasks(tasks);
-        return getDelegate().invokeAny(tasks);
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public final Object invokeAny(Collection tasks) throws InterruptedException,
+			ExecutionException {
+		tasks = createTasks(tasks);
+		return getDelegate().invokeAny(tasks);
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public final Object invokeAny(Collection tasks, long timeout, TimeUnit unit)
-            throws InterruptedException, ExecutionException, TimeoutException {
-        tasks = createTasks(tasks);
-        return getDelegate().invokeAny(tasks, timeout, unit);
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public final Object invokeAny(Collection tasks, long timeout, TimeUnit unit)
+			throws InterruptedException, ExecutionException, TimeoutException {
+		tasks = createTasks(tasks);
+		return getDelegate().invokeAny(tasks, timeout, unit);
+	}
 
-    private <T> Collection<Callable<T>> createTasks(Collection<Callable<T>> tasks) {
-        if (tasks == null) {
-            return null;
-        }
-        List<Callable<T>> results = new ArrayList<Callable<T>>(tasks.size());
-        for (Callable<T> task : tasks) {
-            results.add(wrap(task));
-        }
-        return results;
-    }
+	private <T> Collection<Callable<T>> createTasks(Collection<Callable<T>> tasks) {
+		if (tasks == null) {
+			return null;
+		}
+		List<Callable<T>> results = new ArrayList<Callable<T>>(tasks.size());
+		for (Callable<T> task : tasks) {
+			results.add(wrap(task));
+		}
+		return results;
+	}
 
-    private ExecutorService getDelegate() {
-        return (ExecutorService) getDelegateExecutor();
-    }
+	private ExecutorService getDelegate() {
+		return (ExecutorService) getDelegateExecutor();
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
index 4bae805dfb..6674c8c6ec 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
@@ -17,66 +17,73 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
 /**
- * Wraps a delegate {@link Runnable} with logic for setting up a {@link SecurityContext} before invoking the delegate
- * {@link Runnable} and then removing the {@link SecurityContext} after the delegate has completed.
+ * Wraps a delegate {@link Runnable} with logic for setting up a {@link SecurityContext}
+ * before invoking the delegate {@link Runnable} and then removing the
+ * {@link SecurityContext} after the delegate has completed.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class DelegatingSecurityContextRunnable implements Runnable {
 
-    private final Runnable delegate;
+	private final Runnable delegate;
 
-    private final SecurityContext securityContext;
+	private final SecurityContext securityContext;
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextRunnable} with a specific {@link SecurityContext}.
-     * @param delegate the delegate {@link Runnable} to run with the specified {@link SecurityContext}. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to establish for the delegate {@link Runnable}. Cannot be
-     * null.
-     */
-    public DelegatingSecurityContextRunnable(Runnable delegate, SecurityContext securityContext) {
-        Assert.notNull(delegate, "delegate cannot be null");
-        Assert.notNull(securityContext, "securityContext cannot be null");
-        this.delegate = delegate;
-        this.securityContext = securityContext;
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextRunnable} with a specific
+	 * {@link SecurityContext}.
+	 * @param delegate the delegate {@link Runnable} to run with the specified
+	 * {@link SecurityContext}. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to establish for the delegate
+	 * {@link Runnable}. Cannot be null.
+	 */
+	public DelegatingSecurityContextRunnable(Runnable delegate,
+			SecurityContext securityContext) {
+		Assert.notNull(delegate, "delegate cannot be null");
+		Assert.notNull(securityContext, "securityContext cannot be null");
+		this.delegate = delegate;
+		this.securityContext = securityContext;
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextRunnable} with the {@link SecurityContext} from the
-     * {@link SecurityContextHolder}.
-     * @param delegate the delegate {@link Runnable} to run under the current {@link SecurityContext}. Cannot be null.
-     */
-    public DelegatingSecurityContextRunnable(Runnable delegate) {
-        this(delegate, SecurityContextHolder.getContext());
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextRunnable} with the
+	 * {@link SecurityContext} from the {@link SecurityContextHolder}.
+	 * @param delegate the delegate {@link Runnable} to run under the current
+	 * {@link SecurityContext}. Cannot be null.
+	 */
+	public DelegatingSecurityContextRunnable(Runnable delegate) {
+		this(delegate, SecurityContextHolder.getContext());
+	}
 
-    public void run() {
-        try {
-            SecurityContextHolder.setContext(securityContext);
-            delegate.run();
-        }
-        finally {
-            SecurityContextHolder.clearContext();
-        }
-    }
+	public void run() {
+		try {
+			SecurityContextHolder.setContext(securityContext);
+			delegate.run();
+		}
+		finally {
+			SecurityContextHolder.clearContext();
+		}
+	}
 
-    public String toString() {
-        return delegate.toString();
-    }
+	public String toString() {
+		return delegate.toString();
+	}
 
-    /**
-     * Factory method for creating a {@link DelegatingSecurityContextRunnable}.
-     *
-     * @param delegate the original {@link Runnable} that will be delegated to after establishing a
-     * {@link SecurityContext} on the {@link SecurityContextHolder}. Cannot have null.
-     * @param securityContext the {@link SecurityContext} to establish before invoking the delegate {@link Runnable}. If
-     * null, the current {@link SecurityContext} from the {@link SecurityContextHolder} will be used.
-     * @return
-     */
-    public static Runnable create(Runnable delegate, SecurityContext securityContext) {
-        Assert.notNull(delegate, "delegate cannot be  null");
-        return securityContext == null ? new DelegatingSecurityContextRunnable(delegate)
-                : new DelegatingSecurityContextRunnable(delegate, securityContext);
-    }
+	/**
+	 * Factory method for creating a {@link DelegatingSecurityContextRunnable}.
+	 *
+	 * @param delegate the original {@link Runnable} that will be delegated to after
+	 * establishing a {@link SecurityContext} on the {@link SecurityContextHolder}. Cannot
+	 * have null.
+	 * @param securityContext the {@link SecurityContext} to establish before invoking the
+	 * delegate {@link Runnable}. If null, the current {@link SecurityContext} from the
+	 * {@link SecurityContextHolder} will be used.
+	 * @return
+	 */
+	public static Runnable create(Runnable delegate, SecurityContext securityContext) {
+		Assert.notNull(delegate, "delegate cannot be  null");
+		return securityContext == null ? new DelegatingSecurityContextRunnable(delegate)
+				: new DelegatingSecurityContextRunnable(delegate, securityContext);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java
index 94f61396ef..eec7b5b079 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java
@@ -22,59 +22,67 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * An {@link ScheduledExecutorService} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable}
- * and each {@link Callable} in a {@link DelegatingSecurityContextCallable}.
+ * An {@link ScheduledExecutorService} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable} and each {@link Callable} in a
+ * {@link DelegatingSecurityContextCallable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class DelegatingSecurityContextScheduledExecutorService extends DelegatingSecurityContextExecutorService
-        implements ScheduledExecutorService {
-    /**
-     * Creates a new {@link DelegatingSecurityContextScheduledExecutorService} that uses the specified
-     * {@link SecurityContext}.
-     *
-     * @param delegateScheduledExecutorService the {@link ScheduledExecutorService} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} and
-     * each {@link DelegatingSecurityContextCallable}.
-     */
-    public DelegatingSecurityContextScheduledExecutorService(ScheduledExecutorService delegateScheduledExecutorService,
-            SecurityContext securityContext) {
-        super(delegateScheduledExecutorService, securityContext);
-    }
+public final class DelegatingSecurityContextScheduledExecutorService extends
+		DelegatingSecurityContextExecutorService implements ScheduledExecutorService {
+	/**
+	 * Creates a new {@link DelegatingSecurityContextScheduledExecutorService} that uses
+	 * the specified {@link SecurityContext}.
+	 *
+	 * @param delegateScheduledExecutorService the {@link ScheduledExecutorService} to
+	 * delegate to. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} and each
+	 * {@link DelegatingSecurityContextCallable}.
+	 */
+	public DelegatingSecurityContextScheduledExecutorService(
+			ScheduledExecutorService delegateScheduledExecutorService,
+			SecurityContext securityContext) {
+		super(delegateScheduledExecutorService, securityContext);
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextScheduledExecutorService} that uses the current
-     * {@link SecurityContext} from the {@link SecurityContextHolder}.
-     *
-     * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextScheduledExecutorService(ScheduledExecutorService delegate) {
-        this(delegate, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextScheduledExecutorService} that uses
+	 * the current {@link SecurityContext} from the {@link SecurityContextHolder}.
+	 *
+	 * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be
+	 * null.
+	 */
+	public DelegatingSecurityContextScheduledExecutorService(
+			ScheduledExecutorService delegate) {
+		this(delegate, null);
+	}
 
-    public final ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
-        command = wrap(command);
-        return getDelegate().schedule(command, delay, unit);
-    }
+	public final ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit unit) {
+		command = wrap(command);
+		return getDelegate().schedule(command, delay, unit);
+	}
 
-    public final <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
-        callable = wrap(callable);
-        return getDelegate().schedule(callable, delay, unit);
-    }
+	public final <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay,
+			TimeUnit unit) {
+		callable = wrap(callable);
+		return getDelegate().schedule(callable, delay, unit);
+	}
 
-    public final ScheduledFuture<?> scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) {
-        command = wrap(command);
-        return getDelegate().scheduleAtFixedRate(command, initialDelay, period, unit);
-    }
+	public final ScheduledFuture<?> scheduleAtFixedRate(Runnable command,
+			long initialDelay, long period, TimeUnit unit) {
+		command = wrap(command);
+		return getDelegate().scheduleAtFixedRate(command, initialDelay, period, unit);
+	}
 
-    public final ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay, long delay,
-            TimeUnit unit) {
-        command = wrap(command);
-        return getDelegate().scheduleWithFixedDelay(command, initialDelay, delay, unit);
-    }
+	public final ScheduledFuture<?> scheduleWithFixedDelay(Runnable command,
+			long initialDelay, long delay, TimeUnit unit) {
+		command = wrap(command);
+		return getDelegate().scheduleWithFixedDelay(command, initialDelay, delay, unit);
+	}
 
-    private ScheduledExecutorService getDelegate() {
-        return (ScheduledExecutorService) getDelegateExecutor();
-    }
+	private ScheduledExecutorService getDelegate() {
+		return (ScheduledExecutorService) getDelegateExecutor();
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java b/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java
index fa6ab215ac..64055545a5 100644
--- a/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java
+++ b/core/src/main/java/org/springframework/security/context/DelegatingApplicationListener.java
@@ -24,33 +24,38 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Used for delegating to a number of SmartApplicationListener instances. This is useful when needing to register an
- * SmartApplicationListener with the ApplicationContext programmatically.
+ * Used for delegating to a number of SmartApplicationListener instances. This is useful
+ * when needing to register an SmartApplicationListener with the ApplicationContext
+ * programmatically.
  *
  * @author Rob Winch
  */
-public final class DelegatingApplicationListener implements ApplicationListener<ApplicationEvent> {
-    private List<SmartApplicationListener> listeners = new ArrayList<SmartApplicationListener>();
+public final class DelegatingApplicationListener implements
+		ApplicationListener<ApplicationEvent> {
+	private List<SmartApplicationListener> listeners = new ArrayList<SmartApplicationListener>();
 
-    public void onApplicationEvent(ApplicationEvent event) {
-        if(event == null) {
-            return;
-        }
-        for(SmartApplicationListener listener : listeners) {
-            Object source = event.getSource();
-            if(source != null && listener.supportsEventType(event.getClass()) && listener.supportsSourceType(source.getClass())) {
-                listener.onApplicationEvent(event);
-            }
-        }
-    }
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event == null) {
+			return;
+		}
+		for (SmartApplicationListener listener : listeners) {
+			Object source = event.getSource();
+			if (source != null && listener.supportsEventType(event.getClass())
+					&& listener.supportsSourceType(source.getClass())) {
+				listener.onApplicationEvent(event);
+			}
+		}
+	}
 
-    /**
-     * Adds a new SmartApplicationListener to use.
-     *
-     * @param smartApplicationListener the SmartApplicationListener to use. Cannot be null.
-     */
-    public void addListener(SmartApplicationListener smartApplicationListener) {
-        Assert.notNull(smartApplicationListener, "smartApplicationListener cannot be null");
-        listeners.add(smartApplicationListener);
-    }
+	/**
+	 * Adds a new SmartApplicationListener to use.
+	 *
+	 * @param smartApplicationListener the SmartApplicationListener to use. Cannot be
+	 * null.
+	 */
+	public void addListener(SmartApplicationListener smartApplicationListener) {
+		Assert.notNull(smartApplicationListener,
+				"smartApplicationListener cannot be null");
+		listeners.add(smartApplicationListener);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/Authentication.java b/core/src/main/java/org/springframework/security/core/Authentication.java
index cc106d5939..42024e7d59 100644
--- a/core/src/main/java/org/springframework/security/core/Authentication.java
+++ b/core/src/main/java/org/springframework/security/core/Authentication.java
@@ -23,105 +23,121 @@ import java.util.Collection;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-
 /**
- * Represents the token for an authentication request or for an authenticated principal once the request has been
- * processed by the {@link AuthenticationManager#authenticate(Authentication)} method.
+ * Represents the token for an authentication request or for an authenticated principal
+ * once the request has been processed by the
+ * {@link AuthenticationManager#authenticate(Authentication)} method.
  * <p>
- * Once the request has been authenticated, the <tt>Authentication</tt> will usually be stored in a thread-local
- * <tt>SecurityContext</tt> managed by the {@link SecurityContextHolder} by the authentication mechanism which is
- * being used. An explicit authentication can be achieved, without using one of Spring Security's authentication
- * mechanisms, by creating an <tt>Authentication</tt> instance and using the code:
+ * Once the request has been authenticated, the <tt>Authentication</tt> will usually be
+ * stored in a thread-local <tt>SecurityContext</tt> managed by the
+ * {@link SecurityContextHolder} by the authentication mechanism which is being used. An
+ * explicit authentication can be achieved, without using one of Spring Security's
+ * authentication mechanisms, by creating an <tt>Authentication</tt> instance and using
+ * the code:
  *
  * <pre>
  * SecurityContextHolder.getContext().setAuthentication(anAuthentication);
  * </pre>
- * Note that unless the <tt>Authentication</tt> has the <tt>authenticated</tt> property set to <tt>true</tt>, it will
- * still be authenticated by any security interceptor (for method or web invocations) which encounters it.
+ * 
+ * Note that unless the <tt>Authentication</tt> has the <tt>authenticated</tt> property
+ * set to <tt>true</tt>, it will still be authenticated by any security interceptor (for
+ * method or web invocations) which encounters it.
  * <p>
- * In most cases, the framework transparently takes care of managing the security context and authentication objects
- * for you.
+ * In most cases, the framework transparently takes care of managing the security context
+ * and authentication objects for you.
  *
  * @author Ben Alex
  */
 public interface Authentication extends Principal, Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Set by an <code>AuthenticationManager</code> to indicate the authorities that the principal has been
-     * granted. Note that classes should not rely on this value as being valid unless it has been set by a trusted
-     * <code>AuthenticationManager</code>.
-     * <p>
-     * Implementations should ensure that modifications to the returned collection
-     * array do not affect the state of the Authentication object, or use an unmodifiable instance.
-     * </p>
-     *
-     * @return the authorities granted to the principal, or an empty collection if the token has not been authenticated.
-     * Never null.
-     */
-    Collection<? extends GrantedAuthority> getAuthorities();
+	/**
+	 * Set by an <code>AuthenticationManager</code> to indicate the authorities that the
+	 * principal has been granted. Note that classes should not rely on this value as
+	 * being valid unless it has been set by a trusted <code>AuthenticationManager</code>.
+	 * <p>
+	 * Implementations should ensure that modifications to the returned collection array
+	 * do not affect the state of the Authentication object, or use an unmodifiable
+	 * instance.
+	 * </p>
+	 *
+	 * @return the authorities granted to the principal, or an empty collection if the
+	 * token has not been authenticated. Never null.
+	 */
+	Collection<? extends GrantedAuthority> getAuthorities();
 
-    /**
-     * The credentials that prove the principal is correct. This is usually a password, but could be anything
-     * relevant to the <code>AuthenticationManager</code>. Callers are expected to populate the credentials.
-     *
-     * @return the credentials that prove the identity of the <code>Principal</code>
-     */
-    Object getCredentials();
+	/**
+	 * The credentials that prove the principal is correct. This is usually a password,
+	 * but could be anything relevant to the <code>AuthenticationManager</code>. Callers
+	 * are expected to populate the credentials.
+	 *
+	 * @return the credentials that prove the identity of the <code>Principal</code>
+	 */
+	Object getCredentials();
 
-    /**
-     * Stores additional details about the authentication request. These might be an IP address, certificate
-     * serial number etc.
-     *
-     * @return additional details about the authentication request, or <code>null</code> if not used
-     */
-    Object getDetails();
+	/**
+	 * Stores additional details about the authentication request. These might be an IP
+	 * address, certificate serial number etc.
+	 *
+	 * @return additional details about the authentication request, or <code>null</code>
+	 * if not used
+	 */
+	Object getDetails();
 
-    /**
-     * The identity of the principal being authenticated. In the case of an authentication request with username and
-     * password, this would be the username. Callers are expected to populate the principal for an authentication
-     * request.
-     * <p>
-     * The <tt>AuthenticationManager</tt> implementation will often return an <tt>Authentication</tt> containing
-     * richer information as the principal for use by the application. Many of the authentication providers will
-     * create a {@code UserDetails} object as the principal.
-     *
-     * @return the <code>Principal</code> being authenticated or the authenticated principal after authentication.
-     */
-    Object getPrincipal();
+	/**
+	 * The identity of the principal being authenticated. In the case of an authentication
+	 * request with username and password, this would be the username. Callers are
+	 * expected to populate the principal for an authentication request.
+	 * <p>
+	 * The <tt>AuthenticationManager</tt> implementation will often return an
+	 * <tt>Authentication</tt> containing richer information as the principal for use by
+	 * the application. Many of the authentication providers will create a
+	 * {@code UserDetails} object as the principal.
+	 *
+	 * @return the <code>Principal</code> being authenticated or the authenticated
+	 * principal after authentication.
+	 */
+	Object getPrincipal();
 
-    /**
-     * Used to indicate to {@code AbstractSecurityInterceptor} whether it should present the
-     * authentication token to the <code>AuthenticationManager</code>. Typically an <code>AuthenticationManager</code>
-     * (or, more often, one of its <code>AuthenticationProvider</code>s) will return an immutable authentication token
-     * after successful authentication, in which case that token can safely return <code>true</code> to this method.
-     * Returning <code>true</code> will improve performance, as calling the <code>AuthenticationManager</code> for
-     * every request will no longer be necessary.
-     * <p>
-     * For security reasons, implementations of this interface should be very careful about returning
-     * <code>true</code> from this method unless they are either immutable, or have some way of ensuring the properties
-     * have not been changed since original creation.
-     *
-     * @return true if the token has been authenticated and the <code>AbstractSecurityInterceptor</code> does not need
-     *         to present the token to the <code>AuthenticationManager</code> again for re-authentication.
-     */
-    boolean isAuthenticated();
+	/**
+	 * Used to indicate to {@code AbstractSecurityInterceptor} whether it should present
+	 * the authentication token to the <code>AuthenticationManager</code>. Typically an
+	 * <code>AuthenticationManager</code> (or, more often, one of its
+	 * <code>AuthenticationProvider</code>s) will return an immutable authentication token
+	 * after successful authentication, in which case that token can safely return
+	 * <code>true</code> to this method. Returning <code>true</code> will improve
+	 * performance, as calling the <code>AuthenticationManager</code> for every request
+	 * will no longer be necessary.
+	 * <p>
+	 * For security reasons, implementations of this interface should be very careful
+	 * about returning <code>true</code> from this method unless they are either
+	 * immutable, or have some way of ensuring the properties have not been changed since
+	 * original creation.
+	 *
+	 * @return true if the token has been authenticated and the
+	 * <code>AbstractSecurityInterceptor</code> does not need to present the token to the
+	 * <code>AuthenticationManager</code> again for re-authentication.
+	 */
+	boolean isAuthenticated();
 
-    /**
-     * See {@link #isAuthenticated()} for a full description.
-     * <p>
-     * Implementations should <b>always</b> allow this method to be called with a <code>false</code> parameter,
-     * as this is used by various classes to specify the authentication token should not be trusted.
-     * If an implementation wishes to reject an invocation with a <code>true</code> parameter (which would indicate
-     * the authentication token is trusted - a potential security risk) the implementation should throw an
-     * {@link IllegalArgumentException}.
-     *
-     * @param isAuthenticated <code>true</code> if the token should be trusted (which may result in an exception) or
-     *        <code>false</code> if the token should not be trusted
-     *
-     * @throws IllegalArgumentException if an attempt to make the authentication token trusted (by passing
-     *         <code>true</code> as the argument) is rejected due to the implementation being immutable or
-     *         implementing its own alternative approach to {@link #isAuthenticated()}
-     */
-    void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException;
+	/**
+	 * See {@link #isAuthenticated()} for a full description.
+	 * <p>
+	 * Implementations should <b>always</b> allow this method to be called with a
+	 * <code>false</code> parameter, as this is used by various classes to specify the
+	 * authentication token should not be trusted. If an implementation wishes to reject
+	 * an invocation with a <code>true</code> parameter (which would indicate the
+	 * authentication token is trusted - a potential security risk) the implementation
+	 * should throw an {@link IllegalArgumentException}.
+	 *
+	 * @param isAuthenticated <code>true</code> if the token should be trusted (which may
+	 * result in an exception) or <code>false</code> if the token should not be trusted
+	 *
+	 * @throws IllegalArgumentException if an attempt to make the authentication token
+	 * trusted (by passing <code>true</code> as the argument) is rejected due to the
+	 * implementation being immutable or implementing its own alternative approach to
+	 * {@link #isAuthenticated()}
+	 */
+	void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException;
 }
diff --git a/core/src/main/java/org/springframework/security/core/AuthenticationException.java b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
index 74f27234a2..60a90940f0 100644
--- a/core/src/main/java/org/springframework/security/core/AuthenticationException.java
+++ b/core/src/main/java/org/springframework/security/core/AuthenticationException.java
@@ -16,32 +16,35 @@
 package org.springframework.security.core;
 
 /**
- * Abstract superclass for all exceptions related to an {@link Authentication} object being invalid for whatever
- * reason.
+ * Abstract superclass for all exceptions related to an {@link Authentication} object
+ * being invalid for whatever reason.
  *
  * @author Ben Alex
  */
 public abstract class AuthenticationException extends RuntimeException {
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs an {@code AuthenticationException} with the specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t the root cause
-     */
-    public AuthenticationException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs an {@code AuthenticationException} with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message
+	 * @param t the root cause
+	 */
+	public AuthenticationException(String msg, Throwable t) {
+		super(msg, t);
+	}
 
-    /**
-     * Constructs an {@code AuthenticationException} with the specified message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public AuthenticationException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an {@code AuthenticationException} with the specified message and no
+	 * root cause.
+	 *
+	 * @param msg the detail message
+	 */
+	public AuthenticationException(String msg) {
+		super(msg);
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
index dc3c03c833..c90cd41cad 100644
--- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java
+++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java
@@ -32,438 +32,391 @@ import java.util.Stack;
 /**
  * Generic implementation of version comparison.
  *
- * NOTE: This is a copy from https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
+ * NOTE: This is a copy from
+ * https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.1.0
+ * /maven-artifact/src/main/
+ * java/org/apache/maven/artifact/versioning/ComparableVersion.java
  *
- * <p>Features:
+ * <p>
+ * Features:
  * <ul>
  * <li>mixing of '<code>-</code>' (dash) and '<code>.</code>' (dot) separators,</li>
  * <li>transition between characters and digits also constitutes a separator:
- *     <code>1.0alpha1 =&gt; [1, 0, alpha, 1]</code></li>
+ * <code>1.0alpha1 =&gt; [1, 0, alpha, 1]</code></li>
  * <li>unlimited number of version components,</li>
  * <li>version components in the text can be digits or strings,</li>
- * <li>strings are checked for well-known qualifiers and the qualifier ordering is used for version ordering.
- *     Well-known qualifiers (case insensitive) are:<ul>
- *     <li><code>alpha</code> or <code>a</code></li>
- *     <li><code>beta</code> or <code>b</code></li>
- *     <li><code>milestone</code> or <code>m</code></li>
- *     <li><code>rc</code> or <code>cr</code></li>
- *     <li><code>snapshot</code></li>
- *     <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
- *     <li><code>sp</code></li>
- *     </ul>
- *     Unknown qualifiers are considered after known qualifiers, with lexical order (always case insensitive),
- *   </li>
- * <li>a dash usually precedes a qualifier, and is always less important than something preceded with a dot.</li>
- * </ul></p>
+ * <li>strings are checked for well-known qualifiers and the qualifier ordering is used
+ * for version ordering. Well-known qualifiers (case insensitive) are:
+ * <ul>
+ * <li><code>alpha</code> or <code>a</code></li>
+ * <li><code>beta</code> or <code>b</code></li>
+ * <li><code>milestone</code> or <code>m</code></li>
+ * <li><code>rc</code> or <code>cr</code></li>
+ * <li><code>snapshot</code></li>
+ * <li><code>(the empty string)</code> or <code>ga</code> or <code>final</code></li>
+ * <li><code>sp</code></li>
+ * </ul>
+ * Unknown qualifiers are considered after known qualifiers, with lexical order (always
+ * case insensitive),</li>
+ * <li>a dash usually precedes a qualifier, and is always less important than something
+ * preceded with a dot.</li>
+ * </ul>
+ * </p>
  *
- * @see <a href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on Maven Wiki</a>
+ * @see <a
+ * href="https://cwiki.apache.org/confluence/display/MAVENOLD/Versioning">"Versioning" on
+ * Maven Wiki</a>
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
  * @author <a href="mailto:hboutemy@apache.org">Hervé Boutemy</a>
  */
-class ComparableVersion
-        implements Comparable<ComparableVersion>
-{
-    private String value;
-
-    private String canonical;
-
-    private ListItem items;
-
-    private interface Item
-    {
-        final int INTEGER_ITEM = 0;
-        final int STRING_ITEM = 1;
-        final int LIST_ITEM = 2;
-
-        int compareTo( Item item );
-
-        int getType();
-
-        boolean isNull();
-    }
-
-    /**
-     * Represents a numeric item in the version item list.
-     */
-    private static class IntegerItem
-            implements Item
-    {
-        private static final BigInteger BigInteger_ZERO = new BigInteger( "0" );
-
-        private final BigInteger value;
-
-        public static final IntegerItem ZERO = new IntegerItem();
-
-        private IntegerItem()
-        {
-            this.value = BigInteger_ZERO;
-        }
-
-        public IntegerItem( String str )
-        {
-            this.value = new BigInteger( str );
-        }
-
-        public int getType()
-        {
-            return INTEGER_ITEM;
-        }
-
-        public boolean isNull()
-        {
-            return BigInteger_ZERO.equals( value );
-        }
-
-        public int compareTo( Item item )
-        {
-            if ( item == null )
-            {
-                return BigInteger_ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
-            }
-
-            switch ( item.getType() )
-            {
-                case INTEGER_ITEM:
-                    return value.compareTo( ( (IntegerItem) item ).value );
-
-                case STRING_ITEM:
-                    return 1; // 1.1 > 1-sp
-
-                case LIST_ITEM:
-                    return 1; // 1.1 > 1-1
-
-                default:
-                    throw new RuntimeException( "invalid item: " + item.getClass() );
-            }
-        }
-
-        public String toString()
-        {
-            return value.toString();
-        }
-    }
-
-    /**
-     * Represents a string in the version item list, usually a qualifier.
-     */
-    private static class StringItem
-            implements Item
-    {
-        private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc", "snapshot", "", "sp" };
-
-        private static final List<String> _QUALIFIERS = Arrays.asList( QUALIFIERS );
-
-        private static final Properties ALIASES = new Properties();
-        static
-        {
-            ALIASES.put( "ga", "" );
-            ALIASES.put( "final", "" );
-            ALIASES.put( "cr", "rc" );
-        }
-
-        /**
-         * A comparable value for the empty-string qualifier. This one is used to determine if a given qualifier makes
-         * the version older than one without a qualifier, or more recent.
-         */
-        private static final String RELEASE_VERSION_INDEX = String.valueOf( _QUALIFIERS.indexOf( "" ) );
-
-        private String value;
-
-        public StringItem( String value, boolean followedByDigit )
-        {
-            if ( followedByDigit && value.length() == 1 )
-            {
-                // a1 = alpha-1, b1 = beta-1, m1 = milestone-1
-                switch ( value.charAt( 0 ) )
-                {
-                    case 'a':
-                        value = "alpha";
-                        break;
-                    case 'b':
-                        value = "beta";
-                        break;
-                    case 'm':
-                        value = "milestone";
-                        break;
-                }
-            }
-            this.value = ALIASES.getProperty( value , value );
-        }
-
-        public int getType()
-        {
-            return STRING_ITEM;
-        }
-
-        public boolean isNull()
-        {
-            return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 );
-        }
-
-        /**
-         * Returns a comparable value for a qualifier.
-         *
-         * This method takes into account the ordering of known qualifiers then unknown qualifiers with lexical ordering.
-         *
-         * just returning an Integer with the index here is faster, but requires a lot of if/then/else to check for -1
-         * or QUALIFIERS.size and then resort to lexical ordering. Most comparisons are decided by the first character,
-         * so this is still fast. If more characters are needed then it requires a lexical sort anyway.
-         *
-         * @param qualifier
-         * @return an equivalent value that can be used with lexical comparison
-         */
-        public static String comparableQualifier( String qualifier )
-        {
-            int i = _QUALIFIERS.indexOf( qualifier );
-
-            return i == -1 ? ( _QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i );
-        }
-
-        public int compareTo( Item item )
-        {
-            if ( item == null )
-            {
-                // 1-rc < 1, 1-ga > 1
-                return comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX );
-            }
-            switch ( item.getType() )
-            {
-                case INTEGER_ITEM:
-                    return -1; // 1.any < 1.1 ?
-
-                case STRING_ITEM:
-                    return comparableQualifier( value ).compareTo( comparableQualifier( ( (StringItem) item ).value ) );
-
-                case LIST_ITEM:
-                    return -1; // 1.any < 1-1
-
-                default:
-                    throw new RuntimeException( "invalid item: " + item.getClass() );
-            }
-        }
-
-        public String toString()
-        {
-            return value;
-        }
-    }
-
-    /**
-     * Represents a version list item. This class is used both for the global item list and for sub-lists (which start
-     * with '-(number)' in the version specification).
-     */
-    private static class ListItem
-            extends ArrayList<Item>
-            implements Item
-    {
-        public int getType()
-        {
-            return LIST_ITEM;
-        }
-
-        public boolean isNull()
-        {
-            return ( size() == 0 );
-        }
-
-        void normalize()
-        {
-            for( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); )
-            {
-                Item item = iterator.previous();
-                if ( item.isNull() )
-                {
-                    iterator.remove(); // remove null trailing items: 0, "", empty list
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        public int compareTo( Item item )
-        {
-            if ( item == null )
-            {
-                if ( size() == 0 )
-                {
-                    return 0; // 1-0 = 1- (normalize) = 1
-                }
-                Item first = get( 0 );
-                return first.compareTo( null );
-            }
-            switch ( item.getType() )
-            {
-                case INTEGER_ITEM:
-                    return -1; // 1-1 < 1.0.x
-
-                case STRING_ITEM:
-                    return 1; // 1-1 > 1-sp
-
-                case LIST_ITEM:
-                    Iterator<Item> left = iterator();
-                    Iterator<Item> right = ( (ListItem) item ).iterator();
-
-                    while ( left.hasNext() || right.hasNext() )
-                    {
-                        Item l = left.hasNext() ? left.next() : null;
-                        Item r = right.hasNext() ? right.next() : null;
-
-                        // if this is shorter, then invert the compare and mul with -1
-                        int result = l == null ? -1 * r.compareTo( l ) : l.compareTo( r );
-
-                        if ( result != 0 )
-                        {
-                            return result;
-                        }
-                    }
-
-                    return 0;
-
-                default:
-                    throw new RuntimeException( "invalid item: " + item.getClass() );
-            }
-        }
-
-        public String toString()
-        {
-            StringBuilder buffer = new StringBuilder( "(" );
-            for( Iterator<Item> iter = iterator(); iter.hasNext(); )
-            {
-                buffer.append( iter.next() );
-                if ( iter.hasNext() )
-                {
-                    buffer.append( ',' );
-                }
-            }
-            buffer.append( ')' );
-            return buffer.toString();
-        }
-    }
-
-    public ComparableVersion( String version )
-    {
-        parseVersion( version );
-    }
-
-    public final void parseVersion( String version )
-    {
-        this.value = version;
-
-        items = new ListItem();
-
-        version = version.toLowerCase( Locale.ENGLISH );
-
-        ListItem list = items;
-
-        Stack<Item> stack = new Stack<Item>();
-        stack.push( list );
-
-        boolean isDigit = false;
-
-        int startIndex = 0;
-
-        for ( int i = 0; i < version.length(); i++ )
-        {
-            char c = version.charAt( i );
-
-            if ( c == '.' )
-            {
-                if ( i == startIndex )
-                {
-                    list.add( IntegerItem.ZERO );
-                }
-                else
-                {
-                    list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
-                }
-                startIndex = i + 1;
-            }
-            else if ( c == '-' )
-            {
-                if ( i == startIndex )
-                {
-                    list.add( IntegerItem.ZERO );
-                }
-                else
-                {
-                    list.add( parseItem( isDigit, version.substring( startIndex, i ) ) );
-                }
-                startIndex = i + 1;
-
-                if ( isDigit )
-                {
-                    list.normalize(); // 1.0-* = 1-*
-
-                    if ( ( i + 1 < version.length() ) && Character.isDigit( version.charAt( i + 1 ) ) )
-                    {
-                        // new ListItem only if previous were digits and new char is a digit,
-                        // ie need to differentiate only 1.1 from 1-1
-                        list.add( list = new ListItem() );
-
-                        stack.push( list );
-                    }
-                }
-            }
-            else if ( Character.isDigit( c ) )
-            {
-                if ( !isDigit && i > startIndex )
-                {
-                    list.add( new StringItem( version.substring( startIndex, i ), true ) );
-                    startIndex = i;
-                }
-
-                isDigit = true;
-            }
-            else
-            {
-                if ( isDigit && i > startIndex )
-                {
-                    list.add( parseItem( true, version.substring( startIndex, i ) ) );
-                    startIndex = i;
-                }
-
-                isDigit = false;
-            }
-        }
-
-        if ( version.length() > startIndex )
-        {
-            list.add( parseItem( isDigit, version.substring( startIndex ) ) );
-        }
-
-        while ( !stack.isEmpty() )
-        {
-            list = (ListItem) stack.pop();
-            list.normalize();
-        }
-
-        canonical = items.toString();
-    }
-
-    private static Item parseItem( boolean isDigit, String buf )
-    {
-        return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false );
-    }
-
-    public int compareTo( ComparableVersion o )
-    {
-        return items.compareTo( o.items );
-    }
-
-    public String toString()
-    {
-        return value;
-    }
-
-    public boolean equals( Object o )
-    {
-        return ( o instanceof ComparableVersion ) && canonical.equals( ( (ComparableVersion) o ).canonical );
-    }
-
-    public int hashCode()
-    {
-        return canonical.hashCode();
-    }
+class ComparableVersion implements Comparable<ComparableVersion> {
+	private String value;
+
+	private String canonical;
+
+	private ListItem items;
+
+	private interface Item {
+		final int INTEGER_ITEM = 0;
+		final int STRING_ITEM = 1;
+		final int LIST_ITEM = 2;
+
+		int compareTo(Item item);
+
+		int getType();
+
+		boolean isNull();
+	}
+
+	/**
+	 * Represents a numeric item in the version item list.
+	 */
+	private static class IntegerItem implements Item {
+		private static final BigInteger BigInteger_ZERO = new BigInteger("0");
+
+		private final BigInteger value;
+
+		public static final IntegerItem ZERO = new IntegerItem();
+
+		private IntegerItem() {
+			this.value = BigInteger_ZERO;
+		}
+
+		public IntegerItem(String str) {
+			this.value = new BigInteger(str);
+		}
+
+		public int getType() {
+			return INTEGER_ITEM;
+		}
+
+		public boolean isNull() {
+			return BigInteger_ZERO.equals(value);
+		}
+
+		public int compareTo(Item item) {
+			if (item == null) {
+				return BigInteger_ZERO.equals(value) ? 0 : 1; // 1.0 == 1, 1.1 > 1
+			}
+
+			switch (item.getType()) {
+			case INTEGER_ITEM:
+				return value.compareTo(((IntegerItem) item).value);
+
+			case STRING_ITEM:
+				return 1; // 1.1 > 1-sp
+
+			case LIST_ITEM:
+				return 1; // 1.1 > 1-1
+
+			default:
+				throw new RuntimeException("invalid item: " + item.getClass());
+			}
+		}
+
+		public String toString() {
+			return value.toString();
+		}
+	}
+
+	/**
+	 * Represents a string in the version item list, usually a qualifier.
+	 */
+	private static class StringItem implements Item {
+		private static final String[] QUALIFIERS = { "alpha", "beta", "milestone", "rc",
+				"snapshot", "", "sp" };
+
+		private static final List<String> _QUALIFIERS = Arrays.asList(QUALIFIERS);
+
+		private static final Properties ALIASES = new Properties();
+		static {
+			ALIASES.put("ga", "");
+			ALIASES.put("final", "");
+			ALIASES.put("cr", "rc");
+		}
+
+		/**
+		 * A comparable value for the empty-string qualifier. This one is used to
+		 * determine if a given qualifier makes the version older than one without a
+		 * qualifier, or more recent.
+		 */
+		private static final String RELEASE_VERSION_INDEX = String.valueOf(_QUALIFIERS
+				.indexOf(""));
+
+		private String value;
+
+		public StringItem(String value, boolean followedByDigit) {
+			if (followedByDigit && value.length() == 1) {
+				// a1 = alpha-1, b1 = beta-1, m1 = milestone-1
+				switch (value.charAt(0)) {
+				case 'a':
+					value = "alpha";
+					break;
+				case 'b':
+					value = "beta";
+					break;
+				case 'm':
+					value = "milestone";
+					break;
+				}
+			}
+			this.value = ALIASES.getProperty(value, value);
+		}
+
+		public int getType() {
+			return STRING_ITEM;
+		}
+
+		public boolean isNull() {
+			return (comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX) == 0);
+		}
+
+		/**
+		 * Returns a comparable value for a qualifier.
+		 *
+		 * This method takes into account the ordering of known qualifiers then unknown
+		 * qualifiers with lexical ordering.
+		 *
+		 * just returning an Integer with the index here is faster, but requires a lot of
+		 * if/then/else to check for -1 or QUALIFIERS.size and then resort to lexical
+		 * ordering. Most comparisons are decided by the first character, so this is still
+		 * fast. If more characters are needed then it requires a lexical sort anyway.
+		 *
+		 * @param qualifier
+		 * @return an equivalent value that can be used with lexical comparison
+		 */
+		public static String comparableQualifier(String qualifier) {
+			int i = _QUALIFIERS.indexOf(qualifier);
+
+			return i == -1 ? (_QUALIFIERS.size() + "-" + qualifier) : String.valueOf(i);
+		}
+
+		public int compareTo(Item item) {
+			if (item == null) {
+				// 1-rc < 1, 1-ga > 1
+				return comparableQualifier(value).compareTo(RELEASE_VERSION_INDEX);
+			}
+			switch (item.getType()) {
+			case INTEGER_ITEM:
+				return -1; // 1.any < 1.1 ?
+
+			case STRING_ITEM:
+				return comparableQualifier(value).compareTo(
+						comparableQualifier(((StringItem) item).value));
+
+			case LIST_ITEM:
+				return -1; // 1.any < 1-1
+
+			default:
+				throw new RuntimeException("invalid item: " + item.getClass());
+			}
+		}
+
+		public String toString() {
+			return value;
+		}
+	}
+
+	/**
+	 * Represents a version list item. This class is used both for the global item list
+	 * and for sub-lists (which start with '-(number)' in the version specification).
+	 */
+	private static class ListItem extends ArrayList<Item> implements Item {
+		public int getType() {
+			return LIST_ITEM;
+		}
+
+		public boolean isNull() {
+			return (size() == 0);
+		}
+
+		void normalize() {
+			for (ListIterator<Item> iterator = listIterator(size()); iterator
+					.hasPrevious();) {
+				Item item = iterator.previous();
+				if (item.isNull()) {
+					iterator.remove(); // remove null trailing items: 0, "", empty list
+				}
+				else {
+					break;
+				}
+			}
+		}
+
+		public int compareTo(Item item) {
+			if (item == null) {
+				if (size() == 0) {
+					return 0; // 1-0 = 1- (normalize) = 1
+				}
+				Item first = get(0);
+				return first.compareTo(null);
+			}
+			switch (item.getType()) {
+			case INTEGER_ITEM:
+				return -1; // 1-1 < 1.0.x
+
+			case STRING_ITEM:
+				return 1; // 1-1 > 1-sp
+
+			case LIST_ITEM:
+				Iterator<Item> left = iterator();
+				Iterator<Item> right = ((ListItem) item).iterator();
+
+				while (left.hasNext() || right.hasNext()) {
+					Item l = left.hasNext() ? left.next() : null;
+					Item r = right.hasNext() ? right.next() : null;
+
+					// if this is shorter, then invert the compare and mul with -1
+					int result = l == null ? -1 * r.compareTo(l) : l.compareTo(r);
+
+					if (result != 0) {
+						return result;
+					}
+				}
+
+				return 0;
+
+			default:
+				throw new RuntimeException("invalid item: " + item.getClass());
+			}
+		}
+
+		public String toString() {
+			StringBuilder buffer = new StringBuilder("(");
+			for (Iterator<Item> iter = iterator(); iter.hasNext();) {
+				buffer.append(iter.next());
+				if (iter.hasNext()) {
+					buffer.append(',');
+				}
+			}
+			buffer.append(')');
+			return buffer.toString();
+		}
+	}
+
+	public ComparableVersion(String version) {
+		parseVersion(version);
+	}
+
+	public final void parseVersion(String version) {
+		this.value = version;
+
+		items = new ListItem();
+
+		version = version.toLowerCase(Locale.ENGLISH);
+
+		ListItem list = items;
+
+		Stack<Item> stack = new Stack<Item>();
+		stack.push(list);
+
+		boolean isDigit = false;
+
+		int startIndex = 0;
+
+		for (int i = 0; i < version.length(); i++) {
+			char c = version.charAt(i);
+
+			if (c == '.') {
+				if (i == startIndex) {
+					list.add(IntegerItem.ZERO);
+				}
+				else {
+					list.add(parseItem(isDigit, version.substring(startIndex, i)));
+				}
+				startIndex = i + 1;
+			}
+			else if (c == '-') {
+				if (i == startIndex) {
+					list.add(IntegerItem.ZERO);
+				}
+				else {
+					list.add(parseItem(isDigit, version.substring(startIndex, i)));
+				}
+				startIndex = i + 1;
+
+				if (isDigit) {
+					list.normalize(); // 1.0-* = 1-*
+
+					if ((i + 1 < version.length())
+							&& Character.isDigit(version.charAt(i + 1))) {
+						// new ListItem only if previous were digits and new char is a
+						// digit,
+						// ie need to differentiate only 1.1 from 1-1
+						list.add(list = new ListItem());
+
+						stack.push(list);
+					}
+				}
+			}
+			else if (Character.isDigit(c)) {
+				if (!isDigit && i > startIndex) {
+					list.add(new StringItem(version.substring(startIndex, i), true));
+					startIndex = i;
+				}
+
+				isDigit = true;
+			}
+			else {
+				if (isDigit && i > startIndex) {
+					list.add(parseItem(true, version.substring(startIndex, i)));
+					startIndex = i;
+				}
+
+				isDigit = false;
+			}
+		}
+
+		if (version.length() > startIndex) {
+			list.add(parseItem(isDigit, version.substring(startIndex)));
+		}
+
+		while (!stack.isEmpty()) {
+			list = (ListItem) stack.pop();
+			list.normalize();
+		}
+
+		canonical = items.toString();
+	}
+
+	private static Item parseItem(boolean isDigit, String buf) {
+		return isDigit ? new IntegerItem(buf) : new StringItem(buf, false);
+	}
+
+	public int compareTo(ComparableVersion o) {
+		return items.compareTo(o.items);
+	}
+
+	public String toString() {
+		return value;
+	}
+
+	public boolean equals(Object o) {
+		return (o instanceof ComparableVersion)
+				&& canonical.equals(((ComparableVersion) o).canonical);
+	}
+
+	public int hashCode() {
+		return canonical.hashCode();
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/core/CredentialsContainer.java b/core/src/main/java/org/springframework/security/core/CredentialsContainer.java
index cb78215144..a81cd05c56 100644
--- a/core/src/main/java/org/springframework/security/core/CredentialsContainer.java
+++ b/core/src/main/java/org/springframework/security/core/CredentialsContainer.java
@@ -1,17 +1,18 @@
 package org.springframework.security.core;
 
 /**
- * Indicates that the implementing object contains sensitive data, which can be erased using the
- * {@code eraseCredentials} method. Implementations are expected to invoke the method on any internal objects
- * which may also implement this interface.
+ * Indicates that the implementing object contains sensitive data, which can be erased
+ * using the {@code eraseCredentials} method. Implementations are expected to invoke the
+ * method on any internal objects which may also implement this interface.
  * <p>
- * For internal framework use only. Users who are writing their own {@code AuthenticationProvider} implementations
- * should create and return an appropriate {@code Authentication} object there, minus any sensitive data,
- * rather than using this interface.
+ * For internal framework use only. Users who are writing their own
+ * {@code AuthenticationProvider} implementations should create and return an appropriate
+ * {@code Authentication} object there, minus any sensitive data, rather than using this
+ * interface.
  *
  * @author Luke Taylor
  * @since 3.0.3
  */
 public interface CredentialsContainer {
-    void eraseCredentials();
+	void eraseCredentials();
 }
diff --git a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java
index cfdd92dd7a..bf2c28b183 100644
--- a/core/src/main/java/org/springframework/security/core/GrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/core/GrantedAuthority.java
@@ -23,27 +23,30 @@ import org.springframework.security.access.AccessDecisionManager;
  * Represents an authority granted to an {@link Authentication} object.
  *
  * <p>
- * A <code>GrantedAuthority</code> must either represent itself as a
- * <code>String</code> or be specifically supported by an  {@link
- * AccessDecisionManager}.
+ * A <code>GrantedAuthority</code> must either represent itself as a <code>String</code>
+ * or be specifically supported by an {@link AccessDecisionManager}.
  *
  * @author Ben Alex
  */
 public interface GrantedAuthority extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * If the <code>GrantedAuthority</code> can be represented as a <code>String</code> and that
-     * <code>String</code> is sufficient in precision to be relied upon for an access control decision by an {@link
-     * AccessDecisionManager} (or delegate), this method should return such a <code>String</code>.
-     * <p>
-     * If the <code>GrantedAuthority</code> cannot be expressed with sufficient precision as a <code>String</code>,
-     * <code>null</code> should be returned. Returning <code>null</code> will require an
-     * <code>AccessDecisionManager</code> (or delegate) to specifically support the <code>GrantedAuthority</code>
-     * implementation, so returning <code>null</code> should be avoided unless actually required.
-     *
-     * @return a representation of the granted authority (or <code>null</code> if the granted authority cannot be
-     *         expressed as a <code>String</code> with sufficient precision).
-     */
-    String getAuthority();
+	/**
+	 * If the <code>GrantedAuthority</code> can be represented as a <code>String</code>
+	 * and that <code>String</code> is sufficient in precision to be relied upon for an
+	 * access control decision by an {@link AccessDecisionManager} (or delegate), this
+	 * method should return such a <code>String</code>.
+	 * <p>
+	 * If the <code>GrantedAuthority</code> cannot be expressed with sufficient precision
+	 * as a <code>String</code>, <code>null</code> should be returned. Returning
+	 * <code>null</code> will require an <code>AccessDecisionManager</code> (or delegate)
+	 * to specifically support the <code>GrantedAuthority</code> implementation, so
+	 * returning <code>null</code> should be avoided unless actually required.
+	 *
+	 * @return a representation of the granted authority (or <code>null</code> if the
+	 * granted authority cannot be expressed as a <code>String</code> with sufficient
+	 * precision).
+	 */
+	String getAuthority();
 }
diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
index f7cf03b2da..3b98d20307 100644
--- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
@@ -11,69 +11,72 @@ import org.springframework.core.SpringVersion;
  * @author Rob Winch
  */
 public class SpringSecurityCoreVersion {
-    private static final String DISABLE_CHECKS = SpringSecurityCoreVersion.class.getName().concat(".DISABLE_CHECKS");
+	private static final String DISABLE_CHECKS = SpringSecurityCoreVersion.class
+			.getName().concat(".DISABLE_CHECKS");
 
-    private static final Log logger = LogFactory.getLog(SpringSecurityCoreVersion.class);
+	private static final Log logger = LogFactory.getLog(SpringSecurityCoreVersion.class);
 
-    /**
-     * Global Serialization value for Spring Security classes.
-     *
-     * N.B. Classes are not intended to be serializable between different versions.
-     * See SEC-1709 for why we still need a serial version.
-     */
-    public static final long SERIAL_VERSION_UID = 400L;
+	/**
+	 * Global Serialization value for Spring Security classes.
+	 *
+	 * N.B. Classes are not intended to be serializable between different versions. See
+	 * SEC-1709 for why we still need a serial version.
+	 */
+	public static final long SERIAL_VERSION_UID = 400L;
 
-    static final String MIN_SPRING_VERSION = "4.1.5.RELEASE";
+	static final String MIN_SPRING_VERSION = "4.1.5.RELEASE";
 
-    static {
-        performVersionChecks();
-    }
+	static {
+		performVersionChecks();
+	}
 
-    public static String getVersion() {
-        Package pkg = SpringSecurityCoreVersion.class.getPackage();
-        return (pkg != null ? pkg.getImplementationVersion() : null);
-    }
+	public static String getVersion() {
+		Package pkg = SpringSecurityCoreVersion.class.getPackage();
+		return (pkg != null ? pkg.getImplementationVersion() : null);
+	}
 
-    /**
-     * Performs version checks
-     */
-    private static void performVersionChecks() {
-        performVersionChecks(MIN_SPRING_VERSION);
-    }
+	/**
+	 * Performs version checks
+	 */
+	private static void performVersionChecks() {
+		performVersionChecks(MIN_SPRING_VERSION);
+	}
 
-    /**
-     * Perform version checks with specific min Spring Version
-     *
-     * @param minSpringVersion
-     */
-    private static void performVersionChecks(String minSpringVersion) {
-        // Check Spring Compatibility
-        String springVersion = SpringVersion.getVersion();
-        String version = getVersion();
+	/**
+	 * Perform version checks with specific min Spring Version
+	 *
+	 * @param minSpringVersion
+	 */
+	private static void performVersionChecks(String minSpringVersion) {
+		// Check Spring Compatibility
+		String springVersion = SpringVersion.getVersion();
+		String version = getVersion();
 
-        if(disableChecks(springVersion, version)) {
-            return;
-        }
+		if (disableChecks(springVersion, version)) {
+			return;
+		}
 
-        logger.info("You are running with Spring Security Core " + version);
-        if (new ComparableVersion(springVersion).compareTo(new ComparableVersion(minSpringVersion)) < 0) {
-            logger.warn("**** You are advised to use Spring " + minSpringVersion +
-                    " or later with this version. You are running: " + springVersion);
-        }
-    }
+		logger.info("You are running with Spring Security Core " + version);
+		if (new ComparableVersion(springVersion).compareTo(new ComparableVersion(
+				minSpringVersion)) < 0) {
+			logger.warn("**** You are advised to use Spring " + minSpringVersion
+					+ " or later with this version. You are running: " + springVersion);
+		}
+	}
 
-    /**
-     * Disable if springVersion and springSecurityVersion are the same to allow
-     * working with Uber Jars.
-     *
-     * @param springVersion
-     * @param springSecurityVersion
-     * @return
-     */
-    private static boolean disableChecks(String springVersion, String springSecurityVersion) {
-        if(springVersion == null || springVersion.equals(springSecurityVersion)) {
-            return true;
-        }
-        return Boolean.getBoolean(DISABLE_CHECKS);
-    }
+	/**
+	 * Disable if springVersion and springSecurityVersion are the same to allow working
+	 * with Uber Jars.
+	 *
+	 * @param springVersion
+	 * @param springSecurityVersion
+	 * @return
+	 */
+	private static boolean disableChecks(String springVersion,
+			String springSecurityVersion) {
+		if (springVersion == null || springVersion.equals(springSecurityVersion)) {
+			return true;
+		}
+		return Boolean.getBoolean(DISABLE_CHECKS);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
index fcff0ff24d..038773c194 100644
--- a/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityMessageSource.java
@@ -18,26 +18,30 @@ package org.springframework.security.core;
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.context.support.ResourceBundleMessageSource;
 
-
 /**
  * The default <code>MessageSource</code> used by Spring Security.
- * <p>All Spring Security classes requiring messge localization will by default use this class.
- * However, all such classes will also implement <code>MessageSourceAware</code> so that the application context can
- * inject an alternative message source. Therefore this class is only used when the deployment environment has not
- * specified an alternative message source.</p>
+ * <p>
+ * All Spring Security classes requiring messge localization will by default use this
+ * class. However, all such classes will also implement <code>MessageSourceAware</code> so
+ * that the application context can inject an alternative message source. Therefore this
+ * class is only used when the deployment environment has not specified an alternative
+ * message source.
+ * </p>
  *
  * @author Ben Alex
  */
 public class SpringSecurityMessageSource extends ResourceBundleMessageSource {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SpringSecurityMessageSource() {
-        setBasename("org.springframework.security.messages");
-    }
+	public SpringSecurityMessageSource() {
+		setBasename("org.springframework.security.messages");
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static MessageSourceAccessor getAccessor() {
-        return new MessageSourceAccessor(new SpringSecurityMessageSource());
-    }
+	public static MessageSourceAccessor getAccessor() {
+		return new MessageSourceAccessor(new SpringSecurityMessageSource());
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java b/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java
index 3bcec67120..ce2b2acb8d 100644
--- a/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java
+++ b/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java
@@ -24,8 +24,8 @@ import java.lang.annotation.Target;
 import org.springframework.security.core.Authentication;
 
 /**
- * Annotation that is used to resolve
- * {@link Authentication#getPrincipal()} to a method argument.
+ * Annotation that is used to resolve {@link Authentication#getPrincipal()} to a method
+ * argument.
  *
  * @author Rob Winch
  * @since 4.0
@@ -37,13 +37,11 @@ import org.springframework.security.core.Authentication;
 @Documented
 public @interface AuthenticationPrincipal {
 
-    /**
-     * True if a {@link ClassCastException} should be thrown
-     * when the current {@link Authentication#getPrincipal()} is the incorrect
-     * type. Default is false.
-     *
-     * @return
-     */
-    boolean errorOnInvalidType() default false;
+	/**
+	 * True if a {@link ClassCastException} should be thrown when the current
+	 * {@link Authentication#getPrincipal()} is the incorrect type. Default is false.
+	 *
+	 * @return
+	 */
+	boolean errorOnInvalidType() default false;
 }
-
diff --git a/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java b/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java
index 25a9bdbc12..3074e06d39 100644
--- a/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java
+++ b/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java
@@ -18,40 +18,44 @@ import org.springframework.util.StringUtils;
  * @author Luke Taylor
  */
 public abstract class AuthorityUtils {
-    public static final List<GrantedAuthority> NO_AUTHORITIES = Collections.emptyList();
+	public static final List<GrantedAuthority> NO_AUTHORITIES = Collections.emptyList();
 
-    /**
-     * Creates a array of GrantedAuthority objects from a comma-separated string
-     * representation (e.g. "ROLE_A, ROLE_B, ROLE_C").
-     *
-     * @param authorityString the comma-separated string
-     * @return the authorities created by tokenizing the string
-     */
-    public static List<GrantedAuthority> commaSeparatedStringToAuthorityList(String authorityString) {
-        return createAuthorityList(StringUtils.tokenizeToStringArray(authorityString, ","));
-    }
+	/**
+	 * Creates a array of GrantedAuthority objects from a comma-separated string
+	 * representation (e.g. "ROLE_A, ROLE_B, ROLE_C").
+	 *
+	 * @param authorityString the comma-separated string
+	 * @return the authorities created by tokenizing the string
+	 */
+	public static List<GrantedAuthority> commaSeparatedStringToAuthorityList(
+			String authorityString) {
+		return createAuthorityList(StringUtils
+				.tokenizeToStringArray(authorityString, ","));
+	}
 
-    /**
-     * Converts an array of GrantedAuthority objects to a Set.
-     * @return a Set of the Strings obtained from each call to GrantedAuthority.getAuthority()
-     */
-    public static Set<String> authorityListToSet(Collection<? extends GrantedAuthority> userAuthorities) {
-        Set<String> set = new HashSet<String>(userAuthorities.size());
+	/**
+	 * Converts an array of GrantedAuthority objects to a Set.
+	 * @return a Set of the Strings obtained from each call to
+	 * GrantedAuthority.getAuthority()
+	 */
+	public static Set<String> authorityListToSet(
+			Collection<? extends GrantedAuthority> userAuthorities) {
+		Set<String> set = new HashSet<String>(userAuthorities.size());
 
-        for (GrantedAuthority authority: userAuthorities) {
-            set.add(authority.getAuthority());
-        }
+		for (GrantedAuthority authority : userAuthorities) {
+			set.add(authority.getAuthority());
+		}
 
-        return set;
-    }
+		return set;
+	}
 
-    public static List<GrantedAuthority> createAuthorityList(String... roles) {
-        List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
+	public static List<GrantedAuthority> createAuthorityList(String... roles) {
+		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
 
-        for (String role : roles) {
-            authorities.add(new SimpleGrantedAuthority(role));
-        }
+		for (String role : roles) {
+			authorities.add(new SimpleGrantedAuthority(role));
+		}
 
-        return authorities;
-    }
+		return authorities;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java b/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java
index 02de085921..5cdba46964 100644
--- a/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java
+++ b/core/src/main/java/org/springframework/security/core/authority/GrantedAuthoritiesContainer.java
@@ -8,13 +8,13 @@ import org.springframework.security.core.GrantedAuthority;
 /**
  * Indicates that a object stores GrantedAuthority objects.
  * <p>
- * Typically used in a pre-authenticated scenario when an AuthenticationDetails instance may also be
- * used to obtain user authorities.
+ * Typically used in a pre-authenticated scenario when an AuthenticationDetails instance
+ * may also be used to obtain user authorities.
  *
  * @author Ruud Senden
  * @author Luke Taylor
  * @since 2.0
  */
 public interface GrantedAuthoritiesContainer extends Serializable {
-    Collection<? extends GrantedAuthority> getGrantedAuthorities();
+	Collection<? extends GrantedAuthority> getGrantedAuthorities();
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
index ca8dfcb962..ceb5bdee0d 100644
--- a/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
+++ b/core/src/main/java/org/springframework/security/core/authority/SimpleGrantedAuthority.java
@@ -15,36 +15,36 @@ import org.springframework.util.Assert;
  */
 public final class SimpleGrantedAuthority implements GrantedAuthority {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private final String role;
+	private final String role;
 
-    public SimpleGrantedAuthority(String role) {
-        Assert.hasText(role, "A granted authority textual representation is required");
-        this.role = role;
-    }
+	public SimpleGrantedAuthority(String role) {
+		Assert.hasText(role, "A granted authority textual representation is required");
+		this.role = role;
+	}
 
-    public String getAuthority() {
-        return role;
-    }
+	public String getAuthority() {
+		return role;
+	}
 
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
 
-        if (obj instanceof SimpleGrantedAuthority) {
-            return role.equals(((SimpleGrantedAuthority) obj).role);
-        }
+		if (obj instanceof SimpleGrantedAuthority) {
+			return role.equals(((SimpleGrantedAuthority) obj).role);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public int hashCode() {
-        return this.role.hashCode();
-    }
+	public int hashCode() {
+		return this.role.hashCode();
+	}
 
-    public String toString() {
-        return this.role;
-    }
+	public String toString() {
+		return this.role;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java
index c456473d41..3bcf09f05c 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java
@@ -6,22 +6,23 @@ import java.util.List;
 import org.springframework.security.core.GrantedAuthority;
 
 /**
- * Interface to be implemented by classes that can map a list of security attributes (such as roles or
- * group names) to a collection of Spring Security {@code GrantedAuthority}s.
+ * Interface to be implemented by classes that can map a list of security attributes (such
+ * as roles or group names) to a collection of Spring Security {@code GrantedAuthority}s.
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public interface Attributes2GrantedAuthoritiesMapper {
-    /**
-     * Implementations of this method should map the given collection of attributes to a
-     * collection of Spring Security GrantedAuthorities. There are no restrictions for the
-     * mapping process; a single attribute can be mapped to multiple Spring Security
-     * GrantedAuthorities, all attributes can be mapped to a single Spring Security
-     * {@code GrantedAuthority}, some attributes may not be mapped, etc.
-     *
-     * @param attributes the attributes to be mapped
-     * @return the collection of authorities created from the attributes
-     */
-    public Collection<? extends GrantedAuthority> getGrantedAuthorities(Collection<String> attributes);
+	/**
+	 * Implementations of this method should map the given collection of attributes to a
+	 * collection of Spring Security GrantedAuthorities. There are no restrictions for the
+	 * mapping process; a single attribute can be mapped to multiple Spring Security
+	 * GrantedAuthorities, all attributes can be mapped to a single Spring Security
+	 * {@code GrantedAuthority}, some attributes may not be mapped, etc.
+	 *
+	 * @param attributes the attributes to be mapped
+	 * @return the collection of authorities created from the attributes
+	 */
+	public Collection<? extends GrantedAuthority> getGrantedAuthorities(
+			Collection<String> attributes);
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/GrantedAuthoritiesMapper.java
index 89e137a462..f1053ac97d 100644
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/GrantedAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/GrantedAuthoritiesMapper.java
@@ -6,10 +6,12 @@ import java.util.*;
 
 /**
  * Mapping interface which can be injected into the authentication layer to convert the
- * authorities loaded from storage into those which will be used in the {@code Authentication} object.
+ * authorities loaded from storage into those which will be used in the
+ * {@code Authentication} object.
  *
  * @author Luke Taylor
  */
 public interface GrantedAuthoritiesMapper {
-    Collection<? extends GrantedAuthority> mapAuthorities(Collection<? extends GrantedAuthority> authorities);
+	Collection<? extends GrantedAuthority> mapAuthorities(
+			Collection<? extends GrantedAuthority> authorities);
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java
index 0f98ba5cc2..b60697f838 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java
@@ -10,149 +10,168 @@ import org.springframework.util.StringUtils;
 
 /**
  * This class implements the Attributes2GrantedAuthoritiesMapper and
- * MappableAttributesRetriever interfaces based on the supplied Map.
- * It supports both one-to-one and one-to-many mappings. The granted
- * authorities to map to can be supplied either as a String or as a
- * GrantedAuthority object.
+ * MappableAttributesRetriever interfaces based on the supplied Map. It supports both
+ * one-to-one and one-to-many mappings. The granted authorities to map to can be supplied
+ * either as a String or as a GrantedAuthority object.
  *
  * @author Ruud Senden
  */
-public class MapBasedAttributes2GrantedAuthoritiesMapper implements Attributes2GrantedAuthoritiesMapper, MappableAttributesRetriever, InitializingBean {
-    private Map<String, Collection<GrantedAuthority>> attributes2grantedAuthoritiesMap = null;
-    private String stringSeparator = ",";
-    private Set<String> mappableAttributes = null;
+public class MapBasedAttributes2GrantedAuthoritiesMapper implements
+		Attributes2GrantedAuthoritiesMapper, MappableAttributesRetriever,
+		InitializingBean {
+	private Map<String, Collection<GrantedAuthority>> attributes2grantedAuthoritiesMap = null;
+	private String stringSeparator = ",";
+	private Set<String> mappableAttributes = null;
 
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(attributes2grantedAuthoritiesMap,
+				"attributes2grantedAuthoritiesMap must be set");
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(attributes2grantedAuthoritiesMap, "attributes2grantedAuthoritiesMap must be set");
-    }
+	/**
+	 * Map the given array of attributes to Spring Security GrantedAuthorities.
+	 */
+	public List<GrantedAuthority> getGrantedAuthorities(Collection<String> attributes) {
+		ArrayList<GrantedAuthority> gaList = new ArrayList<GrantedAuthority>();
+		for (String attribute : attributes) {
+			Collection<GrantedAuthority> c = attributes2grantedAuthoritiesMap
+					.get(attribute);
+			if (c != null) {
+				gaList.addAll(c);
+			}
+		}
+		gaList.trimToSize();
 
-    /**
-     * Map the given array of attributes to Spring Security GrantedAuthorities.
-     */
-    public List<GrantedAuthority> getGrantedAuthorities(Collection<String> attributes) {
-        ArrayList<GrantedAuthority> gaList = new ArrayList<GrantedAuthority>();
-        for (String attribute : attributes) {
-            Collection<GrantedAuthority> c = attributes2grantedAuthoritiesMap.get(attribute);
-            if ( c != null ) { gaList.addAll(c); }
-        }
-        gaList.trimToSize();
+		return gaList;
+	}
 
-        return gaList;
-    }
+	/**
+	 * @return Returns the attributes2grantedAuthoritiesMap.
+	 */
+	public Map<String, Collection<GrantedAuthority>> getAttributes2grantedAuthoritiesMap() {
+		return attributes2grantedAuthoritiesMap;
+	}
 
-    /**
-     * @return Returns the attributes2grantedAuthoritiesMap.
-     */
-    public Map<String, Collection<GrantedAuthority>> getAttributes2grantedAuthoritiesMap() {
-        return attributes2grantedAuthoritiesMap;
-    }
-    /**
-     * @param attributes2grantedAuthoritiesMap The attributes2grantedAuthoritiesMap to set.
-     */
-    public void setAttributes2grantedAuthoritiesMap(final Map<?,?> attributes2grantedAuthoritiesMap) {
-        Assert.notEmpty(attributes2grantedAuthoritiesMap,"A non-empty attributes2grantedAuthoritiesMap must be supplied");
-        this.attributes2grantedAuthoritiesMap = preProcessMap(attributes2grantedAuthoritiesMap);
+	/**
+	 * @param attributes2grantedAuthoritiesMap The attributes2grantedAuthoritiesMap to
+	 * set.
+	 */
+	public void setAttributes2grantedAuthoritiesMap(
+			final Map<?, ?> attributes2grantedAuthoritiesMap) {
+		Assert.notEmpty(attributes2grantedAuthoritiesMap,
+				"A non-empty attributes2grantedAuthoritiesMap must be supplied");
+		this.attributes2grantedAuthoritiesMap = preProcessMap(attributes2grantedAuthoritiesMap);
 
-        mappableAttributes = Collections.unmodifiableSet(this.attributes2grantedAuthoritiesMap.keySet());
-    }
+		mappableAttributes = Collections
+				.unmodifiableSet(this.attributes2grantedAuthoritiesMap.keySet());
+	}
 
-    /**
-     * Preprocess the given map to convert all the values to GrantedAuthority collections
-     *
-     * @param orgMap The map to process
-     * @return the processed Map
-     */
-    private Map<String, Collection<GrantedAuthority>> preProcessMap(Map<?, ?> orgMap) {
-        Map<String, Collection<GrantedAuthority>> result =
-            new HashMap<String, Collection<GrantedAuthority>>(orgMap.size());
+	/**
+	 * Preprocess the given map to convert all the values to GrantedAuthority collections
+	 *
+	 * @param orgMap The map to process
+	 * @return the processed Map
+	 */
+	private Map<String, Collection<GrantedAuthority>> preProcessMap(Map<?, ?> orgMap) {
+		Map<String, Collection<GrantedAuthority>> result = new HashMap<String, Collection<GrantedAuthority>>(
+				orgMap.size());
 
-        for(Map.Entry<?,?> entry : orgMap.entrySet()) {
-            Assert.isInstanceOf(String.class, entry.getKey(),
-                    "attributes2grantedAuthoritiesMap contains non-String objects as keys");
-            result.put((String)entry.getKey(),getGrantedAuthorityCollection(entry.getValue()));
-        }
-        return result;
-    }
+		for (Map.Entry<?, ?> entry : orgMap.entrySet()) {
+			Assert.isInstanceOf(String.class, entry.getKey(),
+					"attributes2grantedAuthoritiesMap contains non-String objects as keys");
+			result.put((String) entry.getKey(),
+					getGrantedAuthorityCollection(entry.getValue()));
+		}
+		return result;
+	}
 
-    /**
-     * Convert the given value to a collection of Granted Authorities
-     *
-     * @param value
-     *            The value to convert to a GrantedAuthority Collection
-     * @return Collection containing the GrantedAuthority Collection
-     */
-    private Collection<GrantedAuthority> getGrantedAuthorityCollection(Object value) {
-        Collection<GrantedAuthority> result = new ArrayList<GrantedAuthority>();
-        addGrantedAuthorityCollection(result,value);
-        return result;
-    }
+	/**
+	 * Convert the given value to a collection of Granted Authorities
+	 *
+	 * @param value The value to convert to a GrantedAuthority Collection
+	 * @return Collection containing the GrantedAuthority Collection
+	 */
+	private Collection<GrantedAuthority> getGrantedAuthorityCollection(Object value) {
+		Collection<GrantedAuthority> result = new ArrayList<GrantedAuthority>();
+		addGrantedAuthorityCollection(result, value);
+		return result;
+	}
 
-    /**
-     * Convert the given value to a collection of Granted Authorities,
-     * adding the result to the given result collection.
-     *
-     * @param value
-     *            The value to convert to a GrantedAuthority Collection
-     * @return Collection containing the GrantedAuthority Collection
-     */
-    private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, Object value) {
-        if ( value == null ) {
-            return;
-        }
-        if ( value instanceof Collection<?> ) {
-            addGrantedAuthorityCollection(result,(Collection<?>)value);
-        } else if ( value instanceof Object[] ) {
-            addGrantedAuthorityCollection(result,(Object[])value);
-        } else if ( value instanceof String ) {
-            addGrantedAuthorityCollection(result,(String)value);
-        } else if ( value instanceof GrantedAuthority ) {
-            result.add((GrantedAuthority) value);
-        } else {
-            throw new IllegalArgumentException("Invalid object type: "+value.getClass().getName());
-        }
-    }
+	/**
+	 * Convert the given value to a collection of Granted Authorities, adding the result
+	 * to the given result collection.
+	 *
+	 * @param value The value to convert to a GrantedAuthority Collection
+	 * @return Collection containing the GrantedAuthority Collection
+	 */
+	private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result,
+			Object value) {
+		if (value == null) {
+			return;
+		}
+		if (value instanceof Collection<?>) {
+			addGrantedAuthorityCollection(result, (Collection<?>) value);
+		}
+		else if (value instanceof Object[]) {
+			addGrantedAuthorityCollection(result, (Object[]) value);
+		}
+		else if (value instanceof String) {
+			addGrantedAuthorityCollection(result, (String) value);
+		}
+		else if (value instanceof GrantedAuthority) {
+			result.add((GrantedAuthority) value);
+		}
+		else {
+			throw new IllegalArgumentException("Invalid object type: "
+					+ value.getClass().getName());
+		}
+	}
 
-    private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, Collection<?> value) {
-        for(Object elt : value) {
-            addGrantedAuthorityCollection(result, elt);
-        }
-    }
+	private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result,
+			Collection<?> value) {
+		for (Object elt : value) {
+			addGrantedAuthorityCollection(result, elt);
+		}
+	}
 
-    private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, Object[] value) {
-        for (Object aValue : value) {
-            addGrantedAuthorityCollection(result, aValue);
-        }
-    }
+	private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result,
+			Object[] value) {
+		for (Object aValue : value) {
+			addGrantedAuthorityCollection(result, aValue);
+		}
+	}
 
-    private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result, String value) {
-        StringTokenizer st = new StringTokenizer(value,stringSeparator,false);
-        while ( st.hasMoreTokens() ) {
-            String nextToken = st.nextToken();
-            if ( StringUtils.hasText(nextToken) ) {
-                result.add(new SimpleGrantedAuthority(nextToken));
-            }
-        }
-    }
+	private void addGrantedAuthorityCollection(Collection<GrantedAuthority> result,
+			String value) {
+		StringTokenizer st = new StringTokenizer(value, stringSeparator, false);
+		while (st.hasMoreTokens()) {
+			String nextToken = st.nextToken();
+			if (StringUtils.hasText(nextToken)) {
+				result.add(new SimpleGrantedAuthority(nextToken));
+			}
+		}
+	}
 
-    /**
-     *
-     * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes()
-     */
-    public Set<String> getMappableAttributes() {
-        return mappableAttributes;
-    }
-    /**
-     * @return Returns the stringSeparator.
-     */
-    public String getStringSeparator() {
-        return stringSeparator;
-    }
-    /**
-     * @param stringSeparator The stringSeparator to set.
-     */
-    public void setStringSeparator(String stringSeparator) {
-        this.stringSeparator = stringSeparator;
-    }
+	/**
+	 *
+	 * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes()
+	 */
+	public Set<String> getMappableAttributes() {
+		return mappableAttributes;
+	}
+
+	/**
+	 * @return Returns the stringSeparator.
+	 */
+	public String getStringSeparator() {
+		return stringSeparator;
+	}
+
+	/**
+	 * @param stringSeparator The stringSeparator to set.
+	 */
+	public void setStringSeparator(String stringSeparator) {
+		this.stringSeparator = stringSeparator;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java
index 5384403bd4..c296ae0b06 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/MappableAttributesRetriever.java
@@ -3,19 +3,19 @@ package org.springframework.security.core.authority.mapping;
 import java.util.Set;
 
 /**
- * Interface to be implemented by classes that can retrieve a list of mappable
- * security attribute strings (for example the list of all available J2EE roles in a web or EJB
+ * Interface to be implemented by classes that can retrieve a list of mappable security
+ * attribute strings (for example the list of all available J2EE roles in a web or EJB
  * application).
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public interface MappableAttributesRetriever {
-    /**
-     * Implementations of this method should return a set of all string attributes which
-     * can be mapped to <tt>GrantedAuthority</tt>s.
-     *
-     * @return set of all mappable roles
-     */
-    Set<String> getMappableAttributes();
+	/**
+	 * Implementations of this method should return a set of all string attributes which
+	 * can be mapped to <tt>GrantedAuthority</tt>s.
+	 *
+	 * @return set of all mappable roles
+	 */
+	Set<String> getMappableAttributes();
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/NullAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/NullAuthoritiesMapper.java
index 7bcd394b2c..62921e5982 100644
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/NullAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/NullAuthoritiesMapper.java
@@ -8,7 +8,8 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class NullAuthoritiesMapper implements GrantedAuthoritiesMapper {
-    public Collection<? extends GrantedAuthority> mapAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        return authorities;
-    }
+	public Collection<? extends GrantedAuthority> mapAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		return authorities;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
index 5ec87b939f..58db3c7c71 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
@@ -15,8 +15,7 @@ import org.springframework.util.Assert;
  * <p>
  * This class implements the Attributes2GrantedAuthoritiesMapper interface by doing a
  * one-to-one mapping from roles to Spring Security GrantedAuthorities. Optionally a
- * prefix can be added, and the attribute name can be converted to upper or lower
- * case.
+ * prefix can be added, and the attribute name can be converted to upper or lower case.
  * <p>
  * By default, the attribute is prefixed with "ROLE_" unless it already starts with
  * "ROLE_", and no case conversion is done.
@@ -24,85 +23,89 @@ import org.springframework.util.Assert;
  * @author Ruud Senden
  * @since 2.0
  */
-public class SimpleAttributes2GrantedAuthoritiesMapper implements Attributes2GrantedAuthoritiesMapper, InitializingBean {
-    private String attributePrefix = "ROLE_";
+public class SimpleAttributes2GrantedAuthoritiesMapper implements
+		Attributes2GrantedAuthoritiesMapper, InitializingBean {
+	private String attributePrefix = "ROLE_";
 
-    private boolean convertAttributeToUpperCase = false;
+	private boolean convertAttributeToUpperCase = false;
 
-    private boolean convertAttributeToLowerCase = false;
+	private boolean convertAttributeToLowerCase = false;
 
-    private boolean addPrefixIfAlreadyExisting = false;
+	private boolean addPrefixIfAlreadyExisting = false;
 
-    /**
-     * Check whether all properties have been set to correct values.
-     */
-    public void afterPropertiesSet() throws Exception {
-        Assert.isTrue(!(isConvertAttributeToUpperCase() && isConvertAttributeToLowerCase()),
-                "Either convertAttributeToUpperCase or convertAttributeToLowerCase can be set to true, but not both");
-    }
+	/**
+	 * Check whether all properties have been set to correct values.
+	 */
+	public void afterPropertiesSet() throws Exception {
+		Assert.isTrue(
+				!(isConvertAttributeToUpperCase() && isConvertAttributeToLowerCase()),
+				"Either convertAttributeToUpperCase or convertAttributeToLowerCase can be set to true, but not both");
+	}
 
-    /**
-     * Map the given list of string attributes one-to-one to Spring Security GrantedAuthorities.
-     */
-    public List<GrantedAuthority> getGrantedAuthorities(Collection<String> attributes) {
-        List<GrantedAuthority> result = new ArrayList<GrantedAuthority>(attributes.size());
-        for (String attribute : attributes) {
-            result.add(getGrantedAuthority(attribute));
-        }
-        return result;
-    }
+	/**
+	 * Map the given list of string attributes one-to-one to Spring Security
+	 * GrantedAuthorities.
+	 */
+	public List<GrantedAuthority> getGrantedAuthorities(Collection<String> attributes) {
+		List<GrantedAuthority> result = new ArrayList<GrantedAuthority>(attributes.size());
+		for (String attribute : attributes) {
+			result.add(getGrantedAuthority(attribute));
+		}
+		return result;
+	}
 
-    /**
-     * Map the given role one-on-one to a Spring Security GrantedAuthority, optionally
-     * doing case conversion and/or adding a prefix.
-     *
-     * @param attribute
-     *            The attribute for which to get a GrantedAuthority
-     * @return GrantedAuthority representing the given role.
-     */
-    private GrantedAuthority getGrantedAuthority(String attribute) {
-        if (isConvertAttributeToLowerCase()) {
-            attribute = attribute.toLowerCase(Locale.getDefault());
-        } else if (isConvertAttributeToUpperCase()) {
-            attribute = attribute.toUpperCase(Locale.getDefault());
-        }
-        if (isAddPrefixIfAlreadyExisting() || !attribute.startsWith(getAttributePrefix())) {
-            return new SimpleGrantedAuthority(getAttributePrefix() + attribute);
-        } else {
-            return new SimpleGrantedAuthority(attribute);
-        }
-    }
+	/**
+	 * Map the given role one-on-one to a Spring Security GrantedAuthority, optionally
+	 * doing case conversion and/or adding a prefix.
+	 *
+	 * @param attribute The attribute for which to get a GrantedAuthority
+	 * @return GrantedAuthority representing the given role.
+	 */
+	private GrantedAuthority getGrantedAuthority(String attribute) {
+		if (isConvertAttributeToLowerCase()) {
+			attribute = attribute.toLowerCase(Locale.getDefault());
+		}
+		else if (isConvertAttributeToUpperCase()) {
+			attribute = attribute.toUpperCase(Locale.getDefault());
+		}
+		if (isAddPrefixIfAlreadyExisting() || !attribute.startsWith(getAttributePrefix())) {
+			return new SimpleGrantedAuthority(getAttributePrefix() + attribute);
+		}
+		else {
+			return new SimpleGrantedAuthority(attribute);
+		}
+	}
 
-    private boolean isConvertAttributeToLowerCase() {
-        return convertAttributeToLowerCase;
-    }
+	private boolean isConvertAttributeToLowerCase() {
+		return convertAttributeToLowerCase;
+	}
 
-    public void setConvertAttributeToLowerCase(boolean b) {
-        convertAttributeToLowerCase = b;
-    }
+	public void setConvertAttributeToLowerCase(boolean b) {
+		convertAttributeToLowerCase = b;
+	}
 
-    private boolean isConvertAttributeToUpperCase() {
-        return convertAttributeToUpperCase;
-    }
+	private boolean isConvertAttributeToUpperCase() {
+		return convertAttributeToUpperCase;
+	}
 
-    public void setConvertAttributeToUpperCase(boolean b) {
-        convertAttributeToUpperCase = b;
-    }
+	public void setConvertAttributeToUpperCase(boolean b) {
+		convertAttributeToUpperCase = b;
+	}
 
-    private String getAttributePrefix() {
-        return attributePrefix == null ? "" : attributePrefix;
-    }
+	private String getAttributePrefix() {
+		return attributePrefix == null ? "" : attributePrefix;
+	}
 
-    public void setAttributePrefix(String string) {
-        attributePrefix = string;
-    }
+	public void setAttributePrefix(String string) {
+		attributePrefix = string;
+	}
 
-    private boolean isAddPrefixIfAlreadyExisting() {
-        return addPrefixIfAlreadyExisting;
-    }
+	private boolean isAddPrefixIfAlreadyExisting() {
+		return addPrefixIfAlreadyExisting;
+	}
 
-    public void setAddPrefixIfAlreadyExisting(boolean b) {
-        addPrefixIfAlreadyExisting = b;
-    }
+	public void setAddPrefixIfAlreadyExisting(boolean b) {
+		addPrefixIfAlreadyExisting = b;
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java
index b794a4641d..1d66b31f7b 100644
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java
@@ -8,94 +8,102 @@ import org.springframework.util.Assert;
 import java.util.*;
 
 /**
- * Simple one-to-one {@code GrantedAuthoritiesMapper} which allows for case conversion of the authority name
- * and the addition of a string prefix (which defaults to {@code ROLE_}).
+ * Simple one-to-one {@code GrantedAuthoritiesMapper} which allows for case conversion of
+ * the authority name and the addition of a string prefix (which defaults to {@code ROLE_}
+ * ).
  *
  * @author Luke Taylor
  * @since 3.1
  */
-public final class SimpleAuthorityMapper implements GrantedAuthoritiesMapper, InitializingBean {
-    private GrantedAuthority defaultAuthority;
-    private String prefix = "ROLE_";
-    private boolean convertToUpperCase = false;
-    private boolean convertToLowerCase = false;
+public final class SimpleAuthorityMapper implements GrantedAuthoritiesMapper,
+		InitializingBean {
+	private GrantedAuthority defaultAuthority;
+	private String prefix = "ROLE_";
+	private boolean convertToUpperCase = false;
+	private boolean convertToLowerCase = false;
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.isTrue(!(convertToUpperCase && convertToLowerCase),
-                "Either convertToUpperCase or convertToLowerCase can be set to true, but not both");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.isTrue(!(convertToUpperCase && convertToLowerCase),
+				"Either convertToUpperCase or convertToLowerCase can be set to true, but not both");
+	}
 
-    /**
-     * Creates a mapping of the supplied authorities based on the case-conversion and prefix settings.
-     * The mapping will be one-to-one unless duplicates are produced during the conversion. If a default
-     * authority has been set, this will also be assigned to each mapping.
-     *
-     * @param authorities the original authorities
-     *
-     * @return the converted set of authorities
-     */
-    public Set<GrantedAuthority> mapAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        HashSet<GrantedAuthority> mapped = new HashSet<GrantedAuthority>(authorities.size());
-        for (GrantedAuthority authority : authorities) {
-            mapped.add(mapAuthority(authority.getAuthority()));
-        }
+	/**
+	 * Creates a mapping of the supplied authorities based on the case-conversion and
+	 * prefix settings. The mapping will be one-to-one unless duplicates are produced
+	 * during the conversion. If a default authority has been set, this will also be
+	 * assigned to each mapping.
+	 *
+	 * @param authorities the original authorities
+	 *
+	 * @return the converted set of authorities
+	 */
+	public Set<GrantedAuthority> mapAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		HashSet<GrantedAuthority> mapped = new HashSet<GrantedAuthority>(
+				authorities.size());
+		for (GrantedAuthority authority : authorities) {
+			mapped.add(mapAuthority(authority.getAuthority()));
+		}
 
-        if (defaultAuthority != null) {
-            mapped.add(defaultAuthority);
-        }
+		if (defaultAuthority != null) {
+			mapped.add(defaultAuthority);
+		}
 
-        return mapped;
-    }
+		return mapped;
+	}
 
-    private GrantedAuthority mapAuthority(String name) {
-        if (convertToUpperCase) {
-            name = name.toUpperCase();
-        } else if (convertToLowerCase) {
-            name = name.toLowerCase();
-        }
+	private GrantedAuthority mapAuthority(String name) {
+		if (convertToUpperCase) {
+			name = name.toUpperCase();
+		}
+		else if (convertToLowerCase) {
+			name = name.toLowerCase();
+		}
 
-        if (prefix.length() > 0 && !name.startsWith(prefix)) {
-            name = prefix + name;
-        }
+		if (prefix.length() > 0 && !name.startsWith(prefix)) {
+			name = prefix + name;
+		}
 
-        return new SimpleGrantedAuthority(name);
-    }
+		return new SimpleGrantedAuthority(name);
+	}
 
-    /**
-     * Sets the prefix which should be added to the authority name (if it doesn't already exist)
-     *
-     * @param prefix the prefix, typically to satisfy the behaviour of an {@code AccessDecisionVoter}.
-     */
-    public void setPrefix(String prefix) {
-        Assert.notNull(prefix, "prefix cannot be null");
-        this.prefix = prefix;
-    }
+	/**
+	 * Sets the prefix which should be added to the authority name (if it doesn't already
+	 * exist)
+	 *
+	 * @param prefix the prefix, typically to satisfy the behaviour of an
+	 * {@code AccessDecisionVoter}.
+	 */
+	public void setPrefix(String prefix) {
+		Assert.notNull(prefix, "prefix cannot be null");
+		this.prefix = prefix;
+	}
 
-    /**
-     * Whether to convert the authority value to upper case in the mapping.
-     *
-     * @param convertToUpperCase defaults to {@code false}
-     */
-    public void setConvertToUpperCase(boolean convertToUpperCase) {
-        this.convertToUpperCase = convertToUpperCase;
-    }
+	/**
+	 * Whether to convert the authority value to upper case in the mapping.
+	 *
+	 * @param convertToUpperCase defaults to {@code false}
+	 */
+	public void setConvertToUpperCase(boolean convertToUpperCase) {
+		this.convertToUpperCase = convertToUpperCase;
+	}
 
-    /**
-     * Whether to convert the authority value to lower case in the mapping.
-     *
-     * @param convertToLowerCase defaults to {@code false}
-     */
-    public void setConvertToLowerCase(boolean convertToLowerCase) {
-        this.convertToLowerCase = convertToLowerCase;
-    }
+	/**
+	 * Whether to convert the authority value to lower case in the mapping.
+	 *
+	 * @param convertToLowerCase defaults to {@code false}
+	 */
+	public void setConvertToLowerCase(boolean convertToLowerCase) {
+		this.convertToLowerCase = convertToLowerCase;
+	}
 
-    /**
-     * Sets a default authority to be assigned to all users
-     *
-     * @param authority the name of the authority to be assigned to all users.
-     */
-    public void setDefaultAuthority(String authority) {
-        Assert.hasText(authority, "The authority name cannot be set to an empty value");
-        this.defaultAuthority = new SimpleGrantedAuthority(authority);
-    }
+	/**
+	 * Sets a default authority to be assigned to all users
+	 *
+	 * @param authority the name of the authority to be assigned to all users.
+	 */
+	public void setDefaultAuthority(String authority) {
+		Assert.hasText(authority, "The authority name cannot be set to an empty value");
+		this.defaultAuthority = new SimpleGrantedAuthority(authority);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java
index bab867e2a5..87c25c5f7d 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java
@@ -5,29 +5,30 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * This class implements the MappableAttributesRetriever interface by just returning
- * a list of mappable attributes as previously set using the corresponding setter
- * method.
+ * This class implements the MappableAttributesRetriever interface by just returning a
+ * list of mappable attributes as previously set using the corresponding setter method.
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public class SimpleMappableAttributesRetriever implements MappableAttributesRetriever {
-    private Set<String> mappableAttributes = null;
+	private Set<String> mappableAttributes = null;
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.springframework.security.core.authority.mapping.MappableAttributesRetriever#getMappableAttributes()
-     */
-    public Set<String> getMappableAttributes() {
-        return mappableAttributes;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.core.authority.mapping.MappableAttributesRetriever
+	 * #getMappableAttributes()
+	 */
+	public Set<String> getMappableAttributes() {
+		return mappableAttributes;
+	}
 
-    public void setMappableAttributes(Set<String> aMappableRoles) {
-        mappableAttributes = new HashSet<String>();
-        mappableAttributes.addAll(aMappableRoles);
-        mappableAttributes = Collections.unmodifiableSet(mappableAttributes);
-    }
+	public void setMappableAttributes(Set<String> aMappableRoles) {
+		mappableAttributes = new HashSet<String>();
+		mappableAttributes.addAll(aMappableRoles);
+		mappableAttributes = Collections.unmodifiableSet(mappableAttributes);
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/package-info.java b/core/src/main/java/org/springframework/security/core/authority/mapping/package-info.java
index da9d6ed241..8d38540abd 100644
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/package-info.java
@@ -6,3 +6,4 @@
  * required within an application.
  */
 package org.springframework.security.core.authority.mapping;
+
diff --git a/core/src/main/java/org/springframework/security/core/authority/package-info.java b/core/src/main/java/org/springframework/security/core/authority/package-info.java
index d9fcaf6d44..4990abd7b6 100644
--- a/core/src/main/java/org/springframework/security/core/authority/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/authority/package-info.java
@@ -2,3 +2,4 @@
  * The default implementation of the {@code GrantedAuthority} interface.
  */
 package org.springframework.security.core.authority;
+
diff --git a/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
index 8d83c34ad5..c222bac7d1 100644
--- a/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/GlobalSecurityContextHolderStrategy.java
@@ -17,40 +17,42 @@ package org.springframework.security.core.context;
 
 import org.springframework.util.Assert;
 
-
 /**
- * A <code>static</code> field-based implementation of {@link SecurityContextHolderStrategy}.
+ * A <code>static</code> field-based implementation of
+ * {@link SecurityContextHolderStrategy}.
  * <p>
- * This means that all instances in the JVM share the
- * same <code>SecurityContext</code>. This is generally useful with rich clients, such as Swing.
+ * This means that all instances in the JVM share the same <code>SecurityContext</code>.
+ * This is generally useful with rich clients, such as Swing.
  *
  * @author Ben Alex
  */
 final class GlobalSecurityContextHolderStrategy implements SecurityContextHolderStrategy {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static SecurityContext contextHolder;
+	private static SecurityContext contextHolder;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void clearContext() {
-        contextHolder = null;
-    }
+	public void clearContext() {
+		contextHolder = null;
+	}
 
-    public SecurityContext getContext() {
-        if (contextHolder == null) {
-            contextHolder = new SecurityContextImpl();
-        }
+	public SecurityContext getContext() {
+		if (contextHolder == null) {
+			contextHolder = new SecurityContextImpl();
+		}
 
-        return contextHolder;
-    }
+		return contextHolder;
+	}
 
-    public void setContext(SecurityContext context) {
-        Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
-        contextHolder = context;
-    }
+	public void setContext(SecurityContext context) {
+		Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
+		contextHolder = context;
+	}
 
-    public SecurityContext createEmptyContext() {
-        return new SecurityContextImpl();
-    }
+	public SecurityContext createEmptyContext() {
+		return new SecurityContextImpl();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
index 837e51d0db..60d082fbce 100644
--- a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java
@@ -17,43 +17,45 @@ package org.springframework.security.core.context;
 
 import org.springframework.util.Assert;
 
-
 /**
- * An <code>InheritableThreadLocal</code>-based implementation of {@link
- * org.springframework.security.core.context.SecurityContextHolderStrategy}.
+ * An <code>InheritableThreadLocal</code>-based implementation of
+ * {@link org.springframework.security.core.context.SecurityContextHolderStrategy}.
  *
  * @author Ben Alex
  *
  * @see java.lang.ThreadLocal
  */
-final class InheritableThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy {
-    //~ Static fields/initializers =====================================================================================
+final class InheritableThreadLocalSecurityContextHolderStrategy implements
+		SecurityContextHolderStrategy {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final ThreadLocal<SecurityContext> contextHolder = new InheritableThreadLocal<SecurityContext>();
+	private static final ThreadLocal<SecurityContext> contextHolder = new InheritableThreadLocal<SecurityContext>();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void clearContext() {
-        contextHolder.remove();
-    }
+	public void clearContext() {
+		contextHolder.remove();
+	}
 
-    public SecurityContext getContext() {
-        SecurityContext ctx = contextHolder.get();
+	public SecurityContext getContext() {
+		SecurityContext ctx = contextHolder.get();
 
-        if (ctx == null) {
-            ctx = createEmptyContext();
-            contextHolder.set(ctx);
-        }
+		if (ctx == null) {
+			ctx = createEmptyContext();
+			contextHolder.set(ctx);
+		}
 
-        return ctx;
-    }
+		return ctx;
+	}
 
-    public void setContext(SecurityContext context) {
-        Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
-        contextHolder.set(context);
-    }
+	public void setContext(SecurityContext context) {
+		Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
+		contextHolder.set(context);
+	}
 
-    public SecurityContext createEmptyContext() {
-        return new SecurityContextImpl();
-    }
+	public SecurityContext createEmptyContext() {
+		return new SecurityContextImpl();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContext.java b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java
index 26df7890ea..386a9731dd 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContext.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContext.java
@@ -19,10 +19,9 @@ import org.springframework.security.core.Authentication;
 
 import java.io.Serializable;
 
-
 /**
- * Interface defining the minimum security information associated with the
- * current thread of execution.
+ * Interface defining the minimum security information associated with the current thread
+ * of execution.
  *
  * <p>
  * The security context is stored in a {@link SecurityContextHolder}.
@@ -31,20 +30,23 @@ import java.io.Serializable;
  * @author Ben Alex
  */
 public interface SecurityContext extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Obtains the currently authenticated principal, or an authentication request token.
-     *
-     * @return the <code>Authentication</code> or <code>null</code> if no authentication information is available
-     */
-    Authentication getAuthentication();
+	/**
+	 * Obtains the currently authenticated principal, or an authentication request token.
+	 *
+	 * @return the <code>Authentication</code> or <code>null</code> if no authentication
+	 * information is available
+	 */
+	Authentication getAuthentication();
 
-    /**
-     * Changes the currently authenticated principal, or removes the authentication information.
-     *
-     * @param authentication the new <code>Authentication</code> token, or <code>null</code> if no further
-     *        authentication information should be stored
-     */
-    void setAuthentication(Authentication authentication);
+	/**
+	 * Changes the currently authenticated principal, or removes the authentication
+	 * information.
+	 *
+	 * @param authentication the new <code>Authentication</code> token, or
+	 * <code>null</code> if no further authentication information should be stored
+	 */
+	void setAuthentication(Authentication authentication);
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
index b00df408cb..d13817ecd0 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolder.java
@@ -19,137 +19,148 @@ import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Constructor;
 
-
 /**
  * Associates a given {@link SecurityContext} with the current execution thread.
  * <p>
  * This class provides a series of static methods that delegate to an instance of
- * {@link org.springframework.security.core.context.SecurityContextHolderStrategy}. The purpose of the class is to provide a
- * convenient way to specify the strategy that should be used for a given JVM.
- * This is a JVM-wide setting, since everything in this class is <code>static</code> to facilitate ease of use in
- * calling code.
+ * {@link org.springframework.security.core.context.SecurityContextHolderStrategy}. The
+ * purpose of the class is to provide a convenient way to specify the strategy that should
+ * be used for a given JVM. This is a JVM-wide setting, since everything in this class is
+ * <code>static</code> to facilitate ease of use in calling code.
  * <p>
- * To specify which strategy should be used, you must provide a mode setting. A mode setting is one of the
- * three valid <code>MODE_</code> settings defined as <code>static final</code> fields, or a fully qualified classname
- * to a concrete implementation of {@link org.springframework.security.core.context.SecurityContextHolderStrategy} that
+ * To specify which strategy should be used, you must provide a mode setting. A mode
+ * setting is one of the three valid <code>MODE_</code> settings defined as
+ * <code>static final</code> fields, or a fully qualified classname to a concrete
+ * implementation of
+ * {@link org.springframework.security.core.context.SecurityContextHolderStrategy} that
  * provides a public no-argument constructor.
  * <p>
- * There are two ways to specify the desired strategy mode <code>String</code>. The first is to specify it via
- * the system property keyed on {@link #SYSTEM_PROPERTY}. The second is to call {@link #setStrategyName(String)}
- * before using the class. If neither approach is used, the class will default to using {@link #MODE_THREADLOCAL},
- * which is backwards compatible, has fewer JVM incompatibilities and is appropriate on servers (whereas {@link
- * #MODE_GLOBAL} is definitely inappropriate for server use).
+ * There are two ways to specify the desired strategy mode <code>String</code>. The first
+ * is to specify it via the system property keyed on {@link #SYSTEM_PROPERTY}. The second
+ * is to call {@link #setStrategyName(String)} before using the class. If neither approach
+ * is used, the class will default to using {@link #MODE_THREADLOCAL}, which is backwards
+ * compatible, has fewer JVM incompatibilities and is appropriate on servers (whereas
+ * {@link #MODE_GLOBAL} is definitely inappropriate for server use).
  *
  * @author Ben Alex
  *
  */
 public class SecurityContextHolder {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    public static final String MODE_THREADLOCAL = "MODE_THREADLOCAL";
-    public static final String MODE_INHERITABLETHREADLOCAL = "MODE_INHERITABLETHREADLOCAL";
-    public static final String MODE_GLOBAL = "MODE_GLOBAL";
-    public static final String SYSTEM_PROPERTY = "spring.security.strategy";
-    private static String strategyName = System.getProperty(SYSTEM_PROPERTY);
-    private static SecurityContextHolderStrategy strategy;
-    private static int initializeCount = 0;
+	public static final String MODE_THREADLOCAL = "MODE_THREADLOCAL";
+	public static final String MODE_INHERITABLETHREADLOCAL = "MODE_INHERITABLETHREADLOCAL";
+	public static final String MODE_GLOBAL = "MODE_GLOBAL";
+	public static final String SYSTEM_PROPERTY = "spring.security.strategy";
+	private static String strategyName = System.getProperty(SYSTEM_PROPERTY);
+	private static SecurityContextHolderStrategy strategy;
+	private static int initializeCount = 0;
 
-    static {
-        initialize();
-    }
+	static {
+		initialize();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Explicitly clears the context value from the current thread.
-     */
-    public static void clearContext() {
-        strategy.clearContext();
-    }
+	/**
+	 * Explicitly clears the context value from the current thread.
+	 */
+	public static void clearContext() {
+		strategy.clearContext();
+	}
 
-    /**
-     * Obtain the current <code>SecurityContext</code>.
-     *
-     * @return the security context (never <code>null</code>)
-     */
-    public static SecurityContext getContext() {
-        return strategy.getContext();
-    }
+	/**
+	 * Obtain the current <code>SecurityContext</code>.
+	 *
+	 * @return the security context (never <code>null</code>)
+	 */
+	public static SecurityContext getContext() {
+		return strategy.getContext();
+	}
 
-    /**
-     * Primarily for troubleshooting purposes, this method shows how many times the class has re-initialized its
-     * <code>SecurityContextHolderStrategy</code>.
-     *
-     * @return the count (should be one unless you've called {@link #setStrategyName(String)} to switch to an alternate
-     *         strategy.
-     */
-    public static int getInitializeCount() {
-        return initializeCount;
-    }
+	/**
+	 * Primarily for troubleshooting purposes, this method shows how many times the class
+	 * has re-initialized its <code>SecurityContextHolderStrategy</code>.
+	 *
+	 * @return the count (should be one unless you've called
+	 * {@link #setStrategyName(String)} to switch to an alternate strategy.
+	 */
+	public static int getInitializeCount() {
+		return initializeCount;
+	}
 
-    private static void initialize() {
-        if ((strategyName == null) || "".equals(strategyName)) {
-            // Set default
-            strategyName = MODE_THREADLOCAL;
-        }
+	private static void initialize() {
+		if ((strategyName == null) || "".equals(strategyName)) {
+			// Set default
+			strategyName = MODE_THREADLOCAL;
+		}
 
-        if (strategyName.equals(MODE_THREADLOCAL)) {
-            strategy = new ThreadLocalSecurityContextHolderStrategy();
-        } else if (strategyName.equals(MODE_INHERITABLETHREADLOCAL)) {
-            strategy = new InheritableThreadLocalSecurityContextHolderStrategy();
-        } else if (strategyName.equals(MODE_GLOBAL)) {
-            strategy = new GlobalSecurityContextHolderStrategy();
-        } else {
-            // Try to load a custom strategy
-            try {
-                Class<?> clazz = Class.forName(strategyName);
-                Constructor<?> customStrategy = clazz.getConstructor();
-                strategy = (SecurityContextHolderStrategy) customStrategy.newInstance();
-            } catch (Exception ex) {
-                ReflectionUtils.handleReflectionException(ex);
-            }
-        }
+		if (strategyName.equals(MODE_THREADLOCAL)) {
+			strategy = new ThreadLocalSecurityContextHolderStrategy();
+		}
+		else if (strategyName.equals(MODE_INHERITABLETHREADLOCAL)) {
+			strategy = new InheritableThreadLocalSecurityContextHolderStrategy();
+		}
+		else if (strategyName.equals(MODE_GLOBAL)) {
+			strategy = new GlobalSecurityContextHolderStrategy();
+		}
+		else {
+			// Try to load a custom strategy
+			try {
+				Class<?> clazz = Class.forName(strategyName);
+				Constructor<?> customStrategy = clazz.getConstructor();
+				strategy = (SecurityContextHolderStrategy) customStrategy.newInstance();
+			}
+			catch (Exception ex) {
+				ReflectionUtils.handleReflectionException(ex);
+			}
+		}
 
-        initializeCount++;
-    }
+		initializeCount++;
+	}
 
-    /**
-     * Associates a new <code>SecurityContext</code> with the current thread of execution.
-     *
-     * @param context the new <code>SecurityContext</code> (may not be <code>null</code>)
-     */
-    public static void setContext(SecurityContext context) {
-        strategy.setContext(context);
-    }
+	/**
+	 * Associates a new <code>SecurityContext</code> with the current thread of execution.
+	 *
+	 * @param context the new <code>SecurityContext</code> (may not be <code>null</code>)
+	 */
+	public static void setContext(SecurityContext context) {
+		strategy.setContext(context);
+	}
 
-    /**
-     * Changes the preferred strategy. Do <em>NOT</em> call this method more than once for a given JVM, as it
-     * will re-initialize the strategy and adversely affect any existing threads using the old strategy.
-     *
-     * @param strategyName the fully qualified class name of the strategy that should be used.
-     */
-    public static void setStrategyName(String strategyName) {
-        SecurityContextHolder.strategyName = strategyName;
-        initialize();
-    }
+	/**
+	 * Changes the preferred strategy. Do <em>NOT</em> call this method more than once for
+	 * a given JVM, as it will re-initialize the strategy and adversely affect any
+	 * existing threads using the old strategy.
+	 *
+	 * @param strategyName the fully qualified class name of the strategy that should be
+	 * used.
+	 */
+	public static void setStrategyName(String strategyName) {
+		SecurityContextHolder.strategyName = strategyName;
+		initialize();
+	}
 
-    /**
-     * Allows retrieval of the context strategy. See SEC-1188.
-     *
-     * @return the configured strategy for storing the security context.
-     */
-    public static SecurityContextHolderStrategy getContextHolderStrategy() {
-        return strategy;
-    }
+	/**
+	 * Allows retrieval of the context strategy. See SEC-1188.
+	 *
+	 * @return the configured strategy for storing the security context.
+	 */
+	public static SecurityContextHolderStrategy getContextHolderStrategy() {
+		return strategy;
+	}
 
-    /**
-     * Delegates the creation of a new, empty context to the configured strategy.
-     */
-    public static SecurityContext createEmptyContext() {
-        return strategy.createEmptyContext();
-    }
+	/**
+	 * Delegates the creation of a new, empty context to the configured strategy.
+	 */
+	public static SecurityContext createEmptyContext() {
+		return strategy.createEmptyContext();
+	}
 
-    public String toString() {
-        return "SecurityContextHolder[strategy='" + strategyName + "'; initializeCount=" + initializeCount + "]";
-    }
+	public String toString() {
+		return "SecurityContextHolder[strategy='" + strategyName + "'; initializeCount="
+				+ initializeCount + "]";
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
index 291a825947..9df417f618 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextHolderStrategy.java
@@ -24,33 +24,37 @@ package org.springframework.security.core.context;
  * @author Ben Alex
  */
 public interface SecurityContextHolderStrategy {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Clears the current context.
-     */
-    void clearContext();
+	/**
+	 * Clears the current context.
+	 */
+	void clearContext();
 
-    /**
-     * Obtains the current context.
-     *
-     * @return a context (never <code>null</code> - create a default implementation if necessary)
-     */
-    SecurityContext getContext();
+	/**
+	 * Obtains the current context.
+	 *
+	 * @return a context (never <code>null</code> - create a default implementation if
+	 * necessary)
+	 */
+	SecurityContext getContext();
 
-    /**
-     * Sets the current context.
-     *
-     * @param context to the new argument (should never be <code>null</code>, although implementations must check if
-     *        <code>null</code> has been passed and throw an <code>IllegalArgumentException</code> in such cases)
-     */
-    void setContext(SecurityContext context);
+	/**
+	 * Sets the current context.
+	 *
+	 * @param context to the new argument (should never be <code>null</code>, although
+	 * implementations must check if <code>null</code> has been passed and throw an
+	 * <code>IllegalArgumentException</code> in such cases)
+	 */
+	void setContext(SecurityContext context);
 
-    /**
-     * Creates a new, empty context implementation, for use by <tt>SecurityContextRepository</tt> implementations,
-     * when creating a new context for the first time.
-     *
-     * @return the empty context.
-     */
-    SecurityContext createEmptyContext();
+	/**
+	 * Creates a new, empty context implementation, for use by
+	 * <tt>SecurityContextRepository</tt> implementations, when creating a new context for
+	 * the first time.
+	 *
+	 * @return the empty context.
+	 */
+	SecurityContext createEmptyContext();
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
index 0018fdd88d..c719e81f5d 100644
--- a/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
+++ b/core/src/main/java/org/springframework/security/core/context/SecurityContextImpl.java
@@ -18,7 +18,6 @@ package org.springframework.security.core.context;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
  * Base implementation of {@link SecurityContext}.
  * <p>
@@ -28,57 +27,61 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
  */
 public class SecurityContextImpl implements SecurityContext {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Authentication authentication;
+	private Authentication authentication;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object obj) {
-        if (obj instanceof SecurityContextImpl) {
-            SecurityContextImpl test = (SecurityContextImpl) obj;
+	public boolean equals(Object obj) {
+		if (obj instanceof SecurityContextImpl) {
+			SecurityContextImpl test = (SecurityContextImpl) obj;
 
-            if ((this.getAuthentication() == null) && (test.getAuthentication() == null)) {
-                return true;
-            }
+			if ((this.getAuthentication() == null) && (test.getAuthentication() == null)) {
+				return true;
+			}
 
-            if ((this.getAuthentication() != null) && (test.getAuthentication() != null)
-                && this.getAuthentication().equals(test.getAuthentication())) {
-                return true;
-            }
-        }
+			if ((this.getAuthentication() != null) && (test.getAuthentication() != null)
+					&& this.getAuthentication().equals(test.getAuthentication())) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public Authentication getAuthentication() {
-        return authentication;
-    }
+	public Authentication getAuthentication() {
+		return authentication;
+	}
 
-    public int hashCode() {
-        if (this.authentication == null) {
-            return -1;
-        } else {
-            return this.authentication.hashCode();
-        }
-    }
+	public int hashCode() {
+		if (this.authentication == null) {
+			return -1;
+		}
+		else {
+			return this.authentication.hashCode();
+		}
+	}
 
-    public void setAuthentication(Authentication authentication) {
-        this.authentication = authentication;
-    }
+	public void setAuthentication(Authentication authentication) {
+		this.authentication = authentication;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString());
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString());
 
-        if (this.authentication == null) {
-            sb.append(": Null authentication");
-        } else {
-            sb.append(": Authentication: ").append(this.authentication);
-        }
+		if (this.authentication == null) {
+			sb.append(": Null authentication");
+		}
+		else {
+			sb.append(": Authentication: ").append(this.authentication);
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
index 704f277a00..91b77197d2 100644
--- a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
+++ b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java
@@ -17,43 +17,46 @@ package org.springframework.security.core.context;
 
 import org.springframework.util.Assert;
 
-
 /**
- * A <code>ThreadLocal</code>-based implementation of {@link SecurityContextHolderStrategy}.
+ * A <code>ThreadLocal</code>-based implementation of
+ * {@link SecurityContextHolderStrategy}.
  *
  * @author Ben Alex
  *
  * @see java.lang.ThreadLocal
  * @see org.springframework.security.core.context.web.SecurityContextPersistenceFilter
  */
-final class ThreadLocalSecurityContextHolderStrategy implements SecurityContextHolderStrategy {
-    //~ Static fields/initializers =====================================================================================
+final class ThreadLocalSecurityContextHolderStrategy implements
+		SecurityContextHolderStrategy {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final ThreadLocal<SecurityContext> contextHolder = new ThreadLocal<SecurityContext>();
+	private static final ThreadLocal<SecurityContext> contextHolder = new ThreadLocal<SecurityContext>();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void clearContext() {
-        contextHolder.remove();
-    }
+	public void clearContext() {
+		contextHolder.remove();
+	}
 
-    public SecurityContext getContext() {
-        SecurityContext ctx = contextHolder.get();
+	public SecurityContext getContext() {
+		SecurityContext ctx = contextHolder.get();
 
-        if (ctx == null) {
-            ctx = createEmptyContext();
-            contextHolder.set(ctx);
-        }
+		if (ctx == null) {
+			ctx = createEmptyContext();
+			contextHolder.set(ctx);
+		}
 
-        return ctx;
-    }
+		return ctx;
+	}
 
-    public void setContext(SecurityContext context) {
-        Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
-        contextHolder.set(context);
-    }
+	public void setContext(SecurityContext context) {
+		Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
+		contextHolder.set(context);
+	}
 
-    public SecurityContext createEmptyContext() {
-        return new SecurityContextImpl();
-    }
+	public SecurityContext createEmptyContext() {
+		return new SecurityContextImpl();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/context/package-info.java b/core/src/main/java/org/springframework/security/core/context/package-info.java
index b102eaef4b..b85db38e60 100644
--- a/core/src/main/java/org/springframework/security/core/context/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/context/package-info.java
@@ -9,3 +9,4 @@
  * by calling the {@link org.springframework.security.core.context.SecurityContextHolder SecurityContextHolder}.
  */
 package org.springframework.security.core.context;
+
diff --git a/core/src/main/java/org/springframework/security/core/package-info.java b/core/src/main/java/org/springframework/security/core/package-info.java
index aea31f4b30..c3e9d20e99 100644
--- a/core/src/main/java/org/springframework/security/core/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/package-info.java
@@ -3,3 +3,4 @@
  * a security context.
  */
 package org.springframework.security.core;
+
diff --git a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java
index 544ec99d1d..786055be9a 100644
--- a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java
+++ b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java
@@ -33,19 +33,19 @@ import org.springframework.util.ReflectionUtils;
 
 /**
  * Allows finding parameter names using the value attribute of any number of
- * {@link Annotation} instances. This is useful when needing to discover the
- * parameter names of interfaces with Spring Security's method level security.
- * For example, consider the following:
+ * {@link Annotation} instances. This is useful when needing to discover the parameter
+ * names of interfaces with Spring Security's method level security. For example, consider
+ * the following:
  *
  * <pre>
  * import org.springframework.security.access.method.P;
- *
+ * 
  * @PostAuthorize("#to == returnObject.to")
  * public Message findMessageByTo(@P("to") String to);
  * </pre>
  *
- * We can make this possible using the following
- * {@link AnnotationParameterNameDiscoverer}:
+ * We can make this possible using the following {@link AnnotationParameterNameDiscoverer}
+ * :
  *
  * <pre>
  * ParameterAnnotationsNameDiscoverer discoverer = new ParameterAnnotationsNameDiscoverer(
@@ -53,33 +53,31 @@ import org.springframework.util.ReflectionUtils;
  * </pre>
  *
  * <p>
- * It is common for users to use {@link AnnotationParameterNameDiscoverer} in
- * conjuction with {@link PrioritizedParameterNameDiscoverer}. In fact, Spring
- * Security's {@link DefaultSecurityParameterNameDiscoverer} (which is used by
- * default with method level security) extends
- * {@link PrioritizedParameterNameDiscoverer} and will automatically support
- * both {@link P} and Spring Data's Param annotation if it is found on the
- * classpath.
+ * It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjuction
+ * with {@link PrioritizedParameterNameDiscoverer}. In fact, Spring Security's
+ * {@link DefaultSecurityParameterNameDiscoverer} (which is used by default with method
+ * level security) extends {@link PrioritizedParameterNameDiscoverer} and will
+ * automatically support both {@link P} and Spring Data's Param annotation if it is found
+ * on the classpath.
  * </p>
  *
  * <p>
- * It is important to note that if a single parameter name has a supported
- * annotation on it then all methods are resolved using
- * {@link AnnotationParameterNameDiscoverer}. For example, consider the
- * following:
+ * It is important to note that if a single parameter name has a supported annotation on
+ * it then all methods are resolved using {@link AnnotationParameterNameDiscoverer}. For
+ * example, consider the following:
  * </p>
  *
  * <pre>
  * import org.springframework.security.access.method.P;
- *
+ * 
  * @PostAuthorize("#to == returnObject.to")
  * public Message findMessageByToAndFrom(@P("to") User to, User from);
  * </pre>
  *
  * <p>
  * The result of finding parameters on the previous sample will be
- * <code>new String[] { "to", null}</code> since only a single parameter
- * contains an annotation. This is mostly due to the fact that the fallbacks for
+ * <code>new String[] { "to", null}</code> since only a single parameter contains an
+ * annotation. This is mostly due to the fact that the fallbacks for
  * {@link PrioritizedParameterNameDiscoverer} are an all or nothing operation.
  * </p>
  *
@@ -88,142 +86,139 @@ import org.springframework.util.ReflectionUtils;
  * @author Rob Winch
  * @since 3.2
  */
-public class AnnotationParameterNameDiscoverer implements
-        ParameterNameDiscoverer {
+public class AnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
 
-    private final Set<String> annotationClassesToUse;
+	private final Set<String> annotationClassesToUse;
 
-    public AnnotationParameterNameDiscoverer(String... annotationClassToUse) {
-        this(new HashSet<String>(Arrays.asList(annotationClassToUse)));
-    }
+	public AnnotationParameterNameDiscoverer(String... annotationClassToUse) {
+		this(new HashSet<String>(Arrays.asList(annotationClassToUse)));
+	}
 
-    public AnnotationParameterNameDiscoverer(Set<String> annotationClassesToUse) {
-        Assert.notEmpty(annotationClassesToUse,
-                "annotationClassesToUse cannot be null or empty");
-        this.annotationClassesToUse = annotationClassesToUse;
-    }
+	public AnnotationParameterNameDiscoverer(Set<String> annotationClassesToUse) {
+		Assert.notEmpty(annotationClassesToUse,
+				"annotationClassesToUse cannot be null or empty");
+		this.annotationClassesToUse = annotationClassesToUse;
+	}
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.core.ParameterNameDiscoverer#getParameterNames(java
-     * .lang.reflect.Method)
-     */
-    public String[] getParameterNames(Method method) {
-        Method originalMethod = BridgeMethodResolver.findBridgedMethod(method);
-        String[] paramNames = lookupParameterNames(METHOD_METHODPARAM_FACTORY, originalMethod);
-        if(paramNames != null) {
-            return paramNames;
-        }
-        Class<?> declaringClass = method.getDeclaringClass();
-        Class<?>[] interfaces = declaringClass.getInterfaces();
-        for(Class<?> intrfc : interfaces) {
-            Method intrfcMethod = ReflectionUtils.findMethod(intrfc, method.getName(), method.getParameterTypes());
-            if(intrfcMethod != null) {
-                return lookupParameterNames(METHOD_METHODPARAM_FACTORY, intrfcMethod);
-            }
-        }
-        return paramNames;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.core.ParameterNameDiscoverer#getParameterNames(java
+	 * .lang.reflect.Method)
+	 */
+	public String[] getParameterNames(Method method) {
+		Method originalMethod = BridgeMethodResolver.findBridgedMethod(method);
+		String[] paramNames = lookupParameterNames(METHOD_METHODPARAM_FACTORY,
+				originalMethod);
+		if (paramNames != null) {
+			return paramNames;
+		}
+		Class<?> declaringClass = method.getDeclaringClass();
+		Class<?>[] interfaces = declaringClass.getInterfaces();
+		for (Class<?> intrfc : interfaces) {
+			Method intrfcMethod = ReflectionUtils.findMethod(intrfc, method.getName(),
+					method.getParameterTypes());
+			if (intrfcMethod != null) {
+				return lookupParameterNames(METHOD_METHODPARAM_FACTORY, intrfcMethod);
+			}
+		}
+		return paramNames;
+	}
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.core.ParameterNameDiscoverer#getParameterNames(java
-     * .lang.reflect.Constructor)
-     */
-    public String[] getParameterNames(Constructor<?> constructor) {
-        return lookupParameterNames(CONSTRUCTOR_METHODPARAM_FACTORY,
-                constructor);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.core.ParameterNameDiscoverer#getParameterNames(java
+	 * .lang.reflect.Constructor)
+	 */
+	public String[] getParameterNames(Constructor<?> constructor) {
+		return lookupParameterNames(CONSTRUCTOR_METHODPARAM_FACTORY, constructor);
+	}
 
-    /**
-     * Gets the parameter names or null if not found.
-     *
-     * @param parameterNameFactory the {@link ParameterNameFactory} to use
-     * @param t the {@link AccessibleObject} to find the parameter names on (i.e. Method or Constructor)
-     * @return the parameter names or null
-     */
-    private <T extends AccessibleObject> String[] lookupParameterNames(
-            ParameterNameFactory<T> parameterNameFactory, T t) {
-        int parameterCount = parameterNameFactory.getParamCount(t);
-        String[] paramNames = new String[parameterCount];
-        boolean found = false;
-        for (int i = 0; i < parameterCount; i++) {
-            Annotation[] annotations = parameterNameFactory.findAnnotationsAt(t, i);
-            String parameterName = findParameterName(annotations);
-            if (parameterName != null) {
-                found = true;
-                paramNames[i] = parameterName;
-            }
-        }
-        return found ? paramNames : null;
-    }
+	/**
+	 * Gets the parameter names or null if not found.
+	 *
+	 * @param parameterNameFactory the {@link ParameterNameFactory} to use
+	 * @param t the {@link AccessibleObject} to find the parameter names on (i.e. Method
+	 * or Constructor)
+	 * @return the parameter names or null
+	 */
+	private <T extends AccessibleObject> String[] lookupParameterNames(
+			ParameterNameFactory<T> parameterNameFactory, T t) {
+		int parameterCount = parameterNameFactory.getParamCount(t);
+		String[] paramNames = new String[parameterCount];
+		boolean found = false;
+		for (int i = 0; i < parameterCount; i++) {
+			Annotation[] annotations = parameterNameFactory.findAnnotationsAt(t, i);
+			String parameterName = findParameterName(annotations);
+			if (parameterName != null) {
+				found = true;
+				paramNames[i] = parameterName;
+			}
+		}
+		return found ? paramNames : null;
+	}
 
-    /**
-     * Finds the parameter name from the provided {@link Annotation}s or null if
-     * it could not find it. The search is done by looking at the value property
-     * of the {@link #annotationClassesToUse}.
-     *
-     * @param parameterAnnotations
-     *            the {@link Annotation}'s to search.
-     * @return
-     */
-    private String findParameterName(Annotation[] parameterAnnotations) {
-        for (Annotation paramAnnotation : parameterAnnotations) {
-            if (annotationClassesToUse.contains(paramAnnotation
-                    .annotationType().getName())) {
-                return (String) AnnotationUtils.getValue(paramAnnotation,
-                        "value");
-            }
-        }
-        return null;
-    }
+	/**
+	 * Finds the parameter name from the provided {@link Annotation}s or null if it could
+	 * not find it. The search is done by looking at the value property of the
+	 * {@link #annotationClassesToUse}.
+	 *
+	 * @param parameterAnnotations the {@link Annotation}'s to search.
+	 * @return
+	 */
+	private String findParameterName(Annotation[] parameterAnnotations) {
+		for (Annotation paramAnnotation : parameterAnnotations) {
+			if (annotationClassesToUse.contains(paramAnnotation.annotationType()
+					.getName())) {
+				return (String) AnnotationUtils.getValue(paramAnnotation, "value");
+			}
+		}
+		return null;
+	}
 
-    private static final ParameterNameFactory<Constructor<?>> CONSTRUCTOR_METHODPARAM_FACTORY = new ParameterNameFactory<Constructor<?>>() {
-        public int getParamCount(Constructor<?> constructor) {
-            return constructor.getParameterTypes().length;
-        }
+	private static final ParameterNameFactory<Constructor<?>> CONSTRUCTOR_METHODPARAM_FACTORY = new ParameterNameFactory<Constructor<?>>() {
+		public int getParamCount(Constructor<?> constructor) {
+			return constructor.getParameterTypes().length;
+		}
 
-        public Annotation[] findAnnotationsAt(Constructor<?> constructor, int index) {
-            return constructor.getParameterAnnotations()[index];
-        }
-    };
+		public Annotation[] findAnnotationsAt(Constructor<?> constructor, int index) {
+			return constructor.getParameterAnnotations()[index];
+		}
+	};
 
-    private static final ParameterNameFactory<Method> METHOD_METHODPARAM_FACTORY = new ParameterNameFactory<Method>() {
-        public int getParamCount(Method method) {
-            return method.getParameterTypes().length;
-        }
+	private static final ParameterNameFactory<Method> METHOD_METHODPARAM_FACTORY = new ParameterNameFactory<Method>() {
+		public int getParamCount(Method method) {
+			return method.getParameterTypes().length;
+		}
 
-        public Annotation[] findAnnotationsAt(Method method, int index) {
-            return method.getParameterAnnotations()[index];
-        }
-    };
+		public Annotation[] findAnnotationsAt(Method method, int index) {
+			return method.getParameterAnnotations()[index];
+		}
+	};
 
-    /**
-     * Strategy interface for looking up the parameter names.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     *
-     * @param <T> the type to inspect (i.e. {@link Method} or {@link Constructor})
-     */
-    private interface ParameterNameFactory<T extends AccessibleObject> {
-        /**
-         * Gets the parameter count
-         * @param t
-         * @return
-         */
-        int getParamCount(T t);
+	/**
+	 * Strategy interface for looking up the parameter names.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 *
+	 * @param <T> the type to inspect (i.e. {@link Method} or {@link Constructor})
+	 */
+	private interface ParameterNameFactory<T extends AccessibleObject> {
+		/**
+		 * Gets the parameter count
+		 * @param t
+		 * @return
+		 */
+		int getParamCount(T t);
 
-        /**
-         * Gets the {@link Annotation}s at a specified index
-         * @param t
-         * @param index
-         * @return
-         */
-        Annotation[] findAnnotationsAt(T t, int index);
-    }
+		/**
+		 * Gets the {@link Annotation}s at a specified index
+		 * @param t
+		 * @param index
+		 * @return
+		 */
+		Annotation[] findAnnotationsAt(T t, int index);
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java
index a4eefe72e6..c9d41c6baf 100644
--- a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java
+++ b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java
@@ -30,18 +30,16 @@ import org.springframework.security.access.method.P;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-
 /**
- * Spring Security's default {@link ParameterNameDiscoverer} which tries a
- * number of {@link ParameterNameDiscoverer} depending on what is found on the
- * classpath.
+ * Spring Security's default {@link ParameterNameDiscoverer} which tries a number of
+ * {@link ParameterNameDiscoverer} depending on what is found on the classpath.
  *
  * <ul>
- * <li>Will use an instance of {@link AnnotationParameterNameDiscoverer} with
- * {@link P} as a valid annotation. If, Spring Data is on the classpath will
- * also add Param annotation.</li>
- * <li>If Spring 4 is on the classpath, then DefaultParameterNameDiscoverer is
- * added. This attempts to use JDK 8 information first and falls back to
+ * <li>Will use an instance of {@link AnnotationParameterNameDiscoverer} with {@link P} as
+ * a valid annotation. If, Spring Data is on the classpath will also add Param annotation.
+ * </li>
+ * <li>If Spring 4 is on the classpath, then DefaultParameterNameDiscoverer is added. This
+ * attempts to use JDK 8 information first and falls back to
  * {@link LocalVariableTableParameterNameDiscoverer}.</li>
  * <li>If Spring 4 is not on the classpath, then
  * {@link LocalVariableTableParameterNameDiscoverer} is added directly.</li>
@@ -53,40 +51,44 @@ import org.springframework.util.ClassUtils;
  * @since 3.2
  */
 public class DefaultSecurityParameterNameDiscoverer extends
-        PrioritizedParameterNameDiscoverer {
+		PrioritizedParameterNameDiscoverer {
 
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private static final String DATA_PARAM_CLASSNAME = "org.springframework.data.repository.query.Param";
-    private static final boolean DATA_PARAM_PRESENT =
-            ClassUtils.isPresent(DATA_PARAM_CLASSNAME, DefaultSecurityParameterNameDiscoverer.class.getClassLoader());
+	private static final String DATA_PARAM_CLASSNAME = "org.springframework.data.repository.query.Param";
+	private static final boolean DATA_PARAM_PRESENT = ClassUtils.isPresent(
+			DATA_PARAM_CLASSNAME,
+			DefaultSecurityParameterNameDiscoverer.class.getClassLoader());
 
-    /**
-     * Creates a new instance with only the default
-     * {@link ParameterNameDiscoverer} instances.
-     */
-    public DefaultSecurityParameterNameDiscoverer() {
-        this(Collections.<ParameterNameDiscoverer>emptyList());
-    }
+	/**
+	 * Creates a new instance with only the default {@link ParameterNameDiscoverer}
+	 * instances.
+	 */
+	public DefaultSecurityParameterNameDiscoverer() {
+		this(Collections.<ParameterNameDiscoverer> emptyList());
+	}
 
-    /**
-     * Creates a new instance that first tries the passed in {@link ParameterNameDiscoverer} instances.
-     * @param parameterNameDiscovers the {@link ParameterNameDiscoverer} before trying the defaults. Cannot be null.
-     */
-    @SuppressWarnings("unchecked")
-    public DefaultSecurityParameterNameDiscoverer(List<? extends ParameterNameDiscoverer> parameterNameDiscovers) {
-        Assert.notNull(parameterNameDiscovers, "parameterNameDiscovers cannot be null");
-        for(ParameterNameDiscoverer discover : parameterNameDiscovers) {
-            addDiscoverer(discover);
-        }
+	/**
+	 * Creates a new instance that first tries the passed in
+	 * {@link ParameterNameDiscoverer} instances.
+	 * @param parameterNameDiscovers the {@link ParameterNameDiscoverer} before trying the
+	 * defaults. Cannot be null.
+	 */
+	@SuppressWarnings("unchecked")
+	public DefaultSecurityParameterNameDiscoverer(
+			List<? extends ParameterNameDiscoverer> parameterNameDiscovers) {
+		Assert.notNull(parameterNameDiscovers, "parameterNameDiscovers cannot be null");
+		for (ParameterNameDiscoverer discover : parameterNameDiscovers) {
+			addDiscoverer(discover);
+		}
 
-        Set<String> annotationClassesToUse = new HashSet<String>(2);
-        annotationClassesToUse.add(P.class.getName());
-        if(DATA_PARAM_PRESENT) {
-            annotationClassesToUse.add(DATA_PARAM_CLASSNAME);
-        }
+		Set<String> annotationClassesToUse = new HashSet<String>(2);
+		annotationClassesToUse.add(P.class.getName());
+		if (DATA_PARAM_PRESENT) {
+			annotationClassesToUse.add(DATA_PARAM_CLASSNAME);
+		}
 
-        addDiscoverer(new AnnotationParameterNameDiscoverer(annotationClassesToUse));
-        addDiscoverer(new DefaultParameterNameDiscoverer());
-    }
+		addDiscoverer(new AnnotationParameterNameDiscoverer(annotationClassesToUse));
+		addDiscoverer(new DefaultParameterNameDiscoverer());
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java b/core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java
index d0d7108bb5..0865b81eaf 100644
--- a/core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java
+++ b/core/src/main/java/org/springframework/security/core/session/SessionCreationEvent.java
@@ -3,15 +3,15 @@ package org.springframework.security.core.session;
 import org.springframework.context.ApplicationEvent;
 
 /**
- * Generic session creation event which indicates that a session (potentially
- * represented by a security context) has begun.
+ * Generic session creation event which indicates that a session (potentially represented
+ * by a security context) has begun.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public abstract class SessionCreationEvent extends ApplicationEvent {
 
-    public SessionCreationEvent(Object source) {
-        super(source);
-    }
+	public SessionCreationEvent(Object source) {
+		super(source);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java b/core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java
index c288caeb3a..712e02a01e 100644
--- a/core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java
+++ b/core/src/main/java/org/springframework/security/core/session/SessionDestroyedEvent.java
@@ -14,21 +14,21 @@ import java.util.*;
  */
 public abstract class SessionDestroyedEvent extends ApplicationEvent {
 
-    public SessionDestroyedEvent(Object source) {
-        super(source);
-    }
+	public SessionDestroyedEvent(Object source) {
+		super(source);
+	}
 
-    /**
-     * Provides the {@code SecurityContext} instances which were associated with the destroyed session. Usually there
-     * will be only one security context per session.
-     *
-     * @return the {@code SecurityContext} instances which were stored in the current session (an empty list if there
-     * are none).
-     */
-    public abstract List<SecurityContext> getSecurityContexts();
+	/**
+	 * Provides the {@code SecurityContext} instances which were associated with the
+	 * destroyed session. Usually there will be only one security context per session.
+	 *
+	 * @return the {@code SecurityContext} instances which were stored in the current
+	 * session (an empty list if there are none).
+	 */
+	public abstract List<SecurityContext> getSecurityContexts();
 
-    /**
-     * @return the identifier associated with the destroyed session.
-     */
-    public abstract String getId();
+	/**
+	 * @return the identifier associated with the destroyed session.
+	 */
+	public abstract String getId();
 }
diff --git a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java
index 496a987c54..8fbc69306f 100644
--- a/core/src/main/java/org/springframework/security/core/session/SessionInformation.java
+++ b/core/src/main/java/org/springframework/security/core/session/SessionInformation.java
@@ -21,68 +21,72 @@ import org.springframework.util.Assert;
 import java.util.Date;
 import java.io.Serializable;
 
-
 /**
  * Represents a record of a session within the Spring Security framework.
  * <p>
  * This is primarily used for concurrent session support.
  * <p>
- * Sessions have three states: active, expired, and destroyed. A session can that is invalidated by
- * <code>session.invalidate()</code> or via Servlet Container management is considered "destroyed". An "expired"
- * session, on the other hand, is a session that Spring Security wants to end because it was selected for removal for
- * some reason (generally as it was the least recently used session and the maximum sessions for the user were
- * reached). An "expired" session is removed as soon as possible by a <code>Filter</code>.
+ * Sessions have three states: active, expired, and destroyed. A session can that is
+ * invalidated by <code>session.invalidate()</code> or via Servlet Container management is
+ * considered "destroyed". An "expired" session, on the other hand, is a session that
+ * Spring Security wants to end because it was selected for removal for some reason
+ * (generally as it was the least recently used session and the maximum sessions for the
+ * user were reached). An "expired" session is removed as soon as possible by a
+ * <code>Filter</code>.
  *
  * @author Ben Alex
  */
 public class SessionInformation implements Serializable {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Date lastRequest;
-    private final Object principal;
-    private final String sessionId;
-    private boolean expired = false;
+	private Date lastRequest;
+	private final Object principal;
+	private final String sessionId;
+	private boolean expired = false;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SessionInformation(Object principal, String sessionId, Date lastRequest) {
-        Assert.notNull(principal, "Principal required");
-        Assert.hasText(sessionId, "SessionId required");
-        Assert.notNull(lastRequest, "LastRequest required");
-        this.principal = principal;
-        this.sessionId = sessionId;
-        this.lastRequest = lastRequest;
-    }
+	public SessionInformation(Object principal, String sessionId, Date lastRequest) {
+		Assert.notNull(principal, "Principal required");
+		Assert.hasText(sessionId, "SessionId required");
+		Assert.notNull(lastRequest, "LastRequest required");
+		this.principal = principal;
+		this.sessionId = sessionId;
+		this.lastRequest = lastRequest;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void expireNow() {
-        this.expired = true;
-    }
+	public void expireNow() {
+		this.expired = true;
+	}
 
-    public Date getLastRequest() {
-        return lastRequest;
-    }
+	public Date getLastRequest() {
+		return lastRequest;
+	}
 
-    public Object getPrincipal() {
-        return principal;
-    }
+	public Object getPrincipal() {
+		return principal;
+	}
 
-    public String getSessionId() {
-        return sessionId;
-    }
+	public String getSessionId() {
+		return sessionId;
+	}
 
-    public boolean isExpired() {
-        return expired;
-    }
+	public boolean isExpired() {
+		return expired;
+	}
 
-    /**
-     * Refreshes the internal lastRequest to the current date and time.
-     */
-    public void refreshLastRequest() {
-        this.lastRequest = new Date();
-    }
+	/**
+	 * Refreshes the internal lastRequest to the current date and time.
+	 */
+	public void refreshLastRequest() {
+		this.lastRequest = new Date();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java
index 230b77bf37..52a752ce4d 100644
--- a/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java
+++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistry.java
@@ -23,59 +23,67 @@ import java.util.List;
  * @author Ben Alex
  */
 public interface SessionRegistry {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Obtains all the known principals in the <code>SessionRegistry</code>.
-     *
-     * @return each of the unique principals, which can then be presented to {@link #getAllSessions(Object, boolean)}.
-     */
-    List<Object> getAllPrincipals();
+	/**
+	 * Obtains all the known principals in the <code>SessionRegistry</code>.
+	 *
+	 * @return each of the unique principals, which can then be presented to
+	 * {@link #getAllSessions(Object, boolean)}.
+	 */
+	List<Object> getAllPrincipals();
 
-    /**
-     * Obtains all the known sessions for the specified principal. Sessions that have been destroyed are not
-     * returned. Sessions that have expired may be returned, depending on the passed argument.
-     *
-     * @param principal to locate sessions for (should never be <code>null</code>)
-     * @param includeExpiredSessions if <code>true</code>, the returned sessions will also include those that have
-     *        expired for the principal
-     *
-     * @return the matching sessions for this principal (should not return null).
-     */
-    List<SessionInformation> getAllSessions(Object principal, boolean includeExpiredSessions);
+	/**
+	 * Obtains all the known sessions for the specified principal. Sessions that have been
+	 * destroyed are not returned. Sessions that have expired may be returned, depending
+	 * on the passed argument.
+	 *
+	 * @param principal to locate sessions for (should never be <code>null</code>)
+	 * @param includeExpiredSessions if <code>true</code>, the returned sessions will also
+	 * include those that have expired for the principal
+	 *
+	 * @return the matching sessions for this principal (should not return null).
+	 */
+	List<SessionInformation> getAllSessions(Object principal,
+			boolean includeExpiredSessions);
 
-    /**
-     * Obtains the session information for the specified <code>sessionId</code>. Even expired sessions are
-     * returned (although destroyed sessions are never returned).
-     *
-     * @param sessionId to lookup (should never be <code>null</code>)
-     *
-     * @return the session information, or <code>null</code> if not found
-     */
-    SessionInformation getSessionInformation(String sessionId);
+	/**
+	 * Obtains the session information for the specified <code>sessionId</code>. Even
+	 * expired sessions are returned (although destroyed sessions are never returned).
+	 *
+	 * @param sessionId to lookup (should never be <code>null</code>)
+	 *
+	 * @return the session information, or <code>null</code> if not found
+	 */
+	SessionInformation getSessionInformation(String sessionId);
 
-    /**
-     * Updates the given <code>sessionId</code> so its last request time is equal to the present date and time.
-     * Silently returns if the given <code>sessionId</code> cannot be found or the session is marked to expire.
-     *
-     * @param sessionId for which to update the date and time of the last request (should never be <code>null</code>)
-     */
-    void refreshLastRequest(String sessionId);
+	/**
+	 * Updates the given <code>sessionId</code> so its last request time is equal to the
+	 * present date and time. Silently returns if the given <code>sessionId</code> cannot
+	 * be found or the session is marked to expire.
+	 *
+	 * @param sessionId for which to update the date and time of the last request (should
+	 * never be <code>null</code>)
+	 */
+	void refreshLastRequest(String sessionId);
 
-    /**
-     * Registers a new session for the specified principal. The newly registered session will not be marked for
-     * expiration.
-     *
-     * @param sessionId to associate with the principal (should never be <code>null</code>)
-     * @param principal to associate with the session (should never be <code>null</code>)
-     */
-    void registerNewSession(String sessionId, Object principal);
+	/**
+	 * Registers a new session for the specified principal. The newly registered session
+	 * will not be marked for expiration.
+	 *
+	 * @param sessionId to associate with the principal (should never be <code>null</code>
+	 * )
+	 * @param principal to associate with the session (should never be <code>null</code>)
+	 */
+	void registerNewSession(String sessionId, Object principal);
 
-    /**
-     * Deletes all the session information being maintained for the specified <code>sessionId</code>. If the
-     * <code>sessionId</code> is not found, the method gracefully returns.
-     *
-     * @param sessionId to delete information for (should never be <code>null</code>)
-     */
-    void removeSessionInformation(String sessionId);
+	/**
+	 * Deletes all the session information being maintained for the specified
+	 * <code>sessionId</code>. If the <code>sessionId</code> is not found, the method
+	 * gracefully returns.
+	 *
+	 * @param sessionId to delete information for (should never be <code>null</code>)
+	 */
+	void removeSessionInformation(String sessionId);
 }
diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java
index 566b8696f4..e6d8fd3bea 100644
--- a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java
+++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java
@@ -26,149 +26,163 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
- * Default implementation of {@link org.springframework.security.core.session.SessionRegistry SessionRegistry}
- * which listens for {@link org.springframework.security.core.session.SessionDestroyedEvent SessionDestroyedEvent}s
- * published in the Spring application context.
+ * Default implementation of
+ * {@link org.springframework.security.core.session.SessionRegistry SessionRegistry} which
+ * listens for {@link org.springframework.security.core.session.SessionDestroyedEvent
+ * SessionDestroyedEvent}s published in the Spring application context.
  * <p>
- * For this class to function correctly in a web application, it is important that you register an
- * {@link org.springframework.security.web.session.HttpSessionEventPublisher HttpSessionEventPublisher}
- * in the <tt>web.xml</tt> file so that this class is notified of sessions that expire.
+ * For this class to function correctly in a web application, it is important that you
+ * register an {@link org.springframework.security.web.session.HttpSessionEventPublisher
+ * HttpSessionEventPublisher} in the <tt>web.xml</tt> file so that this class is notified
+ * of sessions that expire.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public class SessionRegistryImpl implements SessionRegistry, ApplicationListener<SessionDestroyedEvent> {
+public class SessionRegistryImpl implements SessionRegistry,
+		ApplicationListener<SessionDestroyedEvent> {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final Log logger = LogFactory.getLog(SessionRegistryImpl.class);
+	protected final Log logger = LogFactory.getLog(SessionRegistryImpl.class);
 
-    /** <principal:Object,SessionIdSet> */
-    private final ConcurrentMap<Object,Set<String>> principals = new ConcurrentHashMap<Object,Set<String>>();
-    /** <sessionId:Object,SessionInformation> */
-    private final Map<String, SessionInformation> sessionIds = new ConcurrentHashMap<String, SessionInformation>();
+	/** <principal:Object,SessionIdSet> */
+	private final ConcurrentMap<Object, Set<String>> principals = new ConcurrentHashMap<Object, Set<String>>();
+	/** <sessionId:Object,SessionInformation> */
+	private final Map<String, SessionInformation> sessionIds = new ConcurrentHashMap<String, SessionInformation>();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public List<Object> getAllPrincipals() {
-        return new ArrayList<Object>(principals.keySet());
-    }
+	public List<Object> getAllPrincipals() {
+		return new ArrayList<Object>(principals.keySet());
+	}
 
-    public List<SessionInformation> getAllSessions(Object principal, boolean includeExpiredSessions) {
-        final Set<String> sessionsUsedByPrincipal = principals.get(principal);
+	public List<SessionInformation> getAllSessions(Object principal,
+			boolean includeExpiredSessions) {
+		final Set<String> sessionsUsedByPrincipal = principals.get(principal);
 
-        if (sessionsUsedByPrincipal == null) {
-            return Collections.emptyList();
-        }
+		if (sessionsUsedByPrincipal == null) {
+			return Collections.emptyList();
+		}
 
-        List<SessionInformation> list = new ArrayList<SessionInformation>(sessionsUsedByPrincipal.size());
+		List<SessionInformation> list = new ArrayList<SessionInformation>(
+				sessionsUsedByPrincipal.size());
 
-        for (String sessionId : sessionsUsedByPrincipal) {
-            SessionInformation sessionInformation = getSessionInformation(sessionId);
+		for (String sessionId : sessionsUsedByPrincipal) {
+			SessionInformation sessionInformation = getSessionInformation(sessionId);
 
-            if (sessionInformation == null) {
-                continue;
-            }
+			if (sessionInformation == null) {
+				continue;
+			}
 
-            if (includeExpiredSessions || !sessionInformation.isExpired()) {
-                list.add(sessionInformation);
-            }
-        }
+			if (includeExpiredSessions || !sessionInformation.isExpired()) {
+				list.add(sessionInformation);
+			}
+		}
 
-        return list;
-    }
+		return list;
+	}
 
-    public SessionInformation getSessionInformation(String sessionId) {
-        Assert.hasText(sessionId, "SessionId required as per interface contract");
+	public SessionInformation getSessionInformation(String sessionId) {
+		Assert.hasText(sessionId, "SessionId required as per interface contract");
 
-        return sessionIds.get(sessionId);
-    }
+		return sessionIds.get(sessionId);
+	}
 
-    public void onApplicationEvent(SessionDestroyedEvent event) {
-        String sessionId = event.getId();
-        removeSessionInformation(sessionId);
-    }
+	public void onApplicationEvent(SessionDestroyedEvent event) {
+		String sessionId = event.getId();
+		removeSessionInformation(sessionId);
+	}
 
-    public void refreshLastRequest(String sessionId) {
-        Assert.hasText(sessionId, "SessionId required as per interface contract");
+	public void refreshLastRequest(String sessionId) {
+		Assert.hasText(sessionId, "SessionId required as per interface contract");
 
-        SessionInformation info = getSessionInformation(sessionId);
+		SessionInformation info = getSessionInformation(sessionId);
 
-        if (info != null) {
-            info.refreshLastRequest();
-        }
-    }
+		if (info != null) {
+			info.refreshLastRequest();
+		}
+	}
 
-    public void registerNewSession(String sessionId, Object principal) {
-        Assert.hasText(sessionId, "SessionId required as per interface contract");
-        Assert.notNull(principal, "Principal required as per interface contract");
+	public void registerNewSession(String sessionId, Object principal) {
+		Assert.hasText(sessionId, "SessionId required as per interface contract");
+		Assert.notNull(principal, "Principal required as per interface contract");
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Registering session " + sessionId +", for principal " + principal);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Registering session " + sessionId + ", for principal "
+					+ principal);
+		}
 
-        if (getSessionInformation(sessionId) != null) {
-            removeSessionInformation(sessionId);
-        }
+		if (getSessionInformation(sessionId) != null) {
+			removeSessionInformation(sessionId);
+		}
 
-        sessionIds.put(sessionId, new SessionInformation(principal, sessionId, new Date()));
+		sessionIds.put(sessionId,
+				new SessionInformation(principal, sessionId, new Date()));
 
-        Set<String> sessionsUsedByPrincipal = principals.get(principal);
+		Set<String> sessionsUsedByPrincipal = principals.get(principal);
 
-        if (sessionsUsedByPrincipal == null) {
-            sessionsUsedByPrincipal = new CopyOnWriteArraySet<String>();
-            Set<String> prevSessionsUsedByPrincipal = principals.putIfAbsent(principal,
-                    sessionsUsedByPrincipal);
-            if (prevSessionsUsedByPrincipal != null) {
-                sessionsUsedByPrincipal = prevSessionsUsedByPrincipal;
-            }
-        }
+		if (sessionsUsedByPrincipal == null) {
+			sessionsUsedByPrincipal = new CopyOnWriteArraySet<String>();
+			Set<String> prevSessionsUsedByPrincipal = principals.putIfAbsent(principal,
+					sessionsUsedByPrincipal);
+			if (prevSessionsUsedByPrincipal != null) {
+				sessionsUsedByPrincipal = prevSessionsUsedByPrincipal;
+			}
+		}
 
-        sessionsUsedByPrincipal.add(sessionId);
+		sessionsUsedByPrincipal.add(sessionId);
 
-        if (logger.isTraceEnabled()) {
-            logger.trace("Sessions used by '" + principal + "' : " + sessionsUsedByPrincipal);
-        }
-    }
+		if (logger.isTraceEnabled()) {
+			logger.trace("Sessions used by '" + principal + "' : "
+					+ sessionsUsedByPrincipal);
+		}
+	}
 
-    public void removeSessionInformation(String sessionId) {
-        Assert.hasText(sessionId, "SessionId required as per interface contract");
+	public void removeSessionInformation(String sessionId) {
+		Assert.hasText(sessionId, "SessionId required as per interface contract");
 
-        SessionInformation info = getSessionInformation(sessionId);
+		SessionInformation info = getSessionInformation(sessionId);
 
-        if (info == null) {
-            return;
-        }
+		if (info == null) {
+			return;
+		}
 
-        if (logger.isTraceEnabled()) {
-            logger.debug("Removing session " + sessionId + " from set of registered sessions");
-        }
+		if (logger.isTraceEnabled()) {
+			logger.debug("Removing session " + sessionId
+					+ " from set of registered sessions");
+		}
 
-        sessionIds.remove(sessionId);
+		sessionIds.remove(sessionId);
 
-        Set<String> sessionsUsedByPrincipal = principals.get(info.getPrincipal());
+		Set<String> sessionsUsedByPrincipal = principals.get(info.getPrincipal());
 
-        if (sessionsUsedByPrincipal == null) {
-            return;
-        }
+		if (sessionsUsedByPrincipal == null) {
+			return;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Removing session " + sessionId + " from principal's set of registered sessions");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Removing session " + sessionId
+					+ " from principal's set of registered sessions");
+		}
 
-        sessionsUsedByPrincipal.remove(sessionId);
+		sessionsUsedByPrincipal.remove(sessionId);
 
-        if (sessionsUsedByPrincipal.isEmpty()) {
-            // No need to keep object in principals Map anymore
-            if (logger.isDebugEnabled()) {
-                logger.debug("Removing principal " + info.getPrincipal() + " from registry");
-            }
-            principals.remove(info.getPrincipal());
-        }
+		if (sessionsUsedByPrincipal.isEmpty()) {
+			// No need to keep object in principals Map anymore
+			if (logger.isDebugEnabled()) {
+				logger.debug("Removing principal " + info.getPrincipal()
+						+ " from registry");
+			}
+			principals.remove(info.getPrincipal());
+		}
 
-        if (logger.isTraceEnabled()) {
-            logger.trace("Sessions used by '" + info.getPrincipal() + "' : " + sessionsUsedByPrincipal);
-        }
-    }
+		if (logger.isTraceEnabled()) {
+			logger.trace("Sessions used by '" + info.getPrincipal() + "' : "
+					+ sessionsUsedByPrincipal);
+		}
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/session/package-info.java b/core/src/main/java/org/springframework/security/core/session/package-info.java
index a8cc7b7506..fe4a5e0028 100644
--- a/core/src/main/java/org/springframework/security/core/session/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/session/package-info.java
@@ -4,3 +4,4 @@
  * is a core part of the web-based concurrent session control, but the code is not dependent on any of the servlet APIs.
  */
 package org.springframework.security.core.session;
+
diff --git a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
index 6e3e444ad7..b2cfca0119 100644
--- a/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
+++ b/core/src/main/java/org/springframework/security/core/token/DefaultToken.java
@@ -11,49 +11,51 @@ import org.springframework.util.Assert;
  * @since 2.0.1
  */
 public class DefaultToken implements Token {
-    private final String key;
-    private final long keyCreationTime;
-    private final String extendedInformation;
+	private final String key;
+	private final long keyCreationTime;
+	private final String extendedInformation;
 
-    public DefaultToken(String key, long keyCreationTime, String extendedInformation) {
-        Assert.hasText(key, "Key required");
-        Assert.notNull(extendedInformation, "Extended information cannot be null");
-        this.key = key;
-        this.keyCreationTime = keyCreationTime;
-        this.extendedInformation = extendedInformation;
-    }
+	public DefaultToken(String key, long keyCreationTime, String extendedInformation) {
+		Assert.hasText(key, "Key required");
+		Assert.notNull(extendedInformation, "Extended information cannot be null");
+		this.key = key;
+		this.keyCreationTime = keyCreationTime;
+		this.extendedInformation = extendedInformation;
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public long getKeyCreationTime() {
-        return keyCreationTime;
-    }
+	public long getKeyCreationTime() {
+		return keyCreationTime;
+	}
 
-    public String getExtendedInformation() {
-        return extendedInformation;
-    }
+	public String getExtendedInformation() {
+		return extendedInformation;
+	}
 
-    public boolean equals(Object obj) {
-        if (obj != null && obj instanceof DefaultToken) {
-            DefaultToken rhs = (DefaultToken) obj;
-            return this.key.equals(rhs.key) && this.keyCreationTime == rhs.keyCreationTime && this.extendedInformation.equals(rhs.extendedInformation);
-        }
-        return false;
-    }
+	public boolean equals(Object obj) {
+		if (obj != null && obj instanceof DefaultToken) {
+			DefaultToken rhs = (DefaultToken) obj;
+			return this.key.equals(rhs.key)
+					&& this.keyCreationTime == rhs.keyCreationTime
+					&& this.extendedInformation.equals(rhs.extendedInformation);
+		}
+		return false;
+	}
 
-    public int hashCode() {
-        int code = 979;
-        code = code * key.hashCode();
-        code = code * new Long(keyCreationTime).hashCode();
-        code = code * extendedInformation.hashCode();
-        return code;
-    }
-
-    public String toString() {
-        return "DefaultToken[key=" + key + "; creation=" + new Date(keyCreationTime) + "; extended=" + extendedInformation + "]";
-    }
+	public int hashCode() {
+		int code = 979;
+		code = code * key.hashCode();
+		code = code * new Long(keyCreationTime).hashCode();
+		code = code * extendedInformation.hashCode();
+		return code;
+	}
 
+	public String toString() {
+		return "DefaultToken[key=" + key + "; creation=" + new Date(keyCreationTime)
+				+ "; extended=" + extendedInformation + "]";
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
index 1a2635829b..5add4fd067 100644
--- a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
+++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java
@@ -11,8 +11,8 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Basic implementation of {@link TokenService} that is compatible with clusters and across machine restarts,
- * without requiring database persistence.
+ * Basic implementation of {@link TokenService} that is compatible with clusters and
+ * across machine restarts, without requiring database persistence.
  *
  * <p>
  * Keys are produced in the format:
@@ -20,29 +20,33 @@ import org.springframework.util.StringUtils;
  *
  * <p>
  * Base64(creationTime + ":" + hex(pseudoRandomNumber) + ":" + extendedInformation + ":" +
- * Sha512Hex(creationTime + ":" + hex(pseudoRandomNumber) + ":" + extendedInformation + ":" + serverSecret) )
+ * Sha512Hex(creationTime + ":" + hex(pseudoRandomNumber) + ":" + extendedInformation +
+ * ":" + serverSecret) )
  * </p>
  *
  * <p>
- * In the above, <code>creationTime</code>, <code>tokenKey</code> and <code>extendedInformation</code>
- * are equal to that stored in {@link Token}. The <code>Sha512Hex</code> includes the same payload,
- * plus a <code>serverSecret</code>.
+ * In the above, <code>creationTime</code>, <code>tokenKey</code> and
+ * <code>extendedInformation</code> are equal to that stored in {@link Token}. The
+ * <code>Sha512Hex</code> includes the same payload, plus a <code>serverSecret</code>.
  * </p>
  *
  * <p>
- * The <code>serverSecret</code> varies every millisecond. It relies on two static server-side secrets. The first
- * is a password, and the second is a server integer. Both of these must remain the same for any issued keys
- * to subsequently be recognised. The applicable <code>serverSecret</code> in any millisecond is computed by
- * <code>password</code> + ":" + (<code>creationTime</code> % <code>serverInteger</code>). This approach
- * further obfuscates the actual server secret and renders attempts to compute the server secret more
- * limited in usefulness (as any false tokens would be forced to have a <code>creationTime</code> equal
- * to the computed hash). Recall that framework features depending on token services should reject tokens
- * that are relatively old in any event.
+ * The <code>serverSecret</code> varies every millisecond. It relies on two static
+ * server-side secrets. The first is a password, and the second is a server integer. Both
+ * of these must remain the same for any issued keys to subsequently be recognised. The
+ * applicable <code>serverSecret</code> in any millisecond is computed by
+ * <code>password</code> + ":" + (<code>creationTime</code> % <code>serverInteger</code>).
+ * This approach further obfuscates the actual server secret and renders attempts to
+ * compute the server secret more limited in usefulness (as any false tokens would be
+ * forced to have a <code>creationTime</code> equal to the computed hash). Recall that
+ * framework features depending on token services should reject tokens that are relatively
+ * old in any event.
  * </p>
  *
  * <p>
- * A further consideration of this class is the requirement for cryptographically strong pseudo-random numbers.
- * To this end, the use of {@link SecureRandomFactoryBean} is recommended to inject the property.
+ * A further consideration of this class is the requirement for cryptographically strong
+ * pseudo-random numbers. To this end, the use of {@link SecureRandomFactoryBean} is
+ * recommended to inject the property.
  * </p>
  *
  * <p>
@@ -53,101 +57,110 @@ import org.springframework.util.StringUtils;
  *
  */
 public class KeyBasedPersistenceTokenService implements TokenService, InitializingBean {
-    private int pseudoRandomNumberBytes = 32;
-    private String serverSecret;
-    private Integer serverInteger;
-    private SecureRandom secureRandom;
+	private int pseudoRandomNumberBytes = 32;
+	private String serverSecret;
+	private Integer serverInteger;
+	private SecureRandom secureRandom;
 
-    public Token allocateToken(String extendedInformation) {
-        Assert.notNull(extendedInformation, "Must provided non-null extendedInformation (but it can be empty)");
-        long creationTime = new Date().getTime();
-        String serverSecret = computeServerSecretApplicableAt(creationTime);
-        String pseudoRandomNumber = generatePseudoRandomNumber();
-        String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":" + extendedInformation;
+	public Token allocateToken(String extendedInformation) {
+		Assert.notNull(extendedInformation,
+				"Must provided non-null extendedInformation (but it can be empty)");
+		long creationTime = new Date().getTime();
+		String serverSecret = computeServerSecretApplicableAt(creationTime);
+		String pseudoRandomNumber = generatePseudoRandomNumber();
+		String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":"
+				+ extendedInformation;
 
-        // Compute key
-        String sha512Hex = Sha512DigestUtils.shaHex(content + ":" + serverSecret);
-        String keyPayload = content + ":" + sha512Hex;
-        String key = Utf8.decode(Base64.encode(Utf8.encode(keyPayload)));
+		// Compute key
+		String sha512Hex = Sha512DigestUtils.shaHex(content + ":" + serverSecret);
+		String keyPayload = content + ":" + sha512Hex;
+		String key = Utf8.decode(Base64.encode(Utf8.encode(keyPayload)));
 
-        return new DefaultToken(key, creationTime, extendedInformation);
-    }
+		return new DefaultToken(key, creationTime, extendedInformation);
+	}
 
-    public Token verifyToken(String key) {
-        if (key == null || "".equals(key)) {
-            return null;
-        }
-        String[] tokens = StringUtils.delimitedListToStringArray(Utf8.decode(Base64.decode(Utf8.encode(key))), ":");
-        Assert.isTrue(tokens.length >= 4, "Expected 4 or more tokens but found " + tokens.length);
+	public Token verifyToken(String key) {
+		if (key == null || "".equals(key)) {
+			return null;
+		}
+		String[] tokens = StringUtils.delimitedListToStringArray(
+				Utf8.decode(Base64.decode(Utf8.encode(key))), ":");
+		Assert.isTrue(tokens.length >= 4, "Expected 4 or more tokens but found "
+				+ tokens.length);
 
-        long creationTime;
-        try {
-            creationTime = Long.decode(tokens[0]).longValue();
-        } catch (NumberFormatException nfe) {
-            throw new IllegalArgumentException("Expected number but found " + tokens[0]);
-        }
+		long creationTime;
+		try {
+			creationTime = Long.decode(tokens[0]).longValue();
+		}
+		catch (NumberFormatException nfe) {
+			throw new IllegalArgumentException("Expected number but found " + tokens[0]);
+		}
 
-        String serverSecret = computeServerSecretApplicableAt(creationTime);
-        String pseudoRandomNumber = tokens[1];
+		String serverSecret = computeServerSecretApplicableAt(creationTime);
+		String pseudoRandomNumber = tokens[1];
 
-        // Permit extendedInfo to itself contain ":" characters
-        StringBuilder extendedInfo = new StringBuilder();
-        for (int i = 2; i < tokens.length-1; i++) {
-            if (i > 2) {
-                extendedInfo.append(":");
-            }
-            extendedInfo.append(tokens[i]);
-        }
+		// Permit extendedInfo to itself contain ":" characters
+		StringBuilder extendedInfo = new StringBuilder();
+		for (int i = 2; i < tokens.length - 1; i++) {
+			if (i > 2) {
+				extendedInfo.append(":");
+			}
+			extendedInfo.append(tokens[i]);
+		}
 
-        String sha1Hex = tokens[tokens.length-1];
+		String sha1Hex = tokens[tokens.length - 1];
 
-        // Verification
-        String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":" + extendedInfo.toString();
-        String expectedSha512Hex = Sha512DigestUtils.shaHex(content + ":" + serverSecret);
-        Assert.isTrue(expectedSha512Hex.equals(sha1Hex), "Key verification failure");
+		// Verification
+		String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":"
+				+ extendedInfo.toString();
+		String expectedSha512Hex = Sha512DigestUtils.shaHex(content + ":" + serverSecret);
+		Assert.isTrue(expectedSha512Hex.equals(sha1Hex), "Key verification failure");
 
-        return new DefaultToken(key, creationTime, extendedInfo.toString());
-    }
+		return new DefaultToken(key, creationTime, extendedInfo.toString());
+	}
 
-    /**
-     * @return a pseduo random number (hex encoded)
-     */
-    private String generatePseudoRandomNumber() {
-        byte[] randomBytes = new byte[pseudoRandomNumberBytes];
-        secureRandom.nextBytes(randomBytes);
-        return new String(Hex.encode(randomBytes));
-    }
+	/**
+	 * @return a pseduo random number (hex encoded)
+	 */
+	private String generatePseudoRandomNumber() {
+		byte[] randomBytes = new byte[pseudoRandomNumberBytes];
+		secureRandom.nextBytes(randomBytes);
+		return new String(Hex.encode(randomBytes));
+	}
 
-    private String computeServerSecretApplicableAt(long time) {
-        return serverSecret + ":" + new Long(time % serverInteger.intValue()).intValue();
-    }
+	private String computeServerSecretApplicableAt(long time) {
+		return serverSecret + ":" + new Long(time % serverInteger.intValue()).intValue();
+	}
 
-    /**
-     * @param serverSecret the new secret, which can contain a ":" if desired (never being sent to the client)
-     */
-    public void setServerSecret(String serverSecret) {
-        this.serverSecret = serverSecret;
-    }
+	/**
+	 * @param serverSecret the new secret, which can contain a ":" if desired (never being
+	 * sent to the client)
+	 */
+	public void setServerSecret(String serverSecret) {
+		this.serverSecret = serverSecret;
+	}
 
-    public void setSecureRandom(SecureRandom secureRandom) {
-        this.secureRandom = secureRandom;
-    }
+	public void setSecureRandom(SecureRandom secureRandom) {
+		this.secureRandom = secureRandom;
+	}
 
-    /**
-     * @param pseudoRandomNumberBytes changes the number of bytes issued (must be >= 0; defaults to 256)
-     */
-    public void setPseudoRandomNumberBytes(int pseudoRandomNumberBytes) {
-        Assert.isTrue(pseudoRandomNumberBytes >= 0, "Must have a positive pseudo random number bit size");
-        this.pseudoRandomNumberBytes = pseudoRandomNumberBytes;
-    }
+	/**
+	 * @param pseudoRandomNumberBytes changes the number of bytes issued (must be >= 0;
+	 * defaults to 256)
+	 */
+	public void setPseudoRandomNumberBytes(int pseudoRandomNumberBytes) {
+		Assert.isTrue(pseudoRandomNumberBytes >= 0,
+				"Must have a positive pseudo random number bit size");
+		this.pseudoRandomNumberBytes = pseudoRandomNumberBytes;
+	}
 
-    public void setServerInteger(Integer serverInteger) {
-        this.serverInteger = serverInteger;
-    }
+	public void setServerInteger(Integer serverInteger) {
+		this.serverInteger = serverInteger;
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasText(serverSecret, "Server secret required");
-        Assert.notNull(serverInteger, "Server integer required");
-        Assert.notNull(secureRandom, "SecureRandom instance required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasText(serverSecret, "Server secret required");
+		Assert.notNull(serverInteger, "Server integer required");
+		Assert.notNull(secureRandom, "SecureRandom instance required");
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
index fdc5a1462e..22569aca50 100644
--- a/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
+++ b/core/src/main/java/org/springframework/security/core/token/SecureRandomFactoryBean.java
@@ -16,52 +16,56 @@ import org.springframework.util.FileCopyUtils;
  */
 public class SecureRandomFactoryBean implements FactoryBean<SecureRandom> {
 
-    private String algorithm = "SHA1PRNG";
-    private Resource seed;
+	private String algorithm = "SHA1PRNG";
+	private Resource seed;
 
-    public SecureRandom getObject() throws Exception {
-        SecureRandom rnd = SecureRandom.getInstance(algorithm);
+	public SecureRandom getObject() throws Exception {
+		SecureRandom rnd = SecureRandom.getInstance(algorithm);
 
-        if (seed != null) {
-            // Seed specified, so use it
-            byte[] seedBytes = FileCopyUtils.copyToByteArray(seed.getInputStream());
-            rnd.setSeed(seedBytes);
-        } else {
-            // Request the next bytes, thus eagerly incurring the expense of default seeding
-            rnd.nextBytes(new byte[1]);
-        }
+		if (seed != null) {
+			// Seed specified, so use it
+			byte[] seedBytes = FileCopyUtils.copyToByteArray(seed.getInputStream());
+			rnd.setSeed(seedBytes);
+		}
+		else {
+			// Request the next bytes, thus eagerly incurring the expense of default
+			// seeding
+			rnd.nextBytes(new byte[1]);
+		}
 
-        return rnd;
-    }
+		return rnd;
+	}
 
-    public Class<SecureRandom> getObjectType() {
-        return SecureRandom.class;
-    }
+	public Class<SecureRandom> getObjectType() {
+		return SecureRandom.class;
+	}
 
-    public boolean isSingleton() {
-        return false;
-    }
+	public boolean isSingleton() {
+		return false;
+	}
 
-    /**
-     * Allows the Pseudo Random Number Generator (PRNG) algorithm to be nominated. Defaults to "SHA1PRNG".
-     *
-     * @param algorithm to use (mandatory)
-     */
-    public void setAlgorithm(String algorithm) {
-        Assert.hasText(algorithm, "Algorithm required");
-        this.algorithm = algorithm;
-    }
+	/**
+	 * Allows the Pseudo Random Number Generator (PRNG) algorithm to be nominated.
+	 * Defaults to "SHA1PRNG".
+	 *
+	 * @param algorithm to use (mandatory)
+	 */
+	public void setAlgorithm(String algorithm) {
+		Assert.hasText(algorithm, "Algorithm required");
+		this.algorithm = algorithm;
+	}
 
-    /**
-     * Allows the user to specify a resource which will act as a seed for the {@link SecureRandom}
-     * instance. Specifically, the resource will be read into an {@link InputStream} and those
-     * bytes presented to the {@link SecureRandom#setSeed(byte[])} method. Note that this will
-     * simply supplement, rather than replace, the existing seed. As such, it is always safe to
-     * set a seed using this method (it never reduces randomness).
-     *
-     * @param seed to use, or <code>null</code> if no additional seeding is needed
-     */
-    public void setSeed(Resource seed) {
-        this.seed = seed;
-    }
+	/**
+	 * Allows the user to specify a resource which will act as a seed for the
+	 * {@link SecureRandom} instance. Specifically, the resource will be read into an
+	 * {@link InputStream} and those bytes presented to the
+	 * {@link SecureRandom#setSeed(byte[])} method. Note that this will simply supplement,
+	 * rather than replace, the existing seed. As such, it is always safe to set a seed
+	 * using this method (it never reduces randomness).
+	 *
+	 * @param seed to use, or <code>null</code> if no additional seeding is needed
+	 */
+	public void setSeed(Resource seed) {
+		this.seed = seed;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/Sha512DigestUtils.java b/core/src/main/java/org/springframework/security/core/token/Sha512DigestUtils.java
index f7fce2686c..98d1ce91cf 100644
--- a/core/src/main/java/org/springframework/security/core/token/Sha512DigestUtils.java
+++ b/core/src/main/java/org/springframework/security/core/token/Sha512DigestUtils.java
@@ -16,62 +16,62 @@ import org.springframework.security.crypto.codec.Hex;
  * @since 2.0.1
  *
  */
-public abstract class Sha512DigestUtils  {
+public abstract class Sha512DigestUtils {
 
-    /**
-     * Returns an SHA digest.
-     *
-     * @return An SHA digest instance.
-     * @throws RuntimeException when a {@link java.security.NoSuchAlgorithmException} is caught.
-     */
-    private static MessageDigest getSha512Digest() {
-        try {
-            return MessageDigest.getInstance("SHA-512");
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e.getMessage());
-        }
-    }
+	/**
+	 * Returns an SHA digest.
+	 *
+	 * @return An SHA digest instance.
+	 * @throws RuntimeException when a {@link java.security.NoSuchAlgorithmException} is
+	 * caught.
+	 */
+	private static MessageDigest getSha512Digest() {
+		try {
+			return MessageDigest.getInstance("SHA-512");
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new RuntimeException(e.getMessage());
+		}
+	}
 
-    /**
-     * Calculates the SHA digest and returns the value as a
-     * <code>byte[]</code>.
-     *
-     * @param data Data to digest
-     * @return SHA digest
-     */
-    public static byte[] sha(byte[] data) {
-        return getSha512Digest().digest(data);
-    }
+	/**
+	 * Calculates the SHA digest and returns the value as a <code>byte[]</code>.
+	 *
+	 * @param data Data to digest
+	 * @return SHA digest
+	 */
+	public static byte[] sha(byte[] data) {
+		return getSha512Digest().digest(data);
+	}
 
-    /**
-     * Calculates the SHA digest and returns the value as a
-     * <code>byte[]</code>.
-     *
-     * @param data Data to digest
-     * @return SHA digest
-     */
-    public static byte[] sha(String data) {
-        return sha(data.getBytes());
-    }
+	/**
+	 * Calculates the SHA digest and returns the value as a <code>byte[]</code>.
+	 *
+	 * @param data Data to digest
+	 * @return SHA digest
+	 */
+	public static byte[] sha(String data) {
+		return sha(data.getBytes());
+	}
 
-    /**
-     * Calculates the SHA digest and returns the value as a hex string.
-     *
-     * @param data Data to digest
-     * @return SHA digest as a hex string
-     */
-    public static String shaHex(byte[] data) {
-        return new String(Hex.encode(sha(data)));
-    }
+	/**
+	 * Calculates the SHA digest and returns the value as a hex string.
+	 *
+	 * @param data Data to digest
+	 * @return SHA digest as a hex string
+	 */
+	public static String shaHex(byte[] data) {
+		return new String(Hex.encode(sha(data)));
+	}
 
-    /**
-     * Calculates the SHA digest and returns the value as a hex string.
-     *
-     * @param data Data to digest
-     * @return SHA digest as a hex string
-     */
-    public static String shaHex(String data) {
-        return new String(Hex.encode(sha(data)));
-    }
+	/**
+	 * Calculates the SHA digest and returns the value as a hex string.
+	 *
+	 * @param data Data to digest
+	 * @return SHA digest as a hex string
+	 */
+	public static String shaHex(String data) {
+		return new String(Hex.encode(sha(data)));
+	}
 
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/Token.java b/core/src/main/java/org/springframework/security/core/token/Token.java
index 8547d74840..d9d4b6aeea 100644
--- a/core/src/main/java/org/springframework/security/core/token/Token.java
+++ b/core/src/main/java/org/springframework/security/core/token/Token.java
@@ -1,15 +1,15 @@
 package org.springframework.security.core.token;
 
-
 /**
  * A token issued by {@link TokenService}.
  *
  * <p>
- * It is important that the keys assigned to tokens are sufficiently randomised and secured that
- * they can serve as identifying a unique user session. Implementations of {@link TokenService}
- * are free to use encryption or encoding strategies of their choice. It is strongly recommended that
- * keys are of sufficient length to balance safety against persistence cost. In relation to persistence
- * cost, it is strongly recommended that returned keys are small enough for encoding in a cookie.
+ * It is important that the keys assigned to tokens are sufficiently randomised and
+ * secured that they can serve as identifying a unique user session. Implementations of
+ * {@link TokenService} are free to use encryption or encoding strategies of their choice.
+ * It is strongly recommended that keys are of sufficient length to balance safety against
+ * persistence cost. In relation to persistence cost, it is strongly recommended that
+ * returned keys are small enough for encoding in a cookie.
  * </p>
  *
  * @author Ben Alex
@@ -17,29 +17,30 @@ package org.springframework.security.core.token;
  */
 public interface Token {
 
-    /**
-     * Obtains the randomised, secure key assigned to this token. Presentation of this token to
-     * {@link TokenService} will always return a <code>Token</code> that is equal to the original
-     * <code>Token</code> issued for that key.
-     *
-     * @return a key with appropriate randomness and security.
-     */
-    String getKey();
+	/**
+	 * Obtains the randomised, secure key assigned to this token. Presentation of this
+	 * token to {@link TokenService} will always return a <code>Token</code> that is equal
+	 * to the original <code>Token</code> issued for that key.
+	 *
+	 * @return a key with appropriate randomness and security.
+	 */
+	String getKey();
 
-    /**
-     * The time the token key was initially created is available from this method. Note that a given
-     * token must never have this creation time changed. If necessary, a new token can be
-     * requested from the {@link TokenService} to replace the original token.
-     *
-     * @return the time this token key was created, in the same format as specified by {@link java.util.Date#getTime()}.
-     */
-    long getKeyCreationTime();
+	/**
+	 * The time the token key was initially created is available from this method. Note
+	 * that a given token must never have this creation time changed. If necessary, a new
+	 * token can be requested from the {@link TokenService} to replace the original token.
+	 *
+	 * @return the time this token key was created, in the same format as specified by
+	 * {@link java.util.Date#getTime()}.
+	 */
+	long getKeyCreationTime();
 
-    /**
-     * Obtains the extended information associated within the token, which was presented when the token
-     * was first created.
-     *
-     * @return the user-specified extended information, if any
-     */
-    String getExtendedInformation();
+	/**
+	 * Obtains the extended information associated within the token, which was presented
+	 * when the token was first created.
+	 *
+	 * @return the user-specified extended information, if any
+	 */
+	String getExtendedInformation();
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/TokenService.java b/core/src/main/java/org/springframework/security/core/token/TokenService.java
index f5327a0529..53aa217511 100644
--- a/core/src/main/java/org/springframework/security/core/token/TokenService.java
+++ b/core/src/main/java/org/springframework/security/core/token/TokenService.java
@@ -1,24 +1,24 @@
 package org.springframework.security.core.token;
 
-
 /**
  * Provides a mechanism to allocate and rebuild secure, randomised tokens.
  *
  * <p>
  * Implementations are solely concern with issuing a new {@link Token} on demand. The
- * issued <code>Token</code> may contain user-specified extended information. The token also
- * contains a cryptographically strong, byte array-based key. This permits the token to be
- * used to identify a user session, if desired. The key can subsequently be re-presented
- * to the <code>TokenService</code> for verification and reconstruction of a <code>Token</code>
- * equal to the original <code>Token</code>.
+ * issued <code>Token</code> may contain user-specified extended information. The token
+ * also contains a cryptographically strong, byte array-based key. This permits the token
+ * to be used to identify a user session, if desired. The key can subsequently be
+ * re-presented to the <code>TokenService</code> for verification and reconstruction of a
+ * <code>Token</code> equal to the original <code>Token</code>.
  * </p>
  *
  * <p>
- * Given the tightly-focused behaviour provided by this interface, it can serve as a building block
- * for more sophisticated token-based solutions. For example, authentication systems that depend on
- * stateless session keys. These could, for instance, place the username inside the user-specified
- * extended information associated with the key). It is important to recognise that we do not intend
- * for this interface to be expanded to provide such capabilities directly.
+ * Given the tightly-focused behaviour provided by this interface, it can serve as a
+ * building block for more sophisticated token-based solutions. For example,
+ * authentication systems that depend on stateless session keys. These could, for
+ * instance, place the username inside the user-specified extended information associated
+ * with the key). It is important to recognise that we do not intend for this interface to
+ * be expanded to provide such capabilities directly.
  * </p>
  *
  * @author Ben Alex
@@ -26,22 +26,25 @@ package org.springframework.security.core.token;
  *
  */
 public interface TokenService {
-    /**
-     * Forces the allocation of a new {@link Token}.
-     *
-     * @param extendedInformation the extended information desired in the token
-     *          (cannot be <code>null</code>, but can be empty)
-     * @return a new token that has not been issued previously, and is guaranteed to be recognised
-     *          by this implementation's {@link #verifyToken(String)} at any future time.
-     */
-    Token allocateToken(String extendedInformation);
+	/**
+	 * Forces the allocation of a new {@link Token}.
+	 *
+	 * @param extendedInformation the extended information desired in the token (cannot be
+	 * <code>null</code>, but can be empty)
+	 * @return a new token that has not been issued previously, and is guaranteed to be
+	 * recognised by this implementation's {@link #verifyToken(String)} at any future
+	 * time.
+	 */
+	Token allocateToken(String extendedInformation);
 
-    /**
-     * Permits verification the <{@link Token#getKey()} was issued by this <code>TokenService</code> and
-     * reconstructs the corresponding <code>Token</code>.
-     *
-     * @param key as obtained from {@link Token#getKey()} and created by this implementation
-     * @return the token, or <code>null</code> if the token was not issued by this <code>TokenService</code>
-     */
-    Token verifyToken(String key);
+	/**
+	 * Permits verification the <{@link Token#getKey()} was issued by this
+	 * <code>TokenService</code> and reconstructs the corresponding <code>Token</code>.
+	 *
+	 * @param key as obtained from {@link Token#getKey()} and created by this
+	 * implementation
+	 * @return the token, or <code>null</code> if the token was not issued by this
+	 * <code>TokenService</code>
+	 */
+	Token verifyToken(String key);
 }
diff --git a/core/src/main/java/org/springframework/security/core/token/package-info.java b/core/src/main/java/org/springframework/security/core/token/package-info.java
index b8f8bbd308..28ab8b6533 100644
--- a/core/src/main/java/org/springframework/security/core/token/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/token/package-info.java
@@ -2,3 +2,4 @@
  * A service for building secure random tokens.
  */
 package org.springframework.security.core.token;
+
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java
index db50d586a3..f7f32993f4 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/AuthenticationUserDetailsService.java
@@ -2,22 +2,21 @@ package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
- * Interface that allows for retrieving a UserDetails object based on an <tt>Authentication</tt> object.
+ * Interface that allows for retrieving a UserDetails object based on an
+ * <tt>Authentication</tt> object.
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public interface AuthenticationUserDetailsService<T extends Authentication> {
 
-    /**
-     *
-     * @param token The pre-authenticated authentication token
-     * @return UserDetails for the given authentication token, never null.
-     * @throws UsernameNotFoundException
-     *             if no user details can be found for the given authentication
-     *             token
-     */
-    UserDetails loadUserDetails(T token) throws UsernameNotFoundException;
+	/**
+	 *
+	 * @param token The pre-authenticated authentication token
+	 * @return UserDetails for the given authentication token, never null.
+	 * @throws UsernameNotFoundException if no user details can be found for the given
+	 * authentication token
+	 */
+	UserDetails loadUserDetails(T token) throws UsernameNotFoundException;
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java
index 7fb1a607e3..a2c7bc1799 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/User.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java
@@ -31,199 +31,210 @@ import org.springframework.util.Assert;
 /**
  * Models core user information retrieved by a {@link UserDetailsService}.
  * <p>
- * Developers may use this class directly, subclass it, or write their own {@link UserDetails} implementation from
- * scratch.
+ * Developers may use this class directly, subclass it, or write their own
+ * {@link UserDetails} implementation from scratch.
  * <p>
- * {@code equals} and {@code hashcode} implementations are based on the {@code username} property only, as the
- * intention is that lookups of the same user principal object (in a user registry, for example) will match
- * where the objects represent the same user, not just when all the properties (authorities, password for
- * example) are the same.
+ * {@code equals} and {@code hashcode} implementations are based on the {@code username}
+ * property only, as the intention is that lookups of the same user principal object (in a
+ * user registry, for example) will match where the objects represent the same user, not
+ * just when all the properties (authorities, password for example) are the same.
  * <p>
- * Note that this implementation is not immutable. It implements the {@code CredentialsContainer} interface, in order
- * to allow the password to be erased after authentication. This may cause side-effects if you are storing instances
- * in-memory and reusing them. If so, make sure you return a copy from your {@code UserDetailsService} each time it is
- * invoked.
+ * Note that this implementation is not immutable. It implements the
+ * {@code CredentialsContainer} interface, in order to allow the password to be erased
+ * after authentication. This may cause side-effects if you are storing instances
+ * in-memory and reusing them. If so, make sure you return a copy from your
+ * {@code UserDetailsService} each time it is invoked.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
 public class User implements UserDetails, CredentialsContainer {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
-    private String password;
-    private final String username;
-    private final Set<GrantedAuthority> authorities;
-    private final boolean accountNonExpired;
-    private final boolean accountNonLocked;
-    private final boolean credentialsNonExpired;
-    private final boolean enabled;
+	// ~ Instance fields
+	// ================================================================================================
+	private String password;
+	private final String username;
+	private final Set<GrantedAuthority> authorities;
+	private final boolean accountNonExpired;
+	private final boolean accountNonLocked;
+	private final boolean credentialsNonExpired;
+	private final boolean enabled;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Calls the more complex constructor with all boolean arguments set to {@code true}.
-     */
-    public User(String username, String password, Collection<? extends GrantedAuthority> authorities) {
-        this(username, password, true, true, true, true, authorities);
-    }
+	/**
+	 * Calls the more complex constructor with all boolean arguments set to {@code true}.
+	 */
+	public User(String username, String password,
+			Collection<? extends GrantedAuthority> authorities) {
+		this(username, password, true, true, true, true, authorities);
+	}
 
-    /**
-     * Construct the <code>User</code> with the details required by
-     * {@link org.springframework.security.authentication.dao.DaoAuthenticationProvider}.
-     *
-     * @param username the username presented to the
-     *        <code>DaoAuthenticationProvider</code>
-     * @param password the password that should be presented to the
-     *        <code>DaoAuthenticationProvider</code>
-     * @param enabled set to <code>true</code> if the user is enabled
-     * @param accountNonExpired set to <code>true</code> if the account has not
-     *        expired
-     * @param credentialsNonExpired set to <code>true</code> if the credentials
-     *        have not expired
-     * @param accountNonLocked set to <code>true</code> if the account is not
-     *        locked
-     * @param authorities the authorities that should be granted to the caller
-     *        if they presented the correct username and password and the user
-     *        is enabled. Not null.
-     *
-     * @throws IllegalArgumentException if a <code>null</code> value was passed
-     *         either as a parameter or as an element in the
-     *         <code>GrantedAuthority</code> collection
-     */
-    public User(String username, String password, boolean enabled, boolean accountNonExpired,
-            boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
+	/**
+	 * Construct the <code>User</code> with the details required by
+	 * {@link org.springframework.security.authentication.dao.DaoAuthenticationProvider}.
+	 *
+	 * @param username the username presented to the
+	 * <code>DaoAuthenticationProvider</code>
+	 * @param password the password that should be presented to the
+	 * <code>DaoAuthenticationProvider</code>
+	 * @param enabled set to <code>true</code> if the user is enabled
+	 * @param accountNonExpired set to <code>true</code> if the account has not expired
+	 * @param credentialsNonExpired set to <code>true</code> if the credentials have not
+	 * expired
+	 * @param accountNonLocked set to <code>true</code> if the account is not locked
+	 * @param authorities the authorities that should be granted to the caller if they
+	 * presented the correct username and password and the user is enabled. Not null.
+	 *
+	 * @throws IllegalArgumentException if a <code>null</code> value was passed either as
+	 * a parameter or as an element in the <code>GrantedAuthority</code> collection
+	 */
+	public User(String username, String password, boolean enabled,
+			boolean accountNonExpired, boolean credentialsNonExpired,
+			boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
 
-        if (((username == null) || "".equals(username)) || (password == null)) {
-            throw new IllegalArgumentException("Cannot pass null or empty values to constructor");
-        }
+		if (((username == null) || "".equals(username)) || (password == null)) {
+			throw new IllegalArgumentException(
+					"Cannot pass null or empty values to constructor");
+		}
 
-        this.username = username;
-        this.password = password;
-        this.enabled = enabled;
-        this.accountNonExpired = accountNonExpired;
-        this.credentialsNonExpired = credentialsNonExpired;
-        this.accountNonLocked = accountNonLocked;
-        this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities));
-    }
+		this.username = username;
+		this.password = password;
+		this.enabled = enabled;
+		this.accountNonExpired = accountNonExpired;
+		this.credentialsNonExpired = credentialsNonExpired;
+		this.accountNonLocked = accountNonLocked;
+		this.authorities = Collections.unmodifiableSet(sortAuthorities(authorities));
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
+	public Collection<GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+	public boolean isEnabled() {
+		return enabled;
+	}
 
-    public boolean isAccountNonExpired() {
-        return accountNonExpired;
-    }
+	public boolean isAccountNonExpired() {
+		return accountNonExpired;
+	}
 
-    public boolean isAccountNonLocked() {
-        return accountNonLocked;
-    }
+	public boolean isAccountNonLocked() {
+		return accountNonLocked;
+	}
 
-    public boolean isCredentialsNonExpired() {
-        return credentialsNonExpired;
-    }
+	public boolean isCredentialsNonExpired() {
+		return credentialsNonExpired;
+	}
 
-    public void eraseCredentials() {
-        password = null;
-    }
+	public void eraseCredentials() {
+		password = null;
+	}
 
-    private static SortedSet<GrantedAuthority> sortAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        Assert.notNull(authorities, "Cannot pass a null GrantedAuthority collection");
-        // Ensure array iteration order is predictable (as per UserDetails.getAuthorities() contract and SEC-717)
-        SortedSet<GrantedAuthority> sortedAuthorities =
-            new TreeSet<GrantedAuthority>(new AuthorityComparator());
+	private static SortedSet<GrantedAuthority> sortAuthorities(
+			Collection<? extends GrantedAuthority> authorities) {
+		Assert.notNull(authorities, "Cannot pass a null GrantedAuthority collection");
+		// Ensure array iteration order is predictable (as per
+		// UserDetails.getAuthorities() contract and SEC-717)
+		SortedSet<GrantedAuthority> sortedAuthorities = new TreeSet<GrantedAuthority>(
+				new AuthorityComparator());
 
-        for (GrantedAuthority grantedAuthority : authorities) {
-            Assert.notNull(grantedAuthority, "GrantedAuthority list cannot contain any null elements");
-            sortedAuthorities.add(grantedAuthority);
-        }
+		for (GrantedAuthority grantedAuthority : authorities) {
+			Assert.notNull(grantedAuthority,
+					"GrantedAuthority list cannot contain any null elements");
+			sortedAuthorities.add(grantedAuthority);
+		}
 
-        return sortedAuthorities;
-    }
+		return sortedAuthorities;
+	}
 
-    private static class AuthorityComparator implements Comparator<GrantedAuthority>, Serializable {
-        private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static class AuthorityComparator implements Comparator<GrantedAuthority>,
+			Serializable {
+		private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-        public int compare(GrantedAuthority g1, GrantedAuthority g2) {
-            // Neither should ever be null as each entry is checked before adding it to the set.
-            // If the authority is null, it is a custom authority and should precede others.
-            if (g2.getAuthority() == null) {
-                return -1;
-            }
+		public int compare(GrantedAuthority g1, GrantedAuthority g2) {
+			// Neither should ever be null as each entry is checked before adding it to
+			// the set.
+			// If the authority is null, it is a custom authority and should precede
+			// others.
+			if (g2.getAuthority() == null) {
+				return -1;
+			}
 
-            if (g1.getAuthority() == null) {
-                return 1;
-            }
+			if (g1.getAuthority() == null) {
+				return 1;
+			}
 
-            return g1.getAuthority().compareTo(g2.getAuthority());
-        }
-    }
+			return g1.getAuthority().compareTo(g2.getAuthority());
+		}
+	}
 
-    /**
-     * Returns {@code true} if the supplied object is a {@code User} instance with the
-     * same {@code username} value.
-     * <p>
-     * In other words, the objects are equal if they have the same username, representing the
-     * same principal.
-     */
-    @Override
-    public boolean equals(Object rhs) {
-        if (rhs instanceof User) {
-            return username.equals(((User) rhs).username);
-        }
-        return false;
-    }
+	/**
+	 * Returns {@code true} if the supplied object is a {@code User} instance with the
+	 * same {@code username} value.
+	 * <p>
+	 * In other words, the objects are equal if they have the same username, representing
+	 * the same principal.
+	 */
+	@Override
+	public boolean equals(Object rhs) {
+		if (rhs instanceof User) {
+			return username.equals(((User) rhs).username);
+		}
+		return false;
+	}
 
-    /**
-     * Returns the hashcode of the {@code username}.
-     */
-    @Override
-    public int hashCode() {
-        return username.hashCode();
-    }
+	/**
+	 * Returns the hashcode of the {@code username}.
+	 */
+	@Override
+	public int hashCode() {
+		return username.hashCode();
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append(": ");
-        sb.append("Username: ").append(this.username).append("; ");
-        sb.append("Password: [PROTECTED]; ");
-        sb.append("Enabled: ").append(this.enabled).append("; ");
-        sb.append("AccountNonExpired: ").append(this.accountNonExpired).append("; ");
-        sb.append("credentialsNonExpired: ").append(this.credentialsNonExpired).append("; ");
-        sb.append("AccountNonLocked: ").append(this.accountNonLocked).append("; ");
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append(": ");
+		sb.append("Username: ").append(this.username).append("; ");
+		sb.append("Password: [PROTECTED]; ");
+		sb.append("Enabled: ").append(this.enabled).append("; ");
+		sb.append("AccountNonExpired: ").append(this.accountNonExpired).append("; ");
+		sb.append("credentialsNonExpired: ").append(this.credentialsNonExpired)
+				.append("; ");
+		sb.append("AccountNonLocked: ").append(this.accountNonLocked).append("; ");
 
-        if (!authorities.isEmpty()) {
-            sb.append("Granted Authorities: ");
+		if (!authorities.isEmpty()) {
+			sb.append("Granted Authorities: ");
 
-            boolean first = true;
-            for (GrantedAuthority auth : authorities) {
-                if (!first) {
-                    sb.append(",");
-                }
-                first = false;
+			boolean first = true;
+			for (GrantedAuthority auth : authorities) {
+				if (!first) {
+					sb.append(",");
+				}
+				first = false;
 
-                sb.append(auth);
-            }
-        } else {
-            sb.append("Not granted any authorities");
-        }
+				sb.append(auth);
+			}
+		}
+		else {
+			sb.append("Not granted any authorities");
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java
index a6da6f86f0..b98031122c 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UserCache.java
@@ -19,49 +19,54 @@ package org.springframework.security.core.userdetails;
  * Provides a cache of {@link UserDetails} objects.
  *
  * <p>
- * Implementations should provide appropriate methods to set their cache parameters (e.g. time-to-live) and/or force
- * removal of entities before their normal expiration. These are not part of the <code>UserCache</code>
- * interface contract because they vary depending on the type of caching
- * system used (in-memory, disk, cluster, hybrid etc.).
+ * Implementations should provide appropriate methods to set their cache parameters (e.g.
+ * time-to-live) and/or force removal of entities before their normal expiration. These
+ * are not part of the <code>UserCache</code> interface contract because they vary
+ * depending on the type of caching system used (in-memory, disk, cluster, hybrid etc.).
  * <p>
- * Caching is generally only required in applications which do not maintain server-side state, such as remote clients
- * or web services. The authentication credentials are then presented on each invocation and the overhead of accessing
- * a database or other persistent storage mechanism to validate would be excessive. In this case, you would configure
- * a cache to store the <tt>UserDetails</tt> information rather than loading it each time.
+ * Caching is generally only required in applications which do not maintain server-side
+ * state, such as remote clients or web services. The authentication credentials are then
+ * presented on each invocation and the overhead of accessing a database or other
+ * persistent storage mechanism to validate would be excessive. In this case, you would
+ * configure a cache to store the <tt>UserDetails</tt> information rather than loading it
+ * each time.
  *
  * @see org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider
  *
  * @author Ben Alex
  */
 public interface UserCache {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Obtains a {@link UserDetails} from the cache.
-     *
-     * @param username the {@link User#getUsername()} used to place the user in the cache
-     *
-     * @return the populated <code>UserDetails</code> or <code>null</code> if the user could not be found or if the
-     *         cache entry has expired
-     */
-    UserDetails getUserFromCache(String username);
+	/**
+	 * Obtains a {@link UserDetails} from the cache.
+	 *
+	 * @param username the {@link User#getUsername()} used to place the user in the cache
+	 *
+	 * @return the populated <code>UserDetails</code> or <code>null</code> if the user
+	 * could not be found or if the cache entry has expired
+	 */
+	UserDetails getUserFromCache(String username);
 
-    /**
-     * Places a {@link UserDetails} in the cache. The <code>username</code> is the key used to subsequently
-     * retrieve the <code>UserDetails</code>.
-     *
-     * @param user the fully populated <code>UserDetails</code> to place in the cache
-     */
-    void putUserInCache(UserDetails user);
+	/**
+	 * Places a {@link UserDetails} in the cache. The <code>username</code> is the key
+	 * used to subsequently retrieve the <code>UserDetails</code>.
+	 *
+	 * @param user the fully populated <code>UserDetails</code> to place in the cache
+	 */
+	void putUserInCache(UserDetails user);
 
-    /**
-     * Removes the specified user from the cache. The <code>username</code> is the key used to remove the user.
-     * If the user is not found, the method should simply return (not thrown an exception).
-     * <p>
-     * Some cache implementations may not support eviction from the cache, in which case they should provide appropriate
-     * behaviour to alter the user in either its documentation, via an exception, or through a log message.
-     *
-     * @param username to be evicted from the cache
-     */
-    void removeUserFromCache(String username);
+	/**
+	 * Removes the specified user from the cache. The <code>username</code> is the key
+	 * used to remove the user. If the user is not found, the method should simply return
+	 * (not thrown an exception).
+	 * <p>
+	 * Some cache implementations may not support eviction from the cache, in which case
+	 * they should provide appropriate behaviour to alter the user in either its
+	 * documentation, via an exception, or through a log message.
+	 *
+	 * @param username to be evicted from the cache
+	 */
+	void removeUserFromCache(String username);
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java
index fa0381c318..7af5ed5729 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java
@@ -21,21 +21,19 @@ import org.springframework.security.core.GrantedAuthority;
 import java.io.Serializable;
 import java.util.Collection;
 
-
 /**
  * Provides core user information.
  *
  * <p>
- * Implementations are not used directly by Spring Security for security
- * purposes. They simply store user information which is later encapsulated
- * into {@link Authentication} objects. This allows non-security related user
- * information (such as email addresses, telephone numbers etc) to be stored
- * in a convenient location.
+ * Implementations are not used directly by Spring Security for security purposes. They
+ * simply store user information which is later encapsulated into {@link Authentication}
+ * objects. This allows non-security related user information (such as email addresses,
+ * telephone numbers etc) to be stored in a convenient location.
  * <p>
- * Concrete implementations must take particular care to ensure the non-null
- * contract detailed for each method is enforced. See
- * {@link org.springframework.security.core.userdetails.User} for a
- * reference implementation (which you might like to extend or use in your code).
+ * Concrete implementations must take particular care to ensure the non-null contract
+ * detailed for each method is enforced. See
+ * {@link org.springframework.security.core.userdetails.User} for a reference
+ * implementation (which you might like to extend or use in your code).
  *
  * @see UserDetailsService
  * @see UserCache
@@ -43,57 +41,62 @@ import java.util.Collection;
  * @author Ben Alex
  */
 public interface UserDetails extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the authorities granted to the user. Cannot return <code>null</code>.
-     *
-     * @return the authorities, sorted by natural key (never <code>null</code>)
-     */
-    Collection<? extends GrantedAuthority> getAuthorities();
+	/**
+	 * Returns the authorities granted to the user. Cannot return <code>null</code>.
+	 *
+	 * @return the authorities, sorted by natural key (never <code>null</code>)
+	 */
+	Collection<? extends GrantedAuthority> getAuthorities();
 
-    /**
-     * Returns the password used to authenticate the user.
-     *
-     * @return the password
-     */
-    String getPassword();
+	/**
+	 * Returns the password used to authenticate the user.
+	 *
+	 * @return the password
+	 */
+	String getPassword();
 
-    /**
-     * Returns the username used to authenticate the user. Cannot return <code>null</code>.
-     *
-     * @return the username (never <code>null</code>)
-     */
-    String getUsername();
+	/**
+	 * Returns the username used to authenticate the user. Cannot return <code>null</code>
+	 * .
+	 *
+	 * @return the username (never <code>null</code>)
+	 */
+	String getUsername();
 
-    /**
-     * Indicates whether the user's account has expired. An expired account cannot be authenticated.
-     *
-     * @return <code>true</code> if the user's account is valid (ie non-expired), <code>false</code> if no longer valid
-     *         (ie expired)
-     */
-    boolean isAccountNonExpired();
+	/**
+	 * Indicates whether the user's account has expired. An expired account cannot be
+	 * authenticated.
+	 *
+	 * @return <code>true</code> if the user's account is valid (ie non-expired),
+	 * <code>false</code> if no longer valid (ie expired)
+	 */
+	boolean isAccountNonExpired();
 
-    /**
-     * Indicates whether the user is locked or unlocked. A locked user cannot be authenticated.
-     *
-     * @return <code>true</code> if the user is not locked, <code>false</code> otherwise
-     */
-    boolean isAccountNonLocked();
+	/**
+	 * Indicates whether the user is locked or unlocked. A locked user cannot be
+	 * authenticated.
+	 *
+	 * @return <code>true</code> if the user is not locked, <code>false</code> otherwise
+	 */
+	boolean isAccountNonLocked();
 
-    /**
-     * Indicates whether the user's credentials (password) has expired. Expired credentials prevent
-     * authentication.
-     *
-     * @return <code>true</code> if the user's credentials are valid (ie non-expired), <code>false</code> if no longer
-     *         valid (ie expired)
-     */
-    boolean isCredentialsNonExpired();
+	/**
+	 * Indicates whether the user's credentials (password) has expired. Expired
+	 * credentials prevent authentication.
+	 *
+	 * @return <code>true</code> if the user's credentials are valid (ie non-expired),
+	 * <code>false</code> if no longer valid (ie expired)
+	 */
+	boolean isCredentialsNonExpired();
 
-    /**
-     * Indicates whether the user is enabled or disabled. A disabled user cannot be authenticated.
-     *
-     * @return <code>true</code> if the user is enabled, <code>false</code> otherwise
-     */
-    boolean isEnabled();
+	/**
+	 * Indicates whether the user is enabled or disabled. A disabled user cannot be
+	 * authenticated.
+	 *
+	 * @return <code>true</code> if the user is enabled, <code>false</code> otherwise
+	 */
+	boolean isEnabled();
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java
index 6410edd324..a6fed0fbb4 100755
--- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapper.java
@@ -5,59 +5,60 @@ import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
 /**
- * This implementation for AuthenticationUserDetailsService wraps a regular
- * Spring Security UserDetailsService implementation, to retrieve a UserDetails object
- * based on the user name contained in an <tt>Authentication</tt> object.
+ * This implementation for AuthenticationUserDetailsService wraps a regular Spring
+ * Security UserDetailsService implementation, to retrieve a UserDetails object based on
+ * the user name contained in an <tt>Authentication</tt> object.
  *
  * @author Ruud Senden
  * @author Scott Battaglia
  * @since 2.0
  */
-public class UserDetailsByNameServiceWrapper<T extends Authentication> implements AuthenticationUserDetailsService<T>, InitializingBean {
-    private UserDetailsService userDetailsService = null;
+public class UserDetailsByNameServiceWrapper<T extends Authentication> implements
+		AuthenticationUserDetailsService<T>, InitializingBean {
+	private UserDetailsService userDetailsService = null;
 
-    /**
-     * Constructs an empty wrapper for compatibility with Spring Security 2.0.x's method of using a setter.
-     */
-    public UserDetailsByNameServiceWrapper() {
-        // constructor for backwards compatibility with 2.0
-    }
+	/**
+	 * Constructs an empty wrapper for compatibility with Spring Security 2.0.x's method
+	 * of using a setter.
+	 */
+	public UserDetailsByNameServiceWrapper() {
+		// constructor for backwards compatibility with 2.0
+	}
 
-    /**
-     * Constructs a new wrapper using the supplied {@link org.springframework.security.core.userdetails.UserDetailsService}
-     * as the service to delegate to.
-     *
-     * @param userDetailsService the UserDetailsService to delegate to.
-     */
-    public UserDetailsByNameServiceWrapper(final UserDetailsService userDetailsService) {
-        Assert.notNull(userDetailsService, "userDetailsService cannot be null.");
-        this.userDetailsService = userDetailsService;
-    }
+	/**
+	 * Constructs a new wrapper using the supplied
+	 * {@link org.springframework.security.core.userdetails.UserDetailsService} as the
+	 * service to delegate to.
+	 *
+	 * @param userDetailsService the UserDetailsService to delegate to.
+	 */
+	public UserDetailsByNameServiceWrapper(final UserDetailsService userDetailsService) {
+		Assert.notNull(userDetailsService, "userDetailsService cannot be null.");
+		this.userDetailsService = userDetailsService;
+	}
 
-    /**
-     * Check whether all required properties have been set.
-     *
-     * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-     */
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.userDetailsService, "UserDetailsService must be set");
-    }
+	/**
+	 * Check whether all required properties have been set.
+	 *
+	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
+	 */
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.userDetailsService, "UserDetailsService must be set");
+	}
 
-    /**
-     * Get the UserDetails object from the wrapped UserDetailsService
-     * implementation
-     */
-    public UserDetails loadUserDetails(T authentication) throws UsernameNotFoundException {
-        return this.userDetailsService.loadUserByUsername(authentication.getName());
-    }
+	/**
+	 * Get the UserDetails object from the wrapped UserDetailsService implementation
+	 */
+	public UserDetails loadUserDetails(T authentication) throws UsernameNotFoundException {
+		return this.userDetailsService.loadUserByUsername(authentication.getName());
+	}
 
-    /**
-     * Set the wrapped UserDetailsService implementation
-     *
-     * @param aUserDetailsService
-     *            The wrapped UserDetailsService to set
-     */
-    public void setUserDetailsService(UserDetailsService aUserDetailsService) {
-        this.userDetailsService = aUserDetailsService;
-    }
+	/**
+	 * Set the wrapped UserDetailsService implementation
+	 *
+	 * @param aUserDetailsService The wrapped UserDetailsService to set
+	 */
+	public void setUserDetailsService(UserDetailsService aUserDetailsService) {
+		this.userDetailsService = aUserDetailsService;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java
index 290d3c69d0..483d515c37 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsChecker.java
@@ -1,13 +1,15 @@
 package org.springframework.security.core.userdetails;
 
 /**
- * Called by classes which make use of a {@link UserDetailsService} to check the status of the loaded
- * <tt>UserDetails</tt> object. Typically this will involve examining the various flags associated with the account and
- * raising an exception if the information cannot be used (for example if the user account is locked or disabled), but
- * a custom implementation could perform any checks it wished.
+ * Called by classes which make use of a {@link UserDetailsService} to check the status of
+ * the loaded <tt>UserDetails</tt> object. Typically this will involve examining the
+ * various flags associated with the account and raising an exception if the information
+ * cannot be used (for example if the user account is locked or disabled), but a custom
+ * implementation could perform any checks it wished.
  * <p>
- * The intention is that this interface should only be used for checks on the persistent data associated with the user.
- * It should not involved in making any authentication decisions based on a submitted authentication request.
+ * The intention is that this interface should only be used for checks on the persistent
+ * data associated with the user. It should not involved in making any authentication
+ * decisions based on a submitted authentication request.
  *
  * @author Luke Taylor
  * @since 2.0
@@ -16,9 +18,9 @@ package org.springframework.security.core.userdetails;
  * @see org.springframework.security.authentication.AccountStatusException
  */
 public interface UserDetailsChecker {
-    /**
-     * Examines the User
-     * @param toCheck the UserDetails instance whose status should be checked.
-     */
-    void check(UserDetails toCheck);
+	/**
+	 * Examines the User
+	 * @param toCheck the UserDetails instance whose status should be checked.
+	 */
+	void check(UserDetails toCheck);
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java
index b4676561c3..df6d7ac984 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UserDetailsService.java
@@ -15,15 +15,16 @@
 
 package org.springframework.security.core.userdetails;
 
-
 /**
  * Core interface which loads user-specific data.
  * <p>
  * It is used throughout the framework as a user DAO and is the strategy used by the
- * {@link org.springframework.security.authentication.dao.DaoAuthenticationProvider DaoAuthenticationProvider}.
+ * {@link org.springframework.security.authentication.dao.DaoAuthenticationProvider
+ * DaoAuthenticationProvider}.
  *
  * <p>
- * The interface requires only one read-only method, which simplifies support for new data-access strategies.
+ * The interface requires only one read-only method, which simplifies support for new
+ * data-access strategies.
  *
  * @see org.springframework.security.authentication.dao.DaoAuthenticationProvider
  * @see UserDetails
@@ -31,19 +32,22 @@ package org.springframework.security.core.userdetails;
  * @author Ben Alex
  */
 public interface UserDetailsService {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Locates the user based on the username. In the actual implementation, the search may possibly be case
-     * sensitive, or case insensitive depending on how the implementation instance is configured. In this case, the
-     * <code>UserDetails</code> object that comes back may have a username that is of a different case than what was
-     * actually requested..
-     *
-     * @param username the username identifying the user whose data is required.
-     *
-     * @return a fully populated user record (never <code>null</code>)
-     *
-     * @throws UsernameNotFoundException if the user could not be found or the user has no GrantedAuthority
-     */
-    UserDetails loadUserByUsername(String username) throws UsernameNotFoundException;
+	/**
+	 * Locates the user based on the username. In the actual implementation, the search
+	 * may possibly be case sensitive, or case insensitive depending on how the
+	 * implementation instance is configured. In this case, the <code>UserDetails</code>
+	 * object that comes back may have a username that is of a different case than what
+	 * was actually requested..
+	 *
+	 * @param username the username identifying the user whose data is required.
+	 *
+	 * @return a fully populated user record (never <code>null</code>)
+	 *
+	 * @throws UsernameNotFoundException if the user could not be found or the user has no
+	 * GrantedAuthority
+	 */
+	UserDetails loadUserByUsername(String username) throws UsernameNotFoundException;
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java b/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java
index 547d9402ff..1fd71e86bc 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/UsernameNotFoundException.java
@@ -17,32 +17,33 @@ package org.springframework.security.core.userdetails;
 
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
- * Thrown if an {@link UserDetailsService} implementation cannot locate a {@link User} by its username.
+ * Thrown if an {@link UserDetailsService} implementation cannot locate a {@link User} by
+ * its username.
  *
  * @author Ben Alex
  */
 public class UsernameNotFoundException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a <code>UsernameNotFoundException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message.
-     */
-    public UsernameNotFoundException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>UsernameNotFoundException</code> with the specified message.
+	 *
+	 * @param msg the detail message.
+	 */
+	public UsernameNotFoundException(String msg) {
+		super(msg);
+	}
 
-    /**
-     * Constructs a {@code UsernameNotFoundException} with the specified message and root cause.
-     *
-     * @param msg the detail message.
-     * @param t root cause
-     */
-    public UsernameNotFoundException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a {@code UsernameNotFoundException} with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message.
+	 * @param t root cause
+	 */
+	public UsernameNotFoundException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java
index 9b760350bf..39b897a92f 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCache.java
@@ -25,7 +25,6 @@ import org.springframework.security.core.userdetails.UserCache;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.util.Assert;
 
-
 /**
  * Caches <code>User</code> objects using a Spring IoC defined <A
  * HREF="http://ehcache.sourceforge.net">EHCACHE</a>.
@@ -33,61 +32,65 @@ import org.springframework.util.Assert;
  * @author Ben Alex
  */
 public class EhCacheBasedUserCache implements UserCache, InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(EhCacheBasedUserCache.class);
+	private static final Log logger = LogFactory.getLog(EhCacheBasedUserCache.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Ehcache cache;
+	private Ehcache cache;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(cache, "cache mandatory");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(cache, "cache mandatory");
+	}
 
-    public Ehcache getCache() {
-        return cache;
-    }
+	public Ehcache getCache() {
+		return cache;
+	}
 
-    public UserDetails getUserFromCache(String username) {
-        Element element = cache.get(username);
+	public UserDetails getUserFromCache(String username) {
+		Element element = cache.get(username);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache hit: " + (element != null) + "; username: " + username);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache hit: " + (element != null) + "; username: " + username);
+		}
 
-        if (element == null) {
-            return null;
-        } else {
-            return (UserDetails) element.getValue();
-        }
-    }
+		if (element == null) {
+			return null;
+		}
+		else {
+			return (UserDetails) element.getValue();
+		}
+	}
 
-    public void putUserInCache(UserDetails user) {
-        Element element = new Element(user.getUsername(), user);
+	public void putUserInCache(UserDetails user) {
+		Element element = new Element(user.getUsername(), user);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache put: " + element.getKey());
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache put: " + element.getKey());
+		}
 
-        cache.put(element);
-    }
+		cache.put(element);
+	}
 
-    public void removeUserFromCache(UserDetails user) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache remove: " + user.getUsername());
-        }
+	public void removeUserFromCache(UserDetails user) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache remove: " + user.getUsername());
+		}
 
-        this.removeUserFromCache(user.getUsername());
-    }
+		this.removeUserFromCache(user.getUsername());
+	}
 
-    public void removeUserFromCache(String username) {
-        cache.remove(username);
-    }
+	public void removeUserFromCache(String username) {
+		cache.remove(username);
+	}
 
-    public void setCache(Ehcache cache) {
-        this.cache = cache;
-    }
+	public void setCache(Ehcache cache) {
+		this.cache = cache;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java
index 7fa5586a97..93dacb721c 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/NullUserCache.java
@@ -15,24 +15,25 @@
 
 package org.springframework.security.core.userdetails.cache;
 
-
 import org.springframework.security.core.userdetails.UserCache;
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 /**
  * Does not perform any caching.
  *
  * @author Ben Alex
  */
 public class NullUserCache implements UserCache {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public UserDetails getUserFromCache(String username) {
-        return null;
-    }
+	public UserDetails getUserFromCache(String username) {
+		return null;
+	}
 
-    public void putUserInCache(UserDetails user) {}
+	public void putUserInCache(UserDetails user) {
+	}
 
-    public void removeUserFromCache(String username) {}
+	public void removeUserFromCache(String username) {
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
index efd3741e8b..ff4c4b46a3 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
@@ -15,54 +15,58 @@ import org.springframework.util.Assert;
  */
 public class SpringCacheBasedUserCache implements UserCache {
 
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    //~ Static fields/initializers =====================================================================================
+	private static final Log logger = LogFactory.getLog(SpringCacheBasedUserCache.class);
 
-    private static final Log logger = LogFactory.getLog(SpringCacheBasedUserCache.class);
+	// ~ Instance fields
+	// ================================================================================================
 
-    //~ Instance fields ================================================================================================
+	private final Cache cache;
 
-    private final Cache cache;
+	// ~ Constructors
+	// ===================================================================================================
 
-    //~ Constructors ===================================================================================================
+	public SpringCacheBasedUserCache(Cache cache) throws Exception {
+		Assert.notNull(cache, "cache mandatory");
+		this.cache = cache;
+	}
 
-    public SpringCacheBasedUserCache(Cache cache) throws Exception {
-        Assert.notNull(cache, "cache mandatory");
-        this.cache = cache;
-    }
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	public UserDetails getUserFromCache(String username) {
+		Cache.ValueWrapper element = username != null ? cache.get(username) : null;
 
-    public UserDetails getUserFromCache(String username) {
-        Cache.ValueWrapper element = username != null ? cache.get(username) : null;
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache hit: " + (element != null) + "; username: " + username);
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache hit: " + (element != null) + "; username: " + username);
-        }
+		if (element == null) {
+			return null;
+		}
+		else {
+			return (UserDetails) element.get();
+		}
+	}
 
-        if (element == null) {
-            return null;
-        } else {
-            return (UserDetails) element.get();
-        }
-    }
+	public void putUserInCache(UserDetails user) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache put: " + user.getUsername());
+		}
+		cache.put(user.getUsername(), user);
+	}
 
-    public void putUserInCache(UserDetails user) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache put: " + user.getUsername());
-        }
-        cache.put(user.getUsername(), user);
-    }
+	public void removeUserFromCache(UserDetails user) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cache remove: " + user.getUsername());
+		}
 
-    public void removeUserFromCache(UserDetails user) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cache remove: " + user.getUsername());
-        }
+		this.removeUserFromCache(user.getUsername());
+	}
 
-        this.removeUserFromCache(user.getUsername());
-    }
-
-    public void removeUserFromCache(String username) {
-        cache.evict(username);
-    }
+	public void removeUserFromCache(String username) {
+		cache.evict(username);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/package-info.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/package-info.java
index 1cadd53d78..fddab0d464 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/cache/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/package-info.java
@@ -2,3 +2,4 @@
  * Implementations of {@link org.springframework.security.core.userdetails.UserCache UserCache}.
  */
 package org.springframework.security.core.userdetails.cache;
+
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java
index 2e9eef98f2..cd922e42d7 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java
@@ -36,319 +36,360 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.Assert;
 
-
 /**
  * <tt>UserDetailsServiceRetrieves</tt> implementation which retrieves the user details
  * (username, password, enabled flag, and authorities) from a database using JDBC queries.
  *
- * <h3>Default Schema</h3>
- * A default database schema is assumed, with two tables "users" and "authorities".
+ * <h3>Default Schema</h3> A default database schema is assumed, with two tables "users"
+ * and "authorities".
  *
  * <h4>The Users table</h4>
  *
  * This table contains the login name, password and enabled status of the user.
  *
  * <table>
- * <tr><th>Column</th></tr>
- * <tr><td>username</td></tr>
- * <tr><td>password</td></tr>
- * <tr><td>enabled</td></tr>
+ * <tr>
+ * <th>Column</th>
+ * </tr>
+ * <tr>
+ * <td>username</td>
+ * </tr>
+ * <tr>
+ * <td>password</td>
+ * </tr>
+ * <tr>
+ * <td>enabled</td>
+ * </tr>
  * </table>
  *
  * <h4>The Authorities Table</h4>
  *
  * <table>
- * <tr><th>Column</th></tr>
- * <tr><td>username</td></tr>
- * <tr><td>authority</td></tr>
+ * <tr>
+ * <th>Column</th>
+ * </tr>
+ * <tr>
+ * <td>username</td>
+ * </tr>
+ * <tr>
+ * <td>authority</td>
+ * </tr>
  * </table>
  *
- * If you are using an existing schema you will have to set the queries <tt>usersByUsernameQuery</tt> and
- * <tt>authoritiesByUsernameQuery</tt> to match your database setup
- * (see {@link #DEF_USERS_BY_USERNAME_QUERY} and {@link #DEF_AUTHORITIES_BY_USERNAME_QUERY}).
+ * If you are using an existing schema you will have to set the queries
+ * <tt>usersByUsernameQuery</tt> and <tt>authoritiesByUsernameQuery</tt> to match your
+ * database setup (see {@link #DEF_USERS_BY_USERNAME_QUERY} and
+ * {@link #DEF_AUTHORITIES_BY_USERNAME_QUERY}).
  *
  * <p>
- * In order to minimise backward compatibility issues, this implementation doesn't recognise the expiration of user
- * accounts or the expiration of user credentials. However, it does recognise and honour the user enabled/disabled
- * column. This should map to a <tt>boolean</tt> type in the result set (the SQL type will depend on the
- * database you are using). All the other columns map to <tt>String</tt>s.
+ * In order to minimise backward compatibility issues, this implementation doesn't
+ * recognise the expiration of user accounts or the expiration of user credentials.
+ * However, it does recognise and honour the user enabled/disabled column. This should map
+ * to a <tt>boolean</tt> type in the result set (the SQL type will depend on the database
+ * you are using). All the other columns map to <tt>String</tt>s.
  *
  * <h3>Group Support</h3>
- * Support for group-based authorities can be enabled by setting the <tt>enableGroups</tt> property to <tt>true</tt>
- * (you may also then wish to set <tt>enableAuthorities</tt> to <tt>false</tt> to disable loading of authorities
- * directly). With this approach, authorities are allocated to groups and a user's authorities are determined based
- * on the groups they are a member of. The net result is the same (a UserDetails containing a set of
- * <tt>GrantedAuthority</tt>s is loaded), but the different persistence strategy may be more suitable for the
- * administration of some applications.
+ * Support for group-based authorities can be enabled by setting the <tt>enableGroups</tt>
+ * property to <tt>true</tt> (you may also then wish to set <tt>enableAuthorities</tt> to
+ * <tt>false</tt> to disable loading of authorities directly). With this approach,
+ * authorities are allocated to groups and a user's authorities are determined based on
+ * the groups they are a member of. The net result is the same (a UserDetails containing a
+ * set of <tt>GrantedAuthority</tt>s is loaded), but the different persistence strategy
+ * may be more suitable for the administration of some applications.
  * <p>
- * When groups are being used, the tables "groups", "group_members" and "group_authorities" are used. See
- * {@link #DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY} for the default query which is used to load the group authorities.
- * Again you can customize this by setting the <tt>groupAuthoritiesByUsernameQuery</tt> property, but the format of
- * the rows returned should match the default.
+ * When groups are being used, the tables "groups", "group_members" and
+ * "group_authorities" are used. See {@link #DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY} for
+ * the default query which is used to load the group authorities. Again you can customize
+ * this by setting the <tt>groupAuthoritiesByUsernameQuery</tt> property, but the format
+ * of the rows returned should match the default.
  *
  * @author Ben Alex
  * @author colin sampaleanu
  * @author Luke Taylor
  */
 public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    public static final String DEF_USERS_BY_USERNAME_QUERY =
-            "select username,password,enabled " +
-            "from users " +
-            "where username = ?";
-    public static final String DEF_AUTHORITIES_BY_USERNAME_QUERY =
-            "select username,authority " +
-            "from authorities " +
-            "where username = ?";
-    public static final String DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY =
-            "select g.id, g.group_name, ga.authority " +
-            "from groups g, group_members gm, group_authorities ga " +
-            "where gm.username = ? " +
-            "and g.id = ga.group_id " +
-            "and g.id = gm.group_id";
+	public static final String DEF_USERS_BY_USERNAME_QUERY = "select username,password,enabled "
+			+ "from users " + "where username = ?";
+	public static final String DEF_AUTHORITIES_BY_USERNAME_QUERY = "select username,authority "
+			+ "from authorities " + "where username = ?";
+	public static final String DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY = "select g.id, g.group_name, ga.authority "
+			+ "from groups g, group_members gm, group_authorities ga "
+			+ "where gm.username = ? "
+			+ "and g.id = ga.group_id "
+			+ "and g.id = gm.group_id";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	protected final MessageSourceAccessor messages = SpringSecurityMessageSource
+			.getAccessor();
 
-    private String authoritiesByUsernameQuery;
-    private String groupAuthoritiesByUsernameQuery;
-    private String usersByUsernameQuery;
-    private String rolePrefix = "";
-    private boolean usernameBasedPrimaryKey = true;
-    private boolean enableAuthorities = true;
-    private boolean enableGroups;
+	private String authoritiesByUsernameQuery;
+	private String groupAuthoritiesByUsernameQuery;
+	private String usersByUsernameQuery;
+	private String rolePrefix = "";
+	private boolean usernameBasedPrimaryKey = true;
+	private boolean enableAuthorities = true;
+	private boolean enableGroups;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public JdbcDaoImpl() {
-        usersByUsernameQuery = DEF_USERS_BY_USERNAME_QUERY;
-        authoritiesByUsernameQuery = DEF_AUTHORITIES_BY_USERNAME_QUERY;
-        groupAuthoritiesByUsernameQuery = DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY;
-    }
+	public JdbcDaoImpl() {
+		usersByUsernameQuery = DEF_USERS_BY_USERNAME_QUERY;
+		authoritiesByUsernameQuery = DEF_AUTHORITIES_BY_USERNAME_QUERY;
+		groupAuthoritiesByUsernameQuery = DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Allows subclasses to add their own granted authorities to the list to be returned in the <tt>UserDetails</tt>.
-     *
-     * @param username the username, for use by finder methods
-     * @param authorities the current granted authorities, as populated from the <code>authoritiesByUsername</code>
-     *        mapping
-     */
-    protected void addCustomAuthorities(String username, List<GrantedAuthority> authorities) {}
+	/**
+	 * Allows subclasses to add their own granted authorities to the list to be returned
+	 * in the <tt>UserDetails</tt>.
+	 *
+	 * @param username the username, for use by finder methods
+	 * @param authorities the current granted authorities, as populated from the
+	 * <code>authoritiesByUsername</code> mapping
+	 */
+	protected void addCustomAuthorities(String username,
+			List<GrantedAuthority> authorities) {
+	}
 
-    public String getUsersByUsernameQuery() {
-        return usersByUsernameQuery;
-    }
+	public String getUsersByUsernameQuery() {
+		return usersByUsernameQuery;
+	}
 
-    protected void initDao() throws ApplicationContextException {
-        Assert.isTrue(enableAuthorities || enableGroups, "Use of either authorities or groups must be enabled");
-    }
+	protected void initDao() throws ApplicationContextException {
+		Assert.isTrue(enableAuthorities || enableGroups,
+				"Use of either authorities or groups must be enabled");
+	}
 
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        List<UserDetails> users = loadUsersByUsername(username);
+	public UserDetails loadUserByUsername(String username)
+			throws UsernameNotFoundException {
+		List<UserDetails> users = loadUsersByUsername(username);
 
-        if (users.size() == 0) {
-            logger.debug("Query returned no results for user '" + username + "'");
+		if (users.size() == 0) {
+			logger.debug("Query returned no results for user '" + username + "'");
 
-            throw new UsernameNotFoundException(
-                    messages.getMessage("JdbcDaoImpl.notFound", new Object[]{username}, "Username {0} not found"));
-        }
+			throw new UsernameNotFoundException(messages.getMessage(
+					"JdbcDaoImpl.notFound", new Object[] { username },
+					"Username {0} not found"));
+		}
 
-        UserDetails user = users.get(0); // contains no GrantedAuthority[]
+		UserDetails user = users.get(0); // contains no GrantedAuthority[]
 
-        Set<GrantedAuthority> dbAuthsSet = new HashSet<GrantedAuthority>();
+		Set<GrantedAuthority> dbAuthsSet = new HashSet<GrantedAuthority>();
 
-        if (enableAuthorities) {
-            dbAuthsSet.addAll(loadUserAuthorities(user.getUsername()));
-        }
+		if (enableAuthorities) {
+			dbAuthsSet.addAll(loadUserAuthorities(user.getUsername()));
+		}
 
-        if (enableGroups) {
-            dbAuthsSet.addAll(loadGroupAuthorities(user.getUsername()));
-        }
+		if (enableGroups) {
+			dbAuthsSet.addAll(loadGroupAuthorities(user.getUsername()));
+		}
 
-        List<GrantedAuthority> dbAuths = new ArrayList<GrantedAuthority>(dbAuthsSet);
+		List<GrantedAuthority> dbAuths = new ArrayList<GrantedAuthority>(dbAuthsSet);
 
-        addCustomAuthorities(user.getUsername(), dbAuths);
+		addCustomAuthorities(user.getUsername(), dbAuths);
 
-        if (dbAuths.size() == 0) {
-            logger.debug("User '" + username + "' has no authorities and will be treated as 'not found'");
+		if (dbAuths.size() == 0) {
+			logger.debug("User '" + username
+					+ "' has no authorities and will be treated as 'not found'");
 
-            throw new UsernameNotFoundException(
-                    messages.getMessage("JdbcDaoImpl.noAuthority",
-                            new Object[] {username}, "User {0} has no GrantedAuthority"));
-        }
+			throw new UsernameNotFoundException(messages.getMessage(
+					"JdbcDaoImpl.noAuthority", new Object[] { username },
+					"User {0} has no GrantedAuthority"));
+		}
 
-        return createUserDetails(username, user, dbAuths);
-    }
+		return createUserDetails(username, user, dbAuths);
+	}
 
-    /**
-     * Executes the SQL <tt>usersByUsernameQuery</tt> and returns a list of UserDetails objects.
-     * There should normally only be one matching user.
-     */
-    protected List<UserDetails> loadUsersByUsername(String username) {
-        return getJdbcTemplate().query(usersByUsernameQuery, new String[] {username}, new RowMapper<UserDetails>() {
-            public UserDetails mapRow(ResultSet rs, int rowNum) throws SQLException {
-                String username = rs.getString(1);
-                String password = rs.getString(2);
-                boolean enabled = rs.getBoolean(3);
-                return new User(username, password, enabled, true, true, true, AuthorityUtils.NO_AUTHORITIES);
-            }
+	/**
+	 * Executes the SQL <tt>usersByUsernameQuery</tt> and returns a list of UserDetails
+	 * objects. There should normally only be one matching user.
+	 */
+	protected List<UserDetails> loadUsersByUsername(String username) {
+		return getJdbcTemplate().query(usersByUsernameQuery, new String[] { username },
+				new RowMapper<UserDetails>() {
+					public UserDetails mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String username = rs.getString(1);
+						String password = rs.getString(2);
+						boolean enabled = rs.getBoolean(3);
+						return new User(username, password, enabled, true, true, true,
+								AuthorityUtils.NO_AUTHORITIES);
+					}
 
-        });
-    }
+				});
+	}
 
-    /**
-     * Loads authorities by executing the SQL from <tt>authoritiesByUsernameQuery</tt>.
-     *
-     * @return a list of GrantedAuthority objects for the user
-     */
-    protected List<GrantedAuthority> loadUserAuthorities(String username) {
-        return getJdbcTemplate().query(authoritiesByUsernameQuery, new String[] {username}, new RowMapper<GrantedAuthority>() {
-            public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException {
-                String roleName = rolePrefix + rs.getString(2);
+	/**
+	 * Loads authorities by executing the SQL from <tt>authoritiesByUsernameQuery</tt>.
+	 *
+	 * @return a list of GrantedAuthority objects for the user
+	 */
+	protected List<GrantedAuthority> loadUserAuthorities(String username) {
+		return getJdbcTemplate().query(authoritiesByUsernameQuery,
+				new String[] { username }, new RowMapper<GrantedAuthority>() {
+					public GrantedAuthority mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String roleName = rolePrefix + rs.getString(2);
 
-                return new SimpleGrantedAuthority(roleName);
-            }
-        });
-    }
+						return new SimpleGrantedAuthority(roleName);
+					}
+				});
+	}
 
-    /**
-     * Loads authorities by executing the SQL from <tt>groupAuthoritiesByUsernameQuery</tt>.
-     *
-     * @return a list of GrantedAuthority objects for the user
-     */
-    protected List<GrantedAuthority> loadGroupAuthorities(String username) {
-        return getJdbcTemplate().query(groupAuthoritiesByUsernameQuery, new String[] {username}, new RowMapper<GrantedAuthority>() {
-            public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException {
-                 String roleName = getRolePrefix() + rs.getString(3);
+	/**
+	 * Loads authorities by executing the SQL from
+	 * <tt>groupAuthoritiesByUsernameQuery</tt>.
+	 *
+	 * @return a list of GrantedAuthority objects for the user
+	 */
+	protected List<GrantedAuthority> loadGroupAuthorities(String username) {
+		return getJdbcTemplate().query(groupAuthoritiesByUsernameQuery,
+				new String[] { username }, new RowMapper<GrantedAuthority>() {
+					public GrantedAuthority mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String roleName = getRolePrefix() + rs.getString(3);
 
-                return new SimpleGrantedAuthority(roleName);
-            }
-        });
-    }
+						return new SimpleGrantedAuthority(roleName);
+					}
+				});
+	}
 
-    /**
-     * Can be overridden to customize the creation of the final UserDetailsObject which is
-     * returned by the <tt>loadUserByUsername</tt> method.
-     *
-     * @param username the name originally passed to loadUserByUsername
-     * @param userFromUserQuery the object returned from the execution of the
-     * @param combinedAuthorities the combined array of authorities from all the authority loading queries.
-     * @return the final UserDetails which should be used in the system.
-     */
-    protected UserDetails createUserDetails(String username, UserDetails userFromUserQuery,
-            List<GrantedAuthority> combinedAuthorities) {
-        String returnUsername = userFromUserQuery.getUsername();
+	/**
+	 * Can be overridden to customize the creation of the final UserDetailsObject which is
+	 * returned by the <tt>loadUserByUsername</tt> method.
+	 *
+	 * @param username the name originally passed to loadUserByUsername
+	 * @param userFromUserQuery the object returned from the execution of the
+	 * @param combinedAuthorities the combined array of authorities from all the authority
+	 * loading queries.
+	 * @return the final UserDetails which should be used in the system.
+	 */
+	protected UserDetails createUserDetails(String username,
+			UserDetails userFromUserQuery, List<GrantedAuthority> combinedAuthorities) {
+		String returnUsername = userFromUserQuery.getUsername();
 
-        if (!usernameBasedPrimaryKey) {
-            returnUsername = username;
-        }
+		if (!usernameBasedPrimaryKey) {
+			returnUsername = username;
+		}
 
-        return new User(returnUsername, userFromUserQuery.getPassword(), userFromUserQuery.isEnabled(),
-                true, true, true, combinedAuthorities);
-    }
+		return new User(returnUsername, userFromUserQuery.getPassword(),
+				userFromUserQuery.isEnabled(), true, true, true, combinedAuthorities);
+	}
 
-    /**
-     * Allows the default query string used to retrieve authorities based on username to be overridden, if
-     * default table or column names need to be changed. The default query is {@link
-     * #DEF_AUTHORITIES_BY_USERNAME_QUERY}; when modifying this query, ensure that all returned columns are mapped
-     * back to the same column names as in the default query.
-     *
-     * @param queryString The SQL query string to set
-     */
-    public void setAuthoritiesByUsernameQuery(String queryString) {
-        authoritiesByUsernameQuery = queryString;
-    }
+	/**
+	 * Allows the default query string used to retrieve authorities based on username to
+	 * be overridden, if default table or column names need to be changed. The default
+	 * query is {@link #DEF_AUTHORITIES_BY_USERNAME_QUERY}; when modifying this query,
+	 * ensure that all returned columns are mapped back to the same column names as in the
+	 * default query.
+	 *
+	 * @param queryString The SQL query string to set
+	 */
+	public void setAuthoritiesByUsernameQuery(String queryString) {
+		authoritiesByUsernameQuery = queryString;
+	}
 
-    protected String getAuthoritiesByUsernameQuery() {
-        return authoritiesByUsernameQuery;
-    }
+	protected String getAuthoritiesByUsernameQuery() {
+		return authoritiesByUsernameQuery;
+	}
 
-    /**
-     * Allows the default query string used to retrieve group authorities based on username to be overridden, if
-     * default table or column names need to be changed. The default query is {@link
-     * #DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY}; when modifying this query, ensure that all returned columns are mapped
-     * back to the same column names as in the default query.
-     *
-     * @param queryString The SQL query string to set
-     */
-    public void setGroupAuthoritiesByUsernameQuery(String queryString) {
-        groupAuthoritiesByUsernameQuery = queryString;
-    }
+	/**
+	 * Allows the default query string used to retrieve group authorities based on
+	 * username to be overridden, if default table or column names need to be changed. The
+	 * default query is {@link #DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY}; when modifying
+	 * this query, ensure that all returned columns are mapped back to the same column
+	 * names as in the default query.
+	 *
+	 * @param queryString The SQL query string to set
+	 */
+	public void setGroupAuthoritiesByUsernameQuery(String queryString) {
+		groupAuthoritiesByUsernameQuery = queryString;
+	}
 
-    /**
-     * Allows a default role prefix to be specified. If this is set to a non-empty value, then it is
-     * automatically prepended to any roles read in from the db. This may for example be used to add the
-     * <tt>ROLE_</tt> prefix expected to exist in role names (by default) by some other Spring Security
-     * classes, in the case that the prefix is not already present in the db.
-     *
-     * @param rolePrefix the new prefix
-     */
-    public void setRolePrefix(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-    }
+	/**
+	 * Allows a default role prefix to be specified. If this is set to a non-empty value,
+	 * then it is automatically prepended to any roles read in from the db. This may for
+	 * example be used to add the <tt>ROLE_</tt> prefix expected to exist in role names
+	 * (by default) by some other Spring Security classes, in the case that the prefix is
+	 * not already present in the db.
+	 *
+	 * @param rolePrefix the new prefix
+	 */
+	public void setRolePrefix(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+	}
 
-    protected String getRolePrefix() {
-        return rolePrefix;
-    }
+	protected String getRolePrefix() {
+		return rolePrefix;
+	}
 
-    /**
-     * If <code>true</code> (the default), indicates the {@link #getUsersByUsernameQuery()} returns a username
-     * in response to a query. If <code>false</code>, indicates that a primary key is used instead. If set to
-     * <code>true</code>, the class will use the database-derived username in the returned <code>UserDetails</code>.
-     * If <code>false</code>, the class will use the {@link #loadUserByUsername(String)} derived username in the
-     * returned <code>UserDetails</code>.
-     *
-     * @param usernameBasedPrimaryKey <code>true</code> if the mapping queries return the username <code>String</code>,
-     *        or <code>false</code> if the mapping returns a database primary key.
-     */
-    public void setUsernameBasedPrimaryKey(boolean usernameBasedPrimaryKey) {
-        this.usernameBasedPrimaryKey = usernameBasedPrimaryKey;
-    }
+	/**
+	 * If <code>true</code> (the default), indicates the
+	 * {@link #getUsersByUsernameQuery()} returns a username in response to a query. If
+	 * <code>false</code>, indicates that a primary key is used instead. If set to
+	 * <code>true</code>, the class will use the database-derived username in the returned
+	 * <code>UserDetails</code>. If <code>false</code>, the class will use the
+	 * {@link #loadUserByUsername(String)} derived username in the returned
+	 * <code>UserDetails</code>.
+	 *
+	 * @param usernameBasedPrimaryKey <code>true</code> if the mapping queries return the
+	 * username <code>String</code>, or <code>false</code> if the mapping returns a
+	 * database primary key.
+	 */
+	public void setUsernameBasedPrimaryKey(boolean usernameBasedPrimaryKey) {
+		this.usernameBasedPrimaryKey = usernameBasedPrimaryKey;
+	}
 
-    protected boolean isUsernameBasedPrimaryKey() {
-        return usernameBasedPrimaryKey;
-    }
+	protected boolean isUsernameBasedPrimaryKey() {
+		return usernameBasedPrimaryKey;
+	}
 
-    /**
-     * Allows the default query string used to retrieve users based on username to be overridden, if default
-     * table or column names need to be changed. The default query is {@link #DEF_USERS_BY_USERNAME_QUERY}; when
-     * modifying this query, ensure that all returned columns are mapped back to the same column names as in the
-     * default query. If the 'enabled' column does not exist in the source database, a permanent true value for this
-     * column may be returned by using a query similar to
-     * <pre>
-     * "select username,password,'true' as enabled from users where username = ?"
-     * </pre>
-     *
-     * @param usersByUsernameQueryString The query string to set
-     */
-    public void setUsersByUsernameQuery(String usersByUsernameQueryString) {
-        this.usersByUsernameQuery = usersByUsernameQueryString;
-    }
+	/**
+	 * Allows the default query string used to retrieve users based on username to be
+	 * overridden, if default table or column names need to be changed. The default query
+	 * is {@link #DEF_USERS_BY_USERNAME_QUERY}; when modifying this query, ensure that all
+	 * returned columns are mapped back to the same column names as in the default query.
+	 * If the 'enabled' column does not exist in the source database, a permanent true
+	 * value for this column may be returned by using a query similar to
+	 * 
+	 * <pre>
+	 * &quot;select username,password,'true' as enabled from users where username = ?&quot;
+	 * </pre>
+	 *
+	 * @param usersByUsernameQueryString The query string to set
+	 */
+	public void setUsersByUsernameQuery(String usersByUsernameQueryString) {
+		this.usersByUsernameQuery = usersByUsernameQueryString;
+	}
 
-    protected boolean getEnableAuthorities() {
-        return enableAuthorities;
-    }
+	protected boolean getEnableAuthorities() {
+		return enableAuthorities;
+	}
 
-    /**
-     * Enables loading of authorities (roles) from the authorities table. Defaults to true
-     */
-    public void setEnableAuthorities(boolean enableAuthorities) {
-        this.enableAuthorities = enableAuthorities;
-    }
+	/**
+	 * Enables loading of authorities (roles) from the authorities table. Defaults to true
+	 */
+	public void setEnableAuthorities(boolean enableAuthorities) {
+		this.enableAuthorities = enableAuthorities;
+	}
 
-    protected boolean getEnableGroups() {
-        return enableGroups;
-    }
+	protected boolean getEnableGroups() {
+		return enableGroups;
+	}
 
-    /**
-     * Enables support for group authorities. Defaults to false
-     * @param enableGroups
-     */
-    public void setEnableGroups(boolean enableGroups) {
-        this.enableGroups = enableGroups;
-    }
+	/**
+	 * Enables support for group authorities. Defaults to false
+	 * @param enableGroups
+	 */
+	public void setEnableGroups(boolean enableGroups) {
+		this.enableGroups = enableGroups;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/package-info.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/package-info.java
index bffdf53c66..26994663bf 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/package-info.java
@@ -3,3 +3,4 @@
  * {@code org.springframework.security.core.userdetails.UserDetailsService UserDetailsService}.
  */
 package org.springframework.security.core.userdetails.jdbc;
+
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java
index 88e75690d5..06bde8f9b9 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java
@@ -22,74 +22,77 @@ import java.util.Vector;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
-
 /**
- * Used by {@link InMemoryDaoImpl} to temporarily store the attributes associated with a user.
+ * Used by {@link InMemoryDaoImpl} to temporarily store the attributes associated with a
+ * user.
  *
  * @author Ben Alex
  */
 public class UserAttribute {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private List<GrantedAuthority> authorities = new Vector<GrantedAuthority>();
-    private String password;
-    private boolean enabled = true;
+	private List<GrantedAuthority> authorities = new Vector<GrantedAuthority>();
+	private String password;
+	private boolean enabled = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void addAuthority(GrantedAuthority newAuthority) {
-        this.authorities.add(newAuthority);
-    }
+	public void addAuthority(GrantedAuthority newAuthority) {
+		this.authorities.add(newAuthority);
+	}
 
-    public List<GrantedAuthority> getAuthorities() {
-        return this.authorities;
-    }
+	public List<GrantedAuthority> getAuthorities() {
+		return this.authorities;
+	}
 
-    /**
-     * Set all authorities for this user.
-     *
-     * @param authorities {@link List} &lt;{@link GrantedAuthority}>
-     * @since 1.1
-     */
-    public void setAuthorities(List<GrantedAuthority> authorities) {
-        this.authorities = authorities;
-    }
+	/**
+	 * Set all authorities for this user.
+	 *
+	 * @param authorities {@link List} &lt;{@link GrantedAuthority}>
+	 * @since 1.1
+	 */
+	public void setAuthorities(List<GrantedAuthority> authorities) {
+		this.authorities = authorities;
+	}
 
-    /**
-     * Set all authorities for this user from String values.
-     * It will create the necessary {@link GrantedAuthority} objects.
-     *
-     * @param authoritiesAsStrings {@link List} &lt;{@link String}>
-     * @since 1.1
-     */
-    public void setAuthoritiesAsString(List<String> authoritiesAsStrings) {
-        setAuthorities(new ArrayList<GrantedAuthority>(authoritiesAsStrings.size()));
-        for(String authority : authoritiesAsStrings) {
-            addAuthority(new SimpleGrantedAuthority(authority));
-        }
-    }
+	/**
+	 * Set all authorities for this user from String values. It will create the necessary
+	 * {@link GrantedAuthority} objects.
+	 *
+	 * @param authoritiesAsStrings {@link List} &lt;{@link String}>
+	 * @since 1.1
+	 */
+	public void setAuthoritiesAsString(List<String> authoritiesAsStrings) {
+		setAuthorities(new ArrayList<GrantedAuthority>(authoritiesAsStrings.size()));
+		for (String authority : authoritiesAsStrings) {
+			addAuthority(new SimpleGrantedAuthority(authority));
+		}
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+	public boolean isEnabled() {
+		return enabled;
+	}
 
-    public boolean isValid() {
-        if ((this.password != null) && (authorities.size() > 0)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	public boolean isValid() {
+		if ((this.password != null) && (authorities.size() > 0)) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 
-    public void setEnabled(boolean enabled) {
-        this.enabled = enabled;
-    }
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java
index a343df84c7..7682835576 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java
@@ -22,44 +22,51 @@ import java.util.List;
 import org.springframework.util.StringUtils;
 
 /**
- * Property editor that creates a {@link UserAttribute} from a  comma separated list of values.
+ * Property editor that creates a {@link UserAttribute} from a comma separated list of
+ * values.
  *
  * @author Ben Alex
  */
 public class UserAttributeEditor extends PropertyEditorSupport {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void setAsText(String s) throws IllegalArgumentException {
-        if (StringUtils.hasText(s)) {
-            String[] tokens = StringUtils.commaDelimitedListToStringArray(s);
-            UserAttribute userAttrib = new UserAttribute();
+	public void setAsText(String s) throws IllegalArgumentException {
+		if (StringUtils.hasText(s)) {
+			String[] tokens = StringUtils.commaDelimitedListToStringArray(s);
+			UserAttribute userAttrib = new UserAttribute();
 
-            List<String> authoritiesAsStrings = new ArrayList<String>();
+			List<String> authoritiesAsStrings = new ArrayList<String>();
 
-            for (int i = 0; i < tokens.length; i++) {
-                String currentToken = tokens[i].trim();
+			for (int i = 0; i < tokens.length; i++) {
+				String currentToken = tokens[i].trim();
 
-                if (i == 0) {
-                    userAttrib.setPassword(currentToken);
-                } else {
-                    if (currentToken.toLowerCase().equals("enabled")) {
-                        userAttrib.setEnabled(true);
-                    } else if (currentToken.toLowerCase().equals("disabled")) {
-                        userAttrib.setEnabled(false);
-                    } else {
-                        authoritiesAsStrings.add(currentToken);
-                    }
-                }
-            }
-            userAttrib.setAuthoritiesAsString(authoritiesAsStrings);
+				if (i == 0) {
+					userAttrib.setPassword(currentToken);
+				}
+				else {
+					if (currentToken.toLowerCase().equals("enabled")) {
+						userAttrib.setEnabled(true);
+					}
+					else if (currentToken.toLowerCase().equals("disabled")) {
+						userAttrib.setEnabled(false);
+					}
+					else {
+						authoritiesAsStrings.add(currentToken);
+					}
+				}
+			}
+			userAttrib.setAuthoritiesAsString(authoritiesAsStrings);
 
-            if (userAttrib.isValid()) {
-                setValue(userAttrib);
-            } else {
-                setValue(null);
-            }
-        } else {
-            setValue(null);
-        }
-    }
+			if (userAttrib.isValid()) {
+				setValue(userAttrib);
+			}
+			else {
+				setValue(null);
+			}
+		}
+		else {
+			setValue(null);
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/package-info.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/package-info.java
index 16afaa46da..f907b59023 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/memory/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/package-info.java
@@ -2,3 +2,4 @@
  * Exposes an in-memory authentication repository.
  */
 package org.springframework.security.core.userdetails.memory;
+
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/package-info.java b/core/src/main/java/org/springframework/security/core/userdetails/package-info.java
index 738ad7912e..f3dc5f398a 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/package-info.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/package-info.java
@@ -6,3 +6,4 @@
  * {@link org.springframework.security.core.userdetails.AuthenticationUserDetailsService AuthenticationUserDetailsService}.
  */
 package org.springframework.security.core.userdetails;
+
diff --git a/core/src/main/java/org/springframework/security/provisioning/GroupManager.java b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
index 3f8da56bd1..0179684e5c 100644
--- a/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/GroupManager.java
@@ -7,78 +7,78 @@ import org.springframework.security.core.GrantedAuthority;
 /**
  * Allows management of groups of authorities and their members.
  * <p>
- * Typically this will be used to supplement the functionality of a {@link UserDetailsManager}
- * in situations where the organization of application granted authorities into groups is preferred over
- * a straight mapping of users to roles.
+ * Typically this will be used to supplement the functionality of a
+ * {@link UserDetailsManager} in situations where the organization of application granted
+ * authorities into groups is preferred over a straight mapping of users to roles.
  * <p>
- * With this scenario, users are allocated to groups and take on the list of authorities which
- * are assigned to the group, providing more flexible administration options.
+ * With this scenario, users are allocated to groups and take on the list of authorities
+ * which are assigned to the group, providing more flexible administration options.
  *
  * @author Luke Taylor
  */
 public interface GroupManager {
 
-    /**
-     * Returns the names of all groups that this group manager controls.
-     */
-    List<String> findAllGroups();
+	/**
+	 * Returns the names of all groups that this group manager controls.
+	 */
+	List<String> findAllGroups();
 
-    /**
-     * Locates the users who are members of a group
-     *
-     * @param groupName the group whose members are required
-     * @return the usernames of the group members
-     */
-    List<String> findUsersInGroup(String groupName);
+	/**
+	 * Locates the users who are members of a group
+	 *
+	 * @param groupName the group whose members are required
+	 * @return the usernames of the group members
+	 */
+	List<String> findUsersInGroup(String groupName);
 
-    /**
-     * Creates a new group with the specified list of authorities.
-     *
-     * @param groupName the name for the new group
-     * @param authorities the authorities which are to be allocated to this group.
-     */
-    void createGroup(String groupName, List<GrantedAuthority> authorities);
+	/**
+	 * Creates a new group with the specified list of authorities.
+	 *
+	 * @param groupName the name for the new group
+	 * @param authorities the authorities which are to be allocated to this group.
+	 */
+	void createGroup(String groupName, List<GrantedAuthority> authorities);
 
-    /**
-     * Removes a group, including all members and authorities.
-     *
-     * @param groupName the group to remove.
-     */
-    void deleteGroup(String groupName);
+	/**
+	 * Removes a group, including all members and authorities.
+	 *
+	 * @param groupName the group to remove.
+	 */
+	void deleteGroup(String groupName);
 
-    /**
-     * Changes the name of a group without altering the assigned authorities or members.
-     */
-    void renameGroup(String oldName, String newName);
+	/**
+	 * Changes the name of a group without altering the assigned authorities or members.
+	 */
+	void renameGroup(String oldName, String newName);
 
-    /**
-     * Makes a user a member of a particular group.
-     *
-     * @param username the user to be given membership.
-     * @param group the name of the group to which the user will be added.
-     */
-    void addUserToGroup(String username, String group);
+	/**
+	 * Makes a user a member of a particular group.
+	 *
+	 * @param username the user to be given membership.
+	 * @param group the name of the group to which the user will be added.
+	 */
+	void addUserToGroup(String username, String group);
 
-    /**
-     * Deletes a user's membership of a group.
-     *
-     * @param username the user
-     * @param groupName the group to remove them from
-     */
-    void removeUserFromGroup(String username, String groupName);
+	/**
+	 * Deletes a user's membership of a group.
+	 *
+	 * @param username the user
+	 * @param groupName the group to remove them from
+	 */
+	void removeUserFromGroup(String username, String groupName);
 
-    /**
-     * Obtains the list of authorities which are assigned to a group.
-     */
-    List<GrantedAuthority> findGroupAuthorities(String groupName);
+	/**
+	 * Obtains the list of authorities which are assigned to a group.
+	 */
+	List<GrantedAuthority> findGroupAuthorities(String groupName);
 
-    /**
-     * Assigns a new authority to a group.
-     */
-    void addGroupAuthority(String groupName, GrantedAuthority authority);
+	/**
+	 * Assigns a new authority to a group.
+	 */
+	void addGroupAuthority(String groupName, GrantedAuthority authority);
 
-    /**
-     * Deletes an authority from those assigned to a group
-     */
-    void removeGroupAuthority(String groupName, GrantedAuthority authority);
+	/**
+	 * Deletes an authority from those assigned to a group
+	 */
+	void removeGroupAuthority(String groupName, GrantedAuthority authority);
 }
diff --git a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java
index 47a7860b9a..7d6e5c4d74 100644
--- a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java
@@ -21,103 +21,113 @@ import org.springframework.security.core.userdetails.memory.UserAttributeEditor;
 import org.springframework.util.Assert;
 
 /**
- * Non-persistent implementation of {@code UserDetailsManager} which is backed by an in-memory map.
+ * Non-persistent implementation of {@code UserDetailsManager} which is backed by an
+ * in-memory map.
  * <p>
- * Mainly intended for testing and demonstration purposes, where a full blown persistent system isn't required.
+ * Mainly intended for testing and demonstration purposes, where a full blown persistent
+ * system isn't required.
  *
  * @author Luke Taylor
  * @since 3.1
  */
 public class InMemoryUserDetailsManager implements UserDetailsManager {
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final Map<String, MutableUserDetails> users = new HashMap<String,MutableUserDetails>();
+	private final Map<String, MutableUserDetails> users = new HashMap<String, MutableUserDetails>();
 
-    private AuthenticationManager authenticationManager;
+	private AuthenticationManager authenticationManager;
 
-    public InMemoryUserDetailsManager(Collection<UserDetails> users) {
-        for (UserDetails user : users) {
-            createUser(user);
-        }
-    }
+	public InMemoryUserDetailsManager(Collection<UserDetails> users) {
+		for (UserDetails user : users) {
+			createUser(user);
+		}
+	}
 
-    public InMemoryUserDetailsManager(Properties users) {
-        Enumeration<?> names = users.propertyNames();
-        UserAttributeEditor editor = new UserAttributeEditor();
+	public InMemoryUserDetailsManager(Properties users) {
+		Enumeration<?> names = users.propertyNames();
+		UserAttributeEditor editor = new UserAttributeEditor();
 
-        while(names.hasMoreElements()) {
-            String name = (String) names.nextElement();
-            editor.setAsText(users.getProperty(name));
-            UserAttribute attr = (UserAttribute) editor.getValue();
-            UserDetails user = new User(name, attr.getPassword(), attr.isEnabled(), true, true, true,
-                    attr.getAuthorities());
-            createUser(user);
-        }
-    }
+		while (names.hasMoreElements()) {
+			String name = (String) names.nextElement();
+			editor.setAsText(users.getProperty(name));
+			UserAttribute attr = (UserAttribute) editor.getValue();
+			UserDetails user = new User(name, attr.getPassword(), attr.isEnabled(), true,
+					true, true, attr.getAuthorities());
+			createUser(user);
+		}
+	}
 
-    public void createUser(UserDetails user) {
-        Assert.isTrue(!userExists(user.getUsername()));
+	public void createUser(UserDetails user) {
+		Assert.isTrue(!userExists(user.getUsername()));
 
-        users.put(user.getUsername().toLowerCase(), new MutableUser(user));
-    }
+		users.put(user.getUsername().toLowerCase(), new MutableUser(user));
+	}
 
-    public void deleteUser(String username) {
-        users.remove(username.toLowerCase());
-    }
+	public void deleteUser(String username) {
+		users.remove(username.toLowerCase());
+	}
 
-    public void updateUser(UserDetails user) {
-        Assert.isTrue(userExists(user.getUsername()));
+	public void updateUser(UserDetails user) {
+		Assert.isTrue(userExists(user.getUsername()));
 
-        users.put(user.getUsername().toLowerCase(), new MutableUser(user));
-    }
+		users.put(user.getUsername().toLowerCase(), new MutableUser(user));
+	}
 
-    public boolean userExists(String username) {
-        return users.containsKey(username.toLowerCase());
-    }
+	public boolean userExists(String username) {
+		return users.containsKey(username.toLowerCase());
+	}
 
-    public void changePassword(String oldPassword, String newPassword) {
-        Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
+	public void changePassword(String oldPassword, String newPassword) {
+		Authentication currentUser = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (currentUser == null) {
-            // This would indicate bad coding somewhere
-            throw new AccessDeniedException("Can't change password as no Authentication object found in context " +
-                    "for current user.");
-        }
+		if (currentUser == null) {
+			// This would indicate bad coding somewhere
+			throw new AccessDeniedException(
+					"Can't change password as no Authentication object found in context "
+							+ "for current user.");
+		}
 
-        String username = currentUser.getName();
+		String username = currentUser.getName();
 
-        logger.debug("Changing password for user '"+ username + "'");
+		logger.debug("Changing password for user '" + username + "'");
 
-        // If an authentication manager has been set, re-authenticate the user with the supplied password.
-        if (authenticationManager != null) {
-            logger.debug("Reauthenticating user '"+ username + "' for password change request.");
+		// If an authentication manager has been set, re-authenticate the user with the
+		// supplied password.
+		if (authenticationManager != null) {
+			logger.debug("Reauthenticating user '" + username
+					+ "' for password change request.");
 
-            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword));
-        } else {
-            logger.debug("No authentication manager set. Password won't be re-checked.");
-        }
+			authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(
+					username, oldPassword));
+		}
+		else {
+			logger.debug("No authentication manager set. Password won't be re-checked.");
+		}
 
-        MutableUserDetails user = users.get(username);
+		MutableUserDetails user = users.get(username);
 
-        if (user == null) {
-            throw new IllegalStateException("Current user doesn't exist in database.");
-        }
+		if (user == null) {
+			throw new IllegalStateException("Current user doesn't exist in database.");
+		}
 
-        user.setPassword(newPassword);
-    }
+		user.setPassword(newPassword);
+	}
 
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        UserDetails user = users.get(username.toLowerCase());
+	public UserDetails loadUserByUsername(String username)
+			throws UsernameNotFoundException {
+		UserDetails user = users.get(username.toLowerCase());
 
-        if (user == null) {
-            throw new UsernameNotFoundException(username);
-        }
+		if (user == null) {
+			throw new UsernameNotFoundException(username);
+		}
 
-        return new User(user.getUsername(), user.getPassword(), user.isEnabled(), user.isAccountNonExpired(),
-                user.isCredentialsNonExpired(), user.isAccountNonLocked(), user.getAuthorities());
-    }
+		return new User(user.getUsername(), user.getPassword(), user.isEnabled(),
+				user.isAccountNonExpired(), user.isCredentialsNonExpired(),
+				user.isAccountNonLocked(), user.getAuthorities());
+	}
 
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
index 9f519afdf6..6ad20fc24d 100644
--- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java
@@ -29,476 +29,483 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * Jdbc user management service, based on the same table structure as its parent class, <tt>JdbcDaoImpl</tt>.
+ * Jdbc user management service, based on the same table structure as its parent class,
+ * <tt>JdbcDaoImpl</tt>.
  * <p>
- * Provides CRUD operations for both users and groups. Note that if the {@link #setEnableAuthorities(boolean)
- * enableAuthorities} property is set to false, calls to createUser, updateUser and deleteUser will not store the
- * authorities from the <tt>UserDetails</tt> or delete authorities for the user. Since this class cannot differentiate
- * between authorities which were loaded for an individual or for a group of which the individual is a member,
- * it's important that you take this into account when using this implementation for managing your users.
+ * Provides CRUD operations for both users and groups. Note that if the
+ * {@link #setEnableAuthorities(boolean) enableAuthorities} property is set to false,
+ * calls to createUser, updateUser and deleteUser will not store the authorities from the
+ * <tt>UserDetails</tt> or delete authorities for the user. Since this class cannot
+ * differentiate between authorities which were loaded for an individual or for a group of
+ * which the individual is a member, it's important that you take this into account when
+ * using this implementation for managing your users.
  *
  * @author Luke Taylor
  * @since 2.0
  */
-public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsManager, GroupManager {
-    //~ Static fields/initializers =====================================================================================
-
-    // UserDetailsManager SQL
-    public static final String DEF_CREATE_USER_SQL =
-            "insert into users (username, password, enabled) values (?,?,?)";
-    public static final String DEF_DELETE_USER_SQL =
-            "delete from users where username = ?";
-    public static final String DEF_UPDATE_USER_SQL =
-            "update users set password = ?, enabled = ? where username = ?";
-    public static final String DEF_INSERT_AUTHORITY_SQL =
-            "insert into authorities (username, authority) values (?,?)";
-    public static final String DEF_DELETE_USER_AUTHORITIES_SQL =
-            "delete from authorities where username = ?";
-    public static final String DEF_USER_EXISTS_SQL =
-            "select username from users where username = ?";
-    public static final String DEF_CHANGE_PASSWORD_SQL =
-            "update users set password = ? where username = ?";
-
-    // GroupManager SQL
-    public static final String DEF_FIND_GROUPS_SQL =
-            "select group_name from groups";
-    public static final String DEF_FIND_USERS_IN_GROUP_SQL =
-            "select username from group_members gm, groups g " +
-            "where gm.group_id = g.id" +
-            " and g.group_name = ?";
-    public static final String DEF_INSERT_GROUP_SQL =
-            "insert into groups (group_name) values (?)";
-    public static final String DEF_FIND_GROUP_ID_SQL =
-            "select id from groups where group_name = ?";
-    public static final String DEF_INSERT_GROUP_AUTHORITY_SQL =
-            "insert into group_authorities (group_id, authority) values (?,?)";
-    public static final String DEF_DELETE_GROUP_SQL =
-            "delete from groups where id = ?";
-    public static final String DEF_DELETE_GROUP_AUTHORITIES_SQL =
-            "delete from group_authorities where group_id = ?";
-    public static final String DEF_DELETE_GROUP_MEMBERS_SQL =
-            "delete from group_members where group_id = ?";
-    public static final String DEF_RENAME_GROUP_SQL =
-            "update groups set group_name = ? where group_name = ?";
-    public static final String DEF_INSERT_GROUP_MEMBER_SQL =
-            "insert into group_members (group_id, username) values (?,?)";
-    public static final String DEF_DELETE_GROUP_MEMBER_SQL =
-            "delete from group_members where group_id = ? and username = ?";
-    public static final String DEF_GROUP_AUTHORITIES_QUERY_SQL =
-            "select g.id, g.group_name, ga.authority " +
-            "from groups g, group_authorities ga " +
-            "where g.group_name = ? " +
-            "and g.id = ga.group_id ";
-    public static final String DEF_DELETE_GROUP_AUTHORITY_SQL =
-            "delete from group_authorities where group_id = ? and authority = ?";
-
-
-    //~ Instance fields ================================================================================================
-
-    protected final Log logger = LogFactory.getLog(getClass());
-
-    private String createUserSql = DEF_CREATE_USER_SQL;
-    private String deleteUserSql = DEF_DELETE_USER_SQL;
-    private String updateUserSql = DEF_UPDATE_USER_SQL;
-    private String createAuthoritySql = DEF_INSERT_AUTHORITY_SQL;
-    private String deleteUserAuthoritiesSql = DEF_DELETE_USER_AUTHORITIES_SQL;
-    private String userExistsSql = DEF_USER_EXISTS_SQL;
-    private String changePasswordSql = DEF_CHANGE_PASSWORD_SQL;
-
-    private String findAllGroupsSql = DEF_FIND_GROUPS_SQL;
-    private String findUsersInGroupSql = DEF_FIND_USERS_IN_GROUP_SQL;
-    private String insertGroupSql = DEF_INSERT_GROUP_SQL;
-    private String findGroupIdSql = DEF_FIND_GROUP_ID_SQL;
-    private String insertGroupAuthoritySql = DEF_INSERT_GROUP_AUTHORITY_SQL;
-    private String deleteGroupSql = DEF_DELETE_GROUP_SQL;
-    private String deleteGroupAuthoritiesSql = DEF_DELETE_GROUP_AUTHORITIES_SQL;
-    private String deleteGroupMembersSql = DEF_DELETE_GROUP_MEMBERS_SQL;
-    private String renameGroupSql = DEF_RENAME_GROUP_SQL;
-    private String insertGroupMemberSql = DEF_INSERT_GROUP_MEMBER_SQL;
-    private String deleteGroupMemberSql = DEF_DELETE_GROUP_MEMBER_SQL;
-    private String groupAuthoritiesSql = DEF_GROUP_AUTHORITIES_QUERY_SQL;
-    private String deleteGroupAuthoritySql = DEF_DELETE_GROUP_AUTHORITY_SQL;
-
-    private AuthenticationManager authenticationManager;
-
-    private UserCache userCache = new NullUserCache();
-
-    //~ Methods ========================================================================================================
-
-    protected void initDao() throws ApplicationContextException {
-        if (authenticationManager == null) {
-            logger.info("No authentication manager set. Reauthentication of users when changing passwords will " +
-                    "not be performed.");
-        }
-
-        super.initDao();
-    }
-
-    //~ UserDetailsManager implementation ==============================================================================
-
-    public void createUser(final UserDetails user) {
-        validateUserDetails(user);
-        getJdbcTemplate().update(createUserSql, new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setString(1, user.getUsername());
-                ps.setString(2, user.getPassword());
-                ps.setBoolean(3, user.isEnabled());
-            }
-
-        });
-
-        if (getEnableAuthorities()) {
-            insertUserAuthorities(user);
-        }
-    }
-
-    public void updateUser(final UserDetails user) {
-        validateUserDetails(user);
-        getJdbcTemplate().update(updateUserSql, new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setString(1, user.getPassword());
-                ps.setBoolean(2, user.isEnabled());
-                ps.setString(3, user.getUsername());
-            }
-        });
-
-        if (getEnableAuthorities()) {
-            deleteUserAuthorities(user.getUsername());
-            insertUserAuthorities(user);
-        }
-
-        userCache.removeUserFromCache(user.getUsername());
-    }
-
-    private void insertUserAuthorities(UserDetails user) {
-        for (GrantedAuthority auth : user.getAuthorities()) {
-            getJdbcTemplate().update(createAuthoritySql, user.getUsername(), auth.getAuthority());
-        }
-    }
-
-    public void deleteUser(String username) {
-        if (getEnableAuthorities()) {
-            deleteUserAuthorities(username);
-        }
-        getJdbcTemplate().update(deleteUserSql, username);
-        userCache.removeUserFromCache(username);
-    }
-
-    private void deleteUserAuthorities(String username) {
-        getJdbcTemplate().update(deleteUserAuthoritiesSql, username);
-    }
-
-    public void changePassword(String oldPassword, String newPassword) throws AuthenticationException {
-        Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
-
-        if (currentUser == null) {
-            // This would indicate bad coding somewhere
-            throw new AccessDeniedException("Can't change password as no Authentication object found in context " +
-                    "for current user.");
-        }
-
-        String username = currentUser.getName();
-
-        // If an authentication manager has been set, re-authenticate the user with the supplied password.
-        if (authenticationManager != null) {
-            logger.debug("Reauthenticating user '"+ username + "' for password change request.");
-
-            authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, oldPassword));
-        } else {
-            logger.debug("No authentication manager set. Password won't be re-checked.");
-        }
-
-        logger.debug("Changing password for user '"+ username + "'");
-
-        getJdbcTemplate().update(changePasswordSql, newPassword, username);
-
-        SecurityContextHolder.getContext().setAuthentication(createNewAuthentication(currentUser, newPassword));
-
-        userCache.removeUserFromCache(username);
-    }
-
-    protected Authentication createNewAuthentication(Authentication currentAuth, String newPassword) {
-        UserDetails user = loadUserByUsername(currentAuth.getName());
-
-        UsernamePasswordAuthenticationToken newAuthentication =
-                new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());
-        newAuthentication.setDetails(currentAuth.getDetails());
-
-        return newAuthentication;
-    }
-
-    public boolean userExists(String username) {
-        List<String> users = getJdbcTemplate().queryForList(userExistsSql, new String[] {username}, String.class);
-
-        if (users.size() > 1) {
-            throw new IncorrectResultSizeDataAccessException("More than one user found with name '" + username + "'", 1);
-        }
-
-        return users.size() == 1;
-    }
-
-    //~ GroupManager implementation ====================================================================================
-
-    public List<String> findAllGroups() {
-        return getJdbcTemplate().queryForList(findAllGroupsSql, String.class);
-    }
-
-    public List<String> findUsersInGroup(String groupName) {
-        Assert.hasText(groupName);
-        return getJdbcTemplate().queryForList(findUsersInGroupSql, new String[] {groupName}, String.class);
-    }
-
-    public void createGroup(final String groupName, final List<GrantedAuthority> authorities) {
-        Assert.hasText(groupName);
-        Assert.notNull(authorities);
-
-        logger.debug("Creating new group '" + groupName + "' with authorities " +
-                AuthorityUtils.authorityListToSet(authorities));
-
-        getJdbcTemplate().update(insertGroupSql, groupName);
-
-        final int groupId = findGroupId(groupName);
-
-        for (GrantedAuthority a : authorities) {
-            final String authority = a.getAuthority();
-            getJdbcTemplate().update(insertGroupAuthoritySql, new PreparedStatementSetter() {
-                public void setValues(PreparedStatement ps) throws SQLException {
-                    ps.setInt(1, groupId);
-                    ps.setString(2, authority);
-                }
-            });
-        }
-    }
-
-    public void deleteGroup(String groupName) {
-        logger.debug("Deleting group '" + groupName + "'");
-        Assert.hasText(groupName);
-
-        final int id = findGroupId(groupName);
-        PreparedStatementSetter groupIdPSS = new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setInt(1, id);
-            }
-        };
-        getJdbcTemplate().update(deleteGroupMembersSql, groupIdPSS);
-        getJdbcTemplate().update(deleteGroupAuthoritiesSql, groupIdPSS);
-        getJdbcTemplate().update(deleteGroupSql, groupIdPSS);
-    }
-
-    public void renameGroup(String oldName, String newName) {
-        logger.debug("Changing group name from '" + oldName + "' to '" + newName + "'");
-        Assert.hasText(oldName);
-        Assert.hasText(newName);
-
-        getJdbcTemplate().update(renameGroupSql, newName, oldName);
-    }
-
-    public void addUserToGroup(final String username, final String groupName) {
-        logger.debug("Adding user '" + username + "' to group '" + groupName + "'");
-        Assert.hasText(username);
-        Assert.hasText(groupName);
-
-        final int id = findGroupId(groupName);
-        getJdbcTemplate().update(insertGroupMemberSql, new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setInt(1, id);
-                ps.setString(2, username);
-            }
-        });
-
-        userCache.removeUserFromCache(username);
-    }
-
-    public void removeUserFromGroup(final String username, final String groupName) {
-        logger.debug("Removing user '" + username + "' to group '" + groupName + "'");
-        Assert.hasText(username);
-        Assert.hasText(groupName);
-
-        final int id = findGroupId(groupName);
-
-        getJdbcTemplate().update(deleteGroupMemberSql, new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setInt(1, id);
-                ps.setString(2, username);
-            }
-        });
-
-        userCache.removeUserFromCache(username);
-    }
-
-    public List<GrantedAuthority> findGroupAuthorities(String groupName) {
-        logger.debug("Loading authorities for group '" + groupName + "'");
-        Assert.hasText(groupName);
-
-        return getJdbcTemplate().query(groupAuthoritiesSql, new String[] {groupName}, new RowMapper<GrantedAuthority>() {
-            public GrantedAuthority mapRow(ResultSet rs, int rowNum) throws SQLException {
-                 String roleName = getRolePrefix() + rs.getString(3);
-
-                return new SimpleGrantedAuthority(roleName);
-            }
-        });
-    }
-
-    public void removeGroupAuthority(String groupName, final GrantedAuthority authority) {
-        logger.debug("Removing authority '" + authority + "' from group '" + groupName + "'");
-        Assert.hasText(groupName);
-        Assert.notNull(authority);
-
-        final int id = findGroupId(groupName);
-
-        getJdbcTemplate().update(deleteGroupAuthoritySql, new PreparedStatementSetter() {
-
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setInt(1, id);
-                ps.setString(2, authority.getAuthority());
-            }
-        });
-    }
-
-    public void addGroupAuthority(final String groupName, final GrantedAuthority authority) {
-        logger.debug("Adding authority '" + authority + "' to group '" + groupName + "'");
-        Assert.hasText(groupName);
-        Assert.notNull(authority);
-
-        final int id = findGroupId(groupName);
-        getJdbcTemplate().update(insertGroupAuthoritySql, new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setInt(1, id);
-                ps.setString(2, authority.getAuthority());
-            }
-        });
-    }
-
-    private int findGroupId(String group) {
-        return getJdbcTemplate().queryForInt(findGroupIdSql, group);
-    }
-
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
-
-    public void setCreateUserSql(String createUserSql) {
-        Assert.hasText(createUserSql);
-        this.createUserSql = createUserSql;
-    }
-
-    public void setDeleteUserSql(String deleteUserSql) {
-        Assert.hasText(deleteUserSql);
-        this.deleteUserSql = deleteUserSql;
-    }
-
-    public void setUpdateUserSql(String updateUserSql) {
-        Assert.hasText(updateUserSql);
-        this.updateUserSql = updateUserSql;
-    }
-
-    public void setCreateAuthoritySql(String createAuthoritySql) {
-        Assert.hasText(createAuthoritySql);
-        this.createAuthoritySql = createAuthoritySql;
-    }
-
-    public void setDeleteUserAuthoritiesSql(String deleteUserAuthoritiesSql) {
-        Assert.hasText(deleteUserAuthoritiesSql);
-        this.deleteUserAuthoritiesSql = deleteUserAuthoritiesSql;
-    }
-
-    public void setUserExistsSql(String userExistsSql) {
-        Assert.hasText(userExistsSql);
-        this.userExistsSql = userExistsSql;
-    }
-
-    public void setChangePasswordSql(String changePasswordSql) {
-        Assert.hasText(changePasswordSql);
-        this.changePasswordSql = changePasswordSql;
-    }
-
-    public void setFindAllGroupsSql(String findAllGroupsSql) {
-        Assert.hasText(findAllGroupsSql);
-        this.findAllGroupsSql = findAllGroupsSql;
-    }
-
-    public void setFindUsersInGroupSql(String findUsersInGroupSql) {
-        Assert.hasText(findUsersInGroupSql);
-        this.findUsersInGroupSql = findUsersInGroupSql;
-    }
-
-    public void setInsertGroupSql(String insertGroupSql) {
-        Assert.hasText(insertGroupSql);
-        this.insertGroupSql = insertGroupSql;
-    }
-
-    public void setFindGroupIdSql(String findGroupIdSql) {
-        Assert.hasText(findGroupIdSql);
-        this.findGroupIdSql = findGroupIdSql;
-    }
-
-    public void setInsertGroupAuthoritySql(String insertGroupAuthoritySql) {
-        Assert.hasText(insertGroupAuthoritySql);
-        this.insertGroupAuthoritySql = insertGroupAuthoritySql;
-    }
-
-    public void setDeleteGroupSql(String deleteGroupSql) {
-        Assert.hasText(deleteGroupSql);
-        this.deleteGroupSql = deleteGroupSql;
-    }
-
-    public void setDeleteGroupAuthoritiesSql(String deleteGroupAuthoritiesSql) {
-        Assert.hasText(deleteGroupAuthoritiesSql);
-        this.deleteGroupAuthoritiesSql = deleteGroupAuthoritiesSql;
-    }
-
-    public void setDeleteGroupMembersSql(String deleteGroupMembersSql) {
-        Assert.hasText(deleteGroupMembersSql);
-        this.deleteGroupMembersSql = deleteGroupMembersSql;
-    }
-
-    public void setRenameGroupSql(String renameGroupSql) {
-        Assert.hasText(renameGroupSql);
-        this.renameGroupSql = renameGroupSql;
-    }
-
-    public void setInsertGroupMemberSql(String insertGroupMemberSql) {
-        Assert.hasText(insertGroupMemberSql);
-        this.insertGroupMemberSql = insertGroupMemberSql;
-    }
-
-    public void setDeleteGroupMemberSql(String deleteGroupMemberSql) {
-        Assert.hasText(deleteGroupMemberSql);
-        this.deleteGroupMemberSql = deleteGroupMemberSql;
-    }
-
-    public void setGroupAuthoritiesSql(String groupAuthoritiesSql) {
-        Assert.hasText(groupAuthoritiesSql);
-        this.groupAuthoritiesSql = groupAuthoritiesSql;
-    }
-
-    public void setDeleteGroupAuthoritySql(String deleteGroupAuthoritySql) {
-        Assert.hasText(deleteGroupAuthoritySql);
-        this.deleteGroupAuthoritySql = deleteGroupAuthoritySql;
-    }
-
-    /**
-     * Optionally sets the UserCache if one is in use in the application.
-     * This allows the user to be removed from the cache after updates have taken place to avoid stale data.
-     *
-     * @param userCache the cache used by the AuthenticationManager.
-     */
-    public void setUserCache(UserCache userCache) {
-        Assert.notNull(userCache, "userCache cannot be null");
-        this.userCache = userCache;
-    }
-
-    private void validateUserDetails(UserDetails user) {
-        Assert.hasText(user.getUsername(), "Username may not be empty or null");
-        validateAuthorities(user.getAuthorities());
-    }
-
-    private void validateAuthorities(Collection<? extends GrantedAuthority> authorities) {
-        Assert.notNull(authorities, "Authorities list must not be null");
-
-        for (GrantedAuthority authority : authorities) {
-            Assert.notNull(authority, "Authorities list contains a null entry");
-            Assert.hasText(authority.getAuthority(), "getAuthority() method must return a non-empty string");
-        }
-    }
+public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsManager,
+		GroupManager {
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	// UserDetailsManager SQL
+	public static final String DEF_CREATE_USER_SQL = "insert into users (username, password, enabled) values (?,?,?)";
+	public static final String DEF_DELETE_USER_SQL = "delete from users where username = ?";
+	public static final String DEF_UPDATE_USER_SQL = "update users set password = ?, enabled = ? where username = ?";
+	public static final String DEF_INSERT_AUTHORITY_SQL = "insert into authorities (username, authority) values (?,?)";
+	public static final String DEF_DELETE_USER_AUTHORITIES_SQL = "delete from authorities where username = ?";
+	public static final String DEF_USER_EXISTS_SQL = "select username from users where username = ?";
+	public static final String DEF_CHANGE_PASSWORD_SQL = "update users set password = ? where username = ?";
+
+	// GroupManager SQL
+	public static final String DEF_FIND_GROUPS_SQL = "select group_name from groups";
+	public static final String DEF_FIND_USERS_IN_GROUP_SQL = "select username from group_members gm, groups g "
+			+ "where gm.group_id = g.id" + " and g.group_name = ?";
+	public static final String DEF_INSERT_GROUP_SQL = "insert into groups (group_name) values (?)";
+	public static final String DEF_FIND_GROUP_ID_SQL = "select id from groups where group_name = ?";
+	public static final String DEF_INSERT_GROUP_AUTHORITY_SQL = "insert into group_authorities (group_id, authority) values (?,?)";
+	public static final String DEF_DELETE_GROUP_SQL = "delete from groups where id = ?";
+	public static final String DEF_DELETE_GROUP_AUTHORITIES_SQL = "delete from group_authorities where group_id = ?";
+	public static final String DEF_DELETE_GROUP_MEMBERS_SQL = "delete from group_members where group_id = ?";
+	public static final String DEF_RENAME_GROUP_SQL = "update groups set group_name = ? where group_name = ?";
+	public static final String DEF_INSERT_GROUP_MEMBER_SQL = "insert into group_members (group_id, username) values (?,?)";
+	public static final String DEF_DELETE_GROUP_MEMBER_SQL = "delete from group_members where group_id = ? and username = ?";
+	public static final String DEF_GROUP_AUTHORITIES_QUERY_SQL = "select g.id, g.group_name, ga.authority "
+			+ "from groups g, group_authorities ga "
+			+ "where g.group_name = ? "
+			+ "and g.id = ga.group_id ";
+	public static final String DEF_DELETE_GROUP_AUTHORITY_SQL = "delete from group_authorities where group_id = ? and authority = ?";
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private String createUserSql = DEF_CREATE_USER_SQL;
+	private String deleteUserSql = DEF_DELETE_USER_SQL;
+	private String updateUserSql = DEF_UPDATE_USER_SQL;
+	private String createAuthoritySql = DEF_INSERT_AUTHORITY_SQL;
+	private String deleteUserAuthoritiesSql = DEF_DELETE_USER_AUTHORITIES_SQL;
+	private String userExistsSql = DEF_USER_EXISTS_SQL;
+	private String changePasswordSql = DEF_CHANGE_PASSWORD_SQL;
+
+	private String findAllGroupsSql = DEF_FIND_GROUPS_SQL;
+	private String findUsersInGroupSql = DEF_FIND_USERS_IN_GROUP_SQL;
+	private String insertGroupSql = DEF_INSERT_GROUP_SQL;
+	private String findGroupIdSql = DEF_FIND_GROUP_ID_SQL;
+	private String insertGroupAuthoritySql = DEF_INSERT_GROUP_AUTHORITY_SQL;
+	private String deleteGroupSql = DEF_DELETE_GROUP_SQL;
+	private String deleteGroupAuthoritiesSql = DEF_DELETE_GROUP_AUTHORITIES_SQL;
+	private String deleteGroupMembersSql = DEF_DELETE_GROUP_MEMBERS_SQL;
+	private String renameGroupSql = DEF_RENAME_GROUP_SQL;
+	private String insertGroupMemberSql = DEF_INSERT_GROUP_MEMBER_SQL;
+	private String deleteGroupMemberSql = DEF_DELETE_GROUP_MEMBER_SQL;
+	private String groupAuthoritiesSql = DEF_GROUP_AUTHORITIES_QUERY_SQL;
+	private String deleteGroupAuthoritySql = DEF_DELETE_GROUP_AUTHORITY_SQL;
+
+	private AuthenticationManager authenticationManager;
+
+	private UserCache userCache = new NullUserCache();
+
+	// ~ Methods
+	// ========================================================================================================
+
+	protected void initDao() throws ApplicationContextException {
+		if (authenticationManager == null) {
+			logger.info("No authentication manager set. Reauthentication of users when changing passwords will "
+					+ "not be performed.");
+		}
+
+		super.initDao();
+	}
+
+	// ~ UserDetailsManager implementation
+	// ==============================================================================
+
+	public void createUser(final UserDetails user) {
+		validateUserDetails(user);
+		getJdbcTemplate().update(createUserSql, new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setString(1, user.getUsername());
+				ps.setString(2, user.getPassword());
+				ps.setBoolean(3, user.isEnabled());
+			}
+
+		});
+
+		if (getEnableAuthorities()) {
+			insertUserAuthorities(user);
+		}
+	}
+
+	public void updateUser(final UserDetails user) {
+		validateUserDetails(user);
+		getJdbcTemplate().update(updateUserSql, new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setString(1, user.getPassword());
+				ps.setBoolean(2, user.isEnabled());
+				ps.setString(3, user.getUsername());
+			}
+		});
+
+		if (getEnableAuthorities()) {
+			deleteUserAuthorities(user.getUsername());
+			insertUserAuthorities(user);
+		}
+
+		userCache.removeUserFromCache(user.getUsername());
+	}
+
+	private void insertUserAuthorities(UserDetails user) {
+		for (GrantedAuthority auth : user.getAuthorities()) {
+			getJdbcTemplate().update(createAuthoritySql, user.getUsername(),
+					auth.getAuthority());
+		}
+	}
+
+	public void deleteUser(String username) {
+		if (getEnableAuthorities()) {
+			deleteUserAuthorities(username);
+		}
+		getJdbcTemplate().update(deleteUserSql, username);
+		userCache.removeUserFromCache(username);
+	}
+
+	private void deleteUserAuthorities(String username) {
+		getJdbcTemplate().update(deleteUserAuthoritiesSql, username);
+	}
+
+	public void changePassword(String oldPassword, String newPassword)
+			throws AuthenticationException {
+		Authentication currentUser = SecurityContextHolder.getContext()
+				.getAuthentication();
+
+		if (currentUser == null) {
+			// This would indicate bad coding somewhere
+			throw new AccessDeniedException(
+					"Can't change password as no Authentication object found in context "
+							+ "for current user.");
+		}
+
+		String username = currentUser.getName();
+
+		// If an authentication manager has been set, re-authenticate the user with the
+		// supplied password.
+		if (authenticationManager != null) {
+			logger.debug("Reauthenticating user '" + username
+					+ "' for password change request.");
+
+			authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(
+					username, oldPassword));
+		}
+		else {
+			logger.debug("No authentication manager set. Password won't be re-checked.");
+		}
+
+		logger.debug("Changing password for user '" + username + "'");
+
+		getJdbcTemplate().update(changePasswordSql, newPassword, username);
+
+		SecurityContextHolder.getContext().setAuthentication(
+				createNewAuthentication(currentUser, newPassword));
+
+		userCache.removeUserFromCache(username);
+	}
+
+	protected Authentication createNewAuthentication(Authentication currentAuth,
+			String newPassword) {
+		UserDetails user = loadUserByUsername(currentAuth.getName());
+
+		UsernamePasswordAuthenticationToken newAuthentication = new UsernamePasswordAuthenticationToken(
+				user, null, user.getAuthorities());
+		newAuthentication.setDetails(currentAuth.getDetails());
+
+		return newAuthentication;
+	}
+
+	public boolean userExists(String username) {
+		List<String> users = getJdbcTemplate().queryForList(userExistsSql,
+				new String[] { username }, String.class);
+
+		if (users.size() > 1) {
+			throw new IncorrectResultSizeDataAccessException(
+					"More than one user found with name '" + username + "'", 1);
+		}
+
+		return users.size() == 1;
+	}
+
+	// ~ GroupManager implementation
+	// ====================================================================================
+
+	public List<String> findAllGroups() {
+		return getJdbcTemplate().queryForList(findAllGroupsSql, String.class);
+	}
+
+	public List<String> findUsersInGroup(String groupName) {
+		Assert.hasText(groupName);
+		return getJdbcTemplate().queryForList(findUsersInGroupSql,
+				new String[] { groupName }, String.class);
+	}
+
+	public void createGroup(final String groupName,
+			final List<GrantedAuthority> authorities) {
+		Assert.hasText(groupName);
+		Assert.notNull(authorities);
+
+		logger.debug("Creating new group '" + groupName + "' with authorities "
+				+ AuthorityUtils.authorityListToSet(authorities));
+
+		getJdbcTemplate().update(insertGroupSql, groupName);
+
+		final int groupId = findGroupId(groupName);
+
+		for (GrantedAuthority a : authorities) {
+			final String authority = a.getAuthority();
+			getJdbcTemplate().update(insertGroupAuthoritySql,
+					new PreparedStatementSetter() {
+						public void setValues(PreparedStatement ps) throws SQLException {
+							ps.setInt(1, groupId);
+							ps.setString(2, authority);
+						}
+					});
+		}
+	}
+
+	public void deleteGroup(String groupName) {
+		logger.debug("Deleting group '" + groupName + "'");
+		Assert.hasText(groupName);
+
+		final int id = findGroupId(groupName);
+		PreparedStatementSetter groupIdPSS = new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setInt(1, id);
+			}
+		};
+		getJdbcTemplate().update(deleteGroupMembersSql, groupIdPSS);
+		getJdbcTemplate().update(deleteGroupAuthoritiesSql, groupIdPSS);
+		getJdbcTemplate().update(deleteGroupSql, groupIdPSS);
+	}
+
+	public void renameGroup(String oldName, String newName) {
+		logger.debug("Changing group name from '" + oldName + "' to '" + newName + "'");
+		Assert.hasText(oldName);
+		Assert.hasText(newName);
+
+		getJdbcTemplate().update(renameGroupSql, newName, oldName);
+	}
+
+	public void addUserToGroup(final String username, final String groupName) {
+		logger.debug("Adding user '" + username + "' to group '" + groupName + "'");
+		Assert.hasText(username);
+		Assert.hasText(groupName);
+
+		final int id = findGroupId(groupName);
+		getJdbcTemplate().update(insertGroupMemberSql, new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setInt(1, id);
+				ps.setString(2, username);
+			}
+		});
+
+		userCache.removeUserFromCache(username);
+	}
+
+	public void removeUserFromGroup(final String username, final String groupName) {
+		logger.debug("Removing user '" + username + "' to group '" + groupName + "'");
+		Assert.hasText(username);
+		Assert.hasText(groupName);
+
+		final int id = findGroupId(groupName);
+
+		getJdbcTemplate().update(deleteGroupMemberSql, new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setInt(1, id);
+				ps.setString(2, username);
+			}
+		});
+
+		userCache.removeUserFromCache(username);
+	}
+
+	public List<GrantedAuthority> findGroupAuthorities(String groupName) {
+		logger.debug("Loading authorities for group '" + groupName + "'");
+		Assert.hasText(groupName);
+
+		return getJdbcTemplate().query(groupAuthoritiesSql, new String[] { groupName },
+				new RowMapper<GrantedAuthority>() {
+					public GrantedAuthority mapRow(ResultSet rs, int rowNum)
+							throws SQLException {
+						String roleName = getRolePrefix() + rs.getString(3);
+
+						return new SimpleGrantedAuthority(roleName);
+					}
+				});
+	}
+
+	public void removeGroupAuthority(String groupName, final GrantedAuthority authority) {
+		logger.debug("Removing authority '" + authority + "' from group '" + groupName
+				+ "'");
+		Assert.hasText(groupName);
+		Assert.notNull(authority);
+
+		final int id = findGroupId(groupName);
+
+		getJdbcTemplate().update(deleteGroupAuthoritySql, new PreparedStatementSetter() {
+
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setInt(1, id);
+				ps.setString(2, authority.getAuthority());
+			}
+		});
+	}
+
+	public void addGroupAuthority(final String groupName, final GrantedAuthority authority) {
+		logger.debug("Adding authority '" + authority + "' to group '" + groupName + "'");
+		Assert.hasText(groupName);
+		Assert.notNull(authority);
+
+		final int id = findGroupId(groupName);
+		getJdbcTemplate().update(insertGroupAuthoritySql, new PreparedStatementSetter() {
+			public void setValues(PreparedStatement ps) throws SQLException {
+				ps.setInt(1, id);
+				ps.setString(2, authority.getAuthority());
+			}
+		});
+	}
+
+	private int findGroupId(String group) {
+		return getJdbcTemplate().queryForInt(findGroupIdSql, group);
+	}
+
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
+
+	public void setCreateUserSql(String createUserSql) {
+		Assert.hasText(createUserSql);
+		this.createUserSql = createUserSql;
+	}
+
+	public void setDeleteUserSql(String deleteUserSql) {
+		Assert.hasText(deleteUserSql);
+		this.deleteUserSql = deleteUserSql;
+	}
+
+	public void setUpdateUserSql(String updateUserSql) {
+		Assert.hasText(updateUserSql);
+		this.updateUserSql = updateUserSql;
+	}
+
+	public void setCreateAuthoritySql(String createAuthoritySql) {
+		Assert.hasText(createAuthoritySql);
+		this.createAuthoritySql = createAuthoritySql;
+	}
+
+	public void setDeleteUserAuthoritiesSql(String deleteUserAuthoritiesSql) {
+		Assert.hasText(deleteUserAuthoritiesSql);
+		this.deleteUserAuthoritiesSql = deleteUserAuthoritiesSql;
+	}
+
+	public void setUserExistsSql(String userExistsSql) {
+		Assert.hasText(userExistsSql);
+		this.userExistsSql = userExistsSql;
+	}
+
+	public void setChangePasswordSql(String changePasswordSql) {
+		Assert.hasText(changePasswordSql);
+		this.changePasswordSql = changePasswordSql;
+	}
+
+	public void setFindAllGroupsSql(String findAllGroupsSql) {
+		Assert.hasText(findAllGroupsSql);
+		this.findAllGroupsSql = findAllGroupsSql;
+	}
+
+	public void setFindUsersInGroupSql(String findUsersInGroupSql) {
+		Assert.hasText(findUsersInGroupSql);
+		this.findUsersInGroupSql = findUsersInGroupSql;
+	}
+
+	public void setInsertGroupSql(String insertGroupSql) {
+		Assert.hasText(insertGroupSql);
+		this.insertGroupSql = insertGroupSql;
+	}
+
+	public void setFindGroupIdSql(String findGroupIdSql) {
+		Assert.hasText(findGroupIdSql);
+		this.findGroupIdSql = findGroupIdSql;
+	}
+
+	public void setInsertGroupAuthoritySql(String insertGroupAuthoritySql) {
+		Assert.hasText(insertGroupAuthoritySql);
+		this.insertGroupAuthoritySql = insertGroupAuthoritySql;
+	}
+
+	public void setDeleteGroupSql(String deleteGroupSql) {
+		Assert.hasText(deleteGroupSql);
+		this.deleteGroupSql = deleteGroupSql;
+	}
+
+	public void setDeleteGroupAuthoritiesSql(String deleteGroupAuthoritiesSql) {
+		Assert.hasText(deleteGroupAuthoritiesSql);
+		this.deleteGroupAuthoritiesSql = deleteGroupAuthoritiesSql;
+	}
+
+	public void setDeleteGroupMembersSql(String deleteGroupMembersSql) {
+		Assert.hasText(deleteGroupMembersSql);
+		this.deleteGroupMembersSql = deleteGroupMembersSql;
+	}
+
+	public void setRenameGroupSql(String renameGroupSql) {
+		Assert.hasText(renameGroupSql);
+		this.renameGroupSql = renameGroupSql;
+	}
+
+	public void setInsertGroupMemberSql(String insertGroupMemberSql) {
+		Assert.hasText(insertGroupMemberSql);
+		this.insertGroupMemberSql = insertGroupMemberSql;
+	}
+
+	public void setDeleteGroupMemberSql(String deleteGroupMemberSql) {
+		Assert.hasText(deleteGroupMemberSql);
+		this.deleteGroupMemberSql = deleteGroupMemberSql;
+	}
+
+	public void setGroupAuthoritiesSql(String groupAuthoritiesSql) {
+		Assert.hasText(groupAuthoritiesSql);
+		this.groupAuthoritiesSql = groupAuthoritiesSql;
+	}
+
+	public void setDeleteGroupAuthoritySql(String deleteGroupAuthoritySql) {
+		Assert.hasText(deleteGroupAuthoritySql);
+		this.deleteGroupAuthoritySql = deleteGroupAuthoritySql;
+	}
+
+	/**
+	 * Optionally sets the UserCache if one is in use in the application. This allows the
+	 * user to be removed from the cache after updates have taken place to avoid stale
+	 * data.
+	 *
+	 * @param userCache the cache used by the AuthenticationManager.
+	 */
+	public void setUserCache(UserCache userCache) {
+		Assert.notNull(userCache, "userCache cannot be null");
+		this.userCache = userCache;
+	}
+
+	private void validateUserDetails(UserDetails user) {
+		Assert.hasText(user.getUsername(), "Username may not be empty or null");
+		validateAuthorities(user.getAuthorities());
+	}
+
+	private void validateAuthorities(Collection<? extends GrantedAuthority> authorities) {
+		Assert.notNull(authorities, "Authorities list must not be null");
+
+		for (GrantedAuthority authority : authorities) {
+			Assert.notNull(authority, "Authorities list contains a null entry");
+			Assert.hasText(authority.getAuthority(),
+					"getAuthority() method must return a non-empty string");
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java
index 1135cd1323..2fe2e72c63 100644
--- a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java
+++ b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java
@@ -13,46 +13,45 @@ import org.springframework.security.core.userdetails.UserDetails;
  */
 class MutableUser implements MutableUserDetails {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private String password;
-    private final UserDetails delegate;
+	private String password;
+	private final UserDetails delegate;
 
-    public MutableUser(UserDetails user) {
-        this.delegate = user;
-        this.password = user.getPassword();
-    }
+	public MutableUser(UserDetails user) {
+		this.delegate = user;
+		this.password = user.getPassword();
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return delegate.getAuthorities();
-    }
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		return delegate.getAuthorities();
+	}
 
-    public String getUsername() {
-        return delegate.getUsername();
-    }
+	public String getUsername() {
+		return delegate.getUsername();
+	}
 
-    public boolean isAccountNonExpired() {
-        return delegate.isAccountNonExpired();
-    }
+	public boolean isAccountNonExpired() {
+		return delegate.isAccountNonExpired();
+	}
 
-    public boolean isAccountNonLocked() {
-        return delegate.isAccountNonLocked();
-    }
+	public boolean isAccountNonLocked() {
+		return delegate.isAccountNonLocked();
+	}
 
-    public boolean isCredentialsNonExpired() {
-        return delegate.isCredentialsNonExpired();
-    }
+	public boolean isCredentialsNonExpired() {
+		return delegate.isCredentialsNonExpired();
+	}
 
-    public boolean isEnabled() {
-        return delegate.isEnabled();
-    }
+	public boolean isEnabled() {
+		return delegate.isEnabled();
+	}
 }
-
diff --git a/core/src/main/java/org/springframework/security/provisioning/MutableUserDetails.java b/core/src/main/java/org/springframework/security/provisioning/MutableUserDetails.java
index 317840afd5..baf8ed7ba9 100644
--- a/core/src/main/java/org/springframework/security/provisioning/MutableUserDetails.java
+++ b/core/src/main/java/org/springframework/security/provisioning/MutableUserDetails.java
@@ -9,6 +9,6 @@ import org.springframework.security.core.userdetails.UserDetails;
  */
 interface MutableUserDetails extends UserDetails {
 
-    void setPassword(String password);
+	void setPassword(String password);
 
 }
diff --git a/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
index 46f8a9f7c1..12f355760d 100644
--- a/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
+++ b/core/src/main/java/org/springframework/security/provisioning/UserDetailsManager.java
@@ -4,41 +4,41 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
 /**
- * An extension of the {@link UserDetailsService} which provides the ability
- * to create new users and update existing ones.
+ * An extension of the {@link UserDetailsService} which provides the ability to create new
+ * users and update existing ones.
  *
  * @author Luke Taylor
  * @since 2.0
  */
 public interface UserDetailsManager extends UserDetailsService {
 
-    /**
-     * Create a new user with the supplied details.
-     */
-    void createUser(UserDetails user);
+	/**
+	 * Create a new user with the supplied details.
+	 */
+	void createUser(UserDetails user);
 
-    /**
-     * Update the specified user.
-     */
-    void updateUser(UserDetails user);
+	/**
+	 * Update the specified user.
+	 */
+	void updateUser(UserDetails user);
 
-    /**
-     * Remove the user with the given login name from the system.
-     */
-    void deleteUser(String username);
+	/**
+	 * Remove the user with the given login name from the system.
+	 */
+	void deleteUser(String username);
 
-    /**
-     * Modify the current user's password. This should change the user's password in
-     * the persistent user repository (datbase, LDAP etc).
-     *
-     * @param oldPassword current password (for re-authentication if required)
-     * @param newPassword the password to change to
-     */
-    void changePassword(String oldPassword, String newPassword);
+	/**
+	 * Modify the current user's password. This should change the user's password in the
+	 * persistent user repository (datbase, LDAP etc).
+	 *
+	 * @param oldPassword current password (for re-authentication if required)
+	 * @param newPassword the password to change to
+	 */
+	void changePassword(String oldPassword, String newPassword);
 
-    /**
-     * Check if a user with the supplied login name exists in the system.
-     */
-    boolean userExists(String username);
+	/**
+	 * Check if a user with the supplied login name exists in the system.
+	 */
+	boolean userExists(String username);
 
 }
diff --git a/core/src/main/java/org/springframework/security/provisioning/package-info.java b/core/src/main/java/org/springframework/security/provisioning/package-info.java
index ccb46716fc..4b56a666be 100644
--- a/core/src/main/java/org/springframework/security/provisioning/package-info.java
+++ b/core/src/main/java/org/springframework/security/provisioning/package-info.java
@@ -3,3 +3,4 @@
  * JDBC-based implementation.
  */
 package org.springframework.security.provisioning;
+
diff --git a/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextSchedulingTaskExecutor.java b/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextSchedulingTaskExecutor.java
index 40fc4bfb0a..8083b36ff2 100644
--- a/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextSchedulingTaskExecutor.java
+++ b/core/src/main/java/org/springframework/security/scheduling/DelegatingSecurityContextSchedulingTaskExecutor.java
@@ -22,41 +22,49 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor;
 
 /**
- * An {@link SchedulingTaskExecutor} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable} and each
- * {@link Callable} in a {@link DelegatingSecurityContextCallable}.
+ * An {@link SchedulingTaskExecutor} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable} and each {@link Callable} in a
+ * {@link DelegatingSecurityContextCallable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class DelegatingSecurityContextSchedulingTaskExecutor extends DelegatingSecurityContextAsyncTaskExecutor
-        implements SchedulingTaskExecutor {
+public class DelegatingSecurityContextSchedulingTaskExecutor extends
+		DelegatingSecurityContextAsyncTaskExecutor implements SchedulingTaskExecutor {
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextSchedulingTaskExecutor} that uses the specified {@link SecurityContext}.
-     *
-     * @param delegateSchedulingTaskExecutor the {@link SchedulingTaskExecutor} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} and
-     * {@link DelegatingSecurityContextCallable}
-     */
-    public DelegatingSecurityContextSchedulingTaskExecutor(SchedulingTaskExecutor delegateSchedulingTaskExecutor,
-            SecurityContext securityContext) {
-        super(delegateSchedulingTaskExecutor, securityContext);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextSchedulingTaskExecutor} that uses the
+	 * specified {@link SecurityContext}.
+	 *
+	 * @param delegateSchedulingTaskExecutor the {@link SchedulingTaskExecutor} to
+	 * delegate to. Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} and
+	 * {@link DelegatingSecurityContextCallable}
+	 */
+	public DelegatingSecurityContextSchedulingTaskExecutor(
+			SchedulingTaskExecutor delegateSchedulingTaskExecutor,
+			SecurityContext securityContext) {
+		super(delegateSchedulingTaskExecutor, securityContext);
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextSchedulingTaskExecutor} that uses the current {@link SecurityContext}.
-     *
-     * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextSchedulingTaskExecutor(SchedulingTaskExecutor delegateAsyncTaskExecutor) {
-        this(delegateAsyncTaskExecutor, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextSchedulingTaskExecutor} that uses the
+	 * current {@link SecurityContext}.
+	 *
+	 * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to.
+	 * Cannot be null.
+	 */
+	public DelegatingSecurityContextSchedulingTaskExecutor(
+			SchedulingTaskExecutor delegateAsyncTaskExecutor) {
+		this(delegateAsyncTaskExecutor, null);
+	}
 
-    public boolean prefersShortLivedTasks() {
-        return getDelegate().prefersShortLivedTasks();
-    }
+	public boolean prefersShortLivedTasks() {
+		return getDelegate().prefersShortLivedTasks();
+	}
 
-    private SchedulingTaskExecutor getDelegate() {
-        return (SchedulingTaskExecutor) getDelegateExecutor();
-    }
+	private SchedulingTaskExecutor getDelegate() {
+		return (SchedulingTaskExecutor) getDelegateExecutor();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java
index 8e08ec30df..737634ef58 100644
--- a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java
+++ b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextAsyncTaskExecutor.java
@@ -21,52 +21,59 @@ import org.springframework.security.concurrent.DelegatingSecurityContextRunnable
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * An {@link AsyncTaskExecutor} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable} and each
- * {@link Callable} in a {@link DelegatingSecurityContextCallable}.
+ * An {@link AsyncTaskExecutor} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable} and each {@link Callable} in a
+ * {@link DelegatingSecurityContextCallable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class DelegatingSecurityContextAsyncTaskExecutor extends DelegatingSecurityContextTaskExecutor implements
-        AsyncTaskExecutor {
+public class DelegatingSecurityContextAsyncTaskExecutor extends
+		DelegatingSecurityContextTaskExecutor implements AsyncTaskExecutor {
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextAsyncTaskExecutor} that uses the specified {@link SecurityContext}.
-     *
-     * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable} and
-     * {@link DelegatingSecurityContextCallable}
-     */
-    public DelegatingSecurityContextAsyncTaskExecutor(AsyncTaskExecutor delegateAsyncTaskExecutor,
-            SecurityContext securityContext) {
-        super(delegateAsyncTaskExecutor, securityContext);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextAsyncTaskExecutor} that uses the
+	 * specified {@link SecurityContext}.
+	 *
+	 * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to.
+	 * Cannot be null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable} and
+	 * {@link DelegatingSecurityContextCallable}
+	 */
+	public DelegatingSecurityContextAsyncTaskExecutor(
+			AsyncTaskExecutor delegateAsyncTaskExecutor, SecurityContext securityContext) {
+		super(delegateAsyncTaskExecutor, securityContext);
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextAsyncTaskExecutor} that uses the current {@link SecurityContext}.
-     *
-     * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextAsyncTaskExecutor(AsyncTaskExecutor delegateAsyncTaskExecutor) {
-        this(delegateAsyncTaskExecutor, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextAsyncTaskExecutor} that uses the
+	 * current {@link SecurityContext}.
+	 *
+	 * @param delegateAsyncTaskExecutor the {@link AsyncTaskExecutor} to delegate to.
+	 * Cannot be null.
+	 */
+	public DelegatingSecurityContextAsyncTaskExecutor(
+			AsyncTaskExecutor delegateAsyncTaskExecutor) {
+		this(delegateAsyncTaskExecutor, null);
+	}
 
-    public final void execute(Runnable task, long startTimeout) {
-        task = wrap(task);
-        getDelegate().execute(task, startTimeout);
-    }
+	public final void execute(Runnable task, long startTimeout) {
+		task = wrap(task);
+		getDelegate().execute(task, startTimeout);
+	}
 
-    public final Future<?> submit(Runnable task) {
-        task = wrap(task);
-        return getDelegate().submit(task);
-    }
+	public final Future<?> submit(Runnable task) {
+		task = wrap(task);
+		return getDelegate().submit(task);
+	}
 
-    public final <T> Future<T> submit(Callable<T> task) {
-        task = wrap(task);
-        return getDelegate().submit(task);
-    }
+	public final <T> Future<T> submit(Callable<T> task) {
+		task = wrap(task);
+		return getDelegate().submit(task);
+	}
 
-    private AsyncTaskExecutor getDelegate() {
-        return (AsyncTaskExecutor) getDelegateExecutor();
-    }
+	private AsyncTaskExecutor getDelegate() {
+		return (AsyncTaskExecutor) getDelegateExecutor();
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java
index bd6023ed52..8506bace35 100644
--- a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java
+++ b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java
@@ -19,29 +19,36 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * An {@link TaskExecutor} which wraps each {@link Runnable} in a {@link DelegatingSecurityContextRunnable}.
+ * An {@link TaskExecutor} which wraps each {@link Runnable} in a
+ * {@link DelegatingSecurityContextRunnable}.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class DelegatingSecurityContextTaskExecutor extends DelegatingSecurityContextExecutor implements TaskExecutor {
-    /**
-     * Creates a new {@link DelegatingSecurityContextTaskExecutor} that uses the specified {@link SecurityContext}.
-     *
-     * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be null.
-     * @param securityContext the {@link SecurityContext} to use for each {@link DelegatingSecurityContextRunnable}
-     */
-    public DelegatingSecurityContextTaskExecutor(TaskExecutor delegateTaskExecutor, SecurityContext securityContext) {
-        super(delegateTaskExecutor, securityContext);
-    }
+public class DelegatingSecurityContextTaskExecutor extends
+		DelegatingSecurityContextExecutor implements TaskExecutor {
+	/**
+	 * Creates a new {@link DelegatingSecurityContextTaskExecutor} that uses the specified
+	 * {@link SecurityContext}.
+	 *
+	 * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be
+	 * null.
+	 * @param securityContext the {@link SecurityContext} to use for each
+	 * {@link DelegatingSecurityContextRunnable}
+	 */
+	public DelegatingSecurityContextTaskExecutor(TaskExecutor delegateTaskExecutor,
+			SecurityContext securityContext) {
+		super(delegateTaskExecutor, securityContext);
+	}
 
-    /**
-     * Creates a new {@link DelegatingSecurityContextTaskExecutor} that uses the current {@link SecurityContext} from
-     * the {@link SecurityContextHolder}.
-     *
-     * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be null.
-     */
-    public DelegatingSecurityContextTaskExecutor(TaskExecutor delegate) {
-        this(delegate, null);
-    }
+	/**
+	 * Creates a new {@link DelegatingSecurityContextTaskExecutor} that uses the current
+	 * {@link SecurityContext} from the {@link SecurityContextHolder}.
+	 *
+	 * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be
+	 * null.
+	 */
+	public DelegatingSecurityContextTaskExecutor(TaskExecutor delegate) {
+		this(delegate, null);
+	}
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/security/util/FieldUtils.java b/core/src/main/java/org/springframework/security/util/FieldUtils.java
index 3be3091391..915ed6b5e5 100644
--- a/core/src/main/java/org/springframework/security/util/FieldUtils.java
+++ b/core/src/main/java/org/springframework/security/util/FieldUtils.java
@@ -21,7 +21,6 @@ import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;
 
-
 /**
  * Offers static methods for directly manipulating fields.
  *
@@ -29,81 +28,89 @@ import java.lang.reflect.Field;
  */
 public final class FieldUtils {
 
-    //~ Methods ========================================================================================================
-    /**
-     * Attempts to locate the specified field on the class.
-     *
-     * @param clazz the class definition containing the field
-     * @param fieldName the name of the field to locate
-     *
-     * @return the Field (never null)
-     *
-     * @throws IllegalStateException if field could not be found
-     */
-    public static Field getField(Class<?> clazz, String fieldName) throws IllegalStateException {
-        Assert.notNull(clazz, "Class required");
-        Assert.hasText(fieldName, "Field name required");
+	// ~ Methods
+	// ========================================================================================================
+	/**
+	 * Attempts to locate the specified field on the class.
+	 *
+	 * @param clazz the class definition containing the field
+	 * @param fieldName the name of the field to locate
+	 *
+	 * @return the Field (never null)
+	 *
+	 * @throws IllegalStateException if field could not be found
+	 */
+	public static Field getField(Class<?> clazz, String fieldName)
+			throws IllegalStateException {
+		Assert.notNull(clazz, "Class required");
+		Assert.hasText(fieldName, "Field name required");
 
-        try {
-            return clazz.getDeclaredField(fieldName);
-        } catch (NoSuchFieldException nsf) {
-            // Try superclass
-            if (clazz.getSuperclass() != null) {
-                return getField(clazz.getSuperclass(), fieldName);
-            }
+		try {
+			return clazz.getDeclaredField(fieldName);
+		}
+		catch (NoSuchFieldException nsf) {
+			// Try superclass
+			if (clazz.getSuperclass() != null) {
+				return getField(clazz.getSuperclass(), fieldName);
+			}
 
-            throw new IllegalStateException("Could not locate field '" + fieldName + "' on class " + clazz);
-        }
-    }
+			throw new IllegalStateException("Could not locate field '" + fieldName
+					+ "' on class " + clazz);
+		}
+	}
 
-    /**
-     * Returns the value of a (nested) field on a bean. Intended for testing.
-     * @param bean the object
-     * @param fieldName the field name, with "." separating nested properties
-     * @return the value of the nested field
-     */
-    public static Object getFieldValue(Object bean, String fieldName) throws IllegalAccessException {
-        Assert.notNull(bean, "Bean cannot be null");
-        Assert.hasText(fieldName, "Field name required");
-        String[] nestedFields = StringUtils.tokenizeToStringArray(fieldName, ".");
-        Class<?> componentClass = bean.getClass();
-        Object value = bean;
+	/**
+	 * Returns the value of a (nested) field on a bean. Intended for testing.
+	 * @param bean the object
+	 * @param fieldName the field name, with "." separating nested properties
+	 * @return the value of the nested field
+	 */
+	public static Object getFieldValue(Object bean, String fieldName)
+			throws IllegalAccessException {
+		Assert.notNull(bean, "Bean cannot be null");
+		Assert.hasText(fieldName, "Field name required");
+		String[] nestedFields = StringUtils.tokenizeToStringArray(fieldName, ".");
+		Class<?> componentClass = bean.getClass();
+		Object value = bean;
 
-        for (String nestedField : nestedFields) {
-            Field field = getField(componentClass, nestedField);
-            field.setAccessible(true);
-            value = field.get(value);
-            if (value != null) {
-                componentClass = value.getClass();
-            }
-        }
+		for (String nestedField : nestedFields) {
+			Field field = getField(componentClass, nestedField);
+			field.setAccessible(true);
+			value = field.get(value);
+			if (value != null) {
+				componentClass = value.getClass();
+			}
+		}
 
-        return value;
+		return value;
 
-    }
+	}
 
-    public static Object getProtectedFieldValue(String protectedField, Object object) {
-        Field field = FieldUtils.getField(object.getClass(), protectedField);
+	public static Object getProtectedFieldValue(String protectedField, Object object) {
+		Field field = FieldUtils.getField(object.getClass(), protectedField);
 
-        try {
-            field.setAccessible(true);
+		try {
+			field.setAccessible(true);
 
-            return field.get(object);
-        } catch (Exception ex) {
-            ReflectionUtils.handleReflectionException(ex);
+			return field.get(object);
+		}
+		catch (Exception ex) {
+			ReflectionUtils.handleReflectionException(ex);
 
-            return null; // unreachable - previous line throws exception
-        }
-    }
+			return null; // unreachable - previous line throws exception
+		}
+	}
 
-    public static void setProtectedFieldValue(String protectedField, Object object, Object newValue) {
-        Field field = FieldUtils.getField(object.getClass(), protectedField);
+	public static void setProtectedFieldValue(String protectedField, Object object,
+			Object newValue) {
+		Field field = FieldUtils.getField(object.getClass(), protectedField);
 
-        try {
-            field.setAccessible(true);
-            field.set(object, newValue);
-        } catch (Exception ex) {
-            ReflectionUtils.handleReflectionException(ex);
-        }
-    }
+		try {
+			field.setAccessible(true);
+			field.set(object, newValue);
+		}
+		catch (Exception ex) {
+			ReflectionUtils.handleReflectionException(ex);
+		}
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
index 78210098d8..3f5255efc6 100644
--- a/core/src/main/java/org/springframework/security/util/InMemoryResource.java
+++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java
@@ -23,54 +23,59 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 
-
 /**
- * An in memory implementation of Spring's {@link org.springframework.core.io.Resource} interface.
- * <p>Used to create a bean factory from an XML string, rather than a file.</p>
+ * An in memory implementation of Spring's {@link org.springframework.core.io.Resource}
+ * interface.
+ * <p>
+ * Used to create a bean factory from an XML string, rather than a file.
+ * </p>
  *
  * @author Luke Taylor
  */
 public class InMemoryResource extends AbstractResource {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final byte[] source;
-    private final String description;
+	private final byte[] source;
+	private final String description;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public InMemoryResource(String source) {
-        this(source.getBytes());
-    }
+	public InMemoryResource(String source) {
+		this(source.getBytes());
+	}
 
-    public InMemoryResource(byte[] source) {
-        this(source, null);
-    }
+	public InMemoryResource(byte[] source) {
+		this(source, null);
+	}
 
-    public InMemoryResource(byte[] source, String description) {
-        Assert.notNull(source);
-        this.source = source;
-        this.description = description;
-    }
+	public InMemoryResource(byte[] source, String description) {
+		Assert.notNull(source);
+		this.source = source;
+		this.description = description;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String getDescription() {
-        return description;
-    }
+	public String getDescription() {
+		return description;
+	}
 
-    public InputStream getInputStream() throws IOException {
-        return new ByteArrayInputStream(source);
-    }
+	public InputStream getInputStream() throws IOException {
+		return new ByteArrayInputStream(source);
+	}
 
-    public int hashCode() {
-        return 1;
-    }
+	public int hashCode() {
+		return 1;
+	}
 
-    public boolean equals(Object res) {
-        if (!(res instanceof InMemoryResource)) {
-            return false;
-        }
+	public boolean equals(Object res) {
+		if (!(res instanceof InMemoryResource)) {
+			return false;
+		}
 
-        return Arrays.equals(source, ((InMemoryResource)res).source);
-    }
+		return Arrays.equals(source, ((InMemoryResource) res).source);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
index 0d98741926..859dd3b515 100644
--- a/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
+++ b/core/src/main/java/org/springframework/security/util/MethodInvocationUtils.java
@@ -22,117 +22,133 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.util.Assert;
 
-
 /**
- * Static utility methods for creating <code>MethodInvocation</code>s usable within Spring Security.
+ * Static utility methods for creating <code>MethodInvocation</code>s usable within Spring
+ * Security.
  * <p>
- * All methods of this class return a {@link org.springframework.security.util.SimpleMethodInvocation}.
+ * All methods of this class return a
+ * {@link org.springframework.security.util.SimpleMethodInvocation}.
  *
  * @author Ben Alex
  */
 public final class MethodInvocationUtils {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Generates a <code>MethodInvocation</code> for specified <code>methodName</code> on the passed object,
-     * using the <code>args</code> to locate the method.
-     *
-     * @param object the object that will be used to find the relevant <code>Method</code>
-     * @param methodName the name of the method to find
-     * @param args arguments that are required as part of the method signature (can be empty)
-     *
-     * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a problem
-     */
-    public static MethodInvocation create(Object object, String methodName, Object... args) {
-        Assert.notNull(object, "Object required");
+	/**
+	 * Generates a <code>MethodInvocation</code> for specified <code>methodName</code> on
+	 * the passed object, using the <code>args</code> to locate the method.
+	 *
+	 * @param object the object that will be used to find the relevant <code>Method</code>
+	 * @param methodName the name of the method to find
+	 * @param args arguments that are required as part of the method signature (can be
+	 * empty)
+	 *
+	 * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a
+	 * problem
+	 */
+	public static MethodInvocation create(Object object, String methodName,
+			Object... args) {
+		Assert.notNull(object, "Object required");
 
-        Class<?>[] classArgs = null;
+		Class<?>[] classArgs = null;
 
-        if (args != null) {
-            classArgs = new Class<?>[args.length];
+		if (args != null) {
+			classArgs = new Class<?>[args.length];
 
-            for (int i = 0; i < args.length; i++) {
-                classArgs[i] = args[i].getClass();
-            }
-        }
+			for (int i = 0; i < args.length; i++) {
+				classArgs[i] = args[i].getClass();
+			}
+		}
 
-        // Determine the type that declares the requested method, taking into account proxies
-        Class<?> target = AopUtils.getTargetClass(object);
-        if (object instanceof Advised) {
-            Advised a = (Advised) object;
-            if (!a.isProxyTargetClass()) {
-                Class<?>[] possibleInterfaces = a.getProxiedInterfaces();
-                for (Class<?> possibleInterface : possibleInterfaces) {
-                    try {
-                        possibleInterface.getMethod(methodName, classArgs);
-                        // to get here means no exception happened
-                        target = possibleInterface;
-                        break;
-                    } catch (Exception ignored) {
-                        // try the next one
-                    }
-                }
-            }
-        }
+		// Determine the type that declares the requested method, taking into account
+		// proxies
+		Class<?> target = AopUtils.getTargetClass(object);
+		if (object instanceof Advised) {
+			Advised a = (Advised) object;
+			if (!a.isProxyTargetClass()) {
+				Class<?>[] possibleInterfaces = a.getProxiedInterfaces();
+				for (Class<?> possibleInterface : possibleInterfaces) {
+					try {
+						possibleInterface.getMethod(methodName, classArgs);
+						// to get here means no exception happened
+						target = possibleInterface;
+						break;
+					}
+					catch (Exception ignored) {
+						// try the next one
+					}
+				}
+			}
+		}
 
-        return createFromClass(object, target, methodName, classArgs, args);
-    }
+		return createFromClass(object, target, methodName, classArgs, args);
+	}
 
-    /**
-     * Generates a <code>MethodInvocation</code> for the specified <code>methodName</code> on the passed class.
-     *
-     * If a method with this name, taking no arguments does not exist, it will check through the declared
-     * methods on the class, until one is found matching the supplied name. If more than one method name matches,
-     * an <tt>IllegalArgumentException</tt> will be raised.
-     *
-     * @param clazz the class of object that will be used to find the relevant <code>Method</code>
-     * @param methodName the name of the method to find
-     *
-     * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a problem
-     */
-    public static MethodInvocation createFromClass(Class<?> clazz, String methodName) {
-        MethodInvocation mi = createFromClass(null, clazz, methodName, null, null);
+	/**
+	 * Generates a <code>MethodInvocation</code> for the specified <code>methodName</code>
+	 * on the passed class.
+	 *
+	 * If a method with this name, taking no arguments does not exist, it will check
+	 * through the declared methods on the class, until one is found matching the supplied
+	 * name. If more than one method name matches, an <tt>IllegalArgumentException</tt>
+	 * will be raised.
+	 *
+	 * @param clazz the class of object that will be used to find the relevant
+	 * <code>Method</code>
+	 * @param methodName the name of the method to find
+	 *
+	 * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a
+	 * problem
+	 */
+	public static MethodInvocation createFromClass(Class<?> clazz, String methodName) {
+		MethodInvocation mi = createFromClass(null, clazz, methodName, null, null);
 
-        if (mi == null) {
-            for (Method m : clazz.getDeclaredMethods()) {
-                if (m.getName().equals(methodName)) {
-                    if (mi != null) {
-                        throw new IllegalArgumentException("The class " + clazz + " has more than one method named" +
-                                " '" + methodName + "'");
-                    }
-                    mi = new SimpleMethodInvocation(null, m);
-                }
-            }
-        }
+		if (mi == null) {
+			for (Method m : clazz.getDeclaredMethods()) {
+				if (m.getName().equals(methodName)) {
+					if (mi != null) {
+						throw new IllegalArgumentException("The class " + clazz
+								+ " has more than one method named" + " '" + methodName
+								+ "'");
+					}
+					mi = new SimpleMethodInvocation(null, m);
+				}
+			}
+		}
 
-        return mi;
-    }
+		return mi;
+	}
 
-    /**
-     * Generates a <code>MethodInvocation</code> for specified <code>methodName</code> on the passed class,
-     * using the <code>args</code> to locate the method.
-     *
-     * @param targetObject the object being invoked
-     * @param clazz the class of object that will be used to find the relevant <code>Method</code>
-     * @param methodName the name of the method to find
-     * @param classArgs arguments that are required to locate the relevant method signature
-     * @param args the actual arguments that should be passed to SimpleMethodInvocation
-     * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a problem
-     */
-    public static MethodInvocation createFromClass(Object targetObject, Class<?> clazz, String methodName,
-            Class<?>[] classArgs, Object[] args) {
-        Assert.notNull(clazz, "Class required");
-        Assert.hasText(methodName, "MethodName required");
+	/**
+	 * Generates a <code>MethodInvocation</code> for specified <code>methodName</code> on
+	 * the passed class, using the <code>args</code> to locate the method.
+	 *
+	 * @param targetObject the object being invoked
+	 * @param clazz the class of object that will be used to find the relevant
+	 * <code>Method</code>
+	 * @param methodName the name of the method to find
+	 * @param classArgs arguments that are required to locate the relevant method
+	 * signature
+	 * @param args the actual arguments that should be passed to SimpleMethodInvocation
+	 * @return a <code>MethodInvocation</code>, or <code>null</code> if there was a
+	 * problem
+	 */
+	public static MethodInvocation createFromClass(Object targetObject, Class<?> clazz,
+			String methodName, Class<?>[] classArgs, Object[] args) {
+		Assert.notNull(clazz, "Class required");
+		Assert.hasText(methodName, "MethodName required");
 
-        Method method;
+		Method method;
 
-        try {
-            method = clazz.getMethod(methodName, classArgs);
-        } catch (NoSuchMethodException e) {
-            return null;
-        }
+		try {
+			method = clazz.getMethod(methodName, classArgs);
+		}
+		catch (NoSuchMethodException e) {
+			return null;
+		}
 
-        return new SimpleMethodInvocation(targetObject, method, args);
-    }
+		return new SimpleMethodInvocation(targetObject, method, args);
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
index 967ffa756b..7130838944 100644
--- a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
+++ b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
@@ -20,48 +20,51 @@ import org.aopalliance.intercept.MethodInvocation;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
 
-
 /**
  * Represents the AOP Alliance <code>MethodInvocation</code>.
  *
  * @author Ben Alex
  */
 public class SimpleMethodInvocation implements MethodInvocation {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Method method;
-    private Object[] arguments;
-    private Object targetObject;
+	private Method method;
+	private Object[] arguments;
+	private Object targetObject;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SimpleMethodInvocation(Object targetObject, Method method, Object... arguments) {
-        this.targetObject = targetObject;
-        this.method = method;
-        this.arguments = arguments == null ? new Object[0] : arguments;
-    }
+	public SimpleMethodInvocation(Object targetObject, Method method, Object... arguments) {
+		this.targetObject = targetObject;
+		this.method = method;
+		this.arguments = arguments == null ? new Object[0] : arguments;
+	}
 
-    public SimpleMethodInvocation() {}
+	public SimpleMethodInvocation() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Object[] getArguments() {
-        return arguments;
-    }
+	public Object[] getArguments() {
+		return arguments;
+	}
 
-    public Method getMethod() {
-        return method;
-    }
+	public Method getMethod() {
+		return method;
+	}
 
-    public AccessibleObject getStaticPart() {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
+	public AccessibleObject getStaticPart() {
+		throw new UnsupportedOperationException("mock method not implemented");
+	}
 
-    public Object getThis() {
-        return targetObject;
-    }
+	public Object getThis() {
+		return targetObject;
+	}
 
-    public Object proceed() throws Throwable {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
+	public Object proceed() throws Throwable {
+		throw new UnsupportedOperationException("mock method not implemented");
+	}
 }
diff --git a/core/src/main/java/org/springframework/security/util/package-info.java b/core/src/main/java/org/springframework/security/util/package-info.java
index 2b135a3d63..f6242344be 100644
--- a/core/src/main/java/org/springframework/security/util/package-info.java
+++ b/core/src/main/java/org/springframework/security/util/package-info.java
@@ -5,3 +5,4 @@
  * just on external libraries and the JDK.
  */
 package org.springframework.security.util;
+
diff --git a/core/src/test/java/org/springframework/security/ITargetObject.java b/core/src/test/java/org/springframework/security/ITargetObject.java
index 4e0cc06d66..d6b9eb34d9 100644
--- a/core/src/test/java/org/springframework/security/ITargetObject.java
+++ b/core/src/test/java/org/springframework/security/ITargetObject.java
@@ -21,15 +21,16 @@ package org.springframework.security;
  * @author Ben Alex
  */
 public interface ITargetObject {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    Integer computeHashCode(String input);
+	Integer computeHashCode(String input);
 
-    int countLength(String input);
+	int countLength(String input);
 
-    String makeLowerCase(String input);
+	String makeLowerCase(String input);
 
-    String makeUpperCase(String input);
+	String makeUpperCase(String input);
 
-    String publicMakeLowerCase(String input);
+	String publicMakeLowerCase(String input);
 }
diff --git a/core/src/test/java/org/springframework/security/OtherTargetObject.java b/core/src/test/java/org/springframework/security/OtherTargetObject.java
index ce9366f60f..f9c5b50d98 100644
--- a/core/src/test/java/org/springframework/security/OtherTargetObject.java
+++ b/core/src/test/java/org/springframework/security/OtherTargetObject.java
@@ -16,27 +16,35 @@
 package org.springframework.security;
 
 /**
- * Simply extends {@link TargetObject} so we have a different object to put configuration attributes against.<P>There
- * is no different behaviour. We have to define each method so that <code>Class.getMethod(methodName, args)</code>
- * returns a <code>Method</code> referencing this class rather than the parent class.</p>
- *  <P>We need to implement <code>ITargetObject</code> again because the <code>MethodDefinitionAttributes</code>
- * only locates attributes on interfaces explicitly defined by the intercepted class (not the interfaces defined by
- * its parent class or classes).</p>
+ * Simply extends {@link TargetObject} so we have a different object to put configuration
+ * attributes against.
+ * <P>
+ * There is no different behaviour. We have to define each method so that
+ * <code>Class.getMethod(methodName, args)</code> returns a <code>Method</code>
+ * referencing this class rather than the parent class.
+ * </p>
+ * <P>
+ * We need to implement <code>ITargetObject</code> again because the
+ * <code>MethodDefinitionAttributes</code> only locates attributes on interfaces
+ * explicitly defined by the intercepted class (not the interfaces defined by its parent
+ * class or classes).
+ * </p>
  *
  * @author Ben Alex
  */
 public class OtherTargetObject extends TargetObject implements ITargetObject {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String makeLowerCase(String input) {
-        return super.makeLowerCase(input);
-    }
+	public String makeLowerCase(String input) {
+		return super.makeLowerCase(input);
+	}
 
-    public String makeUpperCase(String input) {
-        return super.makeUpperCase(input);
-    }
+	public String makeUpperCase(String input) {
+		return super.makeUpperCase(input);
+	}
 
-    public String publicMakeLowerCase(String input) {
-        return super.publicMakeLowerCase(input);
-    }
+	public String publicMakeLowerCase(String input) {
+		return super.publicMakeLowerCase(input);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/PopulatedDatabase.java b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
index 8e7646dc4e..e01761ec4b 100644
--- a/core/src/test/java/org/springframework/security/PopulatedDatabase.java
+++ b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
@@ -19,117 +19,106 @@ import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
 
-
 /**
- * Singleton which provides a populated database connection for all JDBC-related unit tests.
+ * Singleton which provides a populated database connection for all JDBC-related unit
+ * tests.
  *
  * @author Ben Alex
  */
 public class PopulatedDatabase {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static TestDataSource dataSource = null;
+	private static TestDataSource dataSource = null;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    private PopulatedDatabase() {}
+	private PopulatedDatabase() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static DataSource getDataSource() {
-        if (dataSource == null) {
-            setupDataSource();
-        }
+	public static DataSource getDataSource() {
+		if (dataSource == null) {
+			setupDataSource();
+		}
 
-        return dataSource;
-    }
+		return dataSource;
+	}
 
-    private static void setupDataSource() {
-        dataSource = new TestDataSource("springsecuritytest");
-        JdbcTemplate template = new JdbcTemplate(dataSource);
+	private static void setupDataSource() {
+		dataSource = new TestDataSource("springsecuritytest");
+		JdbcTemplate template = new JdbcTemplate(dataSource);
 
-        template.execute(
-            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL)");
-        template.execute(
-            "CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME))");
-        template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY)");
-        template.execute(
-            "CREATE TABLE ACL_OBJECT_IDENTITY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,OBJECT_IDENTITY VARCHAR_IGNORECASE(250) NOT NULL,PARENT_OBJECT BIGINT,ACL_CLASS VARCHAR_IGNORECASE(250) NOT NULL,CONSTRAINT UNIQUE_OBJECT_IDENTITY UNIQUE(OBJECT_IDENTITY),CONSTRAINT SYS_FK_3 FOREIGN KEY(PARENT_OBJECT) REFERENCES ACL_OBJECT_IDENTITY(ID))");
-        template.execute(
-            "CREATE TABLE ACL_PERMISSION(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,RECIPIENT VARCHAR_IGNORECASE(100) NOT NULL,MASK INTEGER NOT NULL,CONSTRAINT UNIQUE_RECIPIENT UNIQUE(ACL_OBJECT_IDENTITY,RECIPIENT),CONSTRAINT SYS_FK_7 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID))");
-        template.execute("SET IGNORECASE TRUE");
-        template.execute("INSERT INTO USERS VALUES('dianne','emu',TRUE)");
-        template.execute("INSERT INTO USERS VALUES('rod','koala',TRUE)");
-        template.execute("INSERT INTO USERS VALUES('peter','opal',FALSE)");
-        template.execute("INSERT INTO USERS VALUES('scott','wombat',TRUE)");
-        template.execute("INSERT INTO USERS VALUES('cooper','kookaburra',TRUE)");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_TELLER')");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR')");
-        template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_TELLER')");
-        template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_TELLER')");
-        template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_TELLER')");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (1, 'org.springframework.security.acl.DomainObject:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (2, 'org.springframework.security.acl.DomainObject:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (3, 'org.springframework.security.acl.DomainObject:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (4, 'org.springframework.security.acl.DomainObject:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (5, 'org.springframework.security.acl.DomainObject:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (6, 'org.springframework.security.acl.DomainObject:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL)");
+		template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME))");
+		template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY)");
+		template.execute("CREATE TABLE ACL_OBJECT_IDENTITY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,OBJECT_IDENTITY VARCHAR_IGNORECASE(250) NOT NULL,PARENT_OBJECT BIGINT,ACL_CLASS VARCHAR_IGNORECASE(250) NOT NULL,CONSTRAINT UNIQUE_OBJECT_IDENTITY UNIQUE(OBJECT_IDENTITY),CONSTRAINT SYS_FK_3 FOREIGN KEY(PARENT_OBJECT) REFERENCES ACL_OBJECT_IDENTITY(ID))");
+		template.execute("CREATE TABLE ACL_PERMISSION(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0)  NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,RECIPIENT VARCHAR_IGNORECASE(100) NOT NULL,MASK INTEGER NOT NULL,CONSTRAINT UNIQUE_RECIPIENT UNIQUE(ACL_OBJECT_IDENTITY,RECIPIENT),CONSTRAINT SYS_FK_7 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID))");
+		template.execute("SET IGNORECASE TRUE");
+		template.execute("INSERT INTO USERS VALUES('dianne','emu',TRUE)");
+		template.execute("INSERT INTO USERS VALUES('rod','koala',TRUE)");
+		template.execute("INSERT INTO USERS VALUES('peter','opal',FALSE)");
+		template.execute("INSERT INTO USERS VALUES('scott','wombat',TRUE)");
+		template.execute("INSERT INTO USERS VALUES('cooper','kookaburra',TRUE)");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_TELLER')");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR')");
+		template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_TELLER')");
+		template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_TELLER')");
+		template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_TELLER')");
+		template.execute("INSERT INTO acl_object_identity VALUES (1, 'org.springframework.security.acl.DomainObject:1', null, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("INSERT INTO acl_object_identity VALUES (2, 'org.springframework.security.acl.DomainObject:2', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("INSERT INTO acl_object_identity VALUES (3, 'org.springframework.security.acl.DomainObject:3', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("INSERT INTO acl_object_identity VALUES (4, 'org.springframework.security.acl.DomainObject:4', 1, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("INSERT INTO acl_object_identity VALUES (5, 'org.springframework.security.acl.DomainObject:5', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
+		template.execute("INSERT INTO acl_object_identity VALUES (6, 'org.springframework.security.acl.DomainObject:6', 3, 'org.springframework.security.acl.basic.SimpleAclEntry');");
 
-        // ----- BEGIN deviation from normal sample data load script -----
-        template.execute(
-            "INSERT INTO acl_object_identity VALUES (7, 'org.springframework.security.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
+		// ----- BEGIN deviation from normal sample data load script -----
+		template.execute("INSERT INTO acl_object_identity VALUES (7, 'org.springframework.security.acl.DomainObject:7', 3, 'some.invalid.acl.entry.class');");
 
-        // ----- FINISH deviation from normal sample data load script -----
-        template.execute("INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1);");
-        template.execute("INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0);");
-        template.execute("INSERT INTO acl_permission VALUES (null, 2, 'rod', 2);");
-        template.execute("INSERT INTO acl_permission VALUES (null, 3, 'scott', 14);");
-        template.execute("INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);");
+		// ----- FINISH deviation from normal sample data load script -----
+		template.execute("INSERT INTO acl_permission VALUES (null, 1, 'ROLE_SUPERVISOR', 1);");
+		template.execute("INSERT INTO acl_permission VALUES (null, 2, 'ROLE_SUPERVISOR', 0);");
+		template.execute("INSERT INTO acl_permission VALUES (null, 2, 'rod', 2);");
+		template.execute("INSERT INTO acl_permission VALUES (null, 3, 'scott', 14);");
+		template.execute("INSERT INTO acl_permission VALUES (null, 6, 'scott', 1);");
 
-        createGroupTables(template);
-        insertGroupData(template);
-    }
+		createGroupTables(template);
+		insertGroupData(template);
+	}
 
-    public static void createGroupTables(JdbcTemplate template) {
-        //  Group tables and data
-        template.execute(
-                "CREATE TABLE GROUPS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, GROUP_NAME VARCHAR_IGNORECASE(50) NOT NULL)");
-        template.execute(
-                "CREATE TABLE GROUP_AUTHORITIES(GROUP_ID BIGINT NOT NULL, AUTHORITY VARCHAR(50) NOT NULL, CONSTRAINT FK_GROUP_AUTHORITIES_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
-        template.execute(
-                "CREATE TABLE GROUP_MEMBERS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, USERNAME VARCHAR(50) NOT NULL, GROUP_ID BIGINT NOT NULL, CONSTRAINT FK_GROUP_MEMBERS_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
-    }
+	public static void createGroupTables(JdbcTemplate template) {
+		// Group tables and data
+		template.execute("CREATE TABLE GROUPS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, GROUP_NAME VARCHAR_IGNORECASE(50) NOT NULL)");
+		template.execute("CREATE TABLE GROUP_AUTHORITIES(GROUP_ID BIGINT NOT NULL, AUTHORITY VARCHAR(50) NOT NULL, CONSTRAINT FK_GROUP_AUTHORITIES_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
+		template.execute("CREATE TABLE GROUP_MEMBERS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 0) PRIMARY KEY, USERNAME VARCHAR(50) NOT NULL, GROUP_ID BIGINT NOT NULL, CONSTRAINT FK_GROUP_MEMBERS_GROUP FOREIGN KEY(GROUP_ID) REFERENCES GROUPS(ID))");
+	}
 
-    public static void insertGroupData(JdbcTemplate template) {
-        template.execute("INSERT INTO USERS VALUES('jerry','password',TRUE)");
-        template.execute("INSERT INTO USERS VALUES('tom','password',TRUE)");
+	public static void insertGroupData(JdbcTemplate template) {
+		template.execute("INSERT INTO USERS VALUES('jerry','password',TRUE)");
+		template.execute("INSERT INTO USERS VALUES('tom','password',TRUE)");
 
-        template.execute("INSERT INTO GROUPS VALUES (0, 'GROUP_0')");
-        template.execute("INSERT INTO GROUPS VALUES (1, 'GROUP_1')");
-        template.execute("INSERT INTO GROUPS VALUES (2, 'GROUP_2')");
-        // Group 3 isn't used
-        template.execute("INSERT INTO GROUPS VALUES (3, 'GROUP_3')");
+		template.execute("INSERT INTO GROUPS VALUES (0, 'GROUP_0')");
+		template.execute("INSERT INTO GROUPS VALUES (1, 'GROUP_1')");
+		template.execute("INSERT INTO GROUPS VALUES (2, 'GROUP_2')");
+		// Group 3 isn't used
+		template.execute("INSERT INTO GROUPS VALUES (3, 'GROUP_3')");
 
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (0, 'ROLE_A')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (1, 'ROLE_B')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (1, 'ROLE_C')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_A')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_B')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_C')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (3, 'ROLE_D')");
-        template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (3, 'ROLE_E')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (0, 'ROLE_A')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (1, 'ROLE_B')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (1, 'ROLE_C')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_A')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_B')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (2, 'ROLE_C')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (3, 'ROLE_D')");
+		template.execute("INSERT INTO GROUP_AUTHORITIES VALUES (3, 'ROLE_E')");
 
-
-        template.execute("INSERT INTO GROUP_MEMBERS VALUES (0, 'jerry', 0)");
-        template.execute("INSERT INTO GROUP_MEMBERS VALUES (1, 'jerry', 1)");
-        // tom has groups with overlapping roles
-        template.execute("INSERT INTO GROUP_MEMBERS VALUES (2, 'tom', 1)");
-        template.execute("INSERT INTO GROUP_MEMBERS VALUES (3, 'tom', 2)");
-    }
+		template.execute("INSERT INTO GROUP_MEMBERS VALUES (0, 'jerry', 0)");
+		template.execute("INSERT INTO GROUP_MEMBERS VALUES (1, 'jerry', 1)");
+		// tom has groups with overlapping roles
+		template.execute("INSERT INTO GROUP_MEMBERS VALUES (2, 'tom', 1)");
+		template.execute("INSERT INTO GROUP_MEMBERS VALUES (3, 'tom', 2)");
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/TargetObject.java b/core/src/test/java/org/springframework/security/TargetObject.java
index f0a92b8e55..a2765b6795 100644
--- a/core/src/test/java/org/springframework/security/TargetObject.java
+++ b/core/src/test/java/org/springframework/security/TargetObject.java
@@ -18,63 +18,68 @@ package org.springframework.security;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-
 /**
  * Represents a secured object.
  *
  * @author Ben Alex
  */
 public class TargetObject implements ITargetObject {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Integer computeHashCode(String input) {
-        return Integer.valueOf(input.hashCode());
-    }
+	public Integer computeHashCode(String input) {
+		return Integer.valueOf(input.hashCode());
+	}
 
-    public int countLength(String input) {
-        return input.length();
-    }
+	public int countLength(String input) {
+		return input.length();
+	}
 
-    /**
-     * Returns the lowercase string, followed by security environment information.
-     *
-     * @param input the message to make lowercase
-     *
-     * @return the lowercase message, a space, the <code>Authentication</code> class that was on the
-     *         <code>SecurityContext</code> at the time of method invocation, and a boolean indicating if the
-     *         <code>Authentication</code> object is authenticated or not
-     */
-    public String makeLowerCase(String input) {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Returns the lowercase string, followed by security environment information.
+	 *
+	 * @param input the message to make lowercase
+	 *
+	 * @return the lowercase message, a space, the <code>Authentication</code> class that
+	 * was on the <code>SecurityContext</code> at the time of method invocation, and a
+	 * boolean indicating if the <code>Authentication</code> object is authenticated or
+	 * not
+	 */
+	public String makeLowerCase(String input) {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        if (auth == null) {
-            return input.toLowerCase() + " Authentication empty";
-        } else {
-            return input.toLowerCase() + " " + auth.getClass().getName() + " " + auth.isAuthenticated();
-        }
-    }
+		if (auth == null) {
+			return input.toLowerCase() + " Authentication empty";
+		}
+		else {
+			return input.toLowerCase() + " " + auth.getClass().getName() + " "
+					+ auth.isAuthenticated();
+		}
+	}
 
-    /**
-     * Returns the uppercase string, followed by security environment information.
-     *
-     * @param input the message to make uppercase
-     *
-     * @return the uppercase message, a space, the <code>Authentication</code> class that was on the
-     *         <code>SecurityContext</code> at the time of method invocation, and a boolean indicating if the
-     *         <code>Authentication</code> object is authenticated or not
-     */
-    public String makeUpperCase(String input) {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Returns the uppercase string, followed by security environment information.
+	 *
+	 * @param input the message to make uppercase
+	 *
+	 * @return the uppercase message, a space, the <code>Authentication</code> class that
+	 * was on the <code>SecurityContext</code> at the time of method invocation, and a
+	 * boolean indicating if the <code>Authentication</code> object is authenticated or
+	 * not
+	 */
+	public String makeUpperCase(String input) {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        return input.toUpperCase() + " " + auth.getClass().getName() + " " + auth.isAuthenticated();
-    }
+		return input.toUpperCase() + " " + auth.getClass().getName() + " "
+				+ auth.isAuthenticated();
+	}
 
-    /**
-     * Delegates through to the {@link #makeLowerCase(String)} method.
-     *
-     * @param input the message to be made lower-case
-     */
-    public String publicMakeLowerCase(String input) {
-        return this.makeLowerCase(input);
-    }
+	/**
+	 * Delegates through to the {@link #makeLowerCase(String)} method.
+	 *
+	 * @param input the message to be made lower-case
+	 */
+	public String publicMakeLowerCase(String input) {
+		return this.makeLowerCase(input);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/TestDataSource.java b/core/src/test/java/org/springframework/security/TestDataSource.java
index 5c322d61f7..768d73a4e1 100644
--- a/core/src/test/java/org/springframework/security/TestDataSource.java
+++ b/core/src/test/java/org/springframework/security/TestDataSource.java
@@ -11,19 +11,19 @@ import org.springframework.beans.factory.DisposableBean;
  * @author Luke Taylor
  */
 public class TestDataSource extends DriverManagerDataSource implements DisposableBean {
-    String name;
+	String name;
 
-    public TestDataSource(String databaseName) {
-        name = databaseName;
-        System.out.println("Creating database: " + name);
-        setDriverClassName("org.hsqldb.jdbcDriver");
-        setUrl("jdbc:hsqldb:mem:" + databaseName);
-        setUsername("sa");
-        setPassword("");
-    }
+	public TestDataSource(String databaseName) {
+		name = databaseName;
+		System.out.println("Creating database: " + name);
+		setDriverClassName("org.hsqldb.jdbcDriver");
+		setUrl("jdbc:hsqldb:mem:" + databaseName);
+		setUsername("sa");
+		setPassword("");
+	}
 
-    public void destroy() throws Exception {
-        System.out.println("Shutting down database: " + name);
-        new JdbcTemplate(this).execute("SHUTDOWN");
-    }
+	public void destroy() throws Exception {
+		System.out.println("Shutting down database: " + name);
+		new JdbcTemplate(this).execute("SHUTDOWN");
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java b/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
index 8c20ce0ecf..63039d30c0 100644
--- a/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthenticationCredentialsNotFoundEventTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.access.event.AuthenticationCredentialsNotFou
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.util.SimpleMethodInvocation;
 
-
 /**
  * Tests {@link AuthenticationCredentialsNotFoundEvent}.
  *
@@ -29,20 +28,22 @@ import org.springframework.security.util.SimpleMethodInvocation;
  */
 public class AuthenticationCredentialsNotFoundEventTests {
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls() {
-        new AuthenticationCredentialsNotFoundEvent(null, SecurityConfig.createList("TEST"),
-                new AuthenticationCredentialsNotFoundException("test"));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls() {
+		new AuthenticationCredentialsNotFoundEvent(null,
+				SecurityConfig.createList("TEST"),
+				new AuthenticationCredentialsNotFoundException("test"));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls2() {
-        new AuthenticationCredentialsNotFoundEvent(new SimpleMethodInvocation(), null,
-                new AuthenticationCredentialsNotFoundException("test"));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls2() {
+		new AuthenticationCredentialsNotFoundEvent(new SimpleMethodInvocation(), null,
+				new AuthenticationCredentialsNotFoundException("test"));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls3() {
-        new AuthenticationCredentialsNotFoundEvent(new SimpleMethodInvocation(), SecurityConfig.createList("TEST"), null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls3() {
+		new AuthenticationCredentialsNotFoundEvent(new SimpleMethodInvocation(),
+				SecurityConfig.createList("TEST"), null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
index 514d8b8ab4..022b9aa62e 100644
--- a/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthorizationFailureEventTests.java
@@ -24,42 +24,45 @@ import org.springframework.security.util.SimpleMethodInvocation;
 
 import java.util.*;
 
-
 /**
  * Tests {@link AuthorizationFailureEvent}.
  *
  * @author Ben Alex
  */
 public class AuthorizationFailureEventTests {
-    private final UsernamePasswordAuthenticationToken foo = new UsernamePasswordAuthenticationToken("foo", "bar");
-    private List<ConfigAttribute> attributes = SecurityConfig.createList("TEST");
-    private AccessDeniedException exception = new AuthorizationServiceException("error", new Throwable());
+	private final UsernamePasswordAuthenticationToken foo = new UsernamePasswordAuthenticationToken(
+			"foo", "bar");
+	private List<ConfigAttribute> attributes = SecurityConfig.createList("TEST");
+	private AccessDeniedException exception = new AuthorizationServiceException("error",
+			new Throwable());
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsNullSecureObject() {
-        new AuthorizationFailureEvent(null, attributes, foo, exception);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullSecureObject() {
+		new AuthorizationFailureEvent(null, attributes, foo, exception);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsNullAttributesList() {
-        new AuthorizationFailureEvent(new SimpleMethodInvocation(), null, foo, exception);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullAttributesList() {
+		new AuthorizationFailureEvent(new SimpleMethodInvocation(), null, foo, exception);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsNullAuthentication() {
-        new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, null, exception);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullAuthentication() {
+		new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, null,
+				exception);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsNullException() {
-        new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, foo, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullException() {
+		new AuthorizationFailureEvent(new SimpleMethodInvocation(), attributes, foo, null);
+	}
 
-    @Test
-    public void gettersReturnCtorSuppliedData() throws Exception {
-        AuthorizationFailureEvent event = new AuthorizationFailureEvent(new Object(), attributes , foo, exception);
-        assertSame(attributes, event.getConfigAttributes());
-        assertSame(exception, event.getAccessDeniedException());
-        assertSame(foo, event.getAuthentication());
-    }
+	@Test
+	public void gettersReturnCtorSuppliedData() throws Exception {
+		AuthorizationFailureEvent event = new AuthorizationFailureEvent(new Object(),
+				attributes, foo, exception);
+		assertSame(attributes, event.getConfigAttributes());
+		assertSame(exception, event.getAccessDeniedException());
+		assertSame(foo, event.getAuthentication());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java b/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
index 32152dadc5..83ebc969b8 100644
--- a/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
+++ b/core/src/test/java/org/springframework/security/access/AuthorizedEventTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.access.event.AuthorizedEvent;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.util.SimpleMethodInvocation;
 
-
 /**
  * Tests {@link AuthorizedEvent}.
  *
@@ -29,19 +28,22 @@ import org.springframework.security.util.SimpleMethodInvocation;
  */
 public class AuthorizedEventTests {
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls() {
-        new AuthorizedEvent(null, SecurityConfig.createList("TEST"), new UsernamePasswordAuthenticationToken("foo", "bar"));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls() {
+		new AuthorizedEvent(null, SecurityConfig.createList("TEST"),
+				new UsernamePasswordAuthenticationToken("foo", "bar"));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls2() {
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls2() {
 
-        new AuthorizedEvent(new SimpleMethodInvocation(), null, new UsernamePasswordAuthenticationToken("foo", "bar"));
-    }
+		new AuthorizedEvent(new SimpleMethodInvocation(), null,
+				new UsernamePasswordAuthenticationToken("foo", "bar"));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNulls3() {
-        new AuthorizedEvent(new SimpleMethodInvocation(), SecurityConfig.createList("TEST"), null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNulls3() {
+		new AuthorizedEvent(new SimpleMethodInvocation(),
+				SecurityConfig.createList("TEST"), null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java
index c4dcf27b4d..a810c25d9b 100644
--- a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java
+++ b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 
-
 /**
  * Tests {@link SecurityConfig}.
  *
@@ -29,72 +28,74 @@ import org.springframework.security.access.SecurityConfig;
  */
 public class SecurityConfigTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testHashCode() {
-        SecurityConfig config = new SecurityConfig("TEST");
-        Assert.assertEquals("TEST".hashCode(), config.hashCode());
-    }
+	@Test
+	public void testHashCode() {
+		SecurityConfig config = new SecurityConfig("TEST");
+		Assert.assertEquals("TEST".hashCode(), config.hashCode());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testCannotConstructWithNullAttribute() {
-           new SecurityConfig(null); // SEC-727
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testCannotConstructWithNullAttribute() {
+		new SecurityConfig(null); // SEC-727
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testCannotConstructWithEmptyAttribute() {
-           new SecurityConfig(""); // SEC-727
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testCannotConstructWithEmptyAttribute() {
+		new SecurityConfig(""); // SEC-727
+	}
 
-    @Test(expected=NoSuchMethodException.class)
-    public void testNoArgConstructorDoesntExist() throws Exception {
-        SecurityConfig.class.getDeclaredConstructor((Class[]) null);
-    }
+	@Test(expected = NoSuchMethodException.class)
+	public void testNoArgConstructorDoesntExist() throws Exception {
+		SecurityConfig.class.getDeclaredConstructor((Class[]) null);
+	}
 
-    @Test
-    public void testObjectEquals() throws Exception {
-        SecurityConfig security1 = new SecurityConfig("TEST");
-        SecurityConfig security2 = new SecurityConfig("TEST");
-        Assert.assertEquals(security1, security2);
+	@Test
+	public void testObjectEquals() throws Exception {
+		SecurityConfig security1 = new SecurityConfig("TEST");
+		SecurityConfig security2 = new SecurityConfig("TEST");
+		Assert.assertEquals(security1, security2);
 
-        // SEC-311: Must observe symmetry requirement of Object.equals(Object) contract
-        String securityString1 = "TEST";
-        Assert.assertNotSame(security1, securityString1);
+		// SEC-311: Must observe symmetry requirement of Object.equals(Object) contract
+		String securityString1 = "TEST";
+		Assert.assertNotSame(security1, securityString1);
 
-        String securityString2 = "NOT_EQUAL";
-        Assert.assertTrue(!security1.equals(securityString2));
+		String securityString2 = "NOT_EQUAL";
+		Assert.assertTrue(!security1.equals(securityString2));
 
-        SecurityConfig security3 = new SecurityConfig("NOT_EQUAL");
-        Assert.assertTrue(!security1.equals(security3));
+		SecurityConfig security3 = new SecurityConfig("NOT_EQUAL");
+		Assert.assertTrue(!security1.equals(security3));
 
-        MockConfigAttribute mock1 = new MockConfigAttribute("TEST");
-        Assert.assertEquals(security1, mock1);
+		MockConfigAttribute mock1 = new MockConfigAttribute("TEST");
+		Assert.assertEquals(security1, mock1);
 
-        MockConfigAttribute mock2 = new MockConfigAttribute("NOT_EQUAL");
-        Assert.assertTrue(!security1.equals(mock2));
+		MockConfigAttribute mock2 = new MockConfigAttribute("NOT_EQUAL");
+		Assert.assertTrue(!security1.equals(mock2));
 
-        Integer int1 = Integer.valueOf(987);
-        Assert.assertTrue(!security1.equals(int1));
-    }
+		Integer int1 = Integer.valueOf(987);
+		Assert.assertTrue(!security1.equals(int1));
+	}
 
-    @Test
-    public void testToString() {
-        SecurityConfig config = new SecurityConfig("TEST");
-        Assert.assertEquals("TEST", config.toString());
-    }
+	@Test
+	public void testToString() {
+		SecurityConfig config = new SecurityConfig("TEST");
+		Assert.assertEquals("TEST", config.toString());
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockConfigAttribute implements ConfigAttribute {
-        private String attribute;
+	private class MockConfigAttribute implements ConfigAttribute {
+		private String attribute;
 
-        public MockConfigAttribute(String configuration) {
-            this.attribute = configuration;
-        }
+		public MockConfigAttribute(String configuration) {
+			this.attribute = configuration;
+		}
 
-        public String getAttribute() {
-            return this.attribute;
-        }
-    }
+		public String getAttribute() {
+			return this.attribute;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
index 825e6ad4b0..3dc0695ad4 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java
@@ -25,39 +25,40 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 /**
  */
-@Secured({"ROLE_USER"})
+@Secured({ "ROLE_USER" })
 @PermitAll
 public interface BusinessService extends Serializable {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Secured({"ROLE_ADMIN"})
-    @RolesAllowed({"ROLE_ADMIN"})
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    public void someAdminMethod();
+	@Secured({ "ROLE_ADMIN" })
+	@RolesAllowed({ "ROLE_ADMIN" })
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	public void someAdminMethod();
 
-    @Secured({"ROLE_USER", "ROLE_ADMIN"})
-    @RolesAllowed({"ROLE_USER", "ROLE_ADMIN"})
-    public void someUserAndAdminMethod();
+	@Secured({ "ROLE_USER", "ROLE_ADMIN" })
+	@RolesAllowed({ "ROLE_USER", "ROLE_ADMIN" })
+	public void someUserAndAdminMethod();
 
-    @Secured({"ROLE_USER"})
-    @RolesAllowed({"ROLE_USER"})
-    public void someUserMethod1();
+	@Secured({ "ROLE_USER" })
+	@RolesAllowed({ "ROLE_USER" })
+	public void someUserMethod1();
 
-    @Secured({"ROLE_USER"})
-    @RolesAllowed({"ROLE_USER"})
-    public void someUserMethod2();
+	@Secured({ "ROLE_USER" })
+	@RolesAllowed({ "ROLE_USER" })
+	public void someUserMethod2();
 
-    @RolesAllowed({"USER"})
-    public void rolesAllowedUser();
+	@RolesAllowed({ "USER" })
+	public void rolesAllowedUser();
 
-    public int someOther(String s);
+	public int someOther(String s);
 
-    public int someOther(int input);
+	public int someOther(int input);
 
-    public List<?> methodReturningAList(List<?> someList);
+	public List<?> methodReturningAList(List<?> someList);
 
-    public Object[] methodReturningAnArray(Object[] someArray);
+	public Object[] methodReturningAnArray(Object[] someArray);
 
-    public List<?> methodReturningAList(String userName, String extraParam);
+	public List<?> methodReturningAList(String userName, String extraParam);
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
index 5f060e6c28..921d3854d3 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java
@@ -9,47 +9,47 @@ import java.util.List;
  */
 public class BusinessServiceImpl<E extends Entity> implements BusinessService {
 
-    @Secured({"ROLE_USER"})
-    public void someUserMethod1() {
-    }
+	@Secured({ "ROLE_USER" })
+	public void someUserMethod1() {
+	}
 
-    @Secured({"ROLE_USER"})
-    public void someUserMethod2() {
-    }
+	@Secured({ "ROLE_USER" })
+	public void someUserMethod2() {
+	}
 
-    @Secured({"ROLE_USER", "ROLE_ADMIN"})
-    public void someUserAndAdminMethod() {
-    }
+	@Secured({ "ROLE_USER", "ROLE_ADMIN" })
+	public void someUserAndAdminMethod() {
+	}
 
-    @Secured({"ROLE_ADMIN"})
-    public void someAdminMethod() {
-    }
+	@Secured({ "ROLE_ADMIN" })
+	public void someAdminMethod() {
+	}
 
-    public E someUserMethod3(final E entity) {
-        return entity;
-    }
+	public E someUserMethod3(final E entity) {
+		return entity;
+	}
 
-    public int someOther(String s) {
-        return 0;
-    }
+	public int someOther(String s) {
+		return 0;
+	}
 
-    public int someOther(int input) {
-        return input;
-    }
+	public int someOther(int input) {
+		return input;
+	}
 
-    public List<?> methodReturningAList(List<?> someList) {
-        return someList;
-    }
+	public List<?> methodReturningAList(List<?> someList) {
+		return someList;
+	}
 
-    public List<Object> methodReturningAList(String userName, String arg2) {
-        return new ArrayList<Object>();
-    }
+	public List<Object> methodReturningAList(String userName, String arg2) {
+		return new ArrayList<Object>();
+	}
 
-    public Object[] methodReturningAnArray(Object[] someArray) {
-        return null;
-    }
+	public Object[] methodReturningAnArray(Object[] someArray) {
+		return null;
+	}
 
-    public void rolesAllowedUser() {
+	public void rolesAllowedUser() {
 
-    }
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/Entity.java b/core/src/test/java/org/springframework/security/access/annotation/Entity.java
index bcd6b9cdea..749a3c0c24 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/Entity.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Entity.java
@@ -7,5 +7,6 @@ package org.springframework.security.access.annotation;
  *
  */
 public class Entity {
-    public Entity(String someParameter) {}
+	public Entity(String someParameter) {
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
index b194696cbf..9c2bcfb8d1 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java
@@ -7,50 +7,49 @@ import org.springframework.security.access.prepost.PostFilter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreFilter;
 
-
 public class ExpressionProtectedBusinessServiceImpl implements BusinessService {
 
-    public void someAdminMethod() {
-    }
+	public void someAdminMethod() {
+	}
 
-    public int someOther(String s) {
-        return 0;
-    }
+	public int someOther(String s) {
+		return 0;
+	}
 
-    public int someOther(int input) {
-        return 0;
-    }
+	public int someOther(int input) {
+		return 0;
+	}
 
-    public void someUserAndAdminMethod() {
-    }
+	public void someUserAndAdminMethod() {
+	}
 
-    public void someUserMethod1() {
-    }
+	public void someUserMethod1() {
+	}
 
-    public void someUserMethod2() {
-    }
+	public void someUserMethod2() {
+	}
 
-    @PreFilter(filterTarget="someList", value="filterObject == authentication.name or filterObject == 'sam'")
-    @PostFilter("filterObject == 'bob'")
-    public List<?> methodReturningAList(List<?> someList) {
-        return someList;
-    }
+	@PreFilter(filterTarget = "someList", value = "filterObject == authentication.name or filterObject == 'sam'")
+	@PostFilter("filterObject == 'bob'")
+	public List<?> methodReturningAList(List<?> someList) {
+		return someList;
+	}
 
-    public List<Object> methodReturningAList(String userName, String arg2) {
-        return new ArrayList<Object>();
-    }
+	public List<Object> methodReturningAList(String userName, String arg2) {
+		return new ArrayList<Object>();
+	}
 
-    @PostFilter("filterObject == 'bob'")
-    public Object[] methodReturningAnArray(Object[] someArray) {
-        return someArray;
-    }
+	@PostFilter("filterObject == 'bob'")
+	public Object[] methodReturningAnArray(Object[] someArray) {
+		return someArray;
+	}
 
-    @PreAuthorize("#x == 'x' and @number.intValue() == 1294 ")
-    public void methodWithBeanNamePropertyAccessExpression(String x) {
+	@PreAuthorize("#x == 'x' and @number.intValue() == 1294 ")
+	public void methodWithBeanNamePropertyAccessExpression(String x) {
 
-    }
+	}
 
-    public void rolesAllowedUser() {
+	public void rolesAllowedUser() {
 
-    }
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
index ada25cca71..d73f354529 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java
@@ -6,7 +6,6 @@ import java.util.List;
 import javax.annotation.security.RolesAllowed;
 import javax.annotation.security.PermitAll;
 
-
 /**
  *
  * @author Luke Taylor
@@ -14,44 +13,44 @@ import javax.annotation.security.PermitAll;
 @PermitAll
 public class Jsr250BusinessServiceImpl implements BusinessService {
 
-    @RolesAllowed("ROLE_USER")
-    public void someUserMethod1() {
-    }
+	@RolesAllowed("ROLE_USER")
+	public void someUserMethod1() {
+	}
 
-    @RolesAllowed("ROLE_USER")
-    public void someUserMethod2() {
-    }
+	@RolesAllowed("ROLE_USER")
+	public void someUserMethod2() {
+	}
 
-    @RolesAllowed({"ROLE_USER", "ROLE_ADMIN"})
-    public void someUserAndAdminMethod() {
-    }
+	@RolesAllowed({ "ROLE_USER", "ROLE_ADMIN" })
+	public void someUserAndAdminMethod() {
+	}
 
-    @RolesAllowed("ROLE_ADMIN")
-    public void someAdminMethod() {
-    }
+	@RolesAllowed("ROLE_ADMIN")
+	public void someAdminMethod() {
+	}
 
-    public int someOther(String input) {
-        return 0;
-    }
+	public int someOther(String input) {
+		return 0;
+	}
 
-    public int someOther(int input) {
-        return input;
-    }
+	public int someOther(int input) {
+		return input;
+	}
 
-    public List<?> methodReturningAList(List<?> someList) {
-        return someList;
-    }
+	public List<?> methodReturningAList(List<?> someList) {
+		return someList;
+	}
 
-    public List<?> methodReturningAList(String userName, String arg2) {
-        return new ArrayList<Object>();
-    }
+	public List<?> methodReturningAList(String userName, String arg2) {
+		return new ArrayList<Object>();
+	}
 
-    public Object[] methodReturningAnArray(Object[] someArray) {
-        return null;
-    }
+	public Object[] methodReturningAnArray(Object[] someArray) {
+		return null;
+	}
 
-    @RolesAllowed({"USER"})
-    public void rolesAllowedUser() {
+	@RolesAllowed({ "USER" })
+	public void rolesAllowedUser() {
 
-    }
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java
index 1fa8cd814e..93573c1620 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSourceTests.java
@@ -34,214 +34,249 @@ import org.springframework.security.access.intercept.method.MockMethodInvocation
  * @author Ben Alex
  */
 public class Jsr250MethodSecurityMetadataSourceTests {
-    Jsr250MethodSecurityMetadataSource mds;
-    A a;
-    UserAllowedClass userAllowed;
+	Jsr250MethodSecurityMetadataSource mds;
+	A a;
+	UserAllowedClass userAllowed;
 
-    @Before
-    public void setup() {
-        mds = new Jsr250MethodSecurityMetadataSource();
-        a = new A();
-        userAllowed = new UserAllowedClass();
-    }
+	@Before
+	public void setup() {
+		mds = new Jsr250MethodSecurityMetadataSource();
+		a = new A();
+		userAllowed = new UserAllowedClass();
+	}
 
-    private ConfigAttribute[] findAttributes(String methodName) throws Exception {
-        return mds.findAttributes(a.getClass().getMethod(methodName), null).toArray(new ConfigAttribute[0]);
-    }
+	private ConfigAttribute[] findAttributes(String methodName) throws Exception {
+		return mds.findAttributes(a.getClass().getMethod(methodName), null).toArray(
+				new ConfigAttribute[0]);
+	}
 
-    @Test
-    public void methodWithRolesAllowedHasCorrectAttribute() throws Exception {
-        ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("ROLE_ADMIN", accessAttributes[0].toString());
-    }
+	@Test
+	public void methodWithRolesAllowedHasCorrectAttribute() throws Exception {
+		ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("ROLE_ADMIN", accessAttributes[0].toString());
+	}
 
-    @Test
-    public void permitAllMethodHasPermitAllAttribute() throws Exception {
-        ConfigAttribute[] accessAttributes = findAttributes("permitAllMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("javax.annotation.security.PermitAll", accessAttributes[0].toString());
-    }
+	@Test
+	public void permitAllMethodHasPermitAllAttribute() throws Exception {
+		ConfigAttribute[] accessAttributes = findAttributes("permitAllMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("javax.annotation.security.PermitAll",
+				accessAttributes[0].toString());
+	}
 
-    @Test
-    public void noRoleMethodHasNoAttributes() throws Exception {
-        Collection<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass().getMethod("noRoleMethod"), null);
-        Assert.assertNull(accessAttributes);
-    }
+	@Test
+	public void noRoleMethodHasNoAttributes() throws Exception {
+		Collection<ConfigAttribute> accessAttributes = mds.findAttributes(a.getClass()
+				.getMethod("noRoleMethod"), null);
+		Assert.assertNull(accessAttributes);
+	}
 
-    @Test
-    public void classRoleIsAppliedToNoRoleMethod() throws Exception {
-        Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("noRoleMethod"), null);
-        Assert.assertNull(accessAttributes);
-    }
+	@Test
+	public void classRoleIsAppliedToNoRoleMethod() throws Exception {
+		Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed
+				.getClass().getMethod("noRoleMethod"), null);
+		Assert.assertNull(accessAttributes);
+	}
 
-    @Test
-    public void methodRoleOverridesClassRole() throws Exception {
-        Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed.getClass().getMethod("adminMethod"), null);
-        assertEquals(1, accessAttributes.size());
-        assertEquals("ROLE_ADMIN", accessAttributes.toArray()[0].toString());
-    }
+	@Test
+	public void methodRoleOverridesClassRole() throws Exception {
+		Collection<ConfigAttribute> accessAttributes = mds.findAttributes(userAllowed
+				.getClass().getMethod("adminMethod"), null);
+		assertEquals(1, accessAttributes.size());
+		assertEquals("ROLE_ADMIN", accessAttributes.toArray()[0].toString());
+	}
 
-    @Test
-    public void customDefaultRolePrefix() throws Exception {
-        mds.setDefaultRolePrefix("CUSTOMPREFIX_");
+	@Test
+	public void customDefaultRolePrefix() throws Exception {
+		mds.setDefaultRolePrefix("CUSTOMPREFIX_");
 
-        ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("CUSTOMPREFIX_ADMIN", accessAttributes[0].toString());
-    }
+		ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("CUSTOMPREFIX_ADMIN", accessAttributes[0].toString());
+	}
 
-    @Test
-    public void emptyDefaultRolePrefix() throws Exception {
-        mds.setDefaultRolePrefix("");
+	@Test
+	public void emptyDefaultRolePrefix() throws Exception {
+		mds.setDefaultRolePrefix("");
 
-        ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("ADMIN", accessAttributes[0].toString());
-    }
+		ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("ADMIN", accessAttributes[0].toString());
+	}
 
-    @Test
-    public void nullDefaultRolePrefix() throws Exception {
-        mds.setDefaultRolePrefix(null);
+	@Test
+	public void nullDefaultRolePrefix() throws Exception {
+		mds.setDefaultRolePrefix(null);
 
-        ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("ADMIN", accessAttributes[0].toString());
-    }
+		ConfigAttribute[] accessAttributes = findAttributes("adminMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("ADMIN", accessAttributes[0].toString());
+	}
 
-    @Test
-    public void alreadyHasDefaultPrefix() throws Exception {
-        ConfigAttribute[] accessAttributes = findAttributes("roleAdminMethod");
-        assertEquals(1, accessAttributes.length);
-        assertEquals("ROLE_ADMIN", accessAttributes[0].toString());
-    }
+	@Test
+	public void alreadyHasDefaultPrefix() throws Exception {
+		ConfigAttribute[] accessAttributes = findAttributes("roleAdminMethod");
+		assertEquals(1, accessAttributes.length);
+		assertEquals("ROLE_ADMIN", accessAttributes[0].toString());
+	}
 
-    // JSR-250 Spec Tests
+	// JSR-250 Spec Tests
 
-    /**
-     *  Class-level annotations only affect the class they annotate and their members, that
-     *  is, its methods and fields. They never affect a member declared by a superclass,
-     * even if it is not hidden or overridden by the class in question.
-     * @throws Exception
-     */
-    @Test
-    public void classLevelAnnotationsOnlyAffectTheClassTheyAnnotateAndTheirMembers() throws Exception {
-        Child target = new Child();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "notOverriden");
+	/**
+	 * Class-level annotations only affect the class they annotate and their members, that
+	 * is, its methods and fields. They never affect a member declared by a superclass,
+	 * even if it is not hidden or overridden by the class in question.
+	 * @throws Exception
+	 */
+	@Test
+	public void classLevelAnnotationsOnlyAffectTheClassTheyAnnotateAndTheirMembers()
+			throws Exception {
+		Child target = new Child();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"notOverriden");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertThat(accessAttributes).isNull();
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertThat(accessAttributes).isNull();
+	}
 
-    @Test
-    public void classLevelAnnotationsOnlyAffectTheClassTheyAnnotateAndTheirMembersOverriden() throws Exception {
-        Child target = new Child();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "overriden");
+	@Test
+	public void classLevelAnnotationsOnlyAffectTheClassTheyAnnotateAndTheirMembersOverriden()
+			throws Exception {
+		Child target = new Child();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"overriden");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertEquals(1, accessAttributes.size());
-        assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertEquals(1, accessAttributes.size());
+		assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
+	}
 
-    @Test
-    public void classLevelAnnotationsImpactMemberLevel() throws Exception {
-        Child target = new Child();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "defaults");
+	@Test
+	public void classLevelAnnotationsImpactMemberLevel() throws Exception {
+		Child target = new Child();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"defaults");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertEquals(1, accessAttributes.size());
-        assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertEquals(1, accessAttributes.size());
+		assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
+	}
 
-    @Test
-    public void classLevelAnnotationsIgnoredByExplicitMemberAnnotation() throws Exception {
-        Child target = new Child();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "explicitMethod");
+	@Test
+	public void classLevelAnnotationsIgnoredByExplicitMemberAnnotation() throws Exception {
+		Child target = new Child();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"explicitMethod");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertEquals(1, accessAttributes.size());
-        assertEquals("ROLE_EXPLICIT", accessAttributes.toArray()[0].toString());
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertEquals(1, accessAttributes.size());
+		assertEquals("ROLE_EXPLICIT", accessAttributes.toArray()[0].toString());
+	}
 
-    /**
-     * The interfaces implemented by a class never contribute annotations to the class
-     * itself or any of its members.
-     * @throws Exception
-     */
-    @Test
-    public void interfacesNeverContributeAnnotationsMethodLevel() throws Exception {
-        Parent target = new Parent();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "interfaceMethod");
+	/**
+	 * The interfaces implemented by a class never contribute annotations to the class
+	 * itself or any of its members.
+	 * @throws Exception
+	 */
+	@Test
+	public void interfacesNeverContributeAnnotationsMethodLevel() throws Exception {
+		Parent target = new Parent();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"interfaceMethod");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertThat(accessAttributes).isEmpty();
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertThat(accessAttributes).isEmpty();
+	}
 
-    @Test
-    public void interfacesNeverContributeAnnotationsClassLevel() throws Exception {
-        Parent target = new Parent();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "notOverriden");
+	@Test
+	public void interfacesNeverContributeAnnotationsClassLevel() throws Exception {
+		Parent target = new Parent();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"notOverriden");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertThat(accessAttributes).isEmpty();
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertThat(accessAttributes).isEmpty();
+	}
 
-    @Test
-    public void annotationsOnOverriddenMemberIgnored() throws Exception {
-        Child target = new Child();
-        MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(), "overridenIgnored");
+	@Test
+	public void annotationsOnOverriddenMemberIgnored() throws Exception {
+		Child target = new Child();
+		MockMethodInvocation mi = new MockMethodInvocation(target, target.getClass(),
+				"overridenIgnored");
 
-        Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
-        assertEquals(1, accessAttributes.size());
-        assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
-    }
+		Collection<ConfigAttribute> accessAttributes = mds.getAttributes(mi);
+		assertEquals(1, accessAttributes.size());
+		assertEquals("ROLE_DERIVED", accessAttributes.toArray()[0].toString());
+	}
 
-    //~ Inner Classes ======================================================================================================
+	// ~ Inner Classes
+	// ======================================================================================================
 
-    public static class A {
+	public static class A {
 
-        public void noRoleMethod() {}
+		public void noRoleMethod() {
+		}
 
-        @RolesAllowed("ADMIN")
-        public void adminMethod() {}
+		@RolesAllowed("ADMIN")
+		public void adminMethod() {
+		}
 
-        @RolesAllowed("ROLE_ADMIN")
-        public void roleAdminMethod() {}
+		@RolesAllowed("ROLE_ADMIN")
+		public void roleAdminMethod() {
+		}
 
-        @PermitAll
-        public void permitAllMethod() {}
-    }
+		@PermitAll
+		public void permitAllMethod() {
+		}
+	}
 
-    @RolesAllowed("USER")
-    public static class UserAllowedClass {
-        public void noRoleMethod() {}
+	@RolesAllowed("USER")
+	public static class UserAllowedClass {
+		public void noRoleMethod() {
+		}
 
-        @RolesAllowed("ADMIN")
-        public void adminMethod() {}
-    }
+		@RolesAllowed("ADMIN")
+		public void adminMethod() {
+		}
+	}
 
-    // JSR-250 Spec
+	// JSR-250 Spec
 
-    @RolesAllowed("IPARENT")
-    interface IParent {
-        @RolesAllowed("INTERFACEMETHOD")
-        void interfaceMethod();
-    }
+	@RolesAllowed("IPARENT")
+	interface IParent {
+		@RolesAllowed("INTERFACEMETHOD")
+		void interfaceMethod();
+	}
 
-    static class Parent implements IParent {
-        public void interfaceMethod() {}
-        public void notOverriden() {}
-        public void overriden() {}
-        @RolesAllowed("OVERRIDENIGNORED")
-        public void overridenIgnored() {}
-    }
+	static class Parent implements IParent {
+		public void interfaceMethod() {
+		}
 
-    @RolesAllowed("DERIVED")
-    class Child extends Parent {
-        public void overriden() {}
-        public void overridenIgnored() {}
-        public void defaults() {}
-        @RolesAllowed("EXPLICIT")
-        public void explicitMethod() {}
-    }
+		public void notOverriden() {
+		}
+
+		public void overriden() {
+		}
+
+		@RolesAllowed("OVERRIDENIGNORED")
+		public void overridenIgnored() {
+		}
+	}
+
+	@RolesAllowed("DERIVED")
+	class Child extends Parent {
+		public void overriden() {
+		}
+
+		public void overridenIgnored() {
+		}
+
+		public void defaults() {
+		}
+
+		@RolesAllowed("EXPLICIT")
+		public void explicitMethod() {
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java
index 96004cd040..7e41b30d3d 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java
@@ -17,28 +17,29 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
  */
 public class Jsr250VoterTests {
 
-    // SEC-1443
-    @Test
-    public void supportsMultipleRolesCorrectly() throws Exception {
-        List<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>();
-        Jsr250Voter voter = new Jsr250Voter();
+	// SEC-1443
+	@Test
+	public void supportsMultipleRolesCorrectly() throws Exception {
+		List<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>();
+		Jsr250Voter voter = new Jsr250Voter();
 
-        attrs.add(new Jsr250SecurityConfig("A"));
-        attrs.add(new Jsr250SecurityConfig("B"));
-        attrs.add(new Jsr250SecurityConfig("C"));
+		attrs.add(new Jsr250SecurityConfig("A"));
+		attrs.add(new Jsr250SecurityConfig("B"));
+		attrs.add(new Jsr250SecurityConfig("C"));
 
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
-                voter.vote(new TestingAuthenticationToken("user", "pwd", "A"), new Object(), attrs));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
-                voter.vote(new TestingAuthenticationToken("user", "pwd", "B"), new Object(), attrs));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
-                voter.vote(new TestingAuthenticationToken("user", "pwd", "C"), new Object(), attrs));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(
+				new TestingAuthenticationToken("user", "pwd", "A"), new Object(), attrs));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(
+				new TestingAuthenticationToken("user", "pwd", "B"), new Object(), attrs));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(
+				new TestingAuthenticationToken("user", "pwd", "C"), new Object(), attrs));
 
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED,
-                voter.vote(new TestingAuthenticationToken("user", "pwd", "NONE"), new Object(), attrs));
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(
+				new TestingAuthenticationToken("user", "pwd", "NONE"), new Object(),
+				attrs));
 
-        assertEquals(AccessDecisionVoter.ACCESS_ABSTAIN,
-                voter.vote(new TestingAuthenticationToken("user", "pwd", "A"), new Object(),
-                        SecurityConfig.createList("A","B","C")));
-    }
+		assertEquals(AccessDecisionVoter.ACCESS_ABSTAIN, voter.vote(
+				new TestingAuthenticationToken("user", "pwd", "A"), new Object(),
+				SecurityConfig.createList("A", "B", "C")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java
index eda1e6755d..dbba82f9ab 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java
@@ -38,9 +38,9 @@ import org.springframework.security.access.annotation.sec2150.MethodInvocationFa
 import org.springframework.security.access.intercept.method.MockMethodInvocation;
 import org.springframework.security.core.GrantedAuthority;
 
-
 /**
- * Tests for {@link org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource}
+ * Tests for
+ * {@link org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource}
  *
  * @author Mark St.Godard
  * @author Joe Scalise
@@ -48,234 +48,263 @@ import org.springframework.security.core.GrantedAuthority;
  * @author Luke Taylor
  */
 public class SecuredAnnotationSecurityMetadataSourceTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource();
+	private SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void genericsSuperclassDeclarationsAreIncludedWhenSubclassesOverride() {
-        Method method = null;
+	@Test
+	public void genericsSuperclassDeclarationsAreIncludedWhenSubclassesOverride() {
+		Method method = null;
 
-        try {
-            method = DepartmentServiceImpl.class.getMethod("someUserMethod3", new Class[] {Department.class});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a superMethod called 'someUserMethod3' on class!");
-        }
+		try {
+			method = DepartmentServiceImpl.class.getMethod("someUserMethod3",
+					new Class[] { Department.class });
+		}
+		catch (NoSuchMethodException unexpected) {
+			fail("Should be a superMethod called 'someUserMethod3' on class!");
+		}
 
-        Collection<ConfigAttribute> attrs = mds.findAttributes(method, DepartmentServiceImpl.class);
+		Collection<ConfigAttribute> attrs = mds.findAttributes(method,
+				DepartmentServiceImpl.class);
 
-        assertNotNull(attrs);
+		assertNotNull(attrs);
 
-        // expect 1 attribute
-        assertTrue("Did not find 1 attribute", attrs.size() == 1);
+		// expect 1 attribute
+		assertTrue("Did not find 1 attribute", attrs.size() == 1);
 
-        // should have 1 SecurityConfig
-        for (ConfigAttribute sc : attrs) {
-            assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
-        }
+		// should have 1 SecurityConfig
+		for (ConfigAttribute sc : attrs) {
+			assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
+		}
 
-        Method superMethod = null;
+		Method superMethod = null;
 
-        try {
-            superMethod = DepartmentServiceImpl.class.getMethod("someUserMethod3", new Class[] {Entity.class});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a superMethod called 'someUserMethod3' on class!");
-        }
+		try {
+			superMethod = DepartmentServiceImpl.class.getMethod("someUserMethod3",
+					new Class[] { Entity.class });
+		}
+		catch (NoSuchMethodException unexpected) {
+			fail("Should be a superMethod called 'someUserMethod3' on class!");
+		}
 
-        Collection<ConfigAttribute> superAttrs = this.mds.findAttributes(superMethod, DepartmentServiceImpl.class);
+		Collection<ConfigAttribute> superAttrs = this.mds.findAttributes(superMethod,
+				DepartmentServiceImpl.class);
 
-        assertNotNull(superAttrs);
+		assertNotNull(superAttrs);
 
-        // This part of the test relates to SEC-274
-        // expect 1 attribute
-        assertEquals("Did not find 1 attribute", 1, superAttrs.size());
-        // should have 1 SecurityConfig
-        for (ConfigAttribute sc : superAttrs) {
-            assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
-        }
-    }
+		// This part of the test relates to SEC-274
+		// expect 1 attribute
+		assertEquals("Did not find 1 attribute", 1, superAttrs.size());
+		// should have 1 SecurityConfig
+		for (ConfigAttribute sc : superAttrs) {
+			assertEquals("Found an incorrect role", "ROLE_ADMIN", sc.getAttribute());
+		}
+	}
 
-    @Test
-    public void classLevelAttributesAreFound() {
-        Collection<ConfigAttribute> attrs = this.mds.findAttributes(BusinessService.class);
+	@Test
+	public void classLevelAttributesAreFound() {
+		Collection<ConfigAttribute> attrs = this.mds
+				.findAttributes(BusinessService.class);
 
-        assertNotNull(attrs);
+		assertNotNull(attrs);
 
-        // expect 1 annotation
-        assertEquals(1, attrs.size());
+		// expect 1 annotation
+		assertEquals(1, attrs.size());
 
-        // should have 1 SecurityConfig
-        SecurityConfig sc = (SecurityConfig) attrs.toArray()[0];
+		// should have 1 SecurityConfig
+		SecurityConfig sc = (SecurityConfig) attrs.toArray()[0];
 
-        assertEquals("ROLE_USER", sc.getAttribute());
-    }
+		assertEquals("ROLE_USER", sc.getAttribute());
+	}
 
-    @Test
-    public void methodLevelAttributesAreFound() {
-        Method method = null;
+	@Test
+	public void methodLevelAttributesAreFound() {
+		Method method = null;
 
-        try {
-            method = BusinessService.class.getMethod("someUserAndAdminMethod", new Class[] {});
-        } catch (NoSuchMethodException unexpected) {
-            fail("Should be a method called 'someUserAndAdminMethod' on class!");
-        }
+		try {
+			method = BusinessService.class.getMethod("someUserAndAdminMethod",
+					new Class[] {});
+		}
+		catch (NoSuchMethodException unexpected) {
+			fail("Should be a method called 'someUserAndAdminMethod' on class!");
+		}
 
-        Collection<ConfigAttribute> attrs = this.mds.findAttributes(method, BusinessService.class);
+		Collection<ConfigAttribute> attrs = this.mds.findAttributes(method,
+				BusinessService.class);
 
-        assertNotNull(attrs);
+		assertNotNull(attrs);
 
-        // expect 2 attributes
-        assertEquals(2, attrs.size());
+		// expect 2 attributes
+		assertEquals(2, attrs.size());
 
-        boolean user = false;
-        boolean admin = false;
+		boolean user = false;
+		boolean admin = false;
 
-        // should have 2 SecurityConfigs
-        for (ConfigAttribute sc : attrs) {
-            assertTrue(sc instanceof SecurityConfig);
+		// should have 2 SecurityConfigs
+		for (ConfigAttribute sc : attrs) {
+			assertTrue(sc instanceof SecurityConfig);
 
-            if (sc.getAttribute().equals("ROLE_USER")) {
-                user = true;
-            } else if (sc.getAttribute().equals("ROLE_ADMIN")) {
-                admin = true;
-            }
-        }
+			if (sc.getAttribute().equals("ROLE_USER")) {
+				user = true;
+			}
+			else if (sc.getAttribute().equals("ROLE_ADMIN")) {
+				admin = true;
+			}
+		}
 
-        // expect to have ROLE_USER and ROLE_ADMIN
-        assertTrue(user && admin);
-    }
+		// expect to have ROLE_USER and ROLE_ADMIN
+		assertTrue(user && admin);
+	}
 
-    // SEC-1491
-    @Test
-    public void customAnnotationAttributesAreFound() throws Exception {
-        SecuredAnnotationSecurityMetadataSource mds =
-                new SecuredAnnotationSecurityMetadataSource(new CustomSecurityAnnotationMetadataExtractor());
-        Collection<ConfigAttribute> attrs = mds.findAttributes(CustomAnnotatedService.class);
-        assertEquals(1, attrs.size());
-        assertEquals(SecurityEnum.ADMIN, attrs.toArray()[0]);
-    }
+	// SEC-1491
+	@Test
+	public void customAnnotationAttributesAreFound() throws Exception {
+		SecuredAnnotationSecurityMetadataSource mds = new SecuredAnnotationSecurityMetadataSource(
+				new CustomSecurityAnnotationMetadataExtractor());
+		Collection<ConfigAttribute> attrs = mds
+				.findAttributes(CustomAnnotatedService.class);
+		assertEquals(1, attrs.size());
+		assertEquals(SecurityEnum.ADMIN, attrs.toArray()[0]);
+	}
 
-    @Test
-    public void annotatedAnnotationAtClassLevelIsDetected() throws Exception {
-        MockMethodInvocation annotatedAtClassLevel = new MockMethodInvocation(new AnnotatedAnnotationAtClassLevel(), ReturnVoid.class, "doSomething", List.class);
+	@Test
+	public void annotatedAnnotationAtClassLevelIsDetected() throws Exception {
+		MockMethodInvocation annotatedAtClassLevel = new MockMethodInvocation(
+				new AnnotatedAnnotationAtClassLevel(), ReturnVoid.class, "doSomething",
+				List.class);
 
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(new ConfigAttribute[0]);
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertEquals("CUSTOM", attrs[0].getAttribute());
-    }
+		assertEquals(1, attrs.length);
+		assertEquals("CUSTOM", attrs[0].getAttribute());
+	}
 
-    @Test
-    public void annotatedAnnotationAtInterfaceLevelIsDetected() throws Exception {
-        MockMethodInvocation annotatedAtInterfaceLevel = new MockMethodInvocation(new AnnotatedAnnotationAtInterfaceLevel(), ReturnVoid2.class, "doSomething", List.class);
+	@Test
+	public void annotatedAnnotationAtInterfaceLevelIsDetected() throws Exception {
+		MockMethodInvocation annotatedAtInterfaceLevel = new MockMethodInvocation(
+				new AnnotatedAnnotationAtInterfaceLevel(), ReturnVoid2.class,
+				"doSomething", List.class);
 
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(new ConfigAttribute[0]);
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertEquals("CUSTOM", attrs[0].getAttribute());
-    }
+		assertEquals(1, attrs.length);
+		assertEquals("CUSTOM", attrs[0].getAttribute());
+	}
 
-    @Test
-    public void annotatedAnnotationAtMethodLevelIsDetected() throws Exception {
-        MockMethodInvocation annotatedAtMethodLevel = new MockMethodInvocation(new AnnotatedAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething", List.class);
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(new ConfigAttribute[0]);
+	@Test
+	public void annotatedAnnotationAtMethodLevelIsDetected() throws Exception {
+		MockMethodInvocation annotatedAtMethodLevel = new MockMethodInvocation(
+				new AnnotatedAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething",
+				List.class);
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertEquals("CUSTOM", attrs[0].getAttribute());
-    }
+		assertEquals(1, attrs.length);
+		assertEquals("CUSTOM", attrs[0].getAttribute());
+	}
 
-    @Test
-    public void proxyFactoryInterfaceAttributesFound() throws Exception {
-        MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation();
-        Collection<ConfigAttribute> attributes = mds.getAttributes(mi);
-        assertThat(attributes.size()).isEqualTo(1);
-        assertThat(attributes).onProperty("attribute").containsOnly("ROLE_PERSON");
-    }
+	@Test
+	public void proxyFactoryInterfaceAttributesFound() throws Exception {
+		MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation();
+		Collection<ConfigAttribute> attributes = mds.getAttributes(mi);
+		assertThat(attributes.size()).isEqualTo(1);
+		assertThat(attributes).onProperty("attribute").containsOnly("ROLE_PERSON");
+	}
 
-    // Inner classes
-    class Department extends Entity {
-        public Department(String name) {
-            super(name);
-        }
-    }
+	// Inner classes
+	class Department extends Entity {
+		public Department(String name) {
+			super(name);
+		}
+	}
 
-    interface DepartmentService extends BusinessService {
-        @Secured({"ROLE_USER"})
-        Department someUserMethod3(Department dept);
-    }
+	interface DepartmentService extends BusinessService {
+		@Secured({ "ROLE_USER" })
+		Department someUserMethod3(Department dept);
+	}
 
-    @SuppressWarnings("serial")
-    class DepartmentServiceImpl extends BusinessServiceImpl<Department> implements DepartmentService {
-        @Secured({"ROLE_ADMIN"})
-        public Department someUserMethod3(final Department dept) {
-            return super.someUserMethod3(dept);
-        }
-    }
+	@SuppressWarnings("serial")
+	class DepartmentServiceImpl extends BusinessServiceImpl<Department> implements
+			DepartmentService {
+		@Secured({ "ROLE_ADMIN" })
+		public Department someUserMethod3(final Department dept) {
+			return super.someUserMethod3(dept);
+		}
+	}
 
-    // SEC-1491 Related classes. PoC for custom annotation with enum value.
+	// SEC-1491 Related classes. PoC for custom annotation with enum value.
 
-    @CustomSecurityAnnotation(SecurityEnum.ADMIN)
-    interface CustomAnnotatedService {
-    }
+	@CustomSecurityAnnotation(SecurityEnum.ADMIN)
+	interface CustomAnnotatedService {
+	}
 
-    class CustomAnnotatedServiceImpl implements CustomAnnotatedService {
-    }
+	class CustomAnnotatedServiceImpl implements CustomAnnotatedService {
+	}
 
-    enum SecurityEnum implements ConfigAttribute, GrantedAuthority {
-        ADMIN,
-        USER;
+	enum SecurityEnum implements ConfigAttribute, GrantedAuthority {
+		ADMIN, USER;
 
-        public String getAttribute() {
-            return toString();
-        }
+		public String getAttribute() {
+			return toString();
+		}
 
-        public String getAuthority() {
-            return toString();
-        }
-    }
+		public String getAuthority() {
+			return toString();
+		}
+	}
 
-    @Target({ElementType.METHOD, ElementType.TYPE})
-    @Retention(RetentionPolicy.RUNTIME)
-    @interface CustomSecurityAnnotation {
-        SecurityEnum[] value();
-    }
+	@Target({ ElementType.METHOD, ElementType.TYPE })
+	@Retention(RetentionPolicy.RUNTIME)
+	@interface CustomSecurityAnnotation {
+		SecurityEnum[] value();
+	}
 
-    class CustomSecurityAnnotationMetadataExtractor implements AnnotationMetadataExtractor<CustomSecurityAnnotation> {
-        public Collection<? extends ConfigAttribute> extractAttributes(CustomSecurityAnnotation securityAnnotation) {
-            SecurityEnum[] values = securityAnnotation.value();
+	class CustomSecurityAnnotationMetadataExtractor implements
+			AnnotationMetadataExtractor<CustomSecurityAnnotation> {
+		public Collection<? extends ConfigAttribute> extractAttributes(
+				CustomSecurityAnnotation securityAnnotation) {
+			SecurityEnum[] values = securityAnnotation.value();
 
-            return EnumSet.copyOf(Arrays.asList(values));
-        }
-    }
+			return EnumSet.copyOf(Arrays.asList(values));
+		}
+	}
 
-    @Target({ ElementType.METHOD, ElementType.TYPE })
-    @Retention(RetentionPolicy.RUNTIME)
-    @Inherited
-    @Secured("CUSTOM")
-    public @interface AnnotatedAnnotation {}
+	@Target({ ElementType.METHOD, ElementType.TYPE })
+	@Retention(RetentionPolicy.RUNTIME)
+	@Inherited
+	@Secured("CUSTOM")
+	public @interface AnnotatedAnnotation {
+	}
 
-    public static interface ReturnVoid {
-        public void doSomething(List<?> param);
-    }
+	public static interface ReturnVoid {
+		public void doSomething(List<?> param);
+	}
 
-    @AnnotatedAnnotation
-    public static interface ReturnVoid2 {
-        public void doSomething(List<?> param);
-    }
+	@AnnotatedAnnotation
+	public static interface ReturnVoid2 {
+		public void doSomething(List<?> param);
+	}
 
-    @AnnotatedAnnotation
-    public static class AnnotatedAnnotationAtClassLevel implements ReturnVoid {
-        public void doSomething(List<?> param) {}
-    }
+	@AnnotatedAnnotation
+	public static class AnnotatedAnnotationAtClassLevel implements ReturnVoid {
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    public static class AnnotatedAnnotationAtInterfaceLevel implements ReturnVoid2 {
-        public void doSomething(List<?> param) {}
-    }
+	public static class AnnotatedAnnotationAtInterfaceLevel implements ReturnVoid2 {
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    public static class AnnotatedAnnotationAtMethodLevel implements ReturnVoid {
-        @AnnotatedAnnotation
-        public void doSomething(List<?> param) {}
-    }
+	public static class AnnotatedAnnotationAtMethodLevel implements ReturnVoid {
+		@AnnotatedAnnotation
+		public void doSomething(List<?> param) {
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/sec2150/CrudRepository.java b/core/src/test/java/org/springframework/security/access/annotation/sec2150/CrudRepository.java
index 11a70310f4..1eb950e22c 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/sec2150/CrudRepository.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/sec2150/CrudRepository.java
@@ -17,5 +17,5 @@ package org.springframework.security.access.annotation.sec2150;
 
 public interface CrudRepository {
 
-    Iterable<Object> findAll();
+	Iterable<Object> findAll();
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/access/annotation/sec2150/MethodInvocationFactory.java b/core/src/test/java/org/springframework/security/access/annotation/sec2150/MethodInvocationFactory.java
index 65cca0dcfc..1bf2e30b7e 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/sec2150/MethodInvocationFactory.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/sec2150/MethodInvocationFactory.java
@@ -20,17 +20,18 @@ import org.springframework.security.access.intercept.method.MockMethodInvocation
 
 public class MethodInvocationFactory {
 
-    /**
-     * In order to reproduce the bug for SEC-2150, we must have a proxy object
-     * that implements TargetSourceAware and implements our annotated interface.
-     *
-     * @return
-     * @throws NoSuchMethodException
-     */
-    public static MockMethodInvocation createSec2150MethodInvocation() throws NoSuchMethodException {
-        ProxyFactory factory = new ProxyFactory(new Class[] {PersonRepository.class});
-        factory.setTargetClass(CrudRepository.class);
-        PersonRepository repository = (PersonRepository) factory.getProxy();
-        return new MockMethodInvocation(repository, PersonRepository.class , "findAll");
-    }
+	/**
+	 * In order to reproduce the bug for SEC-2150, we must have a proxy object that
+	 * implements TargetSourceAware and implements our annotated interface.
+	 *
+	 * @return
+	 * @throws NoSuchMethodException
+	 */
+	public static MockMethodInvocation createSec2150MethodInvocation()
+			throws NoSuchMethodException {
+		ProxyFactory factory = new ProxyFactory(new Class[] { PersonRepository.class });
+		factory.setTargetClass(CrudRepository.class);
+		PersonRepository repository = (PersonRepository) factory.getProxy();
+		return new MockMethodInvocation(repository, PersonRepository.class, "findAll");
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/annotation/sec2150/PersonRepository.java b/core/src/test/java/org/springframework/security/access/annotation/sec2150/PersonRepository.java
index c7d80ec446..31b189dce0 100644
--- a/core/src/test/java/org/springframework/security/access/annotation/sec2150/PersonRepository.java
+++ b/core/src/test/java/org/springframework/security/access/annotation/sec2150/PersonRepository.java
@@ -19,12 +19,13 @@ import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.access.prepost.PreAuthorize;
 
 /**
- * Note that JSR-256 states that annotations have no impact when placed on
- * interfaces, so SEC-2150 is not impacted by JSR-256 support.
+ * Note that JSR-256 states that annotations have no impact when placed on interfaces, so
+ * SEC-2150 is not impacted by JSR-256 support.
  *
  * @author Rob Winch
  *
  */
 @Secured("ROLE_PERSON")
 @PreAuthorize("hasRole('ROLE_PERSON')")
-public interface PersonRepository extends CrudRepository {}
\ No newline at end of file
+public interface PersonRepository extends CrudRepository {
+}
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java
index 5e2dd70500..9d9bd1ccba 100644
--- a/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/AbstractSecurityExpressionHandlerTests.java
@@ -16,49 +16,54 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  */
 public class AbstractSecurityExpressionHandlerTests {
-    private AbstractSecurityExpressionHandler<Object> handler;
+	private AbstractSecurityExpressionHandler<Object> handler;
 
-    @Before
-    public void setUp() throws Exception {
-        handler = new AbstractSecurityExpressionHandler<Object>() {
-            @Override
-            protected SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, Object o) {
-                return new SecurityExpressionRoot(authentication) {};
-            }
-        };
-    }
+	@Before
+	public void setUp() throws Exception {
+		handler = new AbstractSecurityExpressionHandler<Object>() {
+			@Override
+			protected SecurityExpressionOperations createSecurityExpressionRoot(
+					Authentication authentication, Object o) {
+				return new SecurityExpressionRoot(authentication) {
+				};
+			}
+		};
+	}
 
-    @Test
-    public void beanNamesAreCorrectlyResolved() throws Exception {
-        handler.setApplicationContext(new AnnotationConfigApplicationContext(TestConfiguration.class));
+	@Test
+	public void beanNamesAreCorrectlyResolved() throws Exception {
+		handler.setApplicationContext(new AnnotationConfigApplicationContext(
+				TestConfiguration.class));
 
-        Expression expression = handler.getExpressionParser().parseExpression("@number10.compareTo(@number20) < 0");
-        assertTrue((Boolean) expression.getValue(handler.createEvaluationContext(mock(Authentication.class), new Object())));
-    }
+		Expression expression = handler.getExpressionParser().parseExpression(
+				"@number10.compareTo(@number20) < 0");
+		assertTrue((Boolean) expression.getValue(handler.createEvaluationContext(
+				mock(Authentication.class), new Object())));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void setExpressionParserNull() {
-        handler.setExpressionParser(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setExpressionParserNull() {
+		handler.setExpressionParser(null);
+	}
 
-    @Test
-    public void setExpressionParser() {
-        SpelExpressionParser parser = new SpelExpressionParser();
-        handler.setExpressionParser(parser);
-        assertTrue(parser == handler.getExpressionParser());
-    }
+	@Test
+	public void setExpressionParser() {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		handler.setExpressionParser(parser);
+		assertTrue(parser == handler.getExpressionParser());
+	}
 }
 
 @Configuration
 class TestConfiguration {
 
-    @Bean
-    Integer number10() {
-        return 10;
-    }
+	@Bean
+	Integer number10() {
+		return 10;
+	}
 
-    @Bean
-    Integer number20() {
-        return 20;
-    }
+	@Bean
+	Integer number20() {
+		return 20;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java
index dfe0270ab4..8b6bef0250 100644
--- a/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/SecurityExpressionRootTests.java
@@ -22,107 +22,112 @@ import org.springframework.security.core.authority.AuthorityUtils;
  * @since 3.0
  */
 public class SecurityExpressionRootTests {
-    final static Authentication JOE = new TestingAuthenticationToken("joe", "pass", "ROLE_A", "ROLE_B");
+	final static Authentication JOE = new TestingAuthenticationToken("joe", "pass",
+			"ROLE_A", "ROLE_B");
 
-    SecurityExpressionRoot root;
+	SecurityExpressionRoot root;
 
-    @Before
-    public void setup() {
-        root = new SecurityExpressionRoot(JOE) {};
-    }
+	@Before
+	public void setup() {
+		root = new SecurityExpressionRoot(JOE) {
+		};
+	}
 
-    @Test
-    public void denyAllIsFalsePermitAllTrue() throws Exception {
-        assertFalse(root.denyAll());
-        assertFalse(root.denyAll);
-        assertTrue(root.permitAll());
-        assertTrue(root.permitAll);
-    }
+	@Test
+	public void denyAllIsFalsePermitAllTrue() throws Exception {
+		assertFalse(root.denyAll());
+		assertFalse(root.denyAll);
+		assertTrue(root.permitAll());
+		assertTrue(root.permitAll);
+	}
 
-    @Test
-    public void rememberMeIsCorrectlyDetected() throws Exception {
-        AuthenticationTrustResolver atr = mock(AuthenticationTrustResolver.class);
-        root.setTrustResolver(atr);
-        when(atr.isRememberMe(JOE)).thenReturn(true);
-        assertTrue(root.isRememberMe());
-        assertFalse(root.isFullyAuthenticated());
-    }
+	@Test
+	public void rememberMeIsCorrectlyDetected() throws Exception {
+		AuthenticationTrustResolver atr = mock(AuthenticationTrustResolver.class);
+		root.setTrustResolver(atr);
+		when(atr.isRememberMe(JOE)).thenReturn(true);
+		assertTrue(root.isRememberMe());
+		assertFalse(root.isFullyAuthenticated());
+	}
 
-    @Test
-    public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() throws Exception {
-        root.setRoleHierarchy(new RoleHierarchy() {
-            public Collection<GrantedAuthority> getReachableGrantedAuthorities(Collection<? extends GrantedAuthority> authorities) {
-                return AuthorityUtils.createAuthorityList("ROLE_C");
-            }
-        });
+	@Test
+	public void roleHierarchySupportIsCorrectlyUsedInEvaluatingRoles() throws Exception {
+		root.setRoleHierarchy(new RoleHierarchy() {
+			public Collection<GrantedAuthority> getReachableGrantedAuthorities(
+					Collection<? extends GrantedAuthority> authorities) {
+				return AuthorityUtils.createAuthorityList("ROLE_C");
+			}
+		});
 
-        assertTrue(root.hasRole("C"));
-        assertTrue(root.hasAuthority("ROLE_C"));
-        assertFalse(root.hasRole("A"));
-        assertFalse(root.hasRole("B"));
-        assertTrue(root.hasAnyRole("C", "A", "B"));
-        assertTrue(root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B"));
-        assertFalse(root.hasAnyRole("A", "B"));
-    }
+		assertTrue(root.hasRole("C"));
+		assertTrue(root.hasAuthority("ROLE_C"));
+		assertFalse(root.hasRole("A"));
+		assertFalse(root.hasRole("B"));
+		assertTrue(root.hasAnyRole("C", "A", "B"));
+		assertTrue(root.hasAnyAuthority("ROLE_C", "ROLE_A", "ROLE_B"));
+		assertFalse(root.hasAnyRole("A", "B"));
+	}
 
-    @Test
-    public void hasRoleAddsDefaultPrefix() throws Exception {
-        assertThat(root.hasRole("A")).isTrue();
-        assertThat(root.hasRole("NO")).isFalse();
-    }
+	@Test
+	public void hasRoleAddsDefaultPrefix() throws Exception {
+		assertThat(root.hasRole("A")).isTrue();
+		assertThat(root.hasRole("NO")).isFalse();
+	}
 
-    @Test
-    public void hasRoleEmptyPrefixDoesNotAddsDefaultPrefix() throws Exception {
-        root.setDefaultRolePrefix("");
-        assertThat(root.hasRole("A")).isFalse();
-        assertThat(root.hasRole("ROLE_A")).isTrue();
-    }
+	@Test
+	public void hasRoleEmptyPrefixDoesNotAddsDefaultPrefix() throws Exception {
+		root.setDefaultRolePrefix("");
+		assertThat(root.hasRole("A")).isFalse();
+		assertThat(root.hasRole("ROLE_A")).isTrue();
+	}
 
-    @Test
-    public void hasRoleNullPrefixDoesNotAddsDefaultPrefix() throws Exception {
-        root.setDefaultRolePrefix(null);
-        assertThat(root.hasRole("A")).isFalse();
-        assertThat(root.hasRole("ROLE_A")).isTrue();
-    }
+	@Test
+	public void hasRoleNullPrefixDoesNotAddsDefaultPrefix() throws Exception {
+		root.setDefaultRolePrefix(null);
+		assertThat(root.hasRole("A")).isFalse();
+		assertThat(root.hasRole("ROLE_A")).isTrue();
+	}
 
-    @Test
-    public void hasRoleDoesNotAddDefaultPrefixForAlreadyPrefixedRoles() throws Exception {
-        SecurityExpressionRoot root = new SecurityExpressionRoot(JOE) {};
+	@Test
+	public void hasRoleDoesNotAddDefaultPrefixForAlreadyPrefixedRoles() throws Exception {
+		SecurityExpressionRoot root = new SecurityExpressionRoot(JOE) {
+		};
 
-        assertThat(root.hasRole("ROLE_A")).isTrue();
-        assertThat(root.hasRole("ROLE_NO")).isFalse();
-    }
+		assertThat(root.hasRole("ROLE_A")).isTrue();
+		assertThat(root.hasRole("ROLE_NO")).isFalse();
+	}
 
-    @Test
-    public void hasAnyRoleAddsDefaultPrefix() throws Exception {
-        assertThat(root.hasAnyRole("NO","A")).isTrue();
-        assertThat(root.hasAnyRole("NO","NOT")).isFalse();
-    }
+	@Test
+	public void hasAnyRoleAddsDefaultPrefix() throws Exception {
+		assertThat(root.hasAnyRole("NO", "A")).isTrue();
+		assertThat(root.hasAnyRole("NO", "NOT")).isFalse();
+	}
 
-    @Test
-    public void hasAnyRoleDoesNotAddDefaultPrefixForAlreadyPrefixedRoles() throws Exception {
-        assertThat(root.hasAnyRole("ROLE_NO","ROLE_A")).isTrue();
-        assertThat(root.hasAnyRole("ROLE_NO","ROLE_NOT")).isFalse();
-    }
+	@Test
+	public void hasAnyRoleDoesNotAddDefaultPrefixForAlreadyPrefixedRoles()
+			throws Exception {
+		assertThat(root.hasAnyRole("ROLE_NO", "ROLE_A")).isTrue();
+		assertThat(root.hasAnyRole("ROLE_NO", "ROLE_NOT")).isFalse();
+	}
 
-    @Test
-    public void hasAnyRoleEmptyPrefixDoesNotAddsDefaultPrefix() throws Exception {
-        root.setDefaultRolePrefix("");
-        assertThat(root.hasRole("A")).isFalse();
-        assertThat(root.hasRole("ROLE_A")).isTrue();
-    }
+	@Test
+	public void hasAnyRoleEmptyPrefixDoesNotAddsDefaultPrefix() throws Exception {
+		root.setDefaultRolePrefix("");
+		assertThat(root.hasRole("A")).isFalse();
+		assertThat(root.hasRole("ROLE_A")).isTrue();
+	}
 
-    @Test
-    public void hasAnyRoleNullPrefixDoesNotAddsDefaultPrefix() throws Exception {
-        root.setDefaultRolePrefix(null);
-        assertThat(root.hasAnyRole("A")).isFalse();
-        assertThat(root.hasAnyRole("ROLE_A")).isTrue();
-    }
+	@Test
+	public void hasAnyRoleNullPrefixDoesNotAddsDefaultPrefix() throws Exception {
+		root.setDefaultRolePrefix(null);
+		assertThat(root.hasAnyRole("A")).isFalse();
+		assertThat(root.hasAnyRole("ROLE_A")).isTrue();
+	}
 
-    @Test
-    public void hasAuthorityDoesNotAddDefaultPrefix() throws Exception {
-        assertThat(root.hasAuthority("A")).isFalse();
-        assertThat(root.hasAnyAuthority("NO","A")).isFalse();
-        assertThat(root.hasAnyAuthority("ROLE_A","NOT")).isTrue();
-    }
+	@Test
+	public void hasAuthorityDoesNotAddDefaultPrefix() throws Exception {
+		assertThat(root.hasAuthority("A")).isFalse();
+		assertThat(root.hasAnyAuthority("NO", "A")).isFalse();
+		assertThat(root.hasAnyAuthority("ROLE_A", "NOT")).isTrue();
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java
index 8ce92aa217..f1d724e3fc 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java
@@ -17,38 +17,40 @@ import org.springframework.security.core.context.SecurityContextHolder;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultMethodSecurityExpressionHandlerTests {
-    private DefaultMethodSecurityExpressionHandler handler;
+	private DefaultMethodSecurityExpressionHandler handler;
 
-    @Mock
-    private Authentication authentication;
-    @Mock
-    private MethodInvocation methodInvocation;
-    @Mock
-    private AuthenticationTrustResolver trustResolver;
+	@Mock
+	private Authentication authentication;
+	@Mock
+	private MethodInvocation methodInvocation;
+	@Mock
+	private AuthenticationTrustResolver trustResolver;
 
-    @Before
-    public void setup() {
-        handler = new DefaultMethodSecurityExpressionHandler();
-    }
+	@Before
+	public void setup() {
+		handler = new DefaultMethodSecurityExpressionHandler();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setTrustResolverNull() {
-        handler.setTrustResolver(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setTrustResolverNull() {
+		handler.setTrustResolver(null);
+	}
 
-    @Test
-    public void createEvaluationContextCustomTrustResolver() {
-        handler.setTrustResolver(trustResolver);
+	@Test
+	public void createEvaluationContextCustomTrustResolver() {
+		handler.setTrustResolver(trustResolver);
 
-        Expression expression = handler.getExpressionParser().parseExpression("anonymous");
-        EvaluationContext context = handler.createEvaluationContext(authentication, methodInvocation);
-        expression.getValue(context, Boolean.class);
+		Expression expression = handler.getExpressionParser()
+				.parseExpression("anonymous");
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				methodInvocation);
+		expression.getValue(context, Boolean.class);
 
-        verify(trustResolver).isAnonymous(authentication);
-    }
+		verify(trustResolver).isAnonymous(authentication);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
index 1a2b7f8453..20e4ac7162 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
@@ -19,120 +19,147 @@ import org.springframework.security.util.SimpleMethodInvocation;
 
 @SuppressWarnings("unchecked")
 public class MethodExpressionVoterTests {
-    private TestingAuthenticationToken joe = new TestingAuthenticationToken("joe", "joespass", "ROLE_blah");
-    private PreInvocationAuthorizationAdviceVoter am =
-        new PreInvocationAuthorizationAdviceVoter(new ExpressionBasedPreInvocationAdvice());
+	private TestingAuthenticationToken joe = new TestingAuthenticationToken("joe",
+			"joespass", "ROLE_blah");
+	private PreInvocationAuthorizationAdviceVoter am = new PreInvocationAuthorizationAdviceVoter(
+			new ExpressionBasedPreInvocationAdvice());
 
-    @Test
-    public void hasRoleExpressionAllowsUserWithRole() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray());
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, "hasRole('blah')"))));
-    }
+	@Test
+	public void hasRoleExpressionAllowsUserWithRole() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingAnArray());
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi,
+				createAttributes(new PreInvocationExpressionAttribute(null, null,
+						"hasRole('blah')"))));
+	}
 
-    @Test
-    public void hasRoleExpressionDeniesUserWithoutRole() throws Exception {
-        List<ConfigAttribute> cad = new ArrayList<ConfigAttribute>(1);
-        cad.add(new PreInvocationExpressionAttribute(null, null, "hasRole('joedoesnt')"));
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray());
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED, am.vote(joe, mi, cad));
-    }
+	@Test
+	public void hasRoleExpressionDeniesUserWithoutRole() throws Exception {
+		List<ConfigAttribute> cad = new ArrayList<ConfigAttribute>(1);
+		cad.add(new PreInvocationExpressionAttribute(null, null, "hasRole('joedoesnt')"));
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingAnArray());
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED, am.vote(joe, mi, cad));
+	}
 
-    @Test
-    public void matchingArgAgainstAuthenticationNameIsSuccessful() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe");
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
-                am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(null, null, "(#argument == principal) and (principal == 'joe')"))));
-    }
+	@Test
+	public void matchingArgAgainstAuthenticationNameIsSuccessful() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingAString(), "joe");
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi,
+				createAttributes(new PreInvocationExpressionAttribute(null, null,
+						"(#argument == principal) and (principal == 'joe')"))));
+	}
 
-    @Test
-    public void accessIsGrantedIfNoPreAuthorizeAttributeIsUsed() throws Exception {
-        Collection arg = createCollectionArg("joe", "bob", "sam");
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), arg);
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
-                am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'jim')", "collection", null))));
-        // All objects should have been removed, because the expression is always false
-        assertEquals(0, arg.size());
-    }
+	@Test
+	public void accessIsGrantedIfNoPreAuthorizeAttributeIsUsed() throws Exception {
+		Collection arg = createCollectionArg("joe", "bob", "sam");
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingACollection(), arg);
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi,
+				createAttributes(new PreInvocationExpressionAttribute(
+						"(filterObject == 'jim')", "collection", null))));
+		// All objects should have been removed, because the expression is always false
+		assertEquals(0, arg.size());
+	}
 
-    @Test
-    public void collectionPreFilteringIsSuccessful() throws Exception {
-        List arg = createCollectionArg("joe", "bob", "sam");
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), arg);
-        am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'joe' or filterObject == 'sam')", "collection", "permitAll")));
-        assertEquals("joe and sam should still be in the list", 2, arg.size());
-        assertEquals("joe", arg.get(0));
-        assertEquals("sam", arg.get(1));
-    }
+	@Test
+	public void collectionPreFilteringIsSuccessful() throws Exception {
+		List arg = createCollectionArg("joe", "bob", "sam");
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingACollection(), arg);
+		am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(
+				"(filterObject == 'joe' or filterObject == 'sam')", "collection",
+				"permitAll")));
+		assertEquals("joe and sam should still be in the list", 2, arg.size());
+		assertEquals("joe", arg.get(0));
+		assertEquals("sam", arg.get(1));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void arraysCannotBePrefiltered() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray(), createArrayArg("sam","joe"));
-        am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'jim')", "someArray", null)));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void arraysCannotBePrefiltered() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingAnArray(), createArrayArg("sam", "joe"));
+		am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(
+				"(filterObject == 'jim')", "someArray", null)));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void incorrectFilterTargetNameIsRejected() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), createCollectionArg("joe", "bob"));
-        am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'joe')", "collcetion", null)));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void incorrectFilterTargetNameIsRejected() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingACollection(), createCollectionArg("joe", "bob"));
+		am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(
+				"(filterObject == 'joe')", "collcetion", null)));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void nullNamedFilterTargetIsRejected() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingACollection(), new Object[] {null});
-        am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute("(filterObject == 'joe')", "collection", null)));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void nullNamedFilterTargetIsRejected() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingACollection(), new Object[] { null });
+		am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(
+				"(filterObject == 'joe')", "collection", null)));
+	}
 
-    @Test
-    public void ruleDefinedInAClassMethodIsApplied() throws Exception {
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAString(), "joe");
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, am.vote(joe, mi,
-                createAttributes(new PreInvocationExpressionAttribute(null, null, "T(org.springframework.security.access.expression.method.SecurityRules).isJoe(#argument)"))));
-    }
+	@Test
+	public void ruleDefinedInAClassMethodIsApplied() throws Exception {
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(),
+				methodTakingAString(), "joe");
+		assertEquals(
+				AccessDecisionVoter.ACCESS_GRANTED,
+				am.vote(joe,
+						mi,
+						createAttributes(new PreInvocationExpressionAttribute(null, null,
+								"T(org.springframework.security.access.expression.method.SecurityRules).isJoe(#argument)"))));
+	}
 
-    private List<ConfigAttribute> createAttributes(ConfigAttribute... attributes) {
-        return Arrays.asList(attributes);
-    }
+	private List<ConfigAttribute> createAttributes(ConfigAttribute... attributes) {
+		return Arrays.asList(attributes);
+	}
 
-    private List createCollectionArg(Object... elts) {
-        ArrayList result = new ArrayList(elts.length);
-        result.addAll(Arrays.asList(elts));
-        return result;
-    }
+	private List createCollectionArg(Object... elts) {
+		ArrayList result = new ArrayList(elts.length);
+		result.addAll(Arrays.asList(elts));
+		return result;
+	}
 
-    private Object createArrayArg(Object... elts) {
-        ArrayList result = new ArrayList(elts.length);
-        result.addAll(Arrays.asList(elts));
-        return result.toArray(new Object[0]);
-    }
+	private Object createArrayArg(Object... elts) {
+		ArrayList result = new ArrayList(elts.length);
+		result.addAll(Arrays.asList(elts));
+		return result.toArray(new Object[0]);
+	}
 
-    private Method methodTakingAnArray() throws Exception {
-        return Target.class.getMethod("methodTakingAnArray", Object[].class);
-    }
+	private Method methodTakingAnArray() throws Exception {
+		return Target.class.getMethod("methodTakingAnArray", Object[].class);
+	}
 
-    private Method methodTakingAString() throws Exception {
-        return Target.class.getMethod("methodTakingAString", String.class);
-    }
+	private Method methodTakingAString() throws Exception {
+		return Target.class.getMethod("methodTakingAString", String.class);
+	}
 
-    private Method methodTakingACollection() throws Exception {
-        return Target.class.getMethod("methodTakingACollection", Collection.class);
-    }
+	private Method methodTakingACollection() throws Exception {
+		return Target.class.getMethod("methodTakingACollection", Collection.class);
+	}
 
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    //~ Inner Classes ==================================================================================================
+	private interface Target {
+		void methodTakingAnArray(Object[] args);
 
-    private interface Target {
-        void methodTakingAnArray(Object[] args);
+		void methodTakingAString(String argument);
 
-        void methodTakingAString(String argument);
+		Collection methodTakingACollection(Collection collection);
+	}
 
-        Collection methodTakingACollection(Collection collection);
-    }
+	private static class TargetImpl implements Target {
+		public void methodTakingAnArray(Object[] args) {
+		}
 
-    private static class TargetImpl implements Target {
-        public void methodTakingAnArray(Object[] args) {}
+		public void methodTakingAString(String argument) {
+		};
 
-        public void methodTakingAString(String argument) {};
-
-        public Collection methodTakingACollection(Collection collection) {return collection;}
-    }
+		public Collection methodTakingACollection(Collection collection) {
+			return collection;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java
index dc3aff5567..6d0d6f9e06 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityExpressionRootTests.java
@@ -23,109 +23,107 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class MethodSecurityExpressionRootTests {
-    SpelExpressionParser parser = new SpelExpressionParser();
-    MethodSecurityExpressionRoot root;
-    StandardEvaluationContext ctx;
-    private AuthenticationTrustResolver trustResolver;
-    private Authentication user;
+	SpelExpressionParser parser = new SpelExpressionParser();
+	MethodSecurityExpressionRoot root;
+	StandardEvaluationContext ctx;
+	private AuthenticationTrustResolver trustResolver;
+	private Authentication user;
 
+	@Before
+	public void createContext() {
+		user = mock(Authentication.class);
+		root = new MethodSecurityExpressionRoot(user);
+		ctx = new StandardEvaluationContext();
+		ctx.setRootObject(root);
+		trustResolver = mock(AuthenticationTrustResolver.class);
+		root.setTrustResolver(trustResolver);
+	}
 
-    @Before
-    public void createContext() {
-        user = mock(Authentication.class);
-        root = new MethodSecurityExpressionRoot(user);
-        ctx = new StandardEvaluationContext();
-        ctx.setRootObject(root);
-        trustResolver = mock(AuthenticationTrustResolver.class);
-        root.setTrustResolver(trustResolver);
-    }
+	@Test
+	public void canCallMethodsOnVariables() throws Exception {
+		ctx.setVariable("var", "somestring");
+		Expression e = parser.parseExpression("#var.length() == 10");
 
-    @Test
-    public void canCallMethodsOnVariables() throws Exception {
-        ctx.setVariable("var", "somestring");
-        Expression e = parser.parseExpression("#var.length() == 10");
+		assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
+	}
 
-        assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
-    }
+	@Test
+	public void isAnonymousReturnsTrueIfTrustResolverReportsAnonymous() {
+		when(trustResolver.isAnonymous(user)).thenReturn(true);
+		assertTrue(root.isAnonymous());
+	}
 
-    @Test
-    public void isAnonymousReturnsTrueIfTrustResolverReportsAnonymous() {
-        when(trustResolver.isAnonymous(user)).thenReturn(true);
-        assertTrue(root.isAnonymous());
-    }
+	@Test
+	public void isAnonymousReturnsFalseIfTrustResolverReportsNonAnonymous() {
+		when(trustResolver.isAnonymous(user)).thenReturn(false);
+		assertFalse(root.isAnonymous());
+	}
 
-    @Test
-    public void isAnonymousReturnsFalseIfTrustResolverReportsNonAnonymous() {
-        when(trustResolver.isAnonymous(user)).thenReturn(false);
-        assertFalse(root.isAnonymous());
-    }
+	@Test
+	public void hasPermissionOnDomainObjectReturnsFalseIfPermissionEvaluatorDoes()
+			throws Exception {
+		final Object dummyDomainObject = new Object();
+		final PermissionEvaluator pe = mock(PermissionEvaluator.class);
+		ctx.setVariable("domainObject", dummyDomainObject);
+		root.setPermissionEvaluator(pe);
+		when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(false);
 
-    @Test
-    public void hasPermissionOnDomainObjectReturnsFalseIfPermissionEvaluatorDoes() throws Exception {
-        final Object dummyDomainObject = new Object();
-        final PermissionEvaluator pe = mock(PermissionEvaluator.class);
-        ctx.setVariable("domainObject", dummyDomainObject);
-        root.setPermissionEvaluator(pe);
-        when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(false);
+		assertFalse(root.hasPermission(dummyDomainObject, "ignored"));
 
-        assertFalse(root.hasPermission(dummyDomainObject, "ignored"));
+	}
 
-    }
+	@Test
+	public void hasPermissionOnDomainObjectReturnsTrueIfPermissionEvaluatorDoes()
+			throws Exception {
+		final Object dummyDomainObject = new Object();
+		final PermissionEvaluator pe = mock(PermissionEvaluator.class);
+		ctx.setVariable("domainObject", dummyDomainObject);
+		root.setPermissionEvaluator(pe);
+		when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(true);
 
-    @Test
-    public void hasPermissionOnDomainObjectReturnsTrueIfPermissionEvaluatorDoes() throws Exception {
-        final Object dummyDomainObject = new Object();
-        final PermissionEvaluator pe = mock(PermissionEvaluator.class);
-        ctx.setVariable("domainObject", dummyDomainObject);
-        root.setPermissionEvaluator(pe);
-        when(pe.hasPermission(user, dummyDomainObject, "ignored")).thenReturn(true);
+		assertTrue(root.hasPermission(dummyDomainObject, "ignored"));
+	}
 
-        assertTrue(root.hasPermission(dummyDomainObject, "ignored"));
-    }
+	@Test
+	public void hasPermissionOnDomainObjectWorksWithIntegerExpressions() throws Exception {
+		final Object dummyDomainObject = new Object();
+		ctx.setVariable("domainObject", dummyDomainObject);
+		final PermissionEvaluator pe = mock(PermissionEvaluator.class);
+		root.setPermissionEvaluator(pe);
+		when(pe.hasPermission(eq(user), eq(dummyDomainObject), any(Integer.class)))
+				.thenReturn(true).thenReturn(true).thenReturn(false);
 
+		Expression e = parser.parseExpression("hasPermission(#domainObject, 0xA)");
+		// evaluator returns true
+		assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
+		e = parser.parseExpression("hasPermission(#domainObject, 10)");
+		// evaluator returns true
+		assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
+		e = parser.parseExpression("hasPermission(#domainObject, 0xFF)");
+		// evaluator returns false, make sure return value matches
+		assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx));
+	}
 
-    @Test
-    public void hasPermissionOnDomainObjectWorksWithIntegerExpressions() throws Exception {
-        final Object dummyDomainObject = new Object();
-        ctx.setVariable("domainObject", dummyDomainObject);
-        final PermissionEvaluator pe = mock(PermissionEvaluator.class);
-        root.setPermissionEvaluator(pe);
-        when(pe.hasPermission(eq(user), eq(dummyDomainObject), any(Integer.class))).thenReturn(true)
-                .thenReturn(true)
-                .thenReturn(false);
+	@Test
+	public void hasPermissionWorksWithThisObject() throws Exception {
+		Object targetObject = new Object() {
+			public String getX() {
+				return "x";
+			}
+		};
+		root.setThis(targetObject);
+		Integer i = 2;
+		PermissionEvaluator pe = mock(PermissionEvaluator.class);
+		root.setPermissionEvaluator(pe);
+		when(pe.hasPermission(user, targetObject, i)).thenReturn(true).thenReturn(false);
+		when(pe.hasPermission(user, "x", i)).thenReturn(true);
 
-        Expression e = parser.parseExpression("hasPermission(#domainObject, 0xA)");
-        // evaluator returns true
-        assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
-        e = parser.parseExpression("hasPermission(#domainObject, 10)");
-     // evaluator returns true
-        assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
-        e = parser.parseExpression("hasPermission(#domainObject, 0xFF)");
-     // evaluator returns false, make sure return value matches
-        assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx));
-    }
+		Expression e = parser.parseExpression("hasPermission(this, 2)");
+		assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
+		e = parser.parseExpression("hasPermission(this, 2)");
+		assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx));
 
-    @Test
-    public void hasPermissionWorksWithThisObject() throws Exception {
-        Object targetObject = new Object() {
-            public String getX() {
-                return "x";
-            }
-        };
-        root.setThis(targetObject);
-        Integer i = 2;
-        PermissionEvaluator pe = mock(PermissionEvaluator.class);
-        root.setPermissionEvaluator(pe);
-        when(pe.hasPermission(user, targetObject, i)).thenReturn(true)
-                .thenReturn(false);
-        when(pe.hasPermission(user, "x", i)).thenReturn(true);
-
-        Expression e = parser.parseExpression("hasPermission(this, 2)");
-        assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
-        e = parser.parseExpression("hasPermission(this, 2)");
-        assertFalse(ExpressionUtils.evaluateAsBoolean(e, ctx));
-
-        e = parser.parseExpression("hasPermission(this.x, 2)");
-        assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
-    }
+		e = parser.parseExpression("hasPermission(this.x, 2)");
+		assertTrue(ExpressionUtils.evaluateAsBoolean(e, ctx));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java
index f39375b2aa..33e5f0f658 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java
@@ -33,216 +33,262 @@ import org.springframework.test.util.ReflectionTestUtils;
  * @since 3.0
  */
 public class PrePostAnnotationSecurityMetadataSourceTests {
-    private PrePostAnnotationSecurityMetadataSource mds =
-        new PrePostAnnotationSecurityMetadataSource(new ExpressionBasedAnnotationAttributeFactory(new DefaultMethodSecurityExpressionHandler()));
+	private PrePostAnnotationSecurityMetadataSource mds = new PrePostAnnotationSecurityMetadataSource(
+			new ExpressionBasedAnnotationAttributeFactory(
+					new DefaultMethodSecurityExpressionHandler()));
 
-    private MockMethodInvocation voidImpl1;
-    private MockMethodInvocation voidImpl2;
-    private MockMethodInvocation voidImpl3;
-    private MockMethodInvocation listImpl1;
-    private MockMethodInvocation notherListImpl1;
-    private MockMethodInvocation notherListImpl2;
-    private MockMethodInvocation annotatedAtClassLevel;
-    private MockMethodInvocation annotatedAtInterfaceLevel;
-    private MockMethodInvocation annotatedAtMethodLevel;
+	private MockMethodInvocation voidImpl1;
+	private MockMethodInvocation voidImpl2;
+	private MockMethodInvocation voidImpl3;
+	private MockMethodInvocation listImpl1;
+	private MockMethodInvocation notherListImpl1;
+	private MockMethodInvocation notherListImpl2;
+	private MockMethodInvocation annotatedAtClassLevel;
+	private MockMethodInvocation annotatedAtInterfaceLevel;
+	private MockMethodInvocation annotatedAtMethodLevel;
 
-    @Before
-    public void setUpData() throws Exception {
-        voidImpl1 = new MockMethodInvocation(new ReturnVoidImpl1(), ReturnVoid.class, "doSomething", List.class);
-        voidImpl2 = new MockMethodInvocation(new ReturnVoidImpl2(), ReturnVoid.class, "doSomething", List.class);
-        voidImpl3 = new MockMethodInvocation(new ReturnVoidImpl3(), ReturnVoid.class, "doSomething", List.class);
-        listImpl1 = new MockMethodInvocation(new ReturnAListImpl1(), ReturnAList.class, "doSomething", List.class);
-        notherListImpl1 = new MockMethodInvocation(new ReturnAnotherListImpl1(), ReturnAnotherList.class, "doSomething", List.class);
-        notherListImpl2 = new MockMethodInvocation(new ReturnAnotherListImpl2(), ReturnAnotherList.class, "doSomething", List.class);
-        annotatedAtClassLevel = new MockMethodInvocation(new CustomAnnotationAtClassLevel(), ReturnVoid.class, "doSomething", List.class);
-        annotatedAtInterfaceLevel = new MockMethodInvocation(new CustomAnnotationAtInterfaceLevel(), ReturnVoid2.class, "doSomething", List.class);
-        annotatedAtMethodLevel = new MockMethodInvocation(new CustomAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething", List.class);
-    }
+	@Before
+	public void setUpData() throws Exception {
+		voidImpl1 = new MockMethodInvocation(new ReturnVoidImpl1(), ReturnVoid.class,
+				"doSomething", List.class);
+		voidImpl2 = new MockMethodInvocation(new ReturnVoidImpl2(), ReturnVoid.class,
+				"doSomething", List.class);
+		voidImpl3 = new MockMethodInvocation(new ReturnVoidImpl3(), ReturnVoid.class,
+				"doSomething", List.class);
+		listImpl1 = new MockMethodInvocation(new ReturnAListImpl1(), ReturnAList.class,
+				"doSomething", List.class);
+		notherListImpl1 = new MockMethodInvocation(new ReturnAnotherListImpl1(),
+				ReturnAnotherList.class, "doSomething", List.class);
+		notherListImpl2 = new MockMethodInvocation(new ReturnAnotherListImpl2(),
+				ReturnAnotherList.class, "doSomething", List.class);
+		annotatedAtClassLevel = new MockMethodInvocation(
+				new CustomAnnotationAtClassLevel(), ReturnVoid.class, "doSomething",
+				List.class);
+		annotatedAtInterfaceLevel = new MockMethodInvocation(
+				new CustomAnnotationAtInterfaceLevel(), ReturnVoid2.class, "doSomething",
+				List.class);
+		annotatedAtMethodLevel = new MockMethodInvocation(
+				new CustomAnnotationAtMethodLevel(), ReturnVoid.class, "doSomething",
+				List.class);
+	}
 
-    @Test
-    public void classLevelPreAnnotationIsPickedUpWhenNoMethodLevelExists() throws Exception {
-        ConfigAttribute[] attrs = mds.getAttributes(voidImpl1).toArray(new ConfigAttribute[0]);
+	@Test
+	public void classLevelPreAnnotationIsPickedUpWhenNoMethodLevelExists()
+			throws Exception {
+		ConfigAttribute[] attrs = mds.getAttributes(voidImpl1).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
-        assertNotNull(pre.getAuthorizeExpression());
-        assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString());
-        assertNull(pre.getFilterExpression());
-    }
+		assertEquals(1, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		assertNotNull(pre.getAuthorizeExpression());
+		assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString());
+		assertNull(pre.getFilterExpression());
+	}
 
-    @Test
-    public void mixedClassAndMethodPreAnnotationsAreBothIncluded() {
-        ConfigAttribute[] attrs = mds.getAttributes(voidImpl2).toArray(new ConfigAttribute[0]);
+	@Test
+	public void mixedClassAndMethodPreAnnotationsAreBothIncluded() {
+		ConfigAttribute[] attrs = mds.getAttributes(voidImpl2).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
-        assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString());
-        assertNotNull(pre.getFilterExpression());
-        assertEquals("somePreFilterExpression", pre.getFilterExpression().getExpressionString());
-    }
+		assertEquals(1, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		assertEquals("someExpression", pre.getAuthorizeExpression().getExpressionString());
+		assertNotNull(pre.getFilterExpression());
+		assertEquals("somePreFilterExpression", pre.getFilterExpression()
+				.getExpressionString());
+	}
 
-    @Test
-    public void methodWithPreFilterOnlyIsAllowed() {
-        ConfigAttribute[] attrs = mds.getAttributes(voidImpl3).toArray(new ConfigAttribute[0]);
+	@Test
+	public void methodWithPreFilterOnlyIsAllowed() {
+		ConfigAttribute[] attrs = mds.getAttributes(voidImpl3).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
-        assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString());
-        assertNotNull(pre.getFilterExpression());
-        assertEquals("somePreFilterExpression", pre.getFilterExpression().getExpressionString());
-    }
+		assertEquals(1, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString());
+		assertNotNull(pre.getFilterExpression());
+		assertEquals("somePreFilterExpression", pre.getFilterExpression()
+				.getExpressionString());
+	}
 
-    @Test
-    public void methodWithPostFilterOnlyIsAllowed() {
-        ConfigAttribute[] attrs = mds.getAttributes(listImpl1).toArray(new ConfigAttribute[0]);
+	@Test
+	public void methodWithPostFilterOnlyIsAllowed() {
+		ConfigAttribute[] attrs = mds.getAttributes(listImpl1).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(2, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        assertTrue(attrs[1] instanceof PostInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
-        PostInvocationExpressionAttribute post = (PostInvocationExpressionAttribute) attrs[1];
-        assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString());
-        assertNotNull(post.getFilterExpression());
-        assertEquals("somePostFilterExpression", post.getFilterExpression().getExpressionString());
-    }
+		assertEquals(2, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		assertTrue(attrs[1] instanceof PostInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		PostInvocationExpressionAttribute post = (PostInvocationExpressionAttribute) attrs[1];
+		assertEquals("permitAll", pre.getAuthorizeExpression().getExpressionString());
+		assertNotNull(post.getFilterExpression());
+		assertEquals("somePostFilterExpression", post.getFilterExpression()
+				.getExpressionString());
+	}
 
-    @Test
-    public void interfaceAttributesAreIncluded() {
-        ConfigAttribute[] attrs = mds.getAttributes(notherListImpl1).toArray(new ConfigAttribute[0]);
+	@Test
+	public void interfaceAttributesAreIncluded() {
+		ConfigAttribute[] attrs = mds.getAttributes(notherListImpl1).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute)attrs[0];
-        assertNotNull(pre.getFilterExpression());
-        assertNotNull(pre.getAuthorizeExpression());
-        assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression().getExpressionString());
-        assertEquals("interfacePreFilterExpression", pre.getFilterExpression().getExpressionString());
-    }
+		assertEquals(1, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		assertNotNull(pre.getFilterExpression());
+		assertNotNull(pre.getAuthorizeExpression());
+		assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression()
+				.getExpressionString());
+		assertEquals("interfacePreFilterExpression", pre.getFilterExpression()
+				.getExpressionString());
+	}
 
-    @Test
-    public void classAttributesTakesPrecedeceOverInterfaceAttributes() {
-        ConfigAttribute[] attrs = mds.getAttributes(notherListImpl2).toArray(new ConfigAttribute[0]);
+	@Test
+	public void classAttributesTakesPrecedeceOverInterfaceAttributes() {
+		ConfigAttribute[] attrs = mds.getAttributes(notherListImpl2).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-        assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
-        PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute)attrs[0];
-        assertNotNull(pre.getFilterExpression());
-        assertNotNull(pre.getAuthorizeExpression());
-        assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression().getExpressionString());
-        assertEquals("classMethodPreFilterExpression", pre.getFilterExpression().getExpressionString());
-    }
+		assertEquals(1, attrs.length);
+		assertTrue(attrs[0] instanceof PreInvocationExpressionAttribute);
+		PreInvocationExpressionAttribute pre = (PreInvocationExpressionAttribute) attrs[0];
+		assertNotNull(pre.getFilterExpression());
+		assertNotNull(pre.getAuthorizeExpression());
+		assertEquals("interfaceMethodAuthzExpression", pre.getAuthorizeExpression()
+				.getExpressionString());
+		assertEquals("classMethodPreFilterExpression", pre.getFilterExpression()
+				.getExpressionString());
+	}
 
-    @Test
-    public void customAnnotationAtClassLevelIsDetected() throws Exception {
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(new ConfigAttribute[0]);
+	@Test
+	public void customAnnotationAtClassLevelIsDetected() throws Exception {
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtClassLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-    }
+		assertEquals(1, attrs.length);
+	}
 
-    @Test
-    public void customAnnotationAtInterfaceLevelIsDetected() throws Exception {
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(new ConfigAttribute[0]);
+	@Test
+	public void customAnnotationAtInterfaceLevelIsDetected() throws Exception {
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtInterfaceLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-    }
+		assertEquals(1, attrs.length);
+	}
 
-    @Test
-    public void customAnnotationAtMethodLevelIsDetected() throws Exception {
-        ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(new ConfigAttribute[0]);
+	@Test
+	public void customAnnotationAtMethodLevelIsDetected() throws Exception {
+		ConfigAttribute[] attrs = mds.getAttributes(annotatedAtMethodLevel).toArray(
+				new ConfigAttribute[0]);
 
-        assertEquals(1, attrs.length);
-    }
+		assertEquals(1, attrs.length);
+	}
 
-    @Test
-    public void proxyFactoryInterfaceAttributesFound() throws Exception {
-        MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation();
-        Collection<ConfigAttribute> attributes = mds.getAttributes(mi);
-        assertThat(attributes.size()).isEqualTo(1);
-        Expression expression = (Expression) ReflectionTestUtils.getField(attributes.iterator().next(),"authorizeExpression");
-        assertThat(expression.getExpressionString()).isEqualTo("hasRole('ROLE_PERSON')");
-    }
+	@Test
+	public void proxyFactoryInterfaceAttributesFound() throws Exception {
+		MockMethodInvocation mi = MethodInvocationFactory.createSec2150MethodInvocation();
+		Collection<ConfigAttribute> attributes = mds.getAttributes(mi);
+		assertThat(attributes.size()).isEqualTo(1);
+		Expression expression = (Expression) ReflectionTestUtils.getField(attributes
+				.iterator().next(), "authorizeExpression");
+		assertThat(expression.getExpressionString()).isEqualTo("hasRole('ROLE_PERSON')");
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    public static interface ReturnVoid {
-        public void doSomething(List<?> param);
-    }
+	public static interface ReturnVoid {
+		public void doSomething(List<?> param);
+	}
 
-    public static interface ReturnAList {
-        public List<?> doSomething(List<?> param);
-    }
+	public static interface ReturnAList {
+		public List<?> doSomething(List<?> param);
+	}
 
-    @PreAuthorize("interfaceAuthzExpression")
-    public static interface ReturnAnotherList {
-        @PreAuthorize("interfaceMethodAuthzExpression")
-        @PreFilter(filterTarget="param", value="interfacePreFilterExpression")
-        public List<?> doSomething(List<?> param);
-    }
+	@PreAuthorize("interfaceAuthzExpression")
+	public static interface ReturnAnotherList {
+		@PreAuthorize("interfaceMethodAuthzExpression")
+		@PreFilter(filterTarget = "param", value = "interfacePreFilterExpression")
+		public List<?> doSomething(List<?> param);
+	}
 
+	@PreAuthorize("someExpression")
+	public static class ReturnVoidImpl1 implements ReturnVoid {
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    @PreAuthorize("someExpression")
-    public static class ReturnVoidImpl1 implements ReturnVoid {
-        public void doSomething(List<?> param) {}
-    }
+	@PreAuthorize("someExpression")
+	public static class ReturnVoidImpl2 implements ReturnVoid {
+		@PreFilter(filterTarget = "param", value = "somePreFilterExpression")
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    @PreAuthorize("someExpression")
-    public static class ReturnVoidImpl2 implements ReturnVoid {
-        @PreFilter(filterTarget="param", value="somePreFilterExpression")
-        public void doSomething(List<?> param) {}
-    }
+	public static class ReturnVoidImpl3 implements ReturnVoid {
+		@PreFilter(filterTarget = "param", value = "somePreFilterExpression")
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    public static class ReturnVoidImpl3 implements ReturnVoid {
-        @PreFilter(filterTarget="param", value="somePreFilterExpression")
-        public void doSomething(List<?> param) {}
-    }
+	public static class ReturnAListImpl1 implements ReturnAList {
+		@PostFilter("somePostFilterExpression")
+		public List<?> doSomething(List<?> param) {
+			return param;
+		}
+	}
 
-    public static class ReturnAListImpl1 implements ReturnAList {
-        @PostFilter("somePostFilterExpression")
-        public List<?> doSomething(List<?> param) {return param;}
-    }
+	public static class ReturnAListImpl2 implements ReturnAList {
+		@PreAuthorize("someExpression")
+		@PreFilter(filterTarget = "param", value = "somePreFilterExpression")
+		@PostFilter("somePostFilterExpression")
+		@PostAuthorize("somePostAuthorizeExpression")
+		public List<?> doSomething(List<?> param) {
+			return param;
+		}
+	}
 
-    public static class ReturnAListImpl2 implements ReturnAList {
-        @PreAuthorize("someExpression")
-        @PreFilter(filterTarget="param", value="somePreFilterExpression")
-        @PostFilter("somePostFilterExpression")
-        @PostAuthorize("somePostAuthorizeExpression")
-        public List<?> doSomething(List<?> param) {return param;}
-    }
+	public static class ReturnAnotherListImpl1 implements ReturnAnotherList {
+		public List<?> doSomething(List<?> param) {
+			return param;
+		}
+	}
 
-    public static class ReturnAnotherListImpl1 implements ReturnAnotherList {
-        public List<?> doSomething(List<?> param) {return param;}
-    }
+	public static class ReturnAnotherListImpl2 implements ReturnAnotherList {
+		@PreFilter(filterTarget = "param", value = "classMethodPreFilterExpression")
+		public List<?> doSomething(List<?> param) {
+			return param;
+		}
+	}
 
-    public static class ReturnAnotherListImpl2 implements ReturnAnotherList {
-        @PreFilter(filterTarget="param", value="classMethodPreFilterExpression")
-        public List<?> doSomething(List<?> param) {return param;}
-    }
+	@Target({ ElementType.METHOD, ElementType.TYPE })
+	@Retention(RetentionPolicy.RUNTIME)
+	@Inherited
+	@PreAuthorize("customAnnotationExpression")
+	public @interface CustomAnnotation {
+	}
 
-    @Target({ ElementType.METHOD, ElementType.TYPE })
-    @Retention(RetentionPolicy.RUNTIME)
-    @Inherited
-    @PreAuthorize("customAnnotationExpression")
-    public @interface CustomAnnotation {}
+	@CustomAnnotation
+	public static interface ReturnVoid2 {
+		public void doSomething(List<?> param);
+	}
 
-    @CustomAnnotation
-    public static interface ReturnVoid2 {
-        public void doSomething(List<?> param);
-    }
+	@CustomAnnotation
+	public static class CustomAnnotationAtClassLevel implements ReturnVoid {
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    @CustomAnnotation
-    public static class CustomAnnotationAtClassLevel implements ReturnVoid {
-        public void doSomething(List<?> param) {}
-    }
+	public static class CustomAnnotationAtInterfaceLevel implements ReturnVoid2 {
+		public void doSomething(List<?> param) {
+		}
+	}
 
-    public static class CustomAnnotationAtInterfaceLevel implements ReturnVoid2 {
-        public void doSomething(List<?> param) {}
-    }
-
-    public static class CustomAnnotationAtMethodLevel implements ReturnVoid {
-        @CustomAnnotation
-        public void doSomething(List<?> param) {}
-    }
+	public static class CustomAnnotationAtMethodLevel implements ReturnVoid {
+		@CustomAnnotation
+		public void doSomething(List<?> param) {
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java b/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
index 3f711a30db..8573bf7aa9 100644
--- a/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
+++ b/core/src/test/java/org/springframework/security/access/expression/method/SecurityRules.java
@@ -1,16 +1,15 @@
 package org.springframework.security.access.expression.method;
 
 public class SecurityRules {
-    public static boolean disallow() {
-        return false;
-    }
+	public static boolean disallow() {
+		return false;
+	}
 
-    public static boolean allow() {
-        return false;
-    }
+	public static boolean allow() {
+		return false;
+	}
 
-    public static boolean isJoe(String s) {
-        return "joe".equals(s);
-    }
+	public static boolean isJoe(String s) {
+		return "joe".equals(s);
+	}
 }
-
diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
index 6319f878c7..5654ed5e76 100755
--- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java
@@ -28,53 +28,60 @@ import org.apache.commons.collections.CollectionUtils;
  */
 public abstract class HierarchicalRolesTestHelper {
 
-    public static boolean containTheSameGrantedAuthorities(Collection<? extends GrantedAuthority> authorities1, Collection<? extends GrantedAuthority> authorities2) {
-        if (authorities1 == null && authorities2 == null) {
-            return true;
-        }
+	public static boolean containTheSameGrantedAuthorities(
+			Collection<? extends GrantedAuthority> authorities1,
+			Collection<? extends GrantedAuthority> authorities2) {
+		if (authorities1 == null && authorities2 == null) {
+			return true;
+		}
 
-        if (authorities1 == null || authorities2 == null) {
-            return false;
-        }
-        return CollectionUtils.isEqualCollection(authorities1, authorities2);
-    }
+		if (authorities1 == null || authorities2 == null) {
+			return false;
+		}
+		return CollectionUtils.isEqualCollection(authorities1, authorities2);
+	}
 
-    public static boolean containTheSameGrantedAuthoritiesCompareByAuthorityString(Collection<? extends GrantedAuthority> authorities1, Collection<? extends GrantedAuthority> authorities2) {
-        if (authorities1 == null && authorities2 == null) {
-            return true;
-        }
+	public static boolean containTheSameGrantedAuthoritiesCompareByAuthorityString(
+			Collection<? extends GrantedAuthority> authorities1,
+			Collection<? extends GrantedAuthority> authorities2) {
+		if (authorities1 == null && authorities2 == null) {
+			return true;
+		}
 
-        if (authorities1 == null || authorities2 == null) {
-            return false;
-        }
-        return CollectionUtils.isEqualCollection(toCollectionOfAuthorityStrings(authorities1), toCollectionOfAuthorityStrings(authorities2));
-    }
+		if (authorities1 == null || authorities2 == null) {
+			return false;
+		}
+		return CollectionUtils.isEqualCollection(
+				toCollectionOfAuthorityStrings(authorities1),
+				toCollectionOfAuthorityStrings(authorities2));
+	}
 
-    public static List<String> toCollectionOfAuthorityStrings(Collection<? extends GrantedAuthority> authorities) {
-        if (authorities == null) {
-            return null;
-        }
+	public static List<String> toCollectionOfAuthorityStrings(
+			Collection<? extends GrantedAuthority> authorities) {
+		if (authorities == null) {
+			return null;
+		}
 
-        List<String> result = new ArrayList<String>(authorities.size());
-        for (GrantedAuthority authority : authorities) {
-            result.add(authority.getAuthority());
-        }
-        return result;
-    }
+		List<String> result = new ArrayList<String>(authorities.size());
+		for (GrantedAuthority authority : authorities) {
+			result.add(authority.getAuthority());
+		}
+		return result;
+	}
 
-    public static List<GrantedAuthority> createAuthorityList(final String... roles) {
-        List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
+	public static List<GrantedAuthority> createAuthorityList(final String... roles) {
+		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(roles.length);
 
-        for (final String role : roles) {
-            // Use non GrantedAuthorityImpl (SEC-863)
-            authorities.add(new GrantedAuthority() {
-                public String getAuthority() {
-                    return role;
-                }
-            });
-        }
+		for (final String role : roles) {
+			// Use non GrantedAuthorityImpl (SEC-863)
+			authorities.add(new GrantedAuthority() {
+				public String getAuthority() {
+					return role;
+				}
+			});
+		}
 
-        return authorities;
-    }
+		return authorities;
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java
index 6db811a24b..dc9e6b034d 100644
--- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyAuthoritiesMapperTests.java
@@ -13,21 +13,22 @@ import java.util.*;
  */
 public class RoleHierarchyAuthoritiesMapperTests {
 
-    @Test
-    public void expectedAuthoritiesAreReturned() {
-        RoleHierarchyImpl rh = new RoleHierarchyImpl();
-        rh.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C");
-        RoleHierarchyAuthoritiesMapper mapper = new RoleHierarchyAuthoritiesMapper(rh);
+	@Test
+	public void expectedAuthoritiesAreReturned() {
+		RoleHierarchyImpl rh = new RoleHierarchyImpl();
+		rh.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C");
+		RoleHierarchyAuthoritiesMapper mapper = new RoleHierarchyAuthoritiesMapper(rh);
 
-        Collection<? extends GrantedAuthority> authorities =
-                mapper.mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_D"));
+		Collection<? extends GrantedAuthority> authorities = mapper
+				.mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_D"));
 
-        assertEquals(4, authorities.size());
+		assertEquals(4, authorities.size());
 
-        mapper = new RoleHierarchyAuthoritiesMapper(new NullRoleHierarchy());
+		mapper = new RoleHierarchyAuthoritiesMapper(new NullRoleHierarchy());
 
-        authorities = mapper.mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_D"));
+		authorities = mapper.mapAuthorities(AuthorityUtils.createAuthorityList("ROLE_A",
+				"ROLE_D"));
 
-        assertEquals(2, authorities.size());
-    }
+		assertEquals(2, authorities.size());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
index ae6c249d37..b7da06d488 100755
--- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java
@@ -1,16 +1,16 @@
 /*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 package org.springframework.security.access.hierarchicalroles;
 
@@ -31,112 +31,172 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class RoleHierarchyImplTests extends TestCase {
 
-    public void testRoleHierarchyWithNullOrEmptyAuthorities() {
-        List<GrantedAuthority> authorities0 = null;
-        List<GrantedAuthority> authorities1 = new ArrayList<GrantedAuthority>();
+	public void testRoleHierarchyWithNullOrEmptyAuthorities() {
+		List<GrantedAuthority> authorities0 = null;
+		List<GrantedAuthority> authorities1 = new ArrayList<GrantedAuthority>();
 
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
 
-        assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0));
-        assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities0).size());
-        assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1));
-        assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities1).size());
-    }
+		assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0));
+		assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities0)
+				.size());
+		assertNotNull(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1));
+		assertEquals(0, roleHierarchyImpl.getReachableGrantedAuthorities(authorities1)
+				.size());
+	}
 
-    public void testSimpleRoleHierarchy() {
+	public void testSimpleRoleHierarchy() {
 
-        List<GrantedAuthority> authorities0 = AuthorityUtils.createAuthorityList("ROLE_0");
-        List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_B");
+		List<GrantedAuthority> authorities0 = AuthorityUtils
+				.createAuthorityList("ROLE_0");
+		List<GrantedAuthority> authorities1 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B");
 
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
 
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0), authorities0));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1), authorities2));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authorities2), authorities2));
-    }
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authorities0),
+				authorities0));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authorities1),
+				authorities2));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authorities2),
+				authorities2));
+	}
 
-    public void testTransitiveRoleHierarchies() {
-        List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_B","ROLE_C");
-        List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_B","ROLE_C","ROLE_D");
+	public void testTransitiveRoleHierarchies() {
+		List<GrantedAuthority> authorities1 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B", "ROLE_C");
+		List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B", "ROLE_C", "ROLE_D");
 
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
 
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C");
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1), authorities2));
+		roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C");
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authorities1),
+				authorities2));
 
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_D");
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1), authorities3));
-    }
+		roleHierarchyImpl
+				.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_D");
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authorities1),
+				authorities3));
+	}
 
-    public void testComplexRoleHierarchy() {
-        List<GrantedAuthority> authoritiesInput1 = AuthorityUtils.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authoritiesOutput1 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B","ROLE_C", "ROLE_D");
-        List<GrantedAuthority> authoritiesInput2 = AuthorityUtils.createAuthorityList("ROLE_B");
-        List<GrantedAuthority> authoritiesOutput2 = AuthorityUtils.createAuthorityList("ROLE_B","ROLE_D");
-        List<GrantedAuthority> authoritiesInput3 = AuthorityUtils.createAuthorityList("ROLE_C");
-        List<GrantedAuthority> authoritiesOutput3 = AuthorityUtils.createAuthorityList("ROLE_C","ROLE_D");
-        List<GrantedAuthority> authoritiesInput4 = AuthorityUtils.createAuthorityList("ROLE_D");
-        List<GrantedAuthority> authoritiesOutput4 = AuthorityUtils.createAuthorityList("ROLE_D");
+	public void testComplexRoleHierarchy() {
+		List<GrantedAuthority> authoritiesInput1 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authoritiesOutput1 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B", "ROLE_C", "ROLE_D");
+		List<GrantedAuthority> authoritiesInput2 = AuthorityUtils
+				.createAuthorityList("ROLE_B");
+		List<GrantedAuthority> authoritiesOutput2 = AuthorityUtils.createAuthorityList(
+				"ROLE_B", "ROLE_D");
+		List<GrantedAuthority> authoritiesInput3 = AuthorityUtils
+				.createAuthorityList("ROLE_C");
+		List<GrantedAuthority> authoritiesOutput3 = AuthorityUtils.createAuthorityList(
+				"ROLE_C", "ROLE_D");
+		List<GrantedAuthority> authoritiesInput4 = AuthorityUtils
+				.createAuthorityList("ROLE_D");
+		List<GrantedAuthority> authoritiesOutput4 = AuthorityUtils
+				.createAuthorityList("ROLE_D");
 
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_A > ROLE_C\nROLE_C > ROLE_D\nROLE_B > ROLE_D");
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		roleHierarchyImpl
+				.setHierarchy("ROLE_A > ROLE_B\nROLE_A > ROLE_C\nROLE_C > ROLE_D\nROLE_B > ROLE_D");
 
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput1), authoritiesOutput1));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput2), authoritiesOutput2));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput3), authoritiesOutput3));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput4), authoritiesOutput4));
-    }
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput1),
+				authoritiesOutput1));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput2),
+				authoritiesOutput2));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput3),
+				authoritiesOutput3));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				roleHierarchyImpl.getReachableGrantedAuthorities(authoritiesInput4),
+				authoritiesOutput4));
+	}
 
-    public void testCyclesInRoleHierarchy() {
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+	public void testCyclesInRoleHierarchy() {
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
 
-        try {
-            roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_A");
-            fail("Cycle in role hierarchy was not detected!");
-        } catch (CycleInRoleHierarchyException e) {}
+		try {
+			roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_A");
+			fail("Cycle in role hierarchy was not detected!");
+		}
+		catch (CycleInRoleHierarchyException e) {
+		}
 
-        try {
-            roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_A");
-            fail("Cycle in role hierarchy was not detected!");
-        } catch (CycleInRoleHierarchyException e) {}
+		try {
+			roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_A");
+			fail("Cycle in role hierarchy was not detected!");
+		}
+		catch (CycleInRoleHierarchyException e) {
+		}
 
-        try {
-            roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_A");
-            fail("Cycle in role hierarchy was not detected!");
-        } catch (CycleInRoleHierarchyException e) {}
+		try {
+			roleHierarchyImpl
+					.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_A");
+			fail("Cycle in role hierarchy was not detected!");
+		}
+		catch (CycleInRoleHierarchyException e) {
+		}
 
-        try {
-            roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_E\nROLE_E > ROLE_D\nROLE_D > ROLE_B");
-            fail("Cycle in role hierarchy was not detected!");
-        } catch (CycleInRoleHierarchyException e) {}
-    }
+		try {
+			roleHierarchyImpl
+					.setHierarchy("ROLE_A > ROLE_B\nROLE_B > ROLE_C\nROLE_C > ROLE_E\nROLE_E > ROLE_D\nROLE_D > ROLE_B");
+			fail("Cycle in role hierarchy was not detected!");
+		}
+		catch (CycleInRoleHierarchyException e) {
+		}
+	}
 
-    public void testNoCyclesInRoleHierarchy() {
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+	public void testNoCyclesInRoleHierarchy() {
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
 
-        try {
-            roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B\nROLE_A > ROLE_C\nROLE_C > ROLE_D\nROLE_B > ROLE_D");
-        } catch (CycleInRoleHierarchyException e) {
-            fail("A cycle in role hierarchy was incorrectly detected!");
-        }
-    }
+		try {
+			roleHierarchyImpl
+					.setHierarchy("ROLE_A > ROLE_B\nROLE_A > ROLE_C\nROLE_C > ROLE_D\nROLE_B > ROLE_D");
+		}
+		catch (CycleInRoleHierarchyException e) {
+			fail("A cycle in role hierarchy was incorrectly detected!");
+		}
+	}
 
-    // SEC-863
-    public void testSimpleRoleHierarchyWithCustomGrantedAuthorityImplementation() {
+	// SEC-863
+	public void testSimpleRoleHierarchyWithCustomGrantedAuthorityImplementation() {
 
-        List<GrantedAuthority> authorities0 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_0");
-        List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authorities2 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_A","ROLE_B");
+		List<GrantedAuthority> authorities0 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_0");
+		List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authorities2 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_A", "ROLE_B");
 
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
 
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthoritiesCompareByAuthorityString(roleHierarchyImpl.getReachableGrantedAuthorities(authorities0), authorities0));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthoritiesCompareByAuthorityString(roleHierarchyImpl.getReachableGrantedAuthorities(authorities1), authorities2));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthoritiesCompareByAuthorityString(roleHierarchyImpl.getReachableGrantedAuthorities(authorities2), authorities2));
-    }
+		assertTrue(HierarchicalRolesTestHelper
+				.containTheSameGrantedAuthoritiesCompareByAuthorityString(
+						roleHierarchyImpl.getReachableGrantedAuthorities(authorities0),
+						authorities0));
+		assertTrue(HierarchicalRolesTestHelper
+				.containTheSameGrantedAuthoritiesCompareByAuthorityString(
+						roleHierarchyImpl.getReachableGrantedAuthorities(authorities1),
+						authorities2));
+		assertTrue(HierarchicalRolesTestHelper
+				.containTheSameGrantedAuthoritiesCompareByAuthorityString(
+						roleHierarchyImpl.getReachableGrantedAuthorities(authorities2),
+						authorities2));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
index f73d3728b5..b8427b20da 100755
--- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
+++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java
@@ -32,113 +32,161 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class TestHelperTests {
 
-    @Test
-    public void testContainTheSameGrantedAuthorities() {
-        List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_B");
-        List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_B","ROLE_A");
-        List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_C");
-        List<GrantedAuthority> authorities4 = AuthorityUtils.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList("ROLE_A","ROLE_A");
+	@Test
+	public void testContainTheSameGrantedAuthorities() {
+		List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B");
+		List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_B", "ROLE_A");
+		List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_C");
+		List<GrantedAuthority> authorities4 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_A");
 
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, null));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities1));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities2));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities2, authorities1));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null,
+				null));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities1));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities2));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities2, authorities1));
 
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, null));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities3));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities3, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities4));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities4, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities4, authorities5));
-    }
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null,
+				authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, null));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities3));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities3, authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities4));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities4, authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities4, authorities5));
+	}
 
-    // SEC-863
-    @Test
-    public void testToListOfAuthorityStrings() {
-        Collection<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B");
-        Collection<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_B", "ROLE_A");
-        Collection<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_C");
-        Collection<GrantedAuthority> authorities4 = AuthorityUtils.createAuthorityList("ROLE_A");
-        Collection<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_A");
+	// SEC-863
+	@Test
+	public void testToListOfAuthorityStrings() {
+		Collection<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B");
+		Collection<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_B", "ROLE_A");
+		Collection<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_C");
+		Collection<GrantedAuthority> authorities4 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		Collection<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_A");
 
-        List<String> authoritiesStrings1 = new ArrayList<String>();
-        authoritiesStrings1.add("ROLE_A");
-        authoritiesStrings1.add("ROLE_B");
+		List<String> authoritiesStrings1 = new ArrayList<String>();
+		authoritiesStrings1.add("ROLE_A");
+		authoritiesStrings1.add("ROLE_B");
 
-        List<String> authoritiesStrings2 = new ArrayList<String>();
-        authoritiesStrings2.add("ROLE_B");
-        authoritiesStrings2.add("ROLE_A");
+		List<String> authoritiesStrings2 = new ArrayList<String>();
+		authoritiesStrings2.add("ROLE_B");
+		authoritiesStrings2.add("ROLE_A");
 
-        List<String> authoritiesStrings3 = new ArrayList<String>();
-        authoritiesStrings3.add("ROLE_A");
-        authoritiesStrings3.add("ROLE_C");
+		List<String> authoritiesStrings3 = new ArrayList<String>();
+		authoritiesStrings3.add("ROLE_A");
+		authoritiesStrings3.add("ROLE_C");
 
-        List<String> authoritiesStrings4 = new ArrayList<String>();
-        authoritiesStrings4.add("ROLE_A");
+		List<String> authoritiesStrings4 = new ArrayList<String>();
+		authoritiesStrings4.add("ROLE_A");
 
-        List<String> authoritiesStrings5 = new ArrayList<String>();
-        authoritiesStrings5.add("ROLE_A");
-        authoritiesStrings5.add("ROLE_A");
+		List<String> authoritiesStrings5 = new ArrayList<String>();
+		authoritiesStrings5.add("ROLE_A");
+		authoritiesStrings5.add("ROLE_A");
 
-        assertTrue(CollectionUtils.isEqualCollection(
-                HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities1), authoritiesStrings1));
+		assertTrue(CollectionUtils.isEqualCollection(
+				HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities1),
+				authoritiesStrings1));
 
-        assertTrue(CollectionUtils.isEqualCollection(
-                HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities2), authoritiesStrings2));
+		assertTrue(CollectionUtils.isEqualCollection(
+				HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities2),
+				authoritiesStrings2));
 
-        assertTrue(CollectionUtils.isEqualCollection(
-                HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities3), authoritiesStrings3));
+		assertTrue(CollectionUtils.isEqualCollection(
+				HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities3),
+				authoritiesStrings3));
 
-        assertTrue(CollectionUtils.isEqualCollection(
-                HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities4), authoritiesStrings4));
+		assertTrue(CollectionUtils.isEqualCollection(
+				HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities4),
+				authoritiesStrings4));
 
-        assertTrue(CollectionUtils.isEqualCollection(
-                HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities5), authoritiesStrings5));
-    }
+		assertTrue(CollectionUtils.isEqualCollection(
+				HierarchicalRolesTestHelper.toCollectionOfAuthorityStrings(authorities5),
+				authoritiesStrings5));
+	}
 
-    // SEC-863
-    @Test
-    public void testContainTheSameGrantedAuthoritiesCompareByAuthorityString() {
-        List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B");
-        List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_B", "ROLE_A");
-        List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_C");
-        List<GrantedAuthority> authorities4 = AuthorityUtils.createAuthorityList("ROLE_A");
-        List<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_A");
+	// SEC-863
+	@Test
+	public void testContainTheSameGrantedAuthoritiesCompareByAuthorityString() {
+		List<GrantedAuthority> authorities1 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B");
+		List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_B", "ROLE_A");
+		List<GrantedAuthority> authorities3 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_C");
+		List<GrantedAuthority> authorities4 = AuthorityUtils
+				.createAuthorityList("ROLE_A");
+		List<GrantedAuthority> authorities5 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_A");
 
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, null));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities1));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities2));
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities2, authorities1));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null,
+				null));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities1));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities2));
+		assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities2, authorities1));
 
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, null));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities3));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities3, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities1, authorities4));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities4, authorities1));
-        assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(authorities4, authorities5));
-    }
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(null,
+				authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, null));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities3));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities3, authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities1, authorities4));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities4, authorities1));
+		assertFalse(HierarchicalRolesTestHelper.containTheSameGrantedAuthorities(
+				authorities4, authorities5));
+	}
 
-    // SEC-863
-    @Test
-    public void testContainTheSameGrantedAuthoritiesCompareByAuthorityStringWithAuthorityLists() {
-        List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_A", "ROLE_B");
-        List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B");
-        assertTrue(HierarchicalRolesTestHelper.containTheSameGrantedAuthoritiesCompareByAuthorityString(authorities1, authorities2));
-    }
+	// SEC-863
+	@Test
+	public void testContainTheSameGrantedAuthoritiesCompareByAuthorityStringWithAuthorityLists() {
+		List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_A", "ROLE_B");
+		List<GrantedAuthority> authorities2 = AuthorityUtils.createAuthorityList(
+				"ROLE_A", "ROLE_B");
+		assertTrue(HierarchicalRolesTestHelper
+				.containTheSameGrantedAuthoritiesCompareByAuthorityString(authorities1,
+						authorities2));
+	}
 
-    // SEC-863
-    @Test
-    public void testCreateAuthorityList() {
-        List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_A");
-        assertEquals(authorities1.size(), 1);
-        assertEquals("ROLE_A", authorities1.get(0).getAuthority());
+	// SEC-863
+	@Test
+	public void testCreateAuthorityList() {
+		List<GrantedAuthority> authorities1 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_A");
+		assertEquals(authorities1.size(), 1);
+		assertEquals("ROLE_A", authorities1.get(0).getAuthority());
 
-        List<GrantedAuthority> authorities2 = HierarchicalRolesTestHelper.createAuthorityList("ROLE_A", "ROLE_C");
-        assertEquals(authorities2.size(), 2);
-        assertEquals("ROLE_A", authorities2.get(0).getAuthority());
-        assertEquals("ROLE_C", authorities2.get(1).getAuthority());
-    }
+		List<GrantedAuthority> authorities2 = HierarchicalRolesTestHelper
+				.createAuthorityList("ROLE_A", "ROLE_C");
+		assertEquals(authorities2.size(), 2);
+		assertEquals("ROLE_A", authorities2.get(0).getAuthority());
+		assertEquals("ROLE_C", authorities2.get(1).getAuthority());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
index d12f7d2b80..6740e13ee3 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java
@@ -23,70 +23,74 @@ import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.util.SimpleMethodInvocation;
 
-
 /**
- * Tests some {@link AbstractSecurityInterceptor} methods. Most of the testing for this class is found in the
- * {@code MethodSecurityInterceptorTests} class.
+ * Tests some {@link AbstractSecurityInterceptor} methods. Most of the testing for this
+ * class is found in the {@code MethodSecurityInterceptorTests} class.
  *
  * @author Ben Alex
  */
 public class AbstractSecurityInterceptorTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsIfInvocationPassedIncompatibleSecureObject() throws Exception {
-        MockSecurityInterceptorWhichOnlySupportsStrings si = new MockSecurityInterceptorWhichOnlySupportsStrings();
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsIfInvocationPassedIncompatibleSecureObject() throws Exception {
+		MockSecurityInterceptorWhichOnlySupportsStrings si = new MockSecurityInterceptorWhichOnlySupportsStrings();
 
-        si.setRunAsManager(mock(RunAsManager.class));
-        si.setAuthenticationManager(mock(AuthenticationManager.class));
-        si.setAfterInvocationManager(mock(AfterInvocationManager.class));
-        si.setAccessDecisionManager(mock(AccessDecisionManager.class));
-        si.setSecurityMetadataSource(mock(SecurityMetadataSource.class));
-        si.beforeInvocation(new SimpleMethodInvocation());
-    }
+		si.setRunAsManager(mock(RunAsManager.class));
+		si.setAuthenticationManager(mock(AuthenticationManager.class));
+		si.setAfterInvocationManager(mock(AfterInvocationManager.class));
+		si.setAccessDecisionManager(mock(AccessDecisionManager.class));
+		si.setSecurityMetadataSource(mock(SecurityMetadataSource.class));
+		si.beforeInvocation(new SimpleMethodInvocation());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsViolationOfGetSecureObjectClassMethod() throws Exception {
-        MockSecurityInterceptorReturnsNull si = new MockSecurityInterceptorReturnsNull();
-        si.setRunAsManager(mock(RunAsManager.class));
-        si.setAuthenticationManager(mock(AuthenticationManager.class));
-        si.setAfterInvocationManager(mock(AfterInvocationManager.class));
-        si.setAccessDecisionManager(mock(AccessDecisionManager.class));
-        si.setSecurityMetadataSource(mock(SecurityMetadataSource.class));
-        si.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsViolationOfGetSecureObjectClassMethod() throws Exception {
+		MockSecurityInterceptorReturnsNull si = new MockSecurityInterceptorReturnsNull();
+		si.setRunAsManager(mock(RunAsManager.class));
+		si.setAuthenticationManager(mock(AuthenticationManager.class));
+		si.setAfterInvocationManager(mock(AfterInvocationManager.class));
+		si.setAccessDecisionManager(mock(AccessDecisionManager.class));
+		si.setSecurityMetadataSource(mock(SecurityMetadataSource.class));
+		si.afterPropertiesSet();
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockSecurityInterceptorReturnsNull extends AbstractSecurityInterceptor {
-        private SecurityMetadataSource securityMetadataSource;
+	private class MockSecurityInterceptorReturnsNull extends AbstractSecurityInterceptor {
+		private SecurityMetadataSource securityMetadataSource;
 
-        public Class<?> getSecureObjectClass() {
-            return null;
-        }
+		public Class<?> getSecureObjectClass() {
+			return null;
+		}
 
-        public SecurityMetadataSource obtainSecurityMetadataSource() {
-            return securityMetadataSource;
-        }
+		public SecurityMetadataSource obtainSecurityMetadataSource() {
+			return securityMetadataSource;
+		}
 
-        public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) {
-            this.securityMetadataSource = securityMetadataSource;
-        }
-    }
+		public void setSecurityMetadataSource(
+				SecurityMetadataSource securityMetadataSource) {
+			this.securityMetadataSource = securityMetadataSource;
+		}
+	}
 
-    private class MockSecurityInterceptorWhichOnlySupportsStrings extends AbstractSecurityInterceptor {
-        private SecurityMetadataSource securityMetadataSource;
+	private class MockSecurityInterceptorWhichOnlySupportsStrings extends
+			AbstractSecurityInterceptor {
+		private SecurityMetadataSource securityMetadataSource;
 
-        public Class<?> getSecureObjectClass() {
-            return String.class;
-        }
+		public Class<?> getSecureObjectClass() {
+			return String.class;
+		}
 
-        public SecurityMetadataSource obtainSecurityMetadataSource() {
-            return securityMetadataSource;
-        }
+		public SecurityMetadataSource obtainSecurityMetadataSource() {
+			return securityMetadataSource;
+		}
 
-        public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) {
-            this.securityMetadataSource = securityMetadataSource;
-        }
-    }
+		public void setSecurityMetadataSource(
+				SecurityMetadataSource securityMetadataSource) {
+			this.securityMetadataSource = securityMetadataSource;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
index 24a835f294..5b14de781f 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java
@@ -30,7 +30,6 @@ import org.springframework.security.access.intercept.AfterInvocationProviderMana
 import org.springframework.security.core.Authentication;
 import org.springframework.security.util.SimpleMethodInvocation;
 
-
 /**
  * Tests {@link AfterInvocationProviderManager}.
  *
@@ -39,133 +38,160 @@ import org.springframework.security.util.SimpleMethodInvocation;
 @SuppressWarnings("unchecked")
 public class AfterInvocationProviderManagerTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testCorrectOperation() throws Exception {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
-        List list = new Vector();
-        list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP1")));
-        list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP2")));
-        list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP3")));
-        manager.setProviders(list);
-        assertEquals(list, manager.getProviders());
-        manager.afterPropertiesSet();
+	public void testCorrectOperation() throws Exception {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+		List list = new Vector();
+		list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP1")));
+		list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP2")));
+		list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP3")));
+		manager.setProviders(list);
+		assertEquals(list, manager.getProviders());
+		manager.afterPropertiesSet();
 
-        List<ConfigAttribute> attr1 = SecurityConfig.createList(new String[] {"GIVE_ME_SWAP1"});
-        List<ConfigAttribute> attr2 = SecurityConfig.createList(new String[] {"GIVE_ME_SWAP2"});
-        List<ConfigAttribute> attr3 = SecurityConfig.createList(new String[] {"GIVE_ME_SWAP3"});
-        List<ConfigAttribute> attr2and3 = SecurityConfig.createList(new String[] {"GIVE_ME_SWAP2","GIVE_ME_SWAP3"});
-        List<ConfigAttribute> attr4 = SecurityConfig.createList(new String[] {"NEVER_CAUSES_SWAP"});
+		List<ConfigAttribute> attr1 = SecurityConfig
+				.createList(new String[] { "GIVE_ME_SWAP1" });
+		List<ConfigAttribute> attr2 = SecurityConfig
+				.createList(new String[] { "GIVE_ME_SWAP2" });
+		List<ConfigAttribute> attr3 = SecurityConfig
+				.createList(new String[] { "GIVE_ME_SWAP3" });
+		List<ConfigAttribute> attr2and3 = SecurityConfig.createList(new String[] {
+				"GIVE_ME_SWAP2", "GIVE_ME_SWAP3" });
+		List<ConfigAttribute> attr4 = SecurityConfig
+				.createList(new String[] { "NEVER_CAUSES_SWAP" });
 
-        assertEquals("swap1", manager.decide(null, new SimpleMethodInvocation(), attr1, "content-before-swapping"));
+		assertEquals("swap1", manager.decide(null, new SimpleMethodInvocation(), attr1,
+				"content-before-swapping"));
 
-        assertEquals("swap2", manager.decide(null, new SimpleMethodInvocation(), attr2, "content-before-swapping"));
+		assertEquals("swap2", manager.decide(null, new SimpleMethodInvocation(), attr2,
+				"content-before-swapping"));
 
-        assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(), attr3, "content-before-swapping"));
+		assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(), attr3,
+				"content-before-swapping"));
 
-        assertEquals("content-before-swapping",
-            manager.decide(null, new SimpleMethodInvocation(), attr4, "content-before-swapping"));
+		assertEquals("content-before-swapping", manager.decide(null,
+				new SimpleMethodInvocation(), attr4, "content-before-swapping"));
 
-        assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(), attr2and3, "content-before-swapping"));
-    }
+		assertEquals("swap3", manager.decide(null, new SimpleMethodInvocation(),
+				attr2and3, "content-before-swapping"));
+	}
 
-    public void testRejectsEmptyProvidersList() {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
-        List list = new Vector();
+	public void testRejectsEmptyProvidersList() {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+		List list = new Vector();
 
-        try {
-            manager.setProviders(list);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			manager.setProviders(list);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRejectsNonAfterInvocationProviders() {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
-        List list = new Vector();
-        list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP1")));
-        list.add(Integer.valueOf(45));
-        list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP3")));
+	public void testRejectsNonAfterInvocationProviders() {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+		List list = new Vector();
+		list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP1")));
+		list.add(Integer.valueOf(45));
+		list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP3")));
 
-        try {
-            manager.setProviders(list);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			manager.setProviders(list);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRejectsNullProvidersList() throws Exception {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+	public void testRejectsNullProvidersList() throws Exception {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
 
-        try {
-            manager.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			manager.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testSupportsConfigAttributeIteration()
-        throws Exception {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
-        List list = new Vector();
-        list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP1")));
-        list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP2")));
-        list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP3")));
-        manager.setProviders(list);
-        manager.afterPropertiesSet();
+	public void testSupportsConfigAttributeIteration() throws Exception {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+		List list = new Vector();
+		list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP1")));
+		list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP2")));
+		list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP3")));
+		manager.setProviders(list);
+		manager.afterPropertiesSet();
 
-        assertFalse(manager.supports(new SecurityConfig("UNKNOWN_ATTRIB")));
-        assertTrue(manager.supports(new SecurityConfig("GIVE_ME_SWAP2")));
-    }
+		assertFalse(manager.supports(new SecurityConfig("UNKNOWN_ATTRIB")));
+		assertTrue(manager.supports(new SecurityConfig("GIVE_ME_SWAP2")));
+	}
 
-    public void testSupportsSecureObjectIteration() throws Exception {
-        AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
-        List list = new Vector();
-        list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP1")));
-        list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP2")));
-        list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class, new SecurityConfig("GIVE_ME_SWAP3")));
-        manager.setProviders(list);
-        manager.afterPropertiesSet();
+	public void testSupportsSecureObjectIteration() throws Exception {
+		AfterInvocationProviderManager manager = new AfterInvocationProviderManager();
+		List list = new Vector();
+		list.add(new MockAfterInvocationProvider("swap1", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP1")));
+		list.add(new MockAfterInvocationProvider("swap2", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP2")));
+		list.add(new MockAfterInvocationProvider("swap3", MethodInvocation.class,
+				new SecurityConfig("GIVE_ME_SWAP3")));
+		manager.setProviders(list);
+		manager.afterPropertiesSet();
 
-//        assertFalse(manager.supports(FilterInvocation.class));
-        assertTrue(manager.supports(MethodInvocation.class));
-    }
+		// assertFalse(manager.supports(FilterInvocation.class));
+		assertTrue(manager.supports(MethodInvocation.class));
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    /**
-     * Always returns the constructor-defined <code>forceReturnObject</code>, provided the same configuration
-     * attribute was provided. Also stores the secure object it supports.
-     */
-    private class MockAfterInvocationProvider implements AfterInvocationProvider {
-        private Class secureObject;
-        private ConfigAttribute configAttribute;
-        private Object forceReturnObject;
+	/**
+	 * Always returns the constructor-defined <code>forceReturnObject</code>, provided the
+	 * same configuration attribute was provided. Also stores the secure object it
+	 * supports.
+	 */
+	private class MockAfterInvocationProvider implements AfterInvocationProvider {
+		private Class secureObject;
+		private ConfigAttribute configAttribute;
+		private Object forceReturnObject;
 
-        public MockAfterInvocationProvider(Object forceReturnObject, Class secureObject, ConfigAttribute configAttribute) {
-            this.forceReturnObject = forceReturnObject;
-            this.secureObject = secureObject;
-            this.configAttribute = configAttribute;
-        }
+		public MockAfterInvocationProvider(Object forceReturnObject, Class secureObject,
+				ConfigAttribute configAttribute) {
+			this.forceReturnObject = forceReturnObject;
+			this.secureObject = secureObject;
+			this.configAttribute = configAttribute;
+		}
 
-        public Object decide(Authentication authentication, Object object, Collection<ConfigAttribute> config,
-            Object returnedObject) throws AccessDeniedException {
-            if (config.contains(configAttribute)) {
-                return forceReturnObject;
-            }
+		public Object decide(Authentication authentication, Object object,
+				Collection<ConfigAttribute> config, Object returnedObject)
+				throws AccessDeniedException {
+			if (config.contains(configAttribute)) {
+				return forceReturnObject;
+			}
 
-            return returnedObject;
-        }
+			return returnedObject;
+		}
 
-        public boolean supports(Class<?> clazz) {
-            return secureObject.isAssignableFrom(clazz);
-        }
+		public boolean supports(Class<?> clazz) {
+			return secureObject.isAssignableFrom(clazz);
+		}
 
-        public boolean supports(ConfigAttribute attribute) {
-            return attribute.equals(configAttribute);
-        }
-    }
+		public boolean supports(ConfigAttribute attribute) {
+			return attribute.equals(configAttribute);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
index dc32e4d27e..c35050b477 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/InterceptorStatusTokenTests.java
@@ -27,7 +27,6 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.SimpleMethodInvocation;
 
-
 /**
  * Tests {@link InterceptorStatusToken}.
  *
@@ -35,16 +34,16 @@ import org.springframework.security.util.SimpleMethodInvocation;
  */
 public class InterceptorStatusTokenTests {
 
-    @Test
-    public void testOperation() {
-        List<ConfigAttribute> attr = SecurityConfig.createList("FOO");
-        MethodInvocation mi = new SimpleMethodInvocation();
-        SecurityContext ctx = SecurityContextHolder.createEmptyContext();
-        InterceptorStatusToken token = new InterceptorStatusToken(ctx, true, attr, mi);
+	@Test
+	public void testOperation() {
+		List<ConfigAttribute> attr = SecurityConfig.createList("FOO");
+		MethodInvocation mi = new SimpleMethodInvocation();
+		SecurityContext ctx = SecurityContextHolder.createEmptyContext();
+		InterceptorStatusToken token = new InterceptorStatusToken(ctx, true, attr, mi);
 
-        assertTrue(token.isContextHolderRefreshRequired());
-        assertEquals(attr, token.getAttributes());
-        assertEquals(mi, token.getSecureObject());
-        assertSame(ctx, token.getSecurityContext());
-    }
+		assertTrue(token.isContextHolderRefreshRequired());
+		assertEquals(attr, token.getAttributes());
+		assertEquals(mi, token.getSecureObject());
+		assertSame(ctx, token.getSecurityContext());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
index a32e0d32a9..3d0666fd7f 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/NullRunAsManagerTests.java
@@ -20,31 +20,31 @@ import junit.framework.TestCase;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.access.intercept.NullRunAsManager;
 
-
 /**
  * Tests {@link NullRunAsManager}.
  *
  * @author Ben Alex
  */
 public class NullRunAsManagerTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testAlwaysReturnsNull() {
-        NullRunAsManager runAs = new NullRunAsManager();
-        assertNull(runAs.buildRunAs(null, null, null));
-    }
+	public void testAlwaysReturnsNull() {
+		NullRunAsManager runAs = new NullRunAsManager();
+		assertNull(runAs.buildRunAs(null, null, null));
+	}
 
-    public void testAlwaysSupportsClass() {
-        NullRunAsManager runAs = new NullRunAsManager();
-        assertTrue(runAs.supports(String.class));
-    }
+	public void testAlwaysSupportsClass() {
+		NullRunAsManager runAs = new NullRunAsManager();
+		assertTrue(runAs.supports(String.class));
+	}
 
-    public void testNeverSupportsAttribute() {
-        NullRunAsManager runAs = new NullRunAsManager();
-        assertFalse(runAs.supports(new SecurityConfig("X")));
-    }
+	public void testNeverSupportsAttribute() {
+		NullRunAsManager runAs = new NullRunAsManager();
+		assertFalse(runAs.supports(new SecurityConfig("X")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
index 903d863634..45d3be3a6d 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsImplAuthenticationProviderTests.java
@@ -24,56 +24,58 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link RunAsImplAuthenticationProvider}.
  */
 public class RunAsImplAuthenticationProviderTests {
 
-    @Test(expected = BadCredentialsException.class)
-    public void testAuthenticationFailDueToWrongKey() {
-        RunAsUserToken token = new RunAsUserToken("wrong_key", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
-        RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
-        provider.setKey("hello_world");
+	@Test(expected = BadCredentialsException.class)
+	public void testAuthenticationFailDueToWrongKey() {
+		RunAsUserToken token = new RunAsUserToken("wrong_key", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				UsernamePasswordAuthenticationToken.class);
+		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
+		provider.setKey("hello_world");
 
-        provider.authenticate(token);
-    }
+		provider.authenticate(token);
+	}
 
-    @Test
-    public void testAuthenticationSuccess() {
-        RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
-        RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
-        provider.setKey("my_password");
+	@Test
+	public void testAuthenticationSuccess() {
+		RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				UsernamePasswordAuthenticationToken.class);
+		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
+		provider.setKey("my_password");
 
-        Authentication result = provider.authenticate(token);
+		Authentication result = provider.authenticate(token);
 
-        Assert.assertTrue("Should have returned RunAsUserToken", result instanceof RunAsUserToken);
+		Assert.assertTrue("Should have returned RunAsUserToken",
+				result instanceof RunAsUserToken);
 
-        RunAsUserToken resultCast = (RunAsUserToken) result;
-        assertEquals("my_password".hashCode(), resultCast.getKeyHash());
-    }
+		RunAsUserToken resultCast = (RunAsUserToken) result;
+		assertEquals("my_password".hashCode(), resultCast.getKeyHash());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testStartupFailsIfNoKey() throws Exception {
-        RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
+	@Test(expected = IllegalArgumentException.class)
+	public void testStartupFailsIfNoKey() throws Exception {
+		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
 
-        provider.afterPropertiesSet();
-    }
+		provider.afterPropertiesSet();
+	}
 
-    @Test
-    public void testStartupSuccess() throws Exception {
-        RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
-        provider.setKey("hello_world");
-        assertEquals("hello_world", provider.getKey());
-        provider.afterPropertiesSet();
-    }
+	@Test
+	public void testStartupSuccess() throws Exception {
+		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
+		provider.setKey("hello_world");
+		assertEquals("hello_world", provider.getKey());
+		provider.afterPropertiesSet();
+	}
 
-    @Test
-    public void testSupports() {
-        RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
-        assertTrue(provider.supports(RunAsUserToken.class));
-        assertTrue(!provider.supports(TestingAuthenticationToken.class));
-    }
+	@Test
+	public void testSupports() {
+		RunAsImplAuthenticationProvider provider = new RunAsImplAuthenticationProvider();
+		assertTrue(provider.supports(RunAsUserToken.class));
+		assertTrue(!provider.supports(TestingAuthenticationToken.class));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
index e6e2b0979b..553c1542bb 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsManagerImplTests.java
@@ -24,99 +24,108 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link RunAsManagerImpl}.
  *
  * @author Ben Alex
  */
 public class RunAsManagerImplTests extends TestCase {
-    public void testAlwaysSupportsClass() {
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
-        assertTrue(runAs.supports(String.class));
-    }
+	public void testAlwaysSupportsClass() {
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
+		assertTrue(runAs.supports(String.class));
+	}
 
-    public void testDoesNotReturnAdditionalAuthoritiesIfCalledWithoutARunAsSetting() throws Exception {
-        UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	public void testDoesNotReturnAdditionalAuthoritiesIfCalledWithoutARunAsSetting()
+			throws Exception {
+		UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
 
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
-        runAs.setKey("my_password");
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
+		runAs.setKey("my_password");
 
-        Authentication resultingToken = runAs.buildRunAs(inputToken, new Object(), SecurityConfig.createList("SOMETHING_WE_IGNORE"));
-        assertEquals(null, resultingToken);
-    }
+		Authentication resultingToken = runAs.buildRunAs(inputToken, new Object(),
+				SecurityConfig.createList("SOMETHING_WE_IGNORE"));
+		assertEquals(null, resultingToken);
+	}
 
-    public void testRespectsRolePrefix() throws Exception {
-        UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ONE", "TWO"));
+	public void testRespectsRolePrefix() throws Exception {
+		UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ONE", "TWO"));
 
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
-        runAs.setKey("my_password");
-        runAs.setRolePrefix("FOOBAR_");
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
+		runAs.setKey("my_password");
+		runAs.setRolePrefix("FOOBAR_");
 
-        Authentication result = runAs.buildRunAs(inputToken, new Object(), SecurityConfig.createList("RUN_AS_SOMETHING"));
+		Authentication result = runAs.buildRunAs(inputToken, new Object(),
+				SecurityConfig.createList("RUN_AS_SOMETHING"));
 
-        assertTrue("Should have returned a RunAsUserToken", result instanceof RunAsUserToken);
-        assertEquals(inputToken.getPrincipal(), result.getPrincipal());
-        assertEquals(inputToken.getCredentials(), result.getCredentials());
-        Set<String> authorities = AuthorityUtils.authorityListToSet(result.getAuthorities());
+		assertTrue("Should have returned a RunAsUserToken",
+				result instanceof RunAsUserToken);
+		assertEquals(inputToken.getPrincipal(), result.getPrincipal());
+		assertEquals(inputToken.getCredentials(), result.getCredentials());
+		Set<String> authorities = AuthorityUtils.authorityListToSet(result
+				.getAuthorities());
 
-        assertTrue(authorities.contains("FOOBAR_RUN_AS_SOMETHING"));
-        assertTrue(authorities.contains("ONE"));
-        assertTrue(authorities.contains("TWO"));
+		assertTrue(authorities.contains("FOOBAR_RUN_AS_SOMETHING"));
+		assertTrue(authorities.contains("ONE"));
+		assertTrue(authorities.contains("TWO"));
 
-        RunAsUserToken resultCast = (RunAsUserToken) result;
-        assertEquals("my_password".hashCode(), resultCast.getKeyHash());
-    }
+		RunAsUserToken resultCast = (RunAsUserToken) result;
+		assertEquals("my_password".hashCode(), resultCast.getKeyHash());
+	}
 
-    public void testReturnsAdditionalGrantedAuthorities() throws Exception {
-        UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	public void testReturnsAdditionalGrantedAuthorities() throws Exception {
+		UsernamePasswordAuthenticationToken inputToken = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
 
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
-        runAs.setKey("my_password");
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
+		runAs.setKey("my_password");
 
-        Authentication result = runAs.buildRunAs(inputToken, new Object(), SecurityConfig.createList("RUN_AS_SOMETHING"));
+		Authentication result = runAs.buildRunAs(inputToken, new Object(),
+				SecurityConfig.createList("RUN_AS_SOMETHING"));
 
-        if (!(result instanceof RunAsUserToken)) {
-            fail("Should have returned a RunAsUserToken");
-        }
+		if (!(result instanceof RunAsUserToken)) {
+			fail("Should have returned a RunAsUserToken");
+		}
 
-        assertEquals(inputToken.getPrincipal(), result.getPrincipal());
-        assertEquals(inputToken.getCredentials(), result.getCredentials());
+		assertEquals(inputToken.getPrincipal(), result.getPrincipal());
+		assertEquals(inputToken.getCredentials(), result.getCredentials());
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(result.getAuthorities());
-        assertTrue(authorities.contains("ROLE_RUN_AS_SOMETHING"));
-        assertTrue(authorities.contains("ROLE_ONE"));
-        assertTrue(authorities.contains("ROLE_TWO"));
+		Set<String> authorities = AuthorityUtils.authorityListToSet(result
+				.getAuthorities());
+		assertTrue(authorities.contains("ROLE_RUN_AS_SOMETHING"));
+		assertTrue(authorities.contains("ROLE_ONE"));
+		assertTrue(authorities.contains("ROLE_TWO"));
 
-        RunAsUserToken resultCast = (RunAsUserToken) result;
-        assertEquals("my_password".hashCode(), resultCast.getKeyHash());
-    }
+		RunAsUserToken resultCast = (RunAsUserToken) result;
+		assertEquals("my_password".hashCode(), resultCast.getKeyHash());
+	}
 
-    public void testStartupDetectsMissingKey() throws Exception {
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
+	public void testStartupDetectsMissingKey() throws Exception {
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
 
-        try {
-            runAs.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			runAs.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testStartupSuccessfulWithKey() throws Exception {
-        RunAsManagerImpl runAs = new RunAsManagerImpl();
-        runAs.setKey("hello_world");
-        runAs.afterPropertiesSet();
-        assertEquals("hello_world", runAs.getKey());
-    }
+	public void testStartupSuccessfulWithKey() throws Exception {
+		RunAsManagerImpl runAs = new RunAsManagerImpl();
+		runAs.setKey("hello_world");
+		runAs.afterPropertiesSet();
+		assertEquals("hello_world", runAs.getKey());
+	}
 
-    public void testSupports() throws Exception {
-        RunAsManager runAs = new RunAsManagerImpl();
-        assertTrue(runAs.supports(new SecurityConfig("RUN_AS_SOMETHING")));
-        assertTrue(!runAs.supports(new SecurityConfig("ROLE_WHICH_IS_IGNORED")));
-        assertTrue(!runAs.supports(new SecurityConfig("role_LOWER_CASE_FAILS")));
-    }
+	public void testSupports() throws Exception {
+		RunAsManager runAs = new RunAsManagerImpl();
+		assertTrue(runAs.supports(new SecurityConfig("RUN_AS_SOMETHING")));
+		assertTrue(!runAs.supports(new SecurityConfig("ROLE_WHICH_IS_IGNORED")));
+		assertTrue(!runAs.supports(new SecurityConfig("role_LOWER_CASE_FAILS")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java b/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
index 2ce5ec6a29..e3d8b794bc 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/RunAsUserTokenTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link RunAsUserToken}.
  *
@@ -27,44 +26,51 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class RunAsUserTokenTests extends TestCase {
 
-    public void testAuthenticationSetting() {
-        RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
-    }
+	public void testAuthenticationSetting() {
+		RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				UsernamePasswordAuthenticationToken.class);
+		assertTrue(token.isAuthenticated());
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
+	}
 
-    public void testGetters() {
-        RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("Password", token.getCredentials());
-        assertEquals("my_password".hashCode(), token.getKeyHash());
-        assertEquals(UsernamePasswordAuthenticationToken.class, token.getOriginalAuthentication());
-    }
+	public void testGetters() {
+		RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				UsernamePasswordAuthenticationToken.class);
+		assertEquals("Test", token.getPrincipal());
+		assertEquals("Password", token.getCredentials());
+		assertEquals("my_password".hashCode(), token.getKeyHash());
+		assertEquals(UsernamePasswordAuthenticationToken.class,
+				token.getOriginalAuthentication());
+	}
 
-    public void testNoArgConstructorDoesntExist() {
-        Class<RunAsUserToken> clazz = RunAsUserToken.class;
+	public void testNoArgConstructorDoesntExist() {
+		Class<RunAsUserToken> clazz = RunAsUserToken.class;
 
-        try {
-            clazz.getDeclaredConstructor((Class[]) null);
-            fail("Should have thrown NoSuchMethodException");
-        } catch (NoSuchMethodException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			clazz.getDeclaredConstructor((Class[]) null);
+			fail("Should have thrown NoSuchMethodException");
+		}
+		catch (NoSuchMethodException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testToString() {
-        RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), UsernamePasswordAuthenticationToken.class);
-        assertTrue(token.toString().lastIndexOf("Original Class: "+UsernamePasswordAuthenticationToken.class.getName().toString()) != -1);
-    }
+	public void testToString() {
+		RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				UsernamePasswordAuthenticationToken.class);
+		assertTrue(token.toString().lastIndexOf(
+				"Original Class: "
+						+ UsernamePasswordAuthenticationToken.class.getName().toString()) != -1);
+	}
 
-    // SEC-1792
-    public void testToStringNullOriginalAuthentication() {
-        RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), null);
-        assertTrue(token.toString().lastIndexOf("Original Class: null") != -1);
-    }
+	// SEC-1792
+	public void testToStringNullOriginalAuthentication() {
+		RunAsUserToken token = new RunAsUserToken("my_password", "Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"), null);
+		assertTrue(token.toString().lastIndexOf("Original Class: null") != -1);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java
index 87006a9bb9..0b38193282 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityInterceptorTests.java
@@ -45,6 +45,7 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.*;
+
 /**
  * Tests {@link MethodSecurityInterceptor}.
  *
@@ -53,277 +54,302 @@ import java.util.*;
  */
 @SuppressWarnings("unchecked")
 public class MethodSecurityInterceptorTests {
-    private TestingAuthenticationToken token;
-    private MethodSecurityInterceptor interceptor;
-    private ITargetObject realTarget;
-    private ITargetObject advisedTarget;
-    private AccessDecisionManager adm;
-    private MethodSecurityMetadataSource mds;
-    private AuthenticationManager authman;
-    private ApplicationEventPublisher eventPublisher;
+	private TestingAuthenticationToken token;
+	private MethodSecurityInterceptor interceptor;
+	private ITargetObject realTarget;
+	private ITargetObject advisedTarget;
+	private AccessDecisionManager adm;
+	private MethodSecurityMetadataSource mds;
+	private AuthenticationManager authman;
+	private ApplicationEventPublisher eventPublisher;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public final void setUp() throws Exception {
-        SecurityContextHolder.clearContext();
-        token = new TestingAuthenticationToken("Test", "Password");
-        interceptor = new MethodSecurityInterceptor();
-        adm = mock(AccessDecisionManager.class);
-        authman = mock(AuthenticationManager.class);
-        mds = mock(MethodSecurityMetadataSource.class);
-        eventPublisher = mock(ApplicationEventPublisher.class);
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setAuthenticationManager(authman);
-        interceptor.setSecurityMetadataSource(mds);
-        interceptor.setApplicationEventPublisher(eventPublisher);
-        createTarget(false);
-    }
+	@Before
+	public final void setUp() throws Exception {
+		SecurityContextHolder.clearContext();
+		token = new TestingAuthenticationToken("Test", "Password");
+		interceptor = new MethodSecurityInterceptor();
+		adm = mock(AccessDecisionManager.class);
+		authman = mock(AuthenticationManager.class);
+		mds = mock(MethodSecurityMetadataSource.class);
+		eventPublisher = mock(ApplicationEventPublisher.class);
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setAuthenticationManager(authman);
+		interceptor.setSecurityMetadataSource(mds);
+		interceptor.setApplicationEventPublisher(eventPublisher);
+		createTarget(false);
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    private void createTarget(boolean useMock) {
-        realTarget = useMock ? mock(ITargetObject.class) : new TargetObject();
-        ProxyFactory pf = new ProxyFactory(realTarget);
-        pf.addAdvice(interceptor);
-        advisedTarget = (ITargetObject) pf.getProxy();
-    }
+	private void createTarget(boolean useMock) {
+		realTarget = useMock ? mock(ITargetObject.class) : new TargetObject();
+		ProxyFactory pf = new ProxyFactory(realTarget);
+		pf.addAdvice(interceptor);
+		advisedTarget = (ITargetObject) pf.getProxy();
+	}
 
-    @Test
-    public void gettersReturnExpectedData() {
-        RunAsManager runAs = mock(RunAsManager.class);
-        AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        interceptor.setRunAsManager(runAs);
-        interceptor.setAfterInvocationManager(aim);
-        assertEquals(adm, interceptor.getAccessDecisionManager());
-        assertEquals(runAs, interceptor.getRunAsManager());
-        assertEquals(authman, interceptor.getAuthenticationManager());
-        assertEquals(mds, interceptor.getSecurityMetadataSource());
-        assertEquals(aim, interceptor.getAfterInvocationManager());
-    }
+	@Test
+	public void gettersReturnExpectedData() {
+		RunAsManager runAs = mock(RunAsManager.class);
+		AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		interceptor.setRunAsManager(runAs);
+		interceptor.setAfterInvocationManager(aim);
+		assertEquals(adm, interceptor.getAccessDecisionManager());
+		assertEquals(runAs, interceptor.getRunAsManager());
+		assertEquals(authman, interceptor.getAuthenticationManager());
+		assertEquals(mds, interceptor.getSecurityMetadataSource());
+		assertEquals(aim, interceptor.getAfterInvocationManager());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void missingAccessDecisionManagerIsDetected() throws Exception {
-        interceptor.setAccessDecisionManager(null);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void missingAccessDecisionManagerIsDetected() throws Exception {
+		interceptor.setAccessDecisionManager(null);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void missingAuthenticationManagerIsDetected() throws Exception {
-        interceptor.setAuthenticationManager(null);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void missingAuthenticationManagerIsDetected() throws Exception {
+		interceptor.setAuthenticationManager(null);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void missingMethodSecurityMetadataSourceIsRejected() throws Exception {
-        interceptor.setSecurityMetadataSource(null);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void missingMethodSecurityMetadataSourceIsRejected() throws Exception {
+		interceptor.setSecurityMetadataSource(null);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void missingRunAsManagerIsRejected() throws Exception {
-        interceptor.setRunAsManager(null);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void missingRunAsManagerIsRejected() throws Exception {
+		interceptor.setRunAsManager(null);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void initializationRejectsSecurityMetadataSourceThatDoesNotSupportMethodInvocation() throws Throwable {
-        when(mds.supports(MethodInvocation.class)).thenReturn(false);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void initializationRejectsSecurityMetadataSourceThatDoesNotSupportMethodInvocation()
+			throws Throwable {
+		when(mds.supports(MethodInvocation.class)).thenReturn(false);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void initializationRejectsAccessDecisionManagerThatDoesNotSupportMethodInvocation() throws Exception {
-        when(mds.supports(MethodInvocation.class)).thenReturn(true);
-        when(adm.supports(MethodInvocation.class)).thenReturn(false);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void initializationRejectsAccessDecisionManagerThatDoesNotSupportMethodInvocation()
+			throws Exception {
+		when(mds.supports(MethodInvocation.class)).thenReturn(true);
+		when(adm.supports(MethodInvocation.class)).thenReturn(false);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void intitalizationRejectsRunAsManagerThatDoesNotSupportMethodInvocation() throws Exception {
-        final RunAsManager ram = mock(RunAsManager.class);
-        when(ram.supports(MethodInvocation.class)).thenReturn(false);
-        interceptor.setRunAsManager(ram);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void intitalizationRejectsRunAsManagerThatDoesNotSupportMethodInvocation()
+			throws Exception {
+		final RunAsManager ram = mock(RunAsManager.class);
+		when(ram.supports(MethodInvocation.class)).thenReturn(false);
+		interceptor.setRunAsManager(ram);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void intitalizationRejectsAfterInvocationManagerThatDoesNotSupportMethodInvocation() throws Exception {
-        final AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        when(aim.supports(MethodInvocation.class)).thenReturn(false);
-        interceptor.setAfterInvocationManager(aim);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void intitalizationRejectsAfterInvocationManagerThatDoesNotSupportMethodInvocation()
+			throws Exception {
+		final AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		when(aim.supports(MethodInvocation.class)).thenReturn(false);
+		interceptor.setAfterInvocationManager(aim);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void initializationFailsIfAccessDecisionManagerRejectsConfigAttributes() throws Exception {
-        when(adm.supports(any(ConfigAttribute.class))).thenReturn(false);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void initializationFailsIfAccessDecisionManagerRejectsConfigAttributes()
+			throws Exception {
+		when(adm.supports(any(ConfigAttribute.class))).thenReturn(false);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test
-    public void validationNotAttemptedIfIsValidateConfigAttributesSetToFalse() throws Exception {
-        when(adm.supports(MethodInvocation.class)).thenReturn(true);
-        when(mds.supports(MethodInvocation.class)).thenReturn(true);
-        interceptor.setValidateConfigAttributes(false);
-        interceptor.afterPropertiesSet();
-        verify(mds, never()).getAllConfigAttributes();
-        verify(adm, never()).supports(any(ConfigAttribute.class));
-    }
+	@Test
+	public void validationNotAttemptedIfIsValidateConfigAttributesSetToFalse()
+			throws Exception {
+		when(adm.supports(MethodInvocation.class)).thenReturn(true);
+		when(mds.supports(MethodInvocation.class)).thenReturn(true);
+		interceptor.setValidateConfigAttributes(false);
+		interceptor.afterPropertiesSet();
+		verify(mds, never()).getAllConfigAttributes();
+		verify(adm, never()).supports(any(ConfigAttribute.class));
+	}
 
-    @Test
-    public void validationNotAttemptedIfMethodSecurityMetadataSourceReturnsNullForAttributes() throws Exception {
-        when(adm.supports(MethodInvocation.class)).thenReturn(true);
-        when(mds.supports(MethodInvocation.class)).thenReturn(true);
-        when(mds.getAllConfigAttributes()).thenReturn(null);
+	@Test
+	public void validationNotAttemptedIfMethodSecurityMetadataSourceReturnsNullForAttributes()
+			throws Exception {
+		when(adm.supports(MethodInvocation.class)).thenReturn(true);
+		when(mds.supports(MethodInvocation.class)).thenReturn(true);
+		when(mds.getAllConfigAttributes()).thenReturn(null);
 
-        interceptor.setValidateConfigAttributes(true);
-        interceptor.afterPropertiesSet();
-        verify(adm, never()).supports(any(ConfigAttribute.class));
-    }
+		interceptor.setValidateConfigAttributes(true);
+		interceptor.afterPropertiesSet();
+		verify(adm, never()).supports(any(ConfigAttribute.class));
+	}
 
-    @Test
-    public void callingAPublicMethodFacadeWillNotRepeatSecurityChecksWhenPassedToTheSecuredMethodItFronts() {
-        mdsReturnsNull();
-        String result = advisedTarget.publicMakeLowerCase("HELLO");
-        assertEquals("hello Authentication empty", result);
-    }
+	@Test
+	public void callingAPublicMethodFacadeWillNotRepeatSecurityChecksWhenPassedToTheSecuredMethodItFronts() {
+		mdsReturnsNull();
+		String result = advisedTarget.publicMakeLowerCase("HELLO");
+		assertEquals("hello Authentication empty", result);
+	}
 
-    @Test
-    public void callingAPublicMethodWhenPresentingAnAuthenticationObjectDoesntChangeItsAuthenticatedProperty() {
-        mdsReturnsNull();
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertEquals("hello org.springframework.security.authentication.TestingAuthenticationToken false",
-                advisedTarget.publicMakeLowerCase("HELLO"));
-        assertTrue(!token.isAuthenticated());
-    }
+	@Test
+	public void callingAPublicMethodWhenPresentingAnAuthenticationObjectDoesntChangeItsAuthenticatedProperty() {
+		mdsReturnsNull();
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertEquals(
+				"hello org.springframework.security.authentication.TestingAuthenticationToken false",
+				advisedTarget.publicMakeLowerCase("HELLO"));
+		assertTrue(!token.isAuthenticated());
+	}
 
-    @Test(expected=AuthenticationException.class)
-    public void callIsntMadeWhenAuthenticationManagerRejectsAuthentication() throws Exception {
-        final TestingAuthenticationToken token = new TestingAuthenticationToken("Test", "Password");
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test(expected = AuthenticationException.class)
+	public void callIsntMadeWhenAuthenticationManagerRejectsAuthentication()
+			throws Exception {
+		final TestingAuthenticationToken token = new TestingAuthenticationToken("Test",
+				"Password");
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        mdsReturnsUserRole();
-        when(authman.authenticate(token)).thenThrow(new BadCredentialsException("rejected"));
+		mdsReturnsUserRole();
+		when(authman.authenticate(token)).thenThrow(
+				new BadCredentialsException("rejected"));
 
-        advisedTarget.makeLowerCase("HELLO");
-    }
+		advisedTarget.makeLowerCase("HELLO");
+	}
 
-    @Test
-    public void callSucceedsIfAccessDecisionManagerGrantsAccess() throws Exception {
-        token.setAuthenticated(true);
-        interceptor.setPublishAuthorizationSuccess(true);
-        SecurityContextHolder.getContext().setAuthentication(token);
-        mdsReturnsUserRole();
+	@Test
+	public void callSucceedsIfAccessDecisionManagerGrantsAccess() throws Exception {
+		token.setAuthenticated(true);
+		interceptor.setPublishAuthorizationSuccess(true);
+		SecurityContextHolder.getContext().setAuthentication(token);
+		mdsReturnsUserRole();
 
-        String result = advisedTarget.makeLowerCase("HELLO");
+		String result = advisedTarget.makeLowerCase("HELLO");
 
-        // Note we check the isAuthenticated remained true in following line
-        assertEquals("hello org.springframework.security.authentication.TestingAuthenticationToken true", result);
-        verify(eventPublisher).publishEvent(any(AuthorizedEvent.class));
-    }
+		// Note we check the isAuthenticated remained true in following line
+		assertEquals(
+				"hello org.springframework.security.authentication.TestingAuthenticationToken true",
+				result);
+		verify(eventPublisher).publishEvent(any(AuthorizedEvent.class));
+	}
 
-    @Test
-    public void callIsntMadeWhenAccessDecisionManagerRejectsAccess() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(token);
-        // Use mocked target to make sure invocation doesn't happen (not in expectations so test would fail)
-        createTarget(true);
-        mdsReturnsUserRole();
-        when(authman.authenticate(token)).thenReturn(token);
-        doThrow(new AccessDeniedException("rejected")).when(adm).decide(any(Authentication.class), any(MethodInvocation.class), any(List.class));
+	@Test
+	public void callIsntMadeWhenAccessDecisionManagerRejectsAccess() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(token);
+		// Use mocked target to make sure invocation doesn't happen (not in expectations
+		// so test would fail)
+		createTarget(true);
+		mdsReturnsUserRole();
+		when(authman.authenticate(token)).thenReturn(token);
+		doThrow(new AccessDeniedException("rejected")).when(adm).decide(
+				any(Authentication.class), any(MethodInvocation.class), any(List.class));
 
-        try {
-            advisedTarget.makeUpperCase("HELLO");
-            fail();
-        } catch (AccessDeniedException expected) {
-        }
-        verify(eventPublisher).publishEvent(any(AuthorizationFailureEvent.class));
-    }
+		try {
+			advisedTarget.makeUpperCase("HELLO");
+			fail();
+		}
+		catch (AccessDeniedException expected) {
+		}
+		verify(eventPublisher).publishEvent(any(AuthorizationFailureEvent.class));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void rejectsNullSecuredObjects() throws Throwable {
-        interceptor.invoke(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullSecuredObjects() throws Throwable {
+		interceptor.invoke(null);
+	}
 
-    @Test
-    public void runAsReplacementIsCorrectlySet() throws Exception {
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        ctx.setAuthentication(token);
-        token.setAuthenticated(true);
-        final RunAsManager runAs = mock(RunAsManager.class);
-        final RunAsUserToken runAsToken =
-            new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), TestingAuthenticationToken.class);
-        interceptor.setRunAsManager(runAs);
-        mdsReturnsUserRole();
-        when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken);
+	@Test
+	public void runAsReplacementIsCorrectlySet() throws Exception {
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		ctx.setAuthentication(token);
+		token.setAuthenticated(true);
+		final RunAsManager runAs = mock(RunAsManager.class);
+		final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds",
+				token.getAuthorities(), TestingAuthenticationToken.class);
+		interceptor.setRunAsManager(runAs);
+		mdsReturnsUserRole();
+		when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class)))
+				.thenReturn(runAsToken);
 
-        String result = advisedTarget.makeUpperCase("hello");
-        assertEquals("HELLO org.springframework.security.access.intercept.RunAsUserToken true", result);
-        // Check we've changed back
-        assertSame(ctx, SecurityContextHolder.getContext());
-        assertSame(token, SecurityContextHolder.getContext().getAuthentication());
-    }
+		String result = advisedTarget.makeUpperCase("hello");
+		assertEquals(
+				"HELLO org.springframework.security.access.intercept.RunAsUserToken true",
+				result);
+		// Check we've changed back
+		assertSame(ctx, SecurityContextHolder.getContext());
+		assertSame(token, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    // SEC-1967
-    @Test
-    public void runAsReplacementCleansAfterException() throws Exception {
-        createTarget(true);
-        when(realTarget.makeUpperCase(anyString())).thenThrow(new RuntimeException());
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        ctx.setAuthentication(token);
-        token.setAuthenticated(true);
-        final RunAsManager runAs = mock(RunAsManager.class);
-        final RunAsUserToken runAsToken =
-            new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), TestingAuthenticationToken.class);
-        interceptor.setRunAsManager(runAs);
-        mdsReturnsUserRole();
-        when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken);
+	// SEC-1967
+	@Test
+	public void runAsReplacementCleansAfterException() throws Exception {
+		createTarget(true);
+		when(realTarget.makeUpperCase(anyString())).thenThrow(new RuntimeException());
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		ctx.setAuthentication(token);
+		token.setAuthenticated(true);
+		final RunAsManager runAs = mock(RunAsManager.class);
+		final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds",
+				token.getAuthorities(), TestingAuthenticationToken.class);
+		interceptor.setRunAsManager(runAs);
+		mdsReturnsUserRole();
+		when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class)))
+				.thenReturn(runAsToken);
 
-        try {
-            advisedTarget.makeUpperCase("hello");
-            fail("Expected Exception");
-        }catch(RuntimeException success) {}
+		try {
+			advisedTarget.makeUpperCase("hello");
+			fail("Expected Exception");
+		}
+		catch (RuntimeException success) {
+		}
 
-        // Check we've changed back
-        assertSame(ctx, SecurityContextHolder.getContext());
-        assertSame(token, SecurityContextHolder.getContext().getAuthentication());
-    }
+		// Check we've changed back
+		assertSame(ctx, SecurityContextHolder.getContext());
+		assertSame(token, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test(expected=AuthenticationCredentialsNotFoundException.class)
-    public void emptySecurityContextIsRejected() throws Exception {
-        mdsReturnsUserRole();
-        advisedTarget.makeUpperCase("hello");
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void emptySecurityContextIsRejected() throws Exception {
+		mdsReturnsUserRole();
+		advisedTarget.makeUpperCase("hello");
+	}
 
-    @Test
-    public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throwable {
-        MethodInvocation mi = mock(MethodInvocation.class);
-        token.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(token);
-        mdsReturnsUserRole();
+	@Test
+	public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throwable {
+		MethodInvocation mi = mock(MethodInvocation.class);
+		token.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(token);
+		mdsReturnsUserRole();
 
-        AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        interceptor.setAfterInvocationManager(aim);
+		AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		interceptor.setAfterInvocationManager(aim);
 
-        when(mi.proceed()).thenThrow(new Throwable());
+		when(mi.proceed()).thenThrow(new Throwable());
 
-        try {
-            interceptor.invoke(mi);
-            fail("Expected exception");
-        } catch (Throwable expected) {
-        }
+		try {
+			interceptor.invoke(mi);
+			fail("Expected exception");
+		}
+		catch (Throwable expected) {
+		}
 
-        verifyZeroInteractions(aim);
-    }
+		verifyZeroInteractions(aim);
+	}
 
-    void mdsReturnsNull() {
-        when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(null);
-    }
+	void mdsReturnsNull() {
+		when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(null);
+	}
 
-    void mdsReturnsUserRole() {
-        when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(SecurityConfig.createList("ROLE_USER"));
-    }
+	void mdsReturnsUserRole() {
+		when(mds.getAttributes(any(MethodInvocation.class))).thenReturn(
+				SecurityConfig.createList("ROLE_USER"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
index 9f73922f6e..765273f22e 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/aopalliance/MethodSecurityMetadataSourceAdvisorTests.java
@@ -31,26 +31,29 @@ import org.springframework.security.access.method.MethodSecurityMetadataSource;
  * @author Ben Alex
  */
 public class MethodSecurityMetadataSourceAdvisorTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testAdvisorReturnsFalseWhenMethodInvocationNotDefined() throws Exception {
-        Class<TargetObject> clazz = TargetObject.class;
-        Method method = clazz.getMethod("makeLowerCase", new Class[] {String.class});
+	public void testAdvisorReturnsFalseWhenMethodInvocationNotDefined() throws Exception {
+		Class<TargetObject> clazz = TargetObject.class;
+		Method method = clazz.getMethod("makeLowerCase", new Class[] { String.class });
 
-        MethodSecurityMetadataSource mds = mock(MethodSecurityMetadataSource.class);
-        when(mds.getAttributes(method, clazz)).thenReturn(null);
-        MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor("", mds ,"");
-        assertFalse(advisor.getPointcut().getMethodMatcher().matches(method, clazz));
-    }
+		MethodSecurityMetadataSource mds = mock(MethodSecurityMetadataSource.class);
+		when(mds.getAttributes(method, clazz)).thenReturn(null);
+		MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor(
+				"", mds, "");
+		assertFalse(advisor.getPointcut().getMethodMatcher().matches(method, clazz));
+	}
 
-    public void testAdvisorReturnsTrueWhenMethodInvocationIsDefined()
-        throws Exception {
-        Class<TargetObject> clazz = TargetObject.class;
-        Method method = clazz.getMethod("countLength", new Class[] {String.class});
+	public void testAdvisorReturnsTrueWhenMethodInvocationIsDefined() throws Exception {
+		Class<TargetObject> clazz = TargetObject.class;
+		Method method = clazz.getMethod("countLength", new Class[] { String.class });
 
-        MethodSecurityMetadataSource mds = mock(MethodSecurityMetadataSource.class);
-        when(mds.getAttributes(method, clazz)).thenReturn(SecurityConfig.createList("ROLE_A"));
-        MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor("", mds ,"");
-        assertTrue(advisor.getPointcut().getMethodMatcher().matches(method, clazz));
-    }
+		MethodSecurityMetadataSource mds = mock(MethodSecurityMetadataSource.class);
+		when(mds.getAttributes(method, clazz)).thenReturn(
+				SecurityConfig.createList("ROLE_A"));
+		MethodSecurityMetadataSourceAdvisor advisor = new MethodSecurityMetadataSourceAdvisor(
+				"", mds, "");
+		assertTrue(advisor.getPointcut().getMethodMatcher().matches(method, clazz));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java
index 5ec0f7a26e..56d36919b7 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/aspectj/AspectJMethodSecurityInterceptorTests.java
@@ -48,7 +48,6 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.List;
 
-
 /**
  * Tests {@link AspectJMethodSecurityInterceptor}.
  *
@@ -57,148 +56,162 @@ import java.util.List;
  * @author Rob Winch
  */
 public class AspectJMethodSecurityInterceptorTests {
-    private TestingAuthenticationToken token;
-    private AspectJMethodSecurityInterceptor interceptor;
-    private @Mock AccessDecisionManager adm;
-    private @Mock MethodSecurityMetadataSource mds;
-    private @Mock AuthenticationManager authman;
-    private @Mock AspectJCallback aspectJCallback;
-    private ProceedingJoinPoint joinPoint;
+	private TestingAuthenticationToken token;
+	private AspectJMethodSecurityInterceptor interceptor;
+	private @Mock AccessDecisionManager adm;
+	private @Mock MethodSecurityMetadataSource mds;
+	private @Mock AuthenticationManager authman;
+	private @Mock AspectJCallback aspectJCallback;
+	private ProceedingJoinPoint joinPoint;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public final void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        SecurityContextHolder.clearContext();
-        token = new TestingAuthenticationToken("Test", "Password");
-        interceptor = new AspectJMethodSecurityInterceptor();
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setAuthenticationManager(authman);
-        interceptor.setSecurityMetadataSource(mds);
-        // Set up joinpoint information for the countLength method on TargetObject
-        joinPoint = mock(ProceedingJoinPoint.class); //new MockJoinPoint(new TargetObject(), method);
-        Signature sig = mock(Signature.class);
-        when(sig.getDeclaringType()).thenReturn(TargetObject.class);
-        JoinPoint.StaticPart staticPart = mock(JoinPoint.StaticPart.class);
-        when(joinPoint.getSignature()).thenReturn(sig);
-        when(joinPoint.getStaticPart()).thenReturn(staticPart);
-        CodeSignature codeSig = mock(CodeSignature.class);
-        when(codeSig.getName()).thenReturn("countLength");
-        when(codeSig.getDeclaringType()).thenReturn(TargetObject.class);
-        when(codeSig.getParameterTypes()).thenReturn(new Class[] {String.class});
-        when(staticPart.getSignature()).thenReturn(codeSig);
-        when(mds.getAttributes(any(JoinPoint.class))).thenReturn(SecurityConfig.createList("ROLE_USER"));
-        when(authman.authenticate(token)).thenReturn(token);
-    }
+	@Before
+	public final void setUp() throws Exception {
+		MockitoAnnotations.initMocks(this);
+		SecurityContextHolder.clearContext();
+		token = new TestingAuthenticationToken("Test", "Password");
+		interceptor = new AspectJMethodSecurityInterceptor();
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setAuthenticationManager(authman);
+		interceptor.setSecurityMetadataSource(mds);
+		// Set up joinpoint information for the countLength method on TargetObject
+		joinPoint = mock(ProceedingJoinPoint.class); // new MockJoinPoint(new
+														// TargetObject(), method);
+		Signature sig = mock(Signature.class);
+		when(sig.getDeclaringType()).thenReturn(TargetObject.class);
+		JoinPoint.StaticPart staticPart = mock(JoinPoint.StaticPart.class);
+		when(joinPoint.getSignature()).thenReturn(sig);
+		when(joinPoint.getStaticPart()).thenReturn(staticPart);
+		CodeSignature codeSig = mock(CodeSignature.class);
+		when(codeSig.getName()).thenReturn("countLength");
+		when(codeSig.getDeclaringType()).thenReturn(TargetObject.class);
+		when(codeSig.getParameterTypes()).thenReturn(new Class[] { String.class });
+		when(staticPart.getSignature()).thenReturn(codeSig);
+		when(mds.getAttributes(any(JoinPoint.class))).thenReturn(
+				SecurityConfig.createList("ROLE_USER"));
+		when(authman.authenticate(token)).thenReturn(token);
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void callbackIsInvokedWhenPermissionGranted() throws Throwable {
-        SecurityContextHolder.getContext().setAuthentication(token);
-        interceptor.invoke(joinPoint, aspectJCallback);
-        verify(aspectJCallback).proceedWithObject();
+	@Test
+	public void callbackIsInvokedWhenPermissionGranted() throws Throwable {
+		SecurityContextHolder.getContext().setAuthentication(token);
+		interceptor.invoke(joinPoint, aspectJCallback);
+		verify(aspectJCallback).proceedWithObject();
 
-        // Just try the other method too
-        interceptor.invoke(joinPoint);
-    }
+		// Just try the other method too
+		interceptor.invoke(joinPoint);
+	}
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void callbackIsNotInvokedWhenPermissionDenied() throws Exception {
-        doThrow(new AccessDeniedException("denied")).when(adm).decide(any(Authentication.class), any(), any(Collection.class));
+	@SuppressWarnings("unchecked")
+	@Test
+	public void callbackIsNotInvokedWhenPermissionDenied() throws Exception {
+		doThrow(new AccessDeniedException("denied")).when(adm).decide(
+				any(Authentication.class), any(), any(Collection.class));
 
-        SecurityContextHolder.getContext().setAuthentication(token);
-        try {
-            interceptor.invoke(joinPoint, aspectJCallback);
-            fail("Expected AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-        }
-        verify(aspectJCallback, never()).proceedWithObject();
-    }
+		SecurityContextHolder.getContext().setAuthentication(token);
+		try {
+			interceptor.invoke(joinPoint, aspectJCallback);
+			fail("Expected AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+		}
+		verify(aspectJCallback, never()).proceedWithObject();
+	}
 
-    @Test
-    public void adapterHoldsCorrectData() throws Exception {
-        TargetObject to = new TargetObject();
-        Method m = ClassUtils.getMethodIfAvailable(TargetObject.class, "countLength", new Class[] {String.class});
+	@Test
+	public void adapterHoldsCorrectData() throws Exception {
+		TargetObject to = new TargetObject();
+		Method m = ClassUtils.getMethodIfAvailable(TargetObject.class, "countLength",
+				new Class[] { String.class });
 
-        when(joinPoint.getTarget()).thenReturn(to);
-        when(joinPoint.getArgs()).thenReturn(new Object[] {"Hi"});
-        MethodInvocationAdapter mia = new MethodInvocationAdapter(joinPoint);
-        assertEquals("Hi", mia.getArguments()[0]);
-        assertEquals(m, mia.getStaticPart());
-        assertEquals(m, mia.getMethod());
-        assertSame(to, mia.getThis());
-    }
+		when(joinPoint.getTarget()).thenReturn(to);
+		when(joinPoint.getArgs()).thenReturn(new Object[] { "Hi" });
+		MethodInvocationAdapter mia = new MethodInvocationAdapter(joinPoint);
+		assertEquals("Hi", mia.getArguments()[0]);
+		assertEquals(m, mia.getStaticPart());
+		assertEquals(m, mia.getMethod());
+		assertSame(to, mia.getThis());
+	}
 
-    @Test
-    public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throwable {
-        token.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(token);
+	@Test
+	public void afterInvocationManagerIsNotInvokedIfExceptionIsRaised() throws Throwable {
+		token.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-        AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        interceptor.setAfterInvocationManager(aim);
+		AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		interceptor.setAfterInvocationManager(aim);
 
-        when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException());
+		when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException());
 
-        try {
-            interceptor.invoke(joinPoint, aspectJCallback);
-            fail("Expected exception");
-        } catch (RuntimeException expected) {
-        }
+		try {
+			interceptor.invoke(joinPoint, aspectJCallback);
+			fail("Expected exception");
+		}
+		catch (RuntimeException expected) {
+		}
 
-        verifyZeroInteractions(aim);
-    }
+		verifyZeroInteractions(aim);
+	}
 
-    // SEC-1967
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeWithAspectJCallbackRunAsReplacementCleansAfterException() throws Exception {
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        ctx.setAuthentication(token);
-        token.setAuthenticated(true);
-        final RunAsManager runAs = mock(RunAsManager.class);
-        final RunAsUserToken runAsToken =
-            new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), TestingAuthenticationToken.class);
-        interceptor.setRunAsManager(runAs);
-        when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken);
-        when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException());
+	// SEC-1967
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeWithAspectJCallbackRunAsReplacementCleansAfterException()
+			throws Exception {
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		ctx.setAuthentication(token);
+		token.setAuthenticated(true);
+		final RunAsManager runAs = mock(RunAsManager.class);
+		final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds",
+				token.getAuthorities(), TestingAuthenticationToken.class);
+		interceptor.setRunAsManager(runAs);
+		when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class)))
+				.thenReturn(runAsToken);
+		when(aspectJCallback.proceedWithObject()).thenThrow(new RuntimeException());
 
-        try {
-            interceptor.invoke(joinPoint, aspectJCallback);
-            fail("Expected Exception");
-        }catch(RuntimeException success) {}
+		try {
+			interceptor.invoke(joinPoint, aspectJCallback);
+			fail("Expected Exception");
+		}
+		catch (RuntimeException success) {
+		}
 
-        // Check we've changed back
-        assertSame(ctx, SecurityContextHolder.getContext());
-        assertSame(token, SecurityContextHolder.getContext().getAuthentication());
-    }
+		// Check we've changed back
+		assertSame(ctx, SecurityContextHolder.getContext());
+		assertSame(token, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    // SEC-1967
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeRunAsReplacementCleansAfterException() throws Throwable {
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        ctx.setAuthentication(token);
-        token.setAuthenticated(true);
-        final RunAsManager runAs = mock(RunAsManager.class);
-        final RunAsUserToken runAsToken =
-            new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), TestingAuthenticationToken.class);
-        interceptor.setRunAsManager(runAs);
-        when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class))).thenReturn(runAsToken);
-        when(joinPoint.proceed()).thenThrow(new RuntimeException());
+	// SEC-1967
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeRunAsReplacementCleansAfterException() throws Throwable {
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		ctx.setAuthentication(token);
+		token.setAuthenticated(true);
+		final RunAsManager runAs = mock(RunAsManager.class);
+		final RunAsUserToken runAsToken = new RunAsUserToken("key", "someone", "creds",
+				token.getAuthorities(), TestingAuthenticationToken.class);
+		interceptor.setRunAsManager(runAs);
+		when(runAs.buildRunAs(eq(token), any(MethodInvocation.class), any(List.class)))
+				.thenReturn(runAsToken);
+		when(joinPoint.proceed()).thenThrow(new RuntimeException());
 
-        try {
-            interceptor.invoke(joinPoint);
-            fail("Expected Exception");
-        }catch(RuntimeException success) {}
+		try {
+			interceptor.invoke(joinPoint);
+			fail("Expected Exception");
+		}
+		catch (RuntimeException success) {
+		}
 
-        // Check we've changed back
-        assertSame(ctx, SecurityContextHolder.getContext());
-        assertSame(token, SecurityContextHolder.getContext().getAuthentication());
-    }
+		// Check we've changed back
+		assertSame(ctx, SecurityContextHolder.getContext());
+		assertSame(token, SecurityContextHolder.getContext().getAuthentication());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
index 70437a00b2..1a4f5fcd61 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MapBasedMethodSecurityMetadataSourceTests.java
@@ -18,41 +18,41 @@ import org.springframework.security.access.method.MapBasedMethodSecurityMetadata
  * @since 2.0.4
  */
 public class MapBasedMethodSecurityMetadataSourceTests {
-    private final List<ConfigAttribute> ROLE_A = SecurityConfig.createList("ROLE_A");
-    private final List<ConfigAttribute> ROLE_B = SecurityConfig.createList("ROLE_B");
-    private MapBasedMethodSecurityMetadataSource mds;
-    private Method someMethodString;
-    private Method someMethodInteger;
+	private final List<ConfigAttribute> ROLE_A = SecurityConfig.createList("ROLE_A");
+	private final List<ConfigAttribute> ROLE_B = SecurityConfig.createList("ROLE_B");
+	private MapBasedMethodSecurityMetadataSource mds;
+	private Method someMethodString;
+	private Method someMethodInteger;
 
-    @Before
-    public void initialize() throws Exception {
-        mds = new MapBasedMethodSecurityMetadataSource();
-        someMethodString = MockService.class.getMethod("someMethod", String.class);
-        someMethodInteger = MockService.class.getMethod("someMethod", Integer.class);
-    }
+	@Before
+	public void initialize() throws Exception {
+		mds = new MapBasedMethodSecurityMetadataSource();
+		someMethodString = MockService.class.getMethod("someMethod", String.class);
+		someMethodInteger = MockService.class.getMethod("someMethod", Integer.class);
+	}
 
-    @Test
-    public void wildcardedMatchIsOverwrittenByMoreSpecificMatch() {
-        mds.addSecureMethod(MockService.class, "some*", ROLE_A);
-        mds.addSecureMethod(MockService.class, "someMethod*", ROLE_B);
-        assertEquals(ROLE_B, mds.getAttributes(someMethodInteger, MockService.class));
-    }
+	@Test
+	public void wildcardedMatchIsOverwrittenByMoreSpecificMatch() {
+		mds.addSecureMethod(MockService.class, "some*", ROLE_A);
+		mds.addSecureMethod(MockService.class, "someMethod*", ROLE_B);
+		assertEquals(ROLE_B, mds.getAttributes(someMethodInteger, MockService.class));
+	}
 
-    @Test
-    public void methodsWithDifferentArgumentsAreMatchedCorrectly() throws Exception {
-        mds.addSecureMethod(MockService.class, someMethodInteger, ROLE_A);
-        mds.addSecureMethod(MockService.class, someMethodString, ROLE_B);
+	@Test
+	public void methodsWithDifferentArgumentsAreMatchedCorrectly() throws Exception {
+		mds.addSecureMethod(MockService.class, someMethodInteger, ROLE_A);
+		mds.addSecureMethod(MockService.class, someMethodString, ROLE_B);
 
-        assertEquals(ROLE_A, mds.getAttributes(someMethodInteger, MockService.class));
-        assertEquals(ROLE_B, mds.getAttributes(someMethodString, MockService.class));
-    }
+		assertEquals(ROLE_A, mds.getAttributes(someMethodInteger, MockService.class));
+		assertEquals(ROLE_B, mds.getAttributes(someMethodString, MockService.class));
+	}
 
-    @SuppressWarnings("unused")
-    private class MockService {
-        public void someMethod(String s) {
-        }
+	@SuppressWarnings("unused")
+	private class MockService {
+		public void someMethod(String s) {
+		}
 
-        public void someMethod(Integer i) {
-        }
-    }
+		public void someMethod(Integer i) {
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
index 5461af884b..c345460c5b 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MethodInvocationPrivilegeEvaluatorTests.java
@@ -38,81 +38,87 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.MethodInvocationUtils;
 
-
 /**
- * Tests {@link org.springframework.security.access.intercept.MethodInvocationPrivilegeEvaluator}.
+ * Tests
+ * {@link org.springframework.security.access.intercept.MethodInvocationPrivilegeEvaluator}
+ * .
  *
  * @author Ben Alex
  */
 public class MethodInvocationPrivilegeEvaluatorTests {
-    private TestingAuthenticationToken token;
-    private MethodSecurityInterceptor interceptor;
-    private AccessDecisionManager adm;
-    private MethodSecurityMetadataSource mds;
-    private final List<ConfigAttribute> role = SecurityConfig.createList("ROLE_IGNORED");
+	private TestingAuthenticationToken token;
+	private MethodSecurityInterceptor interceptor;
+	private AccessDecisionManager adm;
+	private MethodSecurityMetadataSource mds;
+	private final List<ConfigAttribute> role = SecurityConfig.createList("ROLE_IGNORED");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public final void setUp() throws Exception {
-        SecurityContextHolder.clearContext();
-        interceptor = new MethodSecurityInterceptor();
-        token = new TestingAuthenticationToken("Test", "Password", "ROLE_SOMETHING");
-        adm = mock(AccessDecisionManager.class);
-        AuthenticationManager authman = mock(AuthenticationManager.class);
-        mds = mock(MethodSecurityMetadataSource.class);
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setAuthenticationManager(authman);
-        interceptor.setSecurityMetadataSource(mds);
-    }
+	@Before
+	public final void setUp() throws Exception {
+		SecurityContextHolder.clearContext();
+		interceptor = new MethodSecurityInterceptor();
+		token = new TestingAuthenticationToken("Test", "Password", "ROLE_SOMETHING");
+		adm = mock(AccessDecisionManager.class);
+		AuthenticationManager authman = mock(AuthenticationManager.class);
+		mds = mock(MethodSecurityMetadataSource.class);
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setAuthenticationManager(authman);
+		interceptor.setSecurityMetadataSource(mds);
+	}
 
-    @Test
-    public void allowsAccessUsingCreate() throws Exception {
-        Object object = new TargetObject();
-        final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase", "foobar");
+	@Test
+	public void allowsAccessUsingCreate() throws Exception {
+		Object object = new TargetObject();
+		final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase",
+				"foobar");
 
-        MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
-        when(mds.getAttributes(mi)).thenReturn(role);
+		MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
+		when(mds.getAttributes(mi)).thenReturn(role);
 
-        mipe.setSecurityInterceptor(interceptor);
-        mipe.afterPropertiesSet();
+		mipe.setSecurityInterceptor(interceptor);
+		mipe.afterPropertiesSet();
 
-        assertTrue(mipe.isAllowed(mi, token));
-    }
+		assertTrue(mipe.isAllowed(mi, token));
+	}
 
-    @Test
-    public void allowsAccessUsingCreateFromClass() throws Exception {
-        final MethodInvocation mi = MethodInvocationUtils.createFromClass(new OtherTargetObject(), ITargetObject.class, "makeLowerCase",
-                new Class[] {String.class}, new Object[] {"Hello world"});
-        MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
-        mipe.setSecurityInterceptor(interceptor);
-        when(mds.getAttributes(mi)).thenReturn(role);
+	@Test
+	public void allowsAccessUsingCreateFromClass() throws Exception {
+		final MethodInvocation mi = MethodInvocationUtils.createFromClass(
+				new OtherTargetObject(), ITargetObject.class, "makeLowerCase",
+				new Class[] { String.class }, new Object[] { "Hello world" });
+		MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
+		mipe.setSecurityInterceptor(interceptor);
+		when(mds.getAttributes(mi)).thenReturn(role);
 
-        assertTrue(mipe.isAllowed(mi, token));
-    }
+		assertTrue(mipe.isAllowed(mi, token));
+	}
 
-    @Test
-    public void declinesAccessUsingCreate() throws Exception {
-        Object object = new TargetObject();
-        final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase", "foobar");
-        MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
-        mipe.setSecurityInterceptor(interceptor);
-        when(mds.getAttributes(mi)).thenReturn(role);
-        doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role);
+	@Test
+	public void declinesAccessUsingCreate() throws Exception {
+		Object object = new TargetObject();
+		final MethodInvocation mi = MethodInvocationUtils.create(object, "makeLowerCase",
+				"foobar");
+		MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
+		mipe.setSecurityInterceptor(interceptor);
+		when(mds.getAttributes(mi)).thenReturn(role);
+		doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role);
 
-        assertFalse(mipe.isAllowed(mi, token));
-    }
+		assertFalse(mipe.isAllowed(mi, token));
+	}
 
-    @Test
-    public void declinesAccessUsingCreateFromClass() throws Exception {
-        final MethodInvocation mi = MethodInvocationUtils.createFromClass(new OtherTargetObject(), ITargetObject.class, "makeLowerCase",
-                new Class[] {String.class}, new Object[] {"helloWorld"});
+	@Test
+	public void declinesAccessUsingCreateFromClass() throws Exception {
+		final MethodInvocation mi = MethodInvocationUtils.createFromClass(
+				new OtherTargetObject(), ITargetObject.class, "makeLowerCase",
+				new Class[] { String.class }, new Object[] { "helloWorld" });
 
-        MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
-        mipe.setSecurityInterceptor(interceptor);
-        when(mds.getAttributes(mi)).thenReturn(role);
-        doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role);
+		MethodInvocationPrivilegeEvaluator mipe = new MethodInvocationPrivilegeEvaluator();
+		mipe.setSecurityInterceptor(interceptor);
+		when(mds.getAttributes(mi)).thenReturn(role);
+		doThrow(new AccessDeniedException("rejected")).when(adm).decide(token, mi, role);
 
-        assertFalse(mipe.isAllowed(mi, token));
-    }
+		assertFalse(mipe.isAllowed(mi, token));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
index 151cd0558e..db924ad157 100644
--- a/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
+++ b/core/src/test/java/org/springframework/security/access/intercept/method/MockMethodInvocation.java
@@ -7,32 +7,32 @@ import org.aopalliance.intercept.MethodInvocation;
 
 @SuppressWarnings("unchecked")
 public class MockMethodInvocation implements MethodInvocation {
-    private Method method;
-    private Object targetObject;
+	private Method method;
+	private Object targetObject;
 
-    public MockMethodInvocation(Object targetObject, Class clazz, String methodName, Class... parameterTypes)
-            throws NoSuchMethodException {
-        this.method = clazz.getMethod(methodName, parameterTypes);
-        this.targetObject = targetObject;
-    }
+	public MockMethodInvocation(Object targetObject, Class clazz, String methodName,
+			Class... parameterTypes) throws NoSuchMethodException {
+		this.method = clazz.getMethod(methodName, parameterTypes);
+		this.targetObject = targetObject;
+	}
 
-    public Object[] getArguments() {
-        return null;
-    }
+	public Object[] getArguments() {
+		return null;
+	}
 
-    public Method getMethod() {
-        return method;
-    }
+	public Method getMethod() {
+		return method;
+	}
 
-    public AccessibleObject getStaticPart() {
-        return null;
-    }
+	public AccessibleObject getStaticPart() {
+		return null;
+	}
 
-    public Object getThis() {
-        return targetObject;
-    }
+	public Object getThis() {
+		return targetObject;
+	}
 
-    public Object proceed() throws Throwable {
-        return null;
-    }
+	public Object proceed() throws Throwable {
+		return null;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java
index b8ecad9714..fdf619e7fa 100644
--- a/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java
+++ b/core/src/test/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSourceTests.java
@@ -15,42 +15,46 @@ import java.util.*;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
 public class DelegatingMethodSecurityMetadataSourceTests {
-    DelegatingMethodSecurityMetadataSource mds;
+	DelegatingMethodSecurityMetadataSource mds;
 
-    @Test
-    public void returnsEmptyListIfDelegateReturnsNull() throws Exception {
-        List sources = new ArrayList();
-        MethodSecurityMetadataSource delegate = mock(MethodSecurityMetadataSource.class);
-        when(delegate.getAttributes(Matchers.<Method>any(), Matchers.any(Class.class))).thenReturn(null);
-        sources.add(delegate);
-        mds = new DelegatingMethodSecurityMetadataSource(sources);
-        assertSame(sources, mds.getMethodSecurityMetadataSources());
-        assertTrue(mds.getAllConfigAttributes().isEmpty());
-        MethodInvocation mi = new SimpleMethodInvocation(null, String.class.getMethod("toString"));
-        assertEquals(Collections.emptyList(), mds.getAttributes(mi));
-        // Exercise the cached case
-        assertEquals(Collections.emptyList(), mds.getAttributes(mi));
-    }
+	@Test
+	public void returnsEmptyListIfDelegateReturnsNull() throws Exception {
+		List sources = new ArrayList();
+		MethodSecurityMetadataSource delegate = mock(MethodSecurityMetadataSource.class);
+		when(delegate.getAttributes(Matchers.<Method> any(), Matchers.any(Class.class)))
+				.thenReturn(null);
+		sources.add(delegate);
+		mds = new DelegatingMethodSecurityMetadataSource(sources);
+		assertSame(sources, mds.getMethodSecurityMetadataSources());
+		assertTrue(mds.getAllConfigAttributes().isEmpty());
+		MethodInvocation mi = new SimpleMethodInvocation(null,
+				String.class.getMethod("toString"));
+		assertEquals(Collections.emptyList(), mds.getAttributes(mi));
+		// Exercise the cached case
+		assertEquals(Collections.emptyList(), mds.getAttributes(mi));
+	}
 
-    @Test
-    public void returnsDelegateAttributes() throws Exception {
-        List sources = new ArrayList();
-        MethodSecurityMetadataSource delegate = mock(MethodSecurityMetadataSource.class);
-        ConfigAttribute ca = mock(ConfigAttribute.class);
-        List attributes = Arrays.asList(ca);
-        Method toString = String.class.getMethod("toString");
-        when(delegate.getAttributes(toString, String.class)).thenReturn(attributes);
-        sources.add(delegate);
-        mds = new DelegatingMethodSecurityMetadataSource(sources);
-        assertSame(sources, mds.getMethodSecurityMetadataSources());
-        assertTrue(mds.getAllConfigAttributes().isEmpty());
-        MethodInvocation mi = new SimpleMethodInvocation("", toString);
-        assertSame(attributes, mds.getAttributes(mi));
-        // Exercise the cached case
-        assertSame(attributes, mds.getAttributes(mi));
-        assertTrue(mds.getAttributes(new SimpleMethodInvocation(null, String.class.getMethod("length"))).isEmpty());
-    }
+	@Test
+	public void returnsDelegateAttributes() throws Exception {
+		List sources = new ArrayList();
+		MethodSecurityMetadataSource delegate = mock(MethodSecurityMetadataSource.class);
+		ConfigAttribute ca = mock(ConfigAttribute.class);
+		List attributes = Arrays.asList(ca);
+		Method toString = String.class.getMethod("toString");
+		when(delegate.getAttributes(toString, String.class)).thenReturn(attributes);
+		sources.add(delegate);
+		mds = new DelegatingMethodSecurityMetadataSource(sources);
+		assertSame(sources, mds.getMethodSecurityMetadataSources());
+		assertTrue(mds.getAllConfigAttributes().isEmpty());
+		MethodInvocation mi = new SimpleMethodInvocation("", toString);
+		assertSame(attributes, mds.getAttributes(mi));
+		// Exercise the cached case
+		assertSame(attributes, mds.getAttributes(mi));
+		assertTrue(mds.getAttributes(
+				new SimpleMethodInvocation(null, String.class.getMethod("length")))
+				.isEmpty());
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java
index 7e61415153..3fec8f52dc 100644
--- a/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/prepost/PreInvocationAuthorizationAdviceVoterTests.java
@@ -11,31 +11,30 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.aop.ProxyMethodInvocation;
 import org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;
 
-
 @RunWith(MockitoJUnitRunner.class)
 public class PreInvocationAuthorizationAdviceVoterTests {
-    @Mock
-    private PreInvocationAuthorizationAdvice authorizationAdvice;
-    private PreInvocationAuthorizationAdviceVoter voter;
+	@Mock
+	private PreInvocationAuthorizationAdvice authorizationAdvice;
+	private PreInvocationAuthorizationAdviceVoter voter;
 
-    @Before
-    public void setUp() {
-        voter = new PreInvocationAuthorizationAdviceVoter(authorizationAdvice);
-    }
+	@Before
+	public void setUp() {
+		voter = new PreInvocationAuthorizationAdviceVoter(authorizationAdvice);
+	}
 
-    @Test
-    public void supportsMethodInvocation() {
-        assertTrue(voter.supports(MethodInvocation.class));
-    }
+	@Test
+	public void supportsMethodInvocation() {
+		assertTrue(voter.supports(MethodInvocation.class));
+	}
 
-    // SEC-2031
-    @Test
-    public void supportsProxyMethodInvocation() {
-        assertTrue(voter.supports(ProxyMethodInvocation.class));
-    }
+	// SEC-2031
+	@Test
+	public void supportsProxyMethodInvocation() {
+		assertTrue(voter.supports(ProxyMethodInvocation.class));
+	}
 
-    @Test
-    public void supportsMethodInvocationAdapter() {
-        assertTrue(voter.supports(MethodInvocationAdapter.class));
-    }
+	@Test
+	public void supportsMethodInvocationAdapter() {
+		assertTrue(voter.supports(MethodInvocationAdapter.class));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
index 3224ff0c7d..fc75433725 100644
--- a/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAccessDecisionManagerTests.java
@@ -29,7 +29,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Vector;
 
-
 /**
  * Tests {@link AbstractAccessDecisionManager}.
  *
@@ -38,112 +37,119 @@ import java.util.Vector;
 @SuppressWarnings("unchecked")
 public class AbstractAccessDecisionManagerTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testAllowIfAccessDecisionManagerDefaults() {
-        List list = new Vector();
-        DenyAgainVoter denyVoter = new DenyAgainVoter();
-        list.add(denyVoter);
-        MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
-        assertTrue(!mock.isAllowIfAllAbstainDecisions()); // default
-        mock.setAllowIfAllAbstainDecisions(true);
-        assertTrue(mock.isAllowIfAllAbstainDecisions()); // changed
-    }
+	public void testAllowIfAccessDecisionManagerDefaults() {
+		List list = new Vector();
+		DenyAgainVoter denyVoter = new DenyAgainVoter();
+		list.add(denyVoter);
+		MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
+		assertTrue(!mock.isAllowIfAllAbstainDecisions()); // default
+		mock.setAllowIfAllAbstainDecisions(true);
+		assertTrue(mock.isAllowIfAllAbstainDecisions()); // changed
+	}
 
-    public void testDelegatesSupportsClassRequests() throws Exception {
-        List list = new Vector();
-        list.add(new DenyVoter());
-        list.add(new MockStringOnlyVoter());
+	public void testDelegatesSupportsClassRequests() throws Exception {
+		List list = new Vector();
+		list.add(new DenyVoter());
+		list.add(new MockStringOnlyVoter());
 
-        MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
+		MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
 
-        assertTrue(mock.supports(String.class));
-        assertTrue(!mock.supports(Integer.class));
-    }
+		assertTrue(mock.supports(String.class));
+		assertTrue(!mock.supports(Integer.class));
+	}
 
-    public void testDelegatesSupportsRequests() throws Exception {
-        List list = new Vector();
-        DenyVoter voter = new DenyVoter();
-        DenyAgainVoter denyVoter = new DenyAgainVoter();
-        list.add(voter);
-        list.add(denyVoter);
+	public void testDelegatesSupportsRequests() throws Exception {
+		List list = new Vector();
+		DenyVoter voter = new DenyVoter();
+		DenyAgainVoter denyVoter = new DenyAgainVoter();
+		list.add(voter);
+		list.add(denyVoter);
 
-        MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
+		MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
 
-        ConfigAttribute attr = new SecurityConfig("DENY_AGAIN_FOR_SURE");
-        assertTrue(mock.supports(attr));
+		ConfigAttribute attr = new SecurityConfig("DENY_AGAIN_FOR_SURE");
+		assertTrue(mock.supports(attr));
 
-        ConfigAttribute badAttr = new SecurityConfig("WE_DONT_SUPPORT_THIS");
-        assertTrue(!mock.supports(badAttr));
-    }
+		ConfigAttribute badAttr = new SecurityConfig("WE_DONT_SUPPORT_THIS");
+		assertTrue(!mock.supports(badAttr));
+	}
 
-    public void testProperlyStoresListOfVoters() throws Exception {
-        List list = new Vector();
-        DenyVoter voter = new DenyVoter();
-        DenyAgainVoter denyVoter = new DenyAgainVoter();
-        list.add(voter);
-        list.add(denyVoter);
-        MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
-        assertEquals(list.size(), mock.getDecisionVoters().size());
-    }
+	public void testProperlyStoresListOfVoters() throws Exception {
+		List list = new Vector();
+		DenyVoter voter = new DenyVoter();
+		DenyAgainVoter denyVoter = new DenyAgainVoter();
+		list.add(voter);
+		list.add(denyVoter);
+		MockDecisionManagerImpl mock = new MockDecisionManagerImpl(list);
+		assertEquals(list.size(), mock.getDecisionVoters().size());
+	}
 
-    public void testRejectsEmptyList() throws Exception {
-        List list = new Vector();
+	public void testRejectsEmptyList() throws Exception {
+		List list = new Vector();
 
-        try {
-            new MockDecisionManagerImpl(list);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			new MockDecisionManagerImpl(list);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRejectsNullVotersList() throws Exception {
-        try {
-            new MockDecisionManagerImpl(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testRejectsNullVotersList() throws Exception {
+		try {
+			new MockDecisionManagerImpl(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRoleVoterAlwaysReturnsTrueToSupports() {
-        RoleVoter rv = new RoleVoter();
-        assertTrue(rv.supports(String.class));
-    }
+	public void testRoleVoterAlwaysReturnsTrueToSupports() {
+		RoleVoter rv = new RoleVoter();
+		assertTrue(rv.supports(String.class));
+	}
 
-    public void testWillNotStartIfDecisionVotersNotSet()
-        throws Exception {
-        try {
-        	new MockDecisionManagerImpl(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testWillNotStartIfDecisionVotersNotSet() throws Exception {
+		try {
+			new MockDecisionManagerImpl(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockDecisionManagerImpl extends AbstractAccessDecisionManager {
-        protected MockDecisionManagerImpl(List<AccessDecisionVoter<? extends Object>> decisionVoters) {
-            super(decisionVoters);
-        }
+	private class MockDecisionManagerImpl extends AbstractAccessDecisionManager {
+		protected MockDecisionManagerImpl(
+				List<AccessDecisionVoter<? extends Object>> decisionVoters) {
+			super(decisionVoters);
+		}
 
-        public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) {
-        }
-    }
+		public void decide(Authentication authentication, Object object,
+				Collection<ConfigAttribute> configAttributes) {
+		}
+	}
 
-    private class MockStringOnlyVoter implements AccessDecisionVoter<Object> {
-        public boolean supports(Class<?> clazz) {
-            return String.class.isAssignableFrom(clazz);
-        }
+	private class MockStringOnlyVoter implements AccessDecisionVoter<Object> {
+		public boolean supports(Class<?> clazz) {
+			return String.class.isAssignableFrom(clazz);
+		}
 
-        public boolean supports(ConfigAttribute attribute) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
+		public boolean supports(ConfigAttribute attribute) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
 
-        public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
-    }
+		public int vote(Authentication authentication, Object object,
+				Collection<ConfigAttribute> attributes) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
index 8c0ad5954c..69be8acbb7 100644
--- a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java
@@ -15,46 +15,50 @@ import org.springframework.security.util.MethodInvocationUtils;
  * @author Luke Taylor
  */
 public class AbstractAclVoterTests {
-    private AbstractAclVoter voter = new AbstractAclVoter() {
-        public boolean supports(ConfigAttribute attribute) {
-            return false;
-        }
-        public int vote(Authentication authentication, MethodInvocation object, Collection<ConfigAttribute> attributes) {
-            return 0;
-        }
-    };
+	private AbstractAclVoter voter = new AbstractAclVoter() {
+		public boolean supports(ConfigAttribute attribute) {
+			return false;
+		}
 
-    @Test
-    public void supportsMethodInvocations() throws Exception {
-        assertTrue(voter.supports(MethodInvocation.class));
-        assertFalse(voter.supports(String.class));
-    }
+		public int vote(Authentication authentication, MethodInvocation object,
+				Collection<ConfigAttribute> attributes) {
+			return 0;
+		}
+	};
 
-    @Test
-    public void expectedDomainObjectArgumentIsReturnedFromMethodInvocation() throws Exception {
-        voter.setProcessDomainObjectClass(String.class);
-        MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), "methodTakingAString", "The Argument");
-        assertEquals("The Argument", voter.getDomainObjectInstance(mi));
-    }
+	@Test
+	public void supportsMethodInvocations() throws Exception {
+		assertTrue(voter.supports(MethodInvocation.class));
+		assertFalse(voter.supports(String.class));
+	}
 
-    @Test
-    public void correctArgumentIsSelectedFromMultipleArgs() throws Exception {
-        voter.setProcessDomainObjectClass(String.class);
-        MethodInvocation mi = MethodInvocationUtils.create(new TestClass(),
-                "methodTakingAListAndAString", new ArrayList<Object>(), "The Argument");
-        assertEquals("The Argument", voter.getDomainObjectInstance(mi));
-    }
+	@Test
+	public void expectedDomainObjectArgumentIsReturnedFromMethodInvocation()
+			throws Exception {
+		voter.setProcessDomainObjectClass(String.class);
+		MethodInvocation mi = MethodInvocationUtils.create(new TestClass(),
+				"methodTakingAString", "The Argument");
+		assertEquals("The Argument", voter.getDomainObjectInstance(mi));
+	}
 
-    @SuppressWarnings("unused")
-    private static class TestClass {
-        public void methodTakingAString(String arg) {
-        }
+	@Test
+	public void correctArgumentIsSelectedFromMultipleArgs() throws Exception {
+		voter.setProcessDomainObjectClass(String.class);
+		MethodInvocation mi = MethodInvocationUtils.create(new TestClass(),
+				"methodTakingAListAndAString", new ArrayList<Object>(), "The Argument");
+		assertEquals("The Argument", voter.getDomainObjectInstance(mi));
+	}
 
-        public void methodTaking2Strings(String arg1, String arg2) {
-        }
+	@SuppressWarnings("unused")
+	private static class TestClass {
+		public void methodTakingAString(String arg) {
+		}
 
-        public void methodTakingAListAndAString(ArrayList<Object> arg1, String arg2) {
-        }
-    }
+		public void methodTaking2Strings(String arg1, String arg2) {
+		}
+
+		public void methodTakingAListAndAString(ArrayList<Object> arg1, String arg2) {
+		}
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
index 680b60b306..17cdf245a6 100644
--- a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java
@@ -31,73 +31,85 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Tests {@link AffirmativeBased}.
  *
  * @author Ben Alex
  */
 public class AffirmativeBasedTests {
-    private final List<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>();
-    private final Authentication user = new TestingAuthenticationToken("somebody", "password","ROLE_1", "ROLE_2");
-    private AffirmativeBased mgr;
-    private AccessDecisionVoter grant;
-    private AccessDecisionVoter abstain;
-    private AccessDecisionVoter deny;
+	private final List<ConfigAttribute> attrs = new ArrayList<ConfigAttribute>();
+	private final Authentication user = new TestingAuthenticationToken("somebody",
+			"password", "ROLE_1", "ROLE_2");
+	private AffirmativeBased mgr;
+	private AccessDecisionVoter grant;
+	private AccessDecisionVoter abstain;
+	private AccessDecisionVoter deny;
 
-    @Before
-    @SuppressWarnings("unchecked")
-    public void setup() {
+	@Before
+	@SuppressWarnings("unchecked")
+	public void setup() {
 
-        grant = mock(AccessDecisionVoter.class);
-        abstain = mock(AccessDecisionVoter.class);
-        deny = mock(AccessDecisionVoter.class);
+		grant = mock(AccessDecisionVoter.class);
+		abstain = mock(AccessDecisionVoter.class);
+		deny = mock(AccessDecisionVoter.class);
 
-        when(grant.vote(any(Authentication.class), any(Object.class), any(List.class))).thenReturn(AccessDecisionVoter.ACCESS_GRANTED);
-        when(abstain.vote(any(Authentication.class), any(Object.class), any(List.class))).thenReturn(AccessDecisionVoter.ACCESS_ABSTAIN);
-        when(deny.vote(any(Authentication.class), any(Object.class), any(List.class))).thenReturn(AccessDecisionVoter.ACCESS_DENIED);
-    }
+		when(grant.vote(any(Authentication.class), any(Object.class), any(List.class)))
+				.thenReturn(AccessDecisionVoter.ACCESS_GRANTED);
+		when(abstain.vote(any(Authentication.class), any(Object.class), any(List.class)))
+				.thenReturn(AccessDecisionVoter.ACCESS_ABSTAIN);
+		when(deny.vote(any(Authentication.class), any(Object.class), any(List.class)))
+				.thenReturn(AccessDecisionVoter.ACCESS_DENIED);
+	}
 
-    @Test
-    public void oneAffirmativeVoteOneDenyVoteOneAbstainVoteGrantsAccess() throws Exception {
+	@Test
+	public void oneAffirmativeVoteOneDenyVoteOneAbstainVoteGrantsAccess()
+			throws Exception {
 
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(grant, deny, abstain));
-        mgr.afterPropertiesSet();
-        mgr.decide(user, new Object(), attrs);
-    }
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				grant, deny, abstain));
+		mgr.afterPropertiesSet();
+		mgr.decide(user, new Object(), attrs);
+	}
 
-    @Test
-    public void oneDenyVoteOneAbstainVoteOneAffirmativeVoteGrantsAccess() throws Exception {
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(deny, abstain, grant));
-        mgr.decide(user, new Object(), attrs);
-    }
+	@Test
+	public void oneDenyVoteOneAbstainVoteOneAffirmativeVoteGrantsAccess()
+			throws Exception {
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				deny, abstain, grant));
+		mgr.decide(user, new Object(), attrs);
+	}
 
-    @Test
-    public void oneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(grant, abstain, abstain));
-        mgr.decide(user, new Object(), attrs);
-    }
+	@Test
+	public void oneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				grant, abstain, abstain));
+		mgr.decide(user, new Object(), attrs);
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void oneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(deny, abstain, abstain));
-        mgr.decide(user, new Object(), attrs);
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void oneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				deny, abstain, abstain));
+		mgr.decide(user, new Object(), attrs);
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void onlyAbstainVotesDeniesAccessWithDefault() throws Exception {
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(abstain, abstain, abstain));
-        assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
+	@Test(expected = AccessDeniedException.class)
+	public void onlyAbstainVotesDeniesAccessWithDefault() throws Exception {
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				abstain, abstain, abstain));
+		assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
 
-        mgr.decide(user, new Object(), attrs);
-    }
+		mgr.decide(user, new Object(), attrs);
+	}
 
-    @Test
-    public void testThreeAbstainVotesGrantsAccessIfAllowIfAllAbstainDecisionsIsSet() throws Exception {
-        mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>>asList(abstain, abstain, abstain));
-        mgr.setAllowIfAllAbstainDecisions(true);
-        assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
+	@Test
+	public void testThreeAbstainVotesGrantsAccessIfAllowIfAllAbstainDecisionsIsSet()
+			throws Exception {
+		mgr = new AffirmativeBased(Arrays.<AccessDecisionVoter<? extends Object>> asList(
+				abstain, abstain, abstain));
+		mgr.setAllowIfAllAbstainDecisions(true);
+		assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
 
-        mgr.decide(user, new Object(), attrs);
-    }
+		mgr.decide(user, new Object(), attrs);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
index ef4f85e103..9fb190ef97 100644
--- a/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/AuthenticatedVoterTests.java
@@ -29,7 +29,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link AuthenticatedVoter}.
  *
@@ -37,59 +36,78 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class AuthenticatedVoterTests extends TestCase {
 
-    private Authentication createAnonymous() {
-        return new AnonymousAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"));
-    }
+	private Authentication createAnonymous() {
+		return new AnonymousAuthenticationToken("ignored", "ignored",
+				AuthorityUtils.createAuthorityList("ignored"));
+	}
 
-    private Authentication createFullyAuthenticated() {
-        return new UsernamePasswordAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"));
-    }
+	private Authentication createFullyAuthenticated() {
+		return new UsernamePasswordAuthenticationToken("ignored", "ignored",
+				AuthorityUtils.createAuthorityList("ignored"));
+	}
 
-    private Authentication createRememberMe() {
-        return new RememberMeAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"));
-    }
+	private Authentication createRememberMe() {
+		return new RememberMeAuthenticationToken("ignored", "ignored",
+				AuthorityUtils.createAuthorityList("ignored"));
+	}
 
-    public void testAnonymousWorks() {
-        AuthenticatedVoter voter = new AuthenticatedVoter();
-        List<ConfigAttribute> def = SecurityConfig.createList(AuthenticatedVoter.IS_AUTHENTICATED_ANONYMOUSLY);
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createAnonymous(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createRememberMe(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createFullyAuthenticated(), null, def));
-    }
+	public void testAnonymousWorks() {
+		AuthenticatedVoter voter = new AuthenticatedVoter();
+		List<ConfigAttribute> def = SecurityConfig
+				.createList(AuthenticatedVoter.IS_AUTHENTICATED_ANONYMOUSLY);
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createAnonymous(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createRememberMe(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createFullyAuthenticated(), null, def));
+	}
 
-    public void testFullyWorks() {
-        AuthenticatedVoter voter = new AuthenticatedVoter();
-        List<ConfigAttribute> def = SecurityConfig.createList(AuthenticatedVoter.IS_AUTHENTICATED_FULLY);
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(createAnonymous(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(createRememberMe(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createFullyAuthenticated(), null, def));
-    }
+	public void testFullyWorks() {
+		AuthenticatedVoter voter = new AuthenticatedVoter();
+		List<ConfigAttribute> def = SecurityConfig
+				.createList(AuthenticatedVoter.IS_AUTHENTICATED_FULLY);
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED,
+				voter.vote(createAnonymous(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED,
+				voter.vote(createRememberMe(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createFullyAuthenticated(), null, def));
+	}
 
-    public void testRememberMeWorks() {
-        AuthenticatedVoter voter = new AuthenticatedVoter();
-        List<ConfigAttribute> def = SecurityConfig.createList(AuthenticatedVoter.IS_AUTHENTICATED_REMEMBERED);
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(createAnonymous(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createRememberMe(), null, def));
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(createFullyAuthenticated(), null, def));
-    }
+	public void testRememberMeWorks() {
+		AuthenticatedVoter voter = new AuthenticatedVoter();
+		List<ConfigAttribute> def = SecurityConfig
+				.createList(AuthenticatedVoter.IS_AUTHENTICATED_REMEMBERED);
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED,
+				voter.vote(createAnonymous(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createRememberMe(), null, def));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(createFullyAuthenticated(), null, def));
+	}
 
-    public void testSetterRejectsNull() {
-        AuthenticatedVoter voter = new AuthenticatedVoter();
+	public void testSetterRejectsNull() {
+		AuthenticatedVoter voter = new AuthenticatedVoter();
 
-        try {
-            voter.setAuthenticationTrustResolver(null);
-            fail("Expected IAE");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			voter.setAuthenticationTrustResolver(null);
+			fail("Expected IAE");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testSupports() {
-        AuthenticatedVoter voter = new AuthenticatedVoter();
-        assertTrue(voter.supports(String.class));
-        assertTrue(voter.supports(new SecurityConfig(AuthenticatedVoter.IS_AUTHENTICATED_ANONYMOUSLY)));
-        assertTrue(voter.supports(new SecurityConfig(AuthenticatedVoter.IS_AUTHENTICATED_FULLY)));
-        assertTrue(voter.supports(new SecurityConfig(AuthenticatedVoter.IS_AUTHENTICATED_REMEMBERED)));
-        assertFalse(voter.supports(new SecurityConfig("FOO")));
-    }
+	public void testSupports() {
+		AuthenticatedVoter voter = new AuthenticatedVoter();
+		assertTrue(voter.supports(String.class));
+		assertTrue(voter.supports(new SecurityConfig(
+				AuthenticatedVoter.IS_AUTHENTICATED_ANONYMOUSLY)));
+		assertTrue(voter.supports(new SecurityConfig(
+				AuthenticatedVoter.IS_AUTHENTICATED_FULLY)));
+		assertTrue(voter.supports(new SecurityConfig(
+				AuthenticatedVoter.IS_AUTHENTICATED_REMEMBERED)));
+		assertFalse(voter.supports(new SecurityConfig("FOO")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
index d49328da96..a32213bf0d 100644
--- a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java
@@ -26,7 +26,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 
 import java.util.*;
 
-
 /**
  * Tests {@link ConsensusBased}.
  *
@@ -34,90 +33,94 @@ import java.util.*;
  */
 public class ConsensusBasedTests {
 
-    @Test(expected=AccessDeniedException.class)
-    public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteDeniesAccessWithoutDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
-        mgr.setAllowIfEqualGrantedDeniedDecisions(false);
-        assertTrue(!mgr.isAllowIfEqualGrantedDeniedDecisions()); // check changed
+	@Test(expected = AccessDeniedException.class)
+	public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteDeniesAccessWithoutDefault()
+			throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
+		mgr.setAllowIfEqualGrantedDeniedDecisions(false);
+		assertTrue(!mgr.isAllowIfEqualGrantedDeniedDecisions()); // check changed
 
-        List<ConfigAttribute> config = SecurityConfig.createList("ROLE_1", "DENY_FOR_SURE");
+		List<ConfigAttribute> config = SecurityConfig.createList("ROLE_1",
+				"DENY_FOR_SURE");
 
-        mgr.decide(auth, new Object(), config);
-    }
+		mgr.decide(auth, new Object(), config);
+	}
 
-    @Test
-    public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteGrantsAccessWithDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
+	@Test
+	public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteGrantsAccessWithDefault()
+			throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
 
-        assertTrue(mgr.isAllowIfEqualGrantedDeniedDecisions()); // check default
+		assertTrue(mgr.isAllowIfEqualGrantedDeniedDecisions()); // check default
 
-        List<ConfigAttribute> config = SecurityConfig.createList("ROLE_1", "DENY_FOR_SURE");
+		List<ConfigAttribute> config = SecurityConfig.createList("ROLE_1",
+				"DENY_FOR_SURE");
 
-        mgr.decide(auth, new Object(), config);
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), config);
+		assertTrue(true);
+	}
 
-    @Test
-    public void testOneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
+	@Test
+	public void testOneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
 
-        mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_2"));
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_2"));
+		assertTrue(true);
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void testOneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
+	@Test(expected = AccessDeniedException.class)
+	public void testOneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
 
-        mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_WE_DO_NOT_HAVE"));
-        fail("Should have thrown AccessDeniedException");
-    }
+		mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_WE_DO_NOT_HAVE"));
+		fail("Should have thrown AccessDeniedException");
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void testThreeAbstainVotesDeniesAccessWithDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
+	@Test(expected = AccessDeniedException.class)
+	public void testThreeAbstainVotesDeniesAccessWithDefault() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
 
-        assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
+		assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
 
-        mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL"));
-    }
+		mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL"));
+	}
 
-    @Test
-    public void testThreeAbstainVotesGrantsAccessWithoutDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
-        mgr.setAllowIfAllAbstainDecisions(true);
-        assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
+	@Test
+	public void testThreeAbstainVotesGrantsAccessWithoutDefault() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
+		mgr.setAllowIfAllAbstainDecisions(true);
+		assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
 
-        mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL"));
-    }
+		mgr.decide(auth, new Object(), SecurityConfig.createList("IGNORED_BY_ALL"));
+	}
 
-    @Test
-    public void testTwoAffirmativeVotesTwoAbstainVotesGrantsAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        ConsensusBased mgr = makeDecisionManager();
+	@Test
+	public void testTwoAffirmativeVotesTwoAbstainVotesGrantsAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		ConsensusBased mgr = makeDecisionManager();
 
-        mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_1", "ROLE_2"));
-    }
+		mgr.decide(auth, new Object(), SecurityConfig.createList("ROLE_1", "ROLE_2"));
+	}
 
-    private ConsensusBased makeDecisionManager() {
-        RoleVoter roleVoter = new RoleVoter();
-        DenyVoter denyForSureVoter = new DenyVoter();
-        DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-        List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
-        voters.add(roleVoter);
-        voters.add(denyForSureVoter);
-        voters.add(denyAgainForSureVoter);
+	private ConsensusBased makeDecisionManager() {
+		RoleVoter roleVoter = new RoleVoter();
+		DenyVoter denyForSureVoter = new DenyVoter();
+		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		voters.add(roleVoter);
+		voters.add(denyForSureVoter);
+		voters.add(denyAgainForSureVoter);
 
-        return new ConsensusBased(voters);
-    }
+		return new ConsensusBased(voters);
+	}
 
-    private TestingAuthenticationToken makeTestToken() {
-        return new TestingAuthenticationToken("somebody", "password", "ROLE_1", "ROLE_2");
-    }
+	private TestingAuthenticationToken makeTestToken() {
+		return new TestingAuthenticationToken("somebody", "password", "ROLE_1", "ROLE_2");
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
index aaa5affae6..53044438de 100644
--- a/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
+++ b/core/src/test/java/org/springframework/security/access/vote/DenyAgainVoter.java
@@ -33,34 +33,35 @@ import java.util.Iterator;
  * @author Ben Alex
  */
 public class DenyAgainVoter implements AccessDecisionVoter<Object> {
-    // ~ Methods
-    // ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean supports(ConfigAttribute attribute) {
-        if ("DENY_AGAIN_FOR_SURE".equals(attribute.getAttribute())) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		if ("DENY_AGAIN_FOR_SURE".equals(attribute.getAttribute())) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
-    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-        Iterator<ConfigAttribute> iter = attributes.iterator();
+	public int vote(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) {
+		Iterator<ConfigAttribute> iter = attributes.iterator();
 
-        while (iter.hasNext()) {
-            ConfigAttribute attribute = iter.next();
+		while (iter.hasNext()) {
+			ConfigAttribute attribute = iter.next();
 
-            if (this.supports(attribute)) {
-                return ACCESS_DENIED;
-            }
-        }
+			if (this.supports(attribute)) {
+				return ACCESS_DENIED;
+			}
+		}
 
-        return ACCESS_ABSTAIN;
-    }
+		return ACCESS_ABSTAIN;
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
index e621000081..9305be0603 100644
--- a/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
+++ b/core/src/test/java/org/springframework/security/access/vote/DenyVoter.java
@@ -22,40 +22,47 @@ import org.springframework.security.core.Authentication;
 import java.util.Collection;
 import java.util.Iterator;
 
-
 /**
- * Implementation of an {@link AccessDecisionVoter} for unit testing.<p>If the {@link
- * ConfigAttribute#getAttribute()} has a value of <code>DENY_FOR_SURE</code>, the voter will vote to deny access.</p>
- *  <p>All comparisons are case sensitive.</p>
+ * Implementation of an {@link AccessDecisionVoter} for unit testing.
+ * <p>
+ * If the {@link ConfigAttribute#getAttribute()} has a value of <code>DENY_FOR_SURE</code>
+ * , the voter will vote to deny access.
+ * </p>
+ * <p>
+ * All comparisons are case sensitive.
+ * </p>
  *
  * @author Ben Alex
  */
 public class DenyVoter implements AccessDecisionVoter<Object> {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean supports(ConfigAttribute attribute) {
-        if ("DENY_FOR_SURE".equals(attribute.getAttribute())) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		if ("DENY_FOR_SURE".equals(attribute.getAttribute())) {
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return true;
-    }
+	public boolean supports(Class<?> clazz) {
+		return true;
+	}
 
-    public int vote(Authentication authentication, Object object, Collection<ConfigAttribute> attributes) {
-        Iterator<ConfigAttribute> iter = attributes.iterator();
+	public int vote(Authentication authentication, Object object,
+			Collection<ConfigAttribute> attributes) {
+		Iterator<ConfigAttribute> iter = attributes.iterator();
 
-        while (iter.hasNext()) {
-            ConfigAttribute attribute = iter.next();
+		while (iter.hasNext()) {
+			ConfigAttribute attribute = iter.next();
 
-            if (this.supports(attribute)) {
-                return ACCESS_DENIED;
-            }
-        }
+			if (this.supports(attribute)) {
+				return ACCESS_DENIED;
+			}
+		}
 
-        return ACCESS_ABSTAIN;
-    }
+		return ACCESS_ABSTAIN;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
index c30ba24715..655cc37062 100644
--- a/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/RoleHierarchyVoterTests.java
@@ -10,15 +10,17 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 
 public class RoleHierarchyVoterTests {
 
-    @Test
-    public void hierarchicalRoleIsIncludedInDecision() {
-        RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
-        roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
+	@Test
+	public void hierarchicalRoleIsIncludedInDecision() {
+		RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl();
+		roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B");
 
-        // User has role A, role B is required
-        TestingAuthenticationToken auth = new TestingAuthenticationToken("user", "password", "ROLE_A");
-        RoleHierarchyVoter voter = new RoleHierarchyVoter(roleHierarchyImpl);
+		// User has role A, role B is required
+		TestingAuthenticationToken auth = new TestingAuthenticationToken("user",
+				"password", "ROLE_A");
+		RoleHierarchyVoter voter = new RoleHierarchyVoter(roleHierarchyImpl);
 
-        assertEquals(RoleHierarchyVoter.ACCESS_GRANTED, voter.vote(auth, new Object(), SecurityConfig.createList("ROLE_B")));
-    }
+		assertEquals(RoleHierarchyVoter.ACCESS_GRANTED,
+				voter.vote(auth, new Object(), SecurityConfig.createList("ROLE_B")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java
index 148dd5a176..1b886def75 100644
--- a/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/RoleVoterTests.java
@@ -13,12 +13,13 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  */
 public class RoleVoterTests {
-    @Test
-    public void oneMatchingAttributeGrantsAccess() {
-        RoleVoter voter = new RoleVoter();
-        voter.setRolePrefix("");
-        Authentication userAB = new TestingAuthenticationToken("user","pass", "A", "B");
-        // Vote on attribute list that has two attributes A and C (i.e. only one matching)
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(userAB, this, SecurityConfig.createList("A","C")));
-    }
+	@Test
+	public void oneMatchingAttributeGrantsAccess() {
+		RoleVoter voter = new RoleVoter();
+		voter.setRolePrefix("");
+		Authentication userAB = new TestingAuthenticationToken("user", "pass", "A", "B");
+		// Vote on attribute list that has two attributes A and C (i.e. only one matching)
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED,
+				voter.vote(userAB, this, SecurityConfig.createList("A", "C")));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
index 28712a935d..ada60d10ab 100644
--- a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObject.java
@@ -21,19 +21,22 @@ package org.springframework.security.access.vote;
  * @author Ben Alex
  */
 public class SomeDomainObject {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String identity;
+	private String identity;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SomeDomainObject(String identity) {
-        this.identity = identity;
-    }
+	public SomeDomainObject(String identity) {
+		this.identity = identity;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String getParent() {
-        return "parentOf" + identity;
-    }
+	public String getParent() {
+		return "parentOf" + identity;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
index 762fc0861a..91abe38bf0 100644
--- a/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
+++ b/core/src/test/java/org/springframework/security/access/vote/SomeDomainObjectManager.java
@@ -16,13 +16,15 @@
 package org.springframework.security.access.vote;
 
 /**
- * Used by {@link BasicAclEntryVoterTests} so it can create a <code>MethodInvocation</code> contining
- * <code>SomeDomainObject</code>.
+ * Used by {@link BasicAclEntryVoterTests} so it can create a
+ * <code>MethodInvocation</code> contining <code>SomeDomainObject</code>.
  *
  * @author Ben Alex
  */
 public class SomeDomainObjectManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void someServiceMethod(SomeDomainObject someDomainObject) {}
+	public void someServiceMethod(SomeDomainObject someDomainObject) {
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
index 53359169ec..6a9f89579d 100644
--- a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
+++ b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java
@@ -28,7 +28,6 @@ import org.springframework.security.access.vote.RoleVoter;
 import org.springframework.security.access.vote.UnanimousBased;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
-
 /**
  * Tests {@link UnanimousBased}.
  *
@@ -36,123 +35,132 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
  */
 public class UnanimousBasedTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private UnanimousBased makeDecisionManager() {
-        RoleVoter roleVoter = new RoleVoter();
-        DenyVoter denyForSureVoter = new DenyVoter();
-        DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-        List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
-        voters.add(roleVoter);
-        voters.add(denyForSureVoter);
-        voters.add(denyAgainForSureVoter);
-        return new UnanimousBased(voters);
-    }
+	private UnanimousBased makeDecisionManager() {
+		RoleVoter roleVoter = new RoleVoter();
+		DenyVoter denyForSureVoter = new DenyVoter();
+		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		voters.add(roleVoter);
+		voters.add(denyForSureVoter);
+		voters.add(denyAgainForSureVoter);
+		return new UnanimousBased(voters);
+	}
 
-    private UnanimousBased makeDecisionManagerWithFooBarPrefix() {
-        RoleVoter roleVoter = new RoleVoter();
-        roleVoter.setRolePrefix("FOOBAR_");
+	private UnanimousBased makeDecisionManagerWithFooBarPrefix() {
+		RoleVoter roleVoter = new RoleVoter();
+		roleVoter.setRolePrefix("FOOBAR_");
 
-        DenyVoter denyForSureVoter = new DenyVoter();
-        DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-        List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
-        voters.add(roleVoter);
-        voters.add(denyForSureVoter);
-        voters.add(denyAgainForSureVoter);
-        return new UnanimousBased(voters);
-    }
+		DenyVoter denyForSureVoter = new DenyVoter();
+		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		voters.add(roleVoter);
+		voters.add(denyForSureVoter);
+		voters.add(denyAgainForSureVoter);
+		return new UnanimousBased(voters);
+	}
 
-    private TestingAuthenticationToken makeTestToken() {
-        return new TestingAuthenticationToken("somebody", "password", "ROLE_1", "ROLE_2");
-    }
+	private TestingAuthenticationToken makeTestToken() {
+		return new TestingAuthenticationToken("somebody", "password", "ROLE_1", "ROLE_2");
+	}
 
-    private TestingAuthenticationToken makeTestTokenWithFooBarPrefix() {
-        return new TestingAuthenticationToken("somebody", "password", "FOOBAR_1", "FOOBAR_2");
-    }
+	private TestingAuthenticationToken makeTestTokenWithFooBarPrefix() {
+		return new TestingAuthenticationToken("somebody", "password", "FOOBAR_1",
+				"FOOBAR_2");
+	}
 
-    public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteDeniesAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
+	public void testOneAffirmativeVoteOneDenyVoteOneAbstainVoteDeniesAccess()
+			throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
 
-        List<ConfigAttribute> config = SecurityConfig.createList(new String[]{"ROLE_1", "DENY_FOR_SURE"});
+		List<ConfigAttribute> config = SecurityConfig.createList(new String[] { "ROLE_1",
+				"DENY_FOR_SURE" });
 
-        try {
-            mgr.decide(auth, new Object(), config);
-            fail("Should have thrown AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			mgr.decide(auth, new Object(), config);
+			fail("Should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testOneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
+	public void testOneAffirmativeVoteTwoAbstainVotesGrantsAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
 
-        List<ConfigAttribute> config = SecurityConfig.createList("ROLE_2");
+		List<ConfigAttribute> config = SecurityConfig.createList("ROLE_2");
 
-        mgr.decide(auth, new Object(), config);
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), config);
+		assertTrue(true);
+	}
 
-    public void testOneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
+	public void testOneDenyVoteTwoAbstainVotesDeniesAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
 
-        List<ConfigAttribute> config = SecurityConfig.createList("ROLE_WE_DO_NOT_HAVE");
+		List<ConfigAttribute> config = SecurityConfig.createList("ROLE_WE_DO_NOT_HAVE");
 
-        try {
-            mgr.decide(auth, new Object(), config);
-            fail("Should have thrown AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			mgr.decide(auth, new Object(), config);
+			fail("Should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRoleVoterPrefixObserved() throws Exception {
-        TestingAuthenticationToken auth = makeTestTokenWithFooBarPrefix();
-        UnanimousBased mgr = makeDecisionManagerWithFooBarPrefix();
+	public void testRoleVoterPrefixObserved() throws Exception {
+		TestingAuthenticationToken auth = makeTestTokenWithFooBarPrefix();
+		UnanimousBased mgr = makeDecisionManagerWithFooBarPrefix();
 
-        List<ConfigAttribute> config = SecurityConfig.createList(new String[]{"FOOBAR_1", "FOOBAR_2"});
+		List<ConfigAttribute> config = SecurityConfig.createList(new String[] {
+				"FOOBAR_1", "FOOBAR_2" });
 
-        mgr.decide(auth, new Object(), config);
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), config);
+		assertTrue(true);
+	}
 
-    public void testThreeAbstainVotesDeniesAccessWithDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
+	public void testThreeAbstainVotesDeniesAccessWithDefault() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
 
-        assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
+		assertTrue(!mgr.isAllowIfAllAbstainDecisions()); // check default
 
-        List<ConfigAttribute> config = SecurityConfig.createList("IGNORED_BY_ALL");
+		List<ConfigAttribute> config = SecurityConfig.createList("IGNORED_BY_ALL");
 
-        try {
-            mgr.decide(auth, new Object(), config);
-            fail("Should have thrown AccessDeniedException");
-        } catch (AccessDeniedException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			mgr.decide(auth, new Object(), config);
+			fail("Should have thrown AccessDeniedException");
+		}
+		catch (AccessDeniedException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testThreeAbstainVotesGrantsAccessWithoutDefault() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
-        mgr.setAllowIfAllAbstainDecisions(true);
-        assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
+	public void testThreeAbstainVotesGrantsAccessWithoutDefault() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
+		mgr.setAllowIfAllAbstainDecisions(true);
+		assertTrue(mgr.isAllowIfAllAbstainDecisions()); // check changed
 
-        List<ConfigAttribute> config = SecurityConfig.createList("IGNORED_BY_ALL");
+		List<ConfigAttribute> config = SecurityConfig.createList("IGNORED_BY_ALL");
 
-        mgr.decide(auth, new Object(), config);
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), config);
+		assertTrue(true);
+	}
 
-    public void testTwoAffirmativeVotesTwoAbstainVotesGrantsAccess() throws Exception {
-        TestingAuthenticationToken auth = makeTestToken();
-        UnanimousBased mgr = makeDecisionManager();
+	public void testTwoAffirmativeVotesTwoAbstainVotesGrantsAccess() throws Exception {
+		TestingAuthenticationToken auth = makeTestToken();
+		UnanimousBased mgr = makeDecisionManager();
 
-        List<ConfigAttribute> config = SecurityConfig.createList(new String[]{"ROLE_1", "ROLE_2"});
+		List<ConfigAttribute> config = SecurityConfig.createList(new String[] { "ROLE_1",
+				"ROLE_2" });
 
-        mgr.decide(auth, new Object(), config);
-        assertTrue(true);
-    }
+		mgr.decide(auth, new Object(), config);
+		assertTrue(true);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java
index 36ad983113..640db425a0 100644
--- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java
@@ -24,117 +24,136 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
 import java.util.*;
 
-
 /**
  * Tests {@link AbstractAuthenticationToken}.
  *
  * @author Ben Alex
  */
 public class AbstractAuthenticationTokenTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private List<GrantedAuthority> authorities = null;
+	private List<GrantedAuthority> authorities = null;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public final void setUp() throws Exception {
-        authorities = AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO");
-    }
+	@Before
+	public final void setUp() throws Exception {
+		authorities = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
+	}
 
-    @Test(expected=UnsupportedOperationException.class)
-    public void testAuthoritiesAreImmutable() {
-        MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities);
-        List<GrantedAuthority> gotAuthorities = (List<GrantedAuthority>) token.getAuthorities();
-        assertNotSame(authorities, gotAuthorities);
+	@Test(expected = UnsupportedOperationException.class)
+	public void testAuthoritiesAreImmutable() {
+		MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		List<GrantedAuthority> gotAuthorities = (List<GrantedAuthority>) token
+				.getAuthorities();
+		assertNotSame(authorities, gotAuthorities);
 
-        gotAuthorities.set(0, new SimpleGrantedAuthority("ROLE_SUPER_USER"));
-    }
+		gotAuthorities.set(0, new SimpleGrantedAuthority("ROLE_SUPER_USER"));
+	}
 
-    @Test
-    public void testGetters() throws Exception {
-        MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities);
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("Password", token.getCredentials());
-        assertEquals("Test", token.getName());
-    }
+	@Test
+	public void testGetters() throws Exception {
+		MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		assertEquals("Test", token.getPrincipal());
+		assertEquals("Password", token.getCredentials());
+		assertEquals("Test", token.getName());
+	}
 
-    @Test
-    public void testHashCode() throws Exception {
-        MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", authorities);
-        MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", authorities);
-        MockAuthenticationImpl token3 = new MockAuthenticationImpl(null, null, AuthorityUtils.NO_AUTHORITIES);
-        assertEquals(token1.hashCode(), token2.hashCode());
-        assertTrue(token1.hashCode() != token3.hashCode());
+	@Test
+	public void testHashCode() throws Exception {
+		MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		MockAuthenticationImpl token3 = new MockAuthenticationImpl(null, null,
+				AuthorityUtils.NO_AUTHORITIES);
+		assertEquals(token1.hashCode(), token2.hashCode());
+		assertTrue(token1.hashCode() != token3.hashCode());
 
-        token2.setAuthenticated(true);
+		token2.setAuthenticated(true);
 
-        assertTrue(token1.hashCode() != token2.hashCode());
-    }
+		assertTrue(token1.hashCode() != token2.hashCode());
+	}
 
-    @Test
-    public void testObjectsEquals() throws Exception {
-        MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password", authorities);
-        MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password", authorities);
-        assertEquals(token1, token2);
+	@Test
+	public void testObjectsEquals() throws Exception {
+		MockAuthenticationImpl token1 = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		MockAuthenticationImpl token2 = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		assertEquals(token1, token2);
 
-        MockAuthenticationImpl token3 = new MockAuthenticationImpl("Test", "Password_Changed", authorities);
-        assertTrue(!token1.equals(token3));
+		MockAuthenticationImpl token3 = new MockAuthenticationImpl("Test",
+				"Password_Changed", authorities);
+		assertTrue(!token1.equals(token3));
 
-        MockAuthenticationImpl token4 = new MockAuthenticationImpl("Test_Changed", "Password", authorities);
-        assertTrue(!token1.equals(token4));
+		MockAuthenticationImpl token4 = new MockAuthenticationImpl("Test_Changed",
+				"Password", authorities);
+		assertTrue(!token1.equals(token4));
 
-        MockAuthenticationImpl token5 = new MockAuthenticationImpl("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO_CHANGED"));
-        assertTrue(!token1.equals(token5));
+		MockAuthenticationImpl token5 = new MockAuthenticationImpl("Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO_CHANGED"));
+		assertTrue(!token1.equals(token5));
 
-        MockAuthenticationImpl token6 = new MockAuthenticationImpl("Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE"));
-        assertTrue(!token1.equals(token6));
+		MockAuthenticationImpl token6 = new MockAuthenticationImpl("Test", "Password",
+				AuthorityUtils.createAuthorityList("ROLE_ONE"));
+		assertTrue(!token1.equals(token6));
 
-        MockAuthenticationImpl token7 = new MockAuthenticationImpl("Test", "Password", null);
-        assertTrue(!token1.equals(token7));
-        assertTrue(!token7.equals(token1));
+		MockAuthenticationImpl token7 = new MockAuthenticationImpl("Test", "Password",
+				null);
+		assertTrue(!token1.equals(token7));
+		assertTrue(!token7.equals(token1));
 
-        assertTrue(!token1.equals(Integer.valueOf(100)));
-    }
+		assertTrue(!token1.equals(Integer.valueOf(100)));
+	}
 
-    @Test
-    public void testSetAuthenticated() throws Exception {
-        MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities);
-        assertTrue(!token.isAuthenticated());
-        token.setAuthenticated(true);
-        assertTrue(token.isAuthenticated());
-    }
+	@Test
+	public void testSetAuthenticated() throws Exception {
+		MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		assertTrue(!token.isAuthenticated());
+		token.setAuthenticated(true);
+		assertTrue(token.isAuthenticated());
+	}
 
-    @Test
-    public void testToStringWithAuthorities() {
-        MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", authorities);
-        assertTrue(token.toString().lastIndexOf("ROLE_TWO") != -1);
-    }
+	@Test
+	public void testToStringWithAuthorities() {
+		MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password",
+				authorities);
+		assertTrue(token.toString().lastIndexOf("ROLE_TWO") != -1);
+	}
 
-    @Test
-    public void testToStringWithNullAuthorities() {
-        MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password", null);
-        assertTrue(token.toString().lastIndexOf("Not granted any authorities") != -1);
-    }
+	@Test
+	public void testToStringWithNullAuthorities() {
+		MockAuthenticationImpl token = new MockAuthenticationImpl("Test", "Password",
+				null);
+		assertTrue(token.toString().lastIndexOf("Not granted any authorities") != -1);
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockAuthenticationImpl extends AbstractAuthenticationToken {
-        private Object credentials;
-        private Object principal;
+	private class MockAuthenticationImpl extends AbstractAuthenticationToken {
+		private Object credentials;
+		private Object principal;
 
-        public MockAuthenticationImpl(Object principal, Object credentials, List<GrantedAuthority> authorities) {
-            super(authorities);
-            this.principal = principal;
-            this.credentials = credentials;
-        }
+		public MockAuthenticationImpl(Object principal, Object credentials,
+				List<GrantedAuthority> authorities) {
+			super(authorities);
+			this.principal = principal;
+			this.credentials = credentials;
+		}
 
-        public Object getCredentials() {
-            return this.credentials;
-        }
+		public Object getCredentials() {
+			return this.credentials;
+		}
 
-        public Object getPrincipal() {
-            return this.principal;
-        }
-    }
+		public Object getPrincipal() {
+			return this.principal;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java
index 9acd77f182..240a8e6503 100644
--- a/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/AuthenticationTrustResolverImplTests.java
@@ -23,41 +23,44 @@ import org.springframework.security.authentication.RememberMeAuthenticationToken
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
- * Tests {@link org.springframework.security.authentication.AuthenticationTrustResolverImpl}.
+ * Tests
+ * {@link org.springframework.security.authentication.AuthenticationTrustResolverImpl}.
  *
  * @author Ben Alex
  */
 public class AuthenticationTrustResolverImplTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testCorrectOperationIsAnonymous() {
-        AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
-        assertTrue(trustResolver.isAnonymous(
-                new AnonymousAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"))));
-        assertFalse(trustResolver.isAnonymous(
-                new TestingAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"))));
-    }
+	public void testCorrectOperationIsAnonymous() {
+		AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
+		assertTrue(trustResolver.isAnonymous(new AnonymousAuthenticationToken("ignored",
+				"ignored", AuthorityUtils.createAuthorityList("ignored"))));
+		assertFalse(trustResolver.isAnonymous(new TestingAuthenticationToken("ignored",
+				"ignored", AuthorityUtils.createAuthorityList("ignored"))));
+	}
 
-    public void testCorrectOperationIsRememberMe() {
-        AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
-        assertTrue(trustResolver.isRememberMe(
-                new RememberMeAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"))));
-        assertFalse(trustResolver.isAnonymous(
-                new TestingAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"))));
-    }
+	public void testCorrectOperationIsRememberMe() {
+		AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
+		assertTrue(trustResolver.isRememberMe(new RememberMeAuthenticationToken(
+				"ignored", "ignored", AuthorityUtils.createAuthorityList("ignored"))));
+		assertFalse(trustResolver.isAnonymous(new TestingAuthenticationToken("ignored",
+				"ignored", AuthorityUtils.createAuthorityList("ignored"))));
+	}
 
-    public void testGettersSetters() {
-        AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
+	public void testGettersSetters() {
+		AuthenticationTrustResolverImpl trustResolver = new AuthenticationTrustResolverImpl();
 
-        assertEquals(AnonymousAuthenticationToken.class, trustResolver.getAnonymousClass());
-        trustResolver.setAnonymousClass(TestingAuthenticationToken.class);
-        assertEquals(TestingAuthenticationToken.class, trustResolver.getAnonymousClass());
+		assertEquals(AnonymousAuthenticationToken.class,
+				trustResolver.getAnonymousClass());
+		trustResolver.setAnonymousClass(TestingAuthenticationToken.class);
+		assertEquals(TestingAuthenticationToken.class, trustResolver.getAnonymousClass());
 
-        assertEquals(RememberMeAuthenticationToken.class, trustResolver.getRememberMeClass());
-        trustResolver.setRememberMeClass(TestingAuthenticationToken.class);
-        assertEquals(TestingAuthenticationToken.class, trustResolver.getRememberMeClass());
-    }
+		assertEquals(RememberMeAuthenticationToken.class,
+				trustResolver.getRememberMeClass());
+		trustResolver.setRememberMeClass(TestingAuthenticationToken.class);
+		assertEquals(TestingAuthenticationToken.class, trustResolver.getRememberMeClass());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java
index 5914841f6c..3375848621 100644
--- a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java
@@ -23,95 +23,111 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class DefaultAuthenticationEventPublisherTests {
-    DefaultAuthenticationEventPublisher publisher;
+	DefaultAuthenticationEventPublisher publisher;
 
-    @Test
-    public void expectedDefaultMappingsAreSatisfied() throws Exception {
-        publisher = new DefaultAuthenticationEventPublisher();
-        ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
-        publisher.setApplicationEventPublisher(appPublisher);
-        Authentication a = mock(Authentication.class);
+	@Test
+	public void expectedDefaultMappingsAreSatisfied() throws Exception {
+		publisher = new DefaultAuthenticationEventPublisher();
+		ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
+		publisher.setApplicationEventPublisher(appPublisher);
+		Authentication a = mock(Authentication.class);
 
-        Exception cause = new Exception();
-        Object extraInfo = new Object();
-        publisher.publishAuthenticationFailure(new BadCredentialsException(""), a);
-        publisher.publishAuthenticationFailure(new BadCredentialsException("", cause), a);
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureBadCredentialsEvent.class));
-        reset(appPublisher);
-        publisher.publishAuthenticationFailure(new UsernameNotFoundException(""), a);
-        publisher.publishAuthenticationFailure(new UsernameNotFoundException("", cause), a);
-        publisher.publishAuthenticationFailure(new AccountExpiredException(""), a);
-        publisher.publishAuthenticationFailure(new AccountExpiredException("", cause), a);
-        publisher.publishAuthenticationFailure(new ProviderNotFoundException(""), a);
-        publisher.publishAuthenticationFailure(new DisabledException(""), a);
-        publisher.publishAuthenticationFailure(new DisabledException("", cause), a);
-        publisher.publishAuthenticationFailure(new LockedException(""), a);
-        publisher.publishAuthenticationFailure(new LockedException("", cause), a);
-        publisher.publishAuthenticationFailure(new AuthenticationServiceException(""), a);
-        publisher.publishAuthenticationFailure(new AuthenticationServiceException("",cause), a);
-        publisher.publishAuthenticationFailure(new CredentialsExpiredException(""), a);
-        publisher.publishAuthenticationFailure(new CredentialsExpiredException("", cause), a);
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureBadCredentialsEvent.class));
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureExpiredEvent.class));
-        verify(appPublisher).publishEvent(isA(AuthenticationFailureProviderNotFoundEvent.class));
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureDisabledEvent.class));
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureLockedEvent.class));
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureServiceExceptionEvent.class));
-        verify(appPublisher, times(2)).publishEvent(isA(AuthenticationFailureCredentialsExpiredEvent.class));
-        verifyNoMoreInteractions(appPublisher);
-    }
+		Exception cause = new Exception();
+		Object extraInfo = new Object();
+		publisher.publishAuthenticationFailure(new BadCredentialsException(""), a);
+		publisher.publishAuthenticationFailure(new BadCredentialsException("", cause), a);
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureBadCredentialsEvent.class));
+		reset(appPublisher);
+		publisher.publishAuthenticationFailure(new UsernameNotFoundException(""), a);
+		publisher.publishAuthenticationFailure(new UsernameNotFoundException("", cause),
+				a);
+		publisher.publishAuthenticationFailure(new AccountExpiredException(""), a);
+		publisher.publishAuthenticationFailure(new AccountExpiredException("", cause), a);
+		publisher.publishAuthenticationFailure(new ProviderNotFoundException(""), a);
+		publisher.publishAuthenticationFailure(new DisabledException(""), a);
+		publisher.publishAuthenticationFailure(new DisabledException("", cause), a);
+		publisher.publishAuthenticationFailure(new LockedException(""), a);
+		publisher.publishAuthenticationFailure(new LockedException("", cause), a);
+		publisher.publishAuthenticationFailure(new AuthenticationServiceException(""), a);
+		publisher.publishAuthenticationFailure(new AuthenticationServiceException("",
+				cause), a);
+		publisher.publishAuthenticationFailure(new CredentialsExpiredException(""), a);
+		publisher.publishAuthenticationFailure(
+				new CredentialsExpiredException("", cause), a);
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureBadCredentialsEvent.class));
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureExpiredEvent.class));
+		verify(appPublisher).publishEvent(
+				isA(AuthenticationFailureProviderNotFoundEvent.class));
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureDisabledEvent.class));
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureLockedEvent.class));
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureServiceExceptionEvent.class));
+		verify(appPublisher, times(2)).publishEvent(
+				isA(AuthenticationFailureCredentialsExpiredEvent.class));
+		verifyNoMoreInteractions(appPublisher);
+	}
 
-    @Test
-    public void authenticationSuccessIsPublished() {
-        publisher = new DefaultAuthenticationEventPublisher();
-        ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
-        publisher.setApplicationEventPublisher(appPublisher);
-        publisher.publishAuthenticationSuccess(mock(Authentication.class));
-        verify(appPublisher).publishEvent(isA(AuthenticationSuccessEvent.class));
+	@Test
+	public void authenticationSuccessIsPublished() {
+		publisher = new DefaultAuthenticationEventPublisher();
+		ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
+		publisher.setApplicationEventPublisher(appPublisher);
+		publisher.publishAuthenticationSuccess(mock(Authentication.class));
+		verify(appPublisher).publishEvent(isA(AuthenticationSuccessEvent.class));
 
-        publisher.setApplicationEventPublisher(null);
-        // Should be ignored with null app publisher
-        publisher.publishAuthenticationSuccess(mock(Authentication.class));
-    }
+		publisher.setApplicationEventPublisher(null);
+		// Should be ignored with null app publisher
+		publisher.publishAuthenticationSuccess(mock(Authentication.class));
+	}
 
-    @Test
-    public void additionalExceptionMappingsAreSupported() {
-        publisher = new DefaultAuthenticationEventPublisher();
-        Properties p = new Properties();
-        p.put(MockAuthenticationException.class.getName(), AuthenticationFailureDisabledEvent.class.getName());
-        publisher.setAdditionalExceptionMappings(p);
-        ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
+	@Test
+	public void additionalExceptionMappingsAreSupported() {
+		publisher = new DefaultAuthenticationEventPublisher();
+		Properties p = new Properties();
+		p.put(MockAuthenticationException.class.getName(),
+				AuthenticationFailureDisabledEvent.class.getName());
+		publisher.setAdditionalExceptionMappings(p);
+		ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
 
-        publisher.setApplicationEventPublisher(appPublisher);
-        publisher.publishAuthenticationFailure(new MockAuthenticationException("test"), mock(Authentication.class));
-        verify(appPublisher).publishEvent(isA(AuthenticationFailureDisabledEvent.class));
-    }
+		publisher.setApplicationEventPublisher(appPublisher);
+		publisher.publishAuthenticationFailure(new MockAuthenticationException("test"),
+				mock(Authentication.class));
+		verify(appPublisher).publishEvent(isA(AuthenticationFailureDisabledEvent.class));
+	}
 
-    @Test(expected=RuntimeException.class)
-    public void missingEventClassExceptionCausesException() {
-        publisher = new DefaultAuthenticationEventPublisher();
-        Properties p = new Properties();
-        p.put(MockAuthenticationException.class.getName(), "NoSuchClass");
-        publisher.setAdditionalExceptionMappings(p);
-    }
+	@Test(expected = RuntimeException.class)
+	public void missingEventClassExceptionCausesException() {
+		publisher = new DefaultAuthenticationEventPublisher();
+		Properties p = new Properties();
+		p.put(MockAuthenticationException.class.getName(), "NoSuchClass");
+		publisher.setAdditionalExceptionMappings(p);
+	}
 
-    @Test
-    public void unknownFailureExceptionIsIgnored() throws Exception {
-        publisher = new DefaultAuthenticationEventPublisher();
-        Properties p = new Properties();
-        p.put(MockAuthenticationException.class.getName(), AuthenticationFailureDisabledEvent.class.getName());
-        publisher.setAdditionalExceptionMappings(p);
-        ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
+	@Test
+	public void unknownFailureExceptionIsIgnored() throws Exception {
+		publisher = new DefaultAuthenticationEventPublisher();
+		Properties p = new Properties();
+		p.put(MockAuthenticationException.class.getName(),
+				AuthenticationFailureDisabledEvent.class.getName());
+		publisher.setAdditionalExceptionMappings(p);
+		ApplicationEventPublisher appPublisher = mock(ApplicationEventPublisher.class);
 
-        publisher.setApplicationEventPublisher(appPublisher);
-        publisher.publishAuthenticationFailure(new AuthenticationException("") {}, mock(Authentication.class));
-        verifyZeroInteractions(appPublisher);
-    }
+		publisher.setApplicationEventPublisher(appPublisher);
+		publisher.publishAuthenticationFailure(new AuthenticationException("") {
+		}, mock(Authentication.class));
+		verifyZeroInteractions(appPublisher);
+	}
 
-    private static final class MockAuthenticationException extends AuthenticationException {
-        public MockAuthenticationException(String msg) {
-            super(msg);
-        }
-    }
+	private static final class MockAuthenticationException extends
+			AuthenticationException {
+		public MockAuthenticationException(String msg) {
+			super(msg);
+		}
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
index 4c97d10e2e..ff62dee0f0 100644
--- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
@@ -37,277 +37,316 @@ import org.springframework.security.core.GrantedAuthority;
 @SuppressWarnings("unchecked")
 public class ProviderManagerTests {
 
-    @Test(expected=ProviderNotFoundException.class)
-    public void authenticationFailsWithUnsupportedToken() throws Exception {
-        Authentication token = new AbstractAuthenticationToken (null) {
-            public Object getCredentials() {
-                return "";
-            }
+	@Test(expected = ProviderNotFoundException.class)
+	public void authenticationFailsWithUnsupportedToken() throws Exception {
+		Authentication token = new AbstractAuthenticationToken(null) {
+			public Object getCredentials() {
+				return "";
+			}
 
-            public Object getPrincipal() {
-                return "";
-            }
-        };
-        ProviderManager mgr = makeProviderManager();
-        mgr.setMessageSource(mock(MessageSource.class));
-        mgr.authenticate(token);
-    }
+			public Object getPrincipal() {
+				return "";
+			}
+		};
+		ProviderManager mgr = makeProviderManager();
+		mgr.setMessageSource(mock(MessageSource.class));
+		mgr.authenticate(token);
+	}
 
-    @Test
-    public void credentialsAreClearedByDefault() throws Exception {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password");
-        ProviderManager mgr = makeProviderManager();
-        Authentication result = mgr.authenticate(token);
-        assertNull(result.getCredentials());
+	@Test
+	public void credentialsAreClearedByDefault() throws Exception {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password");
+		ProviderManager mgr = makeProviderManager();
+		Authentication result = mgr.authenticate(token);
+		assertNull(result.getCredentials());
 
-        mgr.setEraseCredentialsAfterAuthentication(false);
-        token = new UsernamePasswordAuthenticationToken("Test", "Password");
-        result = mgr.authenticate(token);
-        assertNotNull(result.getCredentials());
-    }
+		mgr.setEraseCredentialsAfterAuthentication(false);
+		token = new UsernamePasswordAuthenticationToken("Test", "Password");
+		result = mgr.authenticate(token);
+		assertNotNull(result.getCredentials());
+	}
 
-    @Test
-    public void authenticationSucceedsWithSupportedTokenAndReturnsExpectedObject() throws Exception {
-        final Authentication a = mock(Authentication.class);
-        ProviderManager mgr = new ProviderManager(Arrays.asList(createProviderWhichReturns(a)));
-        AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
-        mgr.setAuthenticationEventPublisher(publisher);
+	@Test
+	public void authenticationSucceedsWithSupportedTokenAndReturnsExpectedObject()
+			throws Exception {
+		final Authentication a = mock(Authentication.class);
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(createProviderWhichReturns(a)));
+		AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
+		mgr.setAuthenticationEventPublisher(publisher);
 
-        Authentication result = mgr.authenticate(a);
-        assertEquals(a, result);
-        verify(publisher).publishAuthenticationSuccess(result);
-    }
+		Authentication result = mgr.authenticate(a);
+		assertEquals(a, result);
+		verify(publisher).publishAuthenticationSuccess(result);
+	}
 
-    @Test
-    public void authenticationSucceedsWhenFirstProviderReturnsNullButSecondAuthenticates() {
-        final Authentication a = mock(Authentication.class);
-        ProviderManager mgr = new ProviderManager(Arrays.asList(createProviderWhichReturns(null), createProviderWhichReturns(a)));
-        AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
-        mgr.setAuthenticationEventPublisher(publisher);
+	@Test
+	public void authenticationSucceedsWhenFirstProviderReturnsNullButSecondAuthenticates() {
+		final Authentication a = mock(Authentication.class);
+		ProviderManager mgr = new ProviderManager(Arrays.asList(
+				createProviderWhichReturns(null), createProviderWhichReturns(a)));
+		AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
+		mgr.setAuthenticationEventPublisher(publisher);
 
-        Authentication result = mgr.authenticate(a);
-        assertSame(a, result);
-        verify(publisher).publishAuthenticationSuccess(result);
-    }
+		Authentication result = mgr.authenticate(a);
+		assertSame(a, result);
+		verify(publisher).publishAuthenticationSuccess(result);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testStartupFailsIfProvidersNotSet() throws Exception {
-        new ProviderManager(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testStartupFailsIfProvidersNotSet() throws Exception {
+		new ProviderManager(null);
+	}
 
-    @Test
-    public void detailsAreNotSetOnAuthenticationTokenIfAlreadySetByProvider() throws Exception {
-        Object requestDetails = "(Request Details)";
-        final Object resultDetails = "(Result Details)";
+	@Test
+	public void detailsAreNotSetOnAuthenticationTokenIfAlreadySetByProvider()
+			throws Exception {
+		Object requestDetails = "(Request Details)";
+		final Object resultDetails = "(Result Details)";
 
-        // A provider which sets the details object
-        AuthenticationProvider provider = new AuthenticationProvider() {
-            public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-                ((TestingAuthenticationToken)authentication).setDetails(resultDetails);
-                return authentication;
-            }
+		// A provider which sets the details object
+		AuthenticationProvider provider = new AuthenticationProvider() {
+			public Authentication authenticate(Authentication authentication)
+					throws AuthenticationException {
+				((TestingAuthenticationToken) authentication).setDetails(resultDetails);
+				return authentication;
+			}
 
-            public boolean supports(Class<?> authentication) {
-                return true;
-            }
-        };
+			public boolean supports(Class<?> authentication) {
+				return true;
+			}
+		};
 
-        ProviderManager authMgr = new ProviderManager(Arrays.asList(provider));
+		ProviderManager authMgr = new ProviderManager(Arrays.asList(provider));
 
-        TestingAuthenticationToken request = createAuthenticationToken();
-        request.setDetails(requestDetails);
+		TestingAuthenticationToken request = createAuthenticationToken();
+		request.setDetails(requestDetails);
 
-        Authentication result = authMgr.authenticate(request);
-        assertEquals(resultDetails, result.getDetails());
-    }
+		Authentication result = authMgr.authenticate(request);
+		assertEquals(resultDetails, result.getDetails());
+	}
 
-    @Test
-    public void detailsAreSetOnAuthenticationTokenIfNotAlreadySetByProvider() throws Exception {
-        Object details = new Object();
-        ProviderManager authMgr = makeProviderManager();
+	@Test
+	public void detailsAreSetOnAuthenticationTokenIfNotAlreadySetByProvider()
+			throws Exception {
+		Object details = new Object();
+		ProviderManager authMgr = makeProviderManager();
 
-        TestingAuthenticationToken request = createAuthenticationToken();
-        request.setDetails(details);
+		TestingAuthenticationToken request = createAuthenticationToken();
+		request.setDetails(details);
 
-        Authentication result = authMgr.authenticate(request);
-        assertNotNull(result.getCredentials());
-        assertSame(details, result.getDetails());
-    }
+		Authentication result = authMgr.authenticate(request);
+		assertNotNull(result.getCredentials());
+		assertSame(details, result.getDetails());
+	}
 
-    @Test
-    public void authenticationExceptionIsIgnoredIfLaterProviderAuthenticates() throws Exception {
-        final Authentication authReq = mock(Authentication.class);
-        ProviderManager mgr = new ProviderManager(Arrays.asList(createProviderWhichThrows(new BadCredentialsException("", new Throwable())),
-                createProviderWhichReturns(authReq)));
-        assertSame(authReq, mgr.authenticate(mock(Authentication.class)));
-    }
+	@Test
+	public void authenticationExceptionIsIgnoredIfLaterProviderAuthenticates()
+			throws Exception {
+		final Authentication authReq = mock(Authentication.class);
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(createProviderWhichThrows(new BadCredentialsException("",
+						new Throwable())), createProviderWhichReturns(authReq)));
+		assertSame(authReq, mgr.authenticate(mock(Authentication.class)));
+	}
 
-    @Test
-    public void authenticationExceptionIsRethrownIfNoLaterProviderAuthenticates() throws Exception {
+	@Test
+	public void authenticationExceptionIsRethrownIfNoLaterProviderAuthenticates()
+			throws Exception {
 
-        ProviderManager mgr = new ProviderManager(Arrays.asList(createProviderWhichThrows(new BadCredentialsException("")),
-                createProviderWhichReturns(null)));
-        try {
-            mgr.authenticate(mock(Authentication.class));
-            fail("Expected BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-        }
-    }
+		ProviderManager mgr = new ProviderManager(Arrays.asList(
+				createProviderWhichThrows(new BadCredentialsException("")),
+				createProviderWhichReturns(null)));
+		try {
+			mgr.authenticate(mock(Authentication.class));
+			fail("Expected BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-    // SEC-546
-    @Test
-    public void accountStatusExceptionPreventsCallsToSubsequentProviders() throws Exception {
-        AuthenticationProvider iThrowAccountStatusException = createProviderWhichThrows(new AccountStatusException("") {
-        });
-        AuthenticationProvider otherProvider = mock(AuthenticationProvider.class);
+	// SEC-546
+	@Test
+	public void accountStatusExceptionPreventsCallsToSubsequentProviders()
+			throws Exception {
+		AuthenticationProvider iThrowAccountStatusException = createProviderWhichThrows(new AccountStatusException(
+				"") {
+		});
+		AuthenticationProvider otherProvider = mock(AuthenticationProvider.class);
 
-        ProviderManager authMgr = new ProviderManager(Arrays.asList(iThrowAccountStatusException, otherProvider));
+		ProviderManager authMgr = new ProviderManager(Arrays.asList(
+				iThrowAccountStatusException, otherProvider));
 
-        try {
-            authMgr.authenticate(mock(Authentication.class));
-            fail("Expected AccountStatusException");
-        } catch (AccountStatusException expected) {
-        }
-        verifyZeroInteractions(otherProvider);
-    }
+		try {
+			authMgr.authenticate(mock(Authentication.class));
+			fail("Expected AccountStatusException");
+		}
+		catch (AccountStatusException expected) {
+		}
+		verifyZeroInteractions(otherProvider);
+	}
 
-    @Test
-    public void parentAuthenticationIsUsedIfProvidersDontAuthenticate() throws Exception {
-        AuthenticationManager parent = mock(AuthenticationManager.class);
-        Authentication authReq = mock(Authentication.class);
-        when(parent.authenticate(authReq)).thenReturn(authReq);
-        ProviderManager mgr = new ProviderManager(Arrays.asList(mock(AuthenticationProvider.class)), parent);
-        assertSame(authReq, mgr.authenticate(authReq));
-    }
+	@Test
+	public void parentAuthenticationIsUsedIfProvidersDontAuthenticate() throws Exception {
+		AuthenticationManager parent = mock(AuthenticationManager.class);
+		Authentication authReq = mock(Authentication.class);
+		when(parent.authenticate(authReq)).thenReturn(authReq);
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(mock(AuthenticationProvider.class)), parent);
+		assertSame(authReq, mgr.authenticate(authReq));
+	}
 
-    @Test
-    public void parentIsNotCalledIfAccountStatusExceptionIsThrown() throws Exception {
-        AuthenticationProvider iThrowAccountStatusException =
-                createProviderWhichThrows(new AccountStatusException("", new Throwable()){});
-        AuthenticationManager parent = mock(AuthenticationManager.class);
-        ProviderManager mgr = new ProviderManager(Arrays.asList(iThrowAccountStatusException), parent);
-        try {
-            mgr.authenticate(mock(Authentication.class));
-            fail("Expected exception");
-        } catch (AccountStatusException expected) {
-        }
-        verifyZeroInteractions(parent);
-    }
+	@Test
+	public void parentIsNotCalledIfAccountStatusExceptionIsThrown() throws Exception {
+		AuthenticationProvider iThrowAccountStatusException = createProviderWhichThrows(new AccountStatusException(
+				"", new Throwable()) {
+		});
+		AuthenticationManager parent = mock(AuthenticationManager.class);
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(iThrowAccountStatusException), parent);
+		try {
+			mgr.authenticate(mock(Authentication.class));
+			fail("Expected exception");
+		}
+		catch (AccountStatusException expected) {
+		}
+		verifyZeroInteractions(parent);
+	}
 
-    @Test
-    public void providerNotFoundFromParentIsIgnored() throws Exception {
-        final Authentication authReq = mock(Authentication.class);
-        AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
-        AuthenticationManager parent = mock(AuthenticationManager.class);
-        when(parent.authenticate(authReq)).thenThrow(new ProviderNotFoundException(""));
+	@Test
+	public void providerNotFoundFromParentIsIgnored() throws Exception {
+		final Authentication authReq = mock(Authentication.class);
+		AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
+		AuthenticationManager parent = mock(AuthenticationManager.class);
+		when(parent.authenticate(authReq)).thenThrow(new ProviderNotFoundException(""));
 
-        // Set a provider that throws an exception - this is the exception we expect to be propagated
-        ProviderManager mgr = new ProviderManager(Arrays.asList(createProviderWhichThrows(new BadCredentialsException(""))), parent);
-        mgr.setAuthenticationEventPublisher(publisher);
+		// Set a provider that throws an exception - this is the exception we expect to be
+		// propagated
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(createProviderWhichThrows(new BadCredentialsException(""))),
+				parent);
+		mgr.setAuthenticationEventPublisher(publisher);
 
-        try {
-            mgr.authenticate(authReq);
-            fail("Expected exception");
-        } catch (BadCredentialsException expected) {
-            verify(publisher).publishAuthenticationFailure(expected, authReq);
-        }
-    }
+		try {
+			mgr.authenticate(authReq);
+			fail("Expected exception");
+		}
+		catch (BadCredentialsException expected) {
+			verify(publisher).publishAuthenticationFailure(expected, authReq);
+		}
+	}
 
-    @Test
-    public void authenticationExceptionFromParentOverridesPreviousOnes() throws Exception {
-        AuthenticationManager parent = mock(AuthenticationManager.class);
-        ProviderManager mgr = new ProviderManager(
-                Arrays.asList(createProviderWhichThrows(new BadCredentialsException(""))), parent);
-        final Authentication authReq = mock(Authentication.class);
-        AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
-        mgr.setAuthenticationEventPublisher(publisher);
-        // Set a provider that throws an exception - this is the exception we expect to be propagated
-        final BadCredentialsException expected = new BadCredentialsException("I'm the one from the parent");
-        when(parent.authenticate(authReq)).thenThrow(expected);
-        try {
-            mgr.authenticate(authReq);
-            fail("Expected exception");
-        } catch (BadCredentialsException e) {
-            assertSame(expected, e);
-        }
-        verify(publisher).publishAuthenticationFailure(expected, authReq);
-    }
+	@Test
+	public void authenticationExceptionFromParentOverridesPreviousOnes() throws Exception {
+		AuthenticationManager parent = mock(AuthenticationManager.class);
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(createProviderWhichThrows(new BadCredentialsException(""))),
+				parent);
+		final Authentication authReq = mock(Authentication.class);
+		AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
+		mgr.setAuthenticationEventPublisher(publisher);
+		// Set a provider that throws an exception - this is the exception we expect to be
+		// propagated
+		final BadCredentialsException expected = new BadCredentialsException(
+				"I'm the one from the parent");
+		when(parent.authenticate(authReq)).thenThrow(expected);
+		try {
+			mgr.authenticate(authReq);
+			fail("Expected exception");
+		}
+		catch (BadCredentialsException e) {
+			assertSame(expected, e);
+		}
+		verify(publisher).publishAuthenticationFailure(expected, authReq);
+	}
 
-    @Test
-    @SuppressWarnings("deprecation")
-    public void statusExceptionIsPublished() throws Exception {
-        AuthenticationManager parent = mock(AuthenticationManager.class);
-        final LockedException expected = new LockedException("");
-        ProviderManager mgr = new ProviderManager(
-                Arrays.asList(createProviderWhichThrows(expected)), parent);
-        final Authentication authReq = mock(Authentication.class);
-        AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
-        mgr.setAuthenticationEventPublisher(publisher);
-        try {
-            mgr.authenticate(authReq);
-            fail("Expected exception");
-        } catch (LockedException e) {
-            assertSame(expected, e);
-        }
-        verify(publisher).publishAuthenticationFailure(expected, authReq);
-    }
+	@Test
+	@SuppressWarnings("deprecation")
+	public void statusExceptionIsPublished() throws Exception {
+		AuthenticationManager parent = mock(AuthenticationManager.class);
+		final LockedException expected = new LockedException("");
+		ProviderManager mgr = new ProviderManager(
+				Arrays.asList(createProviderWhichThrows(expected)), parent);
+		final Authentication authReq = mock(Authentication.class);
+		AuthenticationEventPublisher publisher = mock(AuthenticationEventPublisher.class);
+		mgr.setAuthenticationEventPublisher(publisher);
+		try {
+			mgr.authenticate(authReq);
+			fail("Expected exception");
+		}
+		catch (LockedException e) {
+			assertSame(expected, e);
+		}
+		verify(publisher).publishAuthenticationFailure(expected, authReq);
+	}
 
-    // SEC-2367
-    @Test
-    public void providerThrowsInternalAuthenticationServiceException() {
-        InternalAuthenticationServiceException expected = new InternalAuthenticationServiceException("Expected");
-        ProviderManager mgr = new ProviderManager(
-                Arrays.asList(createProviderWhichThrows(expected), createProviderWhichThrows(new BadCredentialsException("Oops"))), null);
-        final Authentication authReq = mock(Authentication.class);
+	// SEC-2367
+	@Test
+	public void providerThrowsInternalAuthenticationServiceException() {
+		InternalAuthenticationServiceException expected = new InternalAuthenticationServiceException(
+				"Expected");
+		ProviderManager mgr = new ProviderManager(Arrays.asList(
+				createProviderWhichThrows(expected),
+				createProviderWhichThrows(new BadCredentialsException("Oops"))), null);
+		final Authentication authReq = mock(Authentication.class);
 
-        try {
-            mgr.authenticate(authReq);
-            fail("Expected Exception");
-        } catch(InternalAuthenticationServiceException success) {}
-    }
+		try {
+			mgr.authenticate(authReq);
+			fail("Expected Exception");
+		}
+		catch (InternalAuthenticationServiceException success) {
+		}
+	}
 
-    private AuthenticationProvider createProviderWhichThrows(final AuthenticationException e) {
-        AuthenticationProvider provider = mock(AuthenticationProvider.class);
-        when(provider.supports(any(Class.class))).thenReturn(true);
-        when(provider.authenticate(any(Authentication.class))).thenThrow(e);
+	private AuthenticationProvider createProviderWhichThrows(
+			final AuthenticationException e) {
+		AuthenticationProvider provider = mock(AuthenticationProvider.class);
+		when(provider.supports(any(Class.class))).thenReturn(true);
+		when(provider.authenticate(any(Authentication.class))).thenThrow(e);
 
-        return provider;
-    }
+		return provider;
+	}
 
-    private AuthenticationProvider createProviderWhichReturns(final Authentication a) {
-        AuthenticationProvider provider = mock(AuthenticationProvider.class);
-        when(provider.supports(any(Class.class))).thenReturn(true);
-        when(provider.authenticate(any(Authentication.class))).thenReturn(a);
+	private AuthenticationProvider createProviderWhichReturns(final Authentication a) {
+		AuthenticationProvider provider = mock(AuthenticationProvider.class);
+		when(provider.supports(any(Class.class))).thenReturn(true);
+		when(provider.authenticate(any(Authentication.class))).thenReturn(a);
 
-        return provider;
-    }
+		return provider;
+	}
 
-    private TestingAuthenticationToken createAuthenticationToken() {
-        return new TestingAuthenticationToken("name", "password", new ArrayList<GrantedAuthority>(0));
-    }
+	private TestingAuthenticationToken createAuthenticationToken() {
+		return new TestingAuthenticationToken("name", "password",
+				new ArrayList<GrantedAuthority>(0));
+	}
 
-    private ProviderManager makeProviderManager() throws Exception {
-        MockProvider provider1 = new MockProvider();
-        List<AuthenticationProvider> providers = new ArrayList<AuthenticationProvider>();
-        providers.add(provider1);
+	private ProviderManager makeProviderManager() throws Exception {
+		MockProvider provider1 = new MockProvider();
+		List<AuthenticationProvider> providers = new ArrayList<AuthenticationProvider>();
+		providers.add(provider1);
 
-        return new ProviderManager(providers);
-    }
+		return new ProviderManager(providers);
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockProvider implements AuthenticationProvider {
-        public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-            if (supports(authentication.getClass())) {
-                return authentication;
-            } else {
-                throw new AuthenticationServiceException("Don't support this class");
-            }
-        }
+	private class MockProvider implements AuthenticationProvider {
+		public Authentication authenticate(Authentication authentication)
+				throws AuthenticationException {
+			if (supports(authentication.getClass())) {
+				return authentication;
+			}
+			else {
+				throw new AuthenticationServiceException("Don't support this class");
+			}
+		}
 
-        public boolean supports(Class<?> authentication) {
-            return TestingAuthenticationToken.class.isAssignableFrom(authentication) ||
-                    UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication);
-        }
-    }
+		public boolean supports(Class<?> authentication) {
+			return TestingAuthenticationToken.class.isAssignableFrom(authentication)
+					|| UsernamePasswordAuthenticationToken.class
+							.isAssignableFrom(authentication);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java
index 882c3b49ba..b51d259a62 100644
--- a/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/TestingAuthenticationProviderTests.java
@@ -29,23 +29,26 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class TestingAuthenticationProviderTests extends TestCase {
 
-    public void testAuthenticates() {
-        TestingAuthenticationProvider provider = new TestingAuthenticationProvider();
-        TestingAuthenticationToken token = new TestingAuthenticationToken("Test", "Password","ROLE_ONE","ROLE_TWO");
-        Authentication result = provider.authenticate(token);
+	public void testAuthenticates() {
+		TestingAuthenticationProvider provider = new TestingAuthenticationProvider();
+		TestingAuthenticationToken token = new TestingAuthenticationToken("Test",
+				"Password", "ROLE_ONE", "ROLE_TWO");
+		Authentication result = provider.authenticate(token);
 
-        assertTrue(result instanceof TestingAuthenticationToken);
+		assertTrue(result instanceof TestingAuthenticationToken);
 
-        TestingAuthenticationToken castResult = (TestingAuthenticationToken) result;
-        assertEquals("Test", castResult.getPrincipal());
-        assertEquals("Password", castResult.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()).contains("ROLE_TWO"));
-    }
+		TestingAuthenticationToken castResult = (TestingAuthenticationToken) result;
+		assertEquals("Test", castResult.getPrincipal());
+		assertEquals("Password", castResult.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities())
+				.contains("ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities())
+				.contains("ROLE_TWO"));
+	}
 
-    public void testSupports() {
-        TestingAuthenticationProvider provider = new TestingAuthenticationProvider();
-        assertTrue(provider.supports(TestingAuthenticationToken.class));
-        assertTrue(!provider.supports(String.class));
-    }
+	public void testSupports() {
+		TestingAuthenticationProvider provider = new TestingAuthenticationProvider();
+		assertTrue(provider.supports(TestingAuthenticationToken.class));
+		assertTrue(!provider.supports(String.class));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java
index d0218727be..8606feafd5 100644
--- a/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/UsernamePasswordAuthenticationTokenTests.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link UsernamePasswordAuthenticationToken}.
  *
@@ -31,49 +30,58 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class UsernamePasswordAuthenticationTokenTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void authenticatedPropertyContractIsSatisfied() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password", AuthorityUtils.NO_AUTHORITIES);
+	@Test
+	public void authenticatedPropertyContractIsSatisfied() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.NO_AUTHORITIES);
 
-        // check default given we passed some GrantedAuthorty[]s (well, we passed empty list)
-        assertTrue(token.isAuthenticated());
+		// check default given we passed some GrantedAuthorty[]s (well, we passed empty
+		// list)
+		assertTrue(token.isAuthenticated());
 
-        // check explicit set to untrusted (we can safely go from trusted to untrusted, but not the reverse)
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
+		// check explicit set to untrusted (we can safely go from trusted to untrusted,
+		// but not the reverse)
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
 
-        // Now let's create a UsernamePasswordAuthenticationToken without any GrantedAuthorty[]s (different constructor)
-        token = new UsernamePasswordAuthenticationToken("Test", "Password");
+		// Now let's create a UsernamePasswordAuthenticationToken without any
+		// GrantedAuthorty[]s (different constructor)
+		token = new UsernamePasswordAuthenticationToken("Test", "Password");
 
-        assertTrue(!token.isAuthenticated());
+		assertTrue(!token.isAuthenticated());
 
-        // check we're allowed to still set it to untrusted
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
+		// check we're allowed to still set it to untrusted
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
 
-        // check denied changing it to trusted
-        try {
-            token.setAuthenticated(true);
-            fail("Should have prohibited setAuthenticated(true)");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		// check denied changing it to trusted
+		try {
+			token.setAuthenticated(true);
+			fail("Should have prohibited setAuthenticated(true)");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void gettersReturnCorrectData() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("Password", token.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_TWO"));
-    }
+	@Test
+	public void gettersReturnCorrectData() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
+		assertEquals("Test", token.getPrincipal());
+		assertEquals("Password", token.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_TWO"));
+	}
 
-    @Test(expected=NoSuchMethodException.class)
-    public void testNoArgConstructorDoesntExist() throws Exception {
-        Class<?> clazz = UsernamePasswordAuthenticationToken.class;
-        clazz.getDeclaredConstructor((Class[]) null);
-    }
+	@Test(expected = NoSuchMethodException.class)
+	public void testNoArgConstructorDoesntExist() throws Exception {
+		Class<?> clazz = UsernamePasswordAuthenticationToken.class;
+		clazz.getDeclaredConstructor((Class[]) null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java
index 34477ad8a4..1327c392c8 100644
--- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationProviderTests.java
@@ -25,7 +25,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link AnonymousAuthenticationProvider}.
  *
@@ -33,65 +32,75 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class AnonymousAuthenticationProviderTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testDetectsAnInvalidKey() throws Exception {
-        AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty");
+	@Test
+	public void testDetectsAnInvalidKey() throws Exception {
+		AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider(
+				"qwerty");
 
-        AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("WRONG_KEY", "Test",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+		AnonymousAuthenticationToken token = new AnonymousAuthenticationToken(
+				"WRONG_KEY", "Test", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
 
-        try {
-            aap.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-        }
-    }
+		try {
+			aap.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-    @Test
-    public void testDetectsMissingKey() throws Exception {
-        try {
-            new AnonymousAuthenticationProvider(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	@Test
+	public void testDetectsMissingKey() throws Exception {
+		try {
+			new AnonymousAuthenticationProvider(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    @Test
-    public void testGettersSetters() throws Exception {
-        AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty");
-        assertEquals("qwerty", aap.getKey());
-    }
+	@Test
+	public void testGettersSetters() throws Exception {
+		AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider(
+				"qwerty");
+		assertEquals("qwerty", aap.getKey());
+	}
 
-    @Test
-    public void testIgnoresClassesItDoesNotSupport() throws Exception {
-        AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty");
+	@Test
+	public void testIgnoresClassesItDoesNotSupport() throws Exception {
+		AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider(
+				"qwerty");
 
-        TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password", "ROLE_A");
-        assertFalse(aap.supports(TestingAuthenticationToken.class));
+		TestingAuthenticationToken token = new TestingAuthenticationToken("user",
+				"password", "ROLE_A");
+		assertFalse(aap.supports(TestingAuthenticationToken.class));
 
-        // Try it anyway
-        assertNull(aap.authenticate(token));
-    }
+		// Try it anyway
+		assertNull(aap.authenticate(token));
+	}
 
-    @Test
-    public void testNormalOperation() throws Exception {
-        AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty");
+	@Test
+	public void testNormalOperation() throws Exception {
+		AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider(
+				"qwerty");
 
-        AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("qwerty", "Test",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+		AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("qwerty",
+				"Test", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
 
-        Authentication result = aap.authenticate(token);
+		Authentication result = aap.authenticate(token);
 
-        assertEquals(result, token);
-    }
+		assertEquals(result, token);
+	}
 
-    @Test
-    public void testSupports() {
-        AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider("qwerty");
-        assertTrue(aap.supports(AnonymousAuthenticationToken.class));
-        assertFalse(aap.supports(TestingAuthenticationToken.class));
-    }
+	@Test
+	public void testSupports() {
+		AnonymousAuthenticationProvider aap = new AnonymousAuthenticationProvider(
+				"qwerty");
+		assertTrue(aap.supports(AnonymousAuthenticationToken.class));
+		assertFalse(aap.supports(TestingAuthenticationToken.class));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java
index dc61388a9c..11fe02164b 100644
--- a/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/anonymous/AnonymousAuthenticationTokenTests.java
@@ -24,7 +24,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link AnonymousAuthenticationToken}.
  *
@@ -32,90 +31,109 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class AnonymousAuthenticationTokenTests extends TestCase {
 
-    private final static List<GrantedAuthority> ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
+	private final static List<GrantedAuthority> ROLES_12 = AuthorityUtils
+			.createAuthorityList("ROLE_ONE", "ROLE_TWO");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testConstructorRejectsNulls() {
-        try {
-            new AnonymousAuthenticationToken(null, "Test", ROLES_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+	public void testConstructorRejectsNulls() {
+		try {
+			new AnonymousAuthenticationToken(null, "Test", ROLES_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new AnonymousAuthenticationToken("key", null, ROLES_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new AnonymousAuthenticationToken("key", null, ROLES_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new AnonymousAuthenticationToken("key", "Test", (List<GrantedAuthority>)null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			new AnonymousAuthenticationToken("key", "Test", (List<GrantedAuthority>) null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            new AnonymousAuthenticationToken("key", "Test", AuthorityUtils.NO_AUTHORITIES );
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			new AnonymousAuthenticationToken("key", "Test", AuthorityUtils.NO_AUTHORITIES);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    public void testEqualsWhenEqual() {
-        AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
-        AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
+	public void testEqualsWhenEqual() {
+		AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
+		AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
 
-        assertEquals(token1, token2);
-    }
+		assertEquals(token1, token2);
+	}
 
-    public void testGetters() {
-        AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
+	public void testGetters() {
+		AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
 
-        assertEquals("key".hashCode(), token.getKeyHash());
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("", token.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_TWO"));
-        assertTrue(token.isAuthenticated());
-    }
+		assertEquals("key".hashCode(), token.getKeyHash());
+		assertEquals("Test", token.getPrincipal());
+		assertEquals("", token.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_TWO"));
+		assertTrue(token.isAuthenticated());
+	}
 
-    public void testNoArgConstructorDoesntExist() {
-        Class<?> clazz = AnonymousAuthenticationToken.class;
+	public void testNoArgConstructorDoesntExist() {
+		Class<?> clazz = AnonymousAuthenticationToken.class;
 
-        try {
-            clazz.getDeclaredConstructor((Class[]) null);
-            fail("Should have thrown NoSuchMethodException");
-        } catch (NoSuchMethodException expected) {
-        }
-    }
+		try {
+			clazz.getDeclaredConstructor((Class[]) null);
+			fail("Should have thrown NoSuchMethodException");
+		}
+		catch (NoSuchMethodException expected) {
+		}
+	}
 
-    public void testNotEqualsDueToAbstractParentEqualsCheck() {
-        AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
-        AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key", "DIFFERENT_PRINCIPAL", ROLES_12);
+	public void testNotEqualsDueToAbstractParentEqualsCheck() {
+		AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
+		AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("key",
+				"DIFFERENT_PRINCIPAL", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToDifferentAuthenticationClass() {
-        AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
-        UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password", ROLES_12);
+	public void testNotEqualsDueToDifferentAuthenticationClass() {
+		AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
+		UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToKey() {
-        AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
+	public void testNotEqualsDueToKey() {
+		AnonymousAuthenticationToken token1 = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
 
-        AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken("DIFFERENT_KEY", "Test", ROLES_12);
+		AnonymousAuthenticationToken token2 = new AnonymousAuthenticationToken(
+				"DIFFERENT_KEY", "Test", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testSetAuthenticatedIgnored() {
-        AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key", "Test", ROLES_12);
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
-    }
+	public void testSetAuthenticatedIgnored() {
+		AnonymousAuthenticationToken token = new AnonymousAuthenticationToken("key",
+				"Test", ROLES_12);
+		assertTrue(token.isAuthenticated());
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
index cf28565fd1..02c3d64c89 100644
--- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java
@@ -51,7 +51,6 @@ import org.springframework.security.core.userdetails.cache.NullUserCache;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-
 /**
  * Tests {@link DaoAuthenticationProvider}.
  *
@@ -59,576 +58,649 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  * @author Rob Winch
  */
 public class DaoAuthenticationProviderTests extends TestCase {
-    private static final List<GrantedAuthority> ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
-
-
-    //~ Methods ========================================================================================================
-
-    public void testAuthenticateFailsForIncorrectPasswordCase() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "KOala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testReceivedBadCredentialsWhenCredentialsNotProvided() {
-        // Test related to SEC-434
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken("rod", null);
-        try {
-            provider.authenticate(authenticationToken);
-            fail("Expected BadCredenialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsIfAccountExpired() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("peter", "opal");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountExpired());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown AccountExpiredException");
-        } catch (AccountExpiredException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsIfAccountLocked() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("peter", "opal");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountLocked());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown LockedException");
-        } catch (LockedException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsIfCredentialsExpired() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("peter", "opal");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserPeterCredentialsExpired());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown CredentialsExpiredException");
-        } catch (CredentialsExpiredException expected) {
-            assertTrue(true);
-        }
-
-        // Check that wrong password causes BadCredentialsException, rather than CredentialsExpiredException
-        token = new UsernamePasswordAuthenticationToken("peter", "wrong_password");
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsIfUserDisabled() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("peter", "opal");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserPeter());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown DisabledException");
-        } catch (DisabledException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsWhenAuthenticationDaoHasBackendFailure() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoSimulateBackendError());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown InternalAuthenticationServiceException");
-        } catch (InternalAuthenticationServiceException expected) {
-        }
-    }
-
-    public void testAuthenticateFailsWithEmptyUsername() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(null, "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsWithInvalidPassword() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod",
-                "INVALID_PASSWORD");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsWithInvalidUsernameAndHideUserNotFoundExceptionFalse() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("INVALID_USER", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false); // we want UsernameNotFoundExceptions
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown UsernameNotFoundException");
-        } catch (UsernameNotFoundException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsWithInvalidUsernameAndHideUserNotFoundExceptionsWithDefaultOfTrue() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("INVALID_USER", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        assertTrue(provider.isHideUserNotFoundExceptions());
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticateFailsWithMixedCaseUsernameIfDefaultChanged() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("RoD", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testAuthenticates() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-        token.setDetails("192.168.0.1");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        Authentication result = provider.authenticate(token);
-
-        if (!(result instanceof UsernamePasswordAuthenticationToken)) {
-            fail("Should have returned instance of UsernamePasswordAuthenticationToken");
-        }
-
-        UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result;
-        assertEquals(User.class, castResult.getPrincipal().getClass());
-        assertEquals("koala", castResult.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities()).contains("ROLE_TWO"));
-        assertEquals("192.168.0.1", castResult.getDetails());
-    }
-
-    public void testAuthenticatesASecondTime() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-
-        Authentication result = provider.authenticate(token);
-
-        if (!(result instanceof UsernamePasswordAuthenticationToken)) {
-            fail("Should have returned instance of UsernamePasswordAuthenticationToken");
-        }
-
-        // Now try to authenticate with the previous result (with its UserDetails)
-        Authentication result2 = provider.authenticate(result);
-
-        if (!(result2 instanceof UsernamePasswordAuthenticationToken)) {
-            fail("Should have returned instance of UsernamePasswordAuthenticationToken");
-        }
-
-        assertEquals(result.getCredentials(), result2.getCredentials());
-    }
-
-    public void testAuthenticatesWhenASaltIsUsed() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        SystemWideSaltSource salt = new SystemWideSaltSource();
-        salt.setSystemWideSalt("SYSTEM_SALT_VALUE");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrodWithSalt());
-        provider.setSaltSource(salt);
-        provider.setUserCache(new MockUserCache());
-
-        Authentication result = provider.authenticate(token);
-
-        if (!(result instanceof UsernamePasswordAuthenticationToken)) {
-            fail("Should have returned instance of UsernamePasswordAuthenticationToken");
-        }
-
-        assertEquals(User.class, result.getPrincipal().getClass());
-
-        // We expect original credentials user submitted to be returned
-        assertEquals("koala", result.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains("ROLE_TWO"));
-    }
-
-    public void testAuthenticatesWithForcePrincipalAsString() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        provider.setUserCache(new MockUserCache());
-        provider.setForcePrincipalAsString(true);
-
-        Authentication result = provider.authenticate(token);
-
-        if (!(result instanceof UsernamePasswordAuthenticationToken)) {
-            fail("Should have returned instance of UsernamePasswordAuthenticationToken");
-        }
-
-        UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result;
-        assertEquals(String.class, castResult.getPrincipal().getClass());
-        assertEquals("rod", castResult.getPrincipal());
-    }
-
-    public void testDetectsNullBeingReturnedFromAuthenticationDao() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoReturnsNull());
-
-        try {
-            provider.authenticate(token);
-            fail("Should have thrown AuthenticationServiceException");
-        } catch (AuthenticationServiceException expected) {
-            assertEquals("UserDetailsService returned null, which is an interface contract violation",
-                expected.getMessage());
-        }
-    }
-
-    public void testGettersSetters() {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setPasswordEncoder(new ShaPasswordEncoder());
-        assertEquals(ShaPasswordEncoder.class, provider.getPasswordEncoder().getClass());
-
-        provider.setSaltSource(new SystemWideSaltSource());
-        assertEquals(SystemWideSaltSource.class, provider.getSaltSource().getClass());
-
-        provider.setUserCache(new EhCacheBasedUserCache());
-        assertEquals(EhCacheBasedUserCache.class, provider.getUserCache().getClass());
-
-        assertFalse(provider.isForcePrincipalAsString());
-        provider.setForcePrincipalAsString(true);
-        assertTrue(provider.isForcePrincipalAsString());
-    }
-
-    public void testGoesBackToAuthenticationDaoToObtainLatestPasswordIfCachedPasswordSeemsIncorrect() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("rod", "koala");
-
-        MockAuthenticationDaoUserrod authenticationDao = new MockAuthenticationDaoUserrod();
-        MockUserCache cache = new MockUserCache();
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(authenticationDao);
-        provider.setUserCache(cache);
-
-        // This will work, as password still "koala"
-        provider.authenticate(token);
-
-        // Check "rod = koala" ended up in the cache
-        assertEquals("koala", cache.getUserFromCache("rod").getPassword());
-
-        // Now change the password the AuthenticationDao will return
-        authenticationDao.setPassword("easternLongNeckTurtle");
-
-        // Now try authentication again, with the new password
-        token = new UsernamePasswordAuthenticationToken("rod", "easternLongNeckTurtle");
-        provider.authenticate(token);
-
-        // To get this far, the new password was accepted
-        // Check the cache was updated
-        assertEquals("easternLongNeckTurtle", cache.getUserFromCache("rod").getPassword());
-    }
-
-    public void testStartupFailsIfNoAuthenticationDao()
-        throws Exception {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-
-        try {
-            provider.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testStartupFailsIfNoUserCacheSet() throws Exception {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        assertEquals(NullUserCache.class, provider.getUserCache().getClass());
-        provider.setUserCache(null);
-
-        try {
-            provider.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
-
-    public void testStartupSuccess() throws Exception {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        UserDetailsService userDetailsService = new MockAuthenticationDaoUserrod();
-        provider.setUserDetailsService(userDetailsService);
-        provider.setUserCache(new MockUserCache());
-        assertEquals(userDetailsService, provider.getUserDetailsService());
-        provider.afterPropertiesSet();
-        assertTrue(true);
-    }
-
-    public void testSupports() {
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class));
-        assertTrue(!provider.supports(TestingAuthenticationToken.class));
-    }
-
-    // SEC-2056
-    public void testUserNotFoundEncodesPassword() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("missing", "koala");
-        PasswordEncoder encoder = mock(PasswordEncoder.class);
-        when(encoder.encode(anyString())).thenReturn("koala");
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false);
-        provider.setPasswordEncoder(encoder);
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        try {
-            provider.authenticate(token);
-            fail("Expected Exception");
-        } catch(UsernameNotFoundException success) {}
-
-        // ensure encoder invoked w/ non-null strings since PasswordEncoder impls may fail if encoded password is null
-        verify(encoder).matches(isA(String.class),  isA(String.class));
-    }
-
-    public void testUserNotFoundBCryptPasswordEncoder() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("missing", "koala");
-        PasswordEncoder encoder =  new BCryptPasswordEncoder();
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false);
-        provider.setPasswordEncoder(encoder);
-        MockAuthenticationDaoUserrod userDetailsService = new MockAuthenticationDaoUserrod();
-        userDetailsService.password = encoder.encode((CharSequence) token.getCredentials());
-        provider.setUserDetailsService(userDetailsService);
-        try {
-            provider.authenticate(token);
-            fail("Expected Exception");
-        } catch(UsernameNotFoundException success) {}
-    }
-
-    public void testUserNotFoundDefaultEncoder() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("missing", null);
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false);
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        try {
-            provider.authenticate(token);
-            fail("Expected Exception");
-        } catch(UsernameNotFoundException success) {}
-    }
-
-    /**
-     * This is an explicit test for SEC-2056. It is intentionally ignored since this test is not
-     * deterministic and {@link #testUserNotFoundEncodesPassword()} ensures that SEC-2056 is fixed.
-     */
-    public void IGNOREtestSec2056() {
-        UsernamePasswordAuthenticationToken foundUser = new UsernamePasswordAuthenticationToken("rod", "koala");
-        UsernamePasswordAuthenticationToken notFoundUser = new UsernamePasswordAuthenticationToken("notFound", "koala");
-        PasswordEncoder encoder = new BCryptPasswordEncoder(10,new SecureRandom());
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false);
-        provider.setPasswordEncoder(encoder);
-        MockAuthenticationDaoUserrod userDetailsService = new MockAuthenticationDaoUserrod();
-        userDetailsService.password = encoder.encode((CharSequence) foundUser.getCredentials());
-        provider.setUserDetailsService(userDetailsService);
-
-        int sampleSize = 100;
-
-        List<Long> userFoundTimes = new ArrayList<Long>(sampleSize);
-        for(int i=0;i<sampleSize;i++) {
-            long start = System.currentTimeMillis();
-            provider.authenticate(foundUser);
-            userFoundTimes.add(System.currentTimeMillis() - start);
-        }
-
-        List<Long> userNotFoundTimes = new ArrayList<Long>(sampleSize);
-        for(int i=0;i<sampleSize;i++) {
-            long start = System.currentTimeMillis();
-            try {
-                provider.authenticate(notFoundUser);
-                fail("Expected Exception");
-            } catch(UsernameNotFoundException success) {}
-            userNotFoundTimes.add(System.currentTimeMillis() - start);
-        }
-
-        double userFoundAvg = avg(userFoundTimes);
-        double userNotFoundAvg = avg(userNotFoundTimes);
-        assertTrue("User not found average " + userNotFoundAvg + " should be within 3ms of user found average " + userFoundAvg,
-                Math.abs(userNotFoundAvg - userFoundAvg) <= 3);
-    }
-
-    private double avg(List<Long> counts) {
-        long sum = 0;
-        for(Long time : counts) {
-            sum += time;
-        }
-        return sum / counts.size();
-    }
-
-    public void testUserNotFoundNullCredentials() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("missing", null);
-        PasswordEncoder encoder = mock(PasswordEncoder.class);
-        DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
-        provider.setHideUserNotFoundExceptions(false);
-        provider.setPasswordEncoder(encoder);
-        provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
-        try {
-            provider.authenticate(token);
-            fail("Expected Exception");
-        } catch(UsernameNotFoundException success) {}
-
-        verify(encoder,times(0)).matches(anyString(), anyString());
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockAuthenticationDaoReturnsNull implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            return null;
-        }
-    }
-
-    private class MockAuthenticationDaoSimulateBackendError implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            throw new DataRetrievalFailureException("This mock simulator is designed to fail");
-        }
-    }
-
-    private class MockAuthenticationDaoUserrod implements UserDetailsService {
-        private String password = "koala";
-
-        public UserDetails loadUserByUsername(String username) {
-            if ("rod".equals(username)) {
-                return new User("rod", password, true, true, true, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-    }
-
-    private class MockAuthenticationDaoUserrodWithSalt implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            if ("rod".equals(username)) {
-                return new User("rod", "koala{SYSTEM_SALT_VALUE}", true, true, true, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
-
-    private class MockAuthenticationDaoUserPeter implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            if ("peter".equals(username)) {
-                return new User("peter", "opal", false, true, true, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
-
-    private class MockAuthenticationDaoUserPeterAccountExpired implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            if ("peter".equals(username)) {
-                return new User("peter", "opal", true, false, true, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
-
-    private class MockAuthenticationDaoUserPeterAccountLocked implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            if ("peter".equals(username)) {
-                return new User("peter", "opal", true, true, true, false, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
-
-    private class MockAuthenticationDaoUserPeterCredentialsExpired implements UserDetailsService {
-        public UserDetails loadUserByUsername(String username) {
-            if ("peter".equals(username)) {
-                return new User("peter", "opal", true, true, false, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
+	private static final List<GrantedAuthority> ROLES_12 = AuthorityUtils
+			.createAuthorityList("ROLE_ONE", "ROLE_TWO");
+
+	// ~ Methods
+	// ========================================================================================================
+
+	public void testAuthenticateFailsForIncorrectPasswordCase() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "KOala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testReceivedBadCredentialsWhenCredentialsNotProvided() {
+		// Test related to SEC-434
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+				"rod", null);
+		try {
+			provider.authenticate(authenticationToken);
+			fail("Expected BadCredenialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsIfAccountExpired() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"peter", "opal");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountExpired());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown AccountExpiredException");
+		}
+		catch (AccountExpiredException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsIfAccountLocked() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"peter", "opal");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserPeterAccountLocked());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown LockedException");
+		}
+		catch (LockedException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsIfCredentialsExpired() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"peter", "opal");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserPeterCredentialsExpired());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown CredentialsExpiredException");
+		}
+		catch (CredentialsExpiredException expected) {
+			assertTrue(true);
+		}
+
+		// Check that wrong password causes BadCredentialsException, rather than
+		// CredentialsExpiredException
+		token = new UsernamePasswordAuthenticationToken("peter", "wrong_password");
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsIfUserDisabled() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"peter", "opal");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserPeter());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown DisabledException");
+		}
+		catch (DisabledException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsWhenAuthenticationDaoHasBackendFailure() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoSimulateBackendError());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown InternalAuthenticationServiceException");
+		}
+		catch (InternalAuthenticationServiceException expected) {
+		}
+	}
+
+	public void testAuthenticateFailsWithEmptyUsername() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				null, "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsWithInvalidPassword() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "INVALID_PASSWORD");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsWithInvalidUsernameAndHideUserNotFoundExceptionFalse() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"INVALID_USER", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false); // we want
+														// UsernameNotFoundExceptions
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown UsernameNotFoundException");
+		}
+		catch (UsernameNotFoundException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsWithInvalidUsernameAndHideUserNotFoundExceptionsWithDefaultOfTrue() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"INVALID_USER", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		assertTrue(provider.isHideUserNotFoundExceptions());
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticateFailsWithMixedCaseUsernameIfDefaultChanged() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"RoD", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testAuthenticates() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+		token.setDetails("192.168.0.1");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		Authentication result = provider.authenticate(token);
+
+		if (!(result instanceof UsernamePasswordAuthenticationToken)) {
+			fail("Should have returned instance of UsernamePasswordAuthenticationToken");
+		}
+
+		UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result;
+		assertEquals(User.class, castResult.getPrincipal().getClass());
+		assertEquals("koala", castResult.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities())
+				.contains("ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(castResult.getAuthorities())
+				.contains("ROLE_TWO"));
+		assertEquals("192.168.0.1", castResult.getDetails());
+	}
+
+	public void testAuthenticatesASecondTime() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+
+		Authentication result = provider.authenticate(token);
+
+		if (!(result instanceof UsernamePasswordAuthenticationToken)) {
+			fail("Should have returned instance of UsernamePasswordAuthenticationToken");
+		}
+
+		// Now try to authenticate with the previous result (with its UserDetails)
+		Authentication result2 = provider.authenticate(result);
+
+		if (!(result2 instanceof UsernamePasswordAuthenticationToken)) {
+			fail("Should have returned instance of UsernamePasswordAuthenticationToken");
+		}
+
+		assertEquals(result.getCredentials(), result2.getCredentials());
+	}
+
+	public void testAuthenticatesWhenASaltIsUsed() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		SystemWideSaltSource salt = new SystemWideSaltSource();
+		salt.setSystemWideSalt("SYSTEM_SALT_VALUE");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrodWithSalt());
+		provider.setSaltSource(salt);
+		provider.setUserCache(new MockUserCache());
+
+		Authentication result = provider.authenticate(token);
+
+		if (!(result instanceof UsernamePasswordAuthenticationToken)) {
+			fail("Should have returned instance of UsernamePasswordAuthenticationToken");
+		}
+
+		assertEquals(User.class, result.getPrincipal().getClass());
+
+		// We expect original credentials user submitted to be returned
+		assertEquals("koala", result.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains(
+				"ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains(
+				"ROLE_TWO"));
+	}
+
+	public void testAuthenticatesWithForcePrincipalAsString() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		provider.setUserCache(new MockUserCache());
+		provider.setForcePrincipalAsString(true);
+
+		Authentication result = provider.authenticate(token);
+
+		if (!(result instanceof UsernamePasswordAuthenticationToken)) {
+			fail("Should have returned instance of UsernamePasswordAuthenticationToken");
+		}
+
+		UsernamePasswordAuthenticationToken castResult = (UsernamePasswordAuthenticationToken) result;
+		assertEquals(String.class, castResult.getPrincipal().getClass());
+		assertEquals("rod", castResult.getPrincipal());
+	}
+
+	public void testDetectsNullBeingReturnedFromAuthenticationDao() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoReturnsNull());
+
+		try {
+			provider.authenticate(token);
+			fail("Should have thrown AuthenticationServiceException");
+		}
+		catch (AuthenticationServiceException expected) {
+			assertEquals(
+					"UserDetailsService returned null, which is an interface contract violation",
+					expected.getMessage());
+		}
+	}
+
+	public void testGettersSetters() {
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setPasswordEncoder(new ShaPasswordEncoder());
+		assertEquals(ShaPasswordEncoder.class, provider.getPasswordEncoder().getClass());
+
+		provider.setSaltSource(new SystemWideSaltSource());
+		assertEquals(SystemWideSaltSource.class, provider.getSaltSource().getClass());
+
+		provider.setUserCache(new EhCacheBasedUserCache());
+		assertEquals(EhCacheBasedUserCache.class, provider.getUserCache().getClass());
+
+		assertFalse(provider.isForcePrincipalAsString());
+		provider.setForcePrincipalAsString(true);
+		assertTrue(provider.isForcePrincipalAsString());
+	}
+
+	public void testGoesBackToAuthenticationDaoToObtainLatestPasswordIfCachedPasswordSeemsIncorrect() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+
+		MockAuthenticationDaoUserrod authenticationDao = new MockAuthenticationDaoUserrod();
+		MockUserCache cache = new MockUserCache();
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(authenticationDao);
+		provider.setUserCache(cache);
+
+		// This will work, as password still "koala"
+		provider.authenticate(token);
+
+		// Check "rod = koala" ended up in the cache
+		assertEquals("koala", cache.getUserFromCache("rod").getPassword());
+
+		// Now change the password the AuthenticationDao will return
+		authenticationDao.setPassword("easternLongNeckTurtle");
+
+		// Now try authentication again, with the new password
+		token = new UsernamePasswordAuthenticationToken("rod", "easternLongNeckTurtle");
+		provider.authenticate(token);
+
+		// To get this far, the new password was accepted
+		// Check the cache was updated
+		assertEquals("easternLongNeckTurtle", cache.getUserFromCache("rod").getPassword());
+	}
+
+	public void testStartupFailsIfNoAuthenticationDao() throws Exception {
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+
+		try {
+			provider.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testStartupFailsIfNoUserCacheSet() throws Exception {
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		assertEquals(NullUserCache.class, provider.getUserCache().getClass());
+		provider.setUserCache(null);
+
+		try {
+			provider.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
+
+	public void testStartupSuccess() throws Exception {
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		UserDetailsService userDetailsService = new MockAuthenticationDaoUserrod();
+		provider.setUserDetailsService(userDetailsService);
+		provider.setUserCache(new MockUserCache());
+		assertEquals(userDetailsService, provider.getUserDetailsService());
+		provider.afterPropertiesSet();
+		assertTrue(true);
+	}
+
+	public void testSupports() {
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class));
+		assertTrue(!provider.supports(TestingAuthenticationToken.class));
+	}
+
+	// SEC-2056
+	public void testUserNotFoundEncodesPassword() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"missing", "koala");
+		PasswordEncoder encoder = mock(PasswordEncoder.class);
+		when(encoder.encode(anyString())).thenReturn("koala");
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false);
+		provider.setPasswordEncoder(encoder);
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		try {
+			provider.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (UsernameNotFoundException success) {
+		}
+
+		// ensure encoder invoked w/ non-null strings since PasswordEncoder impls may fail
+		// if encoded password is null
+		verify(encoder).matches(isA(String.class), isA(String.class));
+	}
+
+	public void testUserNotFoundBCryptPasswordEncoder() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"missing", "koala");
+		PasswordEncoder encoder = new BCryptPasswordEncoder();
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false);
+		provider.setPasswordEncoder(encoder);
+		MockAuthenticationDaoUserrod userDetailsService = new MockAuthenticationDaoUserrod();
+		userDetailsService.password = encoder.encode((CharSequence) token
+				.getCredentials());
+		provider.setUserDetailsService(userDetailsService);
+		try {
+			provider.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (UsernameNotFoundException success) {
+		}
+	}
+
+	public void testUserNotFoundDefaultEncoder() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"missing", null);
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false);
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		try {
+			provider.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (UsernameNotFoundException success) {
+		}
+	}
+
+	/**
+	 * This is an explicit test for SEC-2056. It is intentionally ignored since this test
+	 * is not deterministic and {@link #testUserNotFoundEncodesPassword()} ensures that
+	 * SEC-2056 is fixed.
+	 */
+	public void IGNOREtestSec2056() {
+		UsernamePasswordAuthenticationToken foundUser = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+		UsernamePasswordAuthenticationToken notFoundUser = new UsernamePasswordAuthenticationToken(
+				"notFound", "koala");
+		PasswordEncoder encoder = new BCryptPasswordEncoder(10, new SecureRandom());
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false);
+		provider.setPasswordEncoder(encoder);
+		MockAuthenticationDaoUserrod userDetailsService = new MockAuthenticationDaoUserrod();
+		userDetailsService.password = encoder.encode((CharSequence) foundUser
+				.getCredentials());
+		provider.setUserDetailsService(userDetailsService);
+
+		int sampleSize = 100;
+
+		List<Long> userFoundTimes = new ArrayList<Long>(sampleSize);
+		for (int i = 0; i < sampleSize; i++) {
+			long start = System.currentTimeMillis();
+			provider.authenticate(foundUser);
+			userFoundTimes.add(System.currentTimeMillis() - start);
+		}
+
+		List<Long> userNotFoundTimes = new ArrayList<Long>(sampleSize);
+		for (int i = 0; i < sampleSize; i++) {
+			long start = System.currentTimeMillis();
+			try {
+				provider.authenticate(notFoundUser);
+				fail("Expected Exception");
+			}
+			catch (UsernameNotFoundException success) {
+			}
+			userNotFoundTimes.add(System.currentTimeMillis() - start);
+		}
+
+		double userFoundAvg = avg(userFoundTimes);
+		double userNotFoundAvg = avg(userNotFoundTimes);
+		assertTrue("User not found average " + userNotFoundAvg
+				+ " should be within 3ms of user found average " + userFoundAvg,
+				Math.abs(userNotFoundAvg - userFoundAvg) <= 3);
+	}
+
+	private double avg(List<Long> counts) {
+		long sum = 0;
+		for (Long time : counts) {
+			sum += time;
+		}
+		return sum / counts.size();
+	}
+
+	public void testUserNotFoundNullCredentials() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"missing", null);
+		PasswordEncoder encoder = mock(PasswordEncoder.class);
+		DaoAuthenticationProvider provider = new DaoAuthenticationProvider();
+		provider.setHideUserNotFoundExceptions(false);
+		provider.setPasswordEncoder(encoder);
+		provider.setUserDetailsService(new MockAuthenticationDaoUserrod());
+		try {
+			provider.authenticate(token);
+			fail("Expected Exception");
+		}
+		catch (UsernameNotFoundException success) {
+		}
+
+		verify(encoder, times(0)).matches(anyString(), anyString());
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class MockAuthenticationDaoReturnsNull implements UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			return null;
+		}
+	}
+
+	private class MockAuthenticationDaoSimulateBackendError implements UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			throw new DataRetrievalFailureException(
+					"This mock simulator is designed to fail");
+		}
+	}
+
+	private class MockAuthenticationDaoUserrod implements UserDetailsService {
+		private String password = "koala";
+
+		public UserDetails loadUserByUsername(String username) {
+			if ("rod".equals(username)) {
+				return new User("rod", password, true, true, true, true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+
+		public void setPassword(String password) {
+			this.password = password;
+		}
+	}
+
+	private class MockAuthenticationDaoUserrodWithSalt implements UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			if ("rod".equals(username)) {
+				return new User("rod", "koala{SYSTEM_SALT_VALUE}", true, true, true,
+						true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
+
+	private class MockAuthenticationDaoUserPeter implements UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			if ("peter".equals(username)) {
+				return new User("peter", "opal", false, true, true, true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
+
+	private class MockAuthenticationDaoUserPeterAccountExpired implements
+			UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			if ("peter".equals(username)) {
+				return new User("peter", "opal", true, false, true, true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
+
+	private class MockAuthenticationDaoUserPeterAccountLocked implements
+			UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			if ("peter".equals(username)) {
+				return new User("peter", "opal", true, true, true, false, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
+
+	private class MockAuthenticationDaoUserPeterCredentialsExpired implements
+			UserDetailsService {
+		public UserDetails loadUserByUsername(String username) {
+			if ("peter".equals(username)) {
+				return new User("peter", "opal", true, true, false, true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java
index 5205a559b7..ac38881199 100644
--- a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java
+++ b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java
@@ -11,17 +11,17 @@ import org.springframework.security.core.userdetails.UserCache;
 import org.springframework.security.core.userdetails.UserDetails;
 
 public class MockUserCache implements UserCache {
-    private Map<String, UserDetails> cache = new HashMap<String, UserDetails>();
+	private Map<String, UserDetails> cache = new HashMap<String, UserDetails>();
 
-    public UserDetails getUserFromCache(String username) {
-        return (User) cache.get(username);
-    }
+	public UserDetails getUserFromCache(String username) {
+		return (User) cache.get(username);
+	}
 
-    public void putUserInCache(UserDetails user) {
-        cache.put(user.getUsername(), user);
-    }
+	public void putUserInCache(UserDetails user) {
+		cache.put(user.getUsername(), user);
+	}
 
-    public void removeUserFromCache(String username) {
-        cache.remove(username);
-    }
+	public void removeUserFromCache(String username) {
+		cache.remove(username);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java
index 893605a7b1..baa1e9959e 100644
--- a/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/dao/salt/ReflectionSaltSourceTests.java
@@ -30,37 +30,38 @@ import org.springframework.security.core.userdetails.UserDetails;
  * @author Ben Alex
  */
 public class ReflectionSaltSourceTests {
-    private UserDetails user = new User("scott", "wombat", true, true, true, true,
-            AuthorityUtils.createAuthorityList("HOLDER"));
+	private UserDetails user = new User("scott", "wombat", true, true, true, true,
+			AuthorityUtils.createAuthorityList("HOLDER"));
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsMissingUserPropertyToUse() throws Exception {
-        ReflectionSaltSource saltSource = new ReflectionSaltSource();
-        saltSource.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingUserPropertyToUse() throws Exception {
+		ReflectionSaltSource saltSource = new ReflectionSaltSource();
+		saltSource.afterPropertiesSet();
+	}
 
-    @Test(expected=AuthenticationServiceException.class)
-    public void exceptionIsThrownWhenInvalidPropertyRequested() throws Exception {
-        ReflectionSaltSource saltSource = new ReflectionSaltSource();
-        saltSource.setUserPropertyToUse("getDoesNotExist");
-        saltSource.afterPropertiesSet();
-        saltSource.getSalt(user);
-    }
+	@Test(expected = AuthenticationServiceException.class)
+	public void exceptionIsThrownWhenInvalidPropertyRequested() throws Exception {
+		ReflectionSaltSource saltSource = new ReflectionSaltSource();
+		saltSource.setUserPropertyToUse("getDoesNotExist");
+		saltSource.afterPropertiesSet();
+		saltSource.getSalt(user);
+	}
 
-    @Test
-    public void methodNameAsPropertyToUseReturnsCorrectSaltValue() {
-        ReflectionSaltSource saltSource = new ReflectionSaltSource();
-        saltSource.setUserPropertyToUse("getUsername");
+	@Test
+	public void methodNameAsPropertyToUseReturnsCorrectSaltValue() {
+		ReflectionSaltSource saltSource = new ReflectionSaltSource();
+		saltSource.setUserPropertyToUse("getUsername");
 
-        assertEquals("scott", saltSource.getSalt(user));
-    }
+		assertEquals("scott", saltSource.getSalt(user));
+	}
 
-    @Test
-    public void propertyNameAsPropertyToUseReturnsCorrectSaltValue() {
-        ReflectionSaltSource saltSource = new ReflectionSaltSource();
-        saltSource.setUserPropertyToUse("password");
-        assertEquals("wombat", saltSource.getSalt(user));
-    }
+	@Test
+	public void propertyNameAsPropertyToUseReturnsCorrectSaltValue() {
+		ReflectionSaltSource saltSource = new ReflectionSaltSource();
+		saltSource.setUserPropertyToUse("password");
+		assertEquals("wombat", saltSource.getSalt(user));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java b/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java
index 1570aed13a..c0dc6cf03d 100644
--- a/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/dao/salt/SystemWideSaltSourceTests.java
@@ -21,62 +21,64 @@ import org.springframework.security.authentication.dao.SystemWideSaltSource;
 
 import junit.framework.TestCase;
 
-
 /**
  * Tests {@link SystemWideSaltSource}.
  *
  * @author Ben Alex
  */
 public class SystemWideSaltSourceTests extends TestCase {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SystemWideSaltSourceTests() {
-        super();
-    }
+	public SystemWideSaltSourceTests() {
+		super();
+	}
 
-    public SystemWideSaltSourceTests(String arg0) {
-        super(arg0);
-    }
+	public SystemWideSaltSourceTests(String arg0) {
+		super(arg0);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(SystemWideSaltSourceTests.class);
-    }
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(SystemWideSaltSourceTests.class);
+	}
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testDetectsMissingSystemWideSalt() throws Exception {
-        SystemWideSaltSource saltSource = new SystemWideSaltSource();
+	public void testDetectsMissingSystemWideSalt() throws Exception {
+		SystemWideSaltSource saltSource = new SystemWideSaltSource();
 
-        try {
-            saltSource.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("A systemWideSalt must be set", expected.getMessage());
-        }
-    }
+		try {
+			saltSource.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("A systemWideSalt must be set", expected.getMessage());
+		}
+	}
 
-    public void testGettersSetters() {
-        SystemWideSaltSource saltSource = new SystemWideSaltSource();
-        saltSource.setSystemWideSalt("helloWorld");
-        assertEquals("helloWorld", saltSource.getSystemWideSalt());
-    }
+	public void testGettersSetters() {
+		SystemWideSaltSource saltSource = new SystemWideSaltSource();
+		saltSource.setSystemWideSalt("helloWorld");
+		assertEquals("helloWorld", saltSource.getSystemWideSalt());
+	}
 
-    public void testNormalOperation() throws Exception {
-        SystemWideSaltSource saltSource = new SystemWideSaltSource();
-        saltSource.setSystemWideSalt("helloWorld");
-        saltSource.afterPropertiesSet();
-        assertEquals("helloWorld", saltSource.getSalt(null));
-    }
+	public void testNormalOperation() throws Exception {
+		SystemWideSaltSource saltSource = new SystemWideSaltSource();
+		saltSource.setSystemWideSalt("helloWorld");
+		saltSource.afterPropertiesSet();
+		assertEquals("helloWorld", saltSource.getSalt(null));
+	}
 
-    // SEC-2173
-    public void testToString() {
-        String systemWideSalt = "helloWorld";
-        SystemWideSaltSource saltSource = new SystemWideSaltSource();
-        saltSource.setSystemWideSalt(systemWideSalt);
-        assertThat(saltSource.toString()).isEqualTo(systemWideSalt);
-    }
+	// SEC-2173
+	public void testToString() {
+		String systemWideSalt = "helloWorld";
+		SystemWideSaltSource saltSource = new SystemWideSaltSource();
+		saltSource.setSystemWideSalt(systemWideSalt);
+		assertThat(saltSource.toString()).isEqualTo(systemWideSalt);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java
index df22e5c8a6..63f3af6be1 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/BasePasswordEncoderTests.java
@@ -17,126 +17,133 @@ package org.springframework.security.authentication.encoding;
 
 import junit.framework.TestCase;
 
-
 /**
- * <p>TestCase for BasePasswordEncoder.</p>
+ * <p>
+ * TestCase for BasePasswordEncoder.
+ * </p>
  *
  * @author Ben Alex
  */
 public class BasePasswordEncoderTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDemergeHandlesEmptyAndNullSalts() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testDemergeHandlesEmptyAndNullSalts() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        String merged = pwd.nowMergePasswordAndSalt("password", null, true);
+		String merged = pwd.nowMergePasswordAndSalt("password", null, true);
 
-        String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
-        assertEquals("password", demerged[0]);
-        assertEquals("", demerged[1]);
+		String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
+		assertEquals("password", demerged[0]);
+		assertEquals("", demerged[1]);
 
-        merged = pwd.nowMergePasswordAndSalt("password", "", true);
+		merged = pwd.nowMergePasswordAndSalt("password", "", true);
 
-        demerged = pwd.nowDemergePasswordAndSalt(merged);
-        assertEquals("password", demerged[0]);
-        assertEquals("", demerged[1]);
-    }
+		demerged = pwd.nowDemergePasswordAndSalt(merged);
+		assertEquals("password", demerged[0]);
+		assertEquals("", demerged[1]);
+	}
 
-    public void testDemergeWithEmptyStringIsRejected() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testDemergeWithEmptyStringIsRejected() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        try {
-            pwd.nowDemergePasswordAndSalt("");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Cannot pass a null or empty String", expected.getMessage());
-        }
-    }
+		try {
+			pwd.nowDemergePasswordAndSalt("");
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("Cannot pass a null or empty String", expected.getMessage());
+		}
+	}
 
-    public void testDemergeWithNullIsRejected() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testDemergeWithNullIsRejected() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        try {
-            pwd.nowDemergePasswordAndSalt(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Cannot pass a null or empty String", expected.getMessage());
-        }
-    }
+		try {
+			pwd.nowDemergePasswordAndSalt(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("Cannot pass a null or empty String", expected.getMessage());
+		}
+	}
 
-    public void testMergeDemerge() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testMergeDemerge() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        String merged = pwd.nowMergePasswordAndSalt("password", "foo", true);
-        assertEquals("password{foo}", merged);
+		String merged = pwd.nowMergePasswordAndSalt("password", "foo", true);
+		assertEquals("password{foo}", merged);
 
-        String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
-        assertEquals("password", demerged[0]);
-        assertEquals("foo", demerged[1]);
-    }
+		String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
+		assertEquals("password", demerged[0]);
+		assertEquals("foo", demerged[1]);
+	}
 
-    public void testMergeDemergeWithDelimitersInPassword() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testMergeDemergeWithDelimitersInPassword() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        String merged = pwd.nowMergePasswordAndSalt("p{ass{w{o}rd", "foo", true);
-        assertEquals("p{ass{w{o}rd{foo}", merged);
+		String merged = pwd.nowMergePasswordAndSalt("p{ass{w{o}rd", "foo", true);
+		assertEquals("p{ass{w{o}rd{foo}", merged);
 
-        String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
+		String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
 
-        assertEquals("p{ass{w{o}rd", demerged[0]);
-        assertEquals("foo", demerged[1]);
-    }
+		assertEquals("p{ass{w{o}rd", demerged[0]);
+		assertEquals("foo", demerged[1]);
+	}
 
-    public void testMergeDemergeWithNullAsPassword() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testMergeDemergeWithNullAsPassword() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        String merged = pwd.nowMergePasswordAndSalt(null, "foo", true);
-        assertEquals("{foo}", merged);
+		String merged = pwd.nowMergePasswordAndSalt(null, "foo", true);
+		assertEquals("{foo}", merged);
 
-        String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
-        assertEquals("", demerged[0]);
-        assertEquals("foo", demerged[1]);
-    }
+		String[] demerged = pwd.nowDemergePasswordAndSalt(merged);
+		assertEquals("", demerged[0]);
+		assertEquals("foo", demerged[1]);
+	}
 
-    public void testStrictMergeRejectsDelimitersInSalt1() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testStrictMergeRejectsDelimitersInSalt1() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        try {
-            pwd.nowMergePasswordAndSalt("password", "f{oo", true);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Cannot use { or } in salt.toString()", expected.getMessage());
-        }
-    }
+		try {
+			pwd.nowMergePasswordAndSalt("password", "f{oo", true);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("Cannot use { or } in salt.toString()", expected.getMessage());
+		}
+	}
 
-    public void testStrictMergeRejectsDelimitersInSalt2() {
-        MockPasswordEncoder pwd = new MockPasswordEncoder();
+	public void testStrictMergeRejectsDelimitersInSalt2() {
+		MockPasswordEncoder pwd = new MockPasswordEncoder();
 
-        try {
-            pwd.nowMergePasswordAndSalt("password", "f}oo", true);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Cannot use { or } in salt.toString()", expected.getMessage());
-        }
-    }
+		try {
+			pwd.nowMergePasswordAndSalt("password", "f}oo", true);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("Cannot use { or } in salt.toString()", expected.getMessage());
+		}
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockPasswordEncoder extends BasePasswordEncoder {
-        public String encodePassword(String rawPass, Object salt) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
+	private class MockPasswordEncoder extends BasePasswordEncoder {
+		public String encodePassword(String rawPass, Object salt) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
 
-        public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-            throw new UnsupportedOperationException("mock method not implemented");
-        }
+		public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+			throw new UnsupportedOperationException("mock method not implemented");
+		}
 
-        public String[] nowDemergePasswordAndSalt(String password) {
-            return demergePasswordAndSalt(password);
-        }
+		public String[] nowDemergePasswordAndSalt(String password) {
+			return demergePasswordAndSalt(password);
+		}
 
-        public String nowMergePasswordAndSalt(String password, Object salt, boolean strict) {
-            return mergePasswordAndSalt(password, salt, strict);
-        }
-    }
+		public String nowMergePasswordAndSalt(String password, Object salt, boolean strict) {
+			return mergePasswordAndSalt(password, salt, strict);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java
index 57777b2eb8..ae0c267ac6 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/Md4PasswordEncoderTests.java
@@ -20,54 +20,55 @@ import junit.framework.TestCase;
 
 public class Md4PasswordEncoderTests extends TestCase {
 
-    public void testEncodeUnsaltedPassword() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        String encodedPassword = md4.encodePassword("ww_uni123", null);
-        assertEquals("8zobtq72iAt0W6KNqavGwg==", encodedPassword);
-    }
+	public void testEncodeUnsaltedPassword() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		String encodedPassword = md4.encodePassword("ww_uni123", null);
+		assertEquals("8zobtq72iAt0W6KNqavGwg==", encodedPassword);
+	}
 
-    public void testEncodeSaltedPassword() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        String encodedPassword = md4.encodePassword("ww_uni123", "Alan K Stewart");
-        assertEquals("ZplT6P5Kv6Rlu6W4FIoYNA==", encodedPassword);
-    }
+	public void testEncodeSaltedPassword() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		String encodedPassword = md4.encodePassword("ww_uni123", "Alan K Stewart");
+		assertEquals("ZplT6P5Kv6Rlu6W4FIoYNA==", encodedPassword);
+	}
 
-    public void testEncodeNullPassword() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        String encodedPassword = md4.encodePassword(null, null);
-        assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword);
-    }
+	public void testEncodeNullPassword() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		String encodedPassword = md4.encodePassword(null, null);
+		assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword);
+	}
 
-    public void testEncodeEmptyPassword() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        String encodedPassword = md4.encodePassword("", null);
-        assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword);
-    }
+	public void testEncodeEmptyPassword() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		String encodedPassword = md4.encodePassword("", null);
+		assertEquals("MdbP4NFq6TG3PFnX4MCJwA==", encodedPassword);
+	}
 
-    public void testNonAsciiPasswordHasCorrectHash() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        String encodedPassword = md4.encodePassword("\u4F60\u597d", null);
-        assertEquals("a7f1196539fd1f85f754ffd185b16e6e", encodedPassword);
-    }
+	public void testNonAsciiPasswordHasCorrectHash() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		String encodedPassword = md4.encodePassword("\u4F60\u597d", null);
+		assertEquals("a7f1196539fd1f85f754ffd185b16e6e", encodedPassword);
+	}
 
-    public void testIsHexPasswordValid() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        assertTrue(md4.isPasswordValid("31d6cfe0d16ae931b73c59d7e0c089c0", "", null));
-    }
+	public void testIsHexPasswordValid() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		assertTrue(md4.isPasswordValid("31d6cfe0d16ae931b73c59d7e0c089c0", "", null));
+	}
 
-    public void testIsPasswordValid() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        assertTrue(md4.isPasswordValid("8zobtq72iAt0W6KNqavGwg==", "ww_uni123", null));
-    }
+	public void testIsPasswordValid() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		assertTrue(md4.isPasswordValid("8zobtq72iAt0W6KNqavGwg==", "ww_uni123", null));
+	}
 
-    public void testIsSaltedPasswordValid() {
-        Md4PasswordEncoder md4 = new Md4PasswordEncoder();
-        md4.setEncodeHashAsBase64(true);
-        assertTrue(md4.isPasswordValid("ZplT6P5Kv6Rlu6W4FIoYNA==", "ww_uni123", "Alan K Stewart"));
-    }
+	public void testIsSaltedPasswordValid() {
+		Md4PasswordEncoder md4 = new Md4PasswordEncoder();
+		md4.setEncodeHashAsBase64(true);
+		assertTrue(md4.isPasswordValid("ZplT6P5Kv6Rlu6W4FIoYNA==", "ww_uni123",
+				"Alan K Stewart"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java
index 517ba83f95..559c13865c 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/Md5PasswordEncoderTests.java
@@ -19,10 +19,10 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-
-
 /**
- * <p>TestCase for Md5PasswordEncoder.</p>
+ * <p>
+ * TestCase for Md5PasswordEncoder.
+ * </p>
  *
  * @author colin sampaleanu
  * @author Ben Alex
@@ -30,49 +30,51 @@ import org.junit.Test;
  * @author Luke Taylor
  */
 public class Md5PasswordEncoderTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testBasicFunctionality() {
-        Md5PasswordEncoder pe = new Md5PasswordEncoder();
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String salt = "THIS_IS_A_SALT";
-        String encoded = pe.encodePassword(raw, salt);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
-        assertEquals("a68aafd90299d0b137de28fb4bb68573", encoded);
-        assertEquals("MD5", pe.getAlgorithm());
-    }
+	@Test
+	public void testBasicFunctionality() {
+		Md5PasswordEncoder pe = new Md5PasswordEncoder();
+		String raw = "abc123";
+		String badRaw = "abc321";
+		String salt = "THIS_IS_A_SALT";
+		String encoded = pe.encodePassword(raw, salt);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+		assertEquals("a68aafd90299d0b137de28fb4bb68573", encoded);
+		assertEquals("MD5", pe.getAlgorithm());
+	}
 
-    @Test
-    public void nonAsciiPasswordHasCorrectHash() throws Exception{
-        Md5PasswordEncoder md5 = new Md5PasswordEncoder();
-        // $ echo -n "你好" | md5
-        // 7eca689f0d3389d9dea66ae112e5cfd7
-        String encodedPassword = md5.encodePassword("\u4F60\u597d", null);
-        assertEquals("7eca689f0d3389d9dea66ae112e5cfd7", encodedPassword);
-    }
+	@Test
+	public void nonAsciiPasswordHasCorrectHash() throws Exception {
+		Md5PasswordEncoder md5 = new Md5PasswordEncoder();
+		// $ echo -n "你好" | md5
+		// 7eca689f0d3389d9dea66ae112e5cfd7
+		String encodedPassword = md5.encodePassword("\u4F60\u597d", null);
+		assertEquals("7eca689f0d3389d9dea66ae112e5cfd7", encodedPassword);
+	}
 
-    @Test
-    public void testBase64() throws Exception {
-        Md5PasswordEncoder pe = new Md5PasswordEncoder();
-        pe.setEncodeHashAsBase64(true);
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String salt = "THIS_IS_A_SALT";
-        String encoded = pe.encodePassword(raw, salt);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
-        assertTrue(encoded.length() != 32);
-    }
+	@Test
+	public void testBase64() throws Exception {
+		Md5PasswordEncoder pe = new Md5PasswordEncoder();
+		pe.setEncodeHashAsBase64(true);
+		String raw = "abc123";
+		String badRaw = "abc321";
+		String salt = "THIS_IS_A_SALT";
+		String encoded = pe.encodePassword(raw, salt);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+		assertTrue(encoded.length() != 32);
+	}
 
-    @Test
-    public void stretchFactorIsProcessedCorrectly() throws Exception {
-        Md5PasswordEncoder pe = new Md5PasswordEncoder();
-        pe.setIterations(2);
-        // Calculate value using:
-        // echo -n password{salt} | openssl md5 -binary | openssl md5
-        assertEquals("eb753fb0c370582b4ee01b30f304b9fc", pe.encodePassword("password", "salt"));
-    }
+	@Test
+	public void stretchFactorIsProcessedCorrectly() throws Exception {
+		Md5PasswordEncoder pe = new Md5PasswordEncoder();
+		pe.setIterations(2);
+		// Calculate value using:
+		// echo -n password{salt} | openssl md5 -binary | openssl md5
+		assertEquals("eb753fb0c370582b4ee01b30f304b9fc",
+				pe.encodePassword("password", "salt"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java
index 2406de3864..eb9fdeff6d 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/PasswordEncoderUtilsTests.java
@@ -3,31 +3,32 @@ package org.springframework.security.authentication.encoding;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+
 /**
  * @author Rob Winch
  */
 public class PasswordEncoderUtilsTests {
 
-    @Test
-    public void differentLength() {
-        assertFalse(PasswordEncoderUtils.equals("abc", "a"));
-        assertFalse(PasswordEncoderUtils.equals("a", "abc"));
-    }
+	@Test
+	public void differentLength() {
+		assertFalse(PasswordEncoderUtils.equals("abc", "a"));
+		assertFalse(PasswordEncoderUtils.equals("a", "abc"));
+	}
 
-    @Test
-    public void equalsNull() {
-        assertFalse(PasswordEncoderUtils.equals(null, "a"));
-        assertFalse(PasswordEncoderUtils.equals("a", null));
-        assertTrue(PasswordEncoderUtils.equals(null, null));
-    }
+	@Test
+	public void equalsNull() {
+		assertFalse(PasswordEncoderUtils.equals(null, "a"));
+		assertFalse(PasswordEncoderUtils.equals("a", null));
+		assertTrue(PasswordEncoderUtils.equals(null, null));
+	}
 
-    @Test
-    public void equalsCaseSensitive() {
-        assertFalse(PasswordEncoderUtils.equals("aBc", "abc"));
-    }
+	@Test
+	public void equalsCaseSensitive() {
+		assertFalse(PasswordEncoderUtils.equals("aBc", "abc"));
+	}
 
-    @Test
-    public void equalsSuccess() {
-        assertTrue(PasswordEncoderUtils.equals("abcdef", "abcdef"));
-    }
+	@Test
+	public void equalsSuccess() {
+		assertTrue(PasswordEncoderUtils.equals("abcdef", "abcdef"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java
index 1e15fcbd41..f50f6e50a9 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/PlaintextPasswordEncoderTests.java
@@ -19,50 +19,52 @@ import org.springframework.security.authentication.encoding.PlaintextPasswordEnc
 
 import junit.framework.TestCase;
 
-
 /**
- * <p>TestCase for PlaintextPasswordEncoder.</p>
+ * <p>
+ * TestCase for PlaintextPasswordEncoder.
+ * </p>
  *
  * @author colin sampaleanu
  * @author Ben Alex
  */
 public class PlaintextPasswordEncoderTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testBasicFunctionality() {
-        PlaintextPasswordEncoder pe = new PlaintextPasswordEncoder();
+	public void testBasicFunctionality() {
+		PlaintextPasswordEncoder pe = new PlaintextPasswordEncoder();
 
-        String raw = "abc123";
-        String rawDiffCase = "AbC123";
-        String badRaw = "abc321";
-        String salt = "THIS_IS_A_SALT";
+		String raw = "abc123";
+		String rawDiffCase = "AbC123";
+		String badRaw = "abc321";
+		String salt = "THIS_IS_A_SALT";
 
-        String encoded = pe.encodePassword(raw, salt);
-        assertEquals("abc123{THIS_IS_A_SALT}", encoded);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+		String encoded = pe.encodePassword(raw, salt);
+		assertEquals("abc123{THIS_IS_A_SALT}", encoded);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
 
-        // make sure default is not to ignore password case
-        assertFalse(pe.isIgnorePasswordCase());
-        encoded = pe.encodePassword(rawDiffCase, salt);
-        assertFalse(pe.isPasswordValid(encoded, raw, salt));
+		// make sure default is not to ignore password case
+		assertFalse(pe.isIgnorePasswordCase());
+		encoded = pe.encodePassword(rawDiffCase, salt);
+		assertFalse(pe.isPasswordValid(encoded, raw, salt));
 
-        // now check for ignore password case
-        pe = new PlaintextPasswordEncoder();
-        pe.setIgnorePasswordCase(true);
+		// now check for ignore password case
+		pe = new PlaintextPasswordEncoder();
+		pe.setIgnorePasswordCase(true);
 
-        // should be able to validate even without encoding
-        encoded = pe.encodePassword(rawDiffCase, salt);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
-    }
+		// should be able to validate even without encoding
+		encoded = pe.encodePassword(rawDiffCase, salt);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+	}
 
-    public void testMergeDemerge() {
-        PlaintextPasswordEncoder pwd = new PlaintextPasswordEncoder();
+	public void testMergeDemerge() {
+		PlaintextPasswordEncoder pwd = new PlaintextPasswordEncoder();
 
-        String merged = pwd.encodePassword("password", "foo");
-        String[] demerged = pwd.obtainPasswordAndSalt(merged);
-        assertEquals("password", demerged[0]);
-        assertEquals("foo", demerged[1]);
-    }
+		String merged = pwd.encodePassword("password", "foo");
+		String[] demerged = pwd.obtainPasswordAndSalt(merged);
+		assertEquals("password", demerged[0]);
+		assertEquals("foo", demerged[1]);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java b/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java
index 913bb38d8b..055d8b58aa 100644
--- a/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/encoding/ShaPasswordEncoderTests.java
@@ -19,55 +19,60 @@ import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 
 import junit.framework.TestCase;
 
-
 /**
- * <p>TestCase for ShaPasswordEncoder.</p>
+ * <p>
+ * TestCase for ShaPasswordEncoder.
+ * </p>
  *
  * @author colin sampaleanu
  * @author Ben Alex
  * @author Ray Krueger
  */
 public class ShaPasswordEncoderTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testBasicFunctionality() {
-        ShaPasswordEncoder pe = new ShaPasswordEncoder();
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String salt = "THIS_IS_A_SALT";
-        String encoded = pe.encodePassword(raw, salt);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
-        assertEquals("b2f50ffcbd3407fe9415c062d55f54731f340d32", encoded);
+	public void testBasicFunctionality() {
+		ShaPasswordEncoder pe = new ShaPasswordEncoder();
+		String raw = "abc123";
+		String badRaw = "abc321";
+		String salt = "THIS_IS_A_SALT";
+		String encoded = pe.encodePassword(raw, salt);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+		assertEquals("b2f50ffcbd3407fe9415c062d55f54731f340d32", encoded);
 
-    }
+	}
 
-    public void testBase64() throws Exception {
-        ShaPasswordEncoder pe = new ShaPasswordEncoder();
-        pe.setEncodeHashAsBase64(true);
-        String raw = "abc123";
-        String badRaw = "abc321";
-        String salt = "THIS_IS_A_SALT";
-        String encoded = pe.encodePassword(raw, salt);
-        assertTrue(pe.isPasswordValid(encoded, raw, salt));
-        assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
-        assertTrue(encoded.length() != 40);
-    }
+	public void testBase64() throws Exception {
+		ShaPasswordEncoder pe = new ShaPasswordEncoder();
+		pe.setEncodeHashAsBase64(true);
+		String raw = "abc123";
+		String badRaw = "abc321";
+		String salt = "THIS_IS_A_SALT";
+		String encoded = pe.encodePassword(raw, salt);
+		assertTrue(pe.isPasswordValid(encoded, raw, salt));
+		assertFalse(pe.isPasswordValid(encoded, badRaw, salt));
+		assertTrue(encoded.length() != 40);
+	}
 
-    public void test256() throws Exception {
-        ShaPasswordEncoder pe = new ShaPasswordEncoder(256);
-        String encoded = pe.encodePassword("abc123", null);
-        assertEquals("6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090", encoded);
-        String encodedWithSalt = pe.encodePassword("abc123", "THIS_IS_A_SALT");
-        assertEquals("4b79b7de23eb23b78cc5ede227d532b8a51f89b2ec166f808af76b0dbedc47d7", encodedWithSalt);
-    }
+	public void test256() throws Exception {
+		ShaPasswordEncoder pe = new ShaPasswordEncoder(256);
+		String encoded = pe.encodePassword("abc123", null);
+		assertEquals("6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090",
+				encoded);
+		String encodedWithSalt = pe.encodePassword("abc123", "THIS_IS_A_SALT");
+		assertEquals("4b79b7de23eb23b78cc5ede227d532b8a51f89b2ec166f808af76b0dbedc47d7",
+				encodedWithSalt);
+	}
 
-    public void testInvalidStrength() throws Exception {
-        try {
-            new ShaPasswordEncoder(666);
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException e) {
-            //expected
-        }
-    }
+	public void testInvalidStrength() throws Exception {
+		try {
+			new ShaPasswordEncoder(666);
+			fail("IllegalArgumentException expected");
+		}
+		catch (IllegalArgumentException e) {
+			// expected
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java
index ce57bba42a..88f3d20c46 100644
--- a/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/event/AuthenticationEventTests.java
@@ -17,7 +17,6 @@ package org.springframework.security.authentication.event;
 
 import junit.framework.TestCase;
 
-
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
@@ -27,62 +26,65 @@ import org.springframework.security.authentication.event.AuthenticationSuccessEv
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
  * Tests {@link AbstractAuthenticationEvent} and its subclasses.
  *
  * @author Ben Alex
  */
 public class AuthenticationEventTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private Authentication getAuthentication() {
-        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("Principal",
-                "Credentials");
-        authentication.setDetails("127.0.0.1");
+	private Authentication getAuthentication() {
+		UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+				"Principal", "Credentials");
+		authentication.setDetails("127.0.0.1");
 
-        return authentication;
-    }
+		return authentication;
+	}
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AuthenticationEventTests.class);
-    }
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(AuthenticationEventTests.class);
+	}
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testAbstractAuthenticationEvent() {
-        Authentication auth = getAuthentication();
-        AbstractAuthenticationEvent event = new AuthenticationSuccessEvent(auth);
-        assertEquals(auth, event.getAuthentication());
-    }
+	public void testAbstractAuthenticationEvent() {
+		Authentication auth = getAuthentication();
+		AbstractAuthenticationEvent event = new AuthenticationSuccessEvent(auth);
+		assertEquals(auth, event.getAuthentication());
+	}
 
-    public void testAbstractAuthenticationFailureEvent() {
-        Authentication auth = getAuthentication();
-        AuthenticationException exception = new DisabledException("TEST");
-        AbstractAuthenticationFailureEvent event = new AuthenticationFailureDisabledEvent(auth, exception);
-        assertEquals(auth, event.getAuthentication());
-        assertEquals(exception, event.getException());
-    }
+	public void testAbstractAuthenticationFailureEvent() {
+		Authentication auth = getAuthentication();
+		AuthenticationException exception = new DisabledException("TEST");
+		AbstractAuthenticationFailureEvent event = new AuthenticationFailureDisabledEvent(
+				auth, exception);
+		assertEquals(auth, event.getAuthentication());
+		assertEquals(exception, event.getException());
+	}
 
-    public void testRejectsNullAuthentication() {
-        AuthenticationException exception = new DisabledException("TEST");
+	public void testRejectsNullAuthentication() {
+		AuthenticationException exception = new DisabledException("TEST");
 
-        try {
-            new AuthenticationFailureDisabledEvent(null, exception);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			new AuthenticationFailureDisabledEvent(null, exception);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testRejectsNullAuthenticationException() {
-        try {
-            new AuthenticationFailureDisabledEvent(getAuthentication(), null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testRejectsNullAuthenticationException() {
+		try {
+			new AuthenticationFailureDisabledEvent(getAuthentication(), null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java
index 3bed46b166..decb8e5b20 100644
--- a/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/event/LoggerListenerTests.java
@@ -17,43 +17,42 @@ package org.springframework.security.authentication.event;
 
 import junit.framework.TestCase;
 
-
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.authentication.event.AuthenticationFailureDisabledEvent;
 import org.springframework.security.authentication.event.LoggerListener;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Tests {@link LoggerListener}.
  *
  * @author Ben Alex
  */
 public class LoggerListenerTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private Authentication getAuthentication() {
-        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken("Principal",
-                "Credentials");
-        authentication.setDetails("127.0.0.1");
+	private Authentication getAuthentication() {
+		UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+				"Principal", "Credentials");
+		authentication.setDetails("127.0.0.1");
 
-        return authentication;
-    }
+		return authentication;
+	}
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(LoggerListenerTests.class);
-    }
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(LoggerListenerTests.class);
+	}
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testLogsEvents() {
-        AuthenticationFailureDisabledEvent event = new AuthenticationFailureDisabledEvent(getAuthentication(),
-                new LockedException("TEST"));
-        LoggerListener listener = new LoggerListener();
-        listener.onApplicationEvent(event);
-        assertTrue(true);
-    }
+	public void testLogsEvents() {
+		AuthenticationFailureDisabledEvent event = new AuthenticationFailureDisabledEvent(
+				getAuthentication(), new LockedException("TEST"));
+		LoggerListener listener = new LoggerListener();
+		listener.onApplicationEvent(event);
+		assertTrue(true);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java
index 774f0334a8..28f7fc30cf 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/DefaultJaasAuthenticationProviderTests.java
@@ -55,219 +55,227 @@ import org.springframework.security.core.session.SessionDestroyedEvent;
 import org.springframework.test.util.ReflectionTestUtils;
 
 public class DefaultJaasAuthenticationProviderTests {
-    private DefaultJaasAuthenticationProvider provider;
-    private UsernamePasswordAuthenticationToken token;
-    private ApplicationEventPublisher publisher;
-    private Log log;
+	private DefaultJaasAuthenticationProvider provider;
+	private UsernamePasswordAuthenticationToken token;
+	private ApplicationEventPublisher publisher;
+	private Log log;
 
-    @Before
-    public void setUp() throws Exception {
-        Configuration configuration = mock(Configuration.class);
-        publisher = mock(ApplicationEventPublisher.class);
-        log = mock(Log.class);
-        provider = new DefaultJaasAuthenticationProvider();
-        provider.setConfiguration(configuration);
-        provider.setApplicationEventPublisher(publisher);
-        provider.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() });
-        provider.afterPropertiesSet();
-        AppConfigurationEntry[] aces = new AppConfigurationEntry[] { new AppConfigurationEntry(
-                TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED,
-                Collections.<String, Object> emptyMap()) };
-        when(configuration.getAppConfigurationEntry(provider.getLoginContextName())).thenReturn(aces);
-        token = new UsernamePasswordAuthenticationToken("user", "password");
-        ReflectionTestUtils.setField(provider, "log", log);
+	@Before
+	public void setUp() throws Exception {
+		Configuration configuration = mock(Configuration.class);
+		publisher = mock(ApplicationEventPublisher.class);
+		log = mock(Log.class);
+		provider = new DefaultJaasAuthenticationProvider();
+		provider.setConfiguration(configuration);
+		provider.setApplicationEventPublisher(publisher);
+		provider.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() });
+		provider.afterPropertiesSet();
+		AppConfigurationEntry[] aces = new AppConfigurationEntry[] { new AppConfigurationEntry(
+				TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED,
+				Collections.<String, Object> emptyMap()) };
+		when(configuration.getAppConfigurationEntry(provider.getLoginContextName()))
+				.thenReturn(aces);
+		token = new UsernamePasswordAuthenticationToken("user", "password");
+		ReflectionTestUtils.setField(provider, "log", log);
 
-    }
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void afterPropertiesSetNullConfiguration() throws Exception {
-        provider.setConfiguration(null);
-        provider.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void afterPropertiesSetNullConfiguration() throws Exception {
+		provider.setConfiguration(null);
+		provider.afterPropertiesSet();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void afterPropertiesSetNullAuthorityGranters() throws Exception {
-        provider.setAuthorityGranters(null);
-        provider.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void afterPropertiesSetNullAuthorityGranters() throws Exception {
+		provider.setAuthorityGranters(null);
+		provider.afterPropertiesSet();
+	}
 
-    @Test
-    public void authenticateUnsupportedAuthentication() {
-        assertEquals(null, provider.authenticate(new TestingAuthenticationToken("user", "password")));
-    }
+	@Test
+	public void authenticateUnsupportedAuthentication() {
+		assertEquals(null,
+				provider.authenticate(new TestingAuthenticationToken("user", "password")));
+	}
 
-    @Test
-    public void authenticateSuccess() throws Exception {
-        Authentication auth = provider.authenticate(token);
-        assertEquals(token.getPrincipal(), auth.getPrincipal());
-        assertEquals(token.getCredentials(), auth.getCredentials());
-        assertEquals(true, auth.isAuthenticated());
-        assertEquals(false, auth.getAuthorities().isEmpty());
-        verify(publisher).publishEvent(isA(JaasAuthenticationSuccessEvent.class));
-        verifyNoMoreInteractions(publisher);
-    }
+	@Test
+	public void authenticateSuccess() throws Exception {
+		Authentication auth = provider.authenticate(token);
+		assertEquals(token.getPrincipal(), auth.getPrincipal());
+		assertEquals(token.getCredentials(), auth.getCredentials());
+		assertEquals(true, auth.isAuthenticated());
+		assertEquals(false, auth.getAuthorities().isEmpty());
+		verify(publisher).publishEvent(isA(JaasAuthenticationSuccessEvent.class));
+		verifyNoMoreInteractions(publisher);
+	}
 
-    @Test
-    public void authenticateBadPassword() {
-        try {
-            provider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf"));
-            fail("LoginException should have been thrown for the bad password");
-        } catch (AuthenticationException success) {
-        }
+	@Test
+	public void authenticateBadPassword() {
+		try {
+			provider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf"));
+			fail("LoginException should have been thrown for the bad password");
+		}
+		catch (AuthenticationException success) {
+		}
 
-        verifyFailedLogin();
-    }
+		verifyFailedLogin();
+	}
 
-    @Test
-    public void authenticateBadUser() {
-        try {
-            provider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password"));
-            fail("LoginException should have been thrown for the bad user");
-        } catch (AuthenticationException success) {
-        }
+	@Test
+	public void authenticateBadUser() {
+		try {
+			provider.authenticate(new UsernamePasswordAuthenticationToken("asdf",
+					"password"));
+			fail("LoginException should have been thrown for the bad user");
+		}
+		catch (AuthenticationException success) {
+		}
 
-        verifyFailedLogin();
-    }
+		verifyFailedLogin();
+	}
 
-    @Test
-    public void logout() throws Exception {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        SecurityContext securityContext = mock(SecurityContext.class);
-        JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
-        LoginContext context = mock(LoginContext.class);
+	@Test
+	public void logout() throws Exception {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		SecurityContext securityContext = mock(SecurityContext.class);
+		JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
+		LoginContext context = mock(LoginContext.class);
 
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
-        when(securityContext.getAuthentication()).thenReturn(token);
-        when(token.getLoginContext()).thenReturn(context);
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
+		when(securityContext.getAuthentication()).thenReturn(token);
+		when(token.getLoginContext()).thenReturn(context);
 
-        provider.onApplicationEvent(event);
+		provider.onApplicationEvent(event);
 
-        verify(event).getSecurityContexts();
-        verify(securityContext).getAuthentication();
-        verify(token).getLoginContext();
-        verify(context).logout();
-        verifyNoMoreInteractions(event, securityContext, token, context);
-    }
+		verify(event).getSecurityContexts();
+		verify(securityContext).getAuthentication();
+		verify(token).getLoginContext();
+		verify(context).logout();
+		verifyNoMoreInteractions(event, securityContext, token, context);
+	}
 
-    @Test
-    public void logoutNullSession() {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+	@Test
+	public void logoutNullSession() {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
 
-        provider.handleLogout(event);
+		provider.handleLogout(event);
 
-        verify(event).getSecurityContexts();
-        verify(log).debug(anyString());
-        verifyNoMoreInteractions(event);
-    }
+		verify(event).getSecurityContexts();
+		verify(log).debug(anyString());
+		verifyNoMoreInteractions(event);
+	}
 
-    @Test
-    public void logoutNullAuthentication() {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        SecurityContext securityContext = mock(SecurityContext.class);
+	@Test
+	public void logoutNullAuthentication() {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		SecurityContext securityContext = mock(SecurityContext.class);
 
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
 
-        provider.handleLogout(event);
+		provider.handleLogout(event);
 
-        verify(event).getSecurityContexts();
-        verify(event).getSecurityContexts();
-        verify(securityContext).getAuthentication();
-        verifyNoMoreInteractions(event, securityContext);
-    }
+		verify(event).getSecurityContexts();
+		verify(event).getSecurityContexts();
+		verify(securityContext).getAuthentication();
+		verifyNoMoreInteractions(event, securityContext);
+	}
 
-    @Test
-    public void logoutNonJaasAuthentication() {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        SecurityContext securityContext = mock(SecurityContext.class);
+	@Test
+	public void logoutNonJaasAuthentication() {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		SecurityContext securityContext = mock(SecurityContext.class);
 
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
-        when(securityContext.getAuthentication()).thenReturn(token);
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
+		when(securityContext.getAuthentication()).thenReturn(token);
 
-        provider.handleLogout(event);
+		provider.handleLogout(event);
 
-        verify(event).getSecurityContexts();
-        verify(event).getSecurityContexts();
-        verify(securityContext).getAuthentication();
-        verifyNoMoreInteractions(event, securityContext);
-    }
+		verify(event).getSecurityContexts();
+		verify(event).getSecurityContexts();
+		verify(securityContext).getAuthentication();
+		verifyNoMoreInteractions(event, securityContext);
+	}
 
-    @Test
-    public void logoutNullLoginContext() throws Exception {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        SecurityContext securityContext = mock(SecurityContext.class);
-        JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
+	@Test
+	public void logoutNullLoginContext() throws Exception {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		SecurityContext securityContext = mock(SecurityContext.class);
+		JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
 
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
-        when(securityContext.getAuthentication()).thenReturn(token);
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
+		when(securityContext.getAuthentication()).thenReturn(token);
 
-        provider.onApplicationEvent(event);
-        verify(event).getSecurityContexts();
-        verify(securityContext).getAuthentication();
-        verify(token).getLoginContext();
+		provider.onApplicationEvent(event);
+		verify(event).getSecurityContexts();
+		verify(securityContext).getAuthentication();
+		verify(token).getLoginContext();
 
-        verifyNoMoreInteractions(event, securityContext, token);
-    }
+		verifyNoMoreInteractions(event, securityContext, token);
+	}
 
-    @Test
-    public void logoutLoginException() throws Exception {
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        SecurityContext securityContext = mock(SecurityContext.class);
-        JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
-        LoginContext context = mock(LoginContext.class);
-        LoginException loginException = new LoginException("Failed Login");
+	@Test
+	public void logoutLoginException() throws Exception {
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		SecurityContext securityContext = mock(SecurityContext.class);
+		JaasAuthenticationToken token = mock(JaasAuthenticationToken.class);
+		LoginContext context = mock(LoginContext.class);
+		LoginException loginException = new LoginException("Failed Login");
 
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
-        when(securityContext.getAuthentication()).thenReturn(token);
-        when(token.getLoginContext()).thenReturn(context);
-        doThrow(loginException).when(context).logout();
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(securityContext));
+		when(securityContext.getAuthentication()).thenReturn(token);
+		when(token.getLoginContext()).thenReturn(context);
+		doThrow(loginException).when(context).logout();
 
-        provider.onApplicationEvent(event);
+		provider.onApplicationEvent(event);
 
-        verify(event).getSecurityContexts();
-        verify(securityContext).getAuthentication();
-        verify(token).getLoginContext();
-        verify(context).logout();
-        verify(log).warn(anyString(), eq(loginException));
-        verifyNoMoreInteractions(event, securityContext, token, context);
-    }
+		verify(event).getSecurityContexts();
+		verify(securityContext).getAuthentication();
+		verify(token).getLoginContext();
+		verify(context).logout();
+		verify(log).warn(anyString(), eq(loginException));
+		verifyNoMoreInteractions(event, securityContext, token, context);
+	}
 
-    @Test
-    public void publishNullPublisher() {
-        provider.setApplicationEventPublisher(null);
-        AuthenticationException ae = new BadCredentialsException("Failed to login");
+	@Test
+	public void publishNullPublisher() {
+		provider.setApplicationEventPublisher(null);
+		AuthenticationException ae = new BadCredentialsException("Failed to login");
 
-        provider.publishFailureEvent(token, ae);
-        provider.publishSuccessEvent(token);
-    }
+		provider.publishFailureEvent(token, ae);
+		provider.publishSuccessEvent(token);
+	}
 
-    @Test
-    public void javadocExample() {
-        String resName = "/" + getClass().getName().replace('.', '/') + ".xml";
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(resName);
-        context.registerShutdownHook();
-        try {
-            provider = context.getBean(DefaultJaasAuthenticationProvider.class);
-            Authentication auth = provider.authenticate(token);
-            assertEquals(true, auth.isAuthenticated());
-            assertEquals(token.getPrincipal(), auth.getPrincipal());
-        } finally {
-            context.close();
-        }
-    }
+	@Test
+	public void javadocExample() {
+		String resName = "/" + getClass().getName().replace('.', '/') + ".xml";
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				resName);
+		context.registerShutdownHook();
+		try {
+			provider = context.getBean(DefaultJaasAuthenticationProvider.class);
+			Authentication auth = provider.authenticate(token);
+			assertEquals(true, auth.isAuthenticated());
+			assertEquals(token.getPrincipal(), auth.getPrincipal());
+		}
+		finally {
+			context.close();
+		}
+	}
 
-    private void verifyFailedLogin() {
-        verify(publisher).publishEvent(argThat(new BaseMatcher<JaasAuthenticationFailedEvent>() {
-            public void describeTo(Description desc) {
-                desc.appendText("isA(org.springframework.security.authentication.jaas.event.JaasAuthenticationFailedEvent)");
-                desc.appendText(" && event.getException() != null");
-            }
+	private void verifyFailedLogin() {
+		verify(publisher).publishEvent(
+				argThat(new BaseMatcher<JaasAuthenticationFailedEvent>() {
+					public void describeTo(Description desc) {
+						desc.appendText("isA(org.springframework.security.authentication.jaas.event.JaasAuthenticationFailedEvent)");
+						desc.appendText(" && event.getException() != null");
+					}
 
-            public boolean matches(Object arg) {
-                JaasAuthenticationFailedEvent e = (JaasAuthenticationFailedEvent) arg;
-                return e.getException() != null;
-            }
+					public boolean matches(Object arg) {
+						JaasAuthenticationFailedEvent e = (JaasAuthenticationFailedEvent) arg;
+						return e.getException() != null;
+					}
 
-        }));
-        verifyNoMoreInteractions(publisher);
-    }
+				}));
+		verifyNoMoreInteractions(publisher);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java
index fc6aea3fac..988513ec7b 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java
@@ -46,241 +46,271 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.core.session.SessionDestroyedEvent;
 
-
 /**
  * Tests for the JaasAuthenticationProvider
  *
  * @author Ray Krueger
  */
 public class JaasAuthenticationProviderTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ApplicationContext context;
-    private JaasAuthenticationProvider jaasProvider;
-    private JaasEventCheck eventCheck;
+	private ApplicationContext context;
+	private JaasAuthenticationProvider jaasProvider;
+	private JaasEventCheck eventCheck;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        String resName = "/" + getClass().getName().replace('.', '/') + ".xml";
-        context = new ClassPathXmlApplicationContext(resName);
-        eventCheck = (JaasEventCheck) context.getBean("eventCheck");
-        jaasProvider = (JaasAuthenticationProvider) context.getBean("jaasAuthenticationProvider");
-    }
+	@Before
+	public void setUp() throws Exception {
+		String resName = "/" + getClass().getName().replace('.', '/') + ".xml";
+		context = new ClassPathXmlApplicationContext(resName);
+		eventCheck = (JaasEventCheck) context.getBean("eventCheck");
+		jaasProvider = (JaasAuthenticationProvider) context
+				.getBean("jaasAuthenticationProvider");
+	}
 
-    @Test
-    public void testBadPassword() {
-        try {
-            jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "asdf"));
-            fail("LoginException should have been thrown for the bad password");
-        } catch (AuthenticationException e) {}
+	@Test
+	public void testBadPassword() {
+		try {
+			jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user",
+					"asdf"));
+			fail("LoginException should have been thrown for the bad password");
+		}
+		catch (AuthenticationException e) {
+		}
 
-        assertNotNull("Failure event not fired", eventCheck.failedEvent);
-        assertNotNull("Failure event exception was null", eventCheck.failedEvent.getException());
-        assertNull("Success event was fired", eventCheck.successEvent);
-    }
+		assertNotNull("Failure event not fired", eventCheck.failedEvent);
+		assertNotNull("Failure event exception was null",
+				eventCheck.failedEvent.getException());
+		assertNull("Success event was fired", eventCheck.successEvent);
+	}
 
-    @Test
-    public void testBadUser() {
-        try {
-            jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("asdf", "password"));
-            fail("LoginException should have been thrown for the bad user");
-        } catch (AuthenticationException e) {}
+	@Test
+	public void testBadUser() {
+		try {
+			jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("asdf",
+					"password"));
+			fail("LoginException should have been thrown for the bad user");
+		}
+		catch (AuthenticationException e) {
+		}
 
-        assertNotNull("Failure event not fired", eventCheck.failedEvent);
-        assertNotNull("Failure event exception was null", eventCheck.failedEvent.getException());
-        assertNull("Success event was fired", eventCheck.successEvent);
-    }
+		assertNotNull("Failure event not fired", eventCheck.failedEvent);
+		assertNotNull("Failure event exception was null",
+				eventCheck.failedEvent.getException());
+		assertNull("Success event was fired", eventCheck.successEvent);
+	}
 
-    @Test
-    public void testConfigurationLoop() throws Exception {
-        String resName = "/" + getClass().getName().replace('.', '/') + ".conf";
-        URL url = getClass().getResource(resName);
+	@Test
+	public void testConfigurationLoop() throws Exception {
+		String resName = "/" + getClass().getName().replace('.', '/') + ".conf";
+		URL url = getClass().getResource(resName);
 
-        Security.setProperty("login.config.url.1", url.toString());
+		Security.setProperty("login.config.url.1", url.toString());
 
-        setUp();
-        testFull();
-    }
+		setUp();
+		testFull();
+	}
 
-    @Test
-    public void detectsMissingLoginConfig() throws Exception {
-        JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
-        myJaasProvider.setApplicationEventPublisher(context);
-        myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
-        myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
-        myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName());
+	@Test
+	public void detectsMissingLoginConfig() throws Exception {
+		JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
+		myJaasProvider.setApplicationEventPublisher(context);
+		myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
+		myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
+		myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName());
 
-        try {
-            myJaasProvider.afterPropertiesSet();
-            fail("Should have thrown ApplicationContextException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(expected.getMessage().startsWith("loginConfig must be set on"));
-        }
-    }
+		try {
+			myJaasProvider.afterPropertiesSet();
+			fail("Should have thrown ApplicationContextException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(expected.getMessage().startsWith("loginConfig must be set on"));
+		}
+	}
 
-    // SEC-1239
-    @Test
-    public void spacesInLoginConfigPathAreAccepted() throws Exception {
-        File configFile;
-        // Create temp directory with a space in the name
-        File configDir = new File(System.getProperty("java.io.tmpdir") + File.separator + "jaas test");
-        configDir.deleteOnExit();
+	// SEC-1239
+	@Test
+	public void spacesInLoginConfigPathAreAccepted() throws Exception {
+		File configFile;
+		// Create temp directory with a space in the name
+		File configDir = new File(System.getProperty("java.io.tmpdir") + File.separator
+				+ "jaas test");
+		configDir.deleteOnExit();
 
-        if (configDir.exists()) {
-            configDir.delete();
-        }
-        configDir.mkdir();
-        configFile = File.createTempFile("login", "conf", configDir);
-        configFile.deleteOnExit();
-        FileOutputStream fos = new FileOutputStream(configFile);
-        PrintWriter pw = new PrintWriter(fos);
-        pw.append("JAASTestBlah {" +
-                    "org.springframework.security.authentication.jaas.TestLoginModule required;" +
-                 "};");
-        pw.flush();
-        pw.close();
+		if (configDir.exists()) {
+			configDir.delete();
+		}
+		configDir.mkdir();
+		configFile = File.createTempFile("login", "conf", configDir);
+		configFile.deleteOnExit();
+		FileOutputStream fos = new FileOutputStream(configFile);
+		PrintWriter pw = new PrintWriter(fos);
+		pw.append("JAASTestBlah {"
+				+ "org.springframework.security.authentication.jaas.TestLoginModule required;"
+				+ "};");
+		pw.flush();
+		pw.close();
 
-        JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
-        myJaasProvider.setApplicationEventPublisher(context);
-        myJaasProvider.setLoginConfig(new FileSystemResource(configFile));
-        myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
-        myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
-        myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName());
+		JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
+		myJaasProvider.setApplicationEventPublisher(context);
+		myJaasProvider.setLoginConfig(new FileSystemResource(configFile));
+		myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
+		myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
+		myJaasProvider.setLoginContextName(jaasProvider.getLoginContextName());
 
-        myJaasProvider.afterPropertiesSet();
-    }
+		myJaasProvider.afterPropertiesSet();
+	}
 
-    @Test
-    public void detectsMissingLoginContextName() throws Exception {
-        JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
-        myJaasProvider.setApplicationEventPublisher(context);
-        myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
-        myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
-        myJaasProvider.setLoginConfig(jaasProvider.getLoginConfig());
-        myJaasProvider.setLoginContextName(null);
+	@Test
+	public void detectsMissingLoginContextName() throws Exception {
+		JaasAuthenticationProvider myJaasProvider = new JaasAuthenticationProvider();
+		myJaasProvider.setApplicationEventPublisher(context);
+		myJaasProvider.setAuthorityGranters(jaasProvider.getAuthorityGranters());
+		myJaasProvider.setCallbackHandlers(jaasProvider.getCallbackHandlers());
+		myJaasProvider.setLoginConfig(jaasProvider.getLoginConfig());
+		myJaasProvider.setLoginContextName(null);
 
-        try {
-            myJaasProvider.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(expected.getMessage().startsWith("loginContextName must be set on"));
-        }
+		try {
+			myJaasProvider.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(expected.getMessage()
+					.startsWith("loginContextName must be set on"));
+		}
 
-        myJaasProvider.setLoginContextName("");
+		myJaasProvider.setLoginContextName("");
 
-        try {
-            myJaasProvider.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(expected.getMessage().startsWith("loginContextName must be set on"));
-        }
-    }
+		try {
+			myJaasProvider.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(expected.getMessage()
+					.startsWith("loginContextName must be set on"));
+		}
+	}
 
-    @Test
-    public void testFull() throws Exception {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE"));
+	@Test
+	public void testFull() throws Exception {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"user", "password", AuthorityUtils.createAuthorityList("ROLE_ONE"));
 
-        assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class));
+		assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class));
 
-        Authentication auth = jaasProvider.authenticate(token);
+		Authentication auth = jaasProvider.authenticate(token);
 
-        assertNotNull(jaasProvider.getAuthorityGranters());
-        assertNotNull(jaasProvider.getCallbackHandlers());
-        assertNotNull(jaasProvider.getLoginConfig());
-        assertNotNull(jaasProvider.getLoginContextName());
+		assertNotNull(jaasProvider.getAuthorityGranters());
+		assertNotNull(jaasProvider.getCallbackHandlers());
+		assertNotNull(jaasProvider.getLoginConfig());
+		assertNotNull(jaasProvider.getLoginContextName());
 
-        Collection<? extends GrantedAuthority> list = auth.getAuthorities();
-        Set<String> set = AuthorityUtils.authorityListToSet(list);
+		Collection<? extends GrantedAuthority> list = auth.getAuthorities();
+		Set<String> set = AuthorityUtils.authorityListToSet(list);
 
-        assertFalse("GrantedAuthorities should not contain ROLE_1", set.contains("ROLE_ONE"));
-        assertTrue("GrantedAuthorities should contain ROLE_TEST1", set.contains("ROLE_TEST1"));
-        assertTrue("GrantedAuthorities should contain ROLE_TEST2", set.contains("ROLE_TEST2"));
+		assertFalse("GrantedAuthorities should not contain ROLE_1",
+				set.contains("ROLE_ONE"));
+		assertTrue("GrantedAuthorities should contain ROLE_TEST1",
+				set.contains("ROLE_TEST1"));
+		assertTrue("GrantedAuthorities should contain ROLE_TEST2",
+				set.contains("ROLE_TEST2"));
 
-        boolean foundit = false;
+		boolean foundit = false;
 
-        for (GrantedAuthority a : list) {
-            if (a instanceof JaasGrantedAuthority) {
-                JaasGrantedAuthority grant = (JaasGrantedAuthority) a;
-                assertNotNull("Principal was null on JaasGrantedAuthority", grant.getPrincipal());
-                foundit = true;
-            }
-        }
+		for (GrantedAuthority a : list) {
+			if (a instanceof JaasGrantedAuthority) {
+				JaasGrantedAuthority grant = (JaasGrantedAuthority) a;
+				assertNotNull("Principal was null on JaasGrantedAuthority",
+						grant.getPrincipal());
+				foundit = true;
+			}
+		}
 
-        assertTrue("Could not find a JaasGrantedAuthority", foundit);
+		assertTrue("Could not find a JaasGrantedAuthority", foundit);
 
-        assertNotNull("Success event should be fired", eventCheck.successEvent);
-        assertEquals("Auth objects should be equal", auth, eventCheck.successEvent.getAuthentication());
-        assertNull("Failure event should not be fired", eventCheck.failedEvent);
-    }
+		assertNotNull("Success event should be fired", eventCheck.successEvent);
+		assertEquals("Auth objects should be equal", auth,
+				eventCheck.successEvent.getAuthentication());
+		assertNull("Failure event should not be fired", eventCheck.failedEvent);
+	}
 
-    @Test
-    public void testGetApplicationEventPublisher() throws Exception {
-        assertNotNull(jaasProvider.getApplicationEventPublisher());
-    }
+	@Test
+	public void testGetApplicationEventPublisher() throws Exception {
+		assertNotNull(jaasProvider.getApplicationEventPublisher());
+	}
 
-    @Test
-    public void testLoginExceptionResolver() {
-        assertNotNull(jaasProvider.getLoginExceptionResolver());
-        jaasProvider.setLoginExceptionResolver(new LoginExceptionResolver() {
-                public AuthenticationException resolveException(LoginException e) {
-                    return new LockedException("This is just a test!");
-                }
-            });
+	@Test
+	public void testLoginExceptionResolver() {
+		assertNotNull(jaasProvider.getLoginExceptionResolver());
+		jaasProvider.setLoginExceptionResolver(new LoginExceptionResolver() {
+			public AuthenticationException resolveException(LoginException e) {
+				return new LockedException("This is just a test!");
+			}
+		});
 
-        try {
-            jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user", "password"));
-        } catch (LockedException e) {}
-        catch (Exception e) {
-            fail("LockedException should have been thrown and caught");
-        }
-    }
+		try {
+			jaasProvider.authenticate(new UsernamePasswordAuthenticationToken("user",
+					"password"));
+		}
+		catch (LockedException e) {
+		}
+		catch (Exception e) {
+			fail("LockedException should have been thrown and caught");
+		}
+	}
 
-    @Test
-    public void testLogout() throws Exception {
-        MockLoginContext loginContext = new MockLoginContext(jaasProvider.getLoginContextName());
+	@Test
+	public void testLogout() throws Exception {
+		MockLoginContext loginContext = new MockLoginContext(
+				jaasProvider.getLoginContextName());
 
-        JaasAuthenticationToken token = new JaasAuthenticationToken(null, null, loginContext);
+		JaasAuthenticationToken token = new JaasAuthenticationToken(null, null,
+				loginContext);
 
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(token);
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(token);
 
-        SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
-        when(event.getSecurityContexts()).thenReturn(Arrays.asList(context));
+		SessionDestroyedEvent event = mock(SessionDestroyedEvent.class);
+		when(event.getSecurityContexts()).thenReturn(Arrays.asList(context));
 
-        jaasProvider.handleLogout(event);
+		jaasProvider.handleLogout(event);
 
-        assertTrue(loginContext.loggedOut);
-    }
+		assertTrue(loginContext.loggedOut);
+	}
 
-    @Test
-    public void testNullDefaultAuthorities() {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password");
+	@Test
+	public void testNullDefaultAuthorities() {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"user", "password");
 
-        assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class));
+		assertTrue(jaasProvider.supports(UsernamePasswordAuthenticationToken.class));
 
-        Authentication auth = jaasProvider.authenticate(token);
-        assertTrue("Only ROLE_TEST1 and ROLE_TEST2 should have been returned", auth.getAuthorities().size() == 2);
-    }
+		Authentication auth = jaasProvider.authenticate(token);
+		assertTrue("Only ROLE_TEST1 and ROLE_TEST2 should have been returned", auth
+				.getAuthorities().size() == 2);
+	}
 
-    @Test
-    public void testUnsupportedAuthenticationObjectReturnsNull() {
-        assertNull(jaasProvider.authenticate(new TestingAuthenticationToken("foo", "bar", AuthorityUtils.NO_AUTHORITIES )));
-    }
+	@Test
+	public void testUnsupportedAuthenticationObjectReturnsNull() {
+		assertNull(jaasProvider.authenticate(new TestingAuthenticationToken("foo", "bar",
+				AuthorityUtils.NO_AUTHORITIES)));
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private static class MockLoginContext extends LoginContext {
-        boolean loggedOut = false;
+	private static class MockLoginContext extends LoginContext {
+		boolean loggedOut = false;
 
-        public MockLoginContext(String loginModule) throws LoginException {
-            super(loginModule);
-        }
+		public MockLoginContext(String loginModule) throws LoginException {
+			super(loginModule);
+		}
 
-        public void logout() throws LoginException {
-            this.loggedOut = true;
-        }
-    }
+		public void logout() throws LoginException {
+			this.loggedOut = true;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java
index 2024566138..74ebb79949 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasEventCheck.java
@@ -20,25 +20,26 @@ import org.springframework.security.authentication.jaas.event.JaasAuthentication
 import org.springframework.security.authentication.jaas.event.JaasAuthenticationFailedEvent;
 import org.springframework.security.authentication.jaas.event.JaasAuthenticationSuccessEvent;
 
-
 /**
  * @author Ray Krueger
  */
 public class JaasEventCheck implements ApplicationListener<JaasAuthenticationEvent> {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    JaasAuthenticationFailedEvent failedEvent;
-    JaasAuthenticationSuccessEvent successEvent;
+	JaasAuthenticationFailedEvent failedEvent;
+	JaasAuthenticationSuccessEvent successEvent;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void onApplicationEvent(JaasAuthenticationEvent event) {
-        if (event instanceof JaasAuthenticationFailedEvent) {
-            failedEvent = (JaasAuthenticationFailedEvent) event;
-        }
+	public void onApplicationEvent(JaasAuthenticationEvent event) {
+		if (event instanceof JaasAuthenticationFailedEvent) {
+			failedEvent = (JaasAuthenticationFailedEvent) event;
+		}
 
-        if (event instanceof JaasAuthenticationSuccessEvent) {
-            successEvent = (JaasAuthenticationSuccessEvent) event;
-        }
-    }
+		if (event instanceof JaasAuthenticationSuccessEvent) {
+			successEvent = (JaasAuthenticationSuccessEvent) event;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java
index c3e056033e..6e7a0ac5de 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/Sec760Tests.java
@@ -21,38 +21,46 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class Sec760Tests {
 
-    public String resolveConfigFile(String filename) {
-        String resName = "/" + getClass().getPackage().getName().replace('.', '/') + filename;
-        return resName;
-    }
+	public String resolveConfigFile(String filename) {
+		String resName = "/" + getClass().getPackage().getName().replace('.', '/')
+				+ filename;
+		return resName;
+	}
 
-    private void testConfigureJaasCase(JaasAuthenticationProvider p1, JaasAuthenticationProvider p2) throws Exception {
-        p1.setLoginConfig(new ClassPathResource(resolveConfigFile("/test1.conf")));
-        p1.setLoginContextName("test1");
-        p1.setCallbackHandlers(new JaasAuthenticationCallbackHandler[] {new TestCallbackHandler(), new JaasNameCallbackHandler(), new JaasPasswordCallbackHandler()});
-        p1.setAuthorityGranters(new AuthorityGranter[] {new TestAuthorityGranter()});
-        p1.afterPropertiesSet();
-        testAuthenticate(p1);
+	private void testConfigureJaasCase(JaasAuthenticationProvider p1,
+			JaasAuthenticationProvider p2) throws Exception {
+		p1.setLoginConfig(new ClassPathResource(resolveConfigFile("/test1.conf")));
+		p1.setLoginContextName("test1");
+		p1.setCallbackHandlers(new JaasAuthenticationCallbackHandler[] {
+				new TestCallbackHandler(), new JaasNameCallbackHandler(),
+				new JaasPasswordCallbackHandler() });
+		p1.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() });
+		p1.afterPropertiesSet();
+		testAuthenticate(p1);
 
-        p2.setLoginConfig(new ClassPathResource(resolveConfigFile("/test2.conf")));
-        p2.setLoginContextName("test2");
-        p2.setCallbackHandlers(new JaasAuthenticationCallbackHandler[] {new TestCallbackHandler(), new JaasNameCallbackHandler(), new JaasPasswordCallbackHandler()});
-        p2.setAuthorityGranters(new AuthorityGranter[] {new TestAuthorityGranter()});
-        p2.afterPropertiesSet();
-        testAuthenticate(p2);
-    }
+		p2.setLoginConfig(new ClassPathResource(resolveConfigFile("/test2.conf")));
+		p2.setLoginContextName("test2");
+		p2.setCallbackHandlers(new JaasAuthenticationCallbackHandler[] {
+				new TestCallbackHandler(), new JaasNameCallbackHandler(),
+				new JaasPasswordCallbackHandler() });
+		p2.setAuthorityGranters(new AuthorityGranter[] { new TestAuthorityGranter() });
+		p2.afterPropertiesSet();
+		testAuthenticate(p2);
+	}
 
-    private void testAuthenticate(JaasAuthenticationProvider p1) {
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("user", "password",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	private void testAuthenticate(JaasAuthenticationProvider p1) {
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				"user", "password", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
 
-        Authentication auth = p1.authenticate(token);
-        Assert.assertNotNull(auth);
-    }
+		Authentication auth = p1.authenticate(token);
+		Assert.assertNotNull(auth);
+	}
 
-    @Test
-    public void testConfigureJaas() throws Exception {
-        testConfigureJaasCase(new JaasAuthenticationProvider(), new JaasAuthenticationProvider());
-    }
+	@Test
+	public void testConfigureJaas() throws Exception {
+		testConfigureJaasCase(new JaasAuthenticationProvider(),
+				new JaasAuthenticationProvider());
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java
index b0cbfd8412..d43e72d9b3 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.authentication.jaas.SecurityContextLoginModule;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -30,85 +29,93 @@ import java.util.Map;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
-
 /**
  * Tests SecurityContextLoginModule
  *
  * @author Ray Krueger
  */
 public class SecurityContextLoginModuleTests extends TestCase {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private SecurityContextLoginModule module = null;
-    private Subject subject = new Subject(false, new HashSet<Principal>(), new HashSet<Object>(), new HashSet<Object>());
-    private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("principal",
-            "credentials");
+	private SecurityContextLoginModule module = null;
+	private Subject subject = new Subject(false, new HashSet<Principal>(),
+			new HashSet<Object>(), new HashSet<Object>());
+	private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+			"principal", "credentials");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    protected void setUp() throws Exception {
-        module = new SecurityContextLoginModule();
-        module.initialize(subject, null, null, null);
-        SecurityContextHolder.clearContext();
-    }
+	protected void setUp() throws Exception {
+		module = new SecurityContextLoginModule();
+		module.initialize(subject, null, null, null);
+		SecurityContextHolder.clearContext();
+	}
 
-    protected void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-        module = null;
-    }
+	protected void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+		module = null;
+	}
 
-    public void testAbort() throws Exception {
-        assertFalse("Should return false, no auth is set", module.abort());
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        module.login();
-        module.commit();
-        assertTrue(module.abort());
-    }
+	public void testAbort() throws Exception {
+		assertFalse("Should return false, no auth is set", module.abort());
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		module.login();
+		module.commit();
+		assertTrue(module.abort());
+	}
 
-    public void testLoginException() throws Exception {
-        try {
-            module.login();
-            fail("LoginException expected, there is no Authentication in the SecurityContext");
-        } catch (LoginException e) {}
-    }
+	public void testLoginException() throws Exception {
+		try {
+			module.login();
+			fail("LoginException expected, there is no Authentication in the SecurityContext");
+		}
+		catch (LoginException e) {
+		}
+	}
 
-    public void testLoginSuccess() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        assertTrue("Login should succeed, there is an authentication set", module.login());
-        assertTrue("The authentication is not null, this should return true", module.commit());
-        assertTrue("Principals should contain the authentication", subject.getPrincipals().contains(auth));
-    }
+	public void testLoginSuccess() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		assertTrue("Login should succeed, there is an authentication set", module.login());
+		assertTrue("The authentication is not null, this should return true",
+				module.commit());
+		assertTrue("Principals should contain the authentication", subject
+				.getPrincipals().contains(auth));
+	}
 
-    public void testLogout() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        module.login();
-        assertTrue("Should return true as it succeeds", module.logout());
-        assertEquals("Authentication should be null", null, module.getAuthentication());
+	public void testLogout() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		module.login();
+		assertTrue("Should return true as it succeeds", module.logout());
+		assertEquals("Authentication should be null", null, module.getAuthentication());
 
-        assertFalse("Principals should not contain the authentication after logout",
-            subject.getPrincipals().contains(auth));
-    }
+		assertFalse("Principals should not contain the authentication after logout",
+				subject.getPrincipals().contains(auth));
+	}
 
-    public void testNullAuthenticationInSecurityContext() throws Exception {
-        try {
-            SecurityContextHolder.getContext().setAuthentication(null);
-            module.login();
-            fail("LoginException expected, the authentication is null in the SecurityContext");
-        } catch (Exception e) {}
-    }
+	public void testNullAuthenticationInSecurityContext() throws Exception {
+		try {
+			SecurityContextHolder.getContext().setAuthentication(null);
+			module.login();
+			fail("LoginException expected, the authentication is null in the SecurityContext");
+		}
+		catch (Exception e) {
+		}
+	}
 
-    public void testNullAuthenticationInSecurityContextIgnored() throws Exception {
-        module = new SecurityContextLoginModule();
+	public void testNullAuthenticationInSecurityContextIgnored() throws Exception {
+		module = new SecurityContextLoginModule();
 
-        Map<String, String> options = new HashMap<String, String>();
-        options.put("ignoreMissingAuthentication", "true");
+		Map<String, String> options = new HashMap<String, String>();
+		options.put("ignoreMissingAuthentication", "true");
 
-        module.initialize(subject, null, null, options);
-        SecurityContextHolder.getContext().setAuthentication(null);
-        assertFalse("Should return false and ask to be ignored", module.login());
-    }
+		module.initialize(subject, null, null, options);
+		SecurityContextHolder.getContext().setAuthentication(null);
+		assertFalse("Should return false and ask to be ignored", module.login());
+	}
 
-    public void testNullLogout() throws Exception {
-        assertFalse(module.logout());
-    }
+	public void testNullLogout() throws Exception {
+		assertFalse(module.logout());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java
index 8405a3b201..1ae3e18a2a 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java
@@ -22,22 +22,22 @@ import java.util.Set;
 
 import org.springframework.security.authentication.jaas.AuthorityGranter;
 
-
 /**
  *
  * @author Ray Krueger
  */
 public class TestAuthorityGranter implements AuthorityGranter {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Set<String> grant(Principal principal) {
-        Set<String> rtnSet = new HashSet<String>();
+	public Set<String> grant(Principal principal) {
+		Set<String> rtnSet = new HashSet<String>();
 
-        if (principal.getName().equals("TEST_PRINCIPAL")) {
-            rtnSet.add("ROLE_TEST1");
-            rtnSet.add("ROLE_TEST2");
-        }
+		if (principal.getName().equals("TEST_PRINCIPAL")) {
+			rtnSet.add("ROLE_TEST1");
+			rtnSet.add("ROLE_TEST2");
+		}
 
-        return rtnSet;
-    }
+		return rtnSet;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java
index 90e0de9de9..23e5a774d2 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestCallbackHandler.java
@@ -24,20 +24,20 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.TextInputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-
 /**
  * TestCallbackHandler
  *
  * @author Ray Krueger
  */
 public class TestCallbackHandler implements JaasAuthenticationCallbackHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void handle(Callback callback, Authentication auth)
-        throws IOException, UnsupportedCallbackException {
-        if (callback instanceof TextInputCallback) {
-            TextInputCallback tic = (TextInputCallback) callback;
-            tic.setText(auth.getPrincipal().toString());
-        }
-    }
+	public void handle(Callback callback, Authentication auth) throws IOException,
+			UnsupportedCallbackException {
+		if (callback instanceof TextInputCallback) {
+			TextInputCallback tic = (TextInputCallback) callback;
+			tic.setText(auth.getPrincipal().toString());
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java
index e19565b999..00e9b21a8d 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestLoginModule.java
@@ -24,70 +24,74 @@ import javax.security.auth.callback.*;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-
 /**
  * @author Ray Krueger
  */
 public class TestLoginModule implements LoginModule {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String password;
-    private String user;
-    private Subject subject;
+	private String password;
+	private String user;
+	private Subject subject;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean abort() throws LoginException {
-        return true;
-    }
+	public boolean abort() throws LoginException {
+		return true;
+	}
 
-    public boolean commit() throws LoginException {
-        return true;
-    }
+	public boolean commit() throws LoginException {
+		return true;
+	}
 
-    @SuppressWarnings("unchecked")
-    public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
-        this.subject = subject;
+	@SuppressWarnings("unchecked")
+	public void initialize(Subject subject, CallbackHandler callbackHandler,
+			Map sharedState, Map options) {
+		this.subject = subject;
 
-        try {
-            TextInputCallback textCallback = new TextInputCallback("prompt");
-            NameCallback nameCallback = new NameCallback("prompt");
-            PasswordCallback passwordCallback = new PasswordCallback("prompt", false);
+		try {
+			TextInputCallback textCallback = new TextInputCallback("prompt");
+			NameCallback nameCallback = new NameCallback("prompt");
+			PasswordCallback passwordCallback = new PasswordCallback("prompt", false);
 
-            callbackHandler.handle(new Callback[] {textCallback, nameCallback, passwordCallback});
+			callbackHandler.handle(new Callback[] { textCallback, nameCallback,
+					passwordCallback });
 
-            password = new String(passwordCallback.getPassword());
-            user = nameCallback.getName();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
+			password = new String(passwordCallback.getPassword());
+			user = nameCallback.getName();
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
 
-    public boolean login() throws LoginException {
-        if (!user.equals("user")) {
-            throw new LoginException("Bad User");
-        }
+	public boolean login() throws LoginException {
+		if (!user.equals("user")) {
+			throw new LoginException("Bad User");
+		}
 
-        if (!password.equals("password")) {
-            throw new LoginException("Bad Password");
-        }
+		if (!password.equals("password")) {
+			throw new LoginException("Bad Password");
+		}
 
-        subject.getPrincipals().add(new Principal() {
-                public String getName() {
-                    return "TEST_PRINCIPAL";
-                }
-            });
+		subject.getPrincipals().add(new Principal() {
+			public String getName() {
+				return "TEST_PRINCIPAL";
+			}
+		});
 
-        subject.getPrincipals().add(new Principal() {
-                public String getName() {
-                    return "NULL_PRINCIPAL";
-                }
-            });
+		subject.getPrincipals().add(new Principal() {
+			public String getName() {
+				return "NULL_PRINCIPAL";
+			}
+		});
 
-        return true;
-    }
+		return true;
+	}
 
-    public boolean logout() throws LoginException {
-        return true;
-    }
+	public boolean logout() throws LoginException {
+		return true;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java
index 74abd4472f..3515932773 100644
--- a/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/jaas/memory/InMemoryConfigurationTests.java
@@ -37,62 +37,70 @@ import org.springframework.security.authentication.jaas.TestLoginModule;
  */
 public class InMemoryConfigurationTests {
 
-    private AppConfigurationEntry[] defaultEntries;
-    private Map<String, AppConfigurationEntry[]> mappedEntries;
+	private AppConfigurationEntry[] defaultEntries;
+	private Map<String, AppConfigurationEntry[]> mappedEntries;
 
-    @Before
-    public void setUp() {
-        defaultEntries = new AppConfigurationEntry[] { new AppConfigurationEntry(TestLoginModule.class.getName(),
-                LoginModuleControlFlag.REQUIRED, Collections.<String, Object> emptyMap()) };
+	@Before
+	public void setUp() {
+		defaultEntries = new AppConfigurationEntry[] { new AppConfigurationEntry(
+				TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED,
+				Collections.<String, Object> emptyMap()) };
 
-        mappedEntries = Collections.<String, AppConfigurationEntry[]> singletonMap("name",
-                new AppConfigurationEntry[] { new AppConfigurationEntry(TestLoginModule.class.getName(),
-                        LoginModuleControlFlag.OPTIONAL, Collections.<String, Object> emptyMap()) });
-    }
+		mappedEntries = Collections.<String, AppConfigurationEntry[]> singletonMap(
+				"name", new AppConfigurationEntry[] { new AppConfigurationEntry(
+						TestLoginModule.class.getName(), LoginModuleControlFlag.OPTIONAL,
+						Collections.<String, Object> emptyMap()) });
+	}
 
-    @Test
-    public void constructorNullDefault() {
-        assertNull(new InMemoryConfiguration((AppConfigurationEntry[]) null).getAppConfigurationEntry("name"));
-    }
+	@Test
+	public void constructorNullDefault() {
+		assertNull(new InMemoryConfiguration((AppConfigurationEntry[]) null)
+				.getAppConfigurationEntry("name"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullMapped() {
-        new InMemoryConfiguration((Map<String, AppConfigurationEntry[]>) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullMapped() {
+		new InMemoryConfiguration((Map<String, AppConfigurationEntry[]>) null);
+	}
 
-    @Test
-    public void constructorEmptyMap() {
-        assertNull(new InMemoryConfiguration(Collections.<String, AppConfigurationEntry[]> emptyMap())
-        .getAppConfigurationEntry("name"));
-    }
+	@Test
+	public void constructorEmptyMap() {
+		assertNull(new InMemoryConfiguration(
+				Collections.<String, AppConfigurationEntry[]> emptyMap())
+				.getAppConfigurationEntry("name"));
+	}
 
-    @Test
-    public void constructorEmptyMapNullDefault() {
-        assertNull(new InMemoryConfiguration(Collections.<String, AppConfigurationEntry[]> emptyMap(), null)
-        .getAppConfigurationEntry("name"));
-    }
+	@Test
+	public void constructorEmptyMapNullDefault() {
+		assertNull(new InMemoryConfiguration(
+				Collections.<String, AppConfigurationEntry[]> emptyMap(), null)
+				.getAppConfigurationEntry("name"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullMapNullDefault() {
-        new InMemoryConfiguration(null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullMapNullDefault() {
+		new InMemoryConfiguration(null, null);
+	}
 
-    @Test
-    public void nonnullDefault() {
-        InMemoryConfiguration configuration = new InMemoryConfiguration(defaultEntries);
-        assertArrayEquals(defaultEntries, configuration.getAppConfigurationEntry("name"));
-    }
+	@Test
+	public void nonnullDefault() {
+		InMemoryConfiguration configuration = new InMemoryConfiguration(defaultEntries);
+		assertArrayEquals(defaultEntries, configuration.getAppConfigurationEntry("name"));
+	}
 
-    @Test
-    public void mappedNonnullDefault() {
-        InMemoryConfiguration configuration = new InMemoryConfiguration(mappedEntries, defaultEntries);
-        assertArrayEquals(defaultEntries, configuration.getAppConfigurationEntry("missing"));
-        assertArrayEquals(mappedEntries.get("name"), configuration.getAppConfigurationEntry("name"));
-    }
+	@Test
+	public void mappedNonnullDefault() {
+		InMemoryConfiguration configuration = new InMemoryConfiguration(mappedEntries,
+				defaultEntries);
+		assertArrayEquals(defaultEntries,
+				configuration.getAppConfigurationEntry("missing"));
+		assertArrayEquals(mappedEntries.get("name"),
+				configuration.getAppConfigurationEntry("name"));
+	}
 
-    @Test
-    public void jdk5Compatable() throws Exception {
-        Method method = InMemoryConfiguration.class.getDeclaredMethod("refresh");
-        assertEquals(InMemoryConfiguration.class, method.getDeclaringClass());
-    }
+	@Test
+	public void jdk5Compatable() throws Exception {
+		Method method = InMemoryConfiguration.class.getDeclaredMethod("refresh");
+		assertEquals(InMemoryConfiguration.class, method.getDeclaringClass());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java
index 5da7784d2e..3f1f4ed63f 100644
--- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationManagerImplTests.java
@@ -25,47 +25,50 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Tests {@link RemoteAuthenticationManagerImpl}.
  *
  * @author Ben Alex
  */
 public class RemoteAuthenticationManagerImplTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=RemoteAuthenticationException.class)
-    public void testFailedAuthenticationReturnsRemoteAuthenticationException() {
-        RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
-        manager.setAuthenticationManager(am);
+	@Test(expected = RemoteAuthenticationException.class)
+	public void testFailedAuthenticationReturnsRemoteAuthenticationException() {
+		RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
+		manager.setAuthenticationManager(am);
 
-        manager.attemptAuthentication("rod", "password");
-    }
+		manager.attemptAuthentication("rod", "password");
+	}
 
-    @Test
-    public void testStartupChecksAuthenticationManagerSet() throws Exception {
-        RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
+	@Test
+	public void testStartupChecksAuthenticationManagerSet() throws Exception {
+		RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
 
-        try {
-            manager.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			manager.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        manager.setAuthenticationManager(mock(AuthenticationManager.class));
-        manager.afterPropertiesSet();
-        assertTrue(true);
-    }
+		manager.setAuthenticationManager(mock(AuthenticationManager.class));
+		manager.afterPropertiesSet();
+		assertTrue(true);
+	}
 
-    @Test
-    public void testSuccessfulAuthentication() {
-        RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenReturn(new TestingAuthenticationToken("u","p","A"));
-        manager.setAuthenticationManager(am);
+	@Test
+	public void testSuccessfulAuthentication() {
+		RemoteAuthenticationManagerImpl manager = new RemoteAuthenticationManagerImpl();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenReturn(
+				new TestingAuthenticationToken("u", "p", "A"));
+		manager.setAuthenticationManager(am);
 
-        manager.attemptAuthentication("rod", "password");
-    }
+		manager.attemptAuthentication("rod", "password");
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java
index 6946c43ff8..da6ddcfc26 100644
--- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java
@@ -25,91 +25,99 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link RemoteAuthenticationProvider}.
  *
  * @author Ben Alex
  */
 public class RemoteAuthenticationProviderTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testExceptionsGetPassedBackToCaller() {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
-        provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(false));
+	public void testExceptionsGetPassedBackToCaller() {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+		provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(false));
 
-        try {
-            provider.authenticate(new UsernamePasswordAuthenticationToken("rod", "password"));
-            fail("Should have thrown RemoteAuthenticationException");
-        } catch (RemoteAuthenticationException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			provider.authenticate(new UsernamePasswordAuthenticationToken("rod",
+					"password"));
+			fail("Should have thrown RemoteAuthenticationException");
+		}
+		catch (RemoteAuthenticationException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGettersSetters() {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
-        provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
-        assertNotNull(provider.getRemoteAuthenticationManager());
-    }
+	public void testGettersSetters() {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+		provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
+		assertNotNull(provider.getRemoteAuthenticationManager());
+	}
 
-    public void testStartupChecksAuthenticationManagerSet()
-        throws Exception {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+	public void testStartupChecksAuthenticationManagerSet() throws Exception {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
 
-        try {
-            provider.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			provider.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
-        provider.afterPropertiesSet();
-        assertTrue(true);
-    }
+		provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
+		provider.afterPropertiesSet();
+		assertTrue(true);
+	}
 
-    public void testSuccessfulAuthenticationCreatesObject() {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
-        provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
+	public void testSuccessfulAuthenticationCreatesObject() {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+		provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(true));
 
-        Authentication result = provider.authenticate(new UsernamePasswordAuthenticationToken("rod", "password"));
-        assertEquals("rod", result.getPrincipal());
-        assertEquals("password", result.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains("foo"));
-    }
+		Authentication result = provider
+				.authenticate(new UsernamePasswordAuthenticationToken("rod", "password"));
+		assertEquals("rod", result.getPrincipal());
+		assertEquals("password", result.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains(
+				"foo"));
+	}
 
-    public void testNullCredentialsDoesNotCauseNullPointerException() {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
-        provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(false));
+	public void testNullCredentialsDoesNotCauseNullPointerException() {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+		provider.setRemoteAuthenticationManager(new MockRemoteAuthenticationManager(false));
 
-        try {
-            provider.authenticate(new UsernamePasswordAuthenticationToken("rod", null));
-            fail("Expected Exception");
-        } catch(RemoteAuthenticationException success) {}
+		try {
+			provider.authenticate(new UsernamePasswordAuthenticationToken("rod", null));
+			fail("Expected Exception");
+		}
+		catch (RemoteAuthenticationException success) {
+		}
 
-    }
+	}
 
-    public void testSupports() {
-        RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
-        assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class));
-    }
+	public void testSupports() {
+		RemoteAuthenticationProvider provider = new RemoteAuthenticationProvider();
+		assertTrue(provider.supports(UsernamePasswordAuthenticationToken.class));
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockRemoteAuthenticationManager implements RemoteAuthenticationManager {
-        private boolean grantAccess;
+	private class MockRemoteAuthenticationManager implements RemoteAuthenticationManager {
+		private boolean grantAccess;
 
-        public MockRemoteAuthenticationManager(boolean grantAccess) {
-            this.grantAccess = grantAccess;
-        }
+		public MockRemoteAuthenticationManager(boolean grantAccess) {
+			this.grantAccess = grantAccess;
+		}
 
-        public Collection<? extends GrantedAuthority> attemptAuthentication(String username, String password)
-            throws RemoteAuthenticationException {
-            if (grantAccess) {
-                return AuthorityUtils.createAuthorityList("foo");
-            } else {
-                throw new RemoteAuthenticationException("as requested");
-            }
-        }
-    }
+		public Collection<? extends GrantedAuthority> attemptAuthentication(
+				String username, String password) throws RemoteAuthenticationException {
+			if (grantAccess) {
+				return AuthorityUtils.createAuthorityList("foo");
+			}
+			else {
+				throw new RemoteAuthenticationException("as requested");
+			}
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java
index 4420f39f7f..ac20e3c75d 100644
--- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationProviderTests.java
@@ -24,67 +24,76 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 
-
 /**
  * Tests {@link RememberMeAuthenticationProvider}.
  *
  * @author Ben Alex
  */
 public class RememberMeAuthenticationProviderTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDetectsAnInvalidKey() throws Exception {
-        RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty");
+	public void testDetectsAnInvalidKey() throws Exception {
+		RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider(
+				"qwerty");
 
-        RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("WRONG_KEY", "Test",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+		RememberMeAuthenticationToken token = new RememberMeAuthenticationToken(
+				"WRONG_KEY", "Test", AuthorityUtils.createAuthorityList("ROLE_ONE",
+						"ROLE_TWO"));
 
-        try {
-            aap.authenticate(token);
-            fail("Should have thrown BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-        }
-    }
+		try {
+			aap.authenticate(token);
+			fail("Should have thrown BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-    public void testDetectsMissingKey() throws Exception {
-        try {
-            new RememberMeAuthenticationProvider(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testDetectsMissingKey() throws Exception {
+		try {
+			new RememberMeAuthenticationProvider(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGettersSetters() throws Exception {
-        RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty");
-        aap.afterPropertiesSet();
-        assertEquals("qwerty", aap.getKey());
-    }
+	public void testGettersSetters() throws Exception {
+		RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider(
+				"qwerty");
+		aap.afterPropertiesSet();
+		assertEquals("qwerty", aap.getKey());
+	}
 
-    public void testIgnoresClassesItDoesNotSupport() throws Exception {
-        RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty");
+	public void testIgnoresClassesItDoesNotSupport() throws Exception {
+		RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider(
+				"qwerty");
 
-        TestingAuthenticationToken token = new TestingAuthenticationToken("user", "password","ROLE_A");
-        assertFalse(aap.supports(TestingAuthenticationToken.class));
+		TestingAuthenticationToken token = new TestingAuthenticationToken("user",
+				"password", "ROLE_A");
+		assertFalse(aap.supports(TestingAuthenticationToken.class));
 
-        // Try it anyway
-        assertNull(aap.authenticate(token));
-    }
+		// Try it anyway
+		assertNull(aap.authenticate(token));
+	}
 
-    public void testNormalOperation() throws Exception {
-        RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty");
+	public void testNormalOperation() throws Exception {
+		RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider(
+				"qwerty");
 
-        RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("qwerty", "Test",
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+		RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("qwerty",
+				"Test", AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
 
-        Authentication result = aap.authenticate(token);
+		Authentication result = aap.authenticate(token);
 
-        assertEquals(result, token);
-    }
+		assertEquals(result, token);
+	}
 
-    public void testSupports() {
-        RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider("qwerty");
-        assertTrue(aap.supports(RememberMeAuthenticationToken.class));
-        assertFalse(aap.supports(TestingAuthenticationToken.class));
-    }
+	public void testSupports() {
+		RememberMeAuthenticationProvider aap = new RememberMeAuthenticationProvider(
+				"qwerty");
+		assertTrue(aap.supports(RememberMeAuthenticationToken.class));
+		assertFalse(aap.supports(TestingAuthenticationToken.class));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java
index ca7a36e54b..4ca5021149 100644
--- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java
@@ -31,79 +31,95 @@ import org.springframework.security.core.authority.AuthorityUtils;
  * @author Ben Alex
  */
 public class RememberMeAuthenticationTokenTests extends TestCase {
-    private static final List<GrantedAuthority> ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
+	private static final List<GrantedAuthority> ROLES_12 = AuthorityUtils
+			.createAuthorityList("ROLE_ONE", "ROLE_TWO");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testConstructorRejectsNulls() {
-        try {
-            new RememberMeAuthenticationToken(null, "Test", ROLES_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+	public void testConstructorRejectsNulls() {
+		try {
+			new RememberMeAuthenticationToken(null, "Test", ROLES_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            new RememberMeAuthenticationToken("key", null, ROLES_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			new RememberMeAuthenticationToken("key", null, ROLES_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            List<GrantedAuthority> authsContainingNull = new ArrayList<GrantedAuthority>();
-            authsContainingNull.add(null);
-            new RememberMeAuthenticationToken("key", "Test", authsContainingNull);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			List<GrantedAuthority> authsContainingNull = new ArrayList<GrantedAuthority>();
+			authsContainingNull.add(null);
+			new RememberMeAuthenticationToken("key", "Test", authsContainingNull);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testEqualsWhenEqual() {
-        RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key", "Test", ROLES_12);
-        RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key", "Test", ROLES_12);
+	public void testEqualsWhenEqual() {
+		RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
+		RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
 
-        assertEquals(token1, token2);
-    }
+		assertEquals(token1, token2);
+	}
 
-    public void testGetters() {
-        RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key", "Test",
-                ROLES_12);
+	public void testGetters() {
+		RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
 
-        assertEquals("key".hashCode(), token.getKeyHash());
-        assertEquals("Test", token.getPrincipal());
-        assertEquals("", token.getCredentials());
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains("ROLE_TWO"));
-        assertTrue(token.isAuthenticated());
-    }
+		assertEquals("key".hashCode(), token.getKeyHash());
+		assertEquals("Test", token.getPrincipal());
+		assertEquals("", token.getCredentials());
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(token.getAuthorities()).contains(
+				"ROLE_TWO"));
+		assertTrue(token.isAuthenticated());
+	}
 
-    public void testNotEqualsDueToAbstractParentEqualsCheck() {
-        RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key", "Test",ROLES_12);
-        RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key", "DIFFERENT_PRINCIPAL",ROLES_12);
+	public void testNotEqualsDueToAbstractParentEqualsCheck() {
+		RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
+		RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("key",
+				"DIFFERENT_PRINCIPAL", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToDifferentAuthenticationClass() {
-        RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key", "Test", ROLES_12);
-        UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken("Test", "Password",ROLES_12);
+	public void testNotEqualsDueToDifferentAuthenticationClass() {
+		RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
+		UsernamePasswordAuthenticationToken token2 = new UsernamePasswordAuthenticationToken(
+				"Test", "Password", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testNotEqualsDueToKey() {
-        RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key", "Test", ROLES_12);
-        RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken("DIFFERENT_KEY", "Test", ROLES_12);
+	public void testNotEqualsDueToKey() {
+		RememberMeAuthenticationToken token1 = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
+		RememberMeAuthenticationToken token2 = new RememberMeAuthenticationToken(
+				"DIFFERENT_KEY", "Test", ROLES_12);
 
-        assertFalse(token1.equals(token2));
-    }
+		assertFalse(token1.equals(token2));
+	}
 
-    public void testSetAuthenticatedIgnored() {
-        RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key", "Test", ROLES_12);
-        assertTrue(token.isAuthenticated());
-        token.setAuthenticated(false);
-        assertTrue(!token.isAuthenticated());
-    }
+	public void testSetAuthenticatedIgnored() {
+		RememberMeAuthenticationToken token = new RememberMeAuthenticationToken("key",
+				"Test", ROLES_12);
+		assertTrue(token.isAuthenticated());
+		token.setAuthenticated(false);
+		assertTrue(!token.isAuthenticated());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java
index f9d455b6ef..554449a965 100644
--- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorServiceTests.java
@@ -26,136 +26,143 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 
-
 /**
- * Abstract class for testing {@link DelegatingSecurityContextExecutorService} which allows customization of
- * how {@link DelegatingSecurityContextExecutorService} and its mocks are created.
+ * Abstract class for testing {@link DelegatingSecurityContextExecutorService} which
+ * allows customization of how {@link DelegatingSecurityContextExecutorService} and its
+ * mocks are created.
  *
  * @author Rob Winch
  * @since 3.2
  * @see CurrentDelegatingSecurityContextExecutorServiceTests
  * @see ExplicitDelegatingSecurityContextExecutorServiceTests
  */
-public abstract class AbstractDelegatingSecurityContextExecutorServiceTests extends AbstractDelegatingSecurityContextExecutorTests {
-    @Mock
-    private Future<Object> expectedFutureObject;
-    @Mock
-    private Object resultArg;
+public abstract class AbstractDelegatingSecurityContextExecutorServiceTests extends
+		AbstractDelegatingSecurityContextExecutorTests {
+	@Mock
+	private Future<Object> expectedFutureObject;
+	@Mock
+	private Object resultArg;
 
-    protected DelegatingSecurityContextExecutorService executor;
+	protected DelegatingSecurityContextExecutorService executor;
 
-    @Before
-    public final void setUpExecutorService() {
-        executor = create();
-    }
+	@Before
+	public final void setUpExecutorService() {
+		executor = create();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegate() {
-        new DelegatingSecurityContextExecutorService(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegate() {
+		new DelegatingSecurityContextExecutorService(null);
+	}
 
-    @Test
-    public void shutdown() {
-        executor.shutdown();
-        verify(delegate).shutdown();
-    }
+	@Test
+	public void shutdown() {
+		executor.shutdown();
+		verify(delegate).shutdown();
+	}
 
-    @Test
-    public void shutdownNow() {
-        List<Runnable> result = executor.shutdownNow();
-        verify(delegate).shutdownNow();
-        assertThat(result).isEqualTo(delegate.shutdownNow()).isNotNull();
-    }
+	@Test
+	public void shutdownNow() {
+		List<Runnable> result = executor.shutdownNow();
+		verify(delegate).shutdownNow();
+		assertThat(result).isEqualTo(delegate.shutdownNow()).isNotNull();
+	}
 
-    @Test
-    public void isShutdown() {
-        boolean result = executor.isShutdown();
-        verify(delegate).isShutdown();
-        assertThat(result).isEqualTo(delegate.isShutdown()).isNotNull();
-    }
+	@Test
+	public void isShutdown() {
+		boolean result = executor.isShutdown();
+		verify(delegate).isShutdown();
+		assertThat(result).isEqualTo(delegate.isShutdown()).isNotNull();
+	}
 
-    @Test
-    public void isTerminated() {
-        boolean result = executor.isTerminated();
-        verify(delegate).isTerminated();
-        assertThat(result).isEqualTo(delegate.isTerminated()).isNotNull();
-    }
+	@Test
+	public void isTerminated() {
+		boolean result = executor.isTerminated();
+		verify(delegate).isTerminated();
+		assertThat(result).isEqualTo(delegate.isTerminated()).isNotNull();
+	}
 
-    @Test
-    public void awaitTermination() throws InterruptedException {
-        boolean result = executor.awaitTermination(1, TimeUnit.SECONDS);
-        verify(delegate).awaitTermination(1, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(delegate.awaitTermination(1, TimeUnit.SECONDS)).isNotNull();
-    }
+	@Test
+	public void awaitTermination() throws InterruptedException {
+		boolean result = executor.awaitTermination(1, TimeUnit.SECONDS);
+		verify(delegate).awaitTermination(1, TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(delegate.awaitTermination(1, TimeUnit.SECONDS))
+				.isNotNull();
+	}
 
-    @Test
-    public void submitCallable() throws Exception {
-        when(delegate.submit(wrappedCallable)).thenReturn(expectedFutureObject);
-        Future<Object> result = executor.submit(callable);
-        verify(delegate).submit(wrappedCallable);
-        assertThat(result).isEqualTo(expectedFutureObject);
-    }
+	@Test
+	public void submitCallable() throws Exception {
+		when(delegate.submit(wrappedCallable)).thenReturn(expectedFutureObject);
+		Future<Object> result = executor.submit(callable);
+		verify(delegate).submit(wrappedCallable);
+		assertThat(result).isEqualTo(expectedFutureObject);
+	}
 
-    @Test
-    public void submitRunnableWithResult() throws Exception {
-        when(delegate.submit(wrappedRunnable, resultArg)).thenReturn(expectedFutureObject);
-        Future<Object> result = executor.submit(runnable, resultArg);
-        verify(delegate).submit(wrappedRunnable, resultArg);
-        assertThat(result).isEqualTo(expectedFutureObject);
-    }
+	@Test
+	public void submitRunnableWithResult() throws Exception {
+		when(delegate.submit(wrappedRunnable, resultArg))
+				.thenReturn(expectedFutureObject);
+		Future<Object> result = executor.submit(runnable, resultArg);
+		verify(delegate).submit(wrappedRunnable, resultArg);
+		assertThat(result).isEqualTo(expectedFutureObject);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void submitRunnable() throws Exception {
-        when((Future<Object>)delegate.submit(wrappedRunnable)).thenReturn(expectedFutureObject);
-        Future<?> result = executor.submit(runnable);
-        verify(delegate).submit(wrappedRunnable);
-        assertThat(result).isEqualTo(expectedFutureObject);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void submitRunnable() throws Exception {
+		when((Future<Object>) delegate.submit(wrappedRunnable)).thenReturn(
+				expectedFutureObject);
+		Future<?> result = executor.submit(runnable);
+		verify(delegate).submit(wrappedRunnable);
+		assertThat(result).isEqualTo(expectedFutureObject);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeAll() throws Exception {
-        List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
-        List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
-        when(delegate.invokeAll(wrappedCallables)).thenReturn(exectedResult);
-        List<Future<Object>> result = executor.invokeAll(Arrays.asList(callable));
-        verify(delegate).invokeAll(wrappedCallables);
-        assertThat(result).isEqualTo(exectedResult);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeAll() throws Exception {
+		List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
+		List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
+		when(delegate.invokeAll(wrappedCallables)).thenReturn(exectedResult);
+		List<Future<Object>> result = executor.invokeAll(Arrays.asList(callable));
+		verify(delegate).invokeAll(wrappedCallables);
+		assertThat(result).isEqualTo(exectedResult);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeAllTimeout() throws Exception {
-        List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
-        List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
-        when(delegate.invokeAll(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult);
-        List<Future<Object>> result = executor.invokeAll(Arrays.asList(callable), 1, TimeUnit.SECONDS);
-        verify(delegate).invokeAll(wrappedCallables, 1, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(exectedResult);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeAllTimeout() throws Exception {
+		List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
+		List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
+		when(delegate.invokeAll(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(
+				exectedResult);
+		List<Future<Object>> result = executor.invokeAll(Arrays.asList(callable), 1,
+				TimeUnit.SECONDS);
+		verify(delegate).invokeAll(wrappedCallables, 1, TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(exectedResult);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeAny() throws Exception {
-        List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
-        List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
-        when(delegate.invokeAny(wrappedCallables)).thenReturn(exectedResult);
-        Object result = executor.invokeAny(Arrays.asList(callable));
-        verify(delegate).invokeAny(wrappedCallables);
-        assertThat(result).isEqualTo(exectedResult);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeAny() throws Exception {
+		List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
+		List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
+		when(delegate.invokeAny(wrappedCallables)).thenReturn(exectedResult);
+		Object result = executor.invokeAny(Arrays.asList(callable));
+		verify(delegate).invokeAny(wrappedCallables);
+		assertThat(result).isEqualTo(exectedResult);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void invokeAnyTimeout() throws Exception {
-        List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
-        List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
-        when(delegate.invokeAny(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(exectedResult);
-        Object result = executor.invokeAny(Arrays.asList(callable), 1, TimeUnit.SECONDS);
-        verify(delegate).invokeAny(wrappedCallables, 1, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(exectedResult);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void invokeAnyTimeout() throws Exception {
+		List<Future<Object>> exectedResult = Arrays.asList(expectedFutureObject);
+		List<Callable<Object>> wrappedCallables = Arrays.asList(wrappedCallable);
+		when(delegate.invokeAny(wrappedCallables, 1, TimeUnit.SECONDS)).thenReturn(
+				exectedResult);
+		Object result = executor.invokeAny(Arrays.asList(callable), 1, TimeUnit.SECONDS);
+		verify(delegate).invokeAny(wrappedCallables, 1, TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(exectedResult);
+	}
 
-    protected abstract DelegatingSecurityContextExecutorService create();
+	protected abstract DelegatingSecurityContextExecutorService create();
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java
index 14209baa7b..969555bb6c 100644
--- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextExecutorTests.java
@@ -21,39 +21,41 @@ import org.junit.Test;
 import org.mockito.Mock;
 
 /**
- * Abstract class for testing {@link DelegatingSecurityContextExecutor} which allows customization of
- * how {@link DelegatingSecurityContextExecutor} and its mocks are created.
+ * Abstract class for testing {@link DelegatingSecurityContextExecutor} which allows
+ * customization of how {@link DelegatingSecurityContextExecutor} and its mocks are
+ * created.
  *
  * @author Rob Winch
  * @since 3.2
  * @see CurrentDelegatingSecurityContextExecutorTests
  * @see ExplicitDelegatingSecurityContextExecutorTests
  */
-public abstract class AbstractDelegatingSecurityContextExecutorTests extends AbstractDelegatingSecurityContextTestSupport {
-    @Mock
-    protected ScheduledExecutorService delegate;
+public abstract class AbstractDelegatingSecurityContextExecutorTests extends
+		AbstractDelegatingSecurityContextTestSupport {
+	@Mock
+	protected ScheduledExecutorService delegate;
 
-    private DelegatingSecurityContextExecutor executor;
+	private DelegatingSecurityContextExecutor executor;
 
-    // --- constructor ---
+	// --- constructor ---
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegate() {
-        new DelegatingSecurityContextExecutor(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegate() {
+		new DelegatingSecurityContextExecutor(null);
+	}
 
-    // --- execute ---
+	// --- execute ---
 
-    @Test
-    public void execute() {
-        executor = create();
-        executor.execute(runnable);
-        verify(getExecutor()).execute(wrappedRunnable);
-    }
+	@Test
+	public void execute() {
+		executor = create();
+		executor.execute(runnable);
+		verify(getExecutor()).execute(wrappedRunnable);
+	}
 
-    protected Executor getExecutor() {
-        return delegate;
-    }
+	protected Executor getExecutor() {
+		return delegate;
+	}
 
-    protected abstract DelegatingSecurityContextExecutor create();
+	protected abstract DelegatingSecurityContextExecutor create();
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java
index 9088a50753..20e9471bc3 100644
--- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextScheduledExecutorServiceTests.java
@@ -24,61 +24,73 @@ import org.junit.Test;
 import org.mockito.Mock;
 
 /**
- * Abstract class for testing {@link DelegatingSecurityContextScheduledExecutorService} which allows customization of
- * how {@link DelegatingSecurityContextScheduledExecutorService} and its mocks are created.
+ * Abstract class for testing {@link DelegatingSecurityContextScheduledExecutorService}
+ * which allows customization of how
+ * {@link DelegatingSecurityContextScheduledExecutorService} and its mocks are created.
  *
  * @author Rob Winch
  * @since 3.2
  * @see CurrentDelegatingSecurityContextScheduledExecutorServiceTests
  * @see ExplicitDelegatingSecurityContextScheduledExecutorServiceTests
  */
-public abstract class AbstractDelegatingSecurityContextScheduledExecutorServiceTests extends
-        AbstractDelegatingSecurityContextExecutorServiceTests {
-    @Mock
-    private ScheduledFuture<Object> expectedResult;
+public abstract class AbstractDelegatingSecurityContextScheduledExecutorServiceTests
+		extends AbstractDelegatingSecurityContextExecutorServiceTests {
+	@Mock
+	private ScheduledFuture<Object> expectedResult;
 
-    private DelegatingSecurityContextScheduledExecutorService executor;
+	private DelegatingSecurityContextScheduledExecutorService executor;
 
-    @Before
-    public final void setUpExecutor() {
-        executor = create();
-    }
+	@Before
+	public final void setUpExecutor() {
+		executor = create();
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void scheduleRunnable() {
-        when((ScheduledFuture<Object>)delegate.schedule(wrappedRunnable, 1, TimeUnit.SECONDS)).thenReturn(expectedResult);
-        ScheduledFuture<?> result = executor.schedule(runnable, 1, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(expectedResult);
-        verify(delegate).schedule(wrappedRunnable, 1, TimeUnit.SECONDS);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void scheduleRunnable() {
+		when(
+				(ScheduledFuture<Object>) delegate.schedule(wrappedRunnable, 1,
+						TimeUnit.SECONDS)).thenReturn(expectedResult);
+		ScheduledFuture<?> result = executor.schedule(runnable, 1, TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(expectedResult);
+		verify(delegate).schedule(wrappedRunnable, 1, TimeUnit.SECONDS);
+	}
 
-    @Test
-    public void scheduleCallable() {
-        when((ScheduledFuture<Object>)delegate.schedule(wrappedCallable, 1, TimeUnit.SECONDS)).thenReturn(expectedResult);
-        ScheduledFuture<Object> result = executor.schedule(callable, 1, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(expectedResult);
-        verify(delegate).schedule(wrappedCallable, 1, TimeUnit.SECONDS);
-    }
+	@Test
+	public void scheduleCallable() {
+		when(
+				(ScheduledFuture<Object>) delegate.schedule(wrappedCallable, 1,
+						TimeUnit.SECONDS)).thenReturn(expectedResult);
+		ScheduledFuture<Object> result = executor.schedule(callable, 1, TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(expectedResult);
+		verify(delegate).schedule(wrappedCallable, 1, TimeUnit.SECONDS);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void scheduleAtFixedRate() {
-        when((ScheduledFuture<Object>)delegate.scheduleAtFixedRate(wrappedRunnable, 1, 2, TimeUnit.SECONDS)).thenReturn(expectedResult);
-        ScheduledFuture<?> result = executor.scheduleAtFixedRate(runnable, 1, 2, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(expectedResult);
-        verify(delegate).scheduleAtFixedRate(wrappedRunnable, 1, 2, TimeUnit.SECONDS);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void scheduleAtFixedRate() {
+		when(
+				(ScheduledFuture<Object>) delegate.scheduleAtFixedRate(wrappedRunnable,
+						1, 2, TimeUnit.SECONDS)).thenReturn(expectedResult);
+		ScheduledFuture<?> result = executor.scheduleAtFixedRate(runnable, 1, 2,
+				TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(expectedResult);
+		verify(delegate).scheduleAtFixedRate(wrappedRunnable, 1, 2, TimeUnit.SECONDS);
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void scheduleWithFixedDelay() {
-        when((ScheduledFuture<Object>)delegate.scheduleWithFixedDelay(wrappedRunnable, 1, 2, TimeUnit.SECONDS)).thenReturn(expectedResult);
-        ScheduledFuture<?> result = executor.scheduleWithFixedDelay(runnable, 1, 2, TimeUnit.SECONDS);
-        assertThat(result).isEqualTo(expectedResult);
-        verify(delegate).scheduleWithFixedDelay(wrappedRunnable, 1, 2, TimeUnit.SECONDS);
-    }
+	@Test
+	@SuppressWarnings("unchecked")
+	public void scheduleWithFixedDelay() {
+		when(
+				(ScheduledFuture<Object>) delegate.scheduleWithFixedDelay(
+						wrappedRunnable, 1, 2, TimeUnit.SECONDS)).thenReturn(
+				expectedResult);
+		ScheduledFuture<?> result = executor.scheduleWithFixedDelay(runnable, 1, 2,
+				TimeUnit.SECONDS);
+		assertThat(result).isEqualTo(expectedResult);
+		verify(delegate).scheduleWithFixedDelay(wrappedRunnable, 1, 2, TimeUnit.SECONDS);
+	}
 
-    @Override
-    protected abstract DelegatingSecurityContextScheduledExecutorService create();
+	@Override
+	protected abstract DelegatingSecurityContextScheduledExecutorService create();
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java
index f0bc8f597c..6aeb061b82 100644
--- a/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java
+++ b/core/src/test/java/org/springframework/security/concurrent/AbstractDelegatingSecurityContextTestSupport.java
@@ -30,59 +30,63 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Abstract base class for testing classes that extend {@link AbstractDelegatingSecurityContextSupport}
+ * Abstract base class for testing classes that extend
+ * {@link AbstractDelegatingSecurityContextSupport}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ DelegatingSecurityContextRunnable.class, DelegatingSecurityContextCallable.class })
+@PrepareForTest({ DelegatingSecurityContextRunnable.class,
+		DelegatingSecurityContextCallable.class })
 public abstract class AbstractDelegatingSecurityContextTestSupport {
-    @Mock
-    protected SecurityContext securityContext;
+	@Mock
+	protected SecurityContext securityContext;
 
-    @Mock
-    protected SecurityContext currentSecurityContext;
+	@Mock
+	protected SecurityContext currentSecurityContext;
 
-    @Captor
-    protected ArgumentCaptor<SecurityContext> securityContextCaptor;
+	@Captor
+	protected ArgumentCaptor<SecurityContext> securityContextCaptor;
 
-    @Mock
-    protected Callable<Object> callable;
+	@Mock
+	protected Callable<Object> callable;
 
-    @Mock
-    protected Callable<Object> wrappedCallable;
+	@Mock
+	protected Callable<Object> wrappedCallable;
 
-    @Mock
-    protected Runnable runnable;
+	@Mock
+	protected Runnable runnable;
 
-    @Mock
-    protected Runnable wrappedRunnable;
+	@Mock
+	protected Runnable wrappedRunnable;
 
-    public final void explicitSecurityContextPowermockSetup() throws Exception {
-        spy(DelegatingSecurityContextCallable.class);
-        doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", eq(callable),
-                securityContextCaptor.capture());
-        spy(DelegatingSecurityContextRunnable.class);
-        doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", eq(runnable),
-                securityContextCaptor.capture());
-    }
+	public final void explicitSecurityContextPowermockSetup() throws Exception {
+		spy(DelegatingSecurityContextCallable.class);
+		doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create",
+				eq(callable), securityContextCaptor.capture());
+		spy(DelegatingSecurityContextRunnable.class);
+		doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create",
+				eq(runnable), securityContextCaptor.capture());
+	}
 
-    public final void currentSecurityContextPowermockSetup() throws Exception {
-        spy(DelegatingSecurityContextCallable.class);
-        doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create", callable, null);
-        spy(DelegatingSecurityContextRunnable.class);
-        doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create", runnable, null);
-    }
+	public final void currentSecurityContextPowermockSetup() throws Exception {
+		spy(DelegatingSecurityContextCallable.class);
+		doReturn(wrappedCallable).when(DelegatingSecurityContextCallable.class, "create",
+				callable, null);
+		spy(DelegatingSecurityContextRunnable.class);
+		doReturn(wrappedRunnable).when(DelegatingSecurityContextRunnable.class, "create",
+				runnable, null);
+	}
 
-    @Before
-    public final void setContext() {
-        SecurityContextHolder.setContext(currentSecurityContext);
-    }
+	@Before
+	public final void setContext() {
+		SecurityContextHolder.setContext(currentSecurityContext);
+	}
 
-    @After
-    public final void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public final void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java
index 1d6be8db07..d97a3b04ed 100644
--- a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorServiceTests.java
@@ -15,21 +15,23 @@ package org.springframework.security.concurrent;
 import org.junit.Before;
 
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextExecutorService}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutorService}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class CurrentDelegatingSecurityContextExecutorServiceTests extends AbstractDelegatingSecurityContextExecutorServiceTests{
+public class CurrentDelegatingSecurityContextExecutorServiceTests extends
+		AbstractDelegatingSecurityContextExecutorServiceTests {
 
-    @Before
-    public void setUp() throws Exception {
-        super.currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		super.currentSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextExecutorService create() {
-        return new DelegatingSecurityContextExecutorService(delegate);
-    }
+	@Override
+	protected DelegatingSecurityContextExecutorService create() {
+		return new DelegatingSecurityContextExecutorService(delegate);
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorTests.java b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorTests.java
index 1d6f5e3045..a8ed84f424 100644
--- a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextExecutorTests.java
@@ -15,22 +15,23 @@ package org.springframework.security.concurrent;
 import org.junit.Before;
 
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextExecutor}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class CurrentDelegatingSecurityContextExecutorTests extends
-        AbstractDelegatingSecurityContextExecutorTests {
+		AbstractDelegatingSecurityContextExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        super.currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		super.currentSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextExecutor create() {
-        return new DelegatingSecurityContextExecutor(getExecutor());
-    }
+	@Override
+	protected DelegatingSecurityContextExecutor create() {
+		return new DelegatingSecurityContextExecutor(getExecutor());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java
index 4126f94a8b..ff94842c94 100644
--- a/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/CurrentDelegatingSecurityContextScheduledExecutorServiceTests.java
@@ -15,23 +15,24 @@ package org.springframework.security.concurrent;
 import org.junit.Before;
 
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextScheduledExecutorService}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextScheduledExecutorService}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class CurrentDelegatingSecurityContextScheduledExecutorServiceTests extends
-        AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
+		AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
 
-    @Before
-    public void setUp() throws Exception {
-        this.currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		this.currentSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextScheduledExecutorService create() {
-        return new DelegatingSecurityContextScheduledExecutorService(delegate);
-    }
+	@Override
+	protected DelegatingSecurityContextScheduledExecutorService create() {
+		return new DelegatingSecurityContextScheduledExecutorService(delegate);
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java
index 17bb536a0b..c3eeafaf92 100644
--- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java
@@ -36,108 +36,113 @@ import org.springframework.security.core.context.SecurityContextHolder;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingSecurityContextCallableTests {
-    @Mock
-    private Callable<Object> delegate;
-    @Mock
-    private SecurityContext securityContext;
-    @Mock
-    private Object callableResult;
+	@Mock
+	private Callable<Object> delegate;
+	@Mock
+	private SecurityContext securityContext;
+	@Mock
+	private Object callableResult;
 
-    private Callable<Object> callable;
+	private Callable<Object> callable;
 
-    @Before
-    @SuppressWarnings("serial")
-    public void setUp() throws Exception {
-        when(delegate.call()).thenAnswer(new Returns(callableResult) {
-            @Override
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
-                return super.answer(invocation);
-            }
-        });
-    }
+	@Before
+	@SuppressWarnings("serial")
+	public void setUp() throws Exception {
+		when(delegate.call()).thenAnswer(new Returns(callableResult) {
+			@Override
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
+				return super.answer(invocation);
+			}
+		});
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    // --- constructor ---
+	// --- constructor ---
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegate() {
-        new DelegatingSecurityContextCallable<Object>(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegate() {
+		new DelegatingSecurityContextCallable<Object>(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegateNonNullSecurityContext() {
-        new DelegatingSecurityContextCallable<Object>(null, securityContext);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegateNonNullSecurityContext() {
+		new DelegatingSecurityContextCallable<Object>(null, securityContext);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegateAndSecurityContext() {
-        new DelegatingSecurityContextCallable<Object>(null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegateAndSecurityContext() {
+		new DelegatingSecurityContextCallable<Object>(null, null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullSecurityContext() {
-        new DelegatingSecurityContextCallable<Object>(delegate, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullSecurityContext() {
+		new DelegatingSecurityContextCallable<Object>(delegate, null);
+	}
 
-    // --- call ---
+	// --- call ---
 
-    @Test
-    public void call() throws Exception {
-        callable = new DelegatingSecurityContextCallable<Object>(delegate, securityContext);
-        assertWrapped(callable.call());
-    }
+	@Test
+	public void call() throws Exception {
+		callable = new DelegatingSecurityContextCallable<Object>(delegate,
+				securityContext);
+		assertWrapped(callable.call());
+	}
 
-    @Test
-    public void callDefaultSecurityContext() throws Exception {
-        SecurityContextHolder.setContext(securityContext);
-        callable = new DelegatingSecurityContextCallable<Object>(delegate);
-        SecurityContextHolder.clearContext(); // ensure callable is what sets up the SecurityContextHolder
-        assertWrapped(callable.call());
-    }
+	@Test
+	public void callDefaultSecurityContext() throws Exception {
+		SecurityContextHolder.setContext(securityContext);
+		callable = new DelegatingSecurityContextCallable<Object>(delegate);
+		SecurityContextHolder.clearContext(); // ensure callable is what sets up the
+												// SecurityContextHolder
+		assertWrapped(callable.call());
+	}
 
-    // --- create ---
+	// --- create ---
 
-    @Test(expected = IllegalArgumentException.class)
-    public void createNullDelegate() {
-        DelegatingSecurityContextCallable.create(null, securityContext);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createNullDelegate() {
+		DelegatingSecurityContextCallable.create(null, securityContext);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void createNullDelegateAndSecurityContext() {
-        DelegatingSecurityContextRunnable.create(null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createNullDelegateAndSecurityContext() {
+		DelegatingSecurityContextRunnable.create(null, null);
+	}
 
-    @Test
-    public void createNullSecurityContext() throws Exception {
-        SecurityContextHolder.setContext(securityContext);
-        callable = DelegatingSecurityContextCallable.create(delegate, null);
-        SecurityContextHolder.clearContext(); // ensure callable is what sets up the SecurityContextHolder
-        assertWrapped(callable.call());
-    }
+	@Test
+	public void createNullSecurityContext() throws Exception {
+		SecurityContextHolder.setContext(securityContext);
+		callable = DelegatingSecurityContextCallable.create(delegate, null);
+		SecurityContextHolder.clearContext(); // ensure callable is what sets up the
+												// SecurityContextHolder
+		assertWrapped(callable.call());
+	}
 
-    @Test
-    public void create() throws Exception {
-        callable = DelegatingSecurityContextCallable.create(delegate, securityContext);
-        assertWrapped(callable.call());
-    }
+	@Test
+	public void create() throws Exception {
+		callable = DelegatingSecurityContextCallable.create(delegate, securityContext);
+		assertWrapped(callable.call());
+	}
 
-    // --- toString
+	// --- toString
 
-    // SEC-2682
-    @Test
-    public void toStringDelegates() {
-        callable = new DelegatingSecurityContextCallable<Object>(delegate, securityContext);
-        assertThat(callable.toString()).isEqualTo(delegate.toString());
-    }
+	// SEC-2682
+	@Test
+	public void toStringDelegates() {
+		callable = new DelegatingSecurityContextCallable<Object>(delegate,
+				securityContext);
+		assertThat(callable.toString()).isEqualTo(delegate.toString());
+	}
 
-    private void assertWrapped(Object actualResult) throws Exception {
-        assertThat(actualResult).isEqualTo(callableResult);
-        verify(delegate).call();
-        assertThat(SecurityContextHolder.getContext()).isEqualTo(SecurityContextHolder.createEmptyContext());
-    }
+	private void assertWrapped(Object actualResult) throws Exception {
+		assertThat(actualResult).isEqualTo(callableResult);
+		verify(delegate).call();
+		assertThat(SecurityContextHolder.getContext()).isEqualTo(
+				SecurityContextHolder.createEmptyContext());
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java
index c5aaf3c4c9..c7031e0fae 100644
--- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnableTests.java
@@ -34,110 +34,112 @@ import org.springframework.security.core.context.SecurityContextHolder;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingSecurityContextRunnableTests {
-    @Mock
-    private Runnable delegate;
-    @Mock
-    private SecurityContext securityContext;
-    @Mock
-    private Object callableResult;
+	@Mock
+	private Runnable delegate;
+	@Mock
+	private SecurityContext securityContext;
+	@Mock
+	private Object callableResult;
 
-    private Runnable runnable;
+	private Runnable runnable;
 
-    @Before
-    public void setUp() throws Exception {
-        doAnswer(new Answer<Object>() {
-            public Object answer(InvocationOnMock invocation) throws Throwable {
-                assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
-                return null;
-            }
-        })
-        .when(delegate).run();
-    }
+	@Before
+	public void setUp() throws Exception {
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				assertThat(SecurityContextHolder.getContext()).isEqualTo(securityContext);
+				return null;
+			}
+		}).when(delegate).run();
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    // --- constructor ---
+	// --- constructor ---
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegate() {
-        new DelegatingSecurityContextRunnable(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegate() {
+		new DelegatingSecurityContextRunnable(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegateNonNullSecurityContext() {
-        new DelegatingSecurityContextRunnable(null, securityContext);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegateNonNullSecurityContext() {
+		new DelegatingSecurityContextRunnable(null, securityContext);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegateAndSecurityContext() {
-        new DelegatingSecurityContextRunnable(null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegateAndSecurityContext() {
+		new DelegatingSecurityContextRunnable(null, null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullSecurityContext() {
-        new DelegatingSecurityContextRunnable(delegate, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullSecurityContext() {
+		new DelegatingSecurityContextRunnable(delegate, null);
+	}
 
-    // --- run ---
+	// --- run ---
 
-    @Test
-    public void call() throws Exception {
-        runnable = new DelegatingSecurityContextRunnable(delegate, securityContext);
-        runnable.run();
-        assertWrapped();
-    }
+	@Test
+	public void call() throws Exception {
+		runnable = new DelegatingSecurityContextRunnable(delegate, securityContext);
+		runnable.run();
+		assertWrapped();
+	}
 
-    @Test
-    public void callDefaultSecurityContext() throws Exception {
-        SecurityContextHolder.setContext(securityContext);
-        runnable = new DelegatingSecurityContextRunnable(delegate);
-        SecurityContextHolder.clearContext(); // ensure runnable is what sets up the SecurityContextHolder
-        runnable.run();
-        assertWrapped();
-    }
+	@Test
+	public void callDefaultSecurityContext() throws Exception {
+		SecurityContextHolder.setContext(securityContext);
+		runnable = new DelegatingSecurityContextRunnable(delegate);
+		SecurityContextHolder.clearContext(); // ensure runnable is what sets up the
+												// SecurityContextHolder
+		runnable.run();
+		assertWrapped();
+	}
 
-    // --- create ---
+	// --- create ---
 
-    @Test(expected = IllegalArgumentException.class)
-    public void createNullDelegate() {
-        DelegatingSecurityContextRunnable.create(null, securityContext);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createNullDelegate() {
+		DelegatingSecurityContextRunnable.create(null, securityContext);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void createNullDelegateAndSecurityContext() {
-        DelegatingSecurityContextRunnable.create(null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createNullDelegateAndSecurityContext() {
+		DelegatingSecurityContextRunnable.create(null, null);
+	}
 
-    @Test
-    public void createNullSecurityContext() {
-        SecurityContextHolder.setContext(securityContext);
-        runnable = DelegatingSecurityContextRunnable.create(delegate, null);
-        SecurityContextHolder.clearContext(); // ensure runnable is what sets up the SecurityContextHolder
-        runnable.run();
-        assertWrapped();
-    }
+	@Test
+	public void createNullSecurityContext() {
+		SecurityContextHolder.setContext(securityContext);
+		runnable = DelegatingSecurityContextRunnable.create(delegate, null);
+		SecurityContextHolder.clearContext(); // ensure runnable is what sets up the
+												// SecurityContextHolder
+		runnable.run();
+		assertWrapped();
+	}
 
-    @Test
-    public void create() {
-        runnable = DelegatingSecurityContextRunnable.create(delegate, securityContext);
-        runnable.run();
-        assertWrapped();
-    }
+	@Test
+	public void create() {
+		runnable = DelegatingSecurityContextRunnable.create(delegate, securityContext);
+		runnable.run();
+		assertWrapped();
+	}
 
-    // --- toString
+	// --- toString
 
-    // SEC-2682
-    @Test
-    public void toStringDelegates() {
-        runnable = new DelegatingSecurityContextRunnable(delegate, securityContext);
-        assertThat(runnable.toString()).isEqualTo(delegate.toString());
-    }
+	// SEC-2682
+	@Test
+	public void toStringDelegates() {
+		runnable = new DelegatingSecurityContextRunnable(delegate, securityContext);
+		assertThat(runnable.toString()).isEqualTo(delegate.toString());
+	}
 
-    private void assertWrapped() {
-        verify(delegate).run();
-        assertThat(SecurityContextHolder.getContext()).isEqualTo(SecurityContextHolder.createEmptyContext());
-    }
+	private void assertWrapped() {
+		verify(delegate).run();
+		assertThat(SecurityContextHolder.getContext()).isEqualTo(
+				SecurityContextHolder.createEmptyContext());
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java
index a36ce7a8a3..c8b55fd217 100644
--- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java
@@ -23,42 +23,44 @@ import org.springframework.security.core.context.SecurityContext;
  * @since 3.2
  *
  */
-public class DelegatingSecurityContextSupportTests extends AbstractDelegatingSecurityContextTestSupport {
-    private AbstractDelegatingSecurityContextSupport support;
+public class DelegatingSecurityContextSupportTests extends
+		AbstractDelegatingSecurityContextTestSupport {
+	private AbstractDelegatingSecurityContextSupport support;
 
-    @Test
-    public void wrapCallable() throws Exception {
-        explicitSecurityContextPowermockSetup();
-        support = new ConcreteDelegatingSecurityContextSupport(securityContext);
-        assertThat(support.wrap(callable)).isSameAs(wrappedCallable);
-        assertThat(securityContextCaptor.getValue()).isSameAs(securityContext);
-    }
+	@Test
+	public void wrapCallable() throws Exception {
+		explicitSecurityContextPowermockSetup();
+		support = new ConcreteDelegatingSecurityContextSupport(securityContext);
+		assertThat(support.wrap(callable)).isSameAs(wrappedCallable);
+		assertThat(securityContextCaptor.getValue()).isSameAs(securityContext);
+	}
 
-    @Test
-    public void wrapCallableNullSecurityContext() throws Exception {
-        currentSecurityContextPowermockSetup();
-        support = new ConcreteDelegatingSecurityContextSupport(null);
-        assertThat(support.wrap(callable)).isSameAs(wrappedCallable);
-    }
+	@Test
+	public void wrapCallableNullSecurityContext() throws Exception {
+		currentSecurityContextPowermockSetup();
+		support = new ConcreteDelegatingSecurityContextSupport(null);
+		assertThat(support.wrap(callable)).isSameAs(wrappedCallable);
+	}
 
-    @Test
-    public void wrapRunnable() throws Exception {
-        explicitSecurityContextPowermockSetup();
-        support = new ConcreteDelegatingSecurityContextSupport(securityContext);
-        assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable);
-        assertThat(securityContextCaptor.getValue()).isSameAs(securityContext);
-    }
+	@Test
+	public void wrapRunnable() throws Exception {
+		explicitSecurityContextPowermockSetup();
+		support = new ConcreteDelegatingSecurityContextSupport(securityContext);
+		assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable);
+		assertThat(securityContextCaptor.getValue()).isSameAs(securityContext);
+	}
 
-    @Test
-    public void wrapRunnableNullSecurityContext() throws Exception {
-        currentSecurityContextPowermockSetup();
-        support = new ConcreteDelegatingSecurityContextSupport(null);
-        assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable);
-    }
+	@Test
+	public void wrapRunnableNullSecurityContext() throws Exception {
+		currentSecurityContextPowermockSetup();
+		support = new ConcreteDelegatingSecurityContextSupport(null);
+		assertThat(support.wrap(runnable)).isSameAs(wrappedRunnable);
+	}
 
-    private static class ConcreteDelegatingSecurityContextSupport extends AbstractDelegatingSecurityContextSupport {
-        public ConcreteDelegatingSecurityContextSupport(SecurityContext securityContext) {
-            super(securityContext);
-        }
-    }
+	private static class ConcreteDelegatingSecurityContextSupport extends
+			AbstractDelegatingSecurityContextSupport {
+		public ConcreteDelegatingSecurityContextSupport(SecurityContext securityContext) {
+			super(securityContext);
+		}
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java
index 1e536e63f8..aac7ca3a17 100644
--- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorServiceTests.java
@@ -15,21 +15,23 @@ package org.springframework.security.concurrent;
 import org.junit.Before;
 
 /**
- * Tests Explicitly specifying the {@link SecurityContext} on {@link DelegatingSecurityContextExecutorService}
+ * Tests Explicitly specifying the {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutorService}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class ExplicitDelegatingSecurityContextExecutorServiceTests extends AbstractDelegatingSecurityContextExecutorServiceTests{
+public class ExplicitDelegatingSecurityContextExecutorServiceTests extends
+		AbstractDelegatingSecurityContextExecutorServiceTests {
 
-    @Before
-    public void setUp() throws Exception {
-        super.explicitSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		super.explicitSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextExecutorService create() {
-        return new DelegatingSecurityContextExecutorService(delegate,securityContext);
-    }
+	@Override
+	protected DelegatingSecurityContextExecutorService create() {
+		return new DelegatingSecurityContextExecutorService(delegate, securityContext);
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java
index ba3a6891a9..2a15840140 100644
--- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextExecutorTests.java
@@ -16,22 +16,23 @@ import org.junit.Before;
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * Tests Explicitly specifying the {@link SecurityContext} on {@link DelegatingSecurityContextExecutor}
+ * Tests Explicitly specifying the {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class ExplicitDelegatingSecurityContextExecutorTests extends
-        AbstractDelegatingSecurityContextExecutorTests {
+		AbstractDelegatingSecurityContextExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        super.explicitSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		super.explicitSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextExecutor create() {
-        return new DelegatingSecurityContextExecutor(getExecutor(), securityContext);
-    }
+	@Override
+	protected DelegatingSecurityContextExecutor create() {
+		return new DelegatingSecurityContextExecutor(getExecutor(), securityContext);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java
index c4cfff8edf..682e61f1f9 100644
--- a/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java
+++ b/core/src/test/java/org/springframework/security/concurrent/ExplicitDelegatingSecurityContextScheduledExecutorServiceTests.java
@@ -16,22 +16,24 @@ import org.junit.Before;
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * Tests Explicitly specifying the {@link SecurityContext} on {@link DelegatingSecurityContextScheduledExecutorService}
+ * Tests Explicitly specifying the {@link SecurityContext} on
+ * {@link DelegatingSecurityContextScheduledExecutorService}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class ExplicitDelegatingSecurityContextScheduledExecutorServiceTests extends
-        AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
+		AbstractDelegatingSecurityContextScheduledExecutorServiceTests {
 
-    @Before
-    public void setUp() throws Exception {
-        this.explicitSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		this.explicitSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextScheduledExecutorService create() {
-        return new DelegatingSecurityContextScheduledExecutorService(delegate, securityContext);
-    }
+	@Override
+	protected DelegatingSecurityContextScheduledExecutorService create() {
+		return new DelegatingSecurityContextScheduledExecutorService(delegate,
+				securityContext);
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java
index df26e9314a..aa1b8e7176 100644
--- a/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java
+++ b/core/src/test/java/org/springframework/security/context/DelegatingApplicationListenerTests.java
@@ -18,55 +18,56 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingApplicationListenerTests {
-    @Mock
-    SmartApplicationListener delegate;
+	@Mock
+	SmartApplicationListener delegate;
 
-    ApplicationEvent event;
+	ApplicationEvent event;
 
-    DelegatingApplicationListener listener;
+	DelegatingApplicationListener listener;
 
-    @Before
-    public void setup() {
-        event = new ApplicationEvent(this) {};
-        listener = new DelegatingApplicationListener();
-        listener.addListener(delegate);
-    }
+	@Before
+	public void setup() {
+		event = new ApplicationEvent(this) {
+		};
+		listener = new DelegatingApplicationListener();
+		listener.addListener(delegate);
+	}
 
-    @Test
-    public void processEventNull() {
-        listener.onApplicationEvent(null);
+	@Test
+	public void processEventNull() {
+		listener.onApplicationEvent(null);
 
-        verify(delegate,never()).onApplicationEvent(any(ApplicationEvent.class));
-    }
+		verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class));
+	}
 
-    @Test
-    public void processEventSuccess() {
-        when(delegate.supportsEventType(event.getClass())).thenReturn(true);
-        when(delegate.supportsSourceType(event.getSource().getClass())).thenReturn(true);
-        listener.onApplicationEvent(event);
+	@Test
+	public void processEventSuccess() {
+		when(delegate.supportsEventType(event.getClass())).thenReturn(true);
+		when(delegate.supportsSourceType(event.getSource().getClass())).thenReturn(true);
+		listener.onApplicationEvent(event);
 
-        verify(delegate).onApplicationEvent(event);
-    }
+		verify(delegate).onApplicationEvent(event);
+	}
 
-    @Test
-    public void processEventEventTypeNotSupported() {
-        when(delegate.supportsSourceType(event.getSource().getClass())).thenReturn(true);
-        listener.onApplicationEvent(event);
+	@Test
+	public void processEventEventTypeNotSupported() {
+		when(delegate.supportsSourceType(event.getSource().getClass())).thenReturn(true);
+		listener.onApplicationEvent(event);
 
-        verify(delegate,never()).onApplicationEvent(any(ApplicationEvent.class));
-    }
+		verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class));
+	}
 
-    @Test
-    public void processEventSourceTypeNotSupported() {
-        when(delegate.supportsEventType(event.getClass())).thenReturn(true);
-        listener.onApplicationEvent(event);
+	@Test
+	public void processEventSourceTypeNotSupported() {
+		when(delegate.supportsEventType(event.getClass())).thenReturn(true);
+		listener.onApplicationEvent(event);
 
-        verify(delegate,never()).onApplicationEvent(any(ApplicationEvent.class));
-    }
+		verify(delegate, never()).onApplicationEvent(any(ApplicationEvent.class));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void addNull() {
-        listener.addListener(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void addNull() {
+		listener.addListener(null);
+	}
 
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/core/JavaVersionTests.java b/core/src/test/java/org/springframework/security/core/JavaVersionTests.java
index 7501b2b7cb..47eac976ce 100644
--- a/core/src/test/java/org/springframework/security/core/JavaVersionTests.java
+++ b/core/src/test/java/org/springframework/security/core/JavaVersionTests.java
@@ -26,24 +26,30 @@ import org.junit.Test;
  */
 public class JavaVersionTests {
 
-    private static final int JDK5_CLASS_VERSION = 49;
+	private static final int JDK5_CLASS_VERSION = 49;
 
-    @Test
-    public void authenticationCorrectJdkCompatibility() throws Exception {
-        assertClassVersion(Authentication.class);
-    }
+	@Test
+	public void authenticationCorrectJdkCompatibility() throws Exception {
+		assertClassVersion(Authentication.class);
+	}
 
-    private void assertClassVersion(Class<?> clazz) throws Exception {
-        String classResourceName = clazz.getName().replaceAll("\\.", "/") + ".class";
-        InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(classResourceName);
-        try {
-            DataInputStream data = new DataInputStream(input);
-            data.readInt();
-            data.readShort(); // minor
-            int major = data.readShort();
-            assertThat(major).isEqualTo(JDK5_CLASS_VERSION);
-        } finally {
-            try { input.close(); } catch(Exception e) {}
-        }
-    }
+	private void assertClassVersion(Class<?> clazz) throws Exception {
+		String classResourceName = clazz.getName().replaceAll("\\.", "/") + ".class";
+		InputStream input = Thread.currentThread().getContextClassLoader()
+				.getResourceAsStream(classResourceName);
+		try {
+			DataInputStream data = new DataInputStream(input);
+			data.readInt();
+			data.readShort(); // minor
+			int major = data.readShort();
+			assertThat(major).isEqualTo(JDK5_CLASS_VERSION);
+		}
+		finally {
+			try {
+				input.close();
+			}
+			catch (Exception e) {
+			}
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
index 84ae472c87..a5ac8a5ad4 100644
--- a/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
+++ b/core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
@@ -43,128 +43,130 @@ import org.springframework.test.util.ReflectionTestUtils;
  * @author Rob Winch
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({SpringSecurityCoreVersion.class,SpringVersion.class})
+@PrepareForTest({ SpringSecurityCoreVersion.class, SpringVersion.class })
 public class SpringSecurityCoreVersionTests {
 
-    @Mock
-    private Log logger;
+	@Mock
+	private Log logger;
 
-    @Before
-    public void setup() {
-        Whitebox.setInternalState(SpringSecurityCoreVersion.class, logger);
-    }
+	@Before
+	public void setup() {
+		Whitebox.setInternalState(SpringSecurityCoreVersion.class, logger);
+	}
 
-    @After
-    public void cleanup() throws Exception {
-        System.clearProperty(getDisableChecksProperty());
-    }
+	@After
+	public void cleanup() throws Exception {
+		System.clearProperty(getDisableChecksProperty());
+	}
 
-    @Test
-    public void springVersionIsUpToDate() throws Exception {
-        // Property is set by the build script
-        String springVersion = System.getProperty("springVersion");
+	@Test
+	public void springVersionIsUpToDate() throws Exception {
+		// Property is set by the build script
+		String springVersion = System.getProperty("springVersion");
 
-        assertEquals(springVersion, SpringSecurityCoreVersion.MIN_SPRING_VERSION);
-    }
+		assertEquals(springVersion, SpringSecurityCoreVersion.MIN_SPRING_VERSION);
+	}
 
-    @Test
-    public void serialVersionMajorAndMinorVersionMatchBuildVersion() throws Exception {
-        String version = System.getProperty("springSecurityVersion");
+	@Test
+	public void serialVersionMajorAndMinorVersionMatchBuildVersion() throws Exception {
+		String version = System.getProperty("springSecurityVersion");
 
-        // Strip patch version
-        String serialVersion = String.valueOf(SpringSecurityCoreVersion.SERIAL_VERSION_UID).substring(0,2);
+		// Strip patch version
+		String serialVersion = String.valueOf(
+				SpringSecurityCoreVersion.SERIAL_VERSION_UID).substring(0, 2);
 
-        assertEquals(version.charAt(0), serialVersion.charAt(0));
-        assertEquals(version.charAt(2), serialVersion.charAt(1));
+		assertEquals(version.charAt(0), serialVersion.charAt(0));
+		assertEquals(version.charAt(2), serialVersion.charAt(1));
 
-    }
+	}
 
-    // SEC-2295
-    @Test
-    public void noLoggingIfVersionsAreEqual() throws Exception {
-        String version = "1";
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn(version);
-        when(SpringVersion.getVersion()).thenReturn(version);
+	// SEC-2295
+	@Test
+	public void noLoggingIfVersionsAreEqual() throws Exception {
+		String version = "1";
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn(version);
+		when(SpringVersion.getVersion()).thenReturn(version);
 
-        performChecks();
+		performChecks();
 
-        verifyZeroInteractions(logger);
-    }
+		verifyZeroInteractions(logger);
+	}
 
-    @Test
-    public void noLoggingIfSpringVersionNull() throws Exception {
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn("1");
-        when(SpringVersion.getVersion()).thenReturn(null);
+	@Test
+	public void noLoggingIfSpringVersionNull() throws Exception {
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn("1");
+		when(SpringVersion.getVersion()).thenReturn(null);
 
-        performChecks();
+		performChecks();
 
-        verifyZeroInteractions(logger);
-    }
+		verifyZeroInteractions(logger);
+	}
 
-    @Test
-    public void warnIfSpringVersionTooSmall() throws Exception {
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn("3");
-        when(SpringVersion.getVersion()).thenReturn("2");
+	@Test
+	public void warnIfSpringVersionTooSmall() throws Exception {
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn("3");
+		when(SpringVersion.getVersion()).thenReturn("2");
 
-        performChecks();
+		performChecks();
 
-        verify(logger, times(1)).warn(any());
-    }
+		verify(logger, times(1)).warn(any());
+	}
 
-    @Test
-    public void noWarnIfSpringVersionLarger() throws Exception {
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn("4.0.0.RELEASE");
-        when(SpringVersion.getVersion()).thenReturn("4.0.0.RELEASE");
+	@Test
+	public void noWarnIfSpringVersionLarger() throws Exception {
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn("4.0.0.RELEASE");
+		when(SpringVersion.getVersion()).thenReturn("4.0.0.RELEASE");
 
-        performChecks();
+		performChecks();
 
-        verify(logger, never()).warn(any());
-    }
+		verify(logger, never()).warn(any());
+	}
 
-    // SEC-2697
-    @Test
-    public void noWarnIfSpringPatchVersionDoubleDigits() throws Exception {
-        String minSpringVersion = "3.2.8.RELEASE";
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn("3.2.0.RELEASE");
-        when(SpringVersion.getVersion()).thenReturn("3.2.10.RELEASE");
+	// SEC-2697
+	@Test
+	public void noWarnIfSpringPatchVersionDoubleDigits() throws Exception {
+		String minSpringVersion = "3.2.8.RELEASE";
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn("3.2.0.RELEASE");
+		when(SpringVersion.getVersion()).thenReturn("3.2.10.RELEASE");
 
-        performChecks(minSpringVersion);
+		performChecks(minSpringVersion);
 
-        verify(logger, never()).warn(any());
-    }
+		verify(logger, never()).warn(any());
+	}
 
-    @Test
-    public void noLoggingIfPropertySet() throws Exception {
-        spy(SpringSecurityCoreVersion.class);
-        spy(SpringVersion.class);
-        when(SpringSecurityCoreVersion.getVersion()).thenReturn("3");
-        when(SpringVersion.getVersion()).thenReturn("2");
-        System.setProperty(getDisableChecksProperty(), Boolean.TRUE.toString());
+	@Test
+	public void noLoggingIfPropertySet() throws Exception {
+		spy(SpringSecurityCoreVersion.class);
+		spy(SpringVersion.class);
+		when(SpringSecurityCoreVersion.getVersion()).thenReturn("3");
+		when(SpringVersion.getVersion()).thenReturn("2");
+		System.setProperty(getDisableChecksProperty(), Boolean.TRUE.toString());
 
-        performChecks();
+		performChecks();
 
-        verifyZeroInteractions(logger);
-    }
+		verifyZeroInteractions(logger);
+	}
 
-    private String getDisableChecksProperty() throws Exception {
-        return SpringSecurityCoreVersion.class.getName().concat(".DISABLE_CHECKS");
-    }
+	private String getDisableChecksProperty() throws Exception {
+		return SpringSecurityCoreVersion.class.getName().concat(".DISABLE_CHECKS");
+	}
 
-    private void performChecks() throws Exception {
-        Whitebox.invokeMethod(SpringSecurityCoreVersion.class, "performVersionChecks");
-    }
+	private void performChecks() throws Exception {
+		Whitebox.invokeMethod(SpringSecurityCoreVersion.class, "performVersionChecks");
+	}
 
-    private void performChecks(String minSpringVersion) throws Exception {
-        Whitebox.invokeMethod(SpringSecurityCoreVersion.class, "performVersionChecks", minSpringVersion);
-    }
+	private void performChecks(String minSpringVersion) throws Exception {
+		Whitebox.invokeMethod(SpringSecurityCoreVersion.class, "performVersionChecks",
+				minSpringVersion);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java b/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java
index 34504ad207..a8004405e7 100644
--- a/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java
+++ b/core/src/test/java/org/springframework/security/core/SpringSecurityMessageSourceTests.java
@@ -23,30 +23,32 @@ import org.springframework.security.core.SpringSecurityMessageSource;
 
 import java.util.Locale;
 
-
 /**
  * Tests {@link org.springframework.security.core.SpringSecurityMessageSource}.
  */
 public class SpringSecurityMessageSourceTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testOperation() {
-        SpringSecurityMessageSource msgs = new SpringSecurityMessageSource();
-        assertEquals("\u4E0D\u5141\u8BB8\u8BBF\u95EE", msgs.getMessage("AbstractAccessDecisionManager.accessDenied", null, Locale.SIMPLIFIED_CHINESE));
-    }
+	public void testOperation() {
+		SpringSecurityMessageSource msgs = new SpringSecurityMessageSource();
+		assertEquals("\u4E0D\u5141\u8BB8\u8BBF\u95EE", msgs.getMessage(
+				"AbstractAccessDecisionManager.accessDenied", null,
+				Locale.SIMPLIFIED_CHINESE));
+	}
 
-    public void testReplacableLookup() {
-        // Change Locale to English
-        Locale before = LocaleContextHolder.getLocale();
-        LocaleContextHolder.setLocale(Locale.FRENCH);
+	public void testReplacableLookup() {
+		// Change Locale to English
+		Locale before = LocaleContextHolder.getLocale();
+		LocaleContextHolder.setLocale(Locale.FRENCH);
 
-        // Cause a message to be generated
-        MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-        assertEquals("Le jeton nonce est compromis FOOBAR",
-            messages.getMessage("DigestAuthenticationFilter.nonceCompromised", new Object[] {"FOOBAR"},
-                "ERROR - FAILED TO LOOKUP"));
+		// Cause a message to be generated
+		MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+		assertEquals("Le jeton nonce est compromis FOOBAR", messages.getMessage(
+				"DigestAuthenticationFilter.nonceCompromised", new Object[] { "FOOBAR" },
+				"ERROR - FAILED TO LOOKUP"));
 
-        // Revert to original Locale
-        LocaleContextHolder.setLocale(before);
-    }
+		// Revert to original Locale
+		LocaleContextHolder.setLocale(before);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java
index 1a59aece11..b73d17288d 100644
--- a/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/AuthorityUtilsTests.java
@@ -14,17 +14,17 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class AuthorityUtilsTests {
 
-    @Test
-    public void commaSeparatedStringIsParsedCorrectly() {
-        List<GrantedAuthority> authorityArray =
-                AuthorityUtils.commaSeparatedStringToAuthorityList(" ROLE_A, B, C, ROLE_D\n,\n E ");
+	@Test
+	public void commaSeparatedStringIsParsedCorrectly() {
+		List<GrantedAuthority> authorityArray = AuthorityUtils
+				.commaSeparatedStringToAuthorityList(" ROLE_A, B, C, ROLE_D\n,\n E ");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(authorityArray);
+		Set<String> authorities = AuthorityUtils.authorityListToSet(authorityArray);
 
-        assertTrue(authorities.contains("B"));
-        assertTrue(authorities.contains("C"));
-        assertTrue(authorities.contains("E"));
-        assertTrue(authorities.contains("ROLE_A"));
-        assertTrue(authorities.contains("ROLE_D"));
-    }
+		assertTrue(authorities.contains("B"));
+		assertTrue(authorities.contains("C"));
+		assertTrue(authorities.contains("E"));
+		assertTrue(authorities.contains("ROLE_A"));
+		assertTrue(authorities.contains("ROLE_D"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java b/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java
index a96360ae34..9cb174372e 100644
--- a/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/SimpleGrantedAuthorityTests.java
@@ -21,7 +21,6 @@ import static org.mockito.Mockito.*;
 import org.junit.*;
 import org.springframework.security.core.GrantedAuthority;
 
-
 /**
  * Tests {@link SimpleGrantedAuthority}.
  *
@@ -29,26 +28,26 @@ import org.springframework.security.core.GrantedAuthority;
  */
 public class SimpleGrantedAuthorityTests {
 
-    @Test
-    public void equalsBehavesAsExpected() throws Exception {
-        SimpleGrantedAuthority auth1 = new SimpleGrantedAuthority("TEST");
-        assertEquals(auth1, auth1);
-        assertEquals(auth1, new SimpleGrantedAuthority("TEST"));
+	@Test
+	public void equalsBehavesAsExpected() throws Exception {
+		SimpleGrantedAuthority auth1 = new SimpleGrantedAuthority("TEST");
+		assertEquals(auth1, auth1);
+		assertEquals(auth1, new SimpleGrantedAuthority("TEST"));
 
-        assertFalse(auth1.equals("TEST"));
+		assertFalse(auth1.equals("TEST"));
 
-        SimpleGrantedAuthority auth3 = new SimpleGrantedAuthority("NOT_EQUAL");
-        assertTrue(!auth1.equals(auth3));
+		SimpleGrantedAuthority auth3 = new SimpleGrantedAuthority("NOT_EQUAL");
+		assertTrue(!auth1.equals(auth3));
 
-        assertFalse(auth1.equals(mock(GrantedAuthority.class)));
+		assertFalse(auth1.equals(mock(GrantedAuthority.class)));
 
-        assertFalse(auth1.equals(Integer.valueOf(222)));
-    }
+		assertFalse(auth1.equals(Integer.valueOf(222)));
+	}
 
-    @Test
-    public void toStringReturnsAuthorityValue() {
-        SimpleGrantedAuthority auth = new SimpleGrantedAuthority("TEST");
-        assertEquals("TEST", auth.toString());
-    }
+	@Test
+	public void toStringReturnsAuthorityValue() {
+		SimpleGrantedAuthority auth = new SimpleGrantedAuthority("TEST");
+		assertEquals("TEST", auth.toString());
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java
index bd394fd32a..8d11823488 100755
--- a/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapperTests.java
@@ -15,177 +15,185 @@ import java.util.*;
 @SuppressWarnings("unchecked")
 public class MapBasedAttributes2GrantedAuthoritiesMapperTests {
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAfterPropertiesSetNoMap() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testAfterPropertiesSetNoMap() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		mapper.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAfterPropertiesSetEmptyMap() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        mapper.setAttributes2grantedAuthoritiesMap(new HashMap());
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testAfterPropertiesSetEmptyMap() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		mapper.setAttributes2grantedAuthoritiesMap(new HashMap());
+		mapper.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAfterPropertiesSetInvalidKeyTypeMap() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        HashMap m = new HashMap();
-        m.put(new Object(),"ga1");
-        mapper.setAttributes2grantedAuthoritiesMap(m);
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testAfterPropertiesSetInvalidKeyTypeMap() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		HashMap m = new HashMap();
+		m.put(new Object(), "ga1");
+		mapper.setAttributes2grantedAuthoritiesMap(m);
+		mapper.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAfterPropertiesSetInvalidValueTypeMap1() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        HashMap m = new HashMap();
-        m.put("role1",new Object());
-        mapper.setAttributes2grantedAuthoritiesMap(m);
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testAfterPropertiesSetInvalidValueTypeMap1() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		HashMap m = new HashMap();
+		m.put("role1", new Object());
+		mapper.setAttributes2grantedAuthoritiesMap(m);
+		mapper.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testAfterPropertiesSetInvalidValueTypeMap2() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        HashMap m = new HashMap();
-        m.put("role1",new Object[]{new String[]{"ga1","ga2"}, new Object()});
-        mapper.setAttributes2grantedAuthoritiesMap(m);
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testAfterPropertiesSetInvalidValueTypeMap2() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		HashMap m = new HashMap();
+		m.put("role1", new Object[] { new String[] { "ga1", "ga2" }, new Object() });
+		mapper.setAttributes2grantedAuthoritiesMap(m);
+		mapper.afterPropertiesSet();
+	}
 
-    @Test
-    public void testAfterPropertiesSetValidMap() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        HashMap m = getValidAttributes2GrantedAuthoritiesMap();
-        mapper.setAttributes2grantedAuthoritiesMap(m);
-        mapper.afterPropertiesSet();
-    }
+	@Test
+	public void testAfterPropertiesSetValidMap() throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		HashMap m = getValidAttributes2GrantedAuthoritiesMap();
+		mapper.setAttributes2grantedAuthoritiesMap(m);
+		mapper.afterPropertiesSet();
+	}
 
-    @Test
-    public void testMapping1() throws Exception {
-        String[] roles = { "role1" };
-        String[] expectedGas = { "ga1" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping1() throws Exception {
+		String[] roles = { "role1" };
+		String[] expectedGas = { "ga1" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping2() throws Exception {
-        String[] roles = { "role2" };
-        String[] expectedGas = { "ga2" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping2() throws Exception {
+		String[] roles = { "role2" };
+		String[] expectedGas = { "ga2" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping3() throws Exception {
-        String[] roles = { "role3" };
-        String[] expectedGas = { "ga3", "ga4" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping3() throws Exception {
+		String[] roles = { "role3" };
+		String[] expectedGas = { "ga3", "ga4" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping4() throws Exception {
-        String[] roles = { "role4" };
-        String[] expectedGas = { "ga5", "ga6" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping4() throws Exception {
+		String[] roles = { "role4" };
+		String[] expectedGas = { "ga5", "ga6" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping5() throws Exception {
-        String[] roles = { "role5" };
-        String[] expectedGas = { "ga7", "ga8", "ga9" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping5() throws Exception {
+		String[] roles = { "role5" };
+		String[] expectedGas = { "ga7", "ga8", "ga9" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping6() throws Exception {
-        String[] roles = { "role6" };
-        String[] expectedGas = { "ga10", "ga11", "ga12" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping6() throws Exception {
+		String[] roles = { "role6" };
+		String[] expectedGas = { "ga10", "ga11", "ga12" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping7() throws Exception {
-        String[] roles = { "role7" };
-        String[] expectedGas = { "ga13", "ga14" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping7() throws Exception {
+		String[] roles = { "role7" };
+		String[] expectedGas = { "ga13", "ga14" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping8() throws Exception {
-        String[] roles = { "role8" };
-        String[] expectedGas = { "ga13", "ga14" };
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping8() throws Exception {
+		String[] roles = { "role8" };
+		String[] expectedGas = { "ga13", "ga14" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping9() throws Exception {
-        String[] roles = { "role9" };
-        String[] expectedGas = {};
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping9() throws Exception {
+		String[] roles = { "role9" };
+		String[] expectedGas = {};
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping10() throws Exception {
-        String[] roles = { "role10" };
-        String[] expectedGas = {};
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping10() throws Exception {
+		String[] roles = { "role10" };
+		String[] expectedGas = {};
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMapping11() throws Exception {
-        String[] roles = { "role11" };
-        String[] expectedGas = {};
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMapping11() throws Exception {
+		String[] roles = { "role11" };
+		String[] expectedGas = {};
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testNonExistingMapping() throws Exception {
-        String[] roles = { "nonExisting" };
-        String[] expectedGas = {};
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testNonExistingMapping() throws Exception {
+		String[] roles = { "nonExisting" };
+		String[] expectedGas = {};
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    @Test
-    public void testMappingCombination() throws Exception {
-        String[] roles = { "role1", "role2", "role3", "role4", "role5", "role6", "role7", "role8", "role9", "role10", "role11" };
-        String[] expectedGas = { "ga1", "ga2", "ga3", "ga4", "ga5", "ga6", "ga7", "ga8", "ga9", "ga10", "ga11", "ga12", "ga13", "ga14"};
-        testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
-    }
+	@Test
+	public void testMappingCombination() throws Exception {
+		String[] roles = { "role1", "role2", "role3", "role4", "role5", "role6", "role7",
+				"role8", "role9", "role10", "role11" };
+		String[] expectedGas = { "ga1", "ga2", "ga3", "ga4", "ga5", "ga6", "ga7", "ga8",
+				"ga9", "ga10", "ga11", "ga12", "ga13", "ga14" };
+		testGetGrantedAuthorities(getDefaultMapper(), roles, expectedGas);
+	}
 
-    private HashMap getValidAttributes2GrantedAuthoritiesMap() {
-        HashMap m = new HashMap();
-        m.put("role1","ga1");
-        m.put("role2",new SimpleGrantedAuthority("ga2"));
-        m.put("role3",Arrays.asList("ga3",new SimpleGrantedAuthority("ga4")));
-        m.put("role4","ga5,ga6");
-        m.put("role5",Arrays.asList("ga7","ga8",new Object[]{new SimpleGrantedAuthority("ga9")}));
-        m.put("role6",new Object[]{"ga10","ga11",new Object[]{new SimpleGrantedAuthority("ga12")}});
-        m.put("role7",new String[]{"ga13","ga14"});
-        m.put("role8",new String[]{"ga13","ga14",null});
-        m.put("role9",null);
-        m.put("role10",new Object[]{});
-        m.put("role11",Arrays.asList(new Object[]{null}));
-        return m;
-    }
+	private HashMap getValidAttributes2GrantedAuthoritiesMap() {
+		HashMap m = new HashMap();
+		m.put("role1", "ga1");
+		m.put("role2", new SimpleGrantedAuthority("ga2"));
+		m.put("role3", Arrays.asList("ga3", new SimpleGrantedAuthority("ga4")));
+		m.put("role4", "ga5,ga6");
+		m.put("role5", Arrays.asList("ga7", "ga8",
+				new Object[] { new SimpleGrantedAuthority("ga9") }));
+		m.put("role6", new Object[] { "ga10", "ga11",
+				new Object[] { new SimpleGrantedAuthority("ga12") } });
+		m.put("role7", new String[] { "ga13", "ga14" });
+		m.put("role8", new String[] { "ga13", "ga14", null });
+		m.put("role9", null);
+		m.put("role10", new Object[] {});
+		m.put("role11", Arrays.asList(new Object[] { null }));
+		return m;
+	}
 
-    private MapBasedAttributes2GrantedAuthoritiesMapper getDefaultMapper() throws Exception {
-        MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
-        mapper.setAttributes2grantedAuthoritiesMap(getValidAttributes2GrantedAuthoritiesMap());
-        mapper.afterPropertiesSet();
-        return mapper;
-    }
+	private MapBasedAttributes2GrantedAuthoritiesMapper getDefaultMapper()
+			throws Exception {
+		MapBasedAttributes2GrantedAuthoritiesMapper mapper = new MapBasedAttributes2GrantedAuthoritiesMapper();
+		mapper.setAttributes2grantedAuthoritiesMap(getValidAttributes2GrantedAuthoritiesMap());
+		mapper.afterPropertiesSet();
+		return mapper;
+	}
 
-    private void testGetGrantedAuthorities(MapBasedAttributes2GrantedAuthoritiesMapper mapper, String[] roles, String[] expectedGas) {
-        List<GrantedAuthority> result = mapper.getGrantedAuthorities(Arrays.asList(roles));
-        Collection resultColl = new ArrayList(result.size());
-        for (GrantedAuthority auth : result) {
-            resultColl.add(auth.getAuthority());
-        }
-        Collection expectedColl = Arrays.asList(expectedGas);
-        assertTrue("Role collections should match; result: " + resultColl + ", expected: " + expectedColl, expectedColl
-                .containsAll(resultColl)
-                && resultColl.containsAll(expectedColl));
-    }
+	private void testGetGrantedAuthorities(
+			MapBasedAttributes2GrantedAuthoritiesMapper mapper, String[] roles,
+			String[] expectedGas) {
+		List<GrantedAuthority> result = mapper
+				.getGrantedAuthorities(Arrays.asList(roles));
+		Collection resultColl = new ArrayList(result.size());
+		for (GrantedAuthority auth : result) {
+			resultColl.add(auth.getAuthority());
+		}
+		Collection expectedColl = Arrays.asList(expectedGas);
+		assertTrue("Role collections should match; result: " + resultColl
+				+ ", expected: " + expectedColl, expectedColl.containsAll(resultColl)
+				&& resultColl.containsAll(expectedColl));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java
index 58c6d61f38..0098d3bea2 100644
--- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleAuthoritiesMapperTests.java
@@ -1,6 +1,5 @@
 package org.springframework.security.core.authority.mapping;
 
-
 import static org.junit.Assert.*;
 
 import org.junit.*;
@@ -14,63 +13,65 @@ import java.util.*;
  */
 public class SimpleAuthoritiesMapperTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsInvalidCaseConversionFlags() throws Exception {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        mapper.setConvertToLowerCase(true);
-        mapper.setConvertToUpperCase(true);
-        mapper.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsInvalidCaseConversionFlags() throws Exception {
+		SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
+		mapper.setConvertToLowerCase(true);
+		mapper.setConvertToUpperCase(true);
+		mapper.afterPropertiesSet();
+	}
 
-    @Test
-    public void defaultPrefixIsCorrectlyApplied() {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        Set<String> mapped = AuthorityUtils.authorityListToSet(
-                mapper.mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "ROLE_bbb")));
-        assertTrue(mapped.contains("ROLE_AaA"));
-        assertTrue(mapped.contains("ROLE_bbb"));
-    }
+	@Test
+	public void defaultPrefixIsCorrectlyApplied() {
+		SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
+		Set<String> mapped = AuthorityUtils.authorityListToSet(mapper
+				.mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "ROLE_bbb")));
+		assertTrue(mapped.contains("ROLE_AaA"));
+		assertTrue(mapped.contains("ROLE_bbb"));
+	}
 
-    @Test
-    public void caseIsConvertedCorrectly() {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        mapper.setPrefix("");
-        List<GrantedAuthority> toMap = AuthorityUtils.createAuthorityList("AaA", "Bbb");
-        Set<String> mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap));
-        assertEquals(2, mapped.size());
-        assertTrue(mapped.contains("AaA"));
-        assertTrue(mapped.contains("Bbb"));
+	@Test
+	public void caseIsConvertedCorrectly() {
+		SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
+		mapper.setPrefix("");
+		List<GrantedAuthority> toMap = AuthorityUtils.createAuthorityList("AaA", "Bbb");
+		Set<String> mapped = AuthorityUtils.authorityListToSet(mapper
+				.mapAuthorities(toMap));
+		assertEquals(2, mapped.size());
+		assertTrue(mapped.contains("AaA"));
+		assertTrue(mapped.contains("Bbb"));
 
-        mapper.setConvertToLowerCase(true);
-        mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap));
-        assertEquals(2, mapped.size());
-        assertTrue(mapped.contains("aaa"));
-        assertTrue(mapped.contains("bbb"));
+		mapper.setConvertToLowerCase(true);
+		mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap));
+		assertEquals(2, mapped.size());
+		assertTrue(mapped.contains("aaa"));
+		assertTrue(mapped.contains("bbb"));
 
-        mapper.setConvertToLowerCase(false);
-        mapper.setConvertToUpperCase(true);
-        mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap));
-        assertEquals(2, mapped.size());
-        assertTrue(mapped.contains("AAA"));
-        assertTrue(mapped.contains("BBB"));
-    }
+		mapper.setConvertToLowerCase(false);
+		mapper.setConvertToUpperCase(true);
+		mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(toMap));
+		assertEquals(2, mapped.size());
+		assertTrue(mapped.contains("AAA"));
+		assertTrue(mapped.contains("BBB"));
+	}
 
-    @Test
-    public void duplicatesAreRemoved() {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        mapper.setConvertToUpperCase(true);
+	@Test
+	public void duplicatesAreRemoved() {
+		SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
+		mapper.setConvertToUpperCase(true);
 
-        Set<String> mapped = AuthorityUtils.authorityListToSet(
-                mapper.mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "AAA")));
-        assertEquals(1, mapped.size());
-    }
+		Set<String> mapped = AuthorityUtils.authorityListToSet(mapper
+				.mapAuthorities(AuthorityUtils.createAuthorityList("AaA", "AAA")));
+		assertEquals(1, mapped.size());
+	}
 
-    @Test
-    public void defaultAuthorityIsAssignedIfSet() throws Exception {
-        SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
-        mapper.setDefaultAuthority("ROLE_USER");
-        Set<String> mapped = AuthorityUtils.authorityListToSet(mapper.mapAuthorities(AuthorityUtils.NO_AUTHORITIES));
-        assertEquals(1, mapped.size());
-        assertTrue(mapped.contains("ROLE_USER"));
-    }
+	@Test
+	public void defaultAuthorityIsAssignedIfSet() throws Exception {
+		SimpleAuthorityMapper mapper = new SimpleAuthorityMapper();
+		mapper.setDefaultAuthority("ROLE_USER");
+		Set<String> mapped = AuthorityUtils.authorityListToSet(mapper
+				.mapAuthorities(AuthorityUtils.NO_AUTHORITIES));
+		assertEquals(1, mapped.size());
+		assertTrue(mapped.contains("ROLE_USER"));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java
index 049f4c2ddc..ff1aa0ebd8 100755
--- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleMappableRolesRetrieverTests.java
@@ -14,13 +14,13 @@ import org.springframework.util.StringUtils;
  */
 public class SimpleMappableRolesRetrieverTests extends TestCase {
 
-    public final void testGetSetMappableRoles() {
-        Set<String> roles = StringUtils.commaDelimitedListToSet("Role1,Role2");
-        SimpleMappableAttributesRetriever r = new SimpleMappableAttributesRetriever();
-        r.setMappableAttributes(roles);
-        Set<String> result = r.getMappableAttributes();
-        assertTrue("Role collections do not match; result: " + result + ", expected: " + roles, roles.containsAll(result)
-                && result.containsAll(roles));
-    }
+	public final void testGetSetMappableRoles() {
+		Set<String> roles = StringUtils.commaDelimitedListToSet("Role1,Role2");
+		SimpleMappableAttributesRetriever r = new SimpleMappableAttributesRetriever();
+		r.setMappableAttributes(roles);
+		Set<String> result = r.getMappableAttributes();
+		assertTrue("Role collections do not match; result: " + result + ", expected: "
+				+ roles, roles.containsAll(result) && result.containsAll(roles));
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
index 4d96ba6bd4..7b7d2de75d 100755
--- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
+++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java
@@ -12,107 +12,113 @@ import java.util.*;
  */
 public class SimpleRoles2GrantedAuthoritiesMapperTests extends TestCase {
 
-    public final void testAfterPropertiesSetConvertToUpperAndLowerCase() {
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
-        mapper.setConvertAttributeToLowerCase(true);
-        mapper.setConvertAttributeToUpperCase(true);
-        try {
-            mapper.afterPropertiesSet();
-            fail("Expected exception not thrown");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception unexpected) {
-            fail("Unexpected exception: " + unexpected);
-        }
-    }
+	public final void testAfterPropertiesSetConvertToUpperAndLowerCase() {
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
+		mapper.setConvertAttributeToLowerCase(true);
+		mapper.setConvertAttributeToUpperCase(true);
+		try {
+			mapper.afterPropertiesSet();
+			fail("Expected exception not thrown");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		catch (Exception unexpected) {
+			fail("Unexpected exception: " + unexpected);
+		}
+	}
 
-    public final void testAfterPropertiesSet() {
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
-        try {
-            mapper.afterPropertiesSet();
-        } catch (Exception unexpected) {
-            fail("Unexpected exception: " + unexpected);
-        }
-    }
+	public final void testAfterPropertiesSet() {
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
+		try {
+			mapper.afterPropertiesSet();
+		}
+		catch (Exception unexpected) {
+			fail("Unexpected exception: " + unexpected);
+		}
+	}
 
-    public final void testGetGrantedAuthoritiesNoConversion() {
-        String[] roles = { "Role1", "Role2" };
-        String[] expectedGas = { "Role1", "Role2" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesNoConversion() {
+		String[] roles = { "Role1", "Role2" };
+		String[] expectedGas = { "Role1", "Role2" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesToUpperCase() {
-        String[] roles = { "Role1", "Role2" };
-        String[] expectedGas = { "ROLE1", "ROLE2" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setConvertAttributeToUpperCase(true);
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesToUpperCase() {
+		String[] roles = { "Role1", "Role2" };
+		String[] expectedGas = { "ROLE1", "ROLE2" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setConvertAttributeToUpperCase(true);
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesToLowerCase() {
-        String[] roles = { "Role1", "Role2" };
-        String[] expectedGas = { "role1", "role2" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setConvertAttributeToLowerCase(true);
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesToLowerCase() {
+		String[] roles = { "Role1", "Role2" };
+		String[] expectedGas = { "role1", "role2" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setConvertAttributeToLowerCase(true);
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesAddPrefixIfAlreadyExisting() {
-        String[] roles = { "Role1", "Role2", "ROLE_Role3" };
-        String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_ROLE_Role3" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setAddPrefixIfAlreadyExisting(true);
-        mapper.setAttributePrefix("ROLE_");
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesAddPrefixIfAlreadyExisting() {
+		String[] roles = { "Role1", "Role2", "ROLE_Role3" };
+		String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_ROLE_Role3" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setAddPrefixIfAlreadyExisting(true);
+		mapper.setAttributePrefix("ROLE_");
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesDontAddPrefixIfAlreadyExisting1() {
-        String[] roles = { "Role1", "Role2", "ROLE_Role3" };
-        String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_Role3" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setAddPrefixIfAlreadyExisting(false);
-        mapper.setAttributePrefix("ROLE_");
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesDontAddPrefixIfAlreadyExisting1() {
+		String[] roles = { "Role1", "Role2", "ROLE_Role3" };
+		String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_Role3" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setAddPrefixIfAlreadyExisting(false);
+		mapper.setAttributePrefix("ROLE_");
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesDontAddPrefixIfAlreadyExisting2() {
-        String[] roles = { "Role1", "Role2", "role_Role3" };
-        String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_role_Role3" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setAddPrefixIfAlreadyExisting(false);
-        mapper.setAttributePrefix("ROLE_");
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesDontAddPrefixIfAlreadyExisting2() {
+		String[] roles = { "Role1", "Role2", "role_Role3" };
+		String[] expectedGas = { "ROLE_Role1", "ROLE_Role2", "ROLE_role_Role3" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setAddPrefixIfAlreadyExisting(false);
+		mapper.setAttributePrefix("ROLE_");
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    public final void testGetGrantedAuthoritiesCombination1() {
-        String[] roles = { "Role1", "Role2", "role_Role3" };
-        String[] expectedGas = { "ROLE_ROLE1", "ROLE_ROLE2", "ROLE_ROLE3" };
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
-        mapper.setAddPrefixIfAlreadyExisting(false);
-        mapper.setConvertAttributeToUpperCase(true);
-        mapper.setAttributePrefix("ROLE_");
-        testGetGrantedAuthorities(mapper, roles, expectedGas);
-    }
+	public final void testGetGrantedAuthoritiesCombination1() {
+		String[] roles = { "Role1", "Role2", "role_Role3" };
+		String[] expectedGas = { "ROLE_ROLE1", "ROLE_ROLE2", "ROLE_ROLE3" };
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = getDefaultMapper();
+		mapper.setAddPrefixIfAlreadyExisting(false);
+		mapper.setConvertAttributeToUpperCase(true);
+		mapper.setAttributePrefix("ROLE_");
+		testGetGrantedAuthorities(mapper, roles, expectedGas);
+	}
 
-    private void testGetGrantedAuthorities(SimpleAttributes2GrantedAuthoritiesMapper mapper, String[] roles, String[] expectedGas) {
-        List<GrantedAuthority> result = mapper.getGrantedAuthorities(Arrays.asList(roles));
-        Collection<String> resultColl = new ArrayList<String>(result.size());
-        for (int i = 0; i < result.size(); i++) {
-            resultColl.add(result.get(i).getAuthority());
-        }
-        Collection<String> expectedColl = Arrays.asList(expectedGas);
-        assertTrue("Role collections do not match; result: " + resultColl + ", expected: " + expectedColl, expectedColl
-                .containsAll(resultColl)
-                && resultColl.containsAll(expectedColl));
-    }
+	private void testGetGrantedAuthorities(
+			SimpleAttributes2GrantedAuthoritiesMapper mapper, String[] roles,
+			String[] expectedGas) {
+		List<GrantedAuthority> result = mapper
+				.getGrantedAuthorities(Arrays.asList(roles));
+		Collection<String> resultColl = new ArrayList<String>(result.size());
+		for (int i = 0; i < result.size(); i++) {
+			resultColl.add(result.get(i).getAuthority());
+		}
+		Collection<String> expectedColl = Arrays.asList(expectedGas);
+		assertTrue("Role collections do not match; result: " + resultColl
+				+ ", expected: " + expectedColl, expectedColl.containsAll(resultColl)
+				&& resultColl.containsAll(expectedColl));
+	}
 
-    private SimpleAttributes2GrantedAuthoritiesMapper getDefaultMapper() {
-        SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
-        mapper.setAttributePrefix("");
-        mapper.setConvertAttributeToLowerCase(false);
-        mapper.setConvertAttributeToUpperCase(false);
-        mapper.setAddPrefixIfAlreadyExisting(false);
-        return mapper;
-    }
+	private SimpleAttributes2GrantedAuthoritiesMapper getDefaultMapper() {
+		SimpleAttributes2GrantedAuthoritiesMapper mapper = new SimpleAttributes2GrantedAuthoritiesMapper();
+		mapper.setAttributePrefix("");
+		mapper.setConvertAttributeToLowerCase(false);
+		mapper.setConvertAttributeToUpperCase(false);
+		mapper.setAddPrefixIfAlreadyExisting(false);
+		return mapper;
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java
index 6e46b385d6..c3fa0e0830 100644
--- a/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java
+++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextHolderTests.java
@@ -27,33 +27,36 @@ import org.springframework.security.core.context.SecurityContextImpl;
  */
 public class SecurityContextHolderTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final void setUp() throws Exception {
-        SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
-    }
+	public final void setUp() throws Exception {
+		SecurityContextHolder
+				.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
+	}
 
-    public void testContextHolderGetterSetterClearer() {
-        SecurityContext sc = new SecurityContextImpl();
-        sc.setAuthentication(new UsernamePasswordAuthenticationToken("Foobar", "pass"));
-        SecurityContextHolder.setContext(sc);
-        assertEquals(sc, SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-        assertNotSame(sc, SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-    }
+	public void testContextHolderGetterSetterClearer() {
+		SecurityContext sc = new SecurityContextImpl();
+		sc.setAuthentication(new UsernamePasswordAuthenticationToken("Foobar", "pass"));
+		SecurityContextHolder.setContext(sc);
+		assertEquals(sc, SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+		assertNotSame(sc, SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+	}
 
-    public void testNeverReturnsNull() {
-        assertNotNull(SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-    }
+	public void testNeverReturnsNull() {
+		assertNotNull(SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+	}
 
-    public void testRejectsNulls() {
-        try {
-            SecurityContextHolder.setContext(null);
-            fail("Should have rejected null");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+	public void testRejectsNulls() {
+		try {
+			SecurityContextHolder.setContext(null);
+			fail("Should have rejected null");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java
index 3659bac10d..5a93dfd34b 100644
--- a/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java
+++ b/core/src/test/java/org/springframework/security/core/context/SecurityContextImplTests.java
@@ -17,41 +17,41 @@ package org.springframework.security.core.context;
 
 import junit.framework.TestCase;
 
-
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextImpl;
 
-
 /**
  * Tests {@link SecurityContextImpl}.
  *
  * @author Ben Alex
  */
 public class SecurityContextImplTests extends TestCase {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SecurityContextImplTests() {
-        super();
-    }
+	public SecurityContextImplTests() {
+		super();
+	}
 
-    public SecurityContextImplTests(String arg0) {
-        super(arg0);
-    }
+	public SecurityContextImplTests(String arg0) {
+		super(arg0);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testEmptyObjectsAreEquals() {
-        SecurityContextImpl obj1 = new SecurityContextImpl();
-        SecurityContextImpl obj2 = new SecurityContextImpl();
-        assertTrue(obj1.equals(obj2));
-    }
+	public void testEmptyObjectsAreEquals() {
+		SecurityContextImpl obj1 = new SecurityContextImpl();
+		SecurityContextImpl obj2 = new SecurityContextImpl();
+		assertTrue(obj1.equals(obj2));
+	}
 
-    public void testSecurityContextCorrectOperation() {
-        SecurityContext context = new SecurityContextImpl();
-        Authentication auth = new UsernamePasswordAuthenticationToken("rod", "koala");
-        context.setAuthentication(auth);
-        assertEquals(auth, context.getAuthentication());
-        assertTrue(context.toString().lastIndexOf("rod") != -1);
-    }
+	public void testSecurityContextCorrectOperation() {
+		SecurityContext context = new SecurityContextImpl();
+		Authentication auth = new UsernamePasswordAuthenticationToken("rod", "koala");
+		context.setAuthentication(auth);
+		assertEquals(auth, context.getAuthentication());
+		assertTrue(context.toString().lastIndexOf("rod") != -1);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java
index 9660509646..08e5791c42 100644
--- a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java
+++ b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java
@@ -8,99 +8,147 @@ import org.springframework.security.access.method.P;
 import org.springframework.util.ReflectionUtils;
 
 public class AnnotationParameterNameDiscovererTests {
-    private AnnotationParameterNameDiscoverer discoverer;
+	private AnnotationParameterNameDiscoverer discoverer;
 
-    @Before
-    public void setup() {
-        discoverer = new AnnotationParameterNameDiscoverer(P.class.getName());
-    }
+	@Before
+	public void setup() {
+		discoverer = new AnnotationParameterNameDiscoverer(P.class.getName());
+	}
 
-    @Test
-    public void getParameterNamesInterfaceSingleParam() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))).isEqualTo(new String [] { "to"});
-    }
+	@Test
+	public void getParameterNamesInterfaceSingleParam() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByTo", String.class))).isEqualTo(
+				new String[] { "to" });
+	}
 
-    @Test
-    public void getParameterNamesInterfaceSingleParamAnnotatedWithMultiParams() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))).isEqualTo(new String [] { "to", null});
-    }
+	@Test
+	public void getParameterNamesInterfaceSingleParamAnnotatedWithMultiParams() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByToAndFrom", String.class, String.class)))
+				.isEqualTo(new String[] { "to", null });
+	}
 
-    @Test
-    public void getParameterNamesInterfaceNoAnnotation() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))).isNull();
-    }
+	@Test
+	public void getParameterNamesInterfaceNoAnnotation() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByIdNoAnnotation", String.class))).isNull();
+	}
 
-    @Test
-    public void getParameterNamesClassSingleParam() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))).isEqualTo(new String [] { "to"});
-    }
+	@Test
+	public void getParameterNamesClassSingleParam() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByTo", String.class))).isEqualTo(
+				new String[] { "to" });
+	}
 
-    @Test
-    public void getParameterNamesClassSingleParamAnnotatedWithMultiParams() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))).isEqualTo(new String [] { "to", null});
-    }
+	@Test
+	public void getParameterNamesClassSingleParamAnnotatedWithMultiParams() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByToAndFrom", String.class, String.class)))
+				.isEqualTo(new String[] { "to", null });
+	}
 
-    @Test
-    public void getParameterNamesClassNoAnnotation() {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))).isNull();
-    }
+	@Test
+	public void getParameterNamesClassNoAnnotation() {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByIdNoAnnotation", String.class))).isNull();
+	}
 
+	@Test
+	public void getParameterNamesConstructor() throws Exception {
+		assertThat(discoverer.getParameterNames(Impl.class.getConstructor(String.class)))
+				.isEqualTo(new String[] { "id" });
+	}
 
-    @Test
-    public void getParameterNamesConstructor() throws Exception {
-        assertThat(discoverer.getParameterNames(Impl.class.getConstructor(String.class))).isEqualTo(new String[] { "id"});
-    }
+	@Test
+	public void getParameterNamesConstructorNoAnnotation() throws Exception {
+		assertThat(discoverer.getParameterNames(Impl.class.getConstructor(Long.class)))
+				.isNull();
+	}
 
-    @Test
-    public void getParameterNamesConstructorNoAnnotation() throws Exception {
-        assertThat(discoverer.getParameterNames(Impl.class.getConstructor(Long.class))).isNull();
-    }
+	@Test
+	public void getParameterNamesClassAnnotationOnInterface() throws Exception {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class,
+						"findMessageByTo", String.class))).isEqualTo(
+				new String[] { "to" });
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByTo", String.class))).isEqualTo(
+				new String[] { "to" });
+	}
 
-    @Test
-    public void getParameterNamesClassAnnotationOnInterface() throws Exception {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class, "findMessageByTo", String.class))).isEqualTo(new String[] {"to"});
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByTo", String.class))).isEqualTo(new String[] {"to"});
-    }
+	@Test
+	public void getParameterNamesClassAnnotationOnImpl() throws Exception {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByToAndFrom", String.class, String.class)))
+				.isEqualTo(new String[] { "to", null });
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class,
+						"findMessageByToAndFrom", String.class, String.class)))
+				.isEqualTo(new String[] { "to", "from" });
+	}
 
-    @Test
-    public void getParameterNamesClassAnnotationOnImpl() throws Exception {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByToAndFrom", String.class, String.class))).isEqualTo(new String [] { "to", null});
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class, "findMessageByToAndFrom", String.class, String.class))).isEqualTo(new String[] {"to", "from"});
-    }
+	@Test
+	public void getParameterNamesClassAnnotationOnBaseClass() throws Exception {
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class,
+						"findMessageByIdNoAnnotation", String.class))).isNull();
+		assertThat(
+				discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class,
+						"findMessageByIdNoAnnotation", String.class))).isEqualTo(
+				new String[] { "id" });
+	}
 
-    @Test
-    public void getParameterNamesClassAnnotationOnBaseClass() throws Exception {
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(Dao.class, "findMessageByIdNoAnnotation", String.class))).isNull();
-        assertThat(discoverer.getParameterNames(ReflectionUtils.findMethod(DaoImpl.class, "findMessageByIdNoAnnotation", String.class))).isEqualTo(new String[] {"id"});
-    }
+	interface Dao {
+		String findMessageByTo(@P("to") String to);
 
-    interface Dao {
-        String findMessageByTo(@P("to") String to);
+		String findMessageByToAndFrom(@P("to") String to, String from);
 
-        String findMessageByToAndFrom(@P("to") String to, String from);
+		String findMessageByIdNoAnnotation(String id);
+	}
 
-        String findMessageByIdNoAnnotation(String id);
-    }
+	static class BaseDaoImpl {
+		public String findMessageByIdNoAnnotation(@P("id") String id) {
+			return null;
+		}
+	}
 
-    static class BaseDaoImpl {
-        public String findMessageByIdNoAnnotation(@P("id") String id) { return null; }
-    }
+	static class DaoImpl extends BaseDaoImpl implements Dao {
+		public String findMessageByTo(String to) {
+			return null;
+		}
 
-    static class DaoImpl extends BaseDaoImpl implements Dao {
-        public String findMessageByTo(String to) { return null; }
+		public String findMessageByToAndFrom(@P("to") String to, @P("from") String from) {
+			return null;
+		}
+	}
 
-        public String findMessageByToAndFrom(@P("to") String to, @P("from") String from) { return null; }
-    }
+	static class Impl {
+		public Impl(Long dataSourceId) {
+		}
 
-    static class Impl {
-        public Impl(Long dataSourceId) {}
+		public Impl(@P("id") String dataSourceId) {
+		}
 
-        public Impl(@P("id") String dataSourceId) {}
+		String findMessageByTo(@P("to") String to) {
+			return null;
+		}
 
-        String findMessageByTo(@P("to") String to) { return null; }
+		String findMessageByToAndFrom(@P("to") String to, String from) {
+			return null;
+		}
 
-        String findMessageByToAndFrom(@P("to") String to, String from) { return null; }
-
-        String findMessageByIdNoAnnotation(String id) { return null; }
-    }
+		String findMessageByIdNoAnnotation(String id) {
+			return null;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java
index 3d39799778..24a05801c9 100644
--- a/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java
+++ b/core/src/test/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscovererTests.java
@@ -38,47 +38,49 @@ import org.springframework.test.util.ReflectionTestUtils;
  */
 @SuppressWarnings("unchecked")
 public class DefaultSecurityParameterNameDiscovererTests {
-    private DefaultSecurityParameterNameDiscoverer discoverer;
+	private DefaultSecurityParameterNameDiscoverer discoverer;
 
-    @Before
-    public void setup() {
-        discoverer = new DefaultSecurityParameterNameDiscoverer();
-    }
+	@Before
+	public void setup() {
+		discoverer = new DefaultSecurityParameterNameDiscoverer();
+	}
 
-    @Test
-    public void constructorDefault() {
-        List<ParameterNameDiscoverer> discoverers = (List<ParameterNameDiscoverer>) ReflectionTestUtils
-                .getField(discoverer, "parameterNameDiscoverers");
+	@Test
+	public void constructorDefault() {
+		List<ParameterNameDiscoverer> discoverers = (List<ParameterNameDiscoverer>) ReflectionTestUtils
+				.getField(discoverer, "parameterNameDiscoverers");
 
-        assertThat(discoverers.size()).isEqualTo(2);
+		assertThat(discoverers.size()).isEqualTo(2);
 
-        ParameterNameDiscoverer annotationDisc = discoverers.get(0);
-        assertThat(annotationDisc).isInstanceOf(
-                AnnotationParameterNameDiscoverer.class);
-        Set<String> annotationsToUse = (Set<String>)ReflectionTestUtils.getField(annotationDisc, "annotationClassesToUse");
-        assertThat(annotationsToUse).containsOnly(P.class.getName());
+		ParameterNameDiscoverer annotationDisc = discoverers.get(0);
+		assertThat(annotationDisc).isInstanceOf(AnnotationParameterNameDiscoverer.class);
+		Set<String> annotationsToUse = (Set<String>) ReflectionTestUtils.getField(
+				annotationDisc, "annotationClassesToUse");
+		assertThat(annotationsToUse).containsOnly(P.class.getName());
 
-        assertThat(discoverers.get(1).getClass()).isEqualTo(DefaultParameterNameDiscoverer.class);
-    }
+		assertThat(discoverers.get(1).getClass()).isEqualTo(
+				DefaultParameterNameDiscoverer.class);
+	}
 
-    @Test
-    public void constructorDiscoverers() {
-        discoverer = new DefaultSecurityParameterNameDiscoverer(Arrays.asList(new LocalVariableTableParameterNameDiscoverer()));
+	@Test
+	public void constructorDiscoverers() {
+		discoverer = new DefaultSecurityParameterNameDiscoverer(
+				Arrays.asList(new LocalVariableTableParameterNameDiscoverer()));
 
-        List<ParameterNameDiscoverer> discoverers = (List<ParameterNameDiscoverer>) ReflectionTestUtils
-                .getField(discoverer, "parameterNameDiscoverers");
+		List<ParameterNameDiscoverer> discoverers = (List<ParameterNameDiscoverer>) ReflectionTestUtils
+				.getField(discoverer, "parameterNameDiscoverers");
 
-        assertThat(discoverers.size()).isEqualTo(3);
-        assertThat(discoverers.get(0)).isInstanceOf(
-                LocalVariableTableParameterNameDiscoverer.class);
+		assertThat(discoverers.size()).isEqualTo(3);
+		assertThat(discoverers.get(0)).isInstanceOf(
+				LocalVariableTableParameterNameDiscoverer.class);
 
-        ParameterNameDiscoverer annotationDisc = discoverers.get(1);
-        assertThat(annotationDisc).isInstanceOf(
-                AnnotationParameterNameDiscoverer.class);
-        Set<String> annotationsToUse = (Set<String>)ReflectionTestUtils.getField(annotationDisc, "annotationClassesToUse");
-        assertThat(annotationsToUse).containsOnly(P.class.getName());
+		ParameterNameDiscoverer annotationDisc = discoverers.get(1);
+		assertThat(annotationDisc).isInstanceOf(AnnotationParameterNameDiscoverer.class);
+		Set<String> annotationsToUse = (Set<String>) ReflectionTestUtils.getField(
+				annotationDisc, "annotationClassesToUse");
+		assertThat(annotationsToUse).containsOnly(P.class.getName());
 
-        assertThat(discoverers.get(2).getClass()).isEqualTo
-(DefaultParameterNameDiscoverer.class);
-    }
+		assertThat(discoverers.get(2).getClass()).isEqualTo(
+				DefaultParameterNameDiscoverer.class);
+	}
 }
\ No newline at end of file
diff --git a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java
index 949dcc64cb..3b99f1732d 100644
--- a/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java
+++ b/core/src/test/java/org/springframework/security/core/session/SessionInformationTests.java
@@ -21,29 +21,30 @@ import java.util.Date;
 
 import org.springframework.security.core.session.SessionInformation;
 
-
 /**
  * Tests {@link SessionInformation}.
  *
  * @author Ben Alex
  */
 public class SessionInformationTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testObject() throws Exception {
-        Object principal = "Some principal object";
-        String sessionId = "1234567890";
-        Date currentDate = new Date();
+	public void testObject() throws Exception {
+		Object principal = "Some principal object";
+		String sessionId = "1234567890";
+		Date currentDate = new Date();
 
-        SessionInformation info = new SessionInformation(principal, sessionId, currentDate);
-        assertEquals(principal, info.getPrincipal());
-        assertEquals(sessionId, info.getSessionId());
-        assertEquals(currentDate, info.getLastRequest());
+		SessionInformation info = new SessionInformation(principal, sessionId,
+				currentDate);
+		assertEquals(principal, info.getPrincipal());
+		assertEquals(sessionId, info.getSessionId());
+		assertEquals(currentDate, info.getLastRequest());
 
-        Thread.sleep(10);
+		Thread.sleep(10);
 
-        info.refreshLastRequest();
+		info.refreshLastRequest();
 
-        assertTrue(info.getLastRequest().after(currentDate));
-    }
+		assertTrue(info.getLastRequest().after(currentDate));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java
index 76ea72ea17..52eebbe2da 100644
--- a/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java
+++ b/core/src/test/java/org/springframework/security/core/session/SessionRegistryImplTests.java
@@ -33,153 +33,161 @@ import org.springframework.security.core.session.SessionRegistryImpl;
  * @author Ben Alex
  */
 public class SessionRegistryImplTests {
-    private SessionRegistryImpl sessionRegistry;
+	private SessionRegistryImpl sessionRegistry;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        sessionRegistry = new SessionRegistryImpl();
-    }
+	@Before
+	public void setUp() throws Exception {
+		sessionRegistry = new SessionRegistryImpl();
+	}
 
-    @Test
-    public void sessionDestroyedEventRemovesSessionFromRegistry() {
-        Object principal = "Some principal object";
-        final String sessionId = "zzzz";
+	@Test
+	public void sessionDestroyedEventRemovesSessionFromRegistry() {
+		Object principal = "Some principal object";
+		final String sessionId = "zzzz";
 
-        // Register new Session
-        sessionRegistry.registerNewSession(sessionId, principal);
+		// Register new Session
+		sessionRegistry.registerNewSession(sessionId, principal);
 
-        // De-register session via an ApplicationEvent
-        sessionRegistry.onApplicationEvent(new SessionDestroyedEvent("") {
-            @Override
-            public String getId() {
-                return sessionId;
-            }
+		// De-register session via an ApplicationEvent
+		sessionRegistry.onApplicationEvent(new SessionDestroyedEvent("") {
+			@Override
+			public String getId() {
+				return sessionId;
+			}
 
-            @Override
-            public List<SecurityContext> getSecurityContexts() {
-                return null;
-            }
-        });
+			@Override
+			public List<SecurityContext> getSecurityContexts() {
+				return null;
+			}
+		});
 
-        // Check attempts to retrieve cleared session return null
-        assertNull(sessionRegistry.getSessionInformation(sessionId));
-    }
+		// Check attempts to retrieve cleared session return null
+		assertNull(sessionRegistry.getSessionInformation(sessionId));
+	}
 
-    @Test
-    public void testMultiplePrincipals() throws Exception {
-        Object principal1 = "principal_1";
-        Object principal2 = "principal_2";
-        String sessionId1 = "1234567890";
-        String sessionId2 = "9876543210";
-        String sessionId3 = "5432109876";
+	@Test
+	public void testMultiplePrincipals() throws Exception {
+		Object principal1 = "principal_1";
+		Object principal2 = "principal_2";
+		String sessionId1 = "1234567890";
+		String sessionId2 = "9876543210";
+		String sessionId3 = "5432109876";
 
-        sessionRegistry.registerNewSession(sessionId1, principal1);
-        sessionRegistry.registerNewSession(sessionId2, principal1);
-        sessionRegistry.registerNewSession(sessionId3, principal2);
+		sessionRegistry.registerNewSession(sessionId1, principal1);
+		sessionRegistry.registerNewSession(sessionId2, principal1);
+		sessionRegistry.registerNewSession(sessionId3, principal2);
 
-        assertEquals(2, sessionRegistry.getAllPrincipals().size());
-        assertTrue(sessionRegistry.getAllPrincipals().contains(principal1));
-        assertTrue(sessionRegistry.getAllPrincipals().contains(principal2));
-    }
+		assertEquals(2, sessionRegistry.getAllPrincipals().size());
+		assertTrue(sessionRegistry.getAllPrincipals().contains(principal1));
+		assertTrue(sessionRegistry.getAllPrincipals().contains(principal2));
+	}
 
-    @Test
-    public void testSessionInformationLifecycle() throws Exception {
-        Object principal = "Some principal object";
-        String sessionId = "1234567890";
-        // Register new Session
-        sessionRegistry.registerNewSession(sessionId, principal);
+	@Test
+	public void testSessionInformationLifecycle() throws Exception {
+		Object principal = "Some principal object";
+		String sessionId = "1234567890";
+		// Register new Session
+		sessionRegistry.registerNewSession(sessionId, principal);
 
-        // Retrieve existing session by session ID
-        Date currentDateTime = sessionRegistry.getSessionInformation(sessionId).getLastRequest();
-        assertEquals(principal, sessionRegistry.getSessionInformation(sessionId).getPrincipal());
-        assertEquals(sessionId, sessionRegistry.getSessionInformation(sessionId).getSessionId());
-        assertNotNull(sessionRegistry.getSessionInformation(sessionId).getLastRequest());
+		// Retrieve existing session by session ID
+		Date currentDateTime = sessionRegistry.getSessionInformation(sessionId)
+				.getLastRequest();
+		assertEquals(principal, sessionRegistry.getSessionInformation(sessionId)
+				.getPrincipal());
+		assertEquals(sessionId, sessionRegistry.getSessionInformation(sessionId)
+				.getSessionId());
+		assertNotNull(sessionRegistry.getSessionInformation(sessionId).getLastRequest());
 
-        // Retrieve existing session by principal
-        assertEquals(1, sessionRegistry.getAllSessions(principal, false).size());
+		// Retrieve existing session by principal
+		assertEquals(1, sessionRegistry.getAllSessions(principal, false).size());
 
-        // Sleep to ensure SessionRegistryImpl will update time
-        Thread.sleep(1000);
+		// Sleep to ensure SessionRegistryImpl will update time
+		Thread.sleep(1000);
 
-        // Update request date/time
-        sessionRegistry.refreshLastRequest(sessionId);
+		// Update request date/time
+		sessionRegistry.refreshLastRequest(sessionId);
 
-        Date retrieved = sessionRegistry.getSessionInformation(sessionId).getLastRequest();
-        assertTrue(retrieved.after(currentDateTime));
+		Date retrieved = sessionRegistry.getSessionInformation(sessionId)
+				.getLastRequest();
+		assertTrue(retrieved.after(currentDateTime));
 
-        // Check it retrieves correctly when looked up via principal
-        assertEquals(retrieved, sessionRegistry.getAllSessions(principal, false).get(0).getLastRequest());
+		// Check it retrieves correctly when looked up via principal
+		assertEquals(retrieved, sessionRegistry.getAllSessions(principal, false).get(0)
+				.getLastRequest());
 
-        // Clear session information
-        sessionRegistry.removeSessionInformation(sessionId);
+		// Clear session information
+		sessionRegistry.removeSessionInformation(sessionId);
 
-        // Check attempts to retrieve cleared session return null
-        assertNull(sessionRegistry.getSessionInformation(sessionId));
-        assertEquals(0, sessionRegistry.getAllSessions(principal, false).size());
-    }
+		// Check attempts to retrieve cleared session return null
+		assertNull(sessionRegistry.getSessionInformation(sessionId));
+		assertEquals(0, sessionRegistry.getAllSessions(principal, false).size());
+	}
 
-    @Test
-    public void testTwoSessionsOnePrincipalExpiring() throws Exception {
-        Object principal = "Some principal object";
-        String sessionId1 = "1234567890";
-        String sessionId2 = "9876543210";
+	@Test
+	public void testTwoSessionsOnePrincipalExpiring() throws Exception {
+		Object principal = "Some principal object";
+		String sessionId1 = "1234567890";
+		String sessionId2 = "9876543210";
 
-        sessionRegistry.registerNewSession(sessionId1, principal);
-        List<SessionInformation> sessions = sessionRegistry.getAllSessions(principal, false);
-        assertEquals(1, sessions.size());
-        assertTrue(contains(sessionId1, principal));
+		sessionRegistry.registerNewSession(sessionId1, principal);
+		List<SessionInformation> sessions = sessionRegistry.getAllSessions(principal,
+				false);
+		assertEquals(1, sessions.size());
+		assertTrue(contains(sessionId1, principal));
 
-        sessionRegistry.registerNewSession(sessionId2, principal);
-        sessions = sessionRegistry.getAllSessions(principal, false);
-        assertEquals(2, sessions.size());
-        assertTrue(contains(sessionId2, principal));
+		sessionRegistry.registerNewSession(sessionId2, principal);
+		sessions = sessionRegistry.getAllSessions(principal, false);
+		assertEquals(2, sessions.size());
+		assertTrue(contains(sessionId2, principal));
 
-        // Expire one session
-        SessionInformation session = sessionRegistry.getSessionInformation(sessionId2);
-        session.expireNow();
+		// Expire one session
+		SessionInformation session = sessionRegistry.getSessionInformation(sessionId2);
+		session.expireNow();
 
-        // Check retrieval still correct
-        assertTrue(sessionRegistry.getSessionInformation(sessionId2).isExpired());
-        assertFalse(sessionRegistry.getSessionInformation(sessionId1).isExpired());
-    }
+		// Check retrieval still correct
+		assertTrue(sessionRegistry.getSessionInformation(sessionId2).isExpired());
+		assertFalse(sessionRegistry.getSessionInformation(sessionId1).isExpired());
+	}
 
-    @Test
-    public void testTwoSessionsOnePrincipalHandling() throws Exception {
-        Object principal = "Some principal object";
-        String sessionId1 = "1234567890";
-        String sessionId2 = "9876543210";
+	@Test
+	public void testTwoSessionsOnePrincipalHandling() throws Exception {
+		Object principal = "Some principal object";
+		String sessionId1 = "1234567890";
+		String sessionId2 = "9876543210";
 
-        sessionRegistry.registerNewSession(sessionId1, principal);
-        List<SessionInformation> sessions = sessionRegistry.getAllSessions(principal, false);
-        assertEquals(1, sessions.size());
-        assertTrue(contains(sessionId1, principal));
+		sessionRegistry.registerNewSession(sessionId1, principal);
+		List<SessionInformation> sessions = sessionRegistry.getAllSessions(principal,
+				false);
+		assertEquals(1, sessions.size());
+		assertTrue(contains(sessionId1, principal));
 
-        sessionRegistry.registerNewSession(sessionId2, principal);
-        sessions = sessionRegistry.getAllSessions(principal, false);
-        assertEquals(2, sessions.size());
-        assertTrue(contains(sessionId2, principal));
+		sessionRegistry.registerNewSession(sessionId2, principal);
+		sessions = sessionRegistry.getAllSessions(principal, false);
+		assertEquals(2, sessions.size());
+		assertTrue(contains(sessionId2, principal));
 
-        sessionRegistry.removeSessionInformation(sessionId1);
-        sessions = sessionRegistry.getAllSessions(principal, false);
-        assertEquals(1, sessions.size());
-        assertTrue(contains(sessionId2, principal));
+		sessionRegistry.removeSessionInformation(sessionId1);
+		sessions = sessionRegistry.getAllSessions(principal, false);
+		assertEquals(1, sessions.size());
+		assertTrue(contains(sessionId2, principal));
 
-        sessionRegistry.removeSessionInformation(sessionId2);
-        assertNull(sessionRegistry.getSessionInformation(sessionId2));
-        assertEquals(0, sessionRegistry.getAllSessions(principal, false).size());
-    }
+		sessionRegistry.removeSessionInformation(sessionId2);
+		assertNull(sessionRegistry.getSessionInformation(sessionId2));
+		assertEquals(0, sessionRegistry.getAllSessions(principal, false).size());
+	}
 
-    private boolean contains(String sessionId, Object principal) {
-        List<SessionInformation> info = sessionRegistry.getAllSessions(principal, false);
+	private boolean contains(String sessionId, Object principal) {
+		List<SessionInformation> info = sessionRegistry.getAllSessions(principal, false);
 
-        for (int i = 0; i < info.size(); i++) {
-            if (sessionId.equals(info.get(i).getSessionId())) {
-                return true;
-            }
-        }
+		for (int i = 0; i < info.size(); i++) {
+			if (sessionId.equals(info.get(i).getSessionId())) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java b/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java
index 487e45e088..3ce6f350cd 100644
--- a/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java
+++ b/core/src/test/java/org/springframework/security/core/token/DefaultTokenTests.java
@@ -14,31 +14,31 @@ import org.springframework.security.core.token.DefaultToken;
  *
  */
 public class DefaultTokenTests {
-    @Test
-    public void testEquality() {
-        String key = "key";
-        long created = new Date().getTime();
-        String extendedInformation = "extended";
+	@Test
+	public void testEquality() {
+		String key = "key";
+		long created = new Date().getTime();
+		String extendedInformation = "extended";
 
-        DefaultToken t1 = new DefaultToken(key, created, extendedInformation);
-        DefaultToken t2 = new DefaultToken(key, created, extendedInformation);
-        Assert.assertEquals(t1, t2);
-    }
+		DefaultToken t1 = new DefaultToken(key, created, extendedInformation);
+		DefaultToken t2 = new DefaultToken(key, created, extendedInformation);
+		Assert.assertEquals(t1, t2);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNullExtendedInformation() {
-        String key = "key";
-        long created = new Date().getTime();
-        new DefaultToken(key, created, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNullExtendedInformation() {
+		String key = "key";
+		long created = new Date().getTime();
+		new DefaultToken(key, created, null);
+	}
 
-    @Test
-    public void testEqualityWithDifferentExtendedInformation3() {
-        String key = "key";
-        long created = new Date().getTime();
+	@Test
+	public void testEqualityWithDifferentExtendedInformation3() {
+		String key = "key";
+		long created = new Date().getTime();
 
-        DefaultToken t1 = new DefaultToken(key, created, "length1");
-        DefaultToken t2 = new DefaultToken(key, created, "longerLength2");
-        Assert.assertFalse(t1.equals(t2));
-    }
+		DefaultToken t1 = new DefaultToken(key, created, "length1");
+		DefaultToken t2 = new DefaultToken(key, created, "longerLength2");
+		Assert.assertFalse(t1.equals(t2));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java
index f4b0c9d73e..d50b753882 100644
--- a/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java
+++ b/core/src/test/java/org/springframework/security/core/token/KeyBasedPersistenceTokenServiceTests.java
@@ -1,5 +1,3 @@
-
-
 package org.springframework.security.core.token;
 
 import java.security.SecureRandom;
@@ -21,68 +19,68 @@ import org.springframework.security.core.token.Token;
  */
 public class KeyBasedPersistenceTokenServiceTests {
 
-    private KeyBasedPersistenceTokenService getService() {
-        SecureRandomFactoryBean fb = new SecureRandomFactoryBean();
-        KeyBasedPersistenceTokenService service = new KeyBasedPersistenceTokenService();
-        service.setServerSecret("MY:SECRET$$$#");
-        service.setServerInteger(Integer.valueOf(454545));
-        try {
-            SecureRandom rnd = (SecureRandom) fb.getObject();
-            service.setSecureRandom(rnd);
-            service.afterPropertiesSet();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        return service;
-    }
+	private KeyBasedPersistenceTokenService getService() {
+		SecureRandomFactoryBean fb = new SecureRandomFactoryBean();
+		KeyBasedPersistenceTokenService service = new KeyBasedPersistenceTokenService();
+		service.setServerSecret("MY:SECRET$$$#");
+		service.setServerInteger(Integer.valueOf(454545));
+		try {
+			SecureRandom rnd = (SecureRandom) fb.getObject();
+			service.setSecureRandom(rnd);
+			service.afterPropertiesSet();
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		return service;
+	}
 
-    @Test
-    public void testOperationWithSimpleExtendedInformation() {
-        KeyBasedPersistenceTokenService service = getService();
-        Token token = service.allocateToken("Hello world");
-        Token result = service.verifyToken(token.getKey());
-        Assert.assertEquals(token, result);
-    }
+	@Test
+	public void testOperationWithSimpleExtendedInformation() {
+		KeyBasedPersistenceTokenService service = getService();
+		Token token = service.allocateToken("Hello world");
+		Token result = service.verifyToken(token.getKey());
+		Assert.assertEquals(token, result);
+	}
 
+	@Test
+	public void testOperationWithComplexExtendedInformation() {
+		KeyBasedPersistenceTokenService service = getService();
+		Token token = service.allocateToken("Hello:world:::");
+		Token result = service.verifyToken(token.getKey());
+		Assert.assertEquals(token, result);
+	}
 
-    @Test
-    public void testOperationWithComplexExtendedInformation() {
-        KeyBasedPersistenceTokenService service = getService();
-        Token token = service.allocateToken("Hello:world:::");
-        Token result = service.verifyToken(token.getKey());
-        Assert.assertEquals(token, result);
-    }
+	@Test
+	public void testOperationWithEmptyRandomNumber() {
+		KeyBasedPersistenceTokenService service = getService();
+		service.setPseudoRandomNumberBytes(0);
+		Token token = service.allocateToken("Hello:world:::");
+		Token result = service.verifyToken(token.getKey());
+		Assert.assertEquals(token, result);
+	}
 
-    @Test
-    public void testOperationWithEmptyRandomNumber() {
-        KeyBasedPersistenceTokenService service = getService();
-        service.setPseudoRandomNumberBytes(0);
-        Token token = service.allocateToken("Hello:world:::");
-        Token result = service.verifyToken(token.getKey());
-        Assert.assertEquals(token, result);
-    }
+	@Test
+	public void testOperationWithNoExtendedInformation() {
+		KeyBasedPersistenceTokenService service = getService();
+		Token token = service.allocateToken("");
+		Token result = service.verifyToken(token.getKey());
+		Assert.assertEquals(token, result);
+	}
 
-    @Test
-    public void testOperationWithNoExtendedInformation() {
-        KeyBasedPersistenceTokenService service = getService();
-        Token token = service.allocateToken("");
-        Token result = service.verifyToken(token.getKey());
-        Assert.assertEquals(token, result);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testOperationWithMissingKey() {
+		KeyBasedPersistenceTokenService service = getService();
+		Token token = new DefaultToken("", new Date().getTime(), "");
+		service.verifyToken(token.getKey());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testOperationWithMissingKey() {
-        KeyBasedPersistenceTokenService service = getService();
-        Token token = new DefaultToken("", new Date().getTime(), "");
-        service.verifyToken(token.getKey());
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testOperationWithTamperedKey() {
-        KeyBasedPersistenceTokenService service = getService();
-        Token goodToken = service.allocateToken("");
-        String fake = goodToken.getKey().toUpperCase();
-        Token token = new DefaultToken(fake, new Date().getTime(), "");
-        service.verifyToken(token.getKey());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testOperationWithTamperedKey() {
+		KeyBasedPersistenceTokenService service = getService();
+		Token goodToken = service.allocateToken("");
+		String fake = goodToken.getKey().toUpperCase();
+		Token token = new DefaultToken(fake, new Date().getTime(), "");
+		service.verifyToken(token.getKey());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java b/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java
index ee93ecebe7..4ba655aa6f 100644
--- a/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java
+++ b/core/src/test/java/org/springframework/security/core/token/SecureRandomFactoryBeanTests.java
@@ -16,37 +16,38 @@ import junit.framework.Assert;
  *
  */
 public class SecureRandomFactoryBeanTests {
-    @Test
-    public void testObjectType() {
-        SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
-        Assert.assertEquals(SecureRandom.class, factory.getObjectType());
-    }
+	@Test
+	public void testObjectType() {
+		SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
+		Assert.assertEquals(SecureRandom.class, factory.getObjectType());
+	}
 
-    @Test
-    public void testIsSingleton() {
-        SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
-        Assert.assertFalse(factory.isSingleton());
-    }
+	@Test
+	public void testIsSingleton() {
+		SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
+		Assert.assertFalse(factory.isSingleton());
+	}
 
-    @Test
-    public void testCreatesUsingDefaults() throws Exception {
-        SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
-        Object result = factory.getObject();
-        Assert.assertTrue(result instanceof SecureRandom);
-        int rnd = ((SecureRandom)result).nextInt();
-        Assert.assertTrue(rnd != 0);
-    }
+	@Test
+	public void testCreatesUsingDefaults() throws Exception {
+		SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
+		Object result = factory.getObject();
+		Assert.assertTrue(result instanceof SecureRandom);
+		int rnd = ((SecureRandom) result).nextInt();
+		Assert.assertTrue(rnd != 0);
+	}
 
-    @Test
-    public void testCreatesUsingSeed() throws Exception {
-        SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
-        Resource resource = new ClassPathResource("org/springframework/security/core/token/SecureRandomFactoryBeanTests.class");
-        Assert.assertNotNull(resource);
-        factory.setSeed(resource);
-        Object result = factory.getObject();
-        Assert.assertTrue(result instanceof SecureRandom);
-        int rnd = ((SecureRandom)result).nextInt();
-        Assert.assertTrue(rnd != 0);
-    }
+	@Test
+	public void testCreatesUsingSeed() throws Exception {
+		SecureRandomFactoryBean factory = new SecureRandomFactoryBean();
+		Resource resource = new ClassPathResource(
+				"org/springframework/security/core/token/SecureRandomFactoryBeanTests.class");
+		Assert.assertNotNull(resource);
+		factory.setSeed(resource);
+		Object result = factory.getObject();
+		Assert.assertTrue(result instanceof SecureRandom);
+		int rnd = ((SecureRandom) result).nextInt();
+		Assert.assertTrue(rnd != 0);
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java
index b2c512ac00..da46478575 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java
@@ -8,28 +8,31 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
 /**
- * A test UserDetailsService containing a set of standard usernames corresponding to their account status:
- * valid, locked, disabled, credentialsExpired, expired. All passwords are "".
+ * A test UserDetailsService containing a set of standard usernames corresponding to their
+ * account status: valid, locked, disabled, credentialsExpired, expired. All passwords are
+ * "".
  *
  * @author Luke Taylor
  */
 public class MockUserDetailsService implements UserDetailsService {
-    private Map<String, User> users = new HashMap<String, User>();
-    private List<GrantedAuthority> auths = AuthorityUtils.createAuthorityList("ROLE_USER");
+	private Map<String, User> users = new HashMap<String, User>();
+	private List<GrantedAuthority> auths = AuthorityUtils
+			.createAuthorityList("ROLE_USER");
 
-    public MockUserDetailsService() {
-        users.put("valid", new User("valid", "",true,true,true,true,auths));
-        users.put("locked", new User("locked", "",true,true,true,false,auths));
-        users.put("disabled", new User("disabled", "",false,true,true,true,auths));
-        users.put("credentialsExpired", new User("credentialsExpired", "",true,true,false,true,auths));
-        users.put("expired", new User("expired", "",true,false,true,true,auths));
-    }
+	public MockUserDetailsService() {
+		users.put("valid", new User("valid", "", true, true, true, true, auths));
+		users.put("locked", new User("locked", "", true, true, true, false, auths));
+		users.put("disabled", new User("disabled", "", false, true, true, true, auths));
+		users.put("credentialsExpired", new User("credentialsExpired", "", true, true,
+				false, true, auths));
+		users.put("expired", new User("expired", "", true, false, true, true, auths));
+	}
 
-    public UserDetails loadUserByUsername(String username) {
-        if (users.get(username) == null) {
-            throw new UsernameNotFoundException("User not found: " + username);
-        }
+	public UserDetails loadUserByUsername(String username) {
+		if (users.get(username) == null) {
+			throw new UsernameNotFoundException("User not found: " + username);
+		}
 
-        return users.get(username);
-    }
+		return users.get(username);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java
index a28349ef34..726e9c0379 100755
--- a/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/UserDetailsByNameServiceWrapperTests.java
@@ -13,34 +13,40 @@ import org.springframework.security.core.authority.AuthorityUtils;
 @SuppressWarnings("unchecked")
 public class UserDetailsByNameServiceWrapperTests extends TestCase {
 
-    public final void testAfterPropertiesSet() {
-        UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
-        try {
-            svc.afterPropertiesSet();
-            fail("AfterPropertiesSet didn't throw expected exception");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception unexpected) {
-            fail("AfterPropertiesSet throws unexpected exception");
-        }
-    }
+	public final void testAfterPropertiesSet() {
+		UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
+		try {
+			svc.afterPropertiesSet();
+			fail("AfterPropertiesSet didn't throw expected exception");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		catch (Exception unexpected) {
+			fail("AfterPropertiesSet throws unexpected exception");
+		}
+	}
 
-    public final void testGetUserDetails() throws Exception {
-        UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
-        final User user = new User("dummy", "dummy", true, true, true, true, AuthorityUtils.NO_AUTHORITIES);
-        svc.setUserDetailsService(new UserDetailsService() {
-            public UserDetails loadUserByUsername(String name) {
-                if (user != null && user.getUsername().equals(name)) {
-                    return user;
-                } else {
-                    return null;
-                }
-            }
-        });
-        svc.afterPropertiesSet();
-        UserDetails result1 = svc.loadUserDetails(new TestingAuthenticationToken("dummy", "dummy"));
-        assertEquals("Result doesn't match original user", user, result1);
-        UserDetails result2 = svc.loadUserDetails(new TestingAuthenticationToken("dummy2", "dummy"));
-        assertNull("Result should have been null", result2);
-    }
+	public final void testGetUserDetails() throws Exception {
+		UserDetailsByNameServiceWrapper svc = new UserDetailsByNameServiceWrapper();
+		final User user = new User("dummy", "dummy", true, true, true, true,
+				AuthorityUtils.NO_AUTHORITIES);
+		svc.setUserDetailsService(new UserDetailsService() {
+			public UserDetails loadUserByUsername(String name) {
+				if (user != null && user.getUsername().equals(name)) {
+					return user;
+				}
+				else {
+					return null;
+				}
+			}
+		});
+		svc.afterPropertiesSet();
+		UserDetails result1 = svc.loadUserDetails(new TestingAuthenticationToken("dummy",
+				"dummy"));
+		assertEquals("Result doesn't match original user", user, result1);
+		UserDetails result2 = svc.loadUserDetails(new TestingAuthenticationToken(
+				"dummy2", "dummy"));
+		assertNull("Result should have been null", result2);
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java
index 13151544c3..904e70c0ed 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java
@@ -28,108 +28,121 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
-
 /**
  * Tests {@link User}.
  *
  * @author Ben Alex
  */
 public class UserTests {
-    private static final List<GrantedAuthority> ROLE_12 = AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO");
-    //~ Methods ========================================================================================================
+	private static final List<GrantedAuthority> ROLE_12 = AuthorityUtils
+			.createAuthorityList("ROLE_ONE", "ROLE_TWO");
 
-    @Test
-    public void equalsReturnsTrueIfUsernamesAreTheSame() {
-        User user1 = new User("rod", "koala", true, true, true, true, ROLE_12);
+	// ~ Methods
+	// ========================================================================================================
 
-        assertFalse(user1.equals(null));
-        assertFalse(user1.equals("A STRING"));
-        assertTrue(user1.equals(user1));
-        assertTrue(user1.equals(new User("rod", "notthesame", true, true, true, true, ROLE_12)));
-    }
+	@Test
+	public void equalsReturnsTrueIfUsernamesAreTheSame() {
+		User user1 = new User("rod", "koala", true, true, true, true, ROLE_12);
 
-    @Test
-    public void hashLookupOnlyDependsOnUsername() throws Exception {
-        User user1 = new User("rod", "koala", true, true, true, true, ROLE_12);
-        Set<UserDetails> users = new HashSet<UserDetails>();
-        users.add(user1);
+		assertFalse(user1.equals(null));
+		assertFalse(user1.equals("A STRING"));
+		assertTrue(user1.equals(user1));
+		assertTrue(user1.equals(new User("rod", "notthesame", true, true, true, true,
+				ROLE_12)));
+	}
 
-        assertTrue(users.contains(new User("rod", "koala", true, true, true, true, ROLE_12)));
-        assertTrue(users.contains(new User("rod", "anotherpass", false, false, false, false, AuthorityUtils.createAuthorityList("ROLE_X"))));
-        assertFalse(users.contains(new User("bod", "koala", true, true, true, true, ROLE_12)));
-    }
+	@Test
+	public void hashLookupOnlyDependsOnUsername() throws Exception {
+		User user1 = new User("rod", "koala", true, true, true, true, ROLE_12);
+		Set<UserDetails> users = new HashSet<UserDetails>();
+		users.add(user1);
 
-    @Test
-    public void testNoArgConstructorDoesntExist() {
-        Class<User> clazz = User.class;
+		assertTrue(users.contains(new User("rod", "koala", true, true, true, true,
+				ROLE_12)));
+		assertTrue(users.contains(new User("rod", "anotherpass", false, false, false,
+				false, AuthorityUtils.createAuthorityList("ROLE_X"))));
+		assertFalse(users.contains(new User("bod", "koala", true, true, true, true,
+				ROLE_12)));
+	}
 
-        try {
-            clazz.getDeclaredConstructor((Class[]) null);
-            fail("Should have thrown NoSuchMethodException");
-        } catch (NoSuchMethodException expected) {
-        }
-    }
+	@Test
+	public void testNoArgConstructorDoesntExist() {
+		Class<User> clazz = User.class;
 
-    @Test
-    public void testNullValuesRejected() throws Exception {
-        try {
-            new User(null, "koala", true, true, true, true,ROLE_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			clazz.getDeclaredConstructor((Class[]) null);
+			fail("Should have thrown NoSuchMethodException");
+		}
+		catch (NoSuchMethodException expected) {
+		}
+	}
 
-        try {
-            new User("rod", null, true, true, true, true, ROLE_12);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
+	@Test
+	public void testNullValuesRejected() throws Exception {
+		try {
+			new User(null, "koala", true, true, true, true, ROLE_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            List<GrantedAuthority> auths = AuthorityUtils.createAuthorityList("ROLE_ONE");
-            auths.add(null);
-            new User("rod", "koala", true, true, true, true, auths);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			new User("rod", null, true, true, true, true, ROLE_12);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-    @Test
-    public void testNullWithinGrantedAuthorityElementIsRejected() throws Exception {
-        try {
-            List<GrantedAuthority> auths = AuthorityUtils.createAuthorityList("ROLE_ONE");
-            auths.add(null);
-            auths.add(new SimpleGrantedAuthority("ROLE_THREE"));
-            new User(null, "koala", true, true, true, true, auths);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			List<GrantedAuthority> auths = AuthorityUtils.createAuthorityList("ROLE_ONE");
+			auths.add(null);
+			new User("rod", "koala", true, true, true, true, auths);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void testUserGettersSetter() throws Exception {
-        UserDetails user = new User("rod", "koala", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_TWO","ROLE_ONE"));
-        assertEquals("rod", user.getUsername());
-        assertEquals("koala", user.getPassword());
-        assertTrue(user.isEnabled());
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_ONE"));
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_TWO"));
-        assertTrue(user.toString().indexOf("rod") != -1);
-    }
+	@Test
+	public void testNullWithinGrantedAuthorityElementIsRejected() throws Exception {
+		try {
+			List<GrantedAuthority> auths = AuthorityUtils.createAuthorityList("ROLE_ONE");
+			auths.add(null);
+			auths.add(new SimpleGrantedAuthority("ROLE_THREE"));
+			new User(null, "koala", true, true, true, true, auths);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void enabledFlagIsFalseForDisabledAccount() throws Exception {
-        UserDetails user = new User("rod", "koala", false, true, true, true, ROLE_12);
-        assertFalse(user.isEnabled());
-    }
+	@Test
+	public void testUserGettersSetter() throws Exception {
+		UserDetails user = new User("rod", "koala", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_TWO", "ROLE_ONE"));
+		assertEquals("rod", user.getUsername());
+		assertEquals("koala", user.getPassword());
+		assertTrue(user.isEnabled());
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_ONE"));
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_TWO"));
+		assertTrue(user.toString().indexOf("rod") != -1);
+	}
 
-    @Test
-    public void useIsSerializable() throws Exception {
-        UserDetails user = new User("rod", "koala", false, true, true, true, ROLE_12);
-        // Serialize to a byte array
-        ByteArrayOutputStream bos = new ByteArrayOutputStream() ;
-        ObjectOutputStream out = new ObjectOutputStream(bos) ;
-        out.writeObject(user);
-        out.close();
-    }
+	@Test
+	public void enabledFlagIsFalseForDisabledAccount() throws Exception {
+		UserDetails user = new User("rod", "koala", false, true, true, true, ROLE_12);
+		assertFalse(user.isEnabled());
+	}
+
+	@Test
+	public void useIsSerializable() throws Exception {
+		UserDetails user = new User("rod", "koala", false, true, true, true, ROLE_12);
+		// Serialize to a byte array
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		ObjectOutputStream out = new ObjectOutputStream(bos);
+		out.writeObject(user);
+		out.close();
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java
index 978d8d9f1b..dccfc61de7 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/EhCacheBasedUserCacheTests.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.core.userdetails.cache;
 
-
 import static org.junit.Assert.*;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
@@ -34,61 +33,64 @@ import org.springframework.security.core.userdetails.cache.EhCacheBasedUserCache
  * @author Ben Alex
  */
 public class EhCacheBasedUserCacheTests {
-    private static CacheManager cacheManager;
+	private static CacheManager cacheManager;
 
-    //~ Methods ========================================================================================================
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = CacheManager.create();
-        cacheManager.addCache(new Cache("ehcacheusercachetests", 500, false, false, 30, 30));
-    }
+	// ~ Methods
+	// ========================================================================================================
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = CacheManager.create();
+		cacheManager.addCache(new Cache("ehcacheusercachetests", 500, false, false, 30,
+				30));
+	}
 
-    @AfterClass
-    public static void shutdownCacheManager() {
-        cacheManager.removalAll();
-        cacheManager.shutdown();
-    }
+	@AfterClass
+	public static void shutdownCacheManager() {
+		cacheManager.removalAll();
+		cacheManager.shutdown();
+	}
 
-    private Ehcache getCache() {
-        Ehcache cache = cacheManager.getCache("ehcacheusercachetests");
-        cache.removeAll();
+	private Ehcache getCache() {
+		Ehcache cache = cacheManager.getCache("ehcacheusercachetests");
+		cache.removeAll();
 
-        return cache;
-    }
+		return cache;
+	}
 
-    private User getUser() {
-        return new User("john", "password", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-    }
+	private User getUser() {
+		return new User("john", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	}
 
-    @Test
-    public void cacheOperationsAreSuccessful() throws Exception {
-        EhCacheBasedUserCache cache = new EhCacheBasedUserCache();
-        cache.setCache(getCache());
-        cache.afterPropertiesSet();
+	@Test
+	public void cacheOperationsAreSuccessful() throws Exception {
+		EhCacheBasedUserCache cache = new EhCacheBasedUserCache();
+		cache.setCache(getCache());
+		cache.afterPropertiesSet();
 
-        // Check it gets stored in the cache
-        cache.putUserInCache(getUser());
-        assertEquals(getUser().getPassword(), cache.getUserFromCache(getUser().getUsername()).getPassword());
+		// Check it gets stored in the cache
+		cache.putUserInCache(getUser());
+		assertEquals(getUser().getPassword(),
+				cache.getUserFromCache(getUser().getUsername()).getPassword());
 
-        // Check it gets removed from the cache
-        cache.removeUserFromCache(getUser());
-        assertNull(cache.getUserFromCache(getUser().getUsername()));
+		// Check it gets removed from the cache
+		cache.removeUserFromCache(getUser());
+		assertNull(cache.getUserFromCache(getUser().getUsername()));
 
-        // Check it doesn't return values for null or unknown users
-        assertNull(cache.getUserFromCache(null));
-        assertNull(cache.getUserFromCache("UNKNOWN_USER"));
-    }
+		// Check it doesn't return values for null or unknown users
+		assertNull(cache.getUserFromCache(null));
+		assertNull(cache.getUserFromCache("UNKNOWN_USER"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void startupDetectsMissingCache() throws Exception {
-        EhCacheBasedUserCache cache = new EhCacheBasedUserCache();
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingCache() throws Exception {
+		EhCacheBasedUserCache cache = new EhCacheBasedUserCache();
 
-        cache.afterPropertiesSet();
-        fail("Should have thrown IllegalArgumentException");
+		cache.afterPropertiesSet();
+		fail("Should have thrown IllegalArgumentException");
 
-        Ehcache myCache = getCache();
-        cache.setCache(myCache);
-        assertEquals(myCache, cache.getCache());
-    }
+		Ehcache myCache = getCache();
+		cache.setCache(myCache);
+		assertEquals(myCache, cache.getCache());
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java
index cf48be34cd..c26590a105 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/NullUserCacheTests.java
@@ -21,7 +21,6 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.cache.NullUserCache;
 
-
 /**
  * Tests {@link NullUserCache}.
  *
@@ -29,17 +28,18 @@ import org.springframework.security.core.userdetails.cache.NullUserCache;
  */
 public class NullUserCacheTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private User getUser() {
-        return new User("john", "password", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-    }
+	private User getUser() {
+		return new User("john", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	}
 
-    public void testCacheOperation() throws Exception {
-        NullUserCache cache = new NullUserCache();
-        cache.putUserInCache(getUser());
-        assertNull(cache.getUserFromCache(null));
-        cache.removeUserFromCache(null);
-    }
+	public void testCacheOperation() throws Exception {
+		NullUserCache cache = new NullUserCache();
+		cache.putUserInCache(getUser());
+		assertNull(cache.getUserFromCache(null));
+		cache.removeUserFromCache(null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java
index f77422a00d..b13d0c5f14 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCacheTests.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.core.userdetails.cache;
 
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -28,56 +27,59 @@ import org.springframework.security.core.userdetails.User;
 import static org.junit.Assert.*;
 
 /**
- * Tests {@link org.springframework.security.core.userdetails.cache.SpringCacheBasedUserCache}.
+ * Tests
+ * {@link org.springframework.security.core.userdetails.cache.SpringCacheBasedUserCache}.
  *
  * @author Marten Deinum
  * @since 3.2
  *
  */
 public class SpringCacheBasedUserCacheTests {
-    private static CacheManager cacheManager;
+	private static CacheManager cacheManager;
 
-    //~ Methods ========================================================================================================
-    @BeforeClass
-    public static void initCacheManaer() {
-        cacheManager = new ConcurrentMapCacheManager();
-        cacheManager.getCache("springbasedusercachetests");
-    }
+	// ~ Methods
+	// ========================================================================================================
+	@BeforeClass
+	public static void initCacheManaer() {
+		cacheManager = new ConcurrentMapCacheManager();
+		cacheManager.getCache("springbasedusercachetests");
+	}
 
-    @AfterClass
-    public static void shutdownCacheManager() {
-    }
+	@AfterClass
+	public static void shutdownCacheManager() {
+	}
 
-    private Cache getCache() {
-        Cache cache = cacheManager.getCache("springbasedusercachetests");
-        cache.clear();
-        return cache;
-    }
+	private Cache getCache() {
+		Cache cache = cacheManager.getCache("springbasedusercachetests");
+		cache.clear();
+		return cache;
+	}
 
-    private User getUser() {
-        return new User("john", "password", true, true, true, true,
-                AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
-    }
+	private User getUser() {
+		return new User("john", "password", true, true, true, true,
+				AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"));
+	}
 
-    @Test
-    public void cacheOperationsAreSuccessful() throws Exception {
-        SpringCacheBasedUserCache cache = new SpringCacheBasedUserCache(getCache());
+	@Test
+	public void cacheOperationsAreSuccessful() throws Exception {
+		SpringCacheBasedUserCache cache = new SpringCacheBasedUserCache(getCache());
 
-        // Check it gets stored in the cache
-        cache.putUserInCache(getUser());
-        assertEquals(getUser().getPassword(), cache.getUserFromCache(getUser().getUsername()).getPassword());
+		// Check it gets stored in the cache
+		cache.putUserInCache(getUser());
+		assertEquals(getUser().getPassword(),
+				cache.getUserFromCache(getUser().getUsername()).getPassword());
 
-        // Check it gets removed from the cache
-        cache.removeUserFromCache(getUser());
-        assertNull(cache.getUserFromCache(getUser().getUsername()));
+		// Check it gets removed from the cache
+		cache.removeUserFromCache(getUser());
+		assertNull(cache.getUserFromCache(getUser().getUsername()));
 
-        // Check it doesn't return values for null or unknown users
-        assertNull(cache.getUserFromCache(null));
-        assertNull(cache.getUserFromCache("UNKNOWN_USER"));
-    }
+		// Check it doesn't return values for null or unknown users
+		assertNull(cache.getUserFromCache(null));
+		assertNull(cache.getUserFromCache("UNKNOWN_USER"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void startupDetectsMissingCache() throws Exception {
-        new SpringCacheBasedUserCache(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingCache() throws Exception {
+		new SpringCacheBasedUserCache(null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java
index a4768c23b6..043870b0be 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImplTests.java
@@ -22,7 +22,6 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
-
 /**
  * Tests {@link JdbcDaoImpl}.
  *
@@ -30,135 +29,145 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
  */
 public class JdbcDaoImplTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private JdbcDaoImpl makePopulatedJdbcDao() throws Exception {
-        JdbcDaoImpl dao = new JdbcDaoImpl();
-        dao.setDataSource(PopulatedDatabase.getDataSource());
-        dao.afterPropertiesSet();
+	private JdbcDaoImpl makePopulatedJdbcDao() throws Exception {
+		JdbcDaoImpl dao = new JdbcDaoImpl();
+		dao.setDataSource(PopulatedDatabase.getDataSource());
+		dao.afterPropertiesSet();
 
-        return dao;
-    }
+		return dao;
+	}
 
-    private JdbcDaoImpl makePopulatedJdbcDaoWithRolePrefix() throws Exception {
-        JdbcDaoImpl dao = new JdbcDaoImpl();
-        dao.setDataSource(PopulatedDatabase.getDataSource());
-        dao.setRolePrefix("ARBITRARY_PREFIX_");
-        dao.afterPropertiesSet();
+	private JdbcDaoImpl makePopulatedJdbcDaoWithRolePrefix() throws Exception {
+		JdbcDaoImpl dao = new JdbcDaoImpl();
+		dao.setDataSource(PopulatedDatabase.getDataSource());
+		dao.setRolePrefix("ARBITRARY_PREFIX_");
+		dao.afterPropertiesSet();
 
-        return dao;
-    }
+		return dao;
+	}
 
-    public void testCheckDaoAccessUserSuccess() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        UserDetails user = dao.loadUserByUsername("rod");
-        assertEquals("rod", user.getUsername());
-        assertEquals("koala", user.getPassword());
-        assertTrue(user.isEnabled());
+	public void testCheckDaoAccessUserSuccess() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		UserDetails user = dao.loadUserByUsername("rod");
+		assertEquals("rod", user.getUsername());
+		assertEquals("koala", user.getPassword());
+		assertTrue(user.isEnabled());
 
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_TELLER"));
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_SUPERVISOR"));
-    }
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_TELLER"));
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_SUPERVISOR"));
+	}
 
-    public void testCheckDaoOnlyReturnsGrantedAuthoritiesGrantedToUser() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        UserDetails user = dao.loadUserByUsername("scott");
-        assertEquals(1, user.getAuthorities().size());
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_TELLER"));
-    }
+	public void testCheckDaoOnlyReturnsGrantedAuthoritiesGrantedToUser() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		UserDetails user = dao.loadUserByUsername("scott");
+		assertEquals(1, user.getAuthorities().size());
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_TELLER"));
+	}
 
-    public void testCheckDaoReturnsCorrectDisabledProperty() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        UserDetails user = dao.loadUserByUsername("peter");
-        assertTrue(!user.isEnabled());
-    }
+	public void testCheckDaoReturnsCorrectDisabledProperty() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		UserDetails user = dao.loadUserByUsername("peter");
+		assertTrue(!user.isEnabled());
+	}
 
-    public void testGettersSetters() {
-        JdbcDaoImpl dao = new JdbcDaoImpl();
-        dao.setAuthoritiesByUsernameQuery("SELECT * FROM FOO");
-        assertEquals("SELECT * FROM FOO", dao.getAuthoritiesByUsernameQuery());
+	public void testGettersSetters() {
+		JdbcDaoImpl dao = new JdbcDaoImpl();
+		dao.setAuthoritiesByUsernameQuery("SELECT * FROM FOO");
+		assertEquals("SELECT * FROM FOO", dao.getAuthoritiesByUsernameQuery());
 
-        dao.setUsersByUsernameQuery("SELECT USERS FROM FOO");
-        assertEquals("SELECT USERS FROM FOO", dao.getUsersByUsernameQuery());
-    }
+		dao.setUsersByUsernameQuery("SELECT USERS FROM FOO");
+		assertEquals("SELECT USERS FROM FOO", dao.getUsersByUsernameQuery());
+	}
 
-    public void testLookupFailsIfUserHasNoGrantedAuthorities() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
+	public void testLookupFailsIfUserHasNoGrantedAuthorities() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
 
-        try {
-            dao.loadUserByUsername("cooper");
-            fail("Should have thrown UsernameNotFoundException");
-        } catch (UsernameNotFoundException expected) {
-        }
-    }
+		try {
+			dao.loadUserByUsername("cooper");
+			fail("Should have thrown UsernameNotFoundException");
+		}
+		catch (UsernameNotFoundException expected) {
+		}
+	}
 
-    public void testLookupFailsWithWrongUsername() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
+	public void testLookupFailsWithWrongUsername() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
 
-        try {
-            dao.loadUserByUsername("UNKNOWN_USER");
-            fail("Should have thrown UsernameNotFoundException");
-        } catch (UsernameNotFoundException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			dao.loadUserByUsername("UNKNOWN_USER");
+			fail("Should have thrown UsernameNotFoundException");
+		}
+		catch (UsernameNotFoundException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testLookupSuccessWithMixedCase() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        assertEquals("koala", dao.loadUserByUsername("rod").getPassword());
-        assertEquals("wombat", dao.loadUserByUsername("ScOTt").getPassword());
-    }
+	public void testLookupSuccessWithMixedCase() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		assertEquals("koala", dao.loadUserByUsername("rod").getPassword());
+		assertEquals("wombat", dao.loadUserByUsername("ScOTt").getPassword());
+	}
 
-    public void testRolePrefixWorks() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDaoWithRolePrefix();
-        assertEquals("ARBITRARY_PREFIX_", dao.getRolePrefix());
+	public void testRolePrefixWorks() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDaoWithRolePrefix();
+		assertEquals("ARBITRARY_PREFIX_", dao.getRolePrefix());
 
-        UserDetails user = dao.loadUserByUsername("rod");
-        assertEquals("rod", user.getUsername());
-        assertEquals(2, user.getAuthorities().size());
+		UserDetails user = dao.loadUserByUsername("rod");
+		assertEquals("rod", user.getUsername());
+		assertEquals(2, user.getAuthorities().size());
 
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ARBITRARY_PREFIX_ROLE_TELLER"));
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ARBITRARY_PREFIX_ROLE_SUPERVISOR"));
-    }
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ARBITRARY_PREFIX_ROLE_TELLER"));
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ARBITRARY_PREFIX_ROLE_SUPERVISOR"));
+	}
 
-    public void testGroupAuthoritiesAreLoadedCorrectly() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        dao.setEnableAuthorities(false);
-        dao.setEnableGroups(true);
+	public void testGroupAuthoritiesAreLoadedCorrectly() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		dao.setEnableAuthorities(false);
+		dao.setEnableGroups(true);
 
-        UserDetails jerry = dao.loadUserByUsername("jerry");
-        assertEquals(3, jerry.getAuthorities().size());
-    }
+		UserDetails jerry = dao.loadUserByUsername("jerry");
+		assertEquals(3, jerry.getAuthorities().size());
+	}
 
-    public void testDuplicateGroupAuthoritiesAreRemoved() throws Exception {
-        JdbcDaoImpl dao = makePopulatedJdbcDao();
-        dao.setEnableAuthorities(false);
-        dao.setEnableGroups(true);
-        // Tom has roles A, B, C and B, C duplicates
-        UserDetails tom = dao.loadUserByUsername("tom");
-        assertEquals(3, tom.getAuthorities().size());
-    }
+	public void testDuplicateGroupAuthoritiesAreRemoved() throws Exception {
+		JdbcDaoImpl dao = makePopulatedJdbcDao();
+		dao.setEnableAuthorities(false);
+		dao.setEnableGroups(true);
+		// Tom has roles A, B, C and B, C duplicates
+		UserDetails tom = dao.loadUserByUsername("tom");
+		assertEquals(3, tom.getAuthorities().size());
+	}
 
-    public void testStartupFailsIfDataSourceNotSet() throws Exception {
-        JdbcDaoImpl dao = new JdbcDaoImpl();
+	public void testStartupFailsIfDataSourceNotSet() throws Exception {
+		JdbcDaoImpl dao = new JdbcDaoImpl();
 
-        try {
-            dao.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			dao.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testStartupFailsIfUserMapSetToNull() throws Exception {
-        JdbcDaoImpl dao = new JdbcDaoImpl();
+	public void testStartupFailsIfUserMapSetToNull() throws Exception {
+		JdbcDaoImpl dao = new JdbcDaoImpl();
 
-        try {
-            dao.setDataSource(null);
-            dao.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			dao.setDataSource(null);
+			dao.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java
index 1ee87b87d9..3296a813f8 100644
--- a/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java
+++ b/core/src/test/java/org/springframework/security/core/userdetails/memory/UserAttributeEditorTests.java
@@ -20,7 +20,6 @@ import junit.framework.TestCase;
 import org.springframework.security.core.userdetails.memory.UserAttribute;
 import org.springframework.security.core.userdetails.memory.UserAttributeEditor;
 
-
 /**
  * Tests {@link UserAttributeEditor} and associated {@link UserAttribute}.
  *
@@ -28,93 +27,93 @@ import org.springframework.security.core.userdetails.memory.UserAttributeEditor;
  */
 public class UserAttributeEditorTests extends TestCase {
 
-    public void testCorrectOperationWithTrailingSpaces() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("password ,ROLE_ONE,ROLE_TWO ");
+	public void testCorrectOperationWithTrailingSpaces() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("password ,ROLE_ONE,ROLE_TWO ");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertEquals("password", user.getPassword());
-        assertEquals(2, user.getAuthorities().size());
-        assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
-        assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertEquals("password", user.getPassword());
+		assertEquals(2, user.getAuthorities().size());
+		assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
+		assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
+	}
 
-    public void testCorrectOperationWithoutEnabledDisabledKeyword() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("password,ROLE_ONE,ROLE_TWO");
+	public void testCorrectOperationWithoutEnabledDisabledKeyword() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("password,ROLE_ONE,ROLE_TWO");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user.isValid());
-        assertTrue(user.isEnabled()); // default
-        assertEquals("password", user.getPassword());
-        assertEquals(2, user.getAuthorities().size());
-        assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
-        assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user.isValid());
+		assertTrue(user.isEnabled()); // default
+		assertEquals("password", user.getPassword());
+		assertEquals(2, user.getAuthorities().size());
+		assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
+		assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
+	}
 
-    public void testDisabledKeyword() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("password,disabled,ROLE_ONE,ROLE_TWO");
+	public void testDisabledKeyword() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("password,disabled,ROLE_ONE,ROLE_TWO");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user.isValid());
-        assertTrue(!user.isEnabled());
-        assertEquals("password", user.getPassword());
-        assertEquals(2, user.getAuthorities().size());
-        assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
-        assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user.isValid());
+		assertTrue(!user.isEnabled());
+		assertEquals("password", user.getPassword());
+		assertEquals(2, user.getAuthorities().size());
+		assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
+		assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
+	}
 
-    public void testEmptyStringReturnsNull() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("");
+	public void testEmptyStringReturnsNull() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user == null);
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user == null);
+	}
 
-    public void testEnabledKeyword() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("password,ROLE_ONE,enabled,ROLE_TWO");
+	public void testEnabledKeyword() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("password,ROLE_ONE,enabled,ROLE_TWO");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user.isValid());
-        assertTrue(user.isEnabled());
-        assertEquals("password", user.getPassword());
-        assertEquals(2, user.getAuthorities().size());
-        assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
-        assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user.isValid());
+		assertTrue(user.isEnabled());
+		assertEquals("password", user.getPassword());
+		assertEquals(2, user.getAuthorities().size());
+		assertEquals("ROLE_ONE", user.getAuthorities().get(0).getAuthority());
+		assertEquals("ROLE_TWO", user.getAuthorities().get(1).getAuthority());
+	}
 
-    public void testMalformedStringReturnsNull() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("MALFORMED_STRING");
+	public void testMalformedStringReturnsNull() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("MALFORMED_STRING");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user == null);
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user == null);
+	}
 
-    public void testNoPasswordOrRolesReturnsNull() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("disabled");
+	public void testNoPasswordOrRolesReturnsNull() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("disabled");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user == null);
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user == null);
+	}
 
-    public void testNoRolesReturnsNull() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText("password,enabled");
+	public void testNoRolesReturnsNull() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText("password,enabled");
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user == null);
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user == null);
+	}
 
-    public void testNullReturnsNull() {
-        UserAttributeEditor editor = new UserAttributeEditor();
-        editor.setAsText(null);
+	public void testNullReturnsNull() {
+		UserAttributeEditor editor = new UserAttributeEditor();
+		editor.setAsText(null);
 
-        UserAttribute user = (UserAttribute) editor.getValue();
-        assertTrue(user == null);
-    }
+		UserAttribute user = (UserAttribute) editor.getValue();
+		assertTrue(user == null);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
index 3f20fac9ac..d890e062ce 100644
--- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
+++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java
@@ -36,316 +36,341 @@ import org.springframework.security.core.userdetails.UserDetails;
  * @author Luke Taylor
  */
 public class JdbcUserDetailsManagerTests {
-    private static final String SELECT_JOE_SQL = "select * from users where username = 'joe'";
-    private static final String SELECT_JOE_AUTHORITIES_SQL = "select * from authorities where username = 'joe'";
+	private static final String SELECT_JOE_SQL = "select * from users where username = 'joe'";
+	private static final String SELECT_JOE_AUTHORITIES_SQL = "select * from authorities where username = 'joe'";
 
-    private static final UserDetails joe = new User("joe", "password", true, true, true, true,
-            AuthorityUtils.createAuthorityList("A","C","B"));
+	private static final UserDetails joe = new User("joe", "password", true, true, true,
+			true, AuthorityUtils.createAuthorityList("A", "C", "B"));
 
-    private static TestDataSource dataSource;
-    private JdbcUserDetailsManager manager;
-    private MockUserCache cache;
-    private JdbcTemplate template;
+	private static TestDataSource dataSource;
+	private JdbcUserDetailsManager manager;
+	private MockUserCache cache;
+	private JdbcTemplate template;
 
-    @BeforeClass
-    public static void createDataSource() {
-        dataSource = new TestDataSource("jdbcusermgrtest");
-    }
+	@BeforeClass
+	public static void createDataSource() {
+		dataSource = new TestDataSource("jdbcusermgrtest");
+	}
 
-    @AfterClass
-    public static void clearDataSource() throws Exception {
-        dataSource.destroy();
-        dataSource = null;
-    }
+	@AfterClass
+	public static void clearDataSource() throws Exception {
+		dataSource.destroy();
+		dataSource = null;
+	}
 
-    @Before
-    public void initializeManagerAndCreateTables() {
-        manager = new JdbcUserDetailsManager();
-        cache = new MockUserCache();
-        manager.setUserCache(cache);
-        manager.setDataSource(dataSource);
-        manager.setCreateUserSql(JdbcUserDetailsManager.DEF_CREATE_USER_SQL);
-        manager.setUpdateUserSql(JdbcUserDetailsManager.DEF_UPDATE_USER_SQL);
-        manager.setUserExistsSql(JdbcUserDetailsManager.DEF_USER_EXISTS_SQL);
-        manager.setCreateAuthoritySql(JdbcUserDetailsManager.DEF_INSERT_AUTHORITY_SQL);
-        manager.setDeleteUserAuthoritiesSql(JdbcUserDetailsManager.DEF_DELETE_USER_AUTHORITIES_SQL);
-        manager.setDeleteUserSql(JdbcUserDetailsManager.DEF_DELETE_USER_SQL);
-        manager.setChangePasswordSql(JdbcUserDetailsManager.DEF_CHANGE_PASSWORD_SQL);
-        manager.initDao();
-        template = manager.getJdbcTemplate();
+	@Before
+	public void initializeManagerAndCreateTables() {
+		manager = new JdbcUserDetailsManager();
+		cache = new MockUserCache();
+		manager.setUserCache(cache);
+		manager.setDataSource(dataSource);
+		manager.setCreateUserSql(JdbcUserDetailsManager.DEF_CREATE_USER_SQL);
+		manager.setUpdateUserSql(JdbcUserDetailsManager.DEF_UPDATE_USER_SQL);
+		manager.setUserExistsSql(JdbcUserDetailsManager.DEF_USER_EXISTS_SQL);
+		manager.setCreateAuthoritySql(JdbcUserDetailsManager.DEF_INSERT_AUTHORITY_SQL);
+		manager.setDeleteUserAuthoritiesSql(JdbcUserDetailsManager.DEF_DELETE_USER_AUTHORITIES_SQL);
+		manager.setDeleteUserSql(JdbcUserDetailsManager.DEF_DELETE_USER_SQL);
+		manager.setChangePasswordSql(JdbcUserDetailsManager.DEF_CHANGE_PASSWORD_SQL);
+		manager.initDao();
+		template = manager.getJdbcTemplate();
 
-        template.execute("create table users(username varchar(20) not null primary key," +
-                "password varchar(20) not null, enabled boolean not null)");
-        template.execute("create table authorities (username varchar(20) not null, authority varchar(20) not null, " +
-                "constraint fk_authorities_users foreign key(username) references users(username))");
-        PopulatedDatabase.createGroupTables(template);
-        PopulatedDatabase.insertGroupData(template);
-    }
+		template.execute("create table users(username varchar(20) not null primary key,"
+				+ "password varchar(20) not null, enabled boolean not null)");
+		template.execute("create table authorities (username varchar(20) not null, authority varchar(20) not null, "
+				+ "constraint fk_authorities_users foreign key(username) references users(username))");
+		PopulatedDatabase.createGroupTables(template);
+		PopulatedDatabase.insertGroupData(template);
+	}
 
-    @After
-    public void dropTablesAndClearContext() {
-        template.execute("drop table authorities");
-        template.execute("drop table users");
-        template.execute("drop table group_authorities");
-        template.execute("drop table group_members");
-        template.execute("drop table groups");
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void dropTablesAndClearContext() {
+		template.execute("drop table authorities");
+		template.execute("drop table users");
+		template.execute("drop table group_authorities");
+		template.execute("drop table group_members");
+		template.execute("drop table groups");
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void createUserInsertsCorrectData() {
-        manager.createUser(joe);
+	@Test
+	public void createUserInsertsCorrectData() {
+		manager.createUser(joe);
 
-        UserDetails joe2 = manager.loadUserByUsername("joe");
+		UserDetails joe2 = manager.loadUserByUsername("joe");
 
-        assertEquals(joe, joe2);
-    }
+		assertEquals(joe, joe2);
+	}
 
-    @Test
-    public void deleteUserRemovesUserDataAndAuthoritiesAndClearsCache() {
-        insertJoe();
-        manager.deleteUser("joe");
+	@Test
+	public void deleteUserRemovesUserDataAndAuthoritiesAndClearsCache() {
+		insertJoe();
+		manager.deleteUser("joe");
 
-        assertEquals(0, template.queryForList(SELECT_JOE_SQL).size());
-        assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
-        assertFalse(cache.getUserMap().containsKey("joe"));
-    }
+		assertEquals(0, template.queryForList(SELECT_JOE_SQL).size());
+		assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
+		assertFalse(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test
-    public void updateUserChangesDataCorrectlyAndClearsCache() {
-        insertJoe();
-        User newJoe = new User("joe","newpassword",false,true,true,true,
-                AuthorityUtils.createAuthorityList(new String[]{"D","F","E"}));
+	@Test
+	public void updateUserChangesDataCorrectlyAndClearsCache() {
+		insertJoe();
+		User newJoe = new User("joe", "newpassword", false, true, true, true,
+				AuthorityUtils.createAuthorityList(new String[] { "D", "F", "E" }));
 
-        manager.updateUser(newJoe);
+		manager.updateUser(newJoe);
 
-        UserDetails joe = manager.loadUserByUsername("joe");
+		UserDetails joe = manager.loadUserByUsername("joe");
 
-        assertEquals(newJoe, joe);
-        assertFalse(cache.getUserMap().containsKey("joe"));
-    }
+		assertEquals(newJoe, joe);
+		assertFalse(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test
-    public void userExistsReturnsFalseForNonExistentUsername() {
-        assertFalse(manager.userExists("joe"));
-    }
+	@Test
+	public void userExistsReturnsFalseForNonExistentUsername() {
+		assertFalse(manager.userExists("joe"));
+	}
 
-    @Test
-    public void userExistsReturnsTrueForExistingUsername() {
-        insertJoe();
-        assertTrue(manager.userExists("joe"));
-        assertTrue(cache.getUserMap().containsKey("joe"));
-    }
+	@Test
+	public void userExistsReturnsTrueForExistingUsername() {
+		insertJoe();
+		assertTrue(manager.userExists("joe"));
+		assertTrue(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void changePasswordFailsForUnauthenticatedUser() {
-        manager.changePassword("password", "newPassword");
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void changePasswordFailsForUnauthenticatedUser() {
+		manager.changePassword("password", "newPassword");
+	}
 
-    @Test
-    public void changePasswordSucceedsWithAuthenticatedUserAndNoAuthenticationManagerSet() {
-        insertJoe();
-        authenticateJoe();
-        manager.changePassword("wrongpassword", "newPassword");
-        UserDetails newJoe = manager.loadUserByUsername("joe");
+	@Test
+	public void changePasswordSucceedsWithAuthenticatedUserAndNoAuthenticationManagerSet() {
+		insertJoe();
+		authenticateJoe();
+		manager.changePassword("wrongpassword", "newPassword");
+		UserDetails newJoe = manager.loadUserByUsername("joe");
 
-        assertEquals("newPassword", newJoe.getPassword());
-        assertFalse(cache.getUserMap().containsKey("joe"));
-    }
+		assertEquals("newPassword", newJoe.getPassword());
+		assertFalse(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test
-    public void changePasswordSucceedsWithIfReAuthenticationSucceeds() {
-        insertJoe();
-        Authentication currentAuth = authenticateJoe();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(currentAuth)).thenReturn(currentAuth);
+	@Test
+	public void changePasswordSucceedsWithIfReAuthenticationSucceeds() {
+		insertJoe();
+		Authentication currentAuth = authenticateJoe();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(currentAuth)).thenReturn(currentAuth);
 
-        manager.setAuthenticationManager(am);
-        manager.changePassword("password", "newPassword");
-        UserDetails newJoe = manager.loadUserByUsername("joe");
+		manager.setAuthenticationManager(am);
+		manager.changePassword("password", "newPassword");
+		UserDetails newJoe = manager.loadUserByUsername("joe");
 
-        assertEquals("newPassword", newJoe.getPassword());
-        // The password in the context should also be altered
-        Authentication newAuth = SecurityContextHolder.getContext().getAuthentication();
-        assertEquals("joe", newAuth.getName());
-        assertEquals(currentAuth.getDetails(), newAuth.getDetails());
-        assertThat(newAuth.getCredentials()).isNull();
-        assertFalse(cache.getUserMap().containsKey("joe"));
-    }
+		assertEquals("newPassword", newJoe.getPassword());
+		// The password in the context should also be altered
+		Authentication newAuth = SecurityContextHolder.getContext().getAuthentication();
+		assertEquals("joe", newAuth.getName());
+		assertEquals(currentAuth.getDetails(), newAuth.getDetails());
+		assertThat(newAuth.getCredentials()).isNull();
+		assertFalse(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test
-    public void changePasswordFailsIfReAuthenticationFails() {
-        insertJoe();
-        authenticateJoe();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
+	@Test
+	public void changePasswordFailsIfReAuthenticationFails() {
+		insertJoe();
+		authenticateJoe();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
 
-        manager.setAuthenticationManager(am);
+		manager.setAuthenticationManager(am);
 
-        try {
-            manager.changePassword("password", "newPassword");
-            fail("Expected BadCredentialsException");
-        } catch (BadCredentialsException expected) {
-        }
+		try {
+			manager.changePassword("password", "newPassword");
+			fail("Expected BadCredentialsException");
+		}
+		catch (BadCredentialsException expected) {
+		}
 
-        // Check password hasn't changed.
-        UserDetails newJoe = manager.loadUserByUsername("joe");
-        assertEquals("password", newJoe.getPassword());
-        assertEquals("password", SecurityContextHolder.getContext().getAuthentication().getCredentials());
-        assertTrue(cache.getUserMap().containsKey("joe"));
-    }
+		// Check password hasn't changed.
+		UserDetails newJoe = manager.loadUserByUsername("joe");
+		assertEquals("password", newJoe.getPassword());
+		assertEquals("password", SecurityContextHolder.getContext().getAuthentication()
+				.getCredentials());
+		assertTrue(cache.getUserMap().containsKey("joe"));
+	}
 
-    @Test
-    public void findAllGroupsReturnsExpectedGroupNames() {
-        List<String> groups = manager.findAllGroups();
-        assertEquals(4, groups.size());
+	@Test
+	public void findAllGroupsReturnsExpectedGroupNames() {
+		List<String> groups = manager.findAllGroups();
+		assertEquals(4, groups.size());
 
-        Collections.sort(groups);
-        assertEquals("GROUP_0", groups.get(0));
-        assertEquals("GROUP_1", groups.get(1));
-        assertEquals("GROUP_2", groups.get(2));
-        assertEquals("GROUP_3", groups.get(3));
-    }
+		Collections.sort(groups);
+		assertEquals("GROUP_0", groups.get(0));
+		assertEquals("GROUP_1", groups.get(1));
+		assertEquals("GROUP_2", groups.get(2));
+		assertEquals("GROUP_3", groups.get(3));
+	}
 
-    @Test
-    public void findGroupMembersReturnsCorrectData() {
-        List<String> groupMembers = manager.findUsersInGroup("GROUP_0");
-        assertEquals(1, groupMembers.size());
-        assertEquals("jerry", groupMembers.get(0));
-        groupMembers = manager.findUsersInGroup("GROUP_1");
-        assertEquals(2, groupMembers.size());
-    }
+	@Test
+	public void findGroupMembersReturnsCorrectData() {
+		List<String> groupMembers = manager.findUsersInGroup("GROUP_0");
+		assertEquals(1, groupMembers.size());
+		assertEquals("jerry", groupMembers.get(0));
+		groupMembers = manager.findUsersInGroup("GROUP_1");
+		assertEquals(2, groupMembers.size());
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void createGroupInsertsCorrectData() {
-        manager.createGroup("TEST_GROUP", AuthorityUtils.createAuthorityList("ROLE_X", "ROLE_Y"));
+	@Test
+	@SuppressWarnings("unchecked")
+	public void createGroupInsertsCorrectData() {
+		manager.createGroup("TEST_GROUP",
+				AuthorityUtils.createAuthorityList("ROLE_X", "ROLE_Y"));
 
-        List roles = template.queryForList(
-                "select ga.authority from groups g, group_authorities ga " +
-                "where ga.group_id = g.id " +
-                "and g.group_name = 'TEST_GROUP'");
+		List roles = template
+				.queryForList("select ga.authority from groups g, group_authorities ga "
+						+ "where ga.group_id = g.id " + "and g.group_name = 'TEST_GROUP'");
 
-        assertEquals(2, roles.size());
-    }
+		assertEquals(2, roles.size());
+	}
 
-    @Test
-    public void deleteGroupRemovesData() throws Exception {
-        manager.deleteGroup("GROUP_0");
-        manager.deleteGroup("GROUP_1");
-        manager.deleteGroup("GROUP_2");
-        manager.deleteGroup("GROUP_3");
+	@Test
+	public void deleteGroupRemovesData() throws Exception {
+		manager.deleteGroup("GROUP_0");
+		manager.deleteGroup("GROUP_1");
+		manager.deleteGroup("GROUP_2");
+		manager.deleteGroup("GROUP_3");
 
-        assertEquals(0, template.queryForList("select * from group_authorities").size());
-        assertEquals(0, template.queryForList("select * from group_members").size());
-        assertEquals(0, template.queryForList("select id from groups").size());
-    }
+		assertEquals(0, template.queryForList("select * from group_authorities").size());
+		assertEquals(0, template.queryForList("select * from group_members").size());
+		assertEquals(0, template.queryForList("select id from groups").size());
+	}
 
-    @Test
-    public void renameGroupIsSuccessful() throws Exception {
-        manager.renameGroup("GROUP_0", "GROUP_X");
+	@Test
+	public void renameGroupIsSuccessful() throws Exception {
+		manager.renameGroup("GROUP_0", "GROUP_X");
 
-        assertEquals(0, template.queryForInt("select id from groups where group_name = 'GROUP_X'"));
-    }
+		assertEquals(
+				0,
+				template.queryForInt("select id from groups where group_name = 'GROUP_X'"));
+	}
 
-    @Test
-    public void addingGroupUserSetsCorrectData() throws Exception {
-        manager.addUserToGroup("tom", "GROUP_0");
+	@Test
+	public void addingGroupUserSetsCorrectData() throws Exception {
+		manager.addUserToGroup("tom", "GROUP_0");
 
-        assertEquals(2, template.queryForList("select username from group_members where group_id = 0").size());
-    }
+		assertEquals(
+				2,
+				template.queryForList(
+						"select username from group_members where group_id = 0").size());
+	}
 
-    @Test
-    public void removeUserFromGroupDeletesGroupMemberRow() throws Exception {
-        manager.removeUserFromGroup("jerry", "GROUP_1");
+	@Test
+	public void removeUserFromGroupDeletesGroupMemberRow() throws Exception {
+		manager.removeUserFromGroup("jerry", "GROUP_1");
 
-        assertEquals(1, template.queryForList("select group_id from group_members where username = 'jerry'").size());
-    }
+		assertEquals(
+				1,
+				template.queryForList(
+						"select group_id from group_members where username = 'jerry'")
+						.size());
+	}
 
-    @Test
-    public void findGroupAuthoritiesReturnsCorrectAuthorities() throws Exception {
-        assertEquals(AuthorityUtils.createAuthorityList("ROLE_A"), manager.findGroupAuthorities("GROUP_0"));
-    }
+	@Test
+	public void findGroupAuthoritiesReturnsCorrectAuthorities() throws Exception {
+		assertEquals(AuthorityUtils.createAuthorityList("ROLE_A"),
+				manager.findGroupAuthorities("GROUP_0"));
+	}
 
-    @Test
-    public void addGroupAuthorityInsertsCorrectGroupAuthorityRow() throws Exception {
-        GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_X");
-        manager.addGroupAuthority("GROUP_0", auth);
+	@Test
+	public void addGroupAuthorityInsertsCorrectGroupAuthorityRow() throws Exception {
+		GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_X");
+		manager.addGroupAuthority("GROUP_0", auth);
 
-        template.queryForObject("select authority from group_authorities where authority = 'ROLE_X' and group_id = 0", String.class);
-    }
+		template.queryForObject(
+				"select authority from group_authorities where authority = 'ROLE_X' and group_id = 0",
+				String.class);
+	}
 
-    @Test
-    public void deleteGroupAuthorityRemovesCorrectRows() throws Exception {
-        GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_A");
-        manager.removeGroupAuthority("GROUP_0", auth);
-        assertEquals(0, template.queryForList("select authority from group_authorities where group_id = 0").size());
+	@Test
+	public void deleteGroupAuthorityRemovesCorrectRows() throws Exception {
+		GrantedAuthority auth = new SimpleGrantedAuthority("ROLE_A");
+		manager.removeGroupAuthority("GROUP_0", auth);
+		assertEquals(
+				0,
+				template.queryForList(
+						"select authority from group_authorities where group_id = 0")
+						.size());
 
-        manager.removeGroupAuthority("GROUP_2", auth);
-        assertEquals(2, template.queryForList("select authority from group_authorities where group_id = 2").size());
-    }
+		manager.removeGroupAuthority("GROUP_2", auth);
+		assertEquals(
+				2,
+				template.queryForList(
+						"select authority from group_authorities where group_id = 2")
+						.size());
+	}
 
-    // SEC-1156
-    @Test
-    public void createUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() throws Exception {
-        manager.setEnableAuthorities(false);
-        manager.createUser(joe);
-        assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
-    }
+	// SEC-1156
+	@Test
+	public void createUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse()
+			throws Exception {
+		manager.setEnableAuthorities(false);
+		manager.createUser(joe);
+		assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
+	}
 
-    // SEC-1156
-    @Test
-    public void updateUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse() throws Exception {
-        manager.setEnableAuthorities(false);
-        insertJoe();
-        template.execute("delete from authorities where username='joe'");
-        manager.updateUser(joe);
-        assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
-    }
+	// SEC-1156
+	@Test
+	public void updateUserDoesNotSaveAuthoritiesIfEnableAuthoritiesIsFalse()
+			throws Exception {
+		manager.setEnableAuthorities(false);
+		insertJoe();
+		template.execute("delete from authorities where username='joe'");
+		manager.updateUser(joe);
+		assertEquals(0, template.queryForList(SELECT_JOE_AUTHORITIES_SQL).size());
+	}
 
-    // SEC-2166
-    @Test
-    public void createNewAuthenticationUsesNullPasswordToKeepPassordsSave() {
-        insertJoe();
-        UsernamePasswordAuthenticationToken currentAuth = new UsernamePasswordAuthenticationToken("joe",null, AuthorityUtils.createAuthorityList("ROLE_USER"));
-        Authentication updatedAuth = manager.createNewAuthentication(currentAuth, "new");
-        assertThat(updatedAuth.getCredentials()).isNull();
-    }
+	// SEC-2166
+	@Test
+	public void createNewAuthenticationUsesNullPasswordToKeepPassordsSave() {
+		insertJoe();
+		UsernamePasswordAuthenticationToken currentAuth = new UsernamePasswordAuthenticationToken(
+				"joe", null, AuthorityUtils.createAuthorityList("ROLE_USER"));
+		Authentication updatedAuth = manager.createNewAuthentication(currentAuth, "new");
+		assertThat(updatedAuth.getCredentials()).isNull();
+	}
 
-    private Authentication authenticateJoe() {
-        UsernamePasswordAuthenticationToken auth =
-                new UsernamePasswordAuthenticationToken("joe","password", joe.getAuthorities());
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	private Authentication authenticateJoe() {
+		UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+				"joe", "password", joe.getAuthorities());
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        return auth;
-    }
+		return auth;
+	}
 
+	private void insertJoe() {
+		template.execute("insert into users (username, password, enabled) values ('joe','password','true')");
+		template.execute("insert into authorities (username, authority) values ('joe','A')");
+		template.execute("insert into authorities (username, authority) values ('joe','B')");
+		template.execute("insert into authorities (username, authority) values ('joe','C')");
+		cache.putUserInCache(joe);
+	}
 
-    private void insertJoe() {
-        template.execute("insert into users (username, password, enabled) values ('joe','password','true')");
-        template.execute("insert into authorities (username, authority) values ('joe','A')");
-        template.execute("insert into authorities (username, authority) values ('joe','B')");
-        template.execute("insert into authorities (username, authority) values ('joe','C')");
-        cache.putUserInCache(joe);
-    }
+	private class MockUserCache implements UserCache {
+		private Map<String, UserDetails> cache = new HashMap<String, UserDetails>();
 
-    private class MockUserCache implements UserCache {
-        private Map<String,UserDetails> cache = new HashMap<String,UserDetails>();
+		public UserDetails getUserFromCache(String username) {
+			return (User) cache.get(username);
+		}
 
-        public UserDetails getUserFromCache(String username) {
-            return (User) cache.get(username);
-        }
+		public void putUserInCache(UserDetails user) {
+			cache.put(user.getUsername(), user);
+		}
 
-        public void putUserInCache(UserDetails user) {
-            cache.put(user.getUsername(), user);
-        }
+		public void removeUserFromCache(String username) {
+			cache.remove(username);
+		}
 
-        public void removeUserFromCache(String username) {
-            cache.remove(username);
-        }
-
-        Map<String,UserDetails> getUserMap() {
-            return cache;
-        }
-    }
+		Map<String, UserDetails> getUserMap() {
+			return cache;
+		}
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java
index 5e232ca586..82e1f150c1 100644
--- a/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/scheduling/AbstractSecurityContextSchedulingTaskExecutorTests.java
@@ -8,8 +8,9 @@ import org.springframework.scheduling.SchedulingTaskExecutor;
 import org.springframework.security.task.AbstractDelegatingSecurityContextAsyncTaskExecutorTests;
 
 /**
- * Abstract class for testing {@link DelegatingSecurityContextSchedulingTaskExecutor} which allows customization of
- * how {@link DelegatingSecurityContextSchedulingTaskExecutor} and its mocks are created.
+ * Abstract class for testing {@link DelegatingSecurityContextSchedulingTaskExecutor}
+ * which allows customization of how
+ * {@link DelegatingSecurityContextSchedulingTaskExecutor} and its mocks are created.
  *
  * @author Rob Winch
  * @since 3.2
@@ -17,23 +18,23 @@ import org.springframework.security.task.AbstractDelegatingSecurityContextAsyncT
  * @see ExplicitSecurityContextSchedulingTaskExecutorTests
  */
 public abstract class AbstractSecurityContextSchedulingTaskExecutorTests extends
-        AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
+		AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
 
-    @Mock
-    protected SchedulingTaskExecutor taskExecutorDelegate;
+	@Mock
+	protected SchedulingTaskExecutor taskExecutorDelegate;
 
-    private DelegatingSecurityContextSchedulingTaskExecutor executor;
+	private DelegatingSecurityContextSchedulingTaskExecutor executor;
 
-    @Test
-    public void prefersShortLivedTasks() {
-        executor = create();
-        executor.prefersShortLivedTasks();
-        verify(taskExecutorDelegate).prefersShortLivedTasks();
-    }
+	@Test
+	public void prefersShortLivedTasks() {
+		executor = create();
+		executor.prefersShortLivedTasks();
+		verify(taskExecutorDelegate).prefersShortLivedTasks();
+	}
 
-    protected SchedulingTaskExecutor getExecutor() {
-        return taskExecutorDelegate;
-    }
+	protected SchedulingTaskExecutor getExecutor() {
+		return taskExecutorDelegate;
+	}
 
-    protected abstract DelegatingSecurityContextSchedulingTaskExecutor create();
+	protected abstract DelegatingSecurityContextSchedulingTaskExecutor create();
 }
diff --git a/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java
index 5a908464b0..5c6454bb10 100644
--- a/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/scheduling/CurrentSecurityContextSchedulingTaskExecutorTests.java
@@ -4,20 +4,22 @@ import org.junit.Before;
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextSchedulingTaskExecutor}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextSchedulingTaskExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class CurrentSecurityContextSchedulingTaskExecutorTests extends AbstractSecurityContextSchedulingTaskExecutorTests {
+public class CurrentSecurityContextSchedulingTaskExecutorTests extends
+		AbstractSecurityContextSchedulingTaskExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		currentSecurityContextPowermockSetup();
+	}
 
-    protected DelegatingSecurityContextSchedulingTaskExecutor create() {
-        return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate);
-    }
+	protected DelegatingSecurityContextSchedulingTaskExecutor create() {
+		return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java b/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java
index a9b3b5ca15..bc8645da1f 100644
--- a/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/scheduling/ExplicitSecurityContextSchedulingTaskExecutorTests.java
@@ -16,20 +16,23 @@ import org.junit.Before;
 import org.springframework.security.core.context.SecurityContext;
 
 /**
- * Tests Explicitly specifying the {@link SecurityContext} on {@link DelegatingSecurityContextSchedulingTaskExecutor}
+ * Tests Explicitly specifying the {@link SecurityContext} on
+ * {@link DelegatingSecurityContextSchedulingTaskExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class ExplicitSecurityContextSchedulingTaskExecutorTests extends AbstractSecurityContextSchedulingTaskExecutorTests {
+public class ExplicitSecurityContextSchedulingTaskExecutorTests extends
+		AbstractSecurityContextSchedulingTaskExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        explicitSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		explicitSecurityContextPowermockSetup();
+	}
 
-    protected DelegatingSecurityContextSchedulingTaskExecutor create() {
-        return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate, securityContext);
-    }
+	protected DelegatingSecurityContextSchedulingTaskExecutor create() {
+		return new DelegatingSecurityContextSchedulingTaskExecutor(taskExecutorDelegate,
+				securityContext);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java
index a5c2cca828..27b744f76b 100644
--- a/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/task/AbstractDelegatingSecurityContextAsyncTaskExecutorTests.java
@@ -21,46 +21,48 @@ import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.security.concurrent.AbstractDelegatingSecurityContextExecutorTests;
 
 /**
- * Abstract class for testing {@link DelegatingSecurityContextAsyncTaskExecutor} which allows customization of
- * how {@link DelegatingSecurityContextAsyncTaskExecutor} and its mocks are created.
+ * Abstract class for testing {@link DelegatingSecurityContextAsyncTaskExecutor} which
+ * allows customization of how {@link DelegatingSecurityContextAsyncTaskExecutor} and its
+ * mocks are created.
  *
  * @author Rob Winch
  * @since 3.2
  * @see CurrentDelegatingSecurityContextAsyncTaskExecutorTests
  * @see ExplicitDelegatingSecurityContextAsyncTaskExecutorTests
  */
-public abstract class AbstractDelegatingSecurityContextAsyncTaskExecutorTests extends AbstractDelegatingSecurityContextExecutorTests {
-    @Mock
-    protected AsyncTaskExecutor taskExecutorDelegate;
+public abstract class AbstractDelegatingSecurityContextAsyncTaskExecutorTests extends
+		AbstractDelegatingSecurityContextExecutorTests {
+	@Mock
+	protected AsyncTaskExecutor taskExecutorDelegate;
 
-    private DelegatingSecurityContextAsyncTaskExecutor executor;
+	private DelegatingSecurityContextAsyncTaskExecutor executor;
 
-    @Before
-    public final void setUpExecutor() {
-        executor = create();
-    }
+	@Before
+	public final void setUpExecutor() {
+		executor = create();
+	}
 
-    @Test
-    public void executeStartTimeout() {
-        executor.execute(runnable, 1);
-        verify(getExecutor()).execute(wrappedRunnable, 1);
-    }
+	@Test
+	public void executeStartTimeout() {
+		executor.execute(runnable, 1);
+		verify(getExecutor()).execute(wrappedRunnable, 1);
+	}
 
-    @Test
-    public void submit() {
-        executor.submit(runnable);
-        verify(getExecutor()).submit(wrappedRunnable);
-    }
+	@Test
+	public void submit() {
+		executor.submit(runnable);
+		verify(getExecutor()).submit(wrappedRunnable);
+	}
 
-    @Test
-    public void submitCallable() {
-        executor.submit(callable);
-        verify(getExecutor()).submit(wrappedCallable);
-    }
+	@Test
+	public void submitCallable() {
+		executor.submit(callable);
+		verify(getExecutor()).submit(wrappedCallable);
+	}
 
-    protected AsyncTaskExecutor getExecutor() {
-        return taskExecutorDelegate;
-    }
+	protected AsyncTaskExecutor getExecutor() {
+		return taskExecutorDelegate;
+	}
 
-    protected abstract DelegatingSecurityContextAsyncTaskExecutor create();
+	protected abstract DelegatingSecurityContextAsyncTaskExecutor create();
 }
diff --git a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java
index c98192f8c4..0e8f19265b 100644
--- a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextAsyncTaskExecutorTests.java
@@ -2,25 +2,25 @@ package org.springframework.security.task;
 
 import org.junit.Before;
 
-
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextAsyncTaskExecutor}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextAsyncTaskExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class CurrentDelegatingSecurityContextAsyncTaskExecutorTests extends
-        AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
+		AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		currentSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextAsyncTaskExecutor create() {
-        return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate);
-    }
+	@Override
+	protected DelegatingSecurityContextAsyncTaskExecutor create() {
+		return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate);
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java
index 4683f79226..770ef1d8e4 100644
--- a/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/task/CurrentDelegatingSecurityContextTaskExecutorTests.java
@@ -20,28 +20,29 @@ import org.springframework.core.task.TaskExecutor;
 import org.springframework.security.concurrent.DelegatingSecurityContextExecutor;
 import org.springframework.security.concurrent.AbstractDelegatingSecurityContextExecutorTests;
 
-
 /**
- * Tests using the current {@link SecurityContext} on {@link DelegatingSecurityContextExecutor}
+ * Tests using the current {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class CurrentDelegatingSecurityContextTaskExecutorTests extends AbstractDelegatingSecurityContextExecutorTests {
-    @Mock
-    private TaskExecutor taskExecutorDelegate;
+public class CurrentDelegatingSecurityContextTaskExecutorTests extends
+		AbstractDelegatingSecurityContextExecutorTests {
+	@Mock
+	private TaskExecutor taskExecutorDelegate;
 
-    @Before
-    public void setUp() throws Exception {
-        currentSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		currentSecurityContextPowermockSetup();
+	}
 
-    protected Executor getExecutor() {
-        return taskExecutorDelegate;
-    }
+	protected Executor getExecutor() {
+		return taskExecutorDelegate;
+	}
 
-    protected DelegatingSecurityContextExecutor create() {
-        return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate);
-    }
+	protected DelegatingSecurityContextExecutor create() {
+		return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java
index 47fbd88396..1e37830039 100644
--- a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextAsyncTaskExecutorTests.java
@@ -2,25 +2,26 @@ package org.springframework.security.task;
 
 import org.junit.Before;
 
-
 /**
- * Tests using an explicit {@link SecurityContext} on {@link DelegatingSecurityContextAsyncTaskExecutor}
+ * Tests using an explicit {@link SecurityContext} on
+ * {@link DelegatingSecurityContextAsyncTaskExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
 public class ExplicitDelegatingSecurityContextAsyncTaskExecutorTests extends
-        AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
+		AbstractDelegatingSecurityContextAsyncTaskExecutorTests {
 
-    @Before
-    public void setUp() throws Exception {
-        explicitSecurityContextPowermockSetup();
-    }
+	@Before
+	public void setUp() throws Exception {
+		explicitSecurityContextPowermockSetup();
+	}
 
-    @Override
-    protected DelegatingSecurityContextAsyncTaskExecutor create() {
-        return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate, securityContext);
-    }
+	@Override
+	protected DelegatingSecurityContextAsyncTaskExecutor create() {
+		return new DelegatingSecurityContextAsyncTaskExecutor(taskExecutorDelegate,
+				securityContext);
+	}
 
 }
diff --git a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java
index d60347c3c4..88e76fa7ab 100644
--- a/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java
+++ b/core/src/test/java/org/springframework/security/task/ExplicitDelegatingSecurityContextTaskExecutorTests.java
@@ -20,29 +20,30 @@ import org.springframework.core.task.TaskExecutor;
 import org.springframework.security.concurrent.DelegatingSecurityContextExecutor;
 import org.springframework.security.concurrent.AbstractDelegatingSecurityContextExecutorTests;
 
-
 /**
- * Tests using the an explicit {@link SecurityContext} on {@link DelegatingSecurityContextExecutor}
+ * Tests using the an explicit {@link SecurityContext} on
+ * {@link DelegatingSecurityContextExecutor}
  *
  * @author Rob Winch
  * @since 3.2
  *
  */
-public class ExplicitDelegatingSecurityContextTaskExecutorTests extends AbstractDelegatingSecurityContextExecutorTests {
-    @Mock
-    private TaskExecutor taskExecutorDelegate;
+public class ExplicitDelegatingSecurityContextTaskExecutorTests extends
+		AbstractDelegatingSecurityContextExecutorTests {
+	@Mock
+	private TaskExecutor taskExecutorDelegate;
 
+	@Before
+	public void setUp() throws Exception {
+		explicitSecurityContextPowermockSetup();
+	}
 
-    @Before
-    public void setUp() throws Exception {
-        explicitSecurityContextPowermockSetup();
-    }
+	protected Executor getExecutor() {
+		return taskExecutorDelegate;
+	}
 
-    protected Executor getExecutor() {
-        return taskExecutorDelegate;
-    }
-
-    protected DelegatingSecurityContextExecutor create() {
-        return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate, securityContext);
-    }
+	protected DelegatingSecurityContextExecutor create() {
+		return new DelegatingSecurityContextTaskExecutor(taskExecutorDelegate,
+				securityContext);
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java b/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java
index bfa03d3671..3d86aa2b39 100644
--- a/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/util/FieldUtilsTests.java
@@ -9,31 +9,32 @@ import org.junit.*;
  */
 public class FieldUtilsTests {
 
-    @Test
-    public void gettingAndSettingProtectedFieldIsSuccessful() throws Exception {
-        new FieldUtils();
+	@Test
+	public void gettingAndSettingProtectedFieldIsSuccessful() throws Exception {
+		new FieldUtils();
 
-        Object tc = new TestClass();
+		Object tc = new TestClass();
 
-        assertEquals("x", FieldUtils.getProtectedFieldValue("protectedField", tc));
-        assertEquals("z", FieldUtils.getFieldValue(tc, "nested.protectedField"));
-        FieldUtils.setProtectedFieldValue("protectedField", tc, "y");
-        assertEquals("y", FieldUtils.getProtectedFieldValue("protectedField", tc));
+		assertEquals("x", FieldUtils.getProtectedFieldValue("protectedField", tc));
+		assertEquals("z", FieldUtils.getFieldValue(tc, "nested.protectedField"));
+		FieldUtils.setProtectedFieldValue("protectedField", tc, "y");
+		assertEquals("y", FieldUtils.getProtectedFieldValue("protectedField", tc));
 
-        try {
-            FieldUtils.getProtectedFieldValue("nonExistentField", tc);
-        } catch (IllegalStateException expected) {
-        }
-    }
+		try {
+			FieldUtils.getProtectedFieldValue("nonExistentField", tc);
+		}
+		catch (IllegalStateException expected) {
+		}
+	}
 }
 
 @SuppressWarnings("unused")
 class TestClass {
-    private String protectedField = "x";
-    private Nested nested = new Nested();
+	private String protectedField = "x";
+	private Nested nested = new Nested();
 }
 
 @SuppressWarnings("unused")
 class Nested {
-    private String protectedField = "z";
+	private String protectedField = "z";
 }
diff --git a/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java b/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java
index 9ca04bb183..e7512829db 100644
--- a/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java
+++ b/core/src/test/java/org/springframework/security/util/InMemoryResourceTests.java
@@ -9,18 +9,18 @@ import org.junit.*;
  */
 public class InMemoryResourceTests {
 
-    @Test
-    public void resourceContainsExpectedData() throws Exception {
-        InMemoryResource resource = new InMemoryResource("blah");
-        assertNull(resource.getDescription());
-        assertEquals(1, resource.hashCode());
-        assertNotNull(resource.getInputStream());
-    }
+	@Test
+	public void resourceContainsExpectedData() throws Exception {
+		InMemoryResource resource = new InMemoryResource("blah");
+		assertNull(resource.getDescription());
+		assertEquals(1, resource.hashCode());
+		assertNotNull(resource.getInputStream());
+	}
 
-    @Test
-    public void resourceIsEqualToOneWithSameContent() throws Exception {
-        assertEquals(new InMemoryResource("xxx"), new InMemoryResource("xxx"));
-        assertFalse(new InMemoryResource("xxx").equals(new InMemoryResource("xxxx")));
-        assertFalse(new InMemoryResource("xxx").equals(new Object()));
-    }
+	@Test
+	public void resourceIsEqualToOneWithSameContent() throws Exception {
+		assertEquals(new InMemoryResource("xxx"), new InMemoryResource("xxx"));
+		assertFalse(new InMemoryResource("xxx").equals(new InMemoryResource("xxxx")));
+		assertFalse(new InMemoryResource("xxx").equals(new Object()));
+	}
 }
diff --git a/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java b/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java
index 973c6d23e1..c2a5724b43 100644
--- a/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java
+++ b/core/src/test/java/org/springframework/security/util/MethodInvocationUtilsTests.java
@@ -15,54 +15,58 @@ import java.io.Serializable;
  */
 public class MethodInvocationUtilsTests {
 
-    @Test
-    public void createFromClassReturnsMethodWithNoArgInfoForMethodWithNoArgs() {
-        new MethodInvocationUtils();
+	@Test
+	public void createFromClassReturnsMethodWithNoArgInfoForMethodWithNoArgs() {
+		new MethodInvocationUtils();
 
-        MethodInvocation mi = MethodInvocationUtils.createFromClass(String.class, "length");
-        assertNotNull(mi);
-    }
+		MethodInvocation mi = MethodInvocationUtils.createFromClass(String.class,
+				"length");
+		assertNotNull(mi);
+	}
 
-    @Test
-    public void createFromClassReturnsMethodIfArgInfoOmittedAndMethodNameIsUnique() {
-        MethodInvocation mi = MethodInvocationUtils.createFromClass(BusinessServiceImpl.class, "methodReturningAnArray");
-        assertNotNull(mi);
-    }
+	@Test
+	public void createFromClassReturnsMethodIfArgInfoOmittedAndMethodNameIsUnique() {
+		MethodInvocation mi = MethodInvocationUtils.createFromClass(
+				BusinessServiceImpl.class, "methodReturningAnArray");
+		assertNotNull(mi);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void exceptionIsRaisedIfArgInfoOmittedAndMethodNameIsNotUnique() {
-        MethodInvocationUtils.createFromClass(BusinessServiceImpl.class, "methodReturningAList");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void exceptionIsRaisedIfArgInfoOmittedAndMethodNameIsNotUnique() {
+		MethodInvocationUtils.createFromClass(BusinessServiceImpl.class,
+				"methodReturningAList");
+	}
 
-    @Test
-    public void createFromClassReturnsMethodIfGivenArgInfoForMethodWithArgs() {
-        MethodInvocation mi = MethodInvocationUtils.createFromClass(null, String.class, "compareTo",
-                new Class<?>[]{String.class}, new Object[] {""});
-        assertNotNull(mi);
-    }
+	@Test
+	public void createFromClassReturnsMethodIfGivenArgInfoForMethodWithArgs() {
+		MethodInvocation mi = MethodInvocationUtils.createFromClass(null, String.class,
+				"compareTo", new Class<?>[] { String.class }, new Object[] { "" });
+		assertNotNull(mi);
+	}
 
-    @Test
-    public void createFromObjectLocatesExistingMethods() throws Exception {
-        AdvisedTarget t = new AdvisedTarget();
-        // Just lie about interfaces
-        t.setInterfaces(new Class[] {Serializable.class, MethodInvocation.class, Blah.class});
+	@Test
+	public void createFromObjectLocatesExistingMethods() throws Exception {
+		AdvisedTarget t = new AdvisedTarget();
+		// Just lie about interfaces
+		t.setInterfaces(new Class[] { Serializable.class, MethodInvocation.class,
+				Blah.class });
 
-        MethodInvocation mi = MethodInvocationUtils.create(t, "blah");
-        assertNotNull(mi);
+		MethodInvocation mi = MethodInvocationUtils.create(t, "blah");
+		assertNotNull(mi);
 
-        t.setProxyTargetClass(true);
-        mi = MethodInvocationUtils.create(t, "blah");
-        assertNotNull(mi);
+		t.setProxyTargetClass(true);
+		mi = MethodInvocationUtils.create(t, "blah");
+		assertNotNull(mi);
 
-        assertNull(MethodInvocationUtils.create(t, "blah", "non-existent arg"));
-    }
+		assertNull(MethodInvocationUtils.create(t, "blah", "non-existent arg"));
+	}
 
-    interface Blah {
-        void blah();
-    }
+	interface Blah {
+		void blah();
+	}
 
-    class AdvisedTarget extends AdvisedSupport implements Blah {
-        public void blah() {
-        }
-    }
+	class AdvisedTarget extends AdvisedSupport implements Blah {
+		public void blah() {
+		}
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
index 69dec6baed..ee06fd80e8 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
@@ -19,25 +19,23 @@ import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 
 /**
- * BCrypt implements OpenBSD-style Blowfish password hashing using
- * the scheme described in "A Future-Adaptable Password Scheme" by
- * Niels Provos and David Mazieres.
+ * BCrypt implements OpenBSD-style Blowfish password hashing using the scheme described in
+ * "A Future-Adaptable Password Scheme" by Niels Provos and David Mazieres.
  * <p>
- * This password hashing system tries to thwart off-line password
- * cracking using a computationally-intensive hashing algorithm,
- * based on Bruce Schneier's Blowfish cipher. The work factor of
- * the algorithm is parameterised, so it can be increased as
- * computers get faster.
+ * This password hashing system tries to thwart off-line password cracking using a
+ * computationally-intensive hashing algorithm, based on Bruce Schneier's Blowfish cipher.
+ * The work factor of the algorithm is parameterised, so it can be increased as computers
+ * get faster.
  * <p>
- * Usage is really simple. To hash a password for the first time,
- * call the hashpw method with a random salt, like this:
+ * Usage is really simple. To hash a password for the first time, call the hashpw method
+ * with a random salt, like this:
  * <p>
  * <code>
  * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
  * </code>
  * <p>
- * To check whether a plaintext password matches one that has been
- * hashed previously, use the checkpw method:
+ * To check whether a plaintext password matches one that has been hashed previously, use
+ * the checkpw method:
  * <p>
  * <code>
  * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
@@ -46,742 +44,626 @@ import java.security.SecureRandom;
  * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
  * </code>
  * <p>
- * The gensalt() method takes an optional parameter (log_rounds)
- * that determines the computational complexity of the hashing:
+ * The gensalt() method takes an optional parameter (log_rounds) that determines the
+ * computational complexity of the hashing:
  * <p>
  * <code>
  * String strong_salt = BCrypt.gensalt(10)<br />
  * String stronger_salt = BCrypt.gensalt(12)<br />
  * </code>
  * <p>
- * The amount of work increases exponentially (2**log_rounds), so
- * each increment is twice as much work. The default log_rounds is
- * 10, and the valid range is 4 to 31.
+ * The amount of work increases exponentially (2**log_rounds), so each increment is twice
+ * as much work. The default log_rounds is 10, and the valid range is 4 to 31.
  *
  * @author Damien Miller
  */
 public class BCrypt {
-    // BCrypt parameters
+	// BCrypt parameters
 
-    private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
-    private static final int BCRYPT_SALT_LEN = 16;
-    // Blowfish parameters
-    private static final int BLOWFISH_NUM_ROUNDS = 16;
-    // Initial contents of key schedule
-    private static final int P_orig[] = {
-        0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-        0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-        0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-        0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-        0x9216d5d9, 0x8979fb1b
-    };
-    private static final int S_orig[] = {
-        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-        0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-        0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-        0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-        0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-        0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-        0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-        0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-        0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-        0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-        0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-        0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-        0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-        0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-        0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-        0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-        0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-        0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-        0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-        0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-        0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-        0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-        0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-        0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-        0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-        0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-        0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-        0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-        0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-        0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-        0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-        0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-        0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-        0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-        0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-        0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-        0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-        0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-        0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-        0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-        0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-        0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-        0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-        0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-        0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-        0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-        0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-        0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-        0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-        0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-        0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-        0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-        0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-        0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-        0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-        0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-        0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-        0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-        0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-        0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-        0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-        0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-        0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
-        0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-        0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-        0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-        0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-        0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-        0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-        0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-        0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-        0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-        0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-        0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-        0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-        0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-        0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-        0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-        0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-        0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-        0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-        0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-        0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-        0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-        0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-        0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-        0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-        0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-        0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-        0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-        0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-        0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-        0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-        0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-        0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-        0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-        0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-        0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-        0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-        0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-        0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-        0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-        0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-        0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-        0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-        0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-        0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-        0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-        0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-        0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-        0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-        0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-        0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-        0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-        0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-        0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-        0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-        0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-        0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-        0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-        0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-        0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-        0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-        0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-        0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-        0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-        0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
-        0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-        0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-        0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-        0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-        0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-        0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-        0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-        0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-        0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-        0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-        0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-        0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-        0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-        0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-        0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-        0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-        0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-        0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-        0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-        0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-        0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-        0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-        0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-        0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-        0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-        0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-        0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-        0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-        0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-        0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-        0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-        0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-        0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-        0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-        0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-        0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-        0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-        0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-        0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-        0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-        0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-        0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-        0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-        0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-        0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-        0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-        0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-        0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-        0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-        0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-        0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-        0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-        0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-        0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-        0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-        0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-        0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-        0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-        0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-        0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-        0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-        0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-        0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-        0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
-        0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-        0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-        0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-        0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-        0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-        0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-        0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-        0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-        0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-        0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-        0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-        0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-        0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-        0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-        0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-        0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-        0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-        0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-        0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-        0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-        0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-        0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-        0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-        0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-        0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-        0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-        0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-        0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-        0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-        0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-        0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-        0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-        0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-        0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-        0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-        0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-        0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-        0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-        0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-        0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-        0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-        0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-        0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-        0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-        0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-        0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-        0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-        0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-        0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-        0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-        0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-        0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-        0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-        0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-        0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-        0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-        0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-        0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-        0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-        0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-        0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-        0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-        0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-        0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-    };
-    // bcrypt IV: "OrpheanBeholderScryDoubt"
-    static private final int bf_crypt_ciphertext[] = {
-        0x4f727068, 0x65616e42, 0x65686f6c,
-        0x64657253, 0x63727944, 0x6f756274
-    };
-    // Table for Base64 encoding
-    static private final char base64_code[] = {
-        '.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-        'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-        'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-        'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
-        'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
-        '6', '7', '8', '9'
-    };
-    // Table for Base64 decoding
-    static private final byte index_64[] = {
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-        -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
-        56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
-        -1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
-        7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-        17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-        -1, -1, -1, -1, -1, -1, 28, 29, 30,
-        31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-        41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
-        51, 52, 53, -1, -1, -1, -1, -1
-    };
-    // Expanded Blowfish key
-    private int P[];
-    private int S[];
+	private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
+	private static final int BCRYPT_SALT_LEN = 16;
+	// Blowfish parameters
+	private static final int BLOWFISH_NUM_ROUNDS = 16;
+	// Initial contents of key schedule
+	private static final int P_orig[] = { 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+			0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377,
+			0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+			0x9216d5d9, 0x8979fb1b };
+	private static final int S_orig[] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7,
+			0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5,
+			0x9c30d539, 0x2af26013, 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27,
+			0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993,
+			0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af,
+			0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5,
+			0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68,
+			0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4,
+			0x7d84a5c3, 0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248,
+			0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4,
+			0x5e5c9ec2, 0x196a2463, 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd,
+			0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc,
+			0x8ea5e9f8, 0xdb3222f8, 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0,
+			0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8,
+			0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01,
+			0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64,
+			0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8,
+			0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86,
+			0xc75442f5, 0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e,
+			0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a,
+			0x1b510052, 0x9a532915, 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6,
+			0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
+			0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
+			0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
+			0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
+			0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
+			0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
+			0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
+			0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
+			0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
+			0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
+			0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
+			0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
+			0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
+			0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
+			0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
+			0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
+			0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
+			0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
+			0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
+			0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
+			0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
+			0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7, 0xe93d5a68, 0x948140f7,
+			0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546,
+			0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, 0x96eb27b3, 0x55fd3941,
+			0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c,
+			0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, 0x1dc9faf7, 0x4b6d1856,
+			0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87,
+			0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802, 0x04272f70,
+			0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1,
+			0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1,
+			0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa,
+			0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, 0xc67b5510, 0x6d672c37,
+			0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24,
+			0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, 0x6a124237, 0xb79251e7,
+			0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f,
+			0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, 0x83426b33, 0xf01eab71,
+			0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74,
+			0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1, 0xbb8205d0,
+			0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df,
+			0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641,
+			0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de,
+			0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5,
+			0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212,
+			0x670efa8e, 0x406000e0, 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315,
+			0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
+			0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6,
+			0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da,
+			0x3f046f69, 0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d,
+			0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc,
+			0xf8d56629, 0x79132e28, 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2,
+			0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8,
+			0xabcc5167, 0xccad925f, 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46,
+			0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40,
+			0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e,
+			0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d,
+			0x06b89fb4, 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b,
+			0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667,
+			0x8df9317c, 0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb,
+			0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df,
+			0xd3a0342b, 0x8971f21e, 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891,
+			0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5,
+			0x6e163697, 0x88d273cc, 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00,
+			0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76,
+			0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0,
+			0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 };
+	// bcrypt IV: "OrpheanBeholderScryDoubt"
+	static private final int bf_crypt_ciphertext[] = { 0x4f727068, 0x65616e42,
+			0x65686f6c, 0x64657253, 0x63727944, 0x6f756274 };
+	// Table for Base64 encoding
+	static private final char base64_code[] = { '.', '/', 'A', 'B', 'C', 'D', 'E', 'F',
+			'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+			'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+			'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
+			'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+	// Table for Base64 decoding
+	static private final byte index_64[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
+			56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, 2, 3, 4, 5, 6, 7,
+			8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+			-1, -1, -1, -1, -1, -1, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+			41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -1, -1, -1, -1, -1 };
+	// Expanded Blowfish key
+	private int P[];
+	private int S[];
 
-    /**
-     * Encode a byte array using bcrypt's slightly-modified base64
-     * encoding scheme. Note that this is <strong>not</strong> compatible with
-     * the standard MIME-base64 encoding.
-     *
-     * @param d the byte array to encode
-     * @param len   the number of bytes to encode
-     * @param rs the destination buffer for the base64-encoded string
-     * @exception IllegalArgumentException if the length is invalid
-     */
-    static void encode_base64(byte d[], int len,
-            StringBuilder rs)
-            throws IllegalArgumentException {
-        int off = 0;
-        int c1, c2;
+	/**
+	 * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme. Note
+	 * that this is <strong>not</strong> compatible with the standard MIME-base64
+	 * encoding.
+	 *
+	 * @param d the byte array to encode
+	 * @param len the number of bytes to encode
+	 * @param rs the destination buffer for the base64-encoded string
+	 * @exception IllegalArgumentException if the length is invalid
+	 */
+	static void encode_base64(byte d[], int len, StringBuilder rs)
+			throws IllegalArgumentException {
+		int off = 0;
+		int c1, c2;
 
-        if (len <= 0 || len > d.length) {
-            throw new IllegalArgumentException("Invalid len");
-        }
+		if (len <= 0 || len > d.length) {
+			throw new IllegalArgumentException("Invalid len");
+		}
 
-        while (off < len) {
-            c1 = d[off++] & 0xff;
-            rs.append(base64_code[(c1 >> 2) & 0x3f]);
-            c1 = (c1 & 0x03) << 4;
-            if (off >= len) {
-                rs.append(base64_code[c1 & 0x3f]);
-                break;
-            }
-            c2 = d[off++] & 0xff;
-            c1 |= (c2 >> 4) & 0x0f;
-            rs.append(base64_code[c1 & 0x3f]);
-            c1 = (c2 & 0x0f) << 2;
-            if (off >= len) {
-                rs.append(base64_code[c1 & 0x3f]);
-                break;
-            }
-            c2 = d[off++] & 0xff;
-            c1 |= (c2 >> 6) & 0x03;
-            rs.append(base64_code[c1 & 0x3f]);
-            rs.append(base64_code[c2 & 0x3f]);
-        }
-    }
+		while (off < len) {
+			c1 = d[off++] & 0xff;
+			rs.append(base64_code[(c1 >> 2) & 0x3f]);
+			c1 = (c1 & 0x03) << 4;
+			if (off >= len) {
+				rs.append(base64_code[c1 & 0x3f]);
+				break;
+			}
+			c2 = d[off++] & 0xff;
+			c1 |= (c2 >> 4) & 0x0f;
+			rs.append(base64_code[c1 & 0x3f]);
+			c1 = (c2 & 0x0f) << 2;
+			if (off >= len) {
+				rs.append(base64_code[c1 & 0x3f]);
+				break;
+			}
+			c2 = d[off++] & 0xff;
+			c1 |= (c2 >> 6) & 0x03;
+			rs.append(base64_code[c1 & 0x3f]);
+			rs.append(base64_code[c2 & 0x3f]);
+		}
+	}
 
-    /**
-     * Look up the 3 bits base64-encoded by the specified character,
-     * range-checking against conversion table
-     * @param x the base64-encoded value
-     * @return  the decoded value of x
-     */
-    private static byte char64(char x) {
-        if (x > index_64.length) {
-            return -1;
-        }
-        return index_64[x];
-    }
+	/**
+	 * Look up the 3 bits base64-encoded by the specified character, range-checking
+	 * against conversion table
+	 * @param x the base64-encoded value
+	 * @return the decoded value of x
+	 */
+	private static byte char64(char x) {
+		if (x > index_64.length) {
+			return -1;
+		}
+		return index_64[x];
+	}
 
-    /**
-     * Decode a string encoded using bcrypt's base64 scheme to a
-     * byte array. Note that this is *not* compatible with
-     * the standard MIME-base64 encoding.
-     * @param s the string to decode
-     * @param maxolen   the maximum number of bytes to decode
-     * @return  an array containing the decoded bytes
-     * @throws IllegalArgumentException if maxolen is invalid
-     */
-    static byte[] decode_base64(String s, int maxolen)
-            throws IllegalArgumentException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream(maxolen);
-        int off = 0, slen = s.length(), olen = 0;
-        byte c1, c2, c3, c4, o;
+	/**
+	 * Decode a string encoded using bcrypt's base64 scheme to a byte array. Note that
+	 * this is *not* compatible with the standard MIME-base64 encoding.
+	 * @param s the string to decode
+	 * @param maxolen the maximum number of bytes to decode
+	 * @return an array containing the decoded bytes
+	 * @throws IllegalArgumentException if maxolen is invalid
+	 */
+	static byte[] decode_base64(String s, int maxolen) throws IllegalArgumentException {
+		ByteArrayOutputStream out = new ByteArrayOutputStream(maxolen);
+		int off = 0, slen = s.length(), olen = 0;
+		byte c1, c2, c3, c4, o;
 
-        if (maxolen <= 0) {
-            throw new IllegalArgumentException("Invalid maxolen");
-        }
+		if (maxolen <= 0) {
+			throw new IllegalArgumentException("Invalid maxolen");
+		}
 
-        while (off < slen - 1 && olen < maxolen) {
-            c1 = char64(s.charAt(off++));
-            c2 = char64(s.charAt(off++));
-            if (c1 == -1 || c2 == -1) {
-                break;
-            }
-            o = (byte) (c1 << 2);
-            o |= (c2 & 0x30) >> 4;
-            out.write(o);
-            if (++olen >= maxolen || off >= slen) {
-                break;
-            }
-            c3 = char64(s.charAt(off++));
-            if (c3 == -1) {
-                break;
-            }
-            o = (byte) ((c2 & 0x0f) << 4);
-            o |= (c3 & 0x3c) >> 2;
-            out.write(o);
-            if (++olen >= maxolen || off >= slen) {
-                break;
-            }
-            c4 = char64(s.charAt(off++));
-            o = (byte) ((c3 & 0x03) << 6);
-            o |= c4;
-            out.write(o);
-            ++olen;
-        }
+		while (off < slen - 1 && olen < maxolen) {
+			c1 = char64(s.charAt(off++));
+			c2 = char64(s.charAt(off++));
+			if (c1 == -1 || c2 == -1) {
+				break;
+			}
+			o = (byte) (c1 << 2);
+			o |= (c2 & 0x30) >> 4;
+			out.write(o);
+			if (++olen >= maxolen || off >= slen) {
+				break;
+			}
+			c3 = char64(s.charAt(off++));
+			if (c3 == -1) {
+				break;
+			}
+			o = (byte) ((c2 & 0x0f) << 4);
+			o |= (c3 & 0x3c) >> 2;
+			out.write(o);
+			if (++olen >= maxolen || off >= slen) {
+				break;
+			}
+			c4 = char64(s.charAt(off++));
+			o = (byte) ((c3 & 0x03) << 6);
+			o |= c4;
+			out.write(o);
+			++olen;
+		}
 
-        return out.toByteArray();
-    }
+		return out.toByteArray();
+	}
 
-    /**
-     * Blowfish encipher a single 64-bit block encoded as
-     * two 32-bit halves
-     * @param lr    an array containing the two 32-bit half blocks
-     * @param off   the position in the array of the blocks
-     */
-    private final void encipher(int lr[], int off) {
-        int i, n, l = lr[off], r = lr[off + 1];
+	/**
+	 * Blowfish encipher a single 64-bit block encoded as two 32-bit halves
+	 * @param lr an array containing the two 32-bit half blocks
+	 * @param off the position in the array of the blocks
+	 */
+	private final void encipher(int lr[], int off) {
+		int i, n, l = lr[off], r = lr[off + 1];
 
-        l ^= P[0];
-        for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
-            // Feistel substitution on left word
-            n = S[(l >> 24) & 0xff];
-            n += S[0x100 | ((l >> 16) & 0xff)];
-            n ^= S[0x200 | ((l >> 8) & 0xff)];
-            n += S[0x300 | (l & 0xff)];
-            r ^= n ^ P[++i];
+		l ^= P[0];
+		for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
+			// Feistel substitution on left word
+			n = S[(l >> 24) & 0xff];
+			n += S[0x100 | ((l >> 16) & 0xff)];
+			n ^= S[0x200 | ((l >> 8) & 0xff)];
+			n += S[0x300 | (l & 0xff)];
+			r ^= n ^ P[++i];
 
-            // Feistel substitution on right word
-            n = S[(r >> 24) & 0xff];
-            n += S[0x100 | ((r >> 16) & 0xff)];
-            n ^= S[0x200 | ((r >> 8) & 0xff)];
-            n += S[0x300 | (r & 0xff)];
-            l ^= n ^ P[++i];
-        }
-        lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
-        lr[off + 1] = l;
-    }
+			// Feistel substitution on right word
+			n = S[(r >> 24) & 0xff];
+			n += S[0x100 | ((r >> 16) & 0xff)];
+			n ^= S[0x200 | ((r >> 8) & 0xff)];
+			n += S[0x300 | (r & 0xff)];
+			l ^= n ^ P[++i];
+		}
+		lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
+		lr[off + 1] = l;
+	}
 
-    /**
-     * Cycically extract a word of key material
-     * @param data  the string to extract the data from
-     * @param offp  a "pointer" (as a one-entry array) to the
-     * current offset into data
-     * @return  the next word of material from data
-     */
-    private static int streamtoword(byte data[], int offp[]) {
-        int i;
-        int word = 0;
-        int off = offp[0];
+	/**
+	 * Cycically extract a word of key material
+	 * @param data the string to extract the data from
+	 * @param offp a "pointer" (as a one-entry array) to the current offset into data
+	 * @return the next word of material from data
+	 */
+	private static int streamtoword(byte data[], int offp[]) {
+		int i;
+		int word = 0;
+		int off = offp[0];
 
-        for (i = 0; i < 4; i++) {
-            word = (word << 8) | (data[off] & 0xff);
-            off = (off + 1) % data.length;
-        }
+		for (i = 0; i < 4; i++) {
+			word = (word << 8) | (data[off] & 0xff);
+			off = (off + 1) % data.length;
+		}
 
-        offp[0] = off;
-        return word;
-    }
+		offp[0] = off;
+		return word;
+	}
 
-    /**
-     * Initialise the Blowfish key schedule
-     */
-    private void init_key() {
-        P = (int[]) P_orig.clone();
-        S = (int[]) S_orig.clone();
-    }
+	/**
+	 * Initialise the Blowfish key schedule
+	 */
+	private void init_key() {
+		P = (int[]) P_orig.clone();
+		S = (int[]) S_orig.clone();
+	}
 
-    /**
-     * Key the Blowfish cipher
-     * @param key   an array containing the key
-     */
-    private void key(byte key[]) {
-        int i;
-        int koffp[] = {0};
-        int lr[] = {0, 0};
-        int plen = P.length, slen = S.length;
+	/**
+	 * Key the Blowfish cipher
+	 * @param key an array containing the key
+	 */
+	private void key(byte key[]) {
+		int i;
+		int koffp[] = { 0 };
+		int lr[] = { 0, 0 };
+		int plen = P.length, slen = S.length;
 
-        for (i = 0; i < plen; i++) {
-            P[i] = P[i] ^ streamtoword(key, koffp);
-        }
+		for (i = 0; i < plen; i++) {
+			P[i] = P[i] ^ streamtoword(key, koffp);
+		}
 
-        for (i = 0; i < plen; i += 2) {
-            encipher(lr, 0);
-            P[i] = lr[0];
-            P[i + 1] = lr[1];
-        }
+		for (i = 0; i < plen; i += 2) {
+			encipher(lr, 0);
+			P[i] = lr[0];
+			P[i + 1] = lr[1];
+		}
 
-        for (i = 0; i < slen; i += 2) {
-            encipher(lr, 0);
-            S[i] = lr[0];
-            S[i + 1] = lr[1];
-        }
-    }
+		for (i = 0; i < slen; i += 2) {
+			encipher(lr, 0);
+			S[i] = lr[0];
+			S[i + 1] = lr[1];
+		}
+	}
 
-    /**
-     * Perform the "enhanced key schedule" step described by
-     * Provos and Mazieres in "A Future-Adaptable Password Scheme"
-     * http://www.openbsd.org/papers/bcrypt-paper.ps
-     * @param data  salt information
-     * @param key   password information
-     */
-    private void ekskey(byte data[], byte key[]) {
-        int i;
-        int koffp[] = {0}, doffp[] = {0};
-        int lr[] = {0, 0};
-        int plen = P.length, slen = S.length;
+	/**
+	 * Perform the "enhanced key schedule" step described by Provos and Mazieres in
+	 * "A Future-Adaptable Password Scheme" http://www.openbsd.org/papers/bcrypt-paper.ps
+	 * @param data salt information
+	 * @param key password information
+	 */
+	private void ekskey(byte data[], byte key[]) {
+		int i;
+		int koffp[] = { 0 }, doffp[] = { 0 };
+		int lr[] = { 0, 0 };
+		int plen = P.length, slen = S.length;
 
-        for (i = 0; i < plen; i++) {
-            P[i] = P[i] ^ streamtoword(key, koffp);
-        }
+		for (i = 0; i < plen; i++) {
+			P[i] = P[i] ^ streamtoword(key, koffp);
+		}
 
-        for (i = 0; i < plen; i += 2) {
-            lr[0] ^= streamtoword(data, doffp);
-            lr[1] ^= streamtoword(data, doffp);
-            encipher(lr, 0);
-            P[i] = lr[0];
-            P[i + 1] = lr[1];
-        }
+		for (i = 0; i < plen; i += 2) {
+			lr[0] ^= streamtoword(data, doffp);
+			lr[1] ^= streamtoword(data, doffp);
+			encipher(lr, 0);
+			P[i] = lr[0];
+			P[i + 1] = lr[1];
+		}
 
-        for (i = 0; i < slen; i += 2) {
-            lr[0] ^= streamtoword(data, doffp);
-            lr[1] ^= streamtoword(data, doffp);
-            encipher(lr, 0);
-            S[i] = lr[0];
-            S[i + 1] = lr[1];
-        }
-    }
+		for (i = 0; i < slen; i += 2) {
+			lr[0] ^= streamtoword(data, doffp);
+			lr[1] ^= streamtoword(data, doffp);
+			encipher(lr, 0);
+			S[i] = lr[0];
+			S[i + 1] = lr[1];
+		}
+	}
 
-    static long roundsForLogRounds(int log_rounds) {
-        if (log_rounds < 4 || log_rounds > 31) {
-            throw new IllegalArgumentException("Bad number of rounds");
-        }
-        return 1L << log_rounds;
-    }
+	static long roundsForLogRounds(int log_rounds) {
+		if (log_rounds < 4 || log_rounds > 31) {
+			throw new IllegalArgumentException("Bad number of rounds");
+		}
+		return 1L << log_rounds;
+	}
 
-    /**
-     * Perform the central password hashing step in the
-     * bcrypt scheme
-     * @param password  the password to hash
-     * @param salt  the binary salt to hash with the password
-     * @param log_rounds    the binary logarithm of the number
-     * of rounds of hashing to apply
-     * @return  an array containing the binary hashed password
-     */
-    private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
-        int cdata[] = (int[]) bf_crypt_ciphertext.clone();
-        int clen = cdata.length;
-        byte ret[];
+	/**
+	 * Perform the central password hashing step in the bcrypt scheme
+	 * @param password the password to hash
+	 * @param salt the binary salt to hash with the password
+	 * @param log_rounds the binary logarithm of the number of rounds of hashing to apply
+	 * @return an array containing the binary hashed password
+	 */
+	private byte[] crypt_raw(byte password[], byte salt[], int log_rounds) {
+		int cdata[] = (int[]) bf_crypt_ciphertext.clone();
+		int clen = cdata.length;
+		byte ret[];
 
-        long rounds = roundsForLogRounds(log_rounds);
+		long rounds = roundsForLogRounds(log_rounds);
 
-        init_key();
-        ekskey(salt, password);
-        for (long i = 0; i < rounds; i++) {
-            key(password);
-            key(salt);
-        }
+		init_key();
+		ekskey(salt, password);
+		for (long i = 0; i < rounds; i++) {
+			key(password);
+			key(salt);
+		}
 
-        for (int i = 0; i < 64; i++) {
-            for (int j = 0; j < (clen >> 1); j++) {
-                encipher(cdata, j << 1);
-            }
-        }
+		for (int i = 0; i < 64; i++) {
+			for (int j = 0; j < (clen >> 1); j++) {
+				encipher(cdata, j << 1);
+			}
+		}
 
-        ret = new byte[clen * 4];
-        for (int i = 0, j = 0; i < clen; i++) {
-            ret[j++] = (byte) ((cdata[i] >> 24) & 0xff);
-            ret[j++] = (byte) ((cdata[i] >> 16) & 0xff);
-            ret[j++] = (byte) ((cdata[i] >> 8) & 0xff);
-            ret[j++] = (byte) (cdata[i] & 0xff);
-        }
-        return ret;
-    }
+		ret = new byte[clen * 4];
+		for (int i = 0, j = 0; i < clen; i++) {
+			ret[j++] = (byte) ((cdata[i] >> 24) & 0xff);
+			ret[j++] = (byte) ((cdata[i] >> 16) & 0xff);
+			ret[j++] = (byte) ((cdata[i] >> 8) & 0xff);
+			ret[j++] = (byte) (cdata[i] & 0xff);
+		}
+		return ret;
+	}
 
-    /**
-     * Hash a password using the OpenBSD bcrypt scheme
-     * @param password  the password to hash
-     * @param salt  the salt to hash with (perhaps generated
-     * using BCrypt.gensalt)
-     * @return  the hashed password
-     */
-    public static String hashpw(String password, String salt) {
-        BCrypt B;
-        String real_salt;
-        byte passwordb[], saltb[], hashed[];
-        char minor = (char) 0;
-        int rounds, off = 0;
-        StringBuilder rs = new StringBuilder();
+	/**
+	 * Hash a password using the OpenBSD bcrypt scheme
+	 * @param password the password to hash
+	 * @param salt the salt to hash with (perhaps generated using BCrypt.gensalt)
+	 * @return the hashed password
+	 */
+	public static String hashpw(String password, String salt) {
+		BCrypt B;
+		String real_salt;
+		byte passwordb[], saltb[], hashed[];
+		char minor = (char) 0;
+		int rounds, off = 0;
+		StringBuilder rs = new StringBuilder();
 
-        int saltLength = salt.length();
+		int saltLength = salt.length();
 
-        if (saltLength < 28) {
-            throw new IllegalArgumentException("Invalid salt");
-        }
+		if (saltLength < 28) {
+			throw new IllegalArgumentException("Invalid salt");
+		}
 
-        if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
-            throw new IllegalArgumentException("Invalid salt version");
-        }
-        if (salt.charAt(2) == '$') {
-            off = 3;
-        } else {
-            minor = salt.charAt(2);
-            if (minor != 'a' || salt.charAt(3) != '$') {
-                throw new IllegalArgumentException("Invalid salt revision");
-            }
-            off = 4;
-        }
+		if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
+			throw new IllegalArgumentException("Invalid salt version");
+		}
+		if (salt.charAt(2) == '$') {
+			off = 3;
+		}
+		else {
+			minor = salt.charAt(2);
+			if (minor != 'a' || salt.charAt(3) != '$') {
+				throw new IllegalArgumentException("Invalid salt revision");
+			}
+			off = 4;
+		}
 
-        if (saltLength - off < 25) {
-            throw new IllegalArgumentException("Invalid salt");
-        }
+		if (saltLength - off < 25) {
+			throw new IllegalArgumentException("Invalid salt");
+		}
 
-        // Extract number of rounds
-        if (salt.charAt(off + 2) > '$') {
-            throw new IllegalArgumentException("Missing salt rounds");
-        }
-        rounds = Integer.parseInt(salt.substring(off, off + 2));
+		// Extract number of rounds
+		if (salt.charAt(off + 2) > '$') {
+			throw new IllegalArgumentException("Missing salt rounds");
+		}
+		rounds = Integer.parseInt(salt.substring(off, off + 2));
 
-        real_salt = salt.substring(off + 3, off + 25);
-        try {
-            passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
-        } catch (UnsupportedEncodingException uee) {
-            throw new AssertionError("UTF-8 is not supported");
-        }
+		real_salt = salt.substring(off + 3, off + 25);
+		try {
+			passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
+		}
+		catch (UnsupportedEncodingException uee) {
+			throw new AssertionError("UTF-8 is not supported");
+		}
 
-        saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
+		saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
 
-        B = new BCrypt();
-        hashed = B.crypt_raw(passwordb, saltb, rounds);
+		B = new BCrypt();
+		hashed = B.crypt_raw(passwordb, saltb, rounds);
 
-        rs.append("$2");
-        if (minor >= 'a') {
-            rs.append(minor);
-        }
-        rs.append("$");
-        if (rounds < 10) {
-            rs.append("0");
-        }
-        rs.append(rounds);
-        rs.append("$");
-        encode_base64(saltb, saltb.length, rs);
-        encode_base64(hashed,
-                bf_crypt_ciphertext.length * 4 - 1, rs);
-        return rs.toString();
-    }
+		rs.append("$2");
+		if (minor >= 'a') {
+			rs.append(minor);
+		}
+		rs.append("$");
+		if (rounds < 10) {
+			rs.append("0");
+		}
+		rs.append(rounds);
+		rs.append("$");
+		encode_base64(saltb, saltb.length, rs);
+		encode_base64(hashed, bf_crypt_ciphertext.length * 4 - 1, rs);
+		return rs.toString();
+	}
 
-    /**
-     * Generate a salt for use with the BCrypt.hashpw() method
-     * @param log_rounds    the log2 of the number of rounds of
-     * hashing to apply - the work factor therefore increases as
-     * 2**log_rounds.
-     * @param random        an instance of SecureRandom to use
-     * @return  an encoded salt value
-     */
-    public static String gensalt(int log_rounds, SecureRandom random) {
-        if (log_rounds < 4 || log_rounds > 31) {
-            throw new IllegalArgumentException("Bad number of rounds");
-        }
-        StringBuilder rs = new StringBuilder();
-        byte rnd[] = new byte[BCRYPT_SALT_LEN];
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method
+	 * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+	 * factor therefore increases as 2**log_rounds.
+	 * @param random an instance of SecureRandom to use
+	 * @return an encoded salt value
+	 */
+	public static String gensalt(int log_rounds, SecureRandom random) {
+		if (log_rounds < 4 || log_rounds > 31) {
+			throw new IllegalArgumentException("Bad number of rounds");
+		}
+		StringBuilder rs = new StringBuilder();
+		byte rnd[] = new byte[BCRYPT_SALT_LEN];
 
-        random.nextBytes(rnd);
+		random.nextBytes(rnd);
 
-        rs.append("$2a$");
-        if (log_rounds < 10) {
-            rs.append("0");
-        }
-        rs.append(log_rounds);
-        rs.append("$");
-        encode_base64(rnd, rnd.length, rs);
-        return rs.toString();
-    }
+		rs.append("$2a$");
+		if (log_rounds < 10) {
+			rs.append("0");
+		}
+		rs.append(log_rounds);
+		rs.append("$");
+		encode_base64(rnd, rnd.length, rs);
+		return rs.toString();
+	}
 
-    /**
-     * Generate a salt for use with the BCrypt.hashpw() method
-     * @param log_rounds    the log2 of the number of rounds of
-     * hashing to apply - the work factor therefore increases as
-     * 2**log_rounds.
-     * @return  an encoded salt value
-     */
-    public static String gensalt(int log_rounds) {
-        return gensalt(log_rounds, new SecureRandom());
-    }
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method
+	 * @param log_rounds the log2 of the number of rounds of hashing to apply - the work
+	 * factor therefore increases as 2**log_rounds.
+	 * @return an encoded salt value
+	 */
+	public static String gensalt(int log_rounds) {
+		return gensalt(log_rounds, new SecureRandom());
+	}
 
-    /**
-     * Generate a salt for use with the BCrypt.hashpw() method,
-     * selecting a reasonable default for the number of hashing
-     * rounds to apply
-     * @return  an encoded salt value
-     */
-    public static String gensalt() {
-        return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
-    }
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method, selecting a reasonable
+	 * default for the number of hashing rounds to apply
+	 * @return an encoded salt value
+	 */
+	public static String gensalt() {
+		return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
+	}
 
-    /**
-     * Check that a plaintext password matches a previously hashed
-     * one
-     * @param plaintext the plaintext password to verify
-     * @param hashed    the previously-hashed password
-     * @return  true if the passwords match, false otherwise
-     */
-    public static boolean checkpw(String plaintext, String hashed) {
-        return equalsNoEarlyReturn(hashed, hashpw(plaintext, hashed));
-    }
+	/**
+	 * Check that a plaintext password matches a previously hashed one
+	 * @param plaintext the plaintext password to verify
+	 * @param hashed the previously-hashed password
+	 * @return true if the passwords match, false otherwise
+	 */
+	public static boolean checkpw(String plaintext, String hashed) {
+		return equalsNoEarlyReturn(hashed, hashpw(plaintext, hashed));
+	}
 
-    static boolean equalsNoEarlyReturn(String a, String b) {
-        char[] caa = a.toCharArray();
-        char[] cab = b.toCharArray();
+	static boolean equalsNoEarlyReturn(String a, String b) {
+		char[] caa = a.toCharArray();
+		char[] cab = b.toCharArray();
 
-        if (caa.length != cab.length) {
-            return false;
-        }
+		if (caa.length != cab.length) {
+			return false;
+		}
 
-        byte ret = 0;
-        for (int i = 0; i < caa.length; i++) {
-            ret |= caa[i] ^ cab[i];
-        }
-        return ret == 0;
-    }
+		byte ret = 0;
+		for (int i = 0; i < caa.length; i++) {
+			ret |= caa[i] ^ cab[i];
+		}
+		return ret == 0;
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
index a12994e229..a18de67fc7 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
@@ -23,69 +23,71 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 /**
- * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients can optionally supply a
- * "strength" (a.k.a. log rounds in BCrypt) and a SecureRandom instance. The larger the strength parameter the more work
- * will have to be done (exponentially) to hash the passwords.  The default value is 10.
+ * Implementation of PasswordEncoder that uses the BCrypt strong hashing function. Clients
+ * can optionally supply a "strength" (a.k.a. log rounds in BCrypt) and a SecureRandom
+ * instance. The larger the strength parameter the more work will have to be done
+ * (exponentially) to hash the passwords. The default value is 10.
  *
  * @author Dave Syer
  *
  */
 public class BCryptPasswordEncoder implements PasswordEncoder {
-    private Pattern BCRYPT_PATTERN = Pattern.compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}");
-    private final Log logger = LogFactory.getLog(getClass());
+	private Pattern BCRYPT_PATTERN = Pattern
+			.compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}");
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final int strength;
+	private final int strength;
 
-    private final SecureRandom random;
+	private final SecureRandom random;
 
-    public BCryptPasswordEncoder() {
-        this(-1);
-    }
+	public BCryptPasswordEncoder() {
+		this(-1);
+	}
 
-    /**
-     * @param strength the log rounds to use
-     */
-    public BCryptPasswordEncoder(int strength) {
-        this(strength, null);
-    }
+	/**
+	 * @param strength the log rounds to use
+	 */
+	public BCryptPasswordEncoder(int strength) {
+		this(strength, null);
+	}
 
-    /**
-     * @param strength the log rounds to use
-     * @param random the secure random instance to use
-     *
-     */
-    public BCryptPasswordEncoder(int strength, SecureRandom random) {
-        this.strength = strength;
-        this.random = random;
-    }
+	/**
+	 * @param strength the log rounds to use
+	 * @param random the secure random instance to use
+	 *
+	 */
+	public BCryptPasswordEncoder(int strength, SecureRandom random) {
+		this.strength = strength;
+		this.random = random;
+	}
 
-    public String encode(CharSequence rawPassword) {
-        String salt;
-        if (strength > 0) {
-            if (random != null) {
-                salt = BCrypt.gensalt(strength, random);
-            }
-            else {
-                salt = BCrypt.gensalt(strength);
-            }
-        }
-        else {
-            salt = BCrypt.gensalt();
-        }
-        return BCrypt.hashpw(rawPassword.toString(), salt);
-    }
+	public String encode(CharSequence rawPassword) {
+		String salt;
+		if (strength > 0) {
+			if (random != null) {
+				salt = BCrypt.gensalt(strength, random);
+			}
+			else {
+				salt = BCrypt.gensalt(strength);
+			}
+		}
+		else {
+			salt = BCrypt.gensalt();
+		}
+		return BCrypt.hashpw(rawPassword.toString(), salt);
+	}
 
-    public boolean matches(CharSequence rawPassword, String encodedPassword) {
-        if (encodedPassword == null || encodedPassword.length() == 0) {
-            logger.warn("Empty encoded password");
-            return false;
-        }
+	public boolean matches(CharSequence rawPassword, String encodedPassword) {
+		if (encodedPassword == null || encodedPassword.length() == 0) {
+			logger.warn("Empty encoded password");
+			return false;
+		}
 
-        if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) {
-            logger.warn("Encoded password does not look like BCrypt");
-            return false;
-        }
+		if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) {
+			logger.warn("Encoded password does not look like BCrypt");
+			return false;
+		}
 
-        return BCrypt.checkpw(rawPassword.toString(), encodedPassword);
-    }
+		return BCrypt.checkpw(rawPassword.toString(), encodedPassword);
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java b/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
index 6ba7029630..46bf7c8313 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
@@ -1,9 +1,9 @@
 package org.springframework.security.crypto.codec;
 
-
 /**
- * Base64 encoder which is a reduced version of Robert Harder's public domain implementation (version 2.3.7).
- * See <a href="http://iharder.net/base64">http://iharder.net/base64</a> for more information.
+ * Base64 encoder which is a reduced version of Robert Harder's public domain
+ * implementation (version 2.3.7). See <a
+ * href="http://iharder.net/base64">http://iharder.net/base64</a> for more information.
  * <p>
  * For internal use only.
  *
@@ -12,631 +12,620 @@ package org.springframework.security.crypto.codec;
  */
 public final class Base64 {
 
-    /** No options specified. Value is zero. */
-    public final static int NO_OPTIONS = 0;
-
-    /** Specify encoding in first bit. Value is one. */
-    public final static int ENCODE = 1;
-
-
-    /** Specify decoding in first bit. Value is zero. */
-    public final static int DECODE = 0;
-
-    /** Do break lines when encoding. Value is 8. */
-    public final static int DO_BREAK_LINES = 8;
-
-    /**
-     * Encode using Base64-like encoding that is URL- and Filename-safe as described
-     * in Section 4 of RFC3548:
-     * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
-     * It is important to note that data encoded this way is <em>not</em> officially valid Base64,
-     * or at the very least should not be called Base64 without also specifying that is
-     * was encoded using the URL- and Filename-safe dialect.
-     */
-    public final static int URL_SAFE = 16;
-
-
-    /**
-     * Encode using the special "ordered" dialect of Base64 described here:
-     * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
-     */
-    public final static int ORDERED = 32;
-
-
-    /** Maximum line length (76) of Base64 output. */
-    private final static int MAX_LINE_LENGTH = 76;
-
-
-    /** The equals sign (=) as a byte. */
-    private final static byte EQUALS_SIGN = (byte)'=';
-
-
-    /** The new line character (\n) as a byte. */
-    private final static byte NEW_LINE = (byte)'\n';
-
-    private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
-    private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
-
-
-/* ********  S T A N D A R D   B A S E 6 4   A L P H A B E T  ******** */
-
-    /** The 64 valid Base64 values. */
-    /* Host platform me be something funny like EBCDIC, so we hardcode these values. */
-    private final static byte[] _STANDARD_ALPHABET = {
-        (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-        (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
-        (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-        (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-        (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
-        (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
-        (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
-    };
-
-
-    /**
-     * Translates a Base64 value to either its 6-bit reconstruction value
-     * or a negative number indicating some other meaning.
-     **/
-    private final static byte[] _STANDARD_DECODABET = {
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-        -5,-5,                                      // Whitespace: Tab and Linefeed
-        -9,-9,                                      // Decimal 11 - 12
-        -5,                                         // Whitespace: Carriage Return
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-        -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-        -5,                                         // Whitespace: Space
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-        62,                                         // Plus sign at decimal 43
-        -9,-9,-9,                                   // Decimal 44 - 46
-        63,                                         // Slash at decimal 47
-        52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
-        -9,-9,-9,                                   // Decimal 58 - 60
-        -1,                                         // Equals sign at decimal 61
-        -9,-9,-9,                                      // Decimal 62 - 64
-        0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
-        14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
-        -9,-9,-9,-9,-9,-9,                          // Decimal 91 - 96
-        26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
-        39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
-        -9,-9,-9,-9,-9                              // Decimal 123 - 127
-        ,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,       // Decimal 128 - 139
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255
-    };
-
-
-/* ********  U R L   S A F E   B A S E 6 4   A L P H A B E T  ******** */
-
-    /**
-     * Used in the URL- and Filename-safe dialect described in Section 4 of RFC3548:
-     * <a href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
-     * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus" and "slash."
-     */
-    private final static byte[] _URL_SAFE_ALPHABET = {
-      (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-      (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-      (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
-      (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-      (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-      (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-      (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
-      (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-      (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
-      (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'-', (byte)'_'
-    };
-
-    /**
-     * Used in decoding URL- and Filename-safe dialects of Base64.
-     */
-    private final static byte[] _URL_SAFE_DECODABET = {
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-      -5,-5,                                      // Whitespace: Tab and Linefeed
-      -9,-9,                                      // Decimal 11 - 12
-      -5,                                         // Whitespace: Carriage Return
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-      -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-      -5,                                         // Whitespace: Space
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-      -9,                                         // Plus sign at decimal 43
-      -9,                                         // Decimal 44
-      62,                                         // Minus sign at decimal 45
-      -9,                                         // Decimal 46
-      -9,                                         // Slash at decimal 47
-      52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
-      -9,-9,-9,                                   // Decimal 58 - 60
-      -1,                                         // Equals sign at decimal 61
-      -9,-9,-9,                                   // Decimal 62 - 64
-      0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
-      14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
-      -9,-9,-9,-9,                                // Decimal 91 - 94
-      63,                                         // Underscore at decimal 95
-      -9,                                         // Decimal 96
-      26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
-      39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
-      -9,-9,-9,-9,-9                              // Decimal 123 - 127
-      ,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 128 - 139
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255
-    };
-
-
-
-/* ********  O R D E R E D   B A S E 6 4   A L P H A B E T  ******** */
-
-    /**
-     * I don't get the point of this technique, but someone requested it,
-     * and it is described here:
-     * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
-     */
-    private final static byte[] _ORDERED_ALPHABET = {
-      (byte)'-',
-      (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4',
-      (byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9',
-      (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
-      (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
-      (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
-      (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
-      (byte)'_',
-      (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
-      (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-      (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
-      (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z'
-    };
-
-    /**
-     * Used in decoding the "ordered" dialect of Base64.
-     */
-    private final static byte[] _ORDERED_DECODABET = {
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
-      -5,-5,                                      // Whitespace: Tab and Linefeed
-      -9,-9,                                      // Decimal 11 - 12
-      -5,                                         // Whitespace: Carriage Return
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
-      -9,-9,-9,-9,-9,                             // Decimal 27 - 31
-      -5,                                         // Whitespace: Space
-      -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
-      -9,                                         // Plus sign at decimal 43
-      -9,                                         // Decimal 44
-      0,                                          // Minus sign at decimal 45
-      -9,                                         // Decimal 46
-      -9,                                         // Slash at decimal 47
-      1,2,3,4,5,6,7,8,9,10,                       // Numbers zero through nine
-      -9,-9,-9,                                   // Decimal 58 - 60
-      -1,                                         // Equals sign at decimal 61
-      -9,-9,-9,                                   // Decimal 62 - 64
-      11,12,13,14,15,16,17,18,19,20,21,22,23,     // Letters 'A' through 'M'
-      24,25,26,27,28,29,30,31,32,33,34,35,36,     // Letters 'N' through 'Z'
-      -9,-9,-9,-9,                                // Decimal 91 - 94
-      37,                                         // Underscore at decimal 95
-      -9,                                         // Decimal 96
-      38,39,40,41,42,43,44,45,46,47,48,49,50,     // Letters 'a' through 'm'
-      51,52,53,54,55,56,57,58,59,60,61,62,63,     // Letters 'n' through 'z'
-      -9,-9,-9,-9,-9                                 // Decimal 123 - 127
-       ,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 128 - 139
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
-        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255
-    };
-
-
-    public static byte[] decode(byte[] bytes) {
-        return decode(bytes, 0, bytes.length, NO_OPTIONS);
-    }
-
-    public static byte[] encode(byte[] bytes) {
-        return encodeBytesToBytes(bytes, 0, bytes.length, NO_OPTIONS);
-    }
-
-    public static boolean isBase64(byte[] bytes) {
-        try {
-            decode(bytes);
-        } catch (InvalidBase64CharacterException e) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Returns one of the _SOMETHING_ALPHABET byte arrays depending on
-     * the options specified.
-     * It's possible, though silly, to specify ORDERED <b>and</b> URLSAFE
-     * in which case one of them will be picked, though there is
-     * no guarantee as to which one will be picked.
-     */
-    private static byte[] getAlphabet( int options ) {
-        if ((options & URL_SAFE) == URL_SAFE) {
-            return _URL_SAFE_ALPHABET;
-        } else if ((options & ORDERED) == ORDERED) {
-            return _ORDERED_ALPHABET;
-        } else {
-            return _STANDARD_ALPHABET;
-        }
-    }
-
-    /**
-     * Returns one of the _SOMETHING_DECODABET byte arrays depending on
-     * the options specified.
-     * It's possible, though silly, to specify ORDERED and URL_SAFE
-     * in which case one of them will be picked, though there is
-     * no guarantee as to which one will be picked.
-     */
-    private static byte[] getDecodabet( int options ) {
-        if( (options & URL_SAFE) == URL_SAFE) {
-            return _URL_SAFE_DECODABET;
-        } else if ((options & ORDERED) == ORDERED) {
-            return _ORDERED_DECODABET;
-        } else {
-            return _STANDARD_DECODABET;
-        }
-    }
-
-
-/* ********  E N C O D I N G   M E T H O D S  ******** */
-
-    /**
-     * <p>Encodes up to three bytes of the array <var>source</var>
-     * and writes the resulting four Base64 bytes to <var>destination</var>.
-     * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying
-     * <var>srcOffset</var> and <var>destOffset</var>.
-     * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 3 for
-     * the <var>source</var> array or <var>destOffset</var> + 4 for
-     * the <var>destination</var> array.
-     * The actual number of significant bytes in your array is
-     * given by <var>numSigBytes</var>.</p>
-     * <p>This is the lowest level of the encoding methods with
-     * all possible parameters.</p>
-     *
-     * @param source the array to convert
-     * @param srcOffset the index where conversion begins
-     * @param numSigBytes the number of significant bytes in your array
-     * @param destination the array to hold the conversion
-     * @param destOffset the index where output will be put
-     * @return the <var>destination</var> array
-     * @since 1.3
-     */
-    private static byte[] encode3to4(
-    byte[] source, int srcOffset, int numSigBytes,
-    byte[] destination, int destOffset, int options ) {
-
-    byte[] ALPHABET = getAlphabet( options );
-
-        //           1         2         3
-        // 01234567890123456789012345678901 Bit position
-        // --------000000001111111122222222 Array position from threeBytes
-        // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
-        //          >>18  >>12  >> 6  >> 0  Right shift necessary
-        //                0x3f  0x3f  0x3f  Additional AND
-
-        // Create buffer with zero-padding if there are only one or two
-        // significant bytes passed in the array.
-        // We have to shift left 24 in order to flush out the 1's that appear
-        // when Java treats a value as negative that is cast from a byte to an int.
-        int inBuff =   ( numSigBytes > 0 ? ((source[ srcOffset     ] << 24) >>>  8) : 0 )
-                     | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
-                     | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
-
-        switch( numSigBytes )
-        {
-            case 3:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
-                destination[ destOffset + 3 ] = ALPHABET[ (inBuff       ) & 0x3f ];
-                return destination;
-
-            case 2:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
-                destination[ destOffset + 3 ] = EQUALS_SIGN;
-                return destination;
-
-            case 1:
-                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
-                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
-                destination[ destOffset + 2 ] = EQUALS_SIGN;
-                destination[ destOffset + 3 ] = EQUALS_SIGN;
-                return destination;
-
-            default:
-                return destination;
-        }
-    }
-
-
-    /**
-     *
-     * @param source The data to convert
-     * @param off Offset in array where conversion should begin
-     * @param len Length of data to convert
-     * @param options Specified options
-     * @return The Base64-encoded data as a String
-     * @see Base64#DO_BREAK_LINES
-     * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if source array is null
-     * @throws IllegalArgumentException if source array, offset, or length are invalid
-     * @since 2.3.1
-     */
-    private static byte[] encodeBytesToBytes( byte[] source, int off, int len, int options ) {
-
-        if( source == null ){
-            throw new NullPointerException( "Cannot serialize a null array." );
-        }   // end if: null
-
-        if( off < 0 ){
-            throw new IllegalArgumentException( "Cannot have negative offset: " + off );
-        }   // end if: off < 0
-
-        if( len < 0 ){
-            throw new IllegalArgumentException( "Cannot have length offset: " + len );
-        }   // end if: len < 0
-
-        if( off + len > source.length  ){
-            throw new IllegalArgumentException(
-            String.format( "Cannot have offset of %d and length of %d with array of length %d", off,len,source.length));
-        }   // end if: off < 0
-
-        boolean breakLines = (options & DO_BREAK_LINES) > 0;
-
-        //int    len43   = len * 4 / 3;
-        //byte[] outBuff = new byte[   ( len43 )                      // Main 4:3
-        //                           + ( (len % 3) > 0 ? 4 : 0 )      // Account for padding
-        //                           + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
-        // Try to determine more precisely how big the array needs to be.
-        // If we get it right, we don't have to do an array copy, and
-        // we save a bunch of memory.
-        int encLen = ( len / 3 ) * 4 + ( len % 3 > 0 ? 4 : 0 ); // Bytes needed for actual encoding
-        if( breakLines ){
-            encLen += encLen / MAX_LINE_LENGTH; // Plus extra newline characters
-        }
-        byte[] outBuff = new byte[ encLen ];
-
-
-        int d = 0;
-        int e = 0;
-        int len2 = len - 2;
-        int lineLength = 0;
-        for( ; d < len2; d+=3, e+=4 ) {
-            encode3to4( source, d+off, 3, outBuff, e, options );
-
-            lineLength += 4;
-            if( breakLines && lineLength >= MAX_LINE_LENGTH )
-            {
-                outBuff[e+4] = NEW_LINE;
-                e++;
-                lineLength = 0;
-            }   // end if: end of line
-        }   // en dfor: each piece of array
-
-        if( d < len ) {
-            encode3to4( source, d+off, len - d, outBuff, e, options );
-            e += 4;
-        }   // end if: some padding needed
-
-
-        // Only resize array if we didn't guess it right.
-        if( e <= outBuff.length - 1 ){
-            byte[] finalOut = new byte[e];
-            System.arraycopy(outBuff,0, finalOut,0,e);
-            //System.err.println("Having to resize array from " + outBuff.length + " to " + e );
-            return finalOut;
-        } else {
-            //System.err.println("No need to resize array.");
-            return outBuff;
-        }
-    }
-
-
-/* ********  D E C O D I N G   M E T H O D S  ******** */
-
-
-    /**
-     * Decodes four bytes from array <var>source</var>
-     * and writes the resulting bytes (up to three of them)
-     * to <var>destination</var>.
-     * The source and destination arrays can be manipulated
-     * anywhere along their length by specifying
-     * <var>srcOffset</var> and <var>destOffset</var>.
-     * This method does not check to make sure your arrays
-     * are large enough to accomodate <var>srcOffset</var> + 4 for
-     * the <var>source</var> array or <var>destOffset</var> + 3 for
-     * the <var>destination</var> array.
-     * This method returns the actual number of bytes that
-     * were converted from the Base64 encoding.
-     * <p>This is the lowest level of the decoding methods with
-     * all possible parameters.</p>
-     *
-     *
-     * @param source the array to convert
-     * @param srcOffset the index where conversion begins
-     * @param destination the array to hold the conversion
-     * @param destOffset the index where output will be put
-     * @param options alphabet type is pulled from this (standard, url-safe, ordered)
-     * @return the number of decoded bytes converted
-     * @throws NullPointerException if source or destination arrays are null
-     * @throws IllegalArgumentException if srcOffset or destOffset are invalid
-     *         or there is not enough room in the array.
-     * @since 1.3
-     */
-    private static int decode4to3(
-    final byte[] source, final int srcOffset,
-    final byte[] destination, final int destOffset, final int options ) {
-
-        // Lots of error checking and exception throwing
-        if( source == null ){
-            throw new NullPointerException( "Source array was null." );
-        }   // end if
-        if( destination == null ){
-            throw new NullPointerException( "Destination array was null." );
-        }   // end if
-        if( srcOffset < 0 || srcOffset + 3 >= source.length ){
-            throw new IllegalArgumentException( String.format(
-            "Source array with length %d cannot have offset of %d and still process four bytes.", source.length, srcOffset ) );
-        }   // end if
-        if( destOffset < 0 || destOffset +2 >= destination.length ){
-            throw new IllegalArgumentException( String.format(
-            "Destination array with length %d cannot have offset of %d and still store three bytes.", destination.length, destOffset ) );
-        }   // end if
-
-
-        byte[] DECODABET = getDecodabet( options );
-
-        // Example: Dk==
-        if( source[ srcOffset + 2] == EQUALS_SIGN ) {
-            // Two ways to do the same thing. Don't know which way I like best.
-          //int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] << 24 ) >>>  6 )
-          //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
-
-            destination[ destOffset ] = (byte)( outBuff >>> 16 );
-            return 1;
-        }
-
-        // Example: DkL=
-        else if( source[ srcOffset + 3 ] == EQUALS_SIGN ) {
-            // Two ways to do the same thing. Don't know which way I like best.
-          //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
-          //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
-          //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
-                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6 );
-
-            destination[ destOffset     ] = (byte)( outBuff >>> 16 );
-            destination[ destOffset + 1 ] = (byte)( outBuff >>>  8 );
-            return 2;
-        }
-
-        // Example: DkLE
-        else {
-            // Two ways to do the same thing. Don't know which way I like best.
-          //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
-          //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
-          //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
-          //              | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
-            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
-                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
-                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6)
-                          | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF )      );
-
-
-            destination[ destOffset     ] = (byte)( outBuff >> 16 );
-            destination[ destOffset + 1 ] = (byte)( outBuff >>  8 );
-            destination[ destOffset + 2 ] = (byte)( outBuff       );
-
-            return 3;
-        }
-    }
-
-    /**
-     * Low-level access to decoding ASCII characters in
-     * the form of a byte array. <strong>Ignores GUNZIP option, if
-     * it's set.</strong> This is not generally a recommended method,
-     * although it is used internally as part of the decoding process.
-     * Special case: if len = 0, an empty array is returned. Still,
-     * if you need more speed and reduced memory footprint (and aren't
-     * gzipping), consider this method.
-     *
-     * @param source The Base64 encoded data
-     * @param off    The offset of where to begin decoding
-     * @param len    The length of characters to decode
-     * @param options Can specify options such as alphabet type to use
-     * @return decoded data
-     * @throws IllegalArgumentException If bogus characters exist in source data
-     */
-    private static byte[] decode(final byte[] source, final int off, final int len, final int options ) {
-
-        // Lots of error checking and exception throwing
-        if( source == null ){
-            throw new NullPointerException( "Cannot decode null source array." );
-        }   // end if
-        if( off < 0 || off + len > source.length ){
-            throw new IllegalArgumentException( String.format(
-            "Source array with length %d cannot have offset of %d and process %d bytes.", source.length, off, len ) );
-        }   // end if
-
-        if( len == 0 ){
-            return new byte[0];
-        }else if( len < 4 ){
-            throw new IllegalArgumentException(
-            "Base64-encoded string must have at least four characters, but length specified was " + len );
-        }   // end if
-
-        byte[] DECODABET = getDecodabet( options );
-
-        int    len34   = len * 3 / 4;       // Estimate on array size
-        byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
-        int    outBuffPosn = 0;             // Keep track of where we're writing
-
-        byte[] b4        = new byte[4];     // Four byte buffer from source, eliminating white space
-        int    b4Posn    = 0;               // Keep track of four byte input buffer
-        int    i         = 0;               // Source array counter
-        byte   sbiDecode = 0;               // Special value from DECODABET
-
-        for(i = off; i < off+len; i++ ) {  // Loop through source
-
-            sbiDecode = DECODABET[ source[i]&0xFF ];
-
-            // White space, Equals sign, or legit Base64 character
-            // Note the values such as -5 and -9 in the
-            // DECODABETs at the top of the file.
-            if( sbiDecode >= WHITE_SPACE_ENC )  {
-                if( sbiDecode >= EQUALS_SIGN_ENC ) {
-                    b4[ b4Posn++ ] = source[i];         // Save non-whitespace
-                    if( b4Posn > 3 ) {                  // Time to decode?
-                        outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn, options );
-                        b4Posn = 0;
-
-                        // If that was the equals sign, break out of 'for' loop
-                        if( source[i] == EQUALS_SIGN ) {
-                            break;
-                        }
-                    }
-                }
-            }
-            else {
-                // There's a bad input character in the Base64 stream.
-                throw new InvalidBase64CharacterException( String.format(
-                "Bad Base64 input character decimal %d in array position %d", ((int)source[i])&0xFF, i ) );
-            }
-        }
-
-        byte[] out = new byte[ outBuffPosn ];
-        System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
-        return out;
-    }
+	/** No options specified. Value is zero. */
+	public final static int NO_OPTIONS = 0;
+
+	/** Specify encoding in first bit. Value is one. */
+	public final static int ENCODE = 1;
+
+	/** Specify decoding in first bit. Value is zero. */
+	public final static int DECODE = 0;
+
+	/** Do break lines when encoding. Value is 8. */
+	public final static int DO_BREAK_LINES = 8;
+
+	/**
+	 * Encode using Base64-like encoding that is URL- and Filename-safe as described in
+	 * Section 4 of RFC3548: <a
+	 * href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs
+	 * .org/rfcs/rfc3548.html</a>. It is important to note that data encoded this way is
+	 * <em>not</em> officially valid Base64, or at the very least should not be called
+	 * Base64 without also specifying that is was encoded using the URL- and Filename-safe
+	 * dialect.
+	 */
+	public final static int URL_SAFE = 16;
+
+	/**
+	 * Encode using the special "ordered" dialect of Base64 described here: <a
+	 * href="http://www.faqs.org/qa/rfcc-1940.html"
+	 * >http://www.faqs.org/qa/rfcc-1940.html</a>.
+	 */
+	public final static int ORDERED = 32;
+
+	/** Maximum line length (76) of Base64 output. */
+	private final static int MAX_LINE_LENGTH = 76;
+
+	/** The equals sign (=) as a byte. */
+	private final static byte EQUALS_SIGN = (byte) '=';
+
+	/** The new line character (\n) as a byte. */
+	private final static byte NEW_LINE = (byte) '\n';
+
+	private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+	private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+
+	/* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */
+
+	/** The 64 valid Base64 values. */
+	/* Host platform me be something funny like EBCDIC, so we hardcode these values. */
+	private final static byte[] _STANDARD_ALPHABET = { (byte) 'A', (byte) 'B',
+			(byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
+			(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N',
+			(byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T',
+			(byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
+			(byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
+			(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l',
+			(byte) 'm', (byte) 'n', (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r',
+			(byte) 's', (byte) 't', (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x',
+			(byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+			(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9',
+			(byte) '+', (byte) '/' };
+
+	/**
+	 * Translates a Base64 value to either its 6-bit reconstruction value or a negative
+	 * number indicating some other meaning.
+	 **/
+	private final static byte[] _STANDARD_DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9,
+			-9, // Decimal 0 - 8
+			-5, -5, // Whitespace: Tab and Linefeed
+			-9, -9, // Decimal 11 - 12
+			-5, // Whitespace: Carriage Return
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
+			-9, -9, -9, -9, -9, // Decimal 27 - 31
+			-5, // Whitespace: Space
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
+			62, // Plus sign at decimal 43
+			-9, -9, -9, // Decimal 44 - 46
+			63, // Slash at decimal 47
+			52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
+			-9, -9, -9, // Decimal 58 - 60
+			-1, // Equals sign at decimal 61
+			-9, -9, -9, // Decimal 62 - 64
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
+			-9, -9, -9, -9, -9, -9, // Decimal 91 - 96
+			26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
+			39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
+			-9, -9, -9, -9, -9 // Decimal 123 - 127
+			, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 128 - 139
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 140 - 152
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 153 - 165
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 166 - 178
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 179 - 191
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 192 - 204
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 205 - 217
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 218 - 230
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 231 - 243
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9 // Decimal 244 - 255
+	};
+
+	/* ******** U R L S A F E B A S E 6 4 A L P H A B E T ******** */
+
+	/**
+	 * Used in the URL- and Filename-safe dialect described in Section 4 of RFC3548: <a
+	 * href
+	 * ="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>.
+	 * Notice that the last two bytes become "hyphen" and "underscore" instead of "plus"
+	 * and "slash."
+	 */
+	private final static byte[] _URL_SAFE_ALPHABET = { (byte) 'A', (byte) 'B',
+			(byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
+			(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N',
+			(byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T',
+			(byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
+			(byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
+			(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l',
+			(byte) 'm', (byte) 'n', (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r',
+			(byte) 's', (byte) 't', (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x',
+			(byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+			(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9',
+			(byte) '-', (byte) '_' };
+
+	/**
+	 * Used in decoding URL- and Filename-safe dialects of Base64.
+	 */
+	private final static byte[] _URL_SAFE_DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9,
+			-9, // Decimal 0 - 8
+			-5, -5, // Whitespace: Tab and Linefeed
+			-9, -9, // Decimal 11 - 12
+			-5, // Whitespace: Carriage Return
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
+			-9, -9, -9, -9, -9, // Decimal 27 - 31
+			-5, // Whitespace: Space
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
+			-9, // Plus sign at decimal 43
+			-9, // Decimal 44
+			62, // Minus sign at decimal 45
+			-9, // Decimal 46
+			-9, // Slash at decimal 47
+			52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
+			-9, -9, -9, // Decimal 58 - 60
+			-1, // Equals sign at decimal 61
+			-9, -9, -9, // Decimal 62 - 64
+			0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
+			14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
+			-9, -9, -9, -9, // Decimal 91 - 94
+			63, // Underscore at decimal 95
+			-9, // Decimal 96
+			26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
+			39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
+			-9, -9, -9, -9, -9 // Decimal 123 - 127
+			, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 128 - 139
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 140 - 152
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 153 - 165
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 166 - 178
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 179 - 191
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 192 - 204
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 205 - 217
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 218 - 230
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 231 - 243
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9 // Decimal 244 - 255
+	};
+
+	/* ******** O R D E R E D B A S E 6 4 A L P H A B E T ******** */
+
+	/**
+	 * I don't get the point of this technique, but someone requested it, and it is
+	 * described here: <a
+	 * href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/
+	 * qa/rfcc-1940.html</a>.
+	 */
+	private final static byte[] _ORDERED_ALPHABET = { (byte) '-', (byte) '0', (byte) '1',
+			(byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7',
+			(byte) '8', (byte) '9', (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D',
+			(byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J',
+			(byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+			(byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V',
+			(byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z', (byte) '_', (byte) 'a',
+			(byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f', (byte) 'g',
+			(byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm',
+			(byte) 'n', (byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's',
+			(byte) 't', (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y',
+			(byte) 'z' };
+
+	/**
+	 * Used in decoding the "ordered" dialect of Base64.
+	 */
+	private final static byte[] _ORDERED_DECODABET = { -9, -9, -9, -9, -9, -9, -9, -9,
+			-9, // Decimal 0 - 8
+			-5, -5, // Whitespace: Tab and Linefeed
+			-9, -9, // Decimal 11 - 12
+			-5, // Whitespace: Carriage Return
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
+			-9, -9, -9, -9, -9, // Decimal 27 - 31
+			-5, // Whitespace: Space
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
+			-9, // Plus sign at decimal 43
+			-9, // Decimal 44
+			0, // Minus sign at decimal 45
+			-9, // Decimal 46
+			-9, // Slash at decimal 47
+			1, 2, 3, 4, 5, 6, 7, 8, 9, 10, // Numbers zero through nine
+			-9, -9, -9, // Decimal 58 - 60
+			-1, // Equals sign at decimal 61
+			-9, -9, -9, // Decimal 62 - 64
+			11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, // Letters 'A' through 'M'
+			24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, // Letters 'N' through 'Z'
+			-9, -9, -9, -9, // Decimal 91 - 94
+			37, // Underscore at decimal 95
+			-9, // Decimal 96
+			38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // Letters 'a' through 'm'
+			51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, // Letters 'n' through 'z'
+			-9, -9, -9, -9, -9 // Decimal 123 - 127
+			, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 128 - 139
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 140 - 152
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 153 - 165
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 166 - 178
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 179 - 191
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 192 - 204
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 205 - 217
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 218 - 230
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 231 - 243
+			-9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9 // Decimal 244 - 255
+	};
+
+	public static byte[] decode(byte[] bytes) {
+		return decode(bytes, 0, bytes.length, NO_OPTIONS);
+	}
+
+	public static byte[] encode(byte[] bytes) {
+		return encodeBytesToBytes(bytes, 0, bytes.length, NO_OPTIONS);
+	}
+
+	public static boolean isBase64(byte[] bytes) {
+		try {
+			decode(bytes);
+		}
+		catch (InvalidBase64CharacterException e) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns one of the _SOMETHING_ALPHABET byte arrays depending on the options
+	 * specified. It's possible, though silly, to specify ORDERED <b>and</b> URLSAFE in
+	 * which case one of them will be picked, though there is no guarantee as to which one
+	 * will be picked.
+	 */
+	private static byte[] getAlphabet(int options) {
+		if ((options & URL_SAFE) == URL_SAFE) {
+			return _URL_SAFE_ALPHABET;
+		}
+		else if ((options & ORDERED) == ORDERED) {
+			return _ORDERED_ALPHABET;
+		}
+		else {
+			return _STANDARD_ALPHABET;
+		}
+	}
+
+	/**
+	 * Returns one of the _SOMETHING_DECODABET byte arrays depending on the options
+	 * specified. It's possible, though silly, to specify ORDERED and URL_SAFE in which
+	 * case one of them will be picked, though there is no guarantee as to which one will
+	 * be picked.
+	 */
+	private static byte[] getDecodabet(int options) {
+		if ((options & URL_SAFE) == URL_SAFE) {
+			return _URL_SAFE_DECODABET;
+		}
+		else if ((options & ORDERED) == ORDERED) {
+			return _ORDERED_DECODABET;
+		}
+		else {
+			return _STANDARD_DECODABET;
+		}
+	}
+
+	/* ******** E N C O D I N G M E T H O D S ******** */
+
+	/**
+	 * <p>
+	 * Encodes up to three bytes of the array <var>source</var> and writes the resulting
+	 * four Base64 bytes to <var>destination</var>. The source and destination arrays can
+	 * be manipulated anywhere along their length by specifying <var>srcOffset</var> and
+	 * <var>destOffset</var>. This method does not check to make sure your arrays are
+	 * large enough to accomodate <var>srcOffset</var> + 3 for the <var>source</var> array
+	 * or <var>destOffset</var> + 4 for the <var>destination</var> array. The actual
+	 * number of significant bytes in your array is given by <var>numSigBytes</var>.
+	 * </p>
+	 * <p>
+	 * This is the lowest level of the encoding methods with all possible parameters.
+	 * </p>
+	 *
+	 * @param source the array to convert
+	 * @param srcOffset the index where conversion begins
+	 * @param numSigBytes the number of significant bytes in your array
+	 * @param destination the array to hold the conversion
+	 * @param destOffset the index where output will be put
+	 * @return the <var>destination</var> array
+	 * @since 1.3
+	 */
+	private static byte[] encode3to4(byte[] source, int srcOffset, int numSigBytes,
+			byte[] destination, int destOffset, int options) {
+
+		byte[] ALPHABET = getAlphabet(options);
+
+		// 1 2 3
+		// 01234567890123456789012345678901 Bit position
+		// --------000000001111111122222222 Array position from threeBytes
+		// --------| || || || | Six bit groups to index ALPHABET
+		// >>18 >>12 >> 6 >> 0 Right shift necessary
+		// 0x3f 0x3f 0x3f Additional AND
+
+		// Create buffer with zero-padding if there are only one or two
+		// significant bytes passed in the array.
+		// We have to shift left 24 in order to flush out the 1's that appear
+		// when Java treats a value as negative that is cast from a byte to an int.
+		int inBuff = (numSigBytes > 0 ? ((source[srcOffset] << 24) >>> 8) : 0)
+				| (numSigBytes > 1 ? ((source[srcOffset + 1] << 24) >>> 16) : 0)
+				| (numSigBytes > 2 ? ((source[srcOffset + 2] << 24) >>> 24) : 0);
+
+		switch (numSigBytes) {
+		case 3:
+			destination[destOffset] = ALPHABET[(inBuff >>> 18)];
+			destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f];
+			destination[destOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3f];
+			destination[destOffset + 3] = ALPHABET[(inBuff) & 0x3f];
+			return destination;
+
+		case 2:
+			destination[destOffset] = ALPHABET[(inBuff >>> 18)];
+			destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f];
+			destination[destOffset + 2] = ALPHABET[(inBuff >>> 6) & 0x3f];
+			destination[destOffset + 3] = EQUALS_SIGN;
+			return destination;
+
+		case 1:
+			destination[destOffset] = ALPHABET[(inBuff >>> 18)];
+			destination[destOffset + 1] = ALPHABET[(inBuff >>> 12) & 0x3f];
+			destination[destOffset + 2] = EQUALS_SIGN;
+			destination[destOffset + 3] = EQUALS_SIGN;
+			return destination;
+
+		default:
+			return destination;
+		}
+	}
+
+	/**
+	 *
+	 * @param source The data to convert
+	 * @param off Offset in array where conversion should begin
+	 * @param len Length of data to convert
+	 * @param options Specified options
+	 * @return The Base64-encoded data as a String
+	 * @see Base64#DO_BREAK_LINES
+	 * @throws java.io.IOException if there is an error
+	 * @throws NullPointerException if source array is null
+	 * @throws IllegalArgumentException if source array, offset, or length are invalid
+	 * @since 2.3.1
+	 */
+	private static byte[] encodeBytesToBytes(byte[] source, int off, int len, int options) {
+
+		if (source == null) {
+			throw new NullPointerException("Cannot serialize a null array.");
+		} // end if: null
+
+		if (off < 0) {
+			throw new IllegalArgumentException("Cannot have negative offset: " + off);
+		} // end if: off < 0
+
+		if (len < 0) {
+			throw new IllegalArgumentException("Cannot have length offset: " + len);
+		} // end if: len < 0
+
+		if (off + len > source.length) {
+			throw new IllegalArgumentException(String.format(
+					"Cannot have offset of %d and length of %d with array of length %d",
+					off, len, source.length));
+		} // end if: off < 0
+
+		boolean breakLines = (options & DO_BREAK_LINES) > 0;
+
+		// int len43 = len * 4 / 3;
+		// byte[] outBuff = new byte[ ( len43 ) // Main 4:3
+		// + ( (len % 3) > 0 ? 4 : 0 ) // Account for padding
+		// + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
+		// Try to determine more precisely how big the array needs to be.
+		// If we get it right, we don't have to do an array copy, and
+		// we save a bunch of memory.
+		int encLen = (len / 3) * 4 + (len % 3 > 0 ? 4 : 0); // Bytes needed for actual
+															// encoding
+		if (breakLines) {
+			encLen += encLen / MAX_LINE_LENGTH; // Plus extra newline characters
+		}
+		byte[] outBuff = new byte[encLen];
+
+		int d = 0;
+		int e = 0;
+		int len2 = len - 2;
+		int lineLength = 0;
+		for (; d < len2; d += 3, e += 4) {
+			encode3to4(source, d + off, 3, outBuff, e, options);
+
+			lineLength += 4;
+			if (breakLines && lineLength >= MAX_LINE_LENGTH) {
+				outBuff[e + 4] = NEW_LINE;
+				e++;
+				lineLength = 0;
+			} // end if: end of line
+		} // en dfor: each piece of array
+
+		if (d < len) {
+			encode3to4(source, d + off, len - d, outBuff, e, options);
+			e += 4;
+		} // end if: some padding needed
+
+		// Only resize array if we didn't guess it right.
+		if (e <= outBuff.length - 1) {
+			byte[] finalOut = new byte[e];
+			System.arraycopy(outBuff, 0, finalOut, 0, e);
+			// System.err.println("Having to resize array from " + outBuff.length + " to "
+			// + e );
+			return finalOut;
+		}
+		else {
+			// System.err.println("No need to resize array.");
+			return outBuff;
+		}
+	}
+
+	/* ******** D E C O D I N G M E T H O D S ******** */
+
+	/**
+	 * Decodes four bytes from array <var>source</var> and writes the resulting bytes (up
+	 * to three of them) to <var>destination</var>. The source and destination arrays can
+	 * be manipulated anywhere along their length by specifying <var>srcOffset</var> and
+	 * <var>destOffset</var>. This method does not check to make sure your arrays are
+	 * large enough to accomodate <var>srcOffset</var> + 4 for the <var>source</var> array
+	 * or <var>destOffset</var> + 3 for the <var>destination</var> array. This method
+	 * returns the actual number of bytes that were converted from the Base64 encoding.
+	 * <p>
+	 * This is the lowest level of the decoding methods with all possible parameters.
+	 * </p>
+	 *
+	 *
+	 * @param source the array to convert
+	 * @param srcOffset the index where conversion begins
+	 * @param destination the array to hold the conversion
+	 * @param destOffset the index where output will be put
+	 * @param options alphabet type is pulled from this (standard, url-safe, ordered)
+	 * @return the number of decoded bytes converted
+	 * @throws NullPointerException if source or destination arrays are null
+	 * @throws IllegalArgumentException if srcOffset or destOffset are invalid or there is
+	 * not enough room in the array.
+	 * @since 1.3
+	 */
+	private static int decode4to3(final byte[] source, final int srcOffset,
+			final byte[] destination, final int destOffset, final int options) {
+
+		// Lots of error checking and exception throwing
+		if (source == null) {
+			throw new NullPointerException("Source array was null.");
+		} // end if
+		if (destination == null) {
+			throw new NullPointerException("Destination array was null.");
+		} // end if
+		if (srcOffset < 0 || srcOffset + 3 >= source.length) {
+			throw new IllegalArgumentException(
+					String.format(
+							"Source array with length %d cannot have offset of %d and still process four bytes.",
+							source.length, srcOffset));
+		} // end if
+		if (destOffset < 0 || destOffset + 2 >= destination.length) {
+			throw new IllegalArgumentException(
+					String.format(
+							"Destination array with length %d cannot have offset of %d and still store three bytes.",
+							destination.length, destOffset));
+		} // end if
+
+		byte[] DECODABET = getDecodabet(options);
+
+		// Example: Dk==
+		if (source[srcOffset + 2] == EQUALS_SIGN) {
+			// Two ways to do the same thing. Don't know which way I like best.
+			// int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+			// | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
+			int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18)
+					| ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12);
+
+			destination[destOffset] = (byte) (outBuff >>> 16);
+			return 1;
+		}
+
+		// Example: DkL=
+		else if (source[srcOffset + 3] == EQUALS_SIGN) {
+			// Two ways to do the same thing. Don't know which way I like best.
+			// int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+			// | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+			// | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
+			int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18)
+					| ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12)
+					| ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6);
+
+			destination[destOffset] = (byte) (outBuff >>> 16);
+			destination[destOffset + 1] = (byte) (outBuff >>> 8);
+			return 2;
+		}
+
+		// Example: DkLE
+		else {
+			// Two ways to do the same thing. Don't know which way I like best.
+			// int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+			// | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+			// | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
+			// | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
+			int outBuff = ((DECODABET[source[srcOffset]] & 0xFF) << 18)
+					| ((DECODABET[source[srcOffset + 1]] & 0xFF) << 12)
+					| ((DECODABET[source[srcOffset + 2]] & 0xFF) << 6)
+					| ((DECODABET[source[srcOffset + 3]] & 0xFF));
+
+			destination[destOffset] = (byte) (outBuff >> 16);
+			destination[destOffset + 1] = (byte) (outBuff >> 8);
+			destination[destOffset + 2] = (byte) (outBuff);
+
+			return 3;
+		}
+	}
+
+	/**
+	 * Low-level access to decoding ASCII characters in the form of a byte array.
+	 * <strong>Ignores GUNZIP option, if it's set.</strong> This is not generally a
+	 * recommended method, although it is used internally as part of the decoding process.
+	 * Special case: if len = 0, an empty array is returned. Still, if you need more speed
+	 * and reduced memory footprint (and aren't gzipping), consider this method.
+	 *
+	 * @param source The Base64 encoded data
+	 * @param off The offset of where to begin decoding
+	 * @param len The length of characters to decode
+	 * @param options Can specify options such as alphabet type to use
+	 * @return decoded data
+	 * @throws IllegalArgumentException If bogus characters exist in source data
+	 */
+	private static byte[] decode(final byte[] source, final int off, final int len,
+			final int options) {
+
+		// Lots of error checking and exception throwing
+		if (source == null) {
+			throw new NullPointerException("Cannot decode null source array.");
+		} // end if
+		if (off < 0 || off + len > source.length) {
+			throw new IllegalArgumentException(
+					String.format(
+							"Source array with length %d cannot have offset of %d and process %d bytes.",
+							source.length, off, len));
+		} // end if
+
+		if (len == 0) {
+			return new byte[0];
+		}
+		else if (len < 4) {
+			throw new IllegalArgumentException(
+					"Base64-encoded string must have at least four characters, but length specified was "
+							+ len);
+		} // end if
+
+		byte[] DECODABET = getDecodabet(options);
+
+		int len34 = len * 3 / 4; // Estimate on array size
+		byte[] outBuff = new byte[len34]; // Upper limit on size of output
+		int outBuffPosn = 0; // Keep track of where we're writing
+
+		byte[] b4 = new byte[4]; // Four byte buffer from source, eliminating white space
+		int b4Posn = 0; // Keep track of four byte input buffer
+		int i = 0; // Source array counter
+		byte sbiDecode = 0; // Special value from DECODABET
+
+		for (i = off; i < off + len; i++) { // Loop through source
+
+			sbiDecode = DECODABET[source[i] & 0xFF];
+
+			// White space, Equals sign, or legit Base64 character
+			// Note the values such as -5 and -9 in the
+			// DECODABETs at the top of the file.
+			if (sbiDecode >= WHITE_SPACE_ENC) {
+				if (sbiDecode >= EQUALS_SIGN_ENC) {
+					b4[b4Posn++] = source[i]; // Save non-whitespace
+					if (b4Posn > 3) { // Time to decode?
+						outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, options);
+						b4Posn = 0;
+
+						// If that was the equals sign, break out of 'for' loop
+						if (source[i] == EQUALS_SIGN) {
+							break;
+						}
+					}
+				}
+			}
+			else {
+				// There's a bad input character in the Base64 stream.
+				throw new InvalidBase64CharacterException(String.format(
+						"Bad Base64 input character decimal %d in array position %d",
+						((int) source[i]) & 0xFF, i));
+			}
+		}
+
+		byte[] out = new byte[outBuffPosn];
+		System.arraycopy(outBuff, 0, out, 0, outBuffPosn);
+		return out;
+	}
 }
 
-
 class InvalidBase64CharacterException extends IllegalArgumentException {
 
-    InvalidBase64CharacterException(String message) {
-        super(message);
-    }
+	InvalidBase64CharacterException(String message) {
+		super(message);
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/Hex.java b/crypto/src/main/java/org/springframework/security/crypto/codec/Hex.java
index a89b4560f6..a850a77c47 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/codec/Hex.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/codec/Hex.java
@@ -11,44 +11,44 @@ package org.springframework.security.crypto.codec;
  */
 public final class Hex {
 
-    private static final char[] HEX = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-    };
+	private static final char[] HEX = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+			'a', 'b', 'c', 'd', 'e', 'f' };
 
-    public static char[] encode(byte[] bytes) {
-        final int nBytes = bytes.length;
-        char[] result = new char[2*nBytes];
+	public static char[] encode(byte[] bytes) {
+		final int nBytes = bytes.length;
+		char[] result = new char[2 * nBytes];
 
-        int j = 0;
-        for (int i=0; i < nBytes; i++) {
-            // Char for top 4 bits
-            result[j++] = HEX[(0xF0 & bytes[i]) >>> 4 ];
-            // Bottom 4
-            result[j++] = HEX[(0x0F & bytes[i])];
-        }
+		int j = 0;
+		for (int i = 0; i < nBytes; i++) {
+			// Char for top 4 bits
+			result[j++] = HEX[(0xF0 & bytes[i]) >>> 4];
+			// Bottom 4
+			result[j++] = HEX[(0x0F & bytes[i])];
+		}
 
-        return result;
-    }
+		return result;
+	}
 
-    public static byte[] decode(CharSequence s) {
-        int nChars = s.length();
+	public static byte[] decode(CharSequence s) {
+		int nChars = s.length();
 
-        if (nChars % 2 != 0) {
-            throw new IllegalArgumentException("Hex-encoded string must have an even number of characters");
-        }
+		if (nChars % 2 != 0) {
+			throw new IllegalArgumentException(
+					"Hex-encoded string must have an even number of characters");
+		}
 
-        byte[] result = new byte[nChars / 2];
+		byte[] result = new byte[nChars / 2];
 
-        for (int i = 0; i < nChars; i += 2) {
-            int msb = Character.digit(s.charAt(i), 16);
-            int lsb = Character.digit(s.charAt(i+1), 16);
+		for (int i = 0; i < nChars; i += 2) {
+			int msb = Character.digit(s.charAt(i), 16);
+			int lsb = Character.digit(s.charAt(i + 1), 16);
 
-            if (msb < 0 || lsb < 0) {
-                throw new IllegalArgumentException("Non-hex character in input: " + s);
-            }
-            result[i / 2] = (byte) ((msb << 4) | lsb);
-        }
-        return result;
-    }
+			if (msb < 0 || lsb < 0) {
+				throw new IllegalArgumentException("Non-hex character in input: " + s);
+			}
+			result[i / 2] = (byte) ((msb << 4) | lsb);
+		}
+		return result;
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java b/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java
index 70ffc62a18..9869df66c1 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java
@@ -14,31 +14,33 @@ import java.util.*;
  * @author Luke Taylor
  */
 public final class Utf8 {
-    private static final Charset CHARSET = Charset.forName("UTF-8");
+	private static final Charset CHARSET = Charset.forName("UTF-8");
 
-    /**
-     * Get the bytes of the String in UTF-8 encoded form.
-     */
-    public static byte[] encode(CharSequence string) {
-        try {
-            ByteBuffer bytes = CHARSET.newEncoder().encode(CharBuffer.wrap(string));
-            byte[] bytesCopy = new byte[bytes.limit()];
-            System.arraycopy(bytes.array(), 0, bytesCopy, 0, bytes.limit());
+	/**
+	 * Get the bytes of the String in UTF-8 encoded form.
+	 */
+	public static byte[] encode(CharSequence string) {
+		try {
+			ByteBuffer bytes = CHARSET.newEncoder().encode(CharBuffer.wrap(string));
+			byte[] bytesCopy = new byte[bytes.limit()];
+			System.arraycopy(bytes.array(), 0, bytesCopy, 0, bytes.limit());
 
-            return bytesCopy;
-        } catch (CharacterCodingException e) {
-            throw new IllegalArgumentException("Encoding failed", e);
-        }
-    }
+			return bytesCopy;
+		}
+		catch (CharacterCodingException e) {
+			throw new IllegalArgumentException("Encoding failed", e);
+		}
+	}
 
-    /**
-     * Decode the bytes in UTF-8 form into a String.
-     */
-    public static String decode(byte[] bytes) {
-        try {
-            return CHARSET.newDecoder().decode(ByteBuffer.wrap(bytes)).toString();
-        } catch (CharacterCodingException e) {
-            throw new IllegalArgumentException("Decoding failed", e);
-        }
-    }
+	/**
+	 * Decode the bytes in UTF-8 form into a String.
+	 */
+	public static String decode(byte[] bytes) {
+		try {
+			return CHARSET.newDecoder().decode(ByteBuffer.wrap(bytes)).toString();
+		}
+		catch (CharacterCodingException e) {
+			throw new IllegalArgumentException("Decoding failed", e);
+		}
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/package-info.java b/crypto/src/main/java/org/springframework/security/crypto/codec/package-info.java
index 791bb54632..febbdc2e91 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/codec/package-info.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/codec/package-info.java
@@ -2,3 +2,4 @@
  * Internal codec classes. Only intended for use within the framework.
  */
 package org.springframework.security.crypto.codec;
+
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
index 8d72edea37..19c4b47f24 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
@@ -38,67 +38,74 @@ import org.springframework.security.crypto.keygen.BytesKeyGenerator;
  */
 final class AesBytesEncryptor implements BytesEncryptor {
 
-    private final SecretKey secretKey;
+	private final SecretKey secretKey;
 
-    private final Cipher encryptor;
+	private final Cipher encryptor;
 
-    private final Cipher decryptor;
+	private final Cipher decryptor;
 
-    private final BytesKeyGenerator ivGenerator;
+	private final BytesKeyGenerator ivGenerator;
 
-    public AesBytesEncryptor(String password, CharSequence salt) {
-        this(password, salt, null);
-    }
+	public AesBytesEncryptor(String password, CharSequence salt) {
+		this(password, salt, null);
+	}
 
-    public AesBytesEncryptor(String password, CharSequence salt, BytesKeyGenerator ivGenerator) {
-        PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray(), Hex.decode(salt), 1024, 256);
-        SecretKey secretKey = newSecretKey("PBKDF2WithHmacSHA1", keySpec);
-        this.secretKey = new SecretKeySpec(secretKey.getEncoded(), "AES");
-        encryptor = newCipher(AES_ALGORITHM);
-        decryptor = newCipher(AES_ALGORITHM);
-        this.ivGenerator = ivGenerator != null ? ivGenerator : NULL_IV_GENERATOR;
-    }
+	public AesBytesEncryptor(String password, CharSequence salt,
+			BytesKeyGenerator ivGenerator) {
+		PBEKeySpec keySpec = new PBEKeySpec(password.toCharArray(), Hex.decode(salt),
+				1024, 256);
+		SecretKey secretKey = newSecretKey("PBKDF2WithHmacSHA1", keySpec);
+		this.secretKey = new SecretKeySpec(secretKey.getEncoded(), "AES");
+		encryptor = newCipher(AES_ALGORITHM);
+		decryptor = newCipher(AES_ALGORITHM);
+		this.ivGenerator = ivGenerator != null ? ivGenerator : NULL_IV_GENERATOR;
+	}
 
-    public byte[] encrypt(byte[] bytes) {
-        synchronized (encryptor) {
-            byte[] iv = ivGenerator.generateKey();
-            initCipher(encryptor, Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(iv));
-            byte[] encrypted = doFinal(encryptor, bytes);
-            return ivGenerator != NULL_IV_GENERATOR ? concatenate(iv, encrypted) : encrypted;
-        }
-    }
+	public byte[] encrypt(byte[] bytes) {
+		synchronized (encryptor) {
+			byte[] iv = ivGenerator.generateKey();
+			initCipher(encryptor, Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(iv));
+			byte[] encrypted = doFinal(encryptor, bytes);
+			return ivGenerator != NULL_IV_GENERATOR ? concatenate(iv, encrypted)
+					: encrypted;
+		}
+	}
 
-    public byte[] decrypt(byte[] encryptedBytes) {
-        synchronized (decryptor) {
-            byte[] iv = iv(encryptedBytes);
-            initCipher(decryptor, Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(iv));
-            return doFinal(decryptor, ivGenerator != NULL_IV_GENERATOR ? encrypted(encryptedBytes, iv.length) : encryptedBytes);
-        }
-    }
+	public byte[] decrypt(byte[] encryptedBytes) {
+		synchronized (decryptor) {
+			byte[] iv = iv(encryptedBytes);
+			initCipher(decryptor, Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(iv));
+			return doFinal(
+					decryptor,
+					ivGenerator != NULL_IV_GENERATOR ? encrypted(encryptedBytes,
+							iv.length) : encryptedBytes);
+		}
+	}
 
-    // internal helpers
+	// internal helpers
 
-    private byte[] iv(byte[] encrypted) {
-        return ivGenerator != NULL_IV_GENERATOR ? subArray(encrypted, 0, ivGenerator.getKeyLength()) : NULL_IV_GENERATOR.generateKey();
-    }
+	private byte[] iv(byte[] encrypted) {
+		return ivGenerator != NULL_IV_GENERATOR ? subArray(encrypted, 0,
+				ivGenerator.getKeyLength()) : NULL_IV_GENERATOR.generateKey();
+	}
 
-    private byte[] encrypted(byte[] encryptedBytes, int ivLength) {
-        return subArray(encryptedBytes, ivLength, encryptedBytes.length);
-    }
+	private byte[] encrypted(byte[] encryptedBytes, int ivLength) {
+		return subArray(encryptedBytes, ivLength, encryptedBytes.length);
+	}
 
-    private static final String AES_ALGORITHM = "AES/CBC/PKCS5Padding";
+	private static final String AES_ALGORITHM = "AES/CBC/PKCS5Padding";
 
-    private static final BytesKeyGenerator NULL_IV_GENERATOR = new BytesKeyGenerator() {
+	private static final BytesKeyGenerator NULL_IV_GENERATOR = new BytesKeyGenerator() {
 
-        private final byte[] VALUE = new byte[16];
+		private final byte[] VALUE = new byte[16];
 
-        public int getKeyLength() {
-            return VALUE.length;
-        }
+		public int getKeyLength() {
+			return VALUE.length;
+		}
 
-        public byte[] generateKey() {
-            return VALUE;
-        }
+		public byte[] generateKey() {
+			return VALUE;
+		}
 
-    };
+	};
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
index 3c820caba0..56eb3ec6ae 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BytesEncryptor.java
@@ -21,14 +21,14 @@ package org.springframework.security.crypto.encrypt;
  */
 public interface BytesEncryptor {
 
-    /**
-     * Encrypt the byte array.
-     */
-    byte[] encrypt(byte[] byteArray);
+	/**
+	 * Encrypt the byte array.
+	 */
+	byte[] encrypt(byte[] byteArray);
 
-    /**
-     * Decrypt the byte array.
-     */
-    byte[] decrypt(byte[] encryptedByteArray);
+	/**
+	 * Decrypt the byte array.
+	 */
+	byte[] decrypt(byte[] encryptedByteArray);
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java
index 97dd0489ea..7d5618c381 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java
@@ -37,96 +37,114 @@ import javax.crypto.spec.PBEParameterSpec;
  */
 class CipherUtils {
 
-    /**
-     * Generates a SecretKey.
-     */
-    public static SecretKey newSecretKey(String algorithm, String password) {
-        return newSecretKey(algorithm, new PBEKeySpec(password.toCharArray()));
-    }
+	/**
+	 * Generates a SecretKey.
+	 */
+	public static SecretKey newSecretKey(String algorithm, String password) {
+		return newSecretKey(algorithm, new PBEKeySpec(password.toCharArray()));
+	}
 
-    /**
-     * Generates a SecretKey.
-     */
-    public static SecretKey newSecretKey(String algorithm, PBEKeySpec keySpec) {
-        try {
-            SecretKeyFactory factory = SecretKeyFactory.getInstance(algorithm);
-            return factory.generateSecret(keySpec);
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalArgumentException("Not a valid encryption algorithm", e);
-        } catch (InvalidKeySpecException e) {
-            throw new IllegalArgumentException("Not a valid secret key", e);
-        }
-    }
+	/**
+	 * Generates a SecretKey.
+	 */
+	public static SecretKey newSecretKey(String algorithm, PBEKeySpec keySpec) {
+		try {
+			SecretKeyFactory factory = SecretKeyFactory.getInstance(algorithm);
+			return factory.generateSecret(keySpec);
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("Not a valid encryption algorithm", e);
+		}
+		catch (InvalidKeySpecException e) {
+			throw new IllegalArgumentException("Not a valid secret key", e);
+		}
+	}
 
-    /**
-     * Constructs a new Cipher.
-     */
-    public static Cipher newCipher(String algorithm) {
-        try {
-            return Cipher.getInstance(algorithm);
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalArgumentException("Not a valid encryption algorithm", e);
-        } catch (NoSuchPaddingException e) {
-            throw new IllegalStateException("Should not happen", e);
-        }
-    }
+	/**
+	 * Constructs a new Cipher.
+	 */
+	public static Cipher newCipher(String algorithm) {
+		try {
+			return Cipher.getInstance(algorithm);
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalArgumentException("Not a valid encryption algorithm", e);
+		}
+		catch (NoSuchPaddingException e) {
+			throw new IllegalStateException("Should not happen", e);
+		}
+	}
 
-    /**
-     * Initializes the Cipher for use.
-     */
-    public static <T extends AlgorithmParameterSpec> T getParameterSpec(Cipher cipher, Class<T> parameterSpecClass) {
-        try {
-            return cipher.getParameters().getParameterSpec(parameterSpecClass);
-        } catch (InvalidParameterSpecException e) {
-            throw new IllegalArgumentException("Unable to access parameter", e);
-        }
-    }
+	/**
+	 * Initializes the Cipher for use.
+	 */
+	public static <T extends AlgorithmParameterSpec> T getParameterSpec(Cipher cipher,
+			Class<T> parameterSpecClass) {
+		try {
+			return cipher.getParameters().getParameterSpec(parameterSpecClass);
+		}
+		catch (InvalidParameterSpecException e) {
+			throw new IllegalArgumentException("Unable to access parameter", e);
+		}
+	}
 
-    /**
-     * Initializes the Cipher for use.
-     */
-    public static void initCipher(Cipher cipher, int mode, SecretKey secretKey) {
-        initCipher(cipher, mode, secretKey, null);
-    }
+	/**
+	 * Initializes the Cipher for use.
+	 */
+	public static void initCipher(Cipher cipher, int mode, SecretKey secretKey) {
+		initCipher(cipher, mode, secretKey, null);
+	}
 
-    /**
-     * Initializes the Cipher for use.
-     */
-    public static void initCipher(Cipher cipher, int mode, SecretKey secretKey, byte[] salt, int iterationCount) {
-        initCipher(cipher, mode, secretKey, new PBEParameterSpec(salt, iterationCount));
-    }
+	/**
+	 * Initializes the Cipher for use.
+	 */
+	public static void initCipher(Cipher cipher, int mode, SecretKey secretKey,
+			byte[] salt, int iterationCount) {
+		initCipher(cipher, mode, secretKey, new PBEParameterSpec(salt, iterationCount));
+	}
 
-    /**
-     * Initializes the Cipher for use.
-     */
-    public static void initCipher(Cipher cipher, int mode, SecretKey secretKey, AlgorithmParameterSpec parameterSpec) {
-        try {
-            if (parameterSpec != null) {
-                cipher.init(mode, secretKey, parameterSpec);
-            } else {
-                cipher.init(mode, secretKey);
-            }
-        } catch (InvalidKeyException e) {
-            throw new IllegalArgumentException("Unable to initialize due to invalid secret key", e);
-        } catch (InvalidAlgorithmParameterException e) {
-            throw new IllegalStateException("Unable to initialize due to invalid decryption parameter spec", e);
-        }
-    }
+	/**
+	 * Initializes the Cipher for use.
+	 */
+	public static void initCipher(Cipher cipher, int mode, SecretKey secretKey,
+			AlgorithmParameterSpec parameterSpec) {
+		try {
+			if (parameterSpec != null) {
+				cipher.init(mode, secretKey, parameterSpec);
+			}
+			else {
+				cipher.init(mode, secretKey);
+			}
+		}
+		catch (InvalidKeyException e) {
+			throw new IllegalArgumentException(
+					"Unable to initialize due to invalid secret key", e);
+		}
+		catch (InvalidAlgorithmParameterException e) {
+			throw new IllegalStateException(
+					"Unable to initialize due to invalid decryption parameter spec", e);
+		}
+	}
 
-    /**
-     * Invokes the Cipher to perform encryption or decryption (depending on the initialized mode).
-     */
-    public static byte[] doFinal(Cipher cipher, byte[] input) {
-        try {
-            return cipher.doFinal(input);
-        } catch (IllegalBlockSizeException e) {
-            throw new IllegalStateException("Unable to invoke Cipher due to illegal block size", e);
-        } catch (BadPaddingException e) {
-            throw new IllegalStateException("Unable to invoke Cipher due to bad padding", e);
-        }
-    }
+	/**
+	 * Invokes the Cipher to perform encryption or decryption (depending on the
+	 * initialized mode).
+	 */
+	public static byte[] doFinal(Cipher cipher, byte[] input) {
+		try {
+			return cipher.doFinal(input);
+		}
+		catch (IllegalBlockSizeException e) {
+			throw new IllegalStateException(
+					"Unable to invoke Cipher due to illegal block size", e);
+		}
+		catch (BadPaddingException e) {
+			throw new IllegalStateException("Unable to invoke Cipher due to bad padding",
+					e);
+		}
+	}
 
-    private CipherUtils() {
-    }
+	private CipherUtils() {
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
index 2dbc14e44e..09570b31ba 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
@@ -18,74 +18,81 @@ package org.springframework.security.crypto.encrypt;
 import org.springframework.security.crypto.keygen.KeyGenerators;
 
 /**
- * Factory for commonly used encryptors.
- * Defines the public API for constructing {@link BytesEncryptor} and {@link TextEncryptor} implementations.
+ * Factory for commonly used encryptors. Defines the public API for constructing
+ * {@link BytesEncryptor} and {@link TextEncryptor} implementations.
  *
  * @author Keith Donald
  */
 public class Encryptors {
 
-    /**
-     * Creates a standard password-based bytes encryptor using 256 bit AES encryption.
-     * Derives the secret key using PKCS #5's PBKDF2 (Password-Based Key Derivation Function #2).
-     * Salts the password to prevent dictionary attacks against the key.
-     * The provided salt is expected to be hex-encoded; it should be random and at least 8 bytes in length.
-     * Also applies a random 16 byte initialization vector to ensure each encrypted message will be unique.
-     * Requires Java 6.
-     *
-     * @param password the password used to generate the encryptor's secret key; should not be shared
-     * @param salt a hex-encoded, random, site-global salt value to use to generate the key
-     */
-    public static BytesEncryptor standard(CharSequence password, CharSequence salt) {
-        return new AesBytesEncryptor(password.toString(), salt, KeyGenerators.secureRandom(16));
-    }
+	/**
+	 * Creates a standard password-based bytes encryptor using 256 bit AES encryption.
+	 * Derives the secret key using PKCS #5's PBKDF2 (Password-Based Key Derivation
+	 * Function #2). Salts the password to prevent dictionary attacks against the key. The
+	 * provided salt is expected to be hex-encoded; it should be random and at least 8
+	 * bytes in length. Also applies a random 16 byte initialization vector to ensure each
+	 * encrypted message will be unique. Requires Java 6.
+	 *
+	 * @param password the password used to generate the encryptor's secret key; should
+	 * not be shared
+	 * @param salt a hex-encoded, random, site-global salt value to use to generate the
+	 * key
+	 */
+	public static BytesEncryptor standard(CharSequence password, CharSequence salt) {
+		return new AesBytesEncryptor(password.toString(), salt,
+				KeyGenerators.secureRandom(16));
+	}
 
-    /**
-     * Creates a text encryptor that uses standard password-based encryption.
-     * Encrypted text is hex-encoded.
-     *
-     * @param password the password used to generate the encryptor's secret key; should not be shared
-     */
-    public static TextEncryptor text(CharSequence password, CharSequence salt) {
-        return new HexEncodingTextEncryptor(standard(password, salt));
-    }
+	/**
+	 * Creates a text encryptor that uses standard password-based encryption. Encrypted
+	 * text is hex-encoded.
+	 *
+	 * @param password the password used to generate the encryptor's secret key; should
+	 * not be shared
+	 */
+	public static TextEncryptor text(CharSequence password, CharSequence salt) {
+		return new HexEncodingTextEncryptor(standard(password, salt));
+	}
 
-    /**
-     * Creates an encryptor for queryable text strings that uses standard password-based encryption.
-     * Uses a 16-byte all-zero initialization vector so encrypting the same data results in the same encryption result.
-     * This is done to allow encrypted data to be queried against.
-     * Encrypted text is hex-encoded.
-     *
-     * @param password the password used to generate the encryptor's secret key; should not be shared
-     * @param salt a hex-encoded, random, site-global salt value to use to generate the secret key
-     */
-    public static TextEncryptor queryableText(CharSequence password, CharSequence salt) {
-        return new HexEncodingTextEncryptor(new AesBytesEncryptor(password.toString(), salt));
-    }
+	/**
+	 * Creates an encryptor for queryable text strings that uses standard password-based
+	 * encryption. Uses a 16-byte all-zero initialization vector so encrypting the same
+	 * data results in the same encryption result. This is done to allow encrypted data to
+	 * be queried against. Encrypted text is hex-encoded.
+	 *
+	 * @param password the password used to generate the encryptor's secret key; should
+	 * not be shared
+	 * @param salt a hex-encoded, random, site-global salt value to use to generate the
+	 * secret key
+	 */
+	public static TextEncryptor queryableText(CharSequence password, CharSequence salt) {
+		return new HexEncodingTextEncryptor(new AesBytesEncryptor(password.toString(),
+				salt));
+	}
 
-    /**
-     * Creates a text encryptor that performs no encryption.
-     * Useful for developer testing environments where working with plain text strings is desired for simplicity.
-     */
-    public static TextEncryptor noOpText() {
-        return NO_OP_TEXT_INSTANCE;
-    }
+	/**
+	 * Creates a text encryptor that performs no encryption. Useful for developer testing
+	 * environments where working with plain text strings is desired for simplicity.
+	 */
+	public static TextEncryptor noOpText() {
+		return NO_OP_TEXT_INSTANCE;
+	}
 
-    private Encryptors() {
-    }
+	private Encryptors() {
+	}
 
-    private static final TextEncryptor NO_OP_TEXT_INSTANCE = new NoOpTextEncryptor();
+	private static final TextEncryptor NO_OP_TEXT_INSTANCE = new NoOpTextEncryptor();
 
-    private static final class NoOpTextEncryptor implements TextEncryptor {
+	private static final class NoOpTextEncryptor implements TextEncryptor {
 
-        public String encrypt(String text) {
-            return text;
-        }
+		public String encrypt(String text) {
+			return text;
+		}
 
-        public String decrypt(String encryptedText) {
-            return encryptedText;
-        }
+		public String decrypt(String encryptedText) {
+			return encryptedText;
+		}
 
-    }
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
index 16bcede36b..615735c182 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
@@ -19,25 +19,25 @@ import org.springframework.security.crypto.codec.Hex;
 import org.springframework.security.crypto.codec.Utf8;
 
 /**
- * Delegates to an {@link BytesEncryptor} to encrypt text strings.
- * Raw text strings are UTF-8 encoded before being passed to the encryptor.
- * Encrypted strings are returned hex-encoded.
+ * Delegates to an {@link BytesEncryptor} to encrypt text strings. Raw text strings are
+ * UTF-8 encoded before being passed to the encryptor. Encrypted strings are returned
+ * hex-encoded.
  * @author Keith Donald
  */
 final class HexEncodingTextEncryptor implements TextEncryptor {
 
-    private final BytesEncryptor encryptor;
+	private final BytesEncryptor encryptor;
 
-    public HexEncodingTextEncryptor(BytesEncryptor encryptor) {
-        this.encryptor = encryptor;
-    }
+	public HexEncodingTextEncryptor(BytesEncryptor encryptor) {
+		this.encryptor = encryptor;
+	}
 
-    public String encrypt(String text) {
-        return new String(Hex.encode(encryptor.encrypt(Utf8.encode(text))));
-    }
+	public String encrypt(String text) {
+		return new String(Hex.encode(encryptor.encrypt(Utf8.encode(text))));
+	}
 
-    public String decrypt(String encryptedText) {
-        return Utf8.decode(encryptor.decrypt(Hex.decode(encryptedText)));
-    }
+	public String decrypt(String encryptedText) {
+		return Utf8.decode(encryptor.decrypt(Hex.decode(encryptedText)));
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
index 7e2ac9459d..2bf5cf29c4 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/TextEncryptor.java
@@ -22,14 +22,14 @@ package org.springframework.security.crypto.encrypt;
  */
 public interface TextEncryptor {
 
-    /**
-     * Encrypt the raw text string.
-     */
-    String encrypt(String text);
+	/**
+	 * Encrypt the raw text string.
+	 */
+	String encrypt(String text);
 
-    /**
-     * Decrypt the encrypted text string.
-     */
-    String decrypt(String encryptedText);
+	/**
+	 * Decrypt the encrypted text string.
+	 */
+	String decrypt(String encryptedText);
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
index 48bae02762..41973f2462 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/BytesKeyGenerator.java
@@ -21,15 +21,15 @@ package org.springframework.security.crypto.keygen;
  */
 public interface BytesKeyGenerator {
 
-    /**
-     * Get the length, in bytes, of keys created by this generator.
-     * Most unique keys are at least 8 bytes in length.
-     */
-    int getKeyLength();
+	/**
+	 * Get the length, in bytes, of keys created by this generator. Most unique keys are
+	 * at least 8 bytes in length.
+	 */
+	int getKeyLength();
 
-    /**
-     * Generate a new key.
-     */
-    byte[] generateKey();
+	/**
+	 * Generate a new key.
+	 */
+	byte[] generateKey();
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
index 0c0b92d5be..d797c736c6 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
@@ -18,20 +18,20 @@ package org.springframework.security.crypto.keygen;
 import org.springframework.security.crypto.codec.Hex;
 
 /**
- * A StringKeyGenerator that generates hex-encoded String keys.
- * Delegates to a {@link BytesKeyGenerator} for the actual key generation.
+ * A StringKeyGenerator that generates hex-encoded String keys. Delegates to a
+ * {@link BytesKeyGenerator} for the actual key generation.
  * @author Keith Donald
  */
 final class HexEncodingStringKeyGenerator implements StringKeyGenerator {
 
-    private final BytesKeyGenerator keyGenerator;
+	private final BytesKeyGenerator keyGenerator;
 
-    public HexEncodingStringKeyGenerator(BytesKeyGenerator keyGenerator) {
-        this.keyGenerator = keyGenerator;
-    }
+	public HexEncodingStringKeyGenerator(BytesKeyGenerator keyGenerator) {
+		this.keyGenerator = keyGenerator;
+	}
 
-    public String generateKey() {
-        return new String(Hex.encode(keyGenerator.generateKey()));
-    }
+	public String generateKey() {
+		return new String(Hex.encode(keyGenerator.generateKey()));
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
index 6df6ae1247..30ca211872 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/KeyGenerators.java
@@ -18,45 +18,48 @@ package org.springframework.security.crypto.keygen;
 import java.security.SecureRandom;
 
 /**
- * Factory for commonly used key generators.
- * Public API for constructing a {@link BytesKeyGenerator} or {@link StringKeyGenerator}.
+ * Factory for commonly used key generators. Public API for constructing a
+ * {@link BytesKeyGenerator} or {@link StringKeyGenerator}.
  * @author Keith Donald
  */
 public class KeyGenerators {
 
-    /**
-     * Create a {@link BytesKeyGenerator} that uses a {@link SecureRandom} to generate keys of 8 bytes in length.
-     */
-    public static BytesKeyGenerator secureRandom() {
-        return new SecureRandomBytesKeyGenerator();
-    }
+	/**
+	 * Create a {@link BytesKeyGenerator} that uses a {@link SecureRandom} to generate
+	 * keys of 8 bytes in length.
+	 */
+	public static BytesKeyGenerator secureRandom() {
+		return new SecureRandomBytesKeyGenerator();
+	}
 
-    /**
-     * Create a {@link BytesKeyGenerator} that uses a {@link SecureRandom} to generate keys of a custom length.
-     * @param keyLength the key length in bytes, e.g. 16, for a 16 byte key.
-     */
-    public static BytesKeyGenerator secureRandom(int keyLength) {
-        return new SecureRandomBytesKeyGenerator(keyLength);
-    }
+	/**
+	 * Create a {@link BytesKeyGenerator} that uses a {@link SecureRandom} to generate
+	 * keys of a custom length.
+	 * @param keyLength the key length in bytes, e.g. 16, for a 16 byte key.
+	 */
+	public static BytesKeyGenerator secureRandom(int keyLength) {
+		return new SecureRandomBytesKeyGenerator(keyLength);
+	}
 
-    /**
-     * Create a {@link BytesKeyGenerator} that returns a single, shared {@link SecureRandom} key of a custom length.
-     * @param keyLength the key length in bytes, e.g. 16, for a 16 byte key.
-     */
-    public static BytesKeyGenerator shared(int keyLength) {
-        return new SharedKeyGenerator(secureRandom(keyLength).generateKey());
-    }
+	/**
+	 * Create a {@link BytesKeyGenerator} that returns a single, shared
+	 * {@link SecureRandom} key of a custom length.
+	 * @param keyLength the key length in bytes, e.g. 16, for a 16 byte key.
+	 */
+	public static BytesKeyGenerator shared(int keyLength) {
+		return new SharedKeyGenerator(secureRandom(keyLength).generateKey());
+	}
 
-    /**
-     * Creates a {@link StringKeyGenerator} that hex-encodes {@link SecureRandom} keys of 8 bytes in length.
-     * The hex-encoded string is keyLength * 2 characters in length.
-     */
-    public static StringKeyGenerator string() {
-        return new HexEncodingStringKeyGenerator(secureRandom());
-    }
+	/**
+	 * Creates a {@link StringKeyGenerator} that hex-encodes {@link SecureRandom} keys of
+	 * 8 bytes in length. The hex-encoded string is keyLength * 2 characters in length.
+	 */
+	public static StringKeyGenerator string() {
+		return new HexEncodingStringKeyGenerator(secureRandom());
+	}
 
-    // internal helpers
+	// internal helpers
 
-    private KeyGenerators() {
-    }
+	private KeyGenerators() {
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
index 196df3de61..4adf8c44ab 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
@@ -22,42 +22,42 @@ import java.security.SecureRandom;
 /**
  * A KeyGenerator that uses {@link SecureRandom} to generate byte array-based keys.
  * <p>
- * No specific provider is used for the {@code SecureRandom}, so the platform default
- * will be used.
+ * No specific provider is used for the {@code SecureRandom}, so the platform default will
+ * be used.
  *
  * @author Keith Donald
  */
 final class SecureRandomBytesKeyGenerator implements BytesKeyGenerator {
 
-    private final SecureRandom random;
+	private final SecureRandom random;
 
-    private final int keyLength;
+	private final int keyLength;
 
-    /**
-     * Creates a secure random key generator using the defaults.
-     */
-    public SecureRandomBytesKeyGenerator() {
-        this(DEFAULT_KEY_LENGTH);
-    }
+	/**
+	 * Creates a secure random key generator using the defaults.
+	 */
+	public SecureRandomBytesKeyGenerator() {
+		this(DEFAULT_KEY_LENGTH);
+	}
 
-    /**
-     * Creates a secure random key generator with a custom key length.
-     */
-    public SecureRandomBytesKeyGenerator(int keyLength) {
-        this.random = new SecureRandom();
-        this.keyLength = keyLength;
-    }
+	/**
+	 * Creates a secure random key generator with a custom key length.
+	 */
+	public SecureRandomBytesKeyGenerator(int keyLength) {
+		this.random = new SecureRandom();
+		this.keyLength = keyLength;
+	}
 
-    public int getKeyLength() {
-        return keyLength;
-    }
+	public int getKeyLength() {
+		return keyLength;
+	}
 
-    public byte[] generateKey() {
-        byte[] bytes = new byte[keyLength];
-        random.nextBytes(bytes);
-        return bytes;
-    }
+	public byte[] generateKey() {
+		byte[] bytes = new byte[keyLength];
+		random.nextBytes(bytes);
+		return bytes;
+	}
 
-    private static final int DEFAULT_KEY_LENGTH = 8;
+	private static final int DEFAULT_KEY_LENGTH = 8;
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
index c63162cee6..ac2e3196c1 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
@@ -24,18 +24,18 @@ package org.springframework.security.crypto.keygen;
  */
 final class SharedKeyGenerator implements BytesKeyGenerator {
 
-    private byte[] sharedKey;
+	private byte[] sharedKey;
 
-    public SharedKeyGenerator(byte[] sharedKey) {
-        this.sharedKey = sharedKey;
-    }
+	public SharedKeyGenerator(byte[] sharedKey) {
+		this.sharedKey = sharedKey;
+	}
 
-    public int getKeyLength() {
-        return sharedKey.length;
-    }
+	public int getKeyLength() {
+		return sharedKey.length;
+	}
 
-    public byte[] generateKey() {
-        return sharedKey;
-    }
+	public byte[] generateKey() {
+		return sharedKey;
+	}
 
 }
\ No newline at end of file
diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
index 65965c50cb..04b76354e4 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/StringKeyGenerator.java
@@ -21,6 +21,6 @@ package org.springframework.security.crypto.keygen;
  */
 public interface StringKeyGenerator {
 
-    String generateKey();
+	String generateKey();
 
 }
\ No newline at end of file
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java
index f5a060ab77..e61b19a51a 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java
@@ -22,38 +22,40 @@ import java.security.NoSuchProviderException;
 /**
  * Helper for working with the MessageDigest API.
  *
- * Performs the configured number of iterations of the hashing algorithm per digest to aid in protecting against brute force attacks.
+ * Performs the configured number of iterations of the hashing algorithm per digest to aid
+ * in protecting against brute force attacks.
  *
  * @author Keith Donald
  * @author Luke Taylor
  */
 final class Digester {
 
-    private final MessageDigest messageDigest;
+	private final MessageDigest messageDigest;
 
-    private final int iterations;
+	private final int iterations;
 
-    /**
-     * Create a new Digester.
-     * @param algorithm the digest algorithm; for example, "SHA-1" or "SHA-256".
-     * @param iterations the number of times to apply the digest algorithm to the input
-     */
-    public Digester(String algorithm, int iterations) {
-        try {
-            messageDigest = MessageDigest.getInstance(algorithm);
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalStateException("No such hashing algorithm", e);
-        }
+	/**
+	 * Create a new Digester.
+	 * @param algorithm the digest algorithm; for example, "SHA-1" or "SHA-256".
+	 * @param iterations the number of times to apply the digest algorithm to the input
+	 */
+	public Digester(String algorithm, int iterations) {
+		try {
+			messageDigest = MessageDigest.getInstance(algorithm);
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalStateException("No such hashing algorithm", e);
+		}
 
-        this.iterations = iterations;
-    }
+		this.iterations = iterations;
+	}
 
-    public byte[] digest(byte[] value) {
-        synchronized (messageDigest) {
-            for (int i = 0; i < iterations; i++) {
-                value = messageDigest.digest(value);
-            }
-            return value;
-        }
-    }
+	public byte[] digest(byte[] value) {
+		synchronized (messageDigest) {
+			for (int i = 0; i < iterations; i++) {
+				value = messageDigest.digest(value);
+			}
+			return value;
+		}
+	}
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
index d9b79d455e..a1e27b9586 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
@@ -16,31 +16,31 @@
 package org.springframework.security.crypto.password;
 
 /**
- * A password encoder that does nothing.
- * Useful for testing where working with plain text passwords may be preferred.
+ * A password encoder that does nothing. Useful for testing where working with plain text
+ * passwords may be preferred.
  *
  * @author Keith Donald
  */
 public final class NoOpPasswordEncoder implements PasswordEncoder {
 
-    public String encode(CharSequence rawPassword) {
-        return rawPassword.toString();
-    }
+	public String encode(CharSequence rawPassword) {
+		return rawPassword.toString();
+	}
 
-    public boolean matches(CharSequence rawPassword, String encodedPassword) {
-        return rawPassword.toString().equals(encodedPassword);
-    }
+	public boolean matches(CharSequence rawPassword, String encodedPassword) {
+		return rawPassword.toString().equals(encodedPassword);
+	}
 
-    /**
-     * Get the singleton {@link NoOpPasswordEncoder}.
-     */
-    public static PasswordEncoder getInstance() {
-        return INSTANCE;
-    }
+	/**
+	 * Get the singleton {@link NoOpPasswordEncoder}.
+	 */
+	public static PasswordEncoder getInstance() {
+		return INSTANCE;
+	}
 
-    private static final PasswordEncoder INSTANCE = new NoOpPasswordEncoder();
+	private static final PasswordEncoder INSTANCE = new NoOpPasswordEncoder();
 
-    private NoOpPasswordEncoder() {
-    }
+	private NoOpPasswordEncoder() {
+	}
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
index 08591883d4..a6701e7461 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/PasswordEncoder.java
@@ -24,22 +24,22 @@ package org.springframework.security.crypto.password;
  */
 public interface PasswordEncoder {
 
-    /**
-     * Encode the raw password.
-     * Generally, a good encoding algorithm applies a SHA-1 or greater hash combined with an 8-byte or greater randomly
-     * generated salt.
-     */
-    String encode(CharSequence rawPassword);
+	/**
+	 * Encode the raw password. Generally, a good encoding algorithm applies a SHA-1 or
+	 * greater hash combined with an 8-byte or greater randomly generated salt.
+	 */
+	String encode(CharSequence rawPassword);
 
-    /**
-     * Verify the encoded password obtained from storage matches the submitted raw password after it too is encoded.
-     * Returns true if the passwords match, false if they do not.
-     * The stored password itself is never decoded.
-     *
-     * @param rawPassword the raw password to encode and match
-     * @param encodedPassword the encoded password from storage to compare with
-     * @return true if the raw password, after encoding, matches the encoded password from storage
-     */
-    boolean matches(CharSequence rawPassword, String encodedPassword);
+	/**
+	 * Verify the encoded password obtained from storage matches the submitted raw
+	 * password after it too is encoded. Returns true if the passwords match, false if
+	 * they do not. The stored password itself is never decoded.
+	 *
+	 * @param rawPassword the raw password to encode and match
+	 * @param encodedPassword the encoded password from storage to compare with
+	 * @return true if the raw password, after encoding, matches the encoded password from
+	 * storage
+	 */
+	boolean matches(CharSequence rawPassword, String encodedPassword);
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
index f850714335..60405fe838 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
@@ -24,89 +24,93 @@ import org.springframework.security.crypto.keygen.BytesKeyGenerator;
 import org.springframework.security.crypto.keygen.KeyGenerators;
 
 /**
- * A standard {@code PasswordEncoder} implementation that uses SHA-256 hashing with 1024 iterations and a
- * random 8-byte random salt value. It uses an additional system-wide secret value to provide additional protection.
+ * A standard {@code PasswordEncoder} implementation that uses SHA-256 hashing with 1024
+ * iterations and a random 8-byte random salt value. It uses an additional system-wide
+ * secret value to provide additional protection.
  * <p>
- * The digest algorithm is invoked on the concatenated bytes of the salt, secret and password.
+ * The digest algorithm is invoked on the concatenated bytes of the salt, secret and
+ * password.
  * <p>
- * If you are developing a new system, {@link org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder} is
- * a better choice both in terms of security and interoperability with other languages.
+ * If you are developing a new system,
+ * {@link org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder} is a better
+ * choice both in terms of security and interoperability with other languages.
  *
  * @author Keith Donald
  * @author Luke Taylor
  */
 public final class StandardPasswordEncoder implements PasswordEncoder {
 
-    private final Digester digester;
+	private final Digester digester;
 
-    private final byte[] secret;
+	private final byte[] secret;
 
-    private final BytesKeyGenerator saltGenerator;
+	private final BytesKeyGenerator saltGenerator;
 
-    /**
-     * Constructs a standard password encoder with no additional secret value.
-     */
-    public StandardPasswordEncoder() {
-        this("");
-    }
+	/**
+	 * Constructs a standard password encoder with no additional secret value.
+	 */
+	public StandardPasswordEncoder() {
+		this("");
+	}
 
-    /**
-     * Constructs a standard password encoder with a secret value which is also included in the
-     * password hash.
-     *
-     * @param secret the secret key used in the encoding process (should not be shared)
-     */
-    public StandardPasswordEncoder(CharSequence secret) {
-        this("SHA-256", secret);
-    }
+	/**
+	 * Constructs a standard password encoder with a secret value which is also included
+	 * in the password hash.
+	 *
+	 * @param secret the secret key used in the encoding process (should not be shared)
+	 */
+	public StandardPasswordEncoder(CharSequence secret) {
+		this("SHA-256", secret);
+	}
 
-    public String encode(CharSequence rawPassword) {
-        return encode(rawPassword, saltGenerator.generateKey());
-    }
+	public String encode(CharSequence rawPassword) {
+		return encode(rawPassword, saltGenerator.generateKey());
+	}
 
-    public boolean matches(CharSequence rawPassword, String encodedPassword) {
-        byte[] digested = decode(encodedPassword);
-        byte[] salt = subArray(digested, 0, saltGenerator.getKeyLength());
-        return matches(digested, digest(rawPassword, salt));
-    }
+	public boolean matches(CharSequence rawPassword, String encodedPassword) {
+		byte[] digested = decode(encodedPassword);
+		byte[] salt = subArray(digested, 0, saltGenerator.getKeyLength());
+		return matches(digested, digest(rawPassword, salt));
+	}
 
-    // internal helpers
+	// internal helpers
 
-    private StandardPasswordEncoder(String algorithm, CharSequence secret) {
-        this.digester = new Digester(algorithm, DEFAULT_ITERATIONS);
-        this.secret = Utf8.encode(secret);
-        this.saltGenerator = KeyGenerators.secureRandom();
-    }
+	private StandardPasswordEncoder(String algorithm, CharSequence secret) {
+		this.digester = new Digester(algorithm, DEFAULT_ITERATIONS);
+		this.secret = Utf8.encode(secret);
+		this.saltGenerator = KeyGenerators.secureRandom();
+	}
 
-    private String encode(CharSequence rawPassword, byte[] salt) {
-        byte[] digest = digest(rawPassword, salt);
-        return new String(Hex.encode(digest));
-    }
+	private String encode(CharSequence rawPassword, byte[] salt) {
+		byte[] digest = digest(rawPassword, salt);
+		return new String(Hex.encode(digest));
+	}
 
-    private byte[] digest(CharSequence rawPassword, byte[] salt) {
-        byte[] digest = digester.digest(concatenate(salt, secret, Utf8.encode(rawPassword)));
-        return concatenate(salt, digest);
-    }
+	private byte[] digest(CharSequence rawPassword, byte[] salt) {
+		byte[] digest = digester.digest(concatenate(salt, secret,
+				Utf8.encode(rawPassword)));
+		return concatenate(salt, digest);
+	}
 
-    private byte[] decode(CharSequence encodedPassword) {
-        return Hex.decode(encodedPassword);
-    }
+	private byte[] decode(CharSequence encodedPassword) {
+		return Hex.decode(encodedPassword);
+	}
 
-    /**
-     * Constant time comparison to prevent against timing attacks.
-     */
-    private boolean matches(byte[] expected, byte[] actual) {
-        if (expected.length != actual.length) {
-            return false;
-        }
+	/**
+	 * Constant time comparison to prevent against timing attacks.
+	 */
+	private boolean matches(byte[] expected, byte[] actual) {
+		if (expected.length != actual.length) {
+			return false;
+		}
 
-        int result = 0;
-        for (int i = 0; i < expected.length; i++) {
-            result |= expected[i] ^ actual[i];
-        }
-        return result == 0;
-    }
+		int result = 0;
+		for (int i = 0; i < expected.length; i++) {
+			result |= expected[i] ^ actual[i];
+		}
+		return result == 0;
+	}
 
-    private static final int DEFAULT_ITERATIONS = 1024;
+	private static final int DEFAULT_ITERATIONS = 1024;
 
 }
diff --git a/crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java b/crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
index fbe83b9fdd..10a3a683f8 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/util/EncodingUtils.java
@@ -24,37 +24,37 @@ package org.springframework.security.crypto.util;
  */
 public class EncodingUtils {
 
-    /**
-     * Combine the individual byte arrays into one array.
-     */
-    public static byte[] concatenate(byte[]... arrays) {
-        int length = 0;
-        for (byte[] array : arrays) {
-            length += array.length;
-        }
-        byte[] newArray = new byte[length];
-        int destPos = 0;
-        for (byte[] array : arrays) {
-            System.arraycopy(array, 0, newArray, destPos, array.length);
-            destPos += array.length;
-        }
-        return newArray;
-    }
+	/**
+	 * Combine the individual byte arrays into one array.
+	 */
+	public static byte[] concatenate(byte[]... arrays) {
+		int length = 0;
+		for (byte[] array : arrays) {
+			length += array.length;
+		}
+		byte[] newArray = new byte[length];
+		int destPos = 0;
+		for (byte[] array : arrays) {
+			System.arraycopy(array, 0, newArray, destPos, array.length);
+			destPos += array.length;
+		}
+		return newArray;
+	}
 
-    /**
-     * Extract a sub array of bytes out of the byte array.
-     * @param array the byte array to extract from
-     * @param beginIndex the beginning index of the sub array, inclusive
-     * @param endIndex the ending index of the sub array, exclusive
-     */
-    public static byte[] subArray(byte[] array, int beginIndex, int endIndex) {
-        int length = endIndex - beginIndex;
-        byte[] subarray = new byte[length];
-        System.arraycopy(array, beginIndex, subarray, 0, length);
-        return subarray;
-    }
+	/**
+	 * Extract a sub array of bytes out of the byte array.
+	 * @param array the byte array to extract from
+	 * @param beginIndex the beginning index of the sub array, inclusive
+	 * @param endIndex the ending index of the sub array, exclusive
+	 */
+	public static byte[] subArray(byte[] array, int beginIndex, int endIndex) {
+		int length = endIndex - beginIndex;
+		byte[] subarray = new byte[length];
+		System.arraycopy(array, beginIndex, subarray, 0, length);
+		return subarray;
+	}
 
-    private EncodingUtils() {
-    }
+	private EncodingUtils() {
+	}
 
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java
index b04d91ca4c..c6ff7105af 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoderTests.java
@@ -22,66 +22,65 @@ import org.junit.Test;
 
 import java.security.SecureRandom;
 
-
 /**
  * @author Dave Syer
  *
  */
 public class BCryptPasswordEncoderTests {
 
-    @Test
-    public void matches() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        String result = encoder.encode("password");
-        assertFalse(result.equals("password"));
-        assertTrue(encoder.matches("password", result));
-    }
+	@Test
+	public void matches() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		String result = encoder.encode("password");
+		assertFalse(result.equals("password"));
+		assertTrue(encoder.matches("password", result));
+	}
 
-    @Test
-    public void unicode() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        String result = encoder.encode("passw\u9292rd");
-        assertFalse(encoder.matches("pass\u9292\u9292rd", result));
-        assertTrue(encoder.matches("passw\u9292rd", result));
-    }
+	@Test
+	public void unicode() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		String result = encoder.encode("passw\u9292rd");
+		assertFalse(encoder.matches("pass\u9292\u9292rd", result));
+		assertTrue(encoder.matches("passw\u9292rd", result));
+	}
 
-    @Test
-    public void notMatches() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        String result = encoder.encode("password");
-        assertFalse(encoder.matches("bogus", result));
-    }
+	@Test
+	public void notMatches() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		String result = encoder.encode("password");
+		assertFalse(encoder.matches("bogus", result));
+	}
 
-    @Test
-    public void customStrength() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8);
-        String result = encoder.encode("password");
-        assertTrue(encoder.matches("password", result));
-    }
+	@Test
+	public void customStrength() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8);
+		String result = encoder.encode("password");
+		assertTrue(encoder.matches("password", result));
+	}
 
-    @Test
-    public void customRandom() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8, new SecureRandom());
-        String result = encoder.encode("password");
-        assertTrue(encoder.matches("password", result));
-    }
+	@Test
+	public void customRandom() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(8, new SecureRandom());
+		String result = encoder.encode("password");
+		assertTrue(encoder.matches("password", result));
+	}
 
-    @Test
-    public void doesntMatchNullEncodedValue() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        assertFalse(encoder.matches("password", null));
-    }
+	@Test
+	public void doesntMatchNullEncodedValue() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		assertFalse(encoder.matches("password", null));
+	}
 
-    @Test
-    public void doesntMatchEmptyEncodedValue() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        assertFalse(encoder.matches("password", ""));
-    }
+	@Test
+	public void doesntMatchEmptyEncodedValue() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		assertFalse(encoder.matches("password", ""));
+	}
 
-    @Test
-    public void doesntMatchBogusEncodedValue() {
-        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
-        assertFalse(encoder.matches("password", "012345678901234567890123456789"));
-    }
+	@Test
+	public void doesntMatchBogusEncodedValue() {
+		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+		assertFalse(encoder.matches("password", "012345678901234567890123456789"));
+	}
 
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java
index 18a94ea13b..86bd49dce9 100755
--- a/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/bcrypt/BCryptTests.java
@@ -25,301 +25,281 @@ import static org.junit.Assert.*;
  */
 public class BCryptTests {
 
-    private static void print(String s) {
-        // System.out.print(s);
-    }
+	private static void print(String s) {
+		// System.out.print(s);
+	}
 
-    private static void println(String s) {
-        // System.out.println(s);
-    }
+	private static void println(String s) {
+		// System.out.println(s);
+	}
 
-    String test_vectors[][] = {
-        {"",
-            "$2a$06$DCq7YPn5Rq63x1Lad4cll.",
-            "$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s."},
-        {"",
-            "$2a$08$HqWuK6/Ng6sg9gQzbLrgb.",
-            "$2a$08$HqWuK6/Ng6sg9gQzbLrgb.Tl.ZHfXLhvt/SgVyWhQqgqcZ7ZuUtye"},
-        {"",
-            "$2a$10$k1wbIrmNyFAPwPVPSVa/ze",
-            "$2a$10$k1wbIrmNyFAPwPVPSVa/zecw2BCEnBwVS2GbrmgzxFUOqW9dk4TCW"},
-        {"",
-            "$2a$12$k42ZFHFWqBp3vWli.nIn8u",
-            "$2a$12$k42ZFHFWqBp3vWli.nIn8uYyIkbvYRvodzbfbK18SSsY.CsIQPlxO"},
-        {"a",
-            "$2a$06$m0CrhHm10qJ3lXRY.5zDGO",
-            "$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe"},
-        {"a",
-            "$2a$08$cfcvVd2aQ8CMvoMpP2EBfe",
-            "$2a$08$cfcvVd2aQ8CMvoMpP2EBfeodLEkkFJ9umNEfPD18.hUF62qqlC/V."},
-        {"a",
-            "$2a$10$k87L/MF28Q673VKh8/cPi.",
-            "$2a$10$k87L/MF28Q673VKh8/cPi.SUl7MU/rWuSiIDDFayrKk/1tBsSQu4u"},
-        {"a",
-            "$2a$12$8NJH3LsPrANStV6XtBakCe",
-            "$2a$12$8NJH3LsPrANStV6XtBakCez0cKHXVxmvxIlcz785vxAIZrihHZpeS"},
-        {"abc",
-            "$2a$06$If6bvum7DFjUnE9p2uDeDu",
-            "$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i"},
-        {"abc",
-            "$2a$08$Ro0CUfOqk6cXEKf3dyaM7O",
-            "$2a$08$Ro0CUfOqk6cXEKf3dyaM7OhSCvnwM9s4wIX9JeLapehKK5YdLxKcm"},
-        {"abc",
-            "$2a$10$WvvTPHKwdBJ3uk0Z37EMR.",
-            "$2a$10$WvvTPHKwdBJ3uk0Z37EMR.hLA2W6N9AEBhEgrAOljy2Ae5MtaSIUi"},
-        {"abc",
-            "$2a$12$EXRkfkdmXn2gzds2SSitu.",
-            "$2a$12$EXRkfkdmXn2gzds2SSitu.MW9.gAVqa9eLS1//RYtYCmB1eLHg.9q"},
-        {"abcdefghijklmnopqrstuvwxyz",
-            "$2a$06$.rCVZVOThsIa97pEDOxvGu",
-            "$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC"},
-        {"abcdefghijklmnopqrstuvwxyz",
-            "$2a$08$aTsUwsyowQuzRrDqFflhge",
-            "$2a$08$aTsUwsyowQuzRrDqFflhgekJ8d9/7Z3GV3UcgvzQW3J5zMyrTvlz."},
-        {"abcdefghijklmnopqrstuvwxyz",
-            "$2a$10$fVH8e28OQRj9tqiDXs1e1u",
-            "$2a$10$fVH8e28OQRj9tqiDXs1e1uxpsjN0c7II7YPKXua2NAKYvM6iQk7dq"},
-        {"abcdefghijklmnopqrstuvwxyz",
-            "$2a$12$D4G5f18o7aMMfwasBL7Gpu",
-            "$2a$12$D4G5f18o7aMMfwasBL7GpuQWuP3pkrZrOAnqP.bmezbMng.QwJ/pG"},
-        {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD",
-            "$2a$06$fPIsBO8qRqkjj273rfaOI.",
-            "$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO"},
-        {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD",
-            "$2a$08$Eq2r4G/76Wv39MzSX262hu",
-            "$2a$08$Eq2r4G/76Wv39MzSX262huzPz612MZiYHVUJe/OcOql2jo4.9UxTW"},
-        {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD",
-            "$2a$10$LgfYWkbzEvQ4JakH7rOvHe",
-            "$2a$10$LgfYWkbzEvQ4JakH7rOvHe0y8pHKF9OaFgwUZ2q7W2FFZmZzJYlfS"},
-        {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD",
-            "$2a$12$WApznUOJfkEGSmYRfnkrPO",
-            "$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC"}
-    };
+	String test_vectors[][] = {
+			{ "", "$2a$06$DCq7YPn5Rq63x1Lad4cll.",
+					"$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s." },
+			{ "", "$2a$08$HqWuK6/Ng6sg9gQzbLrgb.",
+					"$2a$08$HqWuK6/Ng6sg9gQzbLrgb.Tl.ZHfXLhvt/SgVyWhQqgqcZ7ZuUtye" },
+			{ "", "$2a$10$k1wbIrmNyFAPwPVPSVa/ze",
+					"$2a$10$k1wbIrmNyFAPwPVPSVa/zecw2BCEnBwVS2GbrmgzxFUOqW9dk4TCW" },
+			{ "", "$2a$12$k42ZFHFWqBp3vWli.nIn8u",
+					"$2a$12$k42ZFHFWqBp3vWli.nIn8uYyIkbvYRvodzbfbK18SSsY.CsIQPlxO" },
+			{ "a", "$2a$06$m0CrhHm10qJ3lXRY.5zDGO",
+					"$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe" },
+			{ "a", "$2a$08$cfcvVd2aQ8CMvoMpP2EBfe",
+					"$2a$08$cfcvVd2aQ8CMvoMpP2EBfeodLEkkFJ9umNEfPD18.hUF62qqlC/V." },
+			{ "a", "$2a$10$k87L/MF28Q673VKh8/cPi.",
+					"$2a$10$k87L/MF28Q673VKh8/cPi.SUl7MU/rWuSiIDDFayrKk/1tBsSQu4u" },
+			{ "a", "$2a$12$8NJH3LsPrANStV6XtBakCe",
+					"$2a$12$8NJH3LsPrANStV6XtBakCez0cKHXVxmvxIlcz785vxAIZrihHZpeS" },
+			{ "abc", "$2a$06$If6bvum7DFjUnE9p2uDeDu",
+					"$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i" },
+			{ "abc", "$2a$08$Ro0CUfOqk6cXEKf3dyaM7O",
+					"$2a$08$Ro0CUfOqk6cXEKf3dyaM7OhSCvnwM9s4wIX9JeLapehKK5YdLxKcm" },
+			{ "abc", "$2a$10$WvvTPHKwdBJ3uk0Z37EMR.",
+					"$2a$10$WvvTPHKwdBJ3uk0Z37EMR.hLA2W6N9AEBhEgrAOljy2Ae5MtaSIUi" },
+			{ "abc", "$2a$12$EXRkfkdmXn2gzds2SSitu.",
+					"$2a$12$EXRkfkdmXn2gzds2SSitu.MW9.gAVqa9eLS1//RYtYCmB1eLHg.9q" },
+			{ "abcdefghijklmnopqrstuvwxyz", "$2a$06$.rCVZVOThsIa97pEDOxvGu",
+					"$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC" },
+			{ "abcdefghijklmnopqrstuvwxyz", "$2a$08$aTsUwsyowQuzRrDqFflhge",
+					"$2a$08$aTsUwsyowQuzRrDqFflhgekJ8d9/7Z3GV3UcgvzQW3J5zMyrTvlz." },
+			{ "abcdefghijklmnopqrstuvwxyz", "$2a$10$fVH8e28OQRj9tqiDXs1e1u",
+					"$2a$10$fVH8e28OQRj9tqiDXs1e1uxpsjN0c7II7YPKXua2NAKYvM6iQk7dq" },
+			{ "abcdefghijklmnopqrstuvwxyz", "$2a$12$D4G5f18o7aMMfwasBL7Gpu",
+					"$2a$12$D4G5f18o7aMMfwasBL7GpuQWuP3pkrZrOAnqP.bmezbMng.QwJ/pG" },
+			{ "~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$06$fPIsBO8qRqkjj273rfaOI.",
+					"$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO" },
+			{ "~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$08$Eq2r4G/76Wv39MzSX262hu",
+					"$2a$08$Eq2r4G/76Wv39MzSX262huzPz612MZiYHVUJe/OcOql2jo4.9UxTW" },
+			{ "~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$10$LgfYWkbzEvQ4JakH7rOvHe",
+					"$2a$10$LgfYWkbzEvQ4JakH7rOvHe0y8pHKF9OaFgwUZ2q7W2FFZmZzJYlfS" },
+			{ "~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$12$WApznUOJfkEGSmYRfnkrPO",
+					"$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC" } };
 
-    /**
-     * Test method for 'BCrypt.hashpw(String, String)'
-     */
-    @Test
-    public void testHashpw() {
-        print("BCrypt.hashpw(): ");
-        for (int i = 0; i < test_vectors.length; i++) {
-            String plain = test_vectors[i][0];
-            String salt = test_vectors[i][1];
-            String expected = test_vectors[i][2];
-            String hashed = BCrypt.hashpw(plain, salt);
-            assertEquals(hashed, expected);
-            print(".");
-        }
-        println("");
-    }
+	/**
+	 * Test method for 'BCrypt.hashpw(String, String)'
+	 */
+	@Test
+	public void testHashpw() {
+		print("BCrypt.hashpw(): ");
+		for (int i = 0; i < test_vectors.length; i++) {
+			String plain = test_vectors[i][0];
+			String salt = test_vectors[i][1];
+			String expected = test_vectors[i][2];
+			String hashed = BCrypt.hashpw(plain, salt);
+			assertEquals(hashed, expected);
+			print(".");
+		}
+		println("");
+	}
 
-    /**
-     * Test method for 'BCrypt.gensalt(int)'
-     */
-    @Test
-    public void testGensaltInt() {
-        print("BCrypt.gensalt(log_rounds):");
-        for (int i = 4; i <= 12; i++) {
-            print(" " + Integer.toString(i) + ":");
-            for (int j = 0; j < test_vectors.length; j += 4) {
-                String plain = test_vectors[j][0];
-                String salt = BCrypt.gensalt(i);
-                String hashed1 = BCrypt.hashpw(plain, salt);
-                String hashed2 = BCrypt.hashpw(plain, hashed1);
-                assertEquals(hashed1, hashed2);
-                print(".");
-            }
-        }
-        println("");
-    }
+	/**
+	 * Test method for 'BCrypt.gensalt(int)'
+	 */
+	@Test
+	public void testGensaltInt() {
+		print("BCrypt.gensalt(log_rounds):");
+		for (int i = 4; i <= 12; i++) {
+			print(" " + Integer.toString(i) + ":");
+			for (int j = 0; j < test_vectors.length; j += 4) {
+				String plain = test_vectors[j][0];
+				String salt = BCrypt.gensalt(i);
+				String hashed1 = BCrypt.hashpw(plain, salt);
+				String hashed2 = BCrypt.hashpw(plain, hashed1);
+				assertEquals(hashed1, hashed2);
+				print(".");
+			}
+		}
+		println("");
+	}
 
-    /**
-     * Test method for 'BCrypt.gensalt()'
-     */
-    @Test
-    public void testGensalt() {
-        print("BCrypt.gensalt(): ");
-        for (int i = 0; i < test_vectors.length; i += 4) {
-            String plain = test_vectors[i][0];
-            String salt = BCrypt.gensalt();
-            String hashed1 = BCrypt.hashpw(plain, salt);
-            String hashed2 = BCrypt.hashpw(plain, hashed1);
-            assertEquals(hashed1, hashed2);
-            print(".");
-        }
-        println("");
-    }
+	/**
+	 * Test method for 'BCrypt.gensalt()'
+	 */
+	@Test
+	public void testGensalt() {
+		print("BCrypt.gensalt(): ");
+		for (int i = 0; i < test_vectors.length; i += 4) {
+			String plain = test_vectors[i][0];
+			String salt = BCrypt.gensalt();
+			String hashed1 = BCrypt.hashpw(plain, salt);
+			String hashed2 = BCrypt.hashpw(plain, hashed1);
+			assertEquals(hashed1, hashed2);
+			print(".");
+		}
+		println("");
+	}
 
-    /**
-     * Test method for 'BCrypt.checkpw(String, String)' expecting success
-     */
-    @Test
-    public void testCheckpw_success() {
-        print("BCrypt.checkpw w/ good passwords: ");
-        for (int i = 0; i < test_vectors.length; i++) {
-            String plain = test_vectors[i][0];
-            String expected = test_vectors[i][2];
-            assertTrue(BCrypt.checkpw(plain, expected));
-            print(".");
-        }
-        println("");
-    }
+	/**
+	 * Test method for 'BCrypt.checkpw(String, String)' expecting success
+	 */
+	@Test
+	public void testCheckpw_success() {
+		print("BCrypt.checkpw w/ good passwords: ");
+		for (int i = 0; i < test_vectors.length; i++) {
+			String plain = test_vectors[i][0];
+			String expected = test_vectors[i][2];
+			assertTrue(BCrypt.checkpw(plain, expected));
+			print(".");
+		}
+		println("");
+	}
 
-    /**
-     * Test method for 'BCrypt.checkpw(String, String)' expecting failure
-     */
-    @Test
-    public void testCheckpw_failure() {
-        print("BCrypt.checkpw w/ bad passwords: ");
-        for (int i = 0; i < test_vectors.length; i++) {
-            int broken_index = (i + 4) % test_vectors.length;
-            String plain = test_vectors[i][0];
-            String expected = test_vectors[broken_index][2];
-            assertFalse(BCrypt.checkpw(plain, expected));
-            print(".");
-        }
-        println("");
-    }
+	/**
+	 * Test method for 'BCrypt.checkpw(String, String)' expecting failure
+	 */
+	@Test
+	public void testCheckpw_failure() {
+		print("BCrypt.checkpw w/ bad passwords: ");
+		for (int i = 0; i < test_vectors.length; i++) {
+			int broken_index = (i + 4) % test_vectors.length;
+			String plain = test_vectors[i][0];
+			String expected = test_vectors[broken_index][2];
+			assertFalse(BCrypt.checkpw(plain, expected));
+			print(".");
+		}
+		println("");
+	}
 
-    /**
-     * Test for correct hashing of non-US-ASCII passwords
-     */
-    @Test
-    public void testInternationalChars() {
-        print("BCrypt.hashpw w/ international chars: ");
-        String pw1 = "ππππππππ";
-        String pw2 = "????????";
+	/**
+	 * Test for correct hashing of non-US-ASCII passwords
+	 */
+	@Test
+	public void testInternationalChars() {
+		print("BCrypt.hashpw w/ international chars: ");
+		String pw1 = "ππππππππ";
+		String pw2 = "????????";
 
-        String h1 = BCrypt.hashpw(pw1, BCrypt.gensalt());
-        assertFalse(BCrypt.checkpw(pw2, h1));
-        print(".");
+		String h1 = BCrypt.hashpw(pw1, BCrypt.gensalt());
+		assertFalse(BCrypt.checkpw(pw2, h1));
+		print(".");
 
-        String h2 = BCrypt.hashpw(pw2, BCrypt.gensalt());
-        assertFalse(BCrypt.checkpw(pw1, h2));
-        print(".");
-        println("");
-    }
+		String h2 = BCrypt.hashpw(pw2, BCrypt.gensalt());
+		assertFalse(BCrypt.checkpw(pw1, h2));
+		print(".");
+		println("");
+	}
 
-    @Test
-    public void roundsForDoesNotOverflow() {
-        assertEquals(1024, BCrypt.roundsForLogRounds(10));
-        assertEquals(0x80000000L, BCrypt.roundsForLogRounds(31));
-    }
+	@Test
+	public void roundsForDoesNotOverflow() {
+		assertEquals(1024, BCrypt.roundsForLogRounds(10));
+		assertEquals(0x80000000L, BCrypt.roundsForLogRounds(31));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void emptyByteArrayCannotBeEncoded() {
-        BCrypt.encode_base64(new byte[0], 0, new StringBuilder());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void emptyByteArrayCannotBeEncoded() {
+		BCrypt.encode_base64(new byte[0], 0, new StringBuilder());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void moreBytesThanInTheArrayCannotBeEncoded() {
-        BCrypt.encode_base64(new byte[1], 2, new StringBuilder());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void moreBytesThanInTheArrayCannotBeEncoded() {
+		BCrypt.encode_base64(new byte[1], 2, new StringBuilder());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void decodingMustRequestMoreThanZeroBytes() {
-        BCrypt.decode_base64("", 0);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void decodingMustRequestMoreThanZeroBytes() {
+		BCrypt.decode_base64("", 0);
+	}
 
-    private static String encode_base64(byte d[], int len) throws IllegalArgumentException {
-        StringBuilder rs = new StringBuilder();
-        BCrypt.encode_base64(d, len, rs);
-        return rs.toString();
-    }
+	private static String encode_base64(byte d[], int len)
+			throws IllegalArgumentException {
+		StringBuilder rs = new StringBuilder();
+		BCrypt.encode_base64(d, len, rs);
+		return rs.toString();
+	}
 
-    @Test
-    public void testBase64EncodeSimpleByteArrays() {
-        assertEquals("..", encode_base64(new byte[] { 0 }, 1));
-        assertEquals("...", encode_base64(new byte[] { 0, 0 }, 2));
-        assertEquals("....", encode_base64(new byte[] { 0, 0, 0 }, 3));
-    }
+	@Test
+	public void testBase64EncodeSimpleByteArrays() {
+		assertEquals("..", encode_base64(new byte[] { 0 }, 1));
+		assertEquals("...", encode_base64(new byte[] { 0, 0 }, 2));
+		assertEquals("....", encode_base64(new byte[] { 0, 0, 0 }, 3));
+	}
 
-    @Test
-    public void decodingCharsOutsideAsciiGivesNoResults() {
-        byte[] ba = BCrypt.decode_base64("ππππππππ", 1);
-        assertEquals(0, ba.length);
-    }
+	@Test
+	public void decodingCharsOutsideAsciiGivesNoResults() {
+		byte[] ba = BCrypt.decode_base64("ππππππππ", 1);
+		assertEquals(0, ba.length);
+	}
 
-    @Test
-    public void decodingStopsWithFirstInvalidCharacter() {
-        assertEquals(1, BCrypt.decode_base64("....", 1).length);
-        assertEquals(0, BCrypt.decode_base64(" ....", 1).length);
-    }
+	@Test
+	public void decodingStopsWithFirstInvalidCharacter() {
+		assertEquals(1, BCrypt.decode_base64("....", 1).length);
+		assertEquals(0, BCrypt.decode_base64(" ....", 1).length);
+	}
 
-    @Test
-    public void decodingOnlyProvidesAvailableBytes() {
-        assertEquals(0, BCrypt.decode_base64("", 1).length);
-        assertEquals(3, BCrypt.decode_base64("......", 3).length);
-        assertEquals(4, BCrypt.decode_base64("......", 4).length);
-        assertEquals(4, BCrypt.decode_base64("......", 5).length);
-    }
+	@Test
+	public void decodingOnlyProvidesAvailableBytes() {
+		assertEquals(0, BCrypt.decode_base64("", 1).length);
+		assertEquals(3, BCrypt.decode_base64("......", 3).length);
+		assertEquals(4, BCrypt.decode_base64("......", 4).length);
+		assertEquals(4, BCrypt.decode_base64("......", 5).length);
+	}
 
-    /**
-     * Encode and decode each byte value in each position.
-     */
-    @Test
-    public void testBase64EncodeDecode() {
-        byte[] ba = new byte[3];
+	/**
+	 * Encode and decode each byte value in each position.
+	 */
+	@Test
+	public void testBase64EncodeDecode() {
+		byte[] ba = new byte[3];
 
-        for (int b = 0; b <= 0xFF; b++) {
-            for (int i = 0; i < ba.length; i++) {
-                Arrays.fill(ba, (byte) 0);
-                ba[i] = (byte) b;
+		for (int b = 0; b <= 0xFF; b++) {
+			for (int i = 0; i < ba.length; i++) {
+				Arrays.fill(ba, (byte) 0);
+				ba[i] = (byte) b;
 
-                String s = encode_base64(ba, 3);
-                assertEquals(4, s.length());
+				String s = encode_base64(ba, 3);
+				assertEquals(4, s.length());
 
-                byte[] decoded = BCrypt.decode_base64(s, 3);
-                assertArrayEquals(ba, decoded);
-            }
-        }
-    }
+				byte[] decoded = BCrypt.decode_base64(s, 3);
+				assertArrayEquals(ba, decoded);
+			}
+		}
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void genSaltFailsWithTooFewRounds() {
-        BCrypt.gensalt(3);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void genSaltFailsWithTooFewRounds() {
+		BCrypt.gensalt(3);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void genSaltFailsWithTooManyRounds() {
-        BCrypt.gensalt(32);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void genSaltFailsWithTooManyRounds() {
+		BCrypt.gensalt(32);
+	}
 
-    @Test
-    public void genSaltGeneratesCorrectSaltPrefix() {
-        assertTrue(BCrypt.gensalt(4).startsWith("$2a$04$"));
-        assertTrue(BCrypt.gensalt(31).startsWith("$2a$31$"));
-    }
+	@Test
+	public void genSaltGeneratesCorrectSaltPrefix() {
+		assertTrue(BCrypt.gensalt(4).startsWith("$2a$04$"));
+		assertTrue(BCrypt.gensalt(31).startsWith("$2a$31$"));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void hashpwFailsWhenSaltSpecifiesTooFewRounds() {
-        BCrypt.hashpw("password", "$2a$03$......................");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void hashpwFailsWhenSaltSpecifiesTooFewRounds() {
+		BCrypt.hashpw("password", "$2a$03$......................");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void hashpwFailsWhenSaltSpecifiesTooManyRounds() {
-        BCrypt.hashpw("password", "$2a$32$......................");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void hashpwFailsWhenSaltSpecifiesTooManyRounds() {
+		BCrypt.hashpw("password", "$2a$32$......................");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void saltLengthIsChecked() {
-        BCrypt.hashpw("", "");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void saltLengthIsChecked() {
+		BCrypt.hashpw("", "");
+	}
 
-    @Test
-    public void hashpwWorksWithOldRevision() {
-        assertEquals("$2$05$......................bvpG2UfzdyW/S0ny/4YyEZrmczoJfVm",
-                BCrypt.hashpw("password", "$2$05$......................"));
-    }
+	@Test
+	public void hashpwWorksWithOldRevision() {
+		assertEquals("$2$05$......................bvpG2UfzdyW/S0ny/4YyEZrmczoJfVm",
+				BCrypt.hashpw("password", "$2$05$......................"));
+	}
 
-    @Test
-    public void equalsOnStringsIsCorrect() {
-        assertTrue(BCrypt.equalsNoEarlyReturn("", ""));
-        assertTrue(BCrypt.equalsNoEarlyReturn("test", "test"));
+	@Test
+	public void equalsOnStringsIsCorrect() {
+		assertTrue(BCrypt.equalsNoEarlyReturn("", ""));
+		assertTrue(BCrypt.equalsNoEarlyReturn("test", "test"));
 
-        assertFalse(BCrypt.equalsNoEarlyReturn("test", ""));
-        assertFalse(BCrypt.equalsNoEarlyReturn("", "test"));
+		assertFalse(BCrypt.equalsNoEarlyReturn("test", ""));
+		assertFalse(BCrypt.equalsNoEarlyReturn("", "test"));
 
-        assertFalse(BCrypt.equalsNoEarlyReturn("test", "pass"));
-    }
+		assertFalse(BCrypt.equalsNoEarlyReturn("test", "pass"));
+	}
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java b/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java
index b50ade614f..902a13e0c2 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/codec/Base64Tests.java
@@ -9,26 +9,28 @@ import org.junit.*;
  */
 public class Base64Tests {
 
-    @Test
-    public void isBase64ReturnsTrueForValidBase64() {
-        new Base64(); // unused
+	@Test
+	public void isBase64ReturnsTrueForValidBase64() {
+		new Base64(); // unused
 
-        assertTrue(Base64.isBase64(new byte[]{ (byte)'A',(byte)'B',(byte)'C',(byte)'D'}));
-    }
+		assertTrue(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte) 'C',
+				(byte) 'D' }));
+	}
 
-    @Test
-    public void isBase64ReturnsFalseForInvalidBase64() throws Exception {
-        // Include invalid '`' character
-        assertFalse(Base64.isBase64(new byte[]{ (byte)'A',(byte)'B',(byte)'C',(byte)'`'}));
-    }
+	@Test
+	public void isBase64ReturnsFalseForInvalidBase64() throws Exception {
+		// Include invalid '`' character
+		assertFalse(Base64.isBase64(new byte[] { (byte) 'A', (byte) 'B', (byte) 'C',
+				(byte) '`' }));
+	}
 
-    @Test(expected = NullPointerException.class)
-    public void isBase64RejectsNull() {
-        Base64.isBase64(null);
-    }
+	@Test(expected = NullPointerException.class)
+	public void isBase64RejectsNull() {
+		Base64.isBase64(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void isBase64RejectsInvalidLength() {
-        Base64.isBase64(new byte[]{ (byte)'A'});
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void isBase64RejectsInvalidLength() {
+		Base64.isBase64(new byte[] { (byte) 'A' });
+	}
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java b/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java
index 363de65560..d57c2f566c 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/codec/Utf8Tests.java
@@ -11,15 +11,15 @@ import java.util.*;
  */
 public class Utf8Tests {
 
-    // SEC-1752
-    @Test
-    public void utf8EncodesAndDecodesCorrectly() throws Exception {
-        byte[] bytes = Utf8.encode("6048b75ed560785c");
-        assertEquals(16, bytes.length);
-        assertTrue(Arrays.equals("6048b75ed560785c".getBytes("UTF-8"), bytes));
+	// SEC-1752
+	@Test
+	public void utf8EncodesAndDecodesCorrectly() throws Exception {
+		byte[] bytes = Utf8.encode("6048b75ed560785c");
+		assertEquals(16, bytes.length);
+		assertTrue(Arrays.equals("6048b75ed560785c".getBytes("UTF-8"), bytes));
 
-        String decoded = Utf8.decode(bytes);
+		String decoded = Utf8.decode(bytes);
 
-        assertEquals("6048b75ed560785c", decoded);
-    }
+		assertEquals("6048b75ed560785c", decoded);
+	}
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
index 4683c468d0..81c1c20ab5 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/EncryptorsTests.java
@@ -9,40 +9,42 @@ import org.junit.Test;
 
 public class EncryptorsTests {
 
-    @Test
-    public void standard() throws Exception {
-        BytesEncryptor encryptor = Encryptors.standard("password", "5c0744940b5c369b");
-        byte[] result = encryptor.encrypt("text".getBytes("UTF-8"));
-        assertNotNull(result);
-        assertFalse(new String(result).equals("text"));
-        assertEquals("text", new String(encryptor.decrypt(result)));
-        assertFalse(new String(result).equals(new String(encryptor.encrypt("text".getBytes()))));
-    }
+	@Test
+	public void standard() throws Exception {
+		BytesEncryptor encryptor = Encryptors.standard("password", "5c0744940b5c369b");
+		byte[] result = encryptor.encrypt("text".getBytes("UTF-8"));
+		assertNotNull(result);
+		assertFalse(new String(result).equals("text"));
+		assertEquals("text", new String(encryptor.decrypt(result)));
+		assertFalse(new String(result).equals(new String(encryptor.encrypt("text"
+				.getBytes()))));
+	}
 
-    @Test
-    public void text() {
-        TextEncryptor encryptor = Encryptors.text("password", "5c0744940b5c369b");
-        String result = encryptor.encrypt("text");
-        assertNotNull(result);
-        assertFalse(result.equals("text"));
-        assertEquals("text", encryptor.decrypt(result));
-        assertFalse(result.equals(encryptor.encrypt("text")));
-    }
+	@Test
+	public void text() {
+		TextEncryptor encryptor = Encryptors.text("password", "5c0744940b5c369b");
+		String result = encryptor.encrypt("text");
+		assertNotNull(result);
+		assertFalse(result.equals("text"));
+		assertEquals("text", encryptor.decrypt(result));
+		assertFalse(result.equals(encryptor.encrypt("text")));
+	}
 
-    @Test
-    public void queryableText() {
-        TextEncryptor encryptor = Encryptors.queryableText("password", "5c0744940b5c369b");
-        String result = encryptor.encrypt("text");
-        assertNotNull(result);
-        assertFalse(result.equals("text"));
-        assertEquals("text", encryptor.decrypt(result));
-        assertTrue(result.equals(encryptor.encrypt("text")));
-    }
+	@Test
+	public void queryableText() {
+		TextEncryptor encryptor = Encryptors
+				.queryableText("password", "5c0744940b5c369b");
+		String result = encryptor.encrypt("text");
+		assertNotNull(result);
+		assertFalse(result.equals("text"));
+		assertEquals("text", encryptor.decrypt(result));
+		assertTrue(result.equals(encryptor.encrypt("text")));
+	}
 
-    @Test
-    public void noOpText() {
-        TextEncryptor encryptor = Encryptors.noOpText();
-        assertEquals("text", encryptor.encrypt("text"));
-        assertEquals("text", encryptor.decrypt("text"));
-    }
+	@Test
+	public void noOpText() {
+		TextEncryptor encryptor = Encryptors.noOpText();
+		assertEquals("text", encryptor.encrypt("text"));
+		assertEquals("text", encryptor.decrypt("text"));
+	}
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
index 3d56f4c31f..c2c58569bc 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/keygen/KeyGeneratorsTests.java
@@ -9,44 +9,44 @@ import org.springframework.security.crypto.codec.Hex;
 
 public class KeyGeneratorsTests {
 
-    @Test
-    public void secureRandom() {
-        BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom();
-        assertEquals(8, keyGenerator.getKeyLength());
-        byte[] key = keyGenerator.generateKey();
-        assertEquals(8, key.length);
-        byte[] key2 = keyGenerator.generateKey();
-        assertFalse(Arrays.equals(key, key2));
-    }
+	@Test
+	public void secureRandom() {
+		BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom();
+		assertEquals(8, keyGenerator.getKeyLength());
+		byte[] key = keyGenerator.generateKey();
+		assertEquals(8, key.length);
+		byte[] key2 = keyGenerator.generateKey();
+		assertFalse(Arrays.equals(key, key2));
+	}
 
-    @Test
-    public void secureRandomCustomLength() {
-        BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom(21);
-        assertEquals(21, keyGenerator.getKeyLength());
-        byte[] key = keyGenerator.generateKey();
-        assertEquals(21, key.length);
-        byte[] key2 = keyGenerator.generateKey();
-        assertFalse(Arrays.equals(key, key2));
-    }
+	@Test
+	public void secureRandomCustomLength() {
+		BytesKeyGenerator keyGenerator = KeyGenerators.secureRandom(21);
+		assertEquals(21, keyGenerator.getKeyLength());
+		byte[] key = keyGenerator.generateKey();
+		assertEquals(21, key.length);
+		byte[] key2 = keyGenerator.generateKey();
+		assertFalse(Arrays.equals(key, key2));
+	}
 
-    @Test
-    public void shared() throws Exception {
-        BytesKeyGenerator keyGenerator = KeyGenerators.shared(21);
-        assertEquals(21, keyGenerator.getKeyLength());
-        byte[] key = keyGenerator.generateKey();
-        assertEquals(21, key.length);
-        byte[] key2 = keyGenerator.generateKey();
-        assertTrue(Arrays.equals(key, key2));
-    }
+	@Test
+	public void shared() throws Exception {
+		BytesKeyGenerator keyGenerator = KeyGenerators.shared(21);
+		assertEquals(21, keyGenerator.getKeyLength());
+		byte[] key = keyGenerator.generateKey();
+		assertEquals(21, key.length);
+		byte[] key2 = keyGenerator.generateKey();
+		assertTrue(Arrays.equals(key, key2));
+	}
 
-    @Test
-    public void string() {
-        StringKeyGenerator keyGenerator = KeyGenerators.string();
-        String hexStringKey = keyGenerator.generateKey();
-        assertEquals(16, hexStringKey.length());
-        assertEquals(8, Hex.decode(hexStringKey).length);
-        String hexStringKey2 = keyGenerator.generateKey();
-        assertFalse(hexStringKey.equals(hexStringKey2));
-    }
+	@Test
+	public void string() {
+		StringKeyGenerator keyGenerator = KeyGenerators.string();
+		String hexStringKey = keyGenerator.generateKey();
+		assertEquals(16, hexStringKey.length());
+		assertEquals(8, Hex.decode(hexStringKey).length);
+		String hexStringKey2 = keyGenerator.generateKey();
+		assertFalse(hexStringKey.equals(hexStringKey2));
+	}
 
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java
index bfb40584a9..f0980626aa 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/password/DigesterTests.java
@@ -13,12 +13,13 @@ import org.springframework.security.crypto.password.Digester;
 
 public class DigesterTests {
 
-    @Test
-    public void digestIsCorrectFor3Iterations() {
-        Digester digester = new Digester("SHA-1", 3);
-        byte[] result = digester.digest(Utf8.encode("text"));
-        // echo -n text | openssl sha1 -binary | openssl sha1 -binary | openssl sha1
-        assertEquals("3cfa28da425eca5b894f0af2b158adf7001e000f", new String(Hex.encode(result)));
-    }
+	@Test
+	public void digestIsCorrectFor3Iterations() {
+		Digester digester = new Digester("SHA-1", 3);
+		byte[] result = digester.digest(Utf8.encode("text"));
+		// echo -n text | openssl sha1 -binary | openssl sha1 -binary | openssl sha1
+		assertEquals("3cfa28da425eca5b894f0af2b158adf7001e000f",
+				new String(Hex.encode(result)));
+	}
 
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
index e4523ec8ba..197c449070 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/password/StandardPasswordEncoderTests.java
@@ -7,25 +7,25 @@ import org.junit.Test;
 
 public class StandardPasswordEncoderTests {
 
-    private StandardPasswordEncoder encoder = new StandardPasswordEncoder("secret");
+	private StandardPasswordEncoder encoder = new StandardPasswordEncoder("secret");
 
-    @Test
-    public void matches() {
-        String result = encoder.encode("password");
-        assertFalse(result.equals("password"));
-        assertTrue(encoder.matches("password", result));
-    }
+	@Test
+	public void matches() {
+		String result = encoder.encode("password");
+		assertFalse(result.equals("password"));
+		assertTrue(encoder.matches("password", result));
+	}
 
-    @Test
-    public void matchesLengthChecked() {
-        String result = encoder.encode("password");
-        assertFalse(encoder.matches("password", result.substring(0,result.length()-2)));
-    }
+	@Test
+	public void matchesLengthChecked() {
+		String result = encoder.encode("password");
+		assertFalse(encoder.matches("password", result.substring(0, result.length() - 2)));
+	}
 
-    @Test
-    public void notMatches() {
-        String result = encoder.encode("password");
-        assertFalse(encoder.matches("bogus", result));
-    }
+	@Test
+	public void notMatches() {
+		String result = encoder.encode("password");
+		assertFalse(encoder.matches("bogus", result));
+	}
 
 }
diff --git a/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java b/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
index 46638d0a35..8d8b54292d 100644
--- a/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
+++ b/crypto/src/test/java/org/springframework/security/crypto/util/EncodingUtilsTests.java
@@ -10,36 +10,40 @@ import org.springframework.security.crypto.codec.Hex;
 
 public class EncodingUtilsTests {
 
-    @Test
-    public void hexEncode() {
-        byte[] bytes = new byte[] { (byte)0x01, (byte)0xFF, (byte)65, (byte)66, (byte)67, (byte)0xC0, (byte)0xC1, (byte)0xC2 };
-        String result = new String(Hex.encode(bytes));
-        assertEquals("01ff414243c0c1c2", result);
-    }
+	@Test
+	public void hexEncode() {
+		byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66,
+				(byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 };
+		String result = new String(Hex.encode(bytes));
+		assertEquals("01ff414243c0c1c2", result);
+	}
 
-    @Test
-    public void hexDecode() {
-        byte[] bytes = new byte[] { (byte)0x01, (byte)0xFF, (byte)65, (byte)66, (byte)67, (byte)0xC0, (byte)0xC1, (byte)0xC2 };
-        byte[] result = Hex.decode("01ff414243c0c1c2");
-        assertTrue(Arrays.equals(bytes, result));
-    }
+	@Test
+	public void hexDecode() {
+		byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66,
+				(byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 };
+		byte[] result = Hex.decode("01ff414243c0c1c2");
+		assertTrue(Arrays.equals(bytes, result));
+	}
 
-    @Test
-    public void concatenate() {
-        byte[] bytes = new byte[] { (byte)0x01, (byte)0xFF, (byte)65, (byte)66, (byte)67, (byte)0xC0, (byte)0xC1, (byte)0xC2 };
-        byte[] one = new byte[] { (byte)0x01 };
-        byte[] two = new byte[] { (byte)0xFF, (byte)65, (byte)66 };
-        byte[] three = new byte[] { (byte)67, (byte)0xC0, (byte)0xC1, (byte)0xC2 };
-        assertTrue(Arrays.equals(bytes, EncodingUtils.concatenate(one, two, three)));
-    }
+	@Test
+	public void concatenate() {
+		byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66,
+				(byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 };
+		byte[] one = new byte[] { (byte) 0x01 };
+		byte[] two = new byte[] { (byte) 0xFF, (byte) 65, (byte) 66 };
+		byte[] three = new byte[] { (byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 };
+		assertTrue(Arrays.equals(bytes, EncodingUtils.concatenate(one, two, three)));
+	}
 
-    @Test
-    public void subArray() {
-        byte[] bytes = new byte[] { (byte)0x01, (byte)0xFF, (byte)65, (byte)66, (byte)67, (byte)0xC0, (byte)0xC1, (byte)0xC2 };
-        byte[] two = new byte[] { (byte)0xFF, (byte)65, (byte)66 };
-        byte[] subArray = EncodingUtils.subArray(bytes, 1, 4);
-        assertEquals(3, subArray.length);
-        assertTrue(Arrays.equals(two, subArray));
-    }
+	@Test
+	public void subArray() {
+		byte[] bytes = new byte[] { (byte) 0x01, (byte) 0xFF, (byte) 65, (byte) 66,
+				(byte) 67, (byte) 0xC0, (byte) 0xC1, (byte) 0xC2 };
+		byte[] two = new byte[] { (byte) 0xFF, (byte) 65, (byte) 66 };
+		byte[] subArray = EncodingUtils.subArray(bytes, 1, 4);
+		assertEquals(3, subArray.length);
+		assertTrue(Arrays.equals(two, subArray));
+	}
 
 }
diff --git a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java
index 0199dc5f9d..f74d192eef 100644
--- a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java
+++ b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java
@@ -27,13 +27,17 @@ import java.util.Map;
 
 /**
  * <p>
- * By defining this object as a Bean, Spring Security is exposed as SpEL expressions for creating Spring Data
- * queries.
+ * By defining this object as a Bean, Spring Security is exposed as SpEL expressions for
+ * creating Spring Data queries.
  * </p>
  *
- * <p>With Java based configuration, we can define the bean using the following:</p>
+ * <p>
+ * With Java based configuration, we can define the bean using the following:
+ * </p>
  *
- * <p>For example, if you return a UserDetails that extends the following User object:</p>
+ * <p>
+ * For example, if you return a UserDetails that extends the following User object:
+ * </p>
  *
  * <pre>
  * @Entity
@@ -41,11 +45,13 @@ import java.util.Map;
  *     @GeneratedValue(strategy = GenerationType.AUTO)
  *     @Id
  *     private Long id;
- *
+ * 
  *     ...
  * </pre>
  *
- * <p>And you have a Message object that looks like the following:</p>
+ * <p>
+ * And you have a Message object that looks like the following:
+ * </p>
  *
  * <pre>
  * @Entity
@@ -53,64 +59,67 @@ import java.util.Map;
  *     @Id
  *     @GeneratedValue(strategy = GenerationType.AUTO)
  *     private Long id;
- *
+ * 
  *     @OneToOne
  *     private User to;
- *
+ * 
  *     ...
  * </pre>
  *
- * You can use the following {@code Query} annotation to search for only messages that are to the current user:
+ * You can use the following {@code Query} annotation to search for only messages that are
+ * to the current user:
  *
  * <pre>
- * @Repository
+ * &#064;Repository
  * public interface SecurityMessageRepository extends MessageRepository {
- *
- *     @Query("select m from Message m where m.to.id = ?#{ principal?.id }")
- *     List<Message> findAll();
+ * 
+ * 	&#064;Query(&quot;select m from Message m where m.to.id = ?#{ principal?.id }&quot;)
+ * 	List&lt;Message&gt; findAll();
  * }
  * </pre>
  *
- * This works because the principal in this instance is a User which has an id field on it.
+ * This works because the principal in this instance is a User which has an id field on
+ * it.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public class SecurityEvaluationContextExtension extends EvaluationContextExtensionSupport {
-    private Authentication authentication;
+	private Authentication authentication;
 
-    /**
-     * Creates a new instance that uses the current {@link Authentication} found on the
-     * {@link org.springframework.security.core.context.SecurityContextHolder}.
-     */
-    public SecurityEvaluationContextExtension() {
-    }
+	/**
+	 * Creates a new instance that uses the current {@link Authentication} found on the
+	 * {@link org.springframework.security.core.context.SecurityContextHolder}.
+	 */
+	public SecurityEvaluationContextExtension() {
+	}
 
-    /**
-     * Creates a new instance that always uses the same {@link Authentication} object.
-     *
-     * @param authentication the {@link Authentication} to use
-     */
-    public SecurityEvaluationContextExtension(Authentication authentication) {
-        this.authentication = authentication;
-    }
+	/**
+	 * Creates a new instance that always uses the same {@link Authentication} object.
+	 *
+	 * @param authentication the {@link Authentication} to use
+	 */
+	public SecurityEvaluationContextExtension(Authentication authentication) {
+		this.authentication = authentication;
+	}
 
-    public String getExtensionId() {
-        return "security";
-    }
+	public String getExtensionId() {
+		return "security";
+	}
 
-    @Override
-    public Object getRootObject() {
-        Authentication authentication = getAuthentication();
-        return new SecurityExpressionRoot(authentication) {};
-    }
+	@Override
+	public Object getRootObject() {
+		Authentication authentication = getAuthentication();
+		return new SecurityExpressionRoot(authentication) {
+		};
+	}
 
-    private Authentication getAuthentication() {
-        if(authentication != null) {
-            return authentication;
-        }
+	private Authentication getAuthentication() {
+		if (authentication != null) {
+			return authentication;
+		}
 
-        SecurityContext context = SecurityContextHolder.getContext();
-        return context.getAuthentication();
-    }
+		SecurityContext context = SecurityContextHolder.getContext();
+		return context.getAuthentication();
+	}
 }
\ No newline at end of file
diff --git a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java
index 6084626277..a555815903 100644
--- a/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java
+++ b/data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java
@@ -25,51 +25,55 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import static org.fest.assertions.Assertions.assertThat;
 
 public class SecurityEvaluationContextExtensionTests {
-    SecurityEvaluationContextExtension securityExtension;
+	SecurityEvaluationContextExtension securityExtension;
 
-    @Before
-    public void setup() {
-        securityExtension = new SecurityEvaluationContextExtension();
-    }
+	@Before
+	public void setup() {
+		securityExtension = new SecurityEvaluationContextExtension();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void getRootObjectSecurityContextHolderAuthenticationNull() {
-        getRoot().getAuthentication();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void getRootObjectSecurityContextHolderAuthenticationNull() {
+		getRoot().getAuthentication();
+	}
 
-    @Test
-    public void getRootObjectSecurityContextHolderAuthentication() {
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+	@Test
+	public void getRootObjectSecurityContextHolderAuthentication() {
+		TestingAuthenticationToken authentication = new TestingAuthenticationToken(
+				"user", "password", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(authentication);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(authentication);
+	}
 
-    @Test
-    public void getRootObjectExplicitAuthenticationOverridesSecurityContextHolder() {
-        TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT");
-        securityExtension = new SecurityEvaluationContextExtension(explicit);
+	@Test
+	public void getRootObjectExplicitAuthenticationOverridesSecurityContextHolder() {
+		TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit",
+				"password", "ROLE_EXPLICIT");
+		securityExtension = new SecurityEvaluationContextExtension(explicit);
 
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+		TestingAuthenticationToken authentication = new TestingAuthenticationToken(
+				"user", "password", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(explicit);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(explicit);
+	}
 
-    @Test
-    public void getRootObjectExplicitAuthentication() {
-        TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT");
-        securityExtension = new SecurityEvaluationContextExtension(explicit);
+	@Test
+	public void getRootObjectExplicitAuthentication() {
+		TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit",
+				"password", "ROLE_EXPLICIT");
+		securityExtension = new SecurityEvaluationContextExtension(explicit);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(explicit);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(explicit);
+	}
 
-    private SecurityExpressionRoot getRoot() {
-        return (SecurityExpressionRoot) securityExtension.getRootObject();
-    }
+	private SecurityExpressionRoot getRoot() {
+		return (SecurityExpressionRoot) securityExtension.getRootObject();
+	}
 }
\ No newline at end of file
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java
index 68a05d49b1..7a5c24df2a 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpNamespaceWithMultipleInterceptorsTests.java
@@ -18,43 +18,45 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@ContextConfiguration(locations={"/http-extra-fsi-app-context.xml"})
+@ContextConfiguration(locations = { "/http-extra-fsi-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class HttpNamespaceWithMultipleInterceptorsTests {
 
-    @Autowired
-    private FilterChainProxy fcp;
+	@Autowired
+	private FilterChainProxy fcp;
 
-    @Test
-    public void requestThatIsMatchedByDefaultInterceptorIsAllowed() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setMethod("GET");
-        request.setServletPath("/somefile.html");
-        request.setSession(createAuthenticatedSession("ROLE_0", "ROLE_1", "ROLE_2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fcp.doFilter(request, response, new MockFilterChain());
-        assertEquals(200, response.getStatus());
-    }
+	@Test
+	public void requestThatIsMatchedByDefaultInterceptorIsAllowed() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		request.setServletPath("/somefile.html");
+		request.setSession(createAuthenticatedSession("ROLE_0", "ROLE_1", "ROLE_2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fcp.doFilter(request, response, new MockFilterChain());
+		assertEquals(200, response.getStatus());
+	}
 
-    @Test
-    public void securedUrlAccessIsRejectedWithoutRequiredRole() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setMethod("GET");
+	@Test
+	public void securedUrlAccessIsRejectedWithoutRequiredRole() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
 
-        request.setServletPath("/secure/somefile.html");
-        request.setSession(createAuthenticatedSession("ROLE_0"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fcp.doFilter(request, response, new MockFilterChain());
-        assertEquals(403, response.getStatus());
-    }
-
-    public HttpSession createAuthenticatedSession(String... roles) {
-        MockHttpSession session = new MockHttpSession();
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("bob", "bobspassword", roles));
-        session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-        return session;
-    }
+		request.setServletPath("/secure/somefile.html");
+		request.setSession(createAuthenticatedSession("ROLE_0"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fcp.doFilter(request, response, new MockFilterChain());
+		assertEquals(403, response.getStatus());
+	}
 
+	public HttpSession createAuthenticatedSession(String... roles) {
+		MockHttpSession session = new MockHttpSession();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("bob", "bobspassword", roles));
+		session.setAttribute(
+				HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+				SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+		return session;
+	}
 
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java
index b84da3d786..096ac390f2 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/HttpPathParameterStrippingTests.java
@@ -18,48 +18,52 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import javax.servlet.http.HttpSession;
 
-@ContextConfiguration(locations={"/http-path-param-stripping-app-context.xml"})
+@ContextConfiguration(locations = { "/http-path-param-stripping-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class HttpPathParameterStrippingTests {
 
-    @Autowired
-    private FilterChainProxy fcp;
+	@Autowired
+	private FilterChainProxy fcp;
 
-    @Test
-    public void securedFilterChainCannotBeBypassedByAddingPathParameters() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setPathInfo("/secured;x=y/admin.html");
-        request.setSession(createAuthenticatedSession("ROLE_USER"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fcp.doFilter(request, response, new MockFilterChain());
-        assertEquals(403, response.getStatus());
-    }
+	@Test
+	public void securedFilterChainCannotBeBypassedByAddingPathParameters()
+			throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setPathInfo("/secured;x=y/admin.html");
+		request.setSession(createAuthenticatedSession("ROLE_USER"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fcp.doFilter(request, response, new MockFilterChain());
+		assertEquals(403, response.getStatus());
+	}
 
-    @Test
-    public void adminFilePatternCannotBeBypassedByAddingPathParameters() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secured/admin.html;x=user.html");
-        request.setSession(createAuthenticatedSession("ROLE_USER"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fcp.doFilter(request, response, new MockFilterChain());
-        assertEquals(403, response.getStatus());
+	@Test
+	public void adminFilePatternCannotBeBypassedByAddingPathParameters() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secured/admin.html;x=user.html");
+		request.setSession(createAuthenticatedSession("ROLE_USER"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fcp.doFilter(request, response, new MockFilterChain());
+		assertEquals(403, response.getStatus());
 
-        // Try with pathInfo
-        request = new MockHttpServletRequest();
-        request.setServletPath("/secured");
-        request.setPathInfo("/admin.html;x=user.html");
-        request.setSession(createAuthenticatedSession("ROLE_USER"));
-        response = new MockHttpServletResponse();
-        fcp.doFilter(request, response, new MockFilterChain());
-        assertEquals(403, response.getStatus());
-    }
+		// Try with pathInfo
+		request = new MockHttpServletRequest();
+		request.setServletPath("/secured");
+		request.setPathInfo("/admin.html;x=user.html");
+		request.setSession(createAuthenticatedSession("ROLE_USER"));
+		response = new MockHttpServletResponse();
+		fcp.doFilter(request, response, new MockFilterChain());
+		assertEquals(403, response.getStatus());
+	}
 
-    public HttpSession createAuthenticatedSession(String... roles) {
-        MockHttpSession session = new MockHttpSession();
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("bob", "bobspassword", roles));
-        session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-        return session;
-    }
+	public HttpSession createAuthenticatedSession(String... roles) {
+		MockHttpSession session = new MockHttpSession();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("bob", "bobspassword", roles));
+		session.setAttribute(
+				HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+				SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+		return session;
+	}
 
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java
index f70d8b301a..34b16acb26 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/MultiAnnotationTests.java
@@ -17,70 +17,72 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 /**
  * @author Luke Taylor
  */
-@ContextConfiguration(locations={"/multi-sec-annotation-app-context.xml"})
+@ContextConfiguration(locations = { "/multi-sec-annotation-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class MultiAnnotationTests {
-    private final TestingAuthenticationToken joe_a = new TestingAuthenticationToken("joe","pass","ROLE_A");
-    private final TestingAuthenticationToken joe_b = new TestingAuthenticationToken("joe","pass","ROLE_B");
+	private final TestingAuthenticationToken joe_a = new TestingAuthenticationToken(
+			"joe", "pass", "ROLE_A");
+	private final TestingAuthenticationToken joe_b = new TestingAuthenticationToken(
+			"joe", "pass", "ROLE_B");
 
-    @Autowired
-    MultiAnnotationService service;
-    @Autowired
-    PreAuthorizeService preService;
-    @Autowired
-    SecuredService secService;
+	@Autowired
+	MultiAnnotationService service;
+	@Autowired
+	PreAuthorizeService preService;
+	@Autowired
+	SecuredService secService;
 
-    @After
-    @Before
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	@Before
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void preAuthorizeDeniedIsDenied() {
-        SecurityContextHolder.getContext().setAuthentication(joe_a);
-        service.preAuthorizeDenyAllMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void preAuthorizeDeniedIsDenied() {
+		SecurityContextHolder.getContext().setAuthentication(joe_a);
+		service.preAuthorizeDenyAllMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void preAuthorizeRoleAIsDeniedIfRoleMissing() {
-        SecurityContextHolder.getContext().setAuthentication(joe_b);
-        service.preAuthorizeHasRoleAMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void preAuthorizeRoleAIsDeniedIfRoleMissing() {
+		SecurityContextHolder.getContext().setAuthentication(joe_b);
+		service.preAuthorizeHasRoleAMethod();
+	}
 
-    @Test
-    public void preAuthorizeRoleAIsAllowedIfRolePresent() {
-        SecurityContextHolder.getContext().setAuthentication(joe_a);
-        service.preAuthorizeHasRoleAMethod();
-    }
+	@Test
+	public void preAuthorizeRoleAIsAllowedIfRolePresent() {
+		SecurityContextHolder.getContext().setAuthentication(joe_a);
+		service.preAuthorizeHasRoleAMethod();
+	}
 
-    @Test
-    public void securedAnonymousIsAllowed() {
-        SecurityContextHolder.getContext().setAuthentication(joe_a);
-        service.securedAnonymousMethod();
-    }
+	@Test
+	public void securedAnonymousIsAllowed() {
+		SecurityContextHolder.getContext().setAuthentication(joe_a);
+		service.securedAnonymousMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void securedRoleAIsDeniedIfRoleMissing() {
-        SecurityContextHolder.getContext().setAuthentication(joe_b);
-        service.securedRoleAMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securedRoleAIsDeniedIfRoleMissing() {
+		SecurityContextHolder.getContext().setAuthentication(joe_b);
+		service.securedRoleAMethod();
+	}
 
-    @Test
-    public void securedRoleAIsAllowedIfRolePresent() {
-        SecurityContextHolder.getContext().setAuthentication(joe_a);
-        service.securedRoleAMethod();
-    }
+	@Test
+	public void securedRoleAIsAllowedIfRolePresent() {
+		SecurityContextHolder.getContext().setAuthentication(joe_a);
+		service.securedRoleAMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void preAuthorizedOnlyServiceDeniesIfRoleMissing() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(joe_b);
-        preService.preAuthorizedMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void preAuthorizedOnlyServiceDeniesIfRoleMissing() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(joe_b);
+		preService.preAuthorizedMethod();
+	}
 
-    @Test(expected=AccessDeniedException.class)
-    public void securedOnlyRoleAServiceDeniesIfRoleMissing() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(joe_b);
-        secService.securedMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securedOnlyRoleAServiceDeniesIfRoleMissing() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(joe_b);
+		secService.securedMethod();
+	}
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java
index f7af74e196..93b242ca0f 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java
@@ -9,15 +9,15 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@ContextConfiguration(locations={"/sec-933-app-context.xml"})
+@ContextConfiguration(locations = { "/sec-933-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class SEC933ApplicationContextTests {
 
-    @Autowired
-    private UserDetailsService userDetailsService;
+	@Autowired
+	private UserDetailsService userDetailsService;
 
-    @Test
-    public void testSimpleApplicationContextBootstrap() throws Exception {
-        assertNotNull(userDetailsService);
-    }
+	@Test
+	public void testSimpleApplicationContextBootstrap() throws Exception {
+		assertNotNull(userDetailsService);
+	}
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
index deb89bc0bf..81d428f5fe 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
@@ -14,17 +14,18 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Luke Taylor
  * @since 2.0
  */
-@ContextConfiguration(locations={"/sec-936-app-context.xml"})
+@ContextConfiguration(locations = { "/sec-936-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class SEC936ApplicationContextTests {
-    @Autowired
-    /** SessionRegistry is used as the test service interface (nothing to do with the test) */
-    private SessionRegistry sessionRegistry;
+	@Autowired
+	/** SessionRegistry is used as the test service interface (nothing to do with the test) */
+	private SessionRegistry sessionRegistry;
 
-    @Test(expected=AccessDeniedException.class)
-    public void securityInterceptorHandlesCallWithNoTargetObject() {
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));
-        sessionRegistry.getAllPrincipals();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securityInterceptorHandlesCallWithNoTargetObject() {
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("bob", "bobspassword"));
+		sessionRegistry.getAllPrincipals();
+	}
 
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/StubUserRepository.java b/itest/context/src/integration-test/java/org/springframework/security/integration/StubUserRepository.java
index a5f2c8babf..908e970078 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/StubUserRepository.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/StubUserRepository.java
@@ -2,6 +2,6 @@ package org.springframework.security.integration;
 
 public class StubUserRepository implements UserRepository {
 
-    public void doSomething() {
-    }
+	public void doSomething() {
+	}
 }
\ No newline at end of file
diff --git a/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java b/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java
index e93f623fe8..d88365fa1b 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/integration/python/PythonInterpreterBasedSecurityTests.java
@@ -8,19 +8,20 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-@ContextConfiguration(locations={"/python-method-access-app-context.xml"})
+@ContextConfiguration(locations = { "/python-method-access-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class PythonInterpreterBasedSecurityTests {
 
-    @Autowired
-    private TestService service;
+	@Autowired
+	private TestService service;
 
-    @Test
-    public void serviceMethod() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob","bobspassword"));
+	@Test
+	public void serviceMethod() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("bob", "bobspassword"));
 
-//        for (int i=0; i < 1000; i++) {
-            service.someMethod();
-//        }
-    }
+		// for (int i=0; i < 1000; i++) {
+		service.someMethod();
+		// }
+	}
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
index a43c6255eb..2feaff2cbb 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
@@ -26,100 +26,109 @@ import java.util.*;
  * @author Luke Taylor
  * @since 2.0
  */
-@ContextConfiguration(locations={"/filter-chain-performance-app-context.xml"})
+@ContextConfiguration(locations = { "/filter-chain-performance-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class FilterChainPerformanceTests {
-    // Adjust as required
-    private static final int N_INVOCATIONS = 1; // 1000
-    private static final int N_AUTHORITIES = 2; // 200
-    private static StopWatch sw = new StopWatch("Filter Chain Performance Tests");
+	// Adjust as required
+	private static final int N_INVOCATIONS = 1; // 1000
+	private static final int N_AUTHORITIES = 2; // 200
+	private static StopWatch sw = new StopWatch("Filter Chain Performance Tests");
 
-    private final UsernamePasswordAuthenticationToken user = new UsernamePasswordAuthenticationToken("bob", "bobspassword", createRoles(N_AUTHORITIES));
-    private HttpSession session;
+	private final UsernamePasswordAuthenticationToken user = new UsernamePasswordAuthenticationToken(
+			"bob", "bobspassword", createRoles(N_AUTHORITIES));
+	private HttpSession session;
 
-    @Autowired
-    @Qualifier("fcpMinimalStack")
-    private FilterChainProxy minimalStack;
+	@Autowired
+	@Qualifier("fcpMinimalStack")
+	private FilterChainProxy minimalStack;
 
-    @Autowired
-    @Qualifier("fcpFullStack")
-    private FilterChainProxy fullStack;
+	@Autowired
+	@Qualifier("fcpFullStack")
+	private FilterChainProxy fullStack;
 
-    @Before
-    public void createAuthenticatedSession() {
-        session = new MockHttpSession();
-        SecurityContextHolder.getContext().setAuthentication(user);
-        session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext());
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public void createAuthenticatedSession() {
+		session = new MockHttpSession();
+		SecurityContextHolder.getContext().setAuthentication(user);
+		session.setAttribute(
+				HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+				SecurityContextHolder.getContext());
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @AfterClass
-    public static void dumpStopWatch() {
-        System.out.println(sw.prettyPrint());
-    }
+	@AfterClass
+	public static void dumpStopWatch() {
+		System.out.println(sw.prettyPrint());
+	}
 
-    private MockHttpServletRequest createRequest(String url) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setSession(session);
-        request.setServletPath(url);
-        request.setMethod("GET");
-        return request;
-    }
+	private MockHttpServletRequest createRequest(String url) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setSession(session);
+		request.setServletPath(url);
+		request.setMethod("GET");
+		return request;
+	}
 
-    private void runWithStack(FilterChainProxy stack) throws Exception {
-        for(int i = 0; i < N_INVOCATIONS; i++) {
-            MockHttpServletRequest request = createRequest("/somefile.html");
-            stack.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
-            session = request.getSession();
-        }
-    }
+	private void runWithStack(FilterChainProxy stack) throws Exception {
+		for (int i = 0; i < N_INVOCATIONS; i++) {
+			MockHttpServletRequest request = createRequest("/somefile.html");
+			stack.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+			session = request.getSession();
+		}
+	}
 
-    @Test
-    public void minimalStackInvocation() throws Exception {
-        sw.start("Run with Minimal Filter Stack");
-        runWithStack(minimalStack);
-        sw.stop();
-    }
+	@Test
+	public void minimalStackInvocation() throws Exception {
+		sw.start("Run with Minimal Filter Stack");
+		runWithStack(minimalStack);
+		sw.stop();
+	}
 
-    @Test
-    public void fullStackInvocation() throws Exception {
-        sw.start("Run with Full Filter Stack");
-        runWithStack(fullStack);
-        sw.stop();
-    }
+	@Test
+	public void fullStackInvocation() throws Exception {
+		sw.start("Run with Full Filter Stack");
+		runWithStack(fullStack);
+		sw.stop();
+	}
 
-    /**
-     * Creates data from 1 to N_AUTHORITIES in steps of 10, performing N_INVOCATIONS for each
-     */
-    @Test
-    public void provideDataOnScalingWithNumberOfAuthoritiesUserHas() throws Exception {
-        StopWatch sw = new StopWatch("Scaling with nAuthorities");
-        for (int user=0; user < N_AUTHORITIES/10; user ++) {
-            int nAuthorities = user == 0 ? 1 : user*10;
-            SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("bob", "bobspassword", createRoles(nAuthorities)));
-            session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext());
-            SecurityContextHolder.clearContext();
-            sw.start(Integer.toString(nAuthorities) + " authorities");
-            runWithStack(minimalStack);
-            System.out.println(sw.shortSummary());
-            sw.stop();
-        }
-        System.out.println(sw.prettyPrint());
-    }
+	/**
+	 * Creates data from 1 to N_AUTHORITIES in steps of 10, performing N_INVOCATIONS for
+	 * each
+	 */
+	@Test
+	public void provideDataOnScalingWithNumberOfAuthoritiesUserHas() throws Exception {
+		StopWatch sw = new StopWatch("Scaling with nAuthorities");
+		for (int user = 0; user < N_AUTHORITIES / 10; user++) {
+			int nAuthorities = user == 0 ? 1 : user * 10;
+			SecurityContextHolder.getContext().setAuthentication(
+					new UsernamePasswordAuthenticationToken("bob", "bobspassword",
+							createRoles(nAuthorities)));
+			session.setAttribute(
+					HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
+					SecurityContextHolder.getContext());
+			SecurityContextHolder.clearContext();
+			sw.start(Integer.toString(nAuthorities) + " authorities");
+			runWithStack(minimalStack);
+			System.out.println(sw.shortSummary());
+			sw.stop();
+		}
+		System.out.println(sw.prettyPrint());
+	}
 
-    private List<GrantedAuthority> createRoles(int howMany) {
-     // This is always the worst case scenario - the required role is ROLE_1, but they are created in reverse order
-        GrantedAuthority[] roles = new GrantedAuthority[howMany];
+	private List<GrantedAuthority> createRoles(int howMany) {
+		// This is always the worst case scenario - the required role is ROLE_1, but they
+		// are created in reverse order
+		GrantedAuthority[] roles = new GrantedAuthority[howMany];
 
-        for (int i = howMany - 1; i >=0 ; i--) {
-            roles[i] = new SimpleGrantedAuthority("ROLE_" + i);
-        }
+		for (int i = howMany - 1; i >= 0; i--) {
+			roles[i] = new SimpleGrantedAuthority("ROLE_" + i);
+		}
 
-        return Arrays.asList(roles);
-    }
+		return Arrays.asList(roles);
+	}
 }
diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java
index 3c25f08b77..1775baaaa2 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/performance/ProtectPointcutPerformanceTests.java
@@ -18,35 +18,38 @@ import org.springframework.util.StopWatch;
 /**
  * @author Luke Taylor
  */
-@ContextConfiguration(locations={"/protect-pointcut-performance-app-context.xml"})
+@ContextConfiguration(locations = { "/protect-pointcut-performance-app-context.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class ProtectPointcutPerformanceTests implements ApplicationContextAware {
-    ApplicationContext ctx;
+	ApplicationContext ctx;
 
-    @Before
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    // Method for use with profiler
-    @Test
-    public void usingPrototypeDoesNotParsePointcutOnEachCall() {
-        StopWatch sw = new StopWatch();
-        sw.start();
-        for (int i = 0; i < 1000; i++) {
-            try {
-                SessionRegistry reg = (SessionRegistry) ctx.getBean("sessionRegistryPrototype");
-                reg.getAllPrincipals();
-                fail("Expected AuthenticationCredentialsNotFoundException");
-            } catch (AuthenticationCredentialsNotFoundException expected) {
-            }
-        }
-        sw.stop();
-//        assertTrue(sw.getTotalTimeMillis() < 1000);
+	// Method for use with profiler
+	@Test
+	public void usingPrototypeDoesNotParsePointcutOnEachCall() {
+		StopWatch sw = new StopWatch();
+		sw.start();
+		for (int i = 0; i < 1000; i++) {
+			try {
+				SessionRegistry reg = (SessionRegistry) ctx
+						.getBean("sessionRegistryPrototype");
+				reg.getAllPrincipals();
+				fail("Expected AuthenticationCredentialsNotFoundException");
+			}
+			catch (AuthenticationCredentialsNotFoundException expected) {
+			}
+		}
+		sw.stop();
+		// assertTrue(sw.getTotalTimeMillis() < 1000);
 
-    }
+	}
 
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        ctx = applicationContext;
-    }
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		ctx = applicationContext;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java
index 86675e3ec7..8791e19382 100755
--- a/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/UserDetailsServiceImpl.java
@@ -7,16 +7,16 @@ import org.springframework.transaction.annotation.Transactional;
 
 public class UserDetailsServiceImpl implements UserDetailsService {
 
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
-    private UserRepository userRepository;
+	@SuppressWarnings({ "unused", "FieldCanBeLocal" })
+	private UserRepository userRepository;
 
-    @Transactional(readOnly=true)
-    public UserDetails loadUserByUsername(String username) {
-        return null;
-    }
+	@Transactional(readOnly = true)
+	public UserDetails loadUserByUsername(String username) {
+		return null;
+	}
 
-    @Required
-    public void setUserRepository(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
+	@Required
+	public void setUserRepository(UserRepository userRepository) {
+		this.userRepository = userRepository;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java
index 64ab31e912..4ee2074cd3 100755
--- a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java
@@ -2,6 +2,6 @@ package org.springframework.security.integration;
 
 public interface UserRepository {
 
-    public void doSomething();
+	public void doSomething();
 
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationService.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationService.java
index 0abb3c1744..d70156115f 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationService.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationService.java
@@ -10,15 +10,15 @@ import org.springframework.security.access.prepost.PreAuthorize;
  */
 public interface MultiAnnotationService {
 
-    @PreAuthorize("denyAll")
-    void preAuthorizeDenyAllMethod();
+	@PreAuthorize("denyAll")
+	void preAuthorizeDenyAllMethod();
 
-    @PreAuthorize("hasRole('ROLE_A')")
-    void preAuthorizeHasRoleAMethod();
+	@PreAuthorize("hasRole('ROLE_A')")
+	void preAuthorizeHasRoleAMethod();
 
-    @Secured("IS_AUTHENTICATED_ANONYMOUSLY")
-    void securedAnonymousMethod();
+	@Secured("IS_AUTHENTICATED_ANONYMOUSLY")
+	void securedAnonymousMethod();
 
-    @Secured("ROLE_A")
-    void securedRoleAMethod();
+	@Secured("ROLE_A")
+	void securedRoleAMethod();
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationServiceImpl.java
index e93122c45a..a13e6e09b5 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationServiceImpl.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/MultiAnnotationServiceImpl.java
@@ -2,16 +2,16 @@ package org.springframework.security.integration.multiannotation;
 
 public class MultiAnnotationServiceImpl implements MultiAnnotationService {
 
-    public void preAuthorizeDenyAllMethod() {
-    }
+	public void preAuthorizeDenyAllMethod() {
+	}
 
-    public void preAuthorizeHasRoleAMethod() {
-    }
+	public void preAuthorizeHasRoleAMethod() {
+	}
 
-    public void securedAnonymousMethod() {
-    }
+	public void securedAnonymousMethod() {
+	}
 
-    public void securedRoleAMethod() {
-    }
+	public void securedRoleAMethod() {
+	}
 
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeService.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeService.java
index b2cdc42ad7..2116ba6630 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeService.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeService.java
@@ -8,6 +8,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
  */
 public interface PreAuthorizeService {
 
-    @PreAuthorize("hasRole('ROLE_A')")
-    void preAuthorizedMethod();
+	@PreAuthorize("hasRole('ROLE_A')")
+	void preAuthorizedMethod();
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeServiceImpl.java
index 7cc42809eb..be75f00884 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeServiceImpl.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/PreAuthorizeServiceImpl.java
@@ -4,6 +4,6 @@ package org.springframework.security.integration.multiannotation;
  * @author Luke Taylor
  */
 public class PreAuthorizeServiceImpl implements PreAuthorizeService {
-    public void preAuthorizedMethod() {
-    }
+	public void preAuthorizedMethod() {
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredService.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredService.java
index 5b35f3910d..5410006480 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredService.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredService.java
@@ -7,6 +7,6 @@ import org.springframework.security.access.annotation.Secured;
  * @author Luke Taylor
  */
 public interface SecuredService {
-    @Secured("ROLE_A")
-    void securedMethod();
+	@Secured("ROLE_A")
+	void securedMethod();
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredServiceImpl.java
index 33a65d3b89..5bcf0fb9b1 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredServiceImpl.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/multiannotation/SecuredServiceImpl.java
@@ -5,6 +5,6 @@ package org.springframework.security.integration.multiannotation;
  * @author Luke Taylor
  */
 public class SecuredServiceImpl implements SecuredService {
-    public void securedMethod() {
-    }
+	public void securedMethod() {
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPostInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPostInvocationAdvice.java
index dd665ff0be..a87dda377f 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPostInvocationAdvice.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPostInvocationAdvice.java
@@ -6,10 +6,12 @@ import org.springframework.security.access.prepost.PostInvocationAttribute;
 import org.springframework.security.access.prepost.PostInvocationAuthorizationAdvice;
 import org.springframework.security.core.Authentication;
 
-public class PythonInterpreterPostInvocationAdvice implements PostInvocationAuthorizationAdvice{
+public class PythonInterpreterPostInvocationAdvice implements
+		PostInvocationAuthorizationAdvice {
 
-    public Object after(Authentication authentication, MethodInvocation mi, PostInvocationAttribute pia,
-            Object returnedObject) throws AccessDeniedException {
-        return returnedObject;
-    }
+	public Object after(Authentication authentication, MethodInvocation mi,
+			PostInvocationAttribute pia, Object returnedObject)
+			throws AccessDeniedException {
+		return returnedObject;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
index 9b5f296c33..5b3197995e 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
@@ -18,45 +18,50 @@ import org.springframework.security.access.prepost.PreInvocationAuthorizationAdv
 import org.springframework.security.core.Authentication;
 import org.springframework.util.ClassUtils;
 
-public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthorizationAdvice{
-    private final ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
+public class PythonInterpreterPreInvocationAdvice implements
+		PreInvocationAuthorizationAdvice {
+	private final ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
 
-    public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preAttr) {
-        PythonInterpreterPreInvocationAttribute pythonAttr = (PythonInterpreterPreInvocationAttribute) preAttr;
-        String script = pythonAttr.getScript();
+	public boolean before(Authentication authentication, MethodInvocation mi,
+			PreInvocationAttribute preAttr) {
+		PythonInterpreterPreInvocationAttribute pythonAttr = (PythonInterpreterPreInvocationAttribute) preAttr;
+		String script = pythonAttr.getScript();
 
-        PythonInterpreter python = new PythonInterpreter();
-        python.set("authentication", authentication);
-        python.set("args", createArgumentMap(mi));
-        python.set("method", mi.getMethod().getName());
-        Resource scriptResource = new PathMatchingResourcePatternResolver().getResource(script);
+		PythonInterpreter python = new PythonInterpreter();
+		python.set("authentication", authentication);
+		python.set("args", createArgumentMap(mi));
+		python.set("method", mi.getMethod().getName());
+		Resource scriptResource = new PathMatchingResourcePatternResolver()
+				.getResource(script);
 
-        try {
-            python.execfile(scriptResource.getInputStream());
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Couldn't run python script, " + script, e);
-        }
+		try {
+			python.execfile(scriptResource.getInputStream());
+		}
+		catch (IOException e) {
+			throw new IllegalArgumentException("Couldn't run python script, " + script, e);
+		}
 
-        PyObject allowed = python.get("allow");
+		PyObject allowed = python.get("allow");
 
-        if (allowed == null) {
-            throw new IllegalStateException("Python script did not set the permit flag");
-        }
+		if (allowed == null) {
+			throw new IllegalStateException("Python script did not set the permit flag");
+		}
 
-        return (Boolean)Py.tojava(allowed, Boolean.class);
-    }
+		return (Boolean) Py.tojava(allowed, Boolean.class);
+	}
 
-    private Map<String,Object> createArgumentMap(MethodInvocation mi) {
-        Object[] args = mi.getArguments();
-        Object targetObject = mi.getThis();
-        Method method = ClassUtils.getMostSpecificMethod(mi.getMethod(), targetObject.getClass());
-        String[] paramNames = parameterNameDiscoverer.getParameterNames(method);
+	private Map<String, Object> createArgumentMap(MethodInvocation mi) {
+		Object[] args = mi.getArguments();
+		Object targetObject = mi.getThis();
+		Method method = ClassUtils.getMostSpecificMethod(mi.getMethod(),
+				targetObject.getClass());
+		String[] paramNames = parameterNameDiscoverer.getParameterNames(method);
 
-        Map<String,Object> argMap = new HashMap<String,Object>();
-        for(int i=0; i < args.length; i++) {
-            argMap.put(paramNames[i], args[i]);
-        }
+		Map<String, Object> argMap = new HashMap<String, Object>();
+		for (int i = 0; i < args.length; i++) {
+			argMap.put(paramNames[i], args[i]);
+		}
 
-        return argMap;
-    }
+		return argMap;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java
index 8639c40a85..a55a3a8453 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAttribute.java
@@ -3,17 +3,17 @@ package org.springframework.security.integration.python;
 import org.springframework.security.access.prepost.PreInvocationAttribute;
 
 public class PythonInterpreterPreInvocationAttribute implements PreInvocationAttribute {
-    private final String script;
+	private final String script;
 
-    PythonInterpreterPreInvocationAttribute(String script) {
-        this.script = script;
-    }
+	PythonInterpreterPreInvocationAttribute(String script) {
+		this.script = script;
+	}
 
-    public String getAttribute() {
-        return null;
-    }
+	public String getAttribute() {
+		return null;
+	}
 
-    public String getScript() {
-        return script;
-    }
+	public String getScript() {
+		return script;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java
index 6612d02871..9cdfa11a77 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java
@@ -5,18 +5,20 @@ import org.springframework.security.access.prepost.PostInvocationAttribute;
 import org.springframework.security.access.prepost.PreInvocationAttribute;
 import org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;
 
-public class PythonInterpreterPrePostInvocationAttributeFactory implements PrePostInvocationAttributeFactory{
+public class PythonInterpreterPrePostInvocationAttributeFactory implements
+		PrePostInvocationAttributeFactory {
 
-    public PythonInterpreterPrePostInvocationAttributeFactory() {
-        PythonInterpreter.initialize(System.getProperties(), null, new String[] {});
-    }
+	public PythonInterpreterPrePostInvocationAttributeFactory() {
+		PythonInterpreter.initialize(System.getProperties(), null, new String[] {});
+	}
 
+	public PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute,
+			String filterObject, String preAuthorizeAttribute) {
+		return new PythonInterpreterPreInvocationAttribute(preAuthorizeAttribute);
+	}
 
-    public PreInvocationAttribute createPreInvocationAttribute(String preFilterAttribute, String filterObject, String preAuthorizeAttribute) {
-        return new PythonInterpreterPreInvocationAttribute(preAuthorizeAttribute    );
-    }
-
-    public PostInvocationAttribute createPostInvocationAttribute(String postFilterAttribute, String postAuthorizeAttribute) {
-        return null;
-    }
+	public PostInvocationAttribute createPostInvocationAttribute(
+			String postFilterAttribute, String postAuthorizeAttribute) {
+		return null;
+	}
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java
index 8786fd5d2f..9851752138 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java
@@ -4,7 +4,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 public interface TestService {
 
-    @PreAuthorize("someMethod.py")
-    public void someMethod();
+	@PreAuthorize("someMethod.py")
+	public void someMethod();
 
 }
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/TestServiceImpl.java b/itest/context/src/main/java/org/springframework/security/integration/python/TestServiceImpl.java
index f8f3530fdb..4589898993 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/TestServiceImpl.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/TestServiceImpl.java
@@ -2,8 +2,8 @@ package org.springframework.security.integration.python;
 
 public class TestServiceImpl implements TestService {
 
-    public void someMethod() {
-        System.out.print("Invoked someMethod()");
-    }
+	public void someMethod() {
+		System.out.print("Invoked someMethod()");
+	}
 
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
index b3dad9ba21..124d665a97 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
@@ -22,136 +22,139 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 
 /**
- * Base class which allows the application to be started with a particular Spring application
- * context. Subclasses override the <tt>getContextConfigLocations</tt> method to return
- * a list of context file names which is passed to the <tt>ContextLoaderListener</tt> when
- * starting up the webapp.
+ * Base class which allows the application to be started with a particular Spring
+ * application context. Subclasses override the <tt>getContextConfigLocations</tt> method
+ * to return a list of context file names which is passed to the
+ * <tt>ContextLoaderListener</tt> when starting up the webapp.
  *
  * @author Luke Taylor
  */
 public abstract class AbstractWebServerIntegrationTests {
-    private Server server;
-    private final Object SERVER_LOCK = new Object();
-    protected final WebTester tester = new WebTester();
+	private Server server;
+	private final Object SERVER_LOCK = new Object();
+	protected final WebTester tester = new WebTester();
 
-    /**
-     * Override to set the application context files that should be loaded or return null
-     * to use web.xml.
-     */
-    protected abstract String getContextConfigLocations();
+	/**
+	 * Override to set the application context files that should be loaded or return null
+	 * to use web.xml.
+	 */
+	protected abstract String getContextConfigLocations();
 
-    protected String getContextPath() {
-        return "/testapp";
-    }
+	protected String getContextPath() {
+		return "/testapp";
+	}
 
-    @BeforeClass
-    public void startServer() throws Exception {
-        synchronized(SERVER_LOCK) {
-            if (server == null) {
-                //System.setProperty("DEBUG", "true");
-                //System.setProperty("VERBOSE", "true");
-                //System.setProperty("IGNORED", "true");
-                server = new Server(0);
-                server.addHandler(createWebContext());
-                server.start();
-            }
-        }
-    }
+	@BeforeClass
+	public void startServer() throws Exception {
+		synchronized (SERVER_LOCK) {
+			if (server == null) {
+				// System.setProperty("DEBUG", "true");
+				// System.setProperty("VERBOSE", "true");
+				// System.setProperty("IGNORED", "true");
+				server = new Server(0);
+				server.addHandler(createWebContext());
+				server.start();
+			}
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    private WebAppContext createWebContext() {
-        String webappDir = System.getProperty("webapp.dir");
+	@SuppressWarnings("unchecked")
+	private WebAppContext createWebContext() {
+		String webappDir = System.getProperty("webapp.dir");
 
-        WebAppContext webCtx = new WebAppContext(webappDir == null ? "src/main/webapp" : webappDir, getContextPath());
+		WebAppContext webCtx = new WebAppContext(webappDir == null ? "src/main/webapp"
+				: webappDir, getContextPath());
 
-        if (StringUtils.hasText(getContextConfigLocations())) {
-            webCtx.addEventListener(new ContextLoaderListener());
-            webCtx.addEventListener(new HttpSessionEventPublisher());
-            webCtx.getInitParams().put("contextConfigLocation", getContextConfigLocations());
-        }
+		if (StringUtils.hasText(getContextConfigLocations())) {
+			webCtx.addEventListener(new ContextLoaderListener());
+			webCtx.addEventListener(new HttpSessionEventPublisher());
+			webCtx.getInitParams().put("contextConfigLocation",
+					getContextConfigLocations());
+		}
 
-        ServletHolder servlet = new ServletHolder();
-        servlet.setName("testapp");
-        servlet.setClassName(DispatcherServlet.class.getName());
-        webCtx.addServlet(servlet, "*.htm");
+		ServletHolder servlet = new ServletHolder();
+		servlet.setName("testapp");
+		servlet.setClassName(DispatcherServlet.class.getName());
+		webCtx.addServlet(servlet, "*.htm");
 
-        return webCtx;
-    }
+		return webCtx;
+	}
 
-    @AfterClass
-    public void stopServer() throws Exception {
-        synchronized(SERVER_LOCK) {
-            if (server != null) {
-                server.stop();
-            }
-            server = null;
-        }
-    }
+	@AfterClass
+	public void stopServer() throws Exception {
+		synchronized (SERVER_LOCK) {
+			if (server != null) {
+				server.stop();
+			}
+			server = null;
+		}
+	}
 
-    @BeforeMethod
-    public void initializeTester() {
-        tester.getTestContext().setBaseUrl(getBaseUrl());
-    }
+	@BeforeMethod
+	public void initializeTester() {
+		tester.getTestContext().setBaseUrl(getBaseUrl());
+	}
 
-    @AfterMethod
-    public void resetWebConversation() {
-        tester.closeBrowser();
-        tester.setTestContext(null);
-    }
+	@AfterMethod
+	public void resetWebConversation() {
+		tester.closeBrowser();
+		tester.setTestContext(null);
+	}
 
-    protected final String getBaseUrl() {
-        int port = server.getConnectors()[0].getLocalPort();
-        return "http://localhost:" + port + getContextPath() + "/";
-    }
+	protected final String getBaseUrl() {
+		int port = server.getConnectors()[0].getLocalPort();
+		return "http://localhost:" + port + getContextPath() + "/";
+	}
 
-    protected final Object getBean(String beanName) {
-        return getAppContext().getBean(beanName);
-    }
+	protected final Object getBean(String beanName) {
+		return getAppContext().getBean(beanName);
+	}
 
-    protected final WebApplicationContext getAppContext() {
-        ServletContext servletCtx = ((WebAppContext)server.getHandler()).getServletContext();
-        WebApplicationContext appCtx =
-                WebApplicationContextUtils.getRequiredWebApplicationContext(servletCtx);
-        return appCtx;
-    }
+	protected final WebApplicationContext getAppContext() {
+		ServletContext servletCtx = ((WebAppContext) server.getHandler())
+				.getServletContext();
+		WebApplicationContext appCtx = WebApplicationContextUtils
+				.getRequiredWebApplicationContext(servletCtx);
+		return appCtx;
+	}
 
-    @SuppressWarnings("unchecked")
-    protected Cookie getRememberMeCookie() {
-        List<Cookie> cookies = (List<Cookie>) tester.getTestingEngine().getCookies();
-        for (Cookie c : cookies) {
-            if (c.getName().equals("remember-me")) {
-                return c;
-            }
-        }
-        return null;
-    }
+	@SuppressWarnings("unchecked")
+	protected Cookie getRememberMeCookie() {
+		List<Cookie> cookies = (List<Cookie>) tester.getTestingEngine().getCookies();
+		for (Cookie c : cookies) {
+			if (c.getName().equals("remember-me")) {
+				return c;
+			}
+		}
+		return null;
+	}
 
-    protected final void submit() {
-        tester.submit();
-    }
+	protected final void submit() {
+		tester.submit();
+	}
 
-    protected final void beginAt(String url) {
-        tester.beginAt(url);
-    }
+	protected final void beginAt(String url) {
+		tester.beginAt(url);
+	}
 
-    protected final void setTextField(String name, String value) {
-        tester.setTextField(name, value);
-    }
+	protected final void setTextField(String name, String value) {
+		tester.setTextField(name, value);
+	}
 
-    protected final void assertFormPresent() {
-        tester.assertFormPresent();
-    }
+	protected final void assertFormPresent() {
+		tester.assertFormPresent();
+	}
 
-    protected final void assertTextPresent(String text) {
-        tester.assertTextPresent(text);
-    }
+	protected final void assertTextPresent(String text) {
+		tester.assertTextPresent(text);
+	}
 
-    // Security-specific utility methods
+	// Security-specific utility methods
 
-    protected void login(String username, String password) {
-        assertFormPresent();
-        setTextField("username", username);
-        setTextField("password", password);
-        submit();
-    }
+	protected void login(String username, String password) {
+		assertFormPresent();
+		setTextField("username", username);
+		setTextField("password", password);
+		submit();
+	}
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java
index 4886386e17..c113c18344 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/BasicAuthenticationTests.java
@@ -4,20 +4,21 @@ import org.testng.annotations.Test;
 
 public class BasicAuthenticationTests extends AbstractWebServerIntegrationTests {
 
-    @Override
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security-basic.xml /WEB-INF/in-memory-provider.xml";
-    }
+	@Override
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security-basic.xml /WEB-INF/in-memory-provider.xml";
+	}
 
-    @Test
-    public void basicAuthenticationIsSuccessful() throws Exception {
-        tester.setIgnoreFailingStatusCodes(true);
-        beginAt("secure/index.html");
-        // Ignore the 401
-        tester.setIgnoreFailingStatusCodes(false);
-        tester.assertHeaderEquals("WWW-Authenticate", "Basic realm=\"Spring Security Application\"");
-        tester.getTestContext().setAuthorization("johnc", "johncspassword");
-        beginAt("secure/index.html");
-    }
+	@Test
+	public void basicAuthenticationIsSuccessful() throws Exception {
+		tester.setIgnoreFailingStatusCodes(true);
+		beginAt("secure/index.html");
+		// Ignore the 401
+		tester.setIgnoreFailingStatusCodes(false);
+		tester.assertHeaderEquals("WWW-Authenticate",
+				"Basic realm=\"Spring Security Application\"");
+		tester.getTestContext().setAuthorization("johnc", "johncspassword");
+		beginAt("secure/index.html");
+	}
 
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java
index 8f9567f1aa..3913c4eae1 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/ConcurrentSessionManagementTests.java
@@ -8,37 +8,36 @@ import org.testng.annotations.Test;
  */
 public class ConcurrentSessionManagementTests extends AbstractWebServerIntegrationTests {
 
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security-concurrency.xml /WEB-INF/in-memory-provider.xml";
-    }
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security-concurrency.xml /WEB-INF/in-memory-provider.xml";
+	}
 
-    @Test
-    public void maxConcurrentLoginsValueIsRespected() throws Exception {
-        System.out.println("Client: ******* First login ******* ");
-        beginAt("secure/index.html");
-        login("jimi", "jimispassword");
-        // Login again
-        System.out.println("Client: ******* Second login ******* ");
-        WebTester tester2 = new WebTester();
-        tester2.getTestContext().setBaseUrl(getBaseUrl());
-        tester2.beginAt("secure/index.html");
-        // seems to be a bug in checking for form here (it fails)
-        //tester2.assertFormPresent();
-        tester2.setTextField("username", "jimi");
-        tester2.setTextField("password", "jimispassword");
-        // tester2.submit() also fails to detect the form
-        tester2.getTestingEngine().submit();
-        tester2.assertTextPresent("Maximum sessions of 1 for this principal exceeded");
+	@Test
+	public void maxConcurrentLoginsValueIsRespected() throws Exception {
+		System.out.println("Client: ******* First login ******* ");
+		beginAt("secure/index.html");
+		login("jimi", "jimispassword");
+		// Login again
+		System.out.println("Client: ******* Second login ******* ");
+		WebTester tester2 = new WebTester();
+		tester2.getTestContext().setBaseUrl(getBaseUrl());
+		tester2.beginAt("secure/index.html");
+		// seems to be a bug in checking for form here (it fails)
+		// tester2.assertFormPresent();
+		tester2.setTextField("username", "jimi");
+		tester2.setTextField("password", "jimispassword");
+		// tester2.submit() also fails to detect the form
+		tester2.getTestingEngine().submit();
+		tester2.assertTextPresent("Maximum sessions of 1 for this principal exceeded");
 
-        // Now logout to kill first session
-        tester.gotoPage("/logout");
+		// Now logout to kill first session
+		tester.gotoPage("/logout");
 
-
-        // Try second session again
-        tester2.setTextField("username", "jimi");
-        tester2.setTextField("password", "jimispassword");
-        // tester2.submit() also fails to detect the form
-        tester2.getTestingEngine().submit();
-        tester2.assertTextPresent("A Secure Page");
-    }
+		// Try second session again
+		tester2.setTextField("username", "jimi");
+		tester2.setTextField("password", "jimispassword");
+		// tester2.submit() also fails to detect the form
+		tester2.getTestingEngine().submit();
+		tester2.assertTextPresent("A Secure Page");
+	}
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java
index 2095b0f8c1..7830c89ed0 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java
@@ -9,45 +9,47 @@ import org.testng.annotations.Test;
 /**
  * @author Luke Taylor
  */
-public class CustomConcurrentSessionManagementTests extends AbstractWebServerIntegrationTests {
+public class CustomConcurrentSessionManagementTests extends
+		AbstractWebServerIntegrationTests {
 
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security-custom-concurrency.xml /WEB-INF/in-memory-provider.xml";
-    }
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security-custom-concurrency.xml /WEB-INF/in-memory-provider.xml";
+	}
 
-    @Test
-    public void maxConcurrentLoginsValueIsRespected() throws Exception {
-        beginAt("secure/index.html");
-        login("jimi", "jimispassword");
-        // Login again
-        System.out.println("Client: ******* Second login ******* ");
-        WebTester tester2 = new WebTester();
-        tester2.getTestContext().setBaseUrl(getBaseUrl());
-        tester2.beginAt("secure/index.html");
-        tester2.setTextField("username", "jimi");
-        tester2.setTextField("password", "jimispassword");
-        tester2.setIgnoreFailingStatusCodes(true);
-        tester2.submit();
-        Assert.assertTrue(tester2.getServerResponse().contains("Maximum sessions of 1 for this principal exceeded"));
-    }
+	@Test
+	public void maxConcurrentLoginsValueIsRespected() throws Exception {
+		beginAt("secure/index.html");
+		login("jimi", "jimispassword");
+		// Login again
+		System.out.println("Client: ******* Second login ******* ");
+		WebTester tester2 = new WebTester();
+		tester2.getTestContext().setBaseUrl(getBaseUrl());
+		tester2.beginAt("secure/index.html");
+		tester2.setTextField("username", "jimi");
+		tester2.setTextField("password", "jimispassword");
+		tester2.setIgnoreFailingStatusCodes(true);
+		tester2.submit();
+		Assert.assertTrue(tester2.getServerResponse().contains(
+				"Maximum sessions of 1 for this principal exceeded"));
+	}
 
-    @Test
-    public void logoutClearsSessionRegistryAndAllowsSecondLogin() throws Exception {
-        beginAt("secure/index.html");
-        login("bessie", "bessiespassword");
-        SessionRegistry reg = getAppContext().getBean(SessionRegistry.class);
+	@Test
+	public void logoutClearsSessionRegistryAndAllowsSecondLogin() throws Exception {
+		beginAt("secure/index.html");
+		login("bessie", "bessiespassword");
+		SessionRegistry reg = getAppContext().getBean(SessionRegistry.class);
 
-        tester.gotoPage("/logout");
+		tester.gotoPage("/logout");
 
-        // Login again
-        System.out.println("Client: ******* Second login ******* ");
-        WebTester tester2 = new WebTester();
-        tester2.getTestContext().setBaseUrl(getBaseUrl());
-        tester2.beginAt("secure/index.html");
-        tester2.setTextField("username", "bessie");
-        tester2.setTextField("password", "bessiespassword");
-        tester2.setIgnoreFailingStatusCodes(true);
-        tester2.submit();
-        Assert.assertTrue(tester2.getServerResponse().contains("A secure page"));
-    }
+		// Login again
+		System.out.println("Client: ******* Second login ******* ");
+		WebTester tester2 = new WebTester();
+		tester2.getTestContext().setBaseUrl(getBaseUrl());
+		tester2.beginAt("secure/index.html");
+		tester2.setTextField("username", "bessie");
+		tester2.setTextField("password", "bessiespassword");
+		tester2.setIgnoreFailingStatusCodes(true);
+		tester2.submit();
+		Assert.assertTrue(tester2.getServerResponse().contains("A secure page"));
+	}
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java
index f464ed47ed..471c6b16e2 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java
@@ -13,63 +13,63 @@ import org.testng.annotations.Test;
  */
 public class InMemoryProviderWebAppTests extends AbstractWebServerIntegrationTests {
 
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security.xml /WEB-INF/in-memory-provider.xml";
-    }
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security.xml /WEB-INF/in-memory-provider.xml";
+	}
 
-    @Test
-    public void loginFailsWithinvalidPassword() {
-        beginAt("secure/index.html");
-        login("jimi", "wrongPassword");
-        assertTextPresent("Your login attempt was not successful");
-    }
+	@Test
+	public void loginFailsWithinvalidPassword() {
+		beginAt("secure/index.html");
+		login("jimi", "wrongPassword");
+		assertTextPresent("Your login attempt was not successful");
+	}
 
-    @Test
-    public void loginSucceedsWithCorrectPassword() {
-        beginAt("secure/index.html");
-        login("jimi", "jimispassword");
-        assertTextPresent("A Secure Page");
-        tester.gotoPage("/logout");
-    }
+	@Test
+	public void loginSucceedsWithCorrectPassword() {
+		beginAt("secure/index.html");
+		login("jimi", "jimispassword");
+		assertTextPresent("A Secure Page");
+		tester.gotoPage("/logout");
+	}
 
-    @Test
-    public void basicAuthenticationIsSuccessful() throws Exception {
-        tester.getTestContext().setAuthorization("johnc", "johncspassword");
-        beginAt("secure/index.html");
-        beginAt("secure/index.html");
-    }
+	@Test
+	public void basicAuthenticationIsSuccessful() throws Exception {
+		tester.getTestContext().setAuthorization("johnc", "johncspassword");
+		beginAt("secure/index.html");
+		beginAt("secure/index.html");
+	}
 
-    /*
-     * Checks use of <jsp:include> with parameters in the secured page.
-     */
-    @Test
-    public void savedRequestWithJspIncludeSeesCorrectParams() {
-        beginAt("secure/secure1.jsp?x=0");
-        login("jimi", "jimispassword");
-        // Included JSP has params ?x=1&y=2
-        assertTextPresent("Params: x=1, y=2");
-        assertTextPresent("xcount=2");
-    }
+	/*
+	 * Checks use of <jsp:include> with parameters in the secured page.
+	 */
+	@Test
+	public void savedRequestWithJspIncludeSeesCorrectParams() {
+		beginAt("secure/secure1.jsp?x=0");
+		login("jimi", "jimispassword");
+		// Included JSP has params ?x=1&y=2
+		assertTextPresent("Params: x=1, y=2");
+		assertTextPresent("xcount=2");
+	}
 
-    // SEC-1255
-    @Test
-    public void redirectToUrlWithSpecialCharsInFilenameWorksOk() throws Exception {
-        beginAt("secure/file%3Fwith%3Fspecial%3Fchars.htm?someArg=1");
-        login("jimi", "jimispassword");
-        assertTextPresent("I'm file?with?special?chars.htm");
-    }
+	// SEC-1255
+	@Test
+	public void redirectToUrlWithSpecialCharsInFilenameWorksOk() throws Exception {
+		beginAt("secure/file%3Fwith%3Fspecial%3Fchars.htm?someArg=1");
+		login("jimi", "jimispassword");
+		assertTextPresent("I'm file?with?special?chars.htm");
+	}
 
-    @Test
-    public void persistentLoginIsSuccesful() throws Exception {
-        beginAt("secure/index.html");
-        tester.checkCheckbox("remember-me");
-        login("jimi", "jimispassword");
-        Cookie rememberMe = getRememberMeCookie();
-        assertNotNull(rememberMe);
-        tester.closeBrowser();
+	@Test
+	public void persistentLoginIsSuccesful() throws Exception {
+		beginAt("secure/index.html");
+		tester.checkCheckbox("remember-me");
+		login("jimi", "jimispassword");
+		Cookie rememberMe = getRememberMeCookie();
+		assertNotNull(rememberMe);
+		tester.closeBrowser();
 
-        tester.getTestContext().addCookie(rememberMe);
-        beginAt("secure/index.html");
-        assertTextPresent("A Secure Page");
-    }
+		tester.getTestContext().addCookie(rememberMe);
+		beginAt("secure/index.html");
+		assertTextPresent("A Secure Page");
+	}
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java
index ef237618f8..e41a7dde05 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/JspTaglibTests.java
@@ -10,30 +10,35 @@ import org.testng.annotations.Test;
  */
 public final class JspTaglibTests extends AbstractWebServerIntegrationTests {
 
-    @Override
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security.xml /WEB-INF/in-memory-provider.xml";
-    }
+	@Override
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security.xml /WEB-INF/in-memory-provider.xml";
+	}
 
-    @Test
-    public void authenticationTagEscapingWorksCorrectly() {
-        beginAt("secure/authenticationTagTestPage.jsp");
-        login("theescapist<>&.", "theescapistspassword");
-        String response = tester.getServerResponse();
-        assertTrue(response.contains("This is the unescaped authentication name: theescapist<>&."));
-        assertTrue(response.contains("This is the unescaped principal.username: theescapist<>&."));
-        assertTrue(response.contains("This is the authentication name: theescapist&lt;&gt;&amp;&#46;"));
-        assertTrue(response.contains("This is the principal.username: theescapist&lt;&gt;&amp;&#46;"));
-    }
+	@Test
+	public void authenticationTagEscapingWorksCorrectly() {
+		beginAt("secure/authenticationTagTestPage.jsp");
+		login("theescapist<>&.", "theescapistspassword");
+		String response = tester.getServerResponse();
+		assertTrue(response
+				.contains("This is the unescaped authentication name: theescapist<>&."));
+		assertTrue(response
+				.contains("This is the unescaped principal.username: theescapist<>&."));
+		assertTrue(response
+				.contains("This is the authentication name: theescapist&lt;&gt;&amp;&#46;"));
+		assertTrue(response
+				.contains("This is the principal.username: theescapist&lt;&gt;&amp;&#46;"));
+	}
 
-    @Test
-    public void authorizationTagEvaluatesExpressionCorrectlyAndWritesValueToVariable() {
-        beginAt("secure/authorizationTagTestPage.jsp");
-        login("bessie", "bessiespassword");
-        String response = tester.getServerResponse();
-        assertTrue(response.contains("Users can see this and 'allowed' variable is true."));
-        assertFalse(response.contains("Role X users (nobody) can see this."));
-        assertTrue(response.contains("Role X expression evaluates to false"));
-    }
+	@Test
+	public void authorizationTagEvaluatesExpressionCorrectlyAndWritesValueToVariable() {
+		beginAt("secure/authorizationTagTestPage.jsp");
+		login("bessie", "bessiespassword");
+		String response = tester.getServerResponse();
+		assertTrue(response
+				.contains("Users can see this and 'allowed' variable is true."));
+		assertFalse(response.contains("Role X users (nobody) can see this."));
+		assertTrue(response.contains("Role X expression evaluates to false"));
+	}
 
 }
diff --git a/itest/web/src/integration-test/java/org/springframework/security/integration/LdapWebAppTests.java b/itest/web/src/integration-test/java/org/springframework/security/integration/LdapWebAppTests.java
index ef1fa1512b..410d55bf9e 100644
--- a/itest/web/src/integration-test/java/org/springframework/security/integration/LdapWebAppTests.java
+++ b/itest/web/src/integration-test/java/org/springframework/security/integration/LdapWebAppTests.java
@@ -7,13 +7,13 @@ import org.testng.annotations.*;
  */
 public class LdapWebAppTests extends AbstractWebServerIntegrationTests {
 
-    protected String getContextConfigLocations() {
-        return "/WEB-INF/http-security.xml /WEB-INF/ldap-provider.xml";
-    }
+	protected String getContextConfigLocations() {
+		return "/WEB-INF/http-security.xml /WEB-INF/ldap-provider.xml";
+	}
 
-    @Test
-    public void doSomething() {
+	@Test
+	public void doSomething() {
 
-    }
+	}
 
 }
diff --git a/itest/web/src/main/java/org/springframework/security/itest/web/TestController.java b/itest/web/src/main/java/org/springframework/security/itest/web/TestController.java
index a947ab6103..b228529c03 100644
--- a/itest/web/src/main/java/org/springframework/security/itest/web/TestController.java
+++ b/itest/web/src/main/java/org/springframework/security/itest/web/TestController.java
@@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 @Controller
 public class TestController {
 
-    @RequestMapping(value="/secure/file?with?special?chars.htm", method=RequestMethod.GET)
-    public void sec1255TestUrl(HttpServletResponse response) throws IOException {
-        response.getWriter().append("I'm file?with?special?chars.htm");
-    }
+	@RequestMapping(value = "/secure/file?with?special?chars.htm", method = RequestMethod.GET)
+	public void sec1255TestUrl(HttpServletResponse response) throws IOException {
+		response.getWriter().append("I'm file?with?special?chars.htm");
+	}
 
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
index 79b32f6346..8d8e2d06e2 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/AbstractLdapIntegrationTests.java
@@ -21,21 +21,23 @@ import org.springframework.ldap.core.support.BaseLdapPathContextSource;
  * @author Luke Taylor
  */
 public abstract class AbstractLdapIntegrationTests {
-    private static DefaultSpringSecurityContextSource contextSource;
+	private static DefaultSpringSecurityContextSource contextSource;
 
-    @BeforeClass
-    public static void createContextSource() throws Exception {
-        int serverPort = ApacheDSServerIntegrationTests.getServerPort();
-        contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:" + serverPort + "/dc=springframework,dc=org");
-// OpenLDAP configuration
-//        contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:22389/dc=springsource,dc=com");
-//        contextSource.setUserDn("cn=admin,dc=springsource,dc=com");
-//        contextSource.setPassword("password");
-        contextSource.afterPropertiesSet();
-    }
+	@BeforeClass
+	public static void createContextSource() throws Exception {
+		int serverPort = ApacheDSServerIntegrationTests.getServerPort();
+		contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:"
+				+ serverPort + "/dc=springframework,dc=org");
+		// OpenLDAP configuration
+		// contextSource = new
+		// DefaultSpringSecurityContextSource("ldap://127.0.0.1:22389/dc=springsource,dc=com");
+		// contextSource.setUserDn("cn=admin,dc=springsource,dc=com");
+		// contextSource.setPassword("password");
+		contextSource.afterPropertiesSet();
+	}
 
-    public BaseLdapPathContextSource getContextSource() {
-        return contextSource;
-    }
+	public BaseLdapPathContextSource getContextSource() {
+		return contextSource;
+	}
 
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/ApacheDSServerIntegrationTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/ApacheDSServerIntegrationTests.java
index d5e9ae5aed..2d7e61b063 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/ApacheDSServerIntegrationTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/ApacheDSServerIntegrationTests.java
@@ -17,119 +17,100 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsManagerTests
  * @author Luke Taylor
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses( {
-        BindAuthenticatorTests.class,
-        PasswordComparisonAuthenticatorTests.class,
-        FilterBasedLdapUserSearchTests.class,
-        DefaultLdapAuthoritiesPopulatorTests.class,
-        LdapUserDetailsManagerTests.class,
-        DefaultSpringSecurityContextSourceTests.class,
-        SpringSecurityLdapTemplateITests.class
-}
-)
+@Suite.SuiteClasses({ BindAuthenticatorTests.class,
+		PasswordComparisonAuthenticatorTests.class, FilterBasedLdapUserSearchTests.class,
+		DefaultLdapAuthoritiesPopulatorTests.class, LdapUserDetailsManagerTests.class,
+		DefaultSpringSecurityContextSourceTests.class,
+		SpringSecurityLdapTemplateITests.class })
 public final class ApacheDSServerIntegrationTests {
-    private static ApacheDSContainer server;
-    private static Integer serverPort;
+	private static ApacheDSContainer server;
+	private static Integer serverPort;
 
-    @BeforeClass
-    public static void startServer() throws Exception {
-// OpenLDAP configuration
-//        contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:22389/dc=springsource,dc=com");
-//        contextSource.setUserDn("cn=admin,dc=springsource,dc=com");
-//        contextSource.setPassword("password");
-        server = new ApacheDSContainer("dc=springframework,dc=org", "classpath:test-server.ldif");
-        int port = getAvailablePort();
-        server.setPort(port);
-        server.afterPropertiesSet();
-        serverPort = port;
-    }
+	@BeforeClass
+	public static void startServer() throws Exception {
+		// OpenLDAP configuration
+		// contextSource = new
+		// DefaultSpringSecurityContextSource("ldap://127.0.0.1:22389/dc=springsource,dc=com");
+		// contextSource.setUserDn("cn=admin,dc=springsource,dc=com");
+		// contextSource.setPassword("password");
+		server = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:test-server.ldif");
+		int port = getAvailablePort();
+		server.setPort(port);
+		server.afterPropertiesSet();
+		serverPort = port;
+	}
 
-    @AfterClass
-    public static void stopServer() throws Exception {
-        serverPort = null;
-        if (server != null) {
-            server.stop();
-        }
-    }
+	@AfterClass
+	public static void stopServer() throws Exception {
+		serverPort = null;
+		if (server != null) {
+			server.stop();
+		}
+	}
 
-    /**
-     * Main class to allow server to be started from gradle script
-     */
-    public static void main(String[] args) throws Exception {
-        ApacheDSContainer server = new ApacheDSContainer("dc=springframework,dc=org", "classpath:test-server.ldif");
-        server.afterPropertiesSet();
-    }
+	/**
+	 * Main class to allow server to be started from gradle script
+	 */
+	public static void main(String[] args) throws Exception {
+		ApacheDSContainer server = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:test-server.ldif");
+		server.afterPropertiesSet();
+	}
 
-    public static int getServerPort() {
-        if(serverPort == null) {
-            throw new IllegalStateException("The ApacheDSContainer is not currently running");
-        }
-        return serverPort;
-    }
-/*
-    @After
-    public final void reloadServerDataIfDirty() throws Exception {
-        ClassPathResource ldifs = new ClassPathResource("test-server.ldif");
+	public static int getServerPort() {
+		if (serverPort == null) {
+			throw new IllegalStateException(
+					"The ApacheDSContainer is not currently running");
+		}
+		return serverPort;
+	}
 
-        if (!ldifs.getFile().exists()) {
-            throw new IllegalStateException("Ldif file not found: " + ldifs.getFile().getAbsolutePath());
-        }
+	/*
+	 * @After public final void reloadServerDataIfDirty() throws Exception {
+	 * ClassPathResource ldifs = new ClassPathResource("test-server.ldif");
+	 * 
+	 * if (!ldifs.getFile().exists()) { throw new
+	 * IllegalStateException("Ldif file not found: " + ldifs.getFile().getAbsolutePath());
+	 * }
+	 * 
+	 * DirContext ctx = getContextSource().getReadWriteContext();
+	 * 
+	 * // First of all, make sure the database is empty. Name startingPoint = new
+	 * DistinguishedName("dc=springframework,dc=org");
+	 * 
+	 * try { clearSubContexts(ctx, startingPoint); LdifFileLoader loader = new
+	 * LdifFileLoader(server.getService().getAdminSession(),
+	 * ldifs.getFile().getAbsolutePath()); loader.execute(); } finally { ctx.close(); } }
+	 * 
+	 * private void clearSubContexts(DirContext ctx, Name name) throws NamingException {
+	 * 
+	 * NamingEnumeration<Binding> enumeration = null; try { enumeration =
+	 * ctx.listBindings(name); while (enumeration.hasMore()) { Binding element =
+	 * enumeration.next(); DistinguishedName childName = new
+	 * DistinguishedName(element.getName()); childName.prepend((DistinguishedName) name);
+	 * 
+	 * try { ctx.destroySubcontext(childName); } catch (ContextNotEmptyException e) {
+	 * clearSubContexts(ctx, childName); ctx.destroySubcontext(childName); } } }
+	 * catch(NameNotFoundException ignored) { } catch (NamingException e) {
+	 * e.printStackTrace(); } finally { try { enumeration.close(); } catch (Exception
+	 * ignored) { } } }
+	 */
 
-        DirContext ctx = getContextSource().getReadWriteContext();
-
-        // First of all, make sure the database is empty.
-        Name startingPoint = new DistinguishedName("dc=springframework,dc=org");
-
-        try {
-            clearSubContexts(ctx, startingPoint);
-            LdifFileLoader loader = new LdifFileLoader(server.getService().getAdminSession(), ldifs.getFile().getAbsolutePath());
-            loader.execute();
-        } finally {
-            ctx.close();
-        }
-    }
-
-    private void clearSubContexts(DirContext ctx, Name name) throws NamingException {
-
-        NamingEnumeration<Binding> enumeration = null;
-        try {
-            enumeration = ctx.listBindings(name);
-            while (enumeration.hasMore()) {
-                Binding element = enumeration.next();
-                DistinguishedName childName = new DistinguishedName(element.getName());
-                childName.prepend((DistinguishedName) name);
-
-                try {
-                    ctx.destroySubcontext(childName);
-                } catch (ContextNotEmptyException e) {
-                    clearSubContexts(ctx, childName);
-                    ctx.destroySubcontext(childName);
-                }
-            }
-        } catch(NameNotFoundException ignored) {
-        }
-        catch (NamingException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                enumeration.close();
-            } catch (Exception ignored) {
-            }
-        }
-    }
-    */
-
-    private static int getAvailablePort() throws IOException {
-        ServerSocket serverSocket =  null;
-        try {
-            serverSocket = new ServerSocket(0);
-            return serverSocket.getLocalPort();
-        } finally {
-            if(serverSocket != null) {
-                try {
-                    serverSocket.close();
-                } catch (IOException e) {}
-            }
-        }
-    }
+	private static int getAvailablePort() throws IOException {
+		ServerSocket serverSocket = null;
+		try {
+			serverSocket = new ServerSocket(0);
+			return serverSocket.getLocalPort();
+		}
+		finally {
+			if (serverSocket != null) {
+				try {
+					serverSocket.close();
+				}
+				catch (IOException e) {
+				}
+			}
+		}
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
index ba02e0f94a..f816e3b9ae 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java
@@ -12,121 +12,137 @@ import org.junit.Test;
 import org.springframework.ldap.AuthenticationException;
 import org.springframework.ldap.core.support.AbstractContextSource;
 
-
 /**
  * @author Luke Taylor
  */
 public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegrationTests {
 
-    @Test
-    public void instantiationSucceedsWithExpectedProperties() {
-        DefaultSpringSecurityContextSource ctxSrc =
-            new DefaultSpringSecurityContextSource("ldap://blah:789/dc=springframework,dc=org");
-        assertFalse(ctxSrc.isAnonymousReadOnly());
-        assertTrue(ctxSrc.isPooled());
-    }
+	@Test
+	public void instantiationSucceedsWithExpectedProperties() {
+		DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(
+				"ldap://blah:789/dc=springframework,dc=org");
+		assertFalse(ctxSrc.isAnonymousReadOnly());
+		assertTrue(ctxSrc.isPooled());
+	}
 
-    @Test
-    public void supportsSpacesInUrl() {
-        new DefaultSpringSecurityContextSource("ldap://myhost:10389/dc=spring%20framework,dc=org");
-    }
+	@Test
+	public void supportsSpacesInUrl() {
+		new DefaultSpringSecurityContextSource(
+				"ldap://myhost:10389/dc=spring%20framework,dc=org");
+	}
 
-    @Test
-    public void poolingFlagIsSetWhenAuthenticationDnMatchesManagerUserDn() throws Exception {
-        EnvExposingDefaultSpringSecurityContextSource ctxSrc =
-            new EnvExposingDefaultSpringSecurityContextSource("ldap://blah:789/dc=springframework,dc=org");
-        ctxSrc.setUserDn("manager");
-        ctxSrc.setPassword("password");
-        ctxSrc.afterPropertiesSet();
-        assertTrue(ctxSrc.getAuthenticatedEnvForTest("manager", "password").containsKey(AbstractContextSource.SUN_LDAP_POOLING_FLAG));
-    }
+	@Test
+	public void poolingFlagIsSetWhenAuthenticationDnMatchesManagerUserDn()
+			throws Exception {
+		EnvExposingDefaultSpringSecurityContextSource ctxSrc = new EnvExposingDefaultSpringSecurityContextSource(
+				"ldap://blah:789/dc=springframework,dc=org");
+		ctxSrc.setUserDn("manager");
+		ctxSrc.setPassword("password");
+		ctxSrc.afterPropertiesSet();
+		assertTrue(ctxSrc.getAuthenticatedEnvForTest("manager", "password").containsKey(
+				AbstractContextSource.SUN_LDAP_POOLING_FLAG));
+	}
 
-    @Test
-    public void poolingFlagIsNotSetWhenAuthenticationDnIsNotManagerUserDn() throws Exception {
-        EnvExposingDefaultSpringSecurityContextSource ctxSrc =
-            new EnvExposingDefaultSpringSecurityContextSource("ldap://blah:789/dc=springframework,dc=org");
-        ctxSrc.setUserDn("manager");
-        ctxSrc.setPassword("password");
-        ctxSrc.afterPropertiesSet();
-        assertFalse(ctxSrc.getAuthenticatedEnvForTest("user", "password").containsKey(AbstractContextSource.SUN_LDAP_POOLING_FLAG));
-    }
+	@Test
+	public void poolingFlagIsNotSetWhenAuthenticationDnIsNotManagerUserDn()
+			throws Exception {
+		EnvExposingDefaultSpringSecurityContextSource ctxSrc = new EnvExposingDefaultSpringSecurityContextSource(
+				"ldap://blah:789/dc=springframework,dc=org");
+		ctxSrc.setUserDn("manager");
+		ctxSrc.setPassword("password");
+		ctxSrc.afterPropertiesSet();
+		assertFalse(ctxSrc.getAuthenticatedEnvForTest("user", "password").containsKey(
+				AbstractContextSource.SUN_LDAP_POOLING_FLAG));
+	}
 
-    // SEC-1145. Confirms that there is no issue here with pooling.
-    @Test(expected=AuthenticationException.class)
-    public void cantBindWithWrongPasswordImmediatelyAfterSuccessfulBind() throws Exception {
-        DirContext ctx = null;
-        try {
-            ctx = getContextSource().getContext("uid=Bob,ou=people,dc=springframework,dc=org", "bobspassword");
-        } catch (Exception e) {
-        }
-        assertNotNull(ctx);
-//        com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
-        ctx.close();
-//        com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
-        // Now get it gain, with wrong password. Should fail.
-        ctx = getContextSource().getContext("uid=Bob,ou=people,dc=springframework,dc=org", "wrongpassword");
-        ctx.close();
-    }
+	// SEC-1145. Confirms that there is no issue here with pooling.
+	@Test(expected = AuthenticationException.class)
+	public void cantBindWithWrongPasswordImmediatelyAfterSuccessfulBind()
+			throws Exception {
+		DirContext ctx = null;
+		try {
+			ctx = getContextSource().getContext(
+					"uid=Bob,ou=people,dc=springframework,dc=org", "bobspassword");
+		}
+		catch (Exception e) {
+		}
+		assertNotNull(ctx);
+		// com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
+		ctx.close();
+		// com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
+		// Now get it gain, with wrong password. Should fail.
+		ctx = getContextSource().getContext(
+				"uid=Bob,ou=people,dc=springframework,dc=org", "wrongpassword");
+		ctx.close();
+	}
 
-    @Test
-    public void serverUrlWithSpacesIsSupported() throws Exception {
-        DefaultSpringSecurityContextSource
-                contextSource = new DefaultSpringSecurityContextSource("ldap://127.0.0.1:" + ApacheDSServerIntegrationTests.getServerPort() + "/ou=space%20cadets,dc=springframework,dc=org");
-        contextSource.afterPropertiesSet();
-        contextSource.getContext("uid=space cadet,ou=space cadets,dc=springframework,dc=org", "spacecadetspassword");
-    }
+	@Test
+	public void serverUrlWithSpacesIsSupported() throws Exception {
+		DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
+				"ldap://127.0.0.1:" + ApacheDSServerIntegrationTests.getServerPort()
+						+ "/ou=space%20cadets,dc=springframework,dc=org");
+		contextSource.afterPropertiesSet();
+		contextSource.getContext(
+				"uid=space cadet,ou=space cadets,dc=springframework,dc=org",
+				"spacecadetspassword");
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void instantiationFailsWithEmptyServerList() throws Exception {
-        List<String> serverUrls = new ArrayList<String>();
-        DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(serverUrls, "dc=springframework,dc=org");
-        ctxSrc.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void instantiationFailsWithEmptyServerList() throws Exception {
+		List<String> serverUrls = new ArrayList<String>();
+		DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(
+				serverUrls, "dc=springframework,dc=org");
+		ctxSrc.afterPropertiesSet();
+	}
 
-    @Test
-    public void instantiationSuceedsWithProperServerList() throws Exception {
-        List<String> serverUrls = new ArrayList<String>();
-        serverUrls.add("ldap://foo:789");
-        serverUrls.add("ldap://bar:389");
-        serverUrls.add("ldaps://blah:636");
-        DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(serverUrls, "dc=springframework,dc=org");
+	@Test
+	public void instantiationSuceedsWithProperServerList() throws Exception {
+		List<String> serverUrls = new ArrayList<String>();
+		serverUrls.add("ldap://foo:789");
+		serverUrls.add("ldap://bar:389");
+		serverUrls.add("ldaps://blah:636");
+		DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(
+				serverUrls, "dc=springframework,dc=org");
 
-        assertFalse(ctxSrc.isAnonymousReadOnly());
-        assertTrue(ctxSrc.isPooled());
-    }
+		assertFalse(ctxSrc.isAnonymousReadOnly());
+		assertTrue(ctxSrc.isPooled());
+	}
 
-    // SEC-2308
-    @Test
-    public void instantiationSuceedsWithEmtpyBaseDn() throws Exception {
-        String baseDn = "";
-        List<String> serverUrls = new ArrayList<String>();
-        serverUrls.add("ldap://foo:789");
-        serverUrls.add("ldap://bar:389");
-        serverUrls.add("ldaps://blah:636");
-        DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(serverUrls, baseDn);
+	// SEC-2308
+	@Test
+	public void instantiationSuceedsWithEmtpyBaseDn() throws Exception {
+		String baseDn = "";
+		List<String> serverUrls = new ArrayList<String>();
+		serverUrls.add("ldap://foo:789");
+		serverUrls.add("ldap://bar:389");
+		serverUrls.add("ldaps://blah:636");
+		DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(
+				serverUrls, baseDn);
 
-        assertFalse(ctxSrc.isAnonymousReadOnly());
-        assertTrue(ctxSrc.isPooled());
-    }
+		assertFalse(ctxSrc.isAnonymousReadOnly());
+		assertTrue(ctxSrc.isPooled());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void instantiationFailsWithIncorrectServerUrl() throws Exception {
-        List<String> serverUrls = new ArrayList<String>();
-        // a simple trailing slash should be ok
-        serverUrls.add("ldaps://blah:636/");
-        // this url should be rejected because the root DN goes into a separate parameter
-        serverUrls.add("ldap://bar:389/dc=foobar,dc=org");
-        DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(serverUrls, "dc=springframework,dc=org");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void instantiationFailsWithIncorrectServerUrl() throws Exception {
+		List<String> serverUrls = new ArrayList<String>();
+		// a simple trailing slash should be ok
+		serverUrls.add("ldaps://blah:636/");
+		// this url should be rejected because the root DN goes into a separate parameter
+		serverUrls.add("ldap://bar:389/dc=foobar,dc=org");
+		DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource(
+				serverUrls, "dc=springframework,dc=org");
+	}
 
-    static class EnvExposingDefaultSpringSecurityContextSource extends DefaultSpringSecurityContextSource {
-        public EnvExposingDefaultSpringSecurityContextSource(String providerUrl) {
-            super(providerUrl);
-        }
+	static class EnvExposingDefaultSpringSecurityContextSource extends
+			DefaultSpringSecurityContextSource {
+		public EnvExposingDefaultSpringSecurityContextSource(String providerUrl) {
+			super(providerUrl);
+		}
 
-        @SuppressWarnings("unchecked")
-        Hashtable getAuthenticatedEnvForTest(String userDn, String password) {
-            return getAuthenticatedEnv(userDn, password);
-        }
-    }
+		@SuppressWarnings("unchecked")
+		Hashtable getAuthenticatedEnvForTest(String userDn, String password) {
+			return getAuthenticatedEnv(userDn, password);
+		}
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java
index 1116c76817..a667f52dda 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java
@@ -36,180 +36,180 @@ import org.springframework.security.crypto.codec.Utf8;
  * @author Luke Taylor
  */
 public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private SpringSecurityLdapTemplate template;
+	private SpringSecurityLdapTemplate template;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        template = new SpringSecurityLdapTemplate(getContextSource());
-    }
-
-    @Test
-    public void compareOfCorrectValueSucceeds() {
-        assertTrue(template.compare("uid=bob,ou=people", "uid", "bob"));
-    }
-
-    @Test
-    public void compareOfCorrectByteValueSucceeds() {
-        assertTrue(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("bobspassword")));
-    }
-
-    @Test
-    public void compareOfWrongByteValueFails() {
-        assertFalse(template.compare("uid=bob,ou=people", "userPassword", Utf8.encode("wrongvalue")));
-    }
-
-    @Test
-    public void compareOfWrongValueFails() {
-        assertFalse(template.compare("uid=bob,ou=people", "uid", "wrongvalue"));
-    }
-
-//    @Test
-//    public void testNameExistsForInValidNameFails() {
-//        assertFalse(template.nameExists("ou=doesntexist,dc=springframework,dc=org"));
-//    }
-//
-//    @Test
-//    public void testNameExistsForValidNameSucceeds() {
-//        assertTrue(template.nameExists("ou=groups,dc=springframework,dc=org"));
-//    }
-
-    @Test
-    public void namingExceptionIsTranslatedCorrectly() {
-        try {
-            template.executeReadOnly(new ContextExecutor() {
-                    public Object executeWithContext(DirContext dirContext) throws NamingException {
-                        throw new NamingException();
-                    }
-                });
-            fail("Expected UncategorizedLdapException on NamingException");
-        } catch (UncategorizedLdapException expected) {}
-    }
-
-    @Test
-    public void roleSearchReturnsCorrectNumberOfRoles() {
-        String param = "uid=ben,ou=people,dc=springframework,dc=org";
-
-        Set<String> values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] {param}, "ou");
-
-        assertEquals("Expected 3 results from search", 3, values.size());
-        assertTrue(values.contains("developer"));
-        assertTrue(values.contains("manager"));
-        assertTrue(values.contains("submanager"));
-    }
+	@Before
+	public void setUp() throws Exception {
+		template = new SpringSecurityLdapTemplate(getContextSource());
+	}
 
 	@Test
-    public void testMultiAttributeRetrievalWithNullAttributeNames() {
-        Set<Map<String, List<String>>> values =
-                template.searchForMultipleAttributeValues(
-                        "ou=people",
-                        "(uid={0})",
-                        new String[]{"bob"},
-                        null);
-        assertEquals(1, values.size());
-        Map<String, List<String>> record = values.iterator().next();
-        assertAttributeValue(record, "uid", "bob");
-        assertAttributeValue(record, "objectclass", "top", "person", "organizationalPerson", "inetOrgPerson");
-        assertAttributeValue(record, "cn", "Bob Hamilton");
-        assertAttributeValue(record, "sn", "Hamilton");
-        assertFalse(record.containsKey("userPassword"));
-    }
+	public void compareOfCorrectValueSucceeds() {
+		assertTrue(template.compare("uid=bob,ou=people", "uid", "bob"));
+	}
 
-    @Test
-    public void testMultiAttributeRetrievalWithZeroLengthAttributeNames() {
-        Set<Map<String, List<String>>> values =
-                template.searchForMultipleAttributeValues(
-                        "ou=people",
-                        "(uid={0})",
-                        new String[]{"bob"},
-                        new String[0]);
-        assertEquals(1, values.size());
-        Map<String, List<String>> record = values.iterator().next();
-        assertAttributeValue(record, "uid", "bob");
-        assertAttributeValue(record, "objectclass", "top", "person", "organizationalPerson", "inetOrgPerson");
-        assertAttributeValue(record, "cn", "Bob Hamilton");
-        assertAttributeValue(record, "sn", "Hamilton");
-        assertFalse(record.containsKey("userPassword"));
-    }
+	@Test
+	public void compareOfCorrectByteValueSucceeds() {
+		assertTrue(template.compare("uid=bob,ou=people", "userPassword",
+				Utf8.encode("bobspassword")));
+	}
 
-    @Test
-    public void testMultiAttributeRetrievalWithSpecifiedAttributeNames() {
-        Set<Map<String, List<String>>> values =
-                template.searchForMultipleAttributeValues(
-                        "ou=people",
-                        "(uid={0})",
-                        new String[]{"bob"},
-                        new String[]{
-                                "uid",
-                                "cn",
-                                "sn"
-                        });
-        assertEquals(1, values.size());
-        Map<String, List<String>> record = values.iterator().next();
-        assertAttributeValue(record, "uid", "bob");
-        assertAttributeValue(record, "cn", "Bob Hamilton");
-        assertAttributeValue(record, "sn", "Hamilton");
-        assertFalse(record.containsKey("userPassword"));
-        assertFalse(record.containsKey("objectclass"));
-    }
+	@Test
+	public void compareOfWrongByteValueFails() {
+		assertFalse(template.compare("uid=bob,ou=people", "userPassword",
+				Utf8.encode("wrongvalue")));
+	}
 
-    protected void assertAttributeValue(Map<String, List<String>> record, String attributeName, String... values) {
-        assertTrue(record.containsKey(attributeName));
-        assertEquals(values.length, record.get(attributeName).size());
-        for (int i = 0; i < values.length; i++) {
-            assertEquals(values[i], record.get(attributeName).get(i));
-        }
-    }
+	@Test
+	public void compareOfWrongValueFails() {
+		assertFalse(template.compare("uid=bob,ou=people", "uid", "wrongvalue"));
+	}
 
-    @Test
-    public void testRoleSearchForMissingAttributeFailsGracefully() {
-        String param = "uid=ben,ou=people,dc=springframework,dc=org";
+	// @Test
+	// public void testNameExistsForInValidNameFails() {
+	// assertFalse(template.nameExists("ou=doesntexist,dc=springframework,dc=org"));
+	// }
+	//
+	// @Test
+	// public void testNameExistsForValidNameSucceeds() {
+	// assertTrue(template.nameExists("ou=groups,dc=springframework,dc=org"));
+	// }
 
-        Set<String> values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] {param}, "mail");
+	@Test
+	public void namingExceptionIsTranslatedCorrectly() {
+		try {
+			template.executeReadOnly(new ContextExecutor() {
+				public Object executeWithContext(DirContext dirContext)
+						throws NamingException {
+					throw new NamingException();
+				}
+			});
+			fail("Expected UncategorizedLdapException on NamingException");
+		}
+		catch (UncategorizedLdapException expected) {
+		}
+	}
 
-        assertEquals(0, values.size());
-    }
+	@Test
+	public void roleSearchReturnsCorrectNumberOfRoles() {
+		String param = "uid=ben,ou=people,dc=springframework,dc=org";
 
-    @Test
-    public void roleSearchWithEscapedCharacterSucceeds() throws Exception {
-        String param = "cn=mouse\\, jerry,ou=people,dc=springframework,dc=org";
+		Set<String> values = template.searchForSingleAttributeValues("ou=groups",
+				"(member={0})", new String[] { param }, "ou");
 
-        Set<String> values = template.searchForSingleAttributeValues("ou=groups", "(member={0})", new String[] {param}, "cn");
+		assertEquals("Expected 3 results from search", 3, values.size());
+		assertTrue(values.contains("developer"));
+		assertTrue(values.contains("manager"));
+		assertTrue(values.contains("submanager"));
+	}
 
-        assertEquals(1, values.size());
-    }
+	@Test
+	public void testMultiAttributeRetrievalWithNullAttributeNames() {
+		Set<Map<String, List<String>>> values = template
+				.searchForMultipleAttributeValues("ou=people", "(uid={0})",
+						new String[] { "bob" }, null);
+		assertEquals(1, values.size());
+		Map<String, List<String>> record = values.iterator().next();
+		assertAttributeValue(record, "uid", "bob");
+		assertAttributeValue(record, "objectclass", "top", "person",
+				"organizationalPerson", "inetOrgPerson");
+		assertAttributeValue(record, "cn", "Bob Hamilton");
+		assertAttributeValue(record, "sn", "Hamilton");
+		assertFalse(record.containsKey("userPassword"));
+	}
 
-    @Test
-    public void nonSpringLdapSearchCodeTestMethod() throws Exception {
-        java.util.Hashtable<String, String> env = new java.util.Hashtable<String, String>();
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put(Context.PROVIDER_URL, "ldap://localhost:" + ApacheDSServerIntegrationTests.getServerPort());
-        env.put(Context.SECURITY_PRINCIPAL, "");
-        env.put(Context.SECURITY_CREDENTIALS, "");
+	@Test
+	public void testMultiAttributeRetrievalWithZeroLengthAttributeNames() {
+		Set<Map<String, List<String>>> values = template
+				.searchForMultipleAttributeValues("ou=people", "(uid={0})",
+						new String[] { "bob" }, new String[0]);
+		assertEquals(1, values.size());
+		Map<String, List<String>> record = values.iterator().next();
+		assertAttributeValue(record, "uid", "bob");
+		assertAttributeValue(record, "objectclass", "top", "person",
+				"organizationalPerson", "inetOrgPerson");
+		assertAttributeValue(record, "cn", "Bob Hamilton");
+		assertAttributeValue(record, "sn", "Hamilton");
+		assertFalse(record.containsKey("userPassword"));
+	}
 
-        DirContext ctx = new javax.naming.directory.InitialDirContext(env);
-        SearchControls controls = new SearchControls();
-        controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-        controls.setReturningObjFlag(true);
-        controls.setReturningAttributes(null);
-        String param = "cn=mouse\\, jerry,ou=people,dc=springframework,dc=org";
+	@Test
+	public void testMultiAttributeRetrievalWithSpecifiedAttributeNames() {
+		Set<Map<String, List<String>>> values = template
+				.searchForMultipleAttributeValues("ou=people", "(uid={0})",
+						new String[] { "bob" }, new String[] { "uid", "cn", "sn" });
+		assertEquals(1, values.size());
+		Map<String, List<String>> record = values.iterator().next();
+		assertAttributeValue(record, "uid", "bob");
+		assertAttributeValue(record, "cn", "Bob Hamilton");
+		assertAttributeValue(record, "sn", "Hamilton");
+		assertFalse(record.containsKey("userPassword"));
+		assertFalse(record.containsKey("objectclass"));
+	}
 
-        javax.naming.NamingEnumeration<SearchResult> results =
-            ctx.search("ou=groups,dc=springframework,dc=org",
-                    "(member={0})", new String[] {param},
-                    controls);
+	protected void assertAttributeValue(Map<String, List<String>> record,
+			String attributeName, String... values) {
+		assertTrue(record.containsKey(attributeName));
+		assertEquals(values.length, record.get(attributeName).size());
+		for (int i = 0; i < values.length; i++) {
+			assertEquals(values[i], record.get(attributeName).get(i));
+		}
+	}
 
-        assertTrue("Expected a result", results.hasMore());
-    }
+	@Test
+	public void testRoleSearchForMissingAttributeFailsGracefully() {
+		String param = "uid=ben,ou=people,dc=springframework,dc=org";
 
-    @Test
-    public void searchForSingleEntryWithEscapedCharsInDnSucceeds() {
-        String param = "mouse, jerry";
+		Set<String> values = template.searchForSingleAttributeValues("ou=groups",
+				"(member={0})", new String[] { param }, "mail");
 
-        template.searchForSingleEntry("ou=people", "(cn={0})", new String[] {param});
-    }
+		assertEquals(0, values.size());
+	}
+
+	@Test
+	public void roleSearchWithEscapedCharacterSucceeds() throws Exception {
+		String param = "cn=mouse\\, jerry,ou=people,dc=springframework,dc=org";
+
+		Set<String> values = template.searchForSingleAttributeValues("ou=groups",
+				"(member={0})", new String[] { param }, "cn");
+
+		assertEquals(1, values.size());
+	}
+
+	@Test
+	public void nonSpringLdapSearchCodeTestMethod() throws Exception {
+		java.util.Hashtable<String, String> env = new java.util.Hashtable<String, String>();
+		env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+		env.put(Context.PROVIDER_URL, "ldap://localhost:"
+				+ ApacheDSServerIntegrationTests.getServerPort());
+		env.put(Context.SECURITY_PRINCIPAL, "");
+		env.put(Context.SECURITY_CREDENTIALS, "");
+
+		DirContext ctx = new javax.naming.directory.InitialDirContext(env);
+		SearchControls controls = new SearchControls();
+		controls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+		controls.setReturningObjFlag(true);
+		controls.setReturningAttributes(null);
+		String param = "cn=mouse\\, jerry,ou=people,dc=springframework,dc=org";
+
+		javax.naming.NamingEnumeration<SearchResult> results = ctx.search(
+				"ou=groups,dc=springframework,dc=org", "(member={0})",
+				new String[] { param }, controls);
+
+		assertTrue("Expected a result", results.hasMore());
+	}
+
+	@Test
+	public void searchForSingleEntryWithEscapedCharsInDnSucceeds() {
+		String param = "mouse, jerry";
+
+		template.searchForSingleEntry("ou=people", "(cn={0})", new String[] { param });
+	}
 
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java
index 69a1ac0f10..a31a8700ad 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java
@@ -32,99 +32,115 @@ import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
  * @author Luke Taylor
  */
 public class BindAuthenticatorTests extends AbstractLdapIntegrationTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private BindAuthenticator authenticator;
-    private Authentication bob;
+	private BindAuthenticator authenticator;
+	private Authentication bob;
 
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	@Before
+	public void setUp() {
+		authenticator = new BindAuthenticator(getContextSource());
+		authenticator.setMessageSource(new SpringSecurityMessageSource());
+		bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
 
-    @Before
-    public void setUp() {
-        authenticator = new BindAuthenticator(getContextSource());
-        authenticator.setMessageSource(new SpringSecurityMessageSource());
-        bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
+	}
 
-    }
+	@Test(expected = BadCredentialsException.class)
+	public void emptyPasswordIsRejected() {
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("jen", ""));
+	}
 
-    @Test(expected=BadCredentialsException.class)
-    public void emptyPasswordIsRejected() {
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("jen", ""));
-    }
+	@Test
+	public void testAuthenticationWithCorrectPasswordSucceeds() {
+		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people",
+				"cn={0},ou=people" });
 
-    @Test
-    public void testAuthenticationWithCorrectPasswordSucceeds() {
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=people", "cn={0},ou=people"});
+		DirContextOperations user = authenticator.authenticate(bob);
+		assertEquals("bob", user.getStringAttribute("uid"));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken(
+				"mouse, jerry", "jerryspassword"));
+	}
 
-        DirContextOperations user = authenticator.authenticate(bob);
-        assertEquals("bob", user.getStringAttribute("uid"));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("mouse, jerry", "jerryspassword"));
-    }
+	@Test
+	public void testAuthenticationWithInvalidUserNameFails() {
+		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" });
 
-    @Test
-    public void testAuthenticationWithInvalidUserNameFails() {
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=people"});
+		try {
+			authenticator.authenticate(new UsernamePasswordAuthenticationToken(
+					"nonexistentsuser", "password"));
+			fail("Shouldn't be able to bind with invalid username");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-        try {
-            authenticator.authenticate(new UsernamePasswordAuthenticationToken("nonexistentsuser", "password"));
-            fail("Shouldn't be able to bind with invalid username");
-        } catch (BadCredentialsException expected) {}
-    }
+	@Test
+	public void testAuthenticationWithUserSearch() throws Exception {
+		// DirContextAdapter ctx = new DirContextAdapter(new
+		// DistinguishedName("uid=bob,ou=people"));
+		authenticator.setUserSearch(new FilterBasedLdapUserSearch("ou=people",
+				"(uid={0})", getContextSource()));
+		authenticator.afterPropertiesSet();
+		authenticator.authenticate(bob);
+		// SEC-1444
+		authenticator.setUserSearch(new FilterBasedLdapUserSearch("ou=people",
+				"(cn={0})", getContextSource()));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken(
+				"mouse, jerry", "jerryspassword"));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("slash/guy",
+				"slashguyspassword"));
+		// SEC-1661
+		authenticator.setUserSearch(new FilterBasedLdapUserSearch(
+				"ou=\\\"quoted people\\\"", "(cn={0})", getContextSource()));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("quote\"guy",
+				"quoteguyspassword"));
+		authenticator.setUserSearch(new FilterBasedLdapUserSearch("", "(cn={0})",
+				getContextSource()));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("quote\"guy",
+				"quoteguyspassword"));
+	}
 
-    @Test
-    public void testAuthenticationWithUserSearch() throws Exception {
-        //DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=bob,ou=people"));
-        authenticator.setUserSearch(new FilterBasedLdapUserSearch("ou=people", "(uid={0})", getContextSource()));
-        authenticator.afterPropertiesSet();
-        authenticator.authenticate(bob);
-        // SEC-1444
-        authenticator.setUserSearch(new FilterBasedLdapUserSearch("ou=people", "(cn={0})", getContextSource()));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("mouse, jerry", "jerryspassword"));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("slash/guy", "slashguyspassword"));
-        // SEC-1661
-        authenticator.setUserSearch(new FilterBasedLdapUserSearch("ou=\\\"quoted people\\\"", "(cn={0})", getContextSource()));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("quote\"guy", "quoteguyspassword"));
-        authenticator.setUserSearch(new FilterBasedLdapUserSearch("", "(cn={0})", getContextSource()));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("quote\"guy", "quoteguyspassword"));
-    }
-/*
-    @Test
-    public void messingWithEscapedChars() throws Exception {
-        Hashtable<String,String> env = new Hashtable<String,String>();
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put(Context.PROVIDER_URL, "ldap://127.0.0.1:22389/dc=springsource,dc=com");
-        env.put(Context.SECURITY_AUTHENTICATION, "simple");
-        env.put(Context.SECURITY_PRINCIPAL, "cn=admin,dc=springsource,dc=com");
-        env.put(Context.SECURITY_CREDENTIALS, "password");
+	/*
+	 * @Test public void messingWithEscapedChars() throws Exception {
+	 * Hashtable<String,String> env = new Hashtable<String,String>();
+	 * env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+	 * env.put(Context.PROVIDER_URL, "ldap://127.0.0.1:22389/dc=springsource,dc=com");
+	 * env.put(Context.SECURITY_AUTHENTICATION, "simple");
+	 * env.put(Context.SECURITY_PRINCIPAL, "cn=admin,dc=springsource,dc=com");
+	 * env.put(Context.SECURITY_CREDENTIALS, "password");
+	 * 
+	 * InitialDirContext idc = new InitialDirContext(env); SearchControls searchControls =
+	 * new SearchControls(); searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+	 * DistinguishedName baseDn = new DistinguishedName("ou=\\\"quoted people\\\"");
+	 * NamingEnumeration<SearchResult> matches = idc.search(baseDn, "(cn=*)", new Object[]
+	 * {"quoteguy"}, searchControls);
+	 * 
+	 * while(matches.hasMore()) { SearchResult match = matches.next(); DistinguishedName
+	 * dn = new DistinguishedName(match.getName()); System.out.println("**** Match: " +
+	 * match.getName() + " ***** " + dn);
+	 * 
+	 * } }
+	 */
+	@Test
+	public void testAuthenticationWithWrongPasswordFails() {
+		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" });
 
-        InitialDirContext idc = new InitialDirContext(env);
-        SearchControls searchControls = new SearchControls();
-        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-        DistinguishedName baseDn = new DistinguishedName("ou=\\\"quoted people\\\"");
-        NamingEnumeration<SearchResult> matches = idc.search(baseDn, "(cn=*)", new Object[] {"quoteguy"}, searchControls);
+		try {
+			authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob",
+					"wrongpassword"));
+			fail("Shouldn't be able to bind with wrong password");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-        while(matches.hasMore()) {
-            SearchResult match = matches.next();
-            DistinguishedName dn = new DistinguishedName(match.getName());
-            System.out.println("**** Match: " + match.getName() + " ***** " + dn);
-
-        }
-    }
-*/
-    @Test
-    public void testAuthenticationWithWrongPasswordFails() {
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=people"});
-
-        try {
-            authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "wrongpassword"));
-            fail("Shouldn't be able to bind with wrong password");
-        } catch (BadCredentialsException expected) {}
-    }
-
-    @Test
-    public void testUserDnPatternReturnsCorrectDn() {
-        authenticator.setUserDnPatterns(new String[] {"cn={0},ou=people"});
-        assertEquals("cn=Joe,ou=people", authenticator.getUserDns("Joe").get(0));
-    }
+	@Test
+	public void testUserDnPatternReturnsCorrectDn() {
+		authenticator.setUserDnPatterns(new String[] { "cn={0},ou=people" });
+		assertEquals("cn=Joe,ou=people", authenticator.getUserDns("Joe").get(0));
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java
index da98e01626..d68dd16af6 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorTests.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.ldap.authentication;
 
-
 import org.junit.*;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -26,7 +25,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.ldap.AbstractLdapIntegrationTests;
 
-
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DistinguishedName;
 
@@ -38,107 +36,120 @@ import static org.junit.Assert.*;
  * @author Luke Taylor
  */
 public class PasswordComparisonAuthenticatorTests extends AbstractLdapIntegrationTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PasswordComparisonAuthenticator authenticator;
-    private Authentication bob;
-    private Authentication ben;
+	private PasswordComparisonAuthenticator authenticator;
+	private Authentication bob;
+	private Authentication ben;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        authenticator = new PasswordComparisonAuthenticator(getContextSource());
-        authenticator.setPasswordEncoder(new PlaintextPasswordEncoder());
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=people"});
-        bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
-        ben = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-    }
+	@Before
+	public void setUp() throws Exception {
+		authenticator = new PasswordComparisonAuthenticator(getContextSource());
+		authenticator.setPasswordEncoder(new PlaintextPasswordEncoder());
+		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=people" });
+		bob = new UsernamePasswordAuthenticationToken("bob", "bobspassword");
+		ben = new UsernamePasswordAuthenticationToken("ben", "benspassword");
+	}
 
-    @Test
-    public void testAllAttributesAreRetrievedByDefault() {
-        DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob);
-        //System.out.println(user.getAttributes().toString());
-        assertEquals("User should have 5 attributes", 5, user.getAttributes().size());
-    }
+	@Test
+	public void testAllAttributesAreRetrievedByDefault() {
+		DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob);
+		// System.out.println(user.getAttributes().toString());
+		assertEquals("User should have 5 attributes", 5, user.getAttributes().size());
+	}
 
-    @Test
-    public void testFailedSearchGivesUserNotFoundException() throws Exception {
-        authenticator = new PasswordComparisonAuthenticator(getContextSource());
-        assertTrue("User DN matches shouldn't be available", authenticator.getUserDns("Bob").isEmpty());
-        authenticator.setUserSearch(new MockUserSearch(null));
-        authenticator.afterPropertiesSet();
+	@Test
+	public void testFailedSearchGivesUserNotFoundException() throws Exception {
+		authenticator = new PasswordComparisonAuthenticator(getContextSource());
+		assertTrue("User DN matches shouldn't be available",
+				authenticator.getUserDns("Bob").isEmpty());
+		authenticator.setUserSearch(new MockUserSearch(null));
+		authenticator.afterPropertiesSet();
 
-        try {
-            authenticator.authenticate(new UsernamePasswordAuthenticationToken("Joe", "pass"));
-            fail("Expected exception on failed user search");
-        } catch (UsernameNotFoundException expected) {}
-    }
+		try {
+			authenticator.authenticate(new UsernamePasswordAuthenticationToken("Joe",
+					"pass"));
+			fail("Expected exception on failed user search");
+		}
+		catch (UsernameNotFoundException expected) {
+		}
+	}
 
-    @Test(expected = BadCredentialsException.class)
-    public void testLdapPasswordCompareFailsWithWrongPassword() {
-       // Don't retrieve the password
-        authenticator.setUserAttributes(new String[] {"uid", "cn", "sn"});
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "wrongpass"));
-    }
+	@Test(expected = BadCredentialsException.class)
+	public void testLdapPasswordCompareFailsWithWrongPassword() {
+		// Don't retrieve the password
+		authenticator.setUserAttributes(new String[] { "uid", "cn", "sn" });
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob",
+				"wrongpass"));
+	}
 
-    @Test
-    public void testMultipleDnPatternsWorkOk() {
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=nonexistent", "uid={0},ou=people"});
-        authenticator.authenticate(bob);
-    }
+	@Test
+	public void testMultipleDnPatternsWorkOk() {
+		authenticator.setUserDnPatterns(new String[] { "uid={0},ou=nonexistent",
+				"uid={0},ou=people" });
+		authenticator.authenticate(bob);
+	}
 
-    @Test
-    public void testOnlySpecifiedAttributesAreRetrieved() throws Exception {
-        authenticator.setUserAttributes(new String[] {"uid", "userPassword"});
+	@Test
+	public void testOnlySpecifiedAttributesAreRetrieved() throws Exception {
+		authenticator.setUserAttributes(new String[] { "uid", "userPassword" });
 
-        DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob);
-        assertEquals("Should have retrieved 2 attribute (uid, userPassword)", 2, user.getAttributes().size());
-    }
+		DirContextAdapter user = (DirContextAdapter) authenticator.authenticate(bob);
+		assertEquals("Should have retrieved 2 attribute (uid, userPassword)", 2, user
+				.getAttributes().size());
+	}
 
-    @Test
-    public void testLdapCompareSucceedsWithCorrectPassword() {
-        // Don't retrieve the password
-        authenticator.setUserAttributes(new String[] {"uid"});
-        authenticator.authenticate(bob);
-    }
+	@Test
+	public void testLdapCompareSucceedsWithCorrectPassword() {
+		// Don't retrieve the password
+		authenticator.setUserAttributes(new String[] { "uid" });
+		authenticator.authenticate(bob);
+	}
 
-    @Test
-    public void testLdapCompareSucceedsWithShaEncodedPassword() {
-        // Don't retrieve the password
-        authenticator.setUserAttributes(new String[] {"uid"});
-        authenticator.setPasswordEncoder(new LdapShaPasswordEncoder());
-        authenticator.authenticate(ben);
-    }
+	@Test
+	public void testLdapCompareSucceedsWithShaEncodedPassword() {
+		// Don't retrieve the password
+		authenticator.setUserAttributes(new String[] { "uid" });
+		authenticator.setPasswordEncoder(new LdapShaPasswordEncoder());
+		authenticator.authenticate(ben);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testPasswordEncoderCantBeNull() {
-        authenticator.setPasswordEncoder((PasswordEncoder)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testPasswordEncoderCantBeNull() {
+		authenticator.setPasswordEncoder((PasswordEncoder) null);
+	}
 
-    @Test
-    public void testUseOfDifferentPasswordAttributeSucceeds() {
-        authenticator.setPasswordAttributeName("uid");
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "bob"));
-    }
+	@Test
+	public void testUseOfDifferentPasswordAttributeSucceeds() {
+		authenticator.setPasswordAttributeName("uid");
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("bob", "bob"));
+	}
 
-    @Test
-    public void testLdapCompareWithDifferentPasswordAttributeSucceeds() {
-        authenticator.setUserAttributes(new String[] {"uid"});
-        authenticator.setPasswordAttributeName("cn");
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("ben", "Ben Alex"));
-    }
+	@Test
+	public void testLdapCompareWithDifferentPasswordAttributeSucceeds() {
+		authenticator.setUserAttributes(new String[] { "uid" });
+		authenticator.setPasswordAttributeName("cn");
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("ben",
+				"Ben Alex"));
+	}
 
-    @Test
-    public void testWithUserSearch() {
-        authenticator = new PasswordComparisonAuthenticator(getContextSource());
-        authenticator.setPasswordEncoder(new PlaintextPasswordEncoder());
-        assertTrue("User DN matches shouldn't be available", authenticator.getUserDns("Bob").isEmpty());
+	@Test
+	public void testWithUserSearch() {
+		authenticator = new PasswordComparisonAuthenticator(getContextSource());
+		authenticator.setPasswordEncoder(new PlaintextPasswordEncoder());
+		assertTrue("User DN matches shouldn't be available",
+				authenticator.getUserDns("Bob").isEmpty());
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=Bob,ou=people"));
-        ctx.setAttributeValue("userPassword", "bobspassword");
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"uid=Bob,ou=people"));
+		ctx.setAttributeValue("userPassword", "bobspassword");
 
-        authenticator.setUserSearch(new MockUserSearch(ctx));
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("shouldntbeused", "bobspassword"));
-    }
+		authenticator.setUserSearch(new MockUserSearch(ctx));
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken(
+				"shouldntbeused", "bobspassword"));
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
index 0303f8ea34..1b184fd3fa 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearchTests.java
@@ -32,70 +32,78 @@ import org.springframework.security.ldap.AbstractLdapIntegrationTests;
  */
 public class FilterBasedLdapUserSearchTests extends AbstractLdapIntegrationTests {
 
-    @Test
-    public void basicSearchSucceeds() throws Exception {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people", "(uid={0})", getContextSource());
-        locator.setSearchSubtree(false);
-        locator.setSearchTimeLimit(0);
-        locator.setDerefLinkFlag(false);
+	@Test
+	public void basicSearchSucceeds() throws Exception {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people",
+				"(uid={0})", getContextSource());
+		locator.setSearchSubtree(false);
+		locator.setSearchTimeLimit(0);
+		locator.setDerefLinkFlag(false);
 
-        DirContextOperations bob = locator.searchForUser("bob");
-        assertEquals("bob", bob.getStringAttribute("uid"));
+		DirContextOperations bob = locator.searchForUser("bob");
+		assertEquals("bob", bob.getStringAttribute("uid"));
 
-        assertEquals(new LdapName("uid=bob,ou=people"), bob.getDn());
-    }
+		assertEquals(new LdapName("uid=bob,ou=people"), bob.getDn());
+	}
 
-    @Test
-    public void searchForNameWithCommaSucceeds() throws Exception {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people", "(uid={0})", getContextSource());
-        locator.setSearchSubtree(false);
+	@Test
+	public void searchForNameWithCommaSucceeds() throws Exception {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people",
+				"(uid={0})", getContextSource());
+		locator.setSearchSubtree(false);
 
-        DirContextOperations jerry = locator.searchForUser("jerry");
-        assertEquals("jerry", jerry.getStringAttribute("uid"));
+		DirContextOperations jerry = locator.searchForUser("jerry");
+		assertEquals("jerry", jerry.getStringAttribute("uid"));
 
-        assertEquals(new LdapName("cn=mouse\\, jerry,ou=people"), jerry.getDn());
-    }
+		assertEquals(new LdapName("cn=mouse\\, jerry,ou=people"), jerry.getDn());
+	}
 
-    // Try some funny business with filters.
-    @Test
-    public void extraFilterPartToExcludeBob() throws Exception {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people",
-                "(&(cn=*)(!(|(uid={0})(uid=rod)(uid=jerry)(uid=slashguy)(uid=javadude)(uid=groovydude)(uid=closuredude)(uid=scaladude))))", getContextSource());
+	// Try some funny business with filters.
+	@Test
+	public void extraFilterPartToExcludeBob() throws Exception {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch(
+				"ou=people",
+				"(&(cn=*)(!(|(uid={0})(uid=rod)(uid=jerry)(uid=slashguy)(uid=javadude)(uid=groovydude)(uid=closuredude)(uid=scaladude))))",
+				getContextSource());
 
-        // Search for bob, get back ben...
-        DirContextOperations ben = locator.searchForUser("bob");
-        assertEquals("Ben Alex", ben.getStringAttribute("cn"));
-    }
+		// Search for bob, get back ben...
+		DirContextOperations ben = locator.searchForUser("bob");
+		assertEquals("Ben Alex", ben.getStringAttribute("cn"));
+	}
 
-    @Test(expected=IncorrectResultSizeDataAccessException.class)
-    public void searchFailsOnMultipleMatches() {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people", "(cn=*)", getContextSource());
-        locator.searchForUser("Ignored");
-    }
+	@Test(expected = IncorrectResultSizeDataAccessException.class)
+	public void searchFailsOnMultipleMatches() {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people",
+				"(cn=*)", getContextSource());
+		locator.searchForUser("Ignored");
+	}
 
-    @Test(expected=UsernameNotFoundException.class)
-    public void searchForInvalidUserFails() {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people", "(uid={0})", getContextSource());
-        locator.searchForUser("Joe");
-    }
+	@Test(expected = UsernameNotFoundException.class)
+	public void searchForInvalidUserFails() {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=people",
+				"(uid={0})", getContextSource());
+		locator.searchForUser("Joe");
+	}
 
-    @Test
-    public void subTreeSearchSucceeds() throws Exception {
-        // Don't set the searchBase, so search from the root.
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("", "(cn={0})", getContextSource());
-        locator.setSearchSubtree(true);
+	@Test
+	public void subTreeSearchSucceeds() throws Exception {
+		// Don't set the searchBase, so search from the root.
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("", "(cn={0})",
+				getContextSource());
+		locator.setSearchSubtree(true);
 
-        DirContextOperations ben = locator.searchForUser("Ben Alex");
-        assertEquals("ben", ben.getStringAttribute("uid"));
+		DirContextOperations ben = locator.searchForUser("Ben Alex");
+		assertEquals("ben", ben.getStringAttribute("uid"));
 
-        assertEquals(new LdapName("uid=ben,ou=people"), ben.getDn());
-    }
+		assertEquals(new LdapName("uid=ben,ou=people"), ben.getDn());
+	}
 
-    @Test
-    public void searchWithDifferentSearchBaseIsSuccessful() throws Exception {
-        FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch("ou=otherpeople", "(cn={0})", getContextSource());
-        DirContextOperations joe = locator.searchForUser("Joe Smeth");
-        assertEquals("Joe Smeth", joe.getStringAttribute("cn"));
-    }
+	@Test
+	public void searchWithDifferentSearchBaseIsSuccessful() throws Exception {
+		FilterBasedLdapUserSearch locator = new FilterBasedLdapUserSearch(
+				"ou=otherpeople", "(cn={0})", getContextSource());
+		DirContextOperations joe = locator.searchForUser("Joe Smeth");
+		assertEquals("Joe Smeth", joe.getStringAttribute("cn"));
+	}
 
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java
index a3a8fa08dc..a41ed30aa8 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java
@@ -33,65 +33,82 @@ import org.junit.Test;
  */
 public class ApacheDSContainerTests {
 
-    // SEC-2162
-    @Test
-    public void failsToStartThrowsException() throws Exception {
-        ApacheDSContainer server1 = new ApacheDSContainer("dc=springframework,dc=org", "classpath:test-server.ldif");
-        ApacheDSContainer server2 = new ApacheDSContainer("dc=springframework,dc=org", "classpath:missing.ldif");
-        List<Integer> ports = getDefaultPorts(1);
-        server1.setPort(ports.get(0));
-        server2.setPort(ports.get(0));
-        try {
-            server1.afterPropertiesSet();
-            try {
-                server2.afterPropertiesSet();
-                fail("Expected Exception");
-            } catch(RuntimeException success) {}
-        } finally {
-            try {
-                server1.destroy();
-            }catch(Throwable t) {}
-            try {
-                server2.destroy();
-            }catch(Throwable t) {}
-        }
-    }
+	// SEC-2162
+	@Test
+	public void failsToStartThrowsException() throws Exception {
+		ApacheDSContainer server1 = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:test-server.ldif");
+		ApacheDSContainer server2 = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:missing.ldif");
+		List<Integer> ports = getDefaultPorts(1);
+		server1.setPort(ports.get(0));
+		server2.setPort(ports.get(0));
+		try {
+			server1.afterPropertiesSet();
+			try {
+				server2.afterPropertiesSet();
+				fail("Expected Exception");
+			}
+			catch (RuntimeException success) {
+			}
+		}
+		finally {
+			try {
+				server1.destroy();
+			}
+			catch (Throwable t) {
+			}
+			try {
+				server2.destroy();
+			}
+			catch (Throwable t) {
+			}
+		}
+	}
 
-    // SEC-2161
-    @Test
-    public void multipleInstancesSimultanciously() throws Exception {
-        ApacheDSContainer server1 = new ApacheDSContainer("dc=springframework,dc=org", "classpath:test-server.ldif");
-        ApacheDSContainer server2 = new ApacheDSContainer("dc=springframework,dc=org", "classpath:test-server.ldif");
-        List<Integer> ports = getDefaultPorts(2);
-        server1.setPort(ports.get(0));
-        server2.setPort(ports.get(1));
-        try {
-            server1.afterPropertiesSet();
-            server2.afterPropertiesSet();
-        } finally {
-            try {
-                server1.destroy();
-            }catch(Throwable t) {}
-            try {
-                server2.destroy();
-            }catch(Throwable t) {}
-        }
-    }
+	// SEC-2161
+	@Test
+	public void multipleInstancesSimultanciously() throws Exception {
+		ApacheDSContainer server1 = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:test-server.ldif");
+		ApacheDSContainer server2 = new ApacheDSContainer("dc=springframework,dc=org",
+				"classpath:test-server.ldif");
+		List<Integer> ports = getDefaultPorts(2);
+		server1.setPort(ports.get(0));
+		server2.setPort(ports.get(1));
+		try {
+			server1.afterPropertiesSet();
+			server2.afterPropertiesSet();
+		}
+		finally {
+			try {
+				server1.destroy();
+			}
+			catch (Throwable t) {
+			}
+			try {
+				server2.destroy();
+			}
+			catch (Throwable t) {
+			}
+		}
+	}
 
-    private List<Integer> getDefaultPorts(int count) throws IOException {
-        List<ServerSocket> connections = new ArrayList<ServerSocket>();
-        List<Integer> availablePorts = new ArrayList<Integer>(count);
-        try {
-            for(int i=0;i<count;i++) {
-                ServerSocket socket = new ServerSocket(0);
-                connections.add(socket);
-                availablePorts.add(socket.getLocalPort());
-            }
-            return availablePorts;
-        } finally {
-            for(ServerSocket conn : connections) {
-                conn.close();
-            }
-        }
-    }
+	private List<Integer> getDefaultPorts(int count) throws IOException {
+		List<ServerSocket> connections = new ArrayList<ServerSocket>();
+		List<Integer> availablePorts = new ArrayList<Integer>(count);
+		try {
+			for (int i = 0; i < count; i++) {
+				ServerSocket socket = new ServerSocket(0);
+				connections.add(socket);
+				availablePorts.add(socket.getLocalPort());
+			}
+			return availablePorts;
+		}
+		finally {
+			for (ServerSocket conn : connections) {
+				conn.close();
+			}
+		}
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java
index 3c1c085b75..4b899318cb 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.ldap.userdetails;
 
-
 import static org.junit.Assert.*;
 
 import org.junit.*;
@@ -28,134 +27,149 @@ import org.springframework.security.ldap.AbstractLdapIntegrationTests;
 
 import java.util.*;
 
-
 /**
  *
  * @author Luke Taylor
  */
-@SuppressWarnings({"deprecation"})
+@SuppressWarnings({ "deprecation" })
 public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegrationTests {
-    private DefaultLdapAuthoritiesPopulator populator;
-    //~ Methods ========================================================================================================
+	private DefaultLdapAuthoritiesPopulator populator;
 
-    @Before
-    public void setUp() throws Exception {
-        populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), "ou=groups");
-        populator.setIgnorePartialResultException(false);
-    }
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void defaultRoleIsAssignedWhenSet() {
-        populator.setDefaultRole("ROLE_USER");
-        assertSame(getContextSource(), populator.getContextSource());
+	@Before
+	public void setUp() throws Exception {
+		populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), "ou=groups");
+		populator.setIgnorePartialResultException(false);
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("cn=notfound"));
+	@Test
+	public void defaultRoleIsAssignedWhenSet() {
+		populator.setDefaultRole("ROLE_USER");
+		assertSame(getContextSource(), populator.getContextSource());
 
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "notfound");
-        assertEquals(1, authorities.size());
-        assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER"));
-    }
+		DirContextAdapter ctx = new DirContextAdapter(
+				new DistinguishedName("cn=notfound"));
 
-    @Test
-    public void nullSearchBaseIsAccepted() throws Exception {
-        populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), null);
-        populator.setDefaultRole("ROLE_USER");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"notfound");
+		assertEquals(1, authorities.size());
+		assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER"));
+	}
 
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(
-                new DirContextAdapter(new DistinguishedName("cn=notused")), "notused");
-        assertEquals(1, authorities.size());
-        assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER"));
-    }
+	@Test
+	public void nullSearchBaseIsAccepted() throws Exception {
+		populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), null);
+		populator.setDefaultRole("ROLE_USER");
 
-    @Test
-    public void groupSearchReturnsExpectedRoles() {
-        populator.setRolePrefix("ROLE_");
-        populator.setGroupRoleAttribute("ou");
-        populator.setSearchSubtree(true);
-        populator.setSearchSubtree(false);
-        populator.setConvertToUpperCase(true);
-        populator.setGroupSearchFilter("(member={0})");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(
+				new DirContextAdapter(new DistinguishedName("cn=notused")), "notused");
+		assertEquals(1, authorities.size());
+		assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_USER"));
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org"));
+	@Test
+	public void groupSearchReturnsExpectedRoles() {
+		populator.setRolePrefix("ROLE_");
+		populator.setGroupRoleAttribute("ou");
+		populator.setSearchSubtree(true);
+		populator.setSearchSubtree(false);
+		populator.setConvertToUpperCase(true);
+		populator.setGroupSearchFilter("(member={0})");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "ben"));
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"uid=ben,ou=people,dc=springframework,dc=org"));
 
-        assertEquals("Should have 2 roles", 2, authorities.size());
+		Set<String> authorities = AuthorityUtils.authorityListToSet(populator
+				.getGrantedAuthorities(ctx, "ben"));
 
-        assertTrue(authorities.contains("ROLE_DEVELOPER"));
-        assertTrue(authorities.contains("ROLE_MANAGER"));
-    }
+		assertEquals("Should have 2 roles", 2, authorities.size());
 
-    @Test
-    public void useOfUsernameParameterReturnsExpectedRoles() {
-        populator.setGroupRoleAttribute("ou");
-        populator.setConvertToUpperCase(true);
-        populator.setGroupSearchFilter("(ou={1})");
+		assertTrue(authorities.contains("ROLE_DEVELOPER"));
+		assertTrue(authorities.contains("ROLE_MANAGER"));
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org"));
+	@Test
+	public void useOfUsernameParameterReturnsExpectedRoles() {
+		populator.setGroupRoleAttribute("ou");
+		populator.setConvertToUpperCase(true);
+		populator.setGroupSearchFilter("(ou={1})");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager"));
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"uid=ben,ou=people,dc=springframework,dc=org"));
 
-        assertEquals("Should have 1 role", 1, authorities.size());
-        assertTrue(authorities.contains("ROLE_MANAGER"));
-    }
+		Set<String> authorities = AuthorityUtils.authorityListToSet(populator
+				.getGrantedAuthorities(ctx, "manager"));
 
-    @Test
-    public void subGroupRolesAreNotFoundByDefault() {
-        populator.setGroupRoleAttribute("ou");
-        populator.setConvertToUpperCase(true);
+		assertEquals("Should have 1 role", 1, authorities.size());
+		assertTrue(authorities.contains("ROLE_MANAGER"));
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org"));
+	@Test
+	public void subGroupRolesAreNotFoundByDefault() {
+		populator.setGroupRoleAttribute("ou");
+		populator.setConvertToUpperCase(true);
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager"));
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"uid=ben,ou=people,dc=springframework,dc=org"));
 
-        assertEquals("Should have 2 roles", 2, authorities.size());
-        assertTrue(authorities.contains("ROLE_MANAGER"));
-        assertTrue(authorities.contains("ROLE_DEVELOPER"));
-    }
+		Set<String> authorities = AuthorityUtils.authorityListToSet(populator
+				.getGrantedAuthorities(ctx, "manager"));
 
-    @Test
-    public void subGroupRolesAreFoundWhenSubtreeSearchIsEnabled() {
-        populator.setGroupRoleAttribute("ou");
-        populator.setConvertToUpperCase(true);
-        populator.setSearchSubtree(true);
+		assertEquals("Should have 2 roles", 2, authorities.size());
+		assertTrue(authorities.contains("ROLE_MANAGER"));
+		assertTrue(authorities.contains("ROLE_DEVELOPER"));
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("uid=ben,ou=people,dc=springframework,dc=org"));
+	@Test
+	public void subGroupRolesAreFoundWhenSubtreeSearchIsEnabled() {
+		populator.setGroupRoleAttribute("ou");
+		populator.setConvertToUpperCase(true);
+		populator.setSearchSubtree(true);
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "manager"));
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"uid=ben,ou=people,dc=springframework,dc=org"));
 
-        assertEquals("Should have 3 roles", 3, authorities.size());
-        assertTrue(authorities.contains("ROLE_MANAGER"));
-        assertTrue(authorities.contains("ROLE_SUBMANAGER"));
-        assertTrue(authorities.contains("ROLE_DEVELOPER"));
-    }
+		Set<String> authorities = AuthorityUtils.authorityListToSet(populator
+				.getGrantedAuthorities(ctx, "manager"));
 
-    @Test
-    public void extraRolesAreAdded() throws Exception {
-        populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), null) {
-            @Override
-            protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String username) {
-                return new HashSet<GrantedAuthority>(AuthorityUtils.createAuthorityList("ROLE_EXTRA"));
-            }
-        };
+		assertEquals("Should have 3 roles", 3, authorities.size());
+		assertTrue(authorities.contains("ROLE_MANAGER"));
+		assertTrue(authorities.contains("ROLE_SUBMANAGER"));
+		assertTrue(authorities.contains("ROLE_DEVELOPER"));
+	}
 
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(
-                new DirContextAdapter(new DistinguishedName("cn=notused")), "notused");
-        assertEquals(1, authorities.size());
-        assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA"));
-    }
+	@Test
+	public void extraRolesAreAdded() throws Exception {
+		populator = new DefaultLdapAuthoritiesPopulator(getContextSource(), null) {
+			@Override
+			protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user,
+					String username) {
+				return new HashSet<GrantedAuthority>(
+						AuthorityUtils.createAuthorityList("ROLE_EXTRA"));
+			}
+		};
 
-    @Test
-    public void userDnWithEscapedCharacterParameterReturnsExpectedRoles() {
-        populator.setGroupRoleAttribute("ou");
-        populator.setConvertToUpperCase(true);
-        populator.setGroupSearchFilter("(member={0})");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(
+				new DirContextAdapter(new DistinguishedName("cn=notused")), "notused");
+		assertEquals(1, authorities.size());
+		assertTrue(AuthorityUtils.authorityListToSet(authorities).contains("ROLE_EXTRA"));
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName("cn=mouse\\, jerry,ou=people,dc=springframework,dc=org"));
+	@Test
+	public void userDnWithEscapedCharacterParameterReturnsExpectedRoles() {
+		populator.setGroupRoleAttribute("ou");
+		populator.setConvertToUpperCase(true);
+		populator.setGroupSearchFilter("(member={0})");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(populator.getGrantedAuthorities(ctx, "notused"));
+		DirContextAdapter ctx = new DirContextAdapter(new DistinguishedName(
+				"cn=mouse\\, jerry,ou=people,dc=springframework,dc=org"));
 
-        assertEquals("Should have 1 role", 1, authorities.size());
-        assertTrue(authorities.contains("ROLE_MANAGER"));
-    }
+		Set<String> authorities = AuthorityUtils.authorityListToSet(populator
+				.getGrantedAuthorities(ctx, "notused"));
+
+		assertEquals("Should have 1 role", 1, authorities.size());
+		assertTrue(authorities.contains("ROLE_MANAGER"));
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java
index 719344b2f5..3d99cebf95 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerTests.java
@@ -42,172 +42,179 @@ import org.springframework.security.ldap.userdetails.PersonContextMapper;
  * @author Luke Taylor
  */
 public class LdapUserDetailsManagerTests extends AbstractLdapIntegrationTests {
-    private static final List<GrantedAuthority> TEST_AUTHORITIES = AuthorityUtils.createAuthorityList("ROLE_CLOWNS","ROLE_ACROBATS");
-    private LdapUserDetailsManager mgr;
-    private SpringSecurityLdapTemplate template;
+	private static final List<GrantedAuthority> TEST_AUTHORITIES = AuthorityUtils
+			.createAuthorityList("ROLE_CLOWNS", "ROLE_ACROBATS");
+	private LdapUserDetailsManager mgr;
+	private SpringSecurityLdapTemplate template;
 
-    @Before
-    public void setUp() throws Exception {
-        mgr = new LdapUserDetailsManager(getContextSource());
-        template = new SpringSecurityLdapTemplate(getContextSource());
-        DirContextAdapter ctx = new DirContextAdapter();
+	@Before
+	public void setUp() throws Exception {
+		mgr = new LdapUserDetailsManager(getContextSource());
+		template = new SpringSecurityLdapTemplate(getContextSource());
+		DirContextAdapter ctx = new DirContextAdapter();
 
-        ctx.setAttributeValue("objectclass", "organizationalUnit");
-        ctx.setAttributeValue("ou", "test people");
-        template.bind("ou=test people", ctx, null);
+		ctx.setAttributeValue("objectclass", "organizationalUnit");
+		ctx.setAttributeValue("ou", "test people");
+		template.bind("ou=test people", ctx, null);
 
-        ctx.setAttributeValue("ou", "testgroups");
-        template.bind("ou=testgroups", ctx, null);
+		ctx.setAttributeValue("ou", "testgroups");
+		template.bind("ou=testgroups", ctx, null);
 
-        DirContextAdapter group = new DirContextAdapter();
+		DirContextAdapter group = new DirContextAdapter();
 
-        group.setAttributeValue("objectclass", "groupOfNames");
-        group.setAttributeValue("cn", "clowns");
-        group.setAttributeValue("member", "cn=nobody,ou=test people,dc=springframework,dc=org");
-        template.bind("cn=clowns,ou=testgroups", group, null);
+		group.setAttributeValue("objectclass", "groupOfNames");
+		group.setAttributeValue("cn", "clowns");
+		group.setAttributeValue("member",
+				"cn=nobody,ou=test people,dc=springframework,dc=org");
+		template.bind("cn=clowns,ou=testgroups", group, null);
 
-        group.setAttributeValue("cn", "acrobats");
-        template.bind("cn=acrobats,ou=testgroups", group, null);
+		group.setAttributeValue("cn", "acrobats");
+		template.bind("cn=acrobats,ou=testgroups", group, null);
 
-        mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=test people","uid"));
-        mgr.setGroupSearchBase("ou=testgroups");
-        mgr.setGroupRoleAttributeName("cn");
-        mgr.setGroupMemberAttributeName("member");
-        mgr.setUserDetailsMapper(new PersonContextMapper());
-    }
+		mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=test people", "uid"));
+		mgr.setGroupSearchBase("ou=testgroups");
+		mgr.setGroupRoleAttributeName("cn");
+		mgr.setGroupMemberAttributeName("member");
+		mgr.setUserDetailsMapper(new PersonContextMapper());
+	}
 
-    @After
-    public void onTearDown() throws Exception {
-//        Iterator people = template.list("ou=testpeople").iterator();
+	@After
+	public void onTearDown() throws Exception {
+		// Iterator people = template.list("ou=testpeople").iterator();
 
-//        DirContext rootCtx = new DirContextAdapter(new DistinguishedName(getInitialCtxFactory().getRootDn()));
-//
-//        while(people.hasNext()) {
-//            template.unbind((String) people.next() + ",ou=testpeople");
-//        }
+		// DirContext rootCtx = new DirContextAdapter(new
+		// DistinguishedName(getInitialCtxFactory().getRootDn()));
+		//
+		// while(people.hasNext()) {
+		// template.unbind((String) people.next() + ",ou=testpeople");
+		// }
 
-        template.unbind("ou=test people",true);
-        template.unbind("ou=testgroups",true);
+		template.unbind("ou=test people", true);
+		template.unbind("ou=testgroups", true);
 
-        SecurityContextHolder.clearContext();
-    }
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testLoadUserByUsernameReturnsCorrectData() {
-        mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people","uid"));
-        mgr.setGroupSearchBase("ou=groups");
-        LdapUserDetails bob = (LdapUserDetails) mgr.loadUserByUsername("bob");
-        assertEquals("bob", bob.getUsername());
-        assertEquals("uid=bob,ou=people,dc=springframework,dc=org", bob.getDn());
-        assertEquals("bobspassword", bob.getPassword());
+	@Test
+	public void testLoadUserByUsernameReturnsCorrectData() {
+		mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid"));
+		mgr.setGroupSearchBase("ou=groups");
+		LdapUserDetails bob = (LdapUserDetails) mgr.loadUserByUsername("bob");
+		assertEquals("bob", bob.getUsername());
+		assertEquals("uid=bob,ou=people,dc=springframework,dc=org", bob.getDn());
+		assertEquals("bobspassword", bob.getPassword());
 
-        assertEquals(1, bob.getAuthorities().size());
-    }
+		assertEquals(1, bob.getAuthorities().size());
+	}
 
-    @Test(expected = UsernameNotFoundException.class)
-    public void testLoadingInvalidUsernameThrowsUsernameNotFoundException() {
-        mgr.loadUserByUsername("jim");
-    }
+	@Test(expected = UsernameNotFoundException.class)
+	public void testLoadingInvalidUsernameThrowsUsernameNotFoundException() {
+		mgr.loadUserByUsername("jim");
+	}
 
-    @Test
-    public void testUserExistsReturnsTrueForValidUser() {
-        mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people","uid"));
-        assertTrue(mgr.userExists("bob"));
-    }
+	@Test
+	public void testUserExistsReturnsTrueForValidUser() {
+		mgr.setUsernameMapper(new DefaultLdapUsernameToDnMapper("ou=people", "uid"));
+		assertTrue(mgr.userExists("bob"));
+	}
 
-    @Test
-    public void testUserExistsReturnsFalseForInValidUser() {
-        assertFalse(mgr.userExists("jim"));
-    }
+	@Test
+	public void testUserExistsReturnsFalseForInValidUser() {
+		assertFalse(mgr.userExists("jim"));
+	}
 
-    @Test
-    public void testCreateNewUserSucceeds() {
-        InetOrgPerson.Essence p = new InetOrgPerson.Essence();
-        p.setCarLicense("XXX");
-        p.setCn(new String[] {"Joe Smeth"});
-        p.setDepartmentNumber("5679");
-        p.setDescription("Some description");
-        p.setDn("whocares");
-        p.setEmployeeNumber("E781");
-        p.setInitials("J");
-        p.setMail("joe@smeth.com");
-        p.setMobile("+44776542911");
-        p.setOu("Joes Unit");
-        p.setO("Organization");
-        p.setRoomNumber("500X");
-        p.setSn("Smeth");
-        p.setUid("joe");
+	@Test
+	public void testCreateNewUserSucceeds() {
+		InetOrgPerson.Essence p = new InetOrgPerson.Essence();
+		p.setCarLicense("XXX");
+		p.setCn(new String[] { "Joe Smeth" });
+		p.setDepartmentNumber("5679");
+		p.setDescription("Some description");
+		p.setDn("whocares");
+		p.setEmployeeNumber("E781");
+		p.setInitials("J");
+		p.setMail("joe@smeth.com");
+		p.setMobile("+44776542911");
+		p.setOu("Joes Unit");
+		p.setO("Organization");
+		p.setRoomNumber("500X");
+		p.setSn("Smeth");
+		p.setUid("joe");
 
-        p.setAuthorities(TEST_AUTHORITIES);
+		p.setAuthorities(TEST_AUTHORITIES);
 
-        mgr.createUser(p.createUserDetails());
-    }
+		mgr.createUser(p.createUserDetails());
+	}
 
-    @Test
-    public void testDeleteUserSucceeds() {
-        InetOrgPerson.Essence p = new InetOrgPerson.Essence();
-        p.setDn("whocares");
-        p.setCn(new String[] {"Don Smeth"});
-        p.setSn("Smeth");
-        p.setUid("don");
-        p.setAuthorities(TEST_AUTHORITIES);
+	@Test
+	public void testDeleteUserSucceeds() {
+		InetOrgPerson.Essence p = new InetOrgPerson.Essence();
+		p.setDn("whocares");
+		p.setCn(new String[] { "Don Smeth" });
+		p.setSn("Smeth");
+		p.setUid("don");
+		p.setAuthorities(TEST_AUTHORITIES);
 
-        mgr.createUser(p.createUserDetails());
-        mgr.setUserDetailsMapper(new InetOrgPersonContextMapper());
+		mgr.createUser(p.createUserDetails());
+		mgr.setUserDetailsMapper(new InetOrgPersonContextMapper());
 
-        InetOrgPerson don = (InetOrgPerson) mgr.loadUserByUsername("don");
+		InetOrgPerson don = (InetOrgPerson) mgr.loadUserByUsername("don");
 
-        assertEquals(2, don.getAuthorities().size());
+		assertEquals(2, don.getAuthorities().size());
 
-        mgr.deleteUser("don");
+		mgr.deleteUser("don");
 
-        try {
-            mgr.loadUserByUsername("don");
-            fail("Expected UsernameNotFoundException after deleting user");
-        } catch(UsernameNotFoundException expected) {
-            // expected
-        }
+		try {
+			mgr.loadUserByUsername("don");
+			fail("Expected UsernameNotFoundException after deleting user");
+		}
+		catch (UsernameNotFoundException expected) {
+			// expected
+		}
 
-        // Check that no authorities are left
-        assertEquals(0, mgr.getUserAuthorities(mgr.usernameMapper.buildDn("don"), "don").size());
-    }
+		// Check that no authorities are left
+		assertEquals(0, mgr.getUserAuthorities(mgr.usernameMapper.buildDn("don"), "don")
+				.size());
+	}
 
-    @Test
-    public void testPasswordChangeWithCorrectOldPasswordSucceeds() {
-        InetOrgPerson.Essence p = new InetOrgPerson.Essence();
-        p.setDn("whocares");
-        p.setCn(new String[] {"John Yossarian"});
-        p.setSn("Yossarian");
-        p.setUid("johnyossarian");
-        p.setPassword("yossarianspassword");
-        p.setAuthorities(TEST_AUTHORITIES);
+	@Test
+	public void testPasswordChangeWithCorrectOldPasswordSucceeds() {
+		InetOrgPerson.Essence p = new InetOrgPerson.Essence();
+		p.setDn("whocares");
+		p.setCn(new String[] { "John Yossarian" });
+		p.setSn("Yossarian");
+		p.setUid("johnyossarian");
+		p.setPassword("yossarianspassword");
+		p.setAuthorities(TEST_AUTHORITIES);
 
-        mgr.createUser(p.createUserDetails());
+		mgr.createUser(p.createUserDetails());
 
-        SecurityContextHolder.getContext().setAuthentication(
-                new UsernamePasswordAuthenticationToken("johnyossarian", "yossarianspassword", TEST_AUTHORITIES));
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("johnyossarian",
+						"yossarianspassword", TEST_AUTHORITIES));
 
-        mgr.changePassword("yossarianspassword", "yossariansnewpassword");
+		mgr.changePassword("yossarianspassword", "yossariansnewpassword");
 
-        assertTrue(template.compare("uid=johnyossarian,ou=test people",
-                "userPassword", "yossariansnewpassword"));
-    }
+		assertTrue(template.compare("uid=johnyossarian,ou=test people", "userPassword",
+				"yossariansnewpassword"));
+	}
 
-    @Test(expected = BadCredentialsException.class)
-    public void testPasswordChangeWithWrongOldPasswordFails() {
-        InetOrgPerson.Essence p = new InetOrgPerson.Essence();
-        p.setDn("whocares");
-        p.setCn(new String[] {"John Yossarian"});
-        p.setSn("Yossarian");
-        p.setUid("johnyossarian");
-        p.setPassword("yossarianspassword");
-        p.setAuthorities(TEST_AUTHORITIES);
+	@Test(expected = BadCredentialsException.class)
+	public void testPasswordChangeWithWrongOldPasswordFails() {
+		InetOrgPerson.Essence p = new InetOrgPerson.Essence();
+		p.setDn("whocares");
+		p.setCn(new String[] { "John Yossarian" });
+		p.setSn("Yossarian");
+		p.setUid("johnyossarian");
+		p.setPassword("yossarianspassword");
+		p.setAuthorities(TEST_AUTHORITIES);
 
-        mgr.createUser(p.createUserDetails());
+		mgr.createUser(p.createUserDetails());
 
-        SecurityContextHolder.getContext().setAuthentication(
-                new UsernamePasswordAuthenticationToken("johnyossarian", "yossarianspassword", TEST_AUTHORITIES));
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("johnyossarian",
+						"yossarianspassword", TEST_AUTHORITIES));
 
-        mgr.changePassword("wrongpassword", "yossariansnewpassword");
-    }
+		mgr.changePassword("wrongpassword", "yossariansnewpassword");
+	}
 }
diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java
index dea5dbba35..d090a56e5a 100644
--- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java
+++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulatorTests.java
@@ -14,7 +14,6 @@
  */
 package org.springframework.security.ldap.userdetails;
 
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.ldap.core.DirContextAdapter;
@@ -32,100 +31,120 @@ import static org.junit.Assert.*;
  */
 public class NestedLdapAuthoritiesPopulatorTests extends AbstractLdapIntegrationTests {
 
-    private NestedLdapAuthoritiesPopulator populator;
-    private LdapAuthority javaDevelopers;
-    private LdapAuthority groovyDevelopers;
-    private LdapAuthority scalaDevelopers;
-    private LdapAuthority closureDevelopers;
-    private LdapAuthority jDevelopers;
-    private LdapAuthority circularJavaDevelopers;
-    //~ Methods ========================================================================================================
+	private NestedLdapAuthoritiesPopulator populator;
+	private LdapAuthority javaDevelopers;
+	private LdapAuthority groovyDevelopers;
+	private LdapAuthority scalaDevelopers;
+	private LdapAuthority closureDevelopers;
+	private LdapAuthority jDevelopers;
+	private LdapAuthority circularJavaDevelopers;
 
-    @Before
-    public void setUp() throws Exception {
-        populator = new NestedLdapAuthoritiesPopulator(getContextSource(), "ou=jdeveloper");
-        populator.setGroupSearchFilter("(member={0})");
-        populator.setIgnorePartialResultException(false);
-        populator.setRolePrefix("");
-        populator.setSearchSubtree(true);
-        populator.setConvertToUpperCase(false);
-        jDevelopers = new LdapAuthority("j-developers", "cn=j-developers,ou=jdeveloper,dc=springframework,dc=org");
-        javaDevelopers = new LdapAuthority("java-developers", "cn=java-developers,ou=jdeveloper,dc=springframework,dc=org");
-        groovyDevelopers = new LdapAuthority("groovy-developers", "cn=groovy-developers,ou=jdeveloper,dc=springframework,dc=org");
-        scalaDevelopers = new LdapAuthority("scala-developers", "cn=scala-developers,ou=jdeveloper,dc=springframework,dc=org");
-        closureDevelopers = new LdapAuthority("closure-developers", "cn=closure-developers,ou=jdeveloper,dc=springframework,dc=org");
-        circularJavaDevelopers = new LdapAuthority("circular-java-developers", "cn=circular-java-developers,ou=jdeveloper,dc=springframework,dc=org");
-    }
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testScalaDudeJDevelopersAuthorities() {
-        DirContextAdapter ctx = new DirContextAdapter("uid=scaladude,ou=people,dc=springframework,dc=org");
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "scaladude");
-        assertEquals(5, authorities.size());
-        assertEquals(Arrays.asList(javaDevelopers, scalaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities);
-    }
+	@Before
+	public void setUp() throws Exception {
+		populator = new NestedLdapAuthoritiesPopulator(getContextSource(),
+				"ou=jdeveloper");
+		populator.setGroupSearchFilter("(member={0})");
+		populator.setIgnorePartialResultException(false);
+		populator.setRolePrefix("");
+		populator.setSearchSubtree(true);
+		populator.setConvertToUpperCase(false);
+		jDevelopers = new LdapAuthority("j-developers",
+				"cn=j-developers,ou=jdeveloper,dc=springframework,dc=org");
+		javaDevelopers = new LdapAuthority("java-developers",
+				"cn=java-developers,ou=jdeveloper,dc=springframework,dc=org");
+		groovyDevelopers = new LdapAuthority("groovy-developers",
+				"cn=groovy-developers,ou=jdeveloper,dc=springframework,dc=org");
+		scalaDevelopers = new LdapAuthority("scala-developers",
+				"cn=scala-developers,ou=jdeveloper,dc=springframework,dc=org");
+		closureDevelopers = new LdapAuthority("closure-developers",
+				"cn=closure-developers,ou=jdeveloper,dc=springframework,dc=org");
+		circularJavaDevelopers = new LdapAuthority("circular-java-developers",
+				"cn=circular-java-developers,ou=jdeveloper,dc=springframework,dc=org");
+	}
 
-    @Test
-    public void testJavaDudeJDevelopersAuthorities() {
-        DirContextAdapter ctx = new DirContextAdapter("uid=javadude,ou=people,dc=springframework,dc=org");
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "javadude");
-        assertEquals(3, authorities.size());
-        assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers), authorities);
-    }
+	@Test
+	public void testScalaDudeJDevelopersAuthorities() {
+		DirContextAdapter ctx = new DirContextAdapter(
+				"uid=scaladude,ou=people,dc=springframework,dc=org");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"scaladude");
+		assertEquals(5, authorities.size());
+		assertEquals(Arrays.asList(javaDevelopers, scalaDevelopers,
+				circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities);
+	}
 
-    @Test
-    public void testScalaDudeJDevelopersAuthoritiesWithSearchLimit() {
-        populator.setMaxSearchDepth(1);
-        DirContextAdapter ctx = new DirContextAdapter("uid=scaladude,ou=people,dc=springframework,dc=org");
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "scaladude");
-        assertEquals(1, authorities.size());
-        assertEquals(Arrays.asList(scalaDevelopers), authorities);
-    }
+	@Test
+	public void testJavaDudeJDevelopersAuthorities() {
+		DirContextAdapter ctx = new DirContextAdapter(
+				"uid=javadude,ou=people,dc=springframework,dc=org");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"javadude");
+		assertEquals(3, authorities.size());
+		assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers),
+				authorities);
+	}
 
-    @Test
-    public void testGroovyDudeJDevelopersAuthorities() {
-        DirContextAdapter ctx = new DirContextAdapter("uid=groovydude,ou=people,dc=springframework,dc=org");
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "groovydude");
-        assertEquals(4, authorities.size());
-        assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities);
-    }
+	@Test
+	public void testScalaDudeJDevelopersAuthoritiesWithSearchLimit() {
+		populator.setMaxSearchDepth(1);
+		DirContextAdapter ctx = new DirContextAdapter(
+				"uid=scaladude,ou=people,dc=springframework,dc=org");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"scaladude");
+		assertEquals(1, authorities.size());
+		assertEquals(Arrays.asList(scalaDevelopers), authorities);
+	}
 
-    @Test
-    public void testClosureDudeJDevelopersWithMembershipAsAttributeValues() {
-        populator.setAttributeNames(new HashSet(Arrays.asList("member")));
+	@Test
+	public void testGroovyDudeJDevelopersAuthorities() {
+		DirContextAdapter ctx = new DirContextAdapter(
+				"uid=groovydude,ou=people,dc=springframework,dc=org");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"groovydude");
+		assertEquals(4, authorities.size());
+		assertEquals(Arrays.asList(javaDevelopers, circularJavaDevelopers, jDevelopers,
+				groovyDevelopers), authorities);
+	}
 
-        DirContextAdapter ctx = new DirContextAdapter("uid=closuredude,ou=people,dc=springframework,dc=org");
-        Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx, "closuredude");
-        assertEquals(5, authorities.size());
-        assertEquals(Arrays.asList(closureDevelopers, javaDevelopers, circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities);
+	@Test
+	public void testClosureDudeJDevelopersWithMembershipAsAttributeValues() {
+		populator.setAttributeNames(new HashSet(Arrays.asList("member")));
 
-        LdapAuthority[] ldapAuthorities = authorities.toArray(new LdapAuthority[0]);
-        assertEquals(5, ldapAuthorities.length);
-        //closure group
-        assertTrue(ldapAuthorities[0].getAttributes().containsKey("member"));
-        assertNotNull(ldapAuthorities[0].getAttributes().get("member"));
-        assertEquals(1, ldapAuthorities[0].getAttributes().get("member").size());
-        assertEquals("uid=closuredude,ou=people,dc=springframework,dc=org", ldapAuthorities[0].getFirstAttributeValue("member"));
+		DirContextAdapter ctx = new DirContextAdapter(
+				"uid=closuredude,ou=people,dc=springframework,dc=org");
+		Collection<GrantedAuthority> authorities = populator.getGrantedAuthorities(ctx,
+				"closuredude");
+		assertEquals(5, authorities.size());
+		assertEquals(Arrays.asList(closureDevelopers, javaDevelopers,
+				circularJavaDevelopers, jDevelopers, groovyDevelopers), authorities);
 
-        //java group
-        assertTrue(ldapAuthorities[1].getAttributes().containsKey("member"));
-        assertNotNull(ldapAuthorities[1].getAttributes().get("member"));
-        assertEquals(3, ldapAuthorities[1].getAttributes().get("member").size());
-        assertEquals(groovyDevelopers.getDn(), ldapAuthorities[1].getFirstAttributeValue("member"));
-        assertEquals(
-                new String[]{
-                        groovyDevelopers.getDn(),
-                        scalaDevelopers.getDn(),
-                        "uid=javadude,ou=people,dc=springframework,dc=org"
-                },
-                ldapAuthorities[1].getAttributes().get("member")
-        );
+		LdapAuthority[] ldapAuthorities = authorities.toArray(new LdapAuthority[0]);
+		assertEquals(5, ldapAuthorities.length);
+		// closure group
+		assertTrue(ldapAuthorities[0].getAttributes().containsKey("member"));
+		assertNotNull(ldapAuthorities[0].getAttributes().get("member"));
+		assertEquals(1, ldapAuthorities[0].getAttributes().get("member").size());
+		assertEquals("uid=closuredude,ou=people,dc=springframework,dc=org",
+				ldapAuthorities[0].getFirstAttributeValue("member"));
 
-        //test non existent attribute
-        assertNull(ldapAuthorities[2].getFirstAttributeValue("test"));
-        assertNotNull(ldapAuthorities[2].getAttributeValues("test"));
-        assertEquals(0, ldapAuthorities[2].getAttributeValues("test").size());
-        //test role name
-        assertEquals(jDevelopers.getAuthority(), ldapAuthorities[3].getAuthority());
-    }
+		// java group
+		assertTrue(ldapAuthorities[1].getAttributes().containsKey("member"));
+		assertNotNull(ldapAuthorities[1].getAttributes().get("member"));
+		assertEquals(3, ldapAuthorities[1].getAttributes().get("member").size());
+		assertEquals(groovyDevelopers.getDn(),
+				ldapAuthorities[1].getFirstAttributeValue("member"));
+		assertEquals(new String[] { groovyDevelopers.getDn(), scalaDevelopers.getDn(),
+				"uid=javadude,ou=people,dc=springframework,dc=org" }, ldapAuthorities[1]
+				.getAttributes().get("member"));
+
+		// test non existent attribute
+		assertNull(ldapAuthorities[2].getFirstAttributeValue("test"));
+		assertNotNull(ldapAuthorities[2].getAttributeValues("test"));
+		assertEquals(0, ldapAuthorities[2].getAttributeValues("test").size());
+		// test role name
+		assertEquals(jDevelopers.getAuthority(), ldapAuthorities[3].getAuthority());
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java b/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java
index 282629db4c..ca307165e2 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/DefaultLdapUsernameToDnMapper.java
@@ -3,34 +3,34 @@ package org.springframework.security.ldap;
 import org.springframework.ldap.core.DistinguishedName;
 
 /**
- * This implementation appends a name component to the <tt>userDnBase</tt> context using the
- * <tt>usernameAttributeName</tt> property. So if the <tt>uid</tt> attribute is used to store the username, and the
- * base DN is <tt>cn=users</tt> and we are creating a new user called "sam", then the DN will be
- * <tt>uid=sam,cn=users</tt>.
+ * This implementation appends a name component to the <tt>userDnBase</tt> context using
+ * the <tt>usernameAttributeName</tt> property. So if the <tt>uid</tt> attribute is used
+ * to store the username, and the base DN is <tt>cn=users</tt> and we are creating a new
+ * user called "sam", then the DN will be <tt>uid=sam,cn=users</tt>.
  *
  * @author Luke Taylor
  */
 public class DefaultLdapUsernameToDnMapper implements LdapUsernameToDnMapper {
-    private final String userDnBase;
-    private final String usernameAttribute;
+	private final String userDnBase;
+	private final String usernameAttribute;
 
-   /**
-    * @param userDnBase the base name of the DN
-    * @param usernameAttribute the attribute to append for the username component.
-    */
-    public DefaultLdapUsernameToDnMapper(String userDnBase, String usernameAttribute) {
-        this.userDnBase = userDnBase;
-        this.usernameAttribute = usernameAttribute;
-    }
+	/**
+	 * @param userDnBase the base name of the DN
+	 * @param usernameAttribute the attribute to append for the username component.
+	 */
+	public DefaultLdapUsernameToDnMapper(String userDnBase, String usernameAttribute) {
+		this.userDnBase = userDnBase;
+		this.usernameAttribute = usernameAttribute;
+	}
 
-    /**
-     * Assembles the Distinguished Name that should be used the given username.
-     */
-    public DistinguishedName buildDn(String username) {
-        DistinguishedName dn = new DistinguishedName(userDnBase);
+	/**
+	 * Assembles the Distinguished Name that should be used the given username.
+	 */
+	public DistinguishedName buildDn(String username) {
+		DistinguishedName dn = new DistinguishedName(userDnBase);
 
-        dn.add(usernameAttribute, username);
+		dn.add(usernameAttribute, username);
 
-        return dn;
-    }
+		return dn;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java
index cba4e82029..2fe357ecb2 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java
@@ -13,127 +13,143 @@ import org.springframework.ldap.core.support.SimpleDirContextAuthenticationStrat
 import org.springframework.util.Assert;
 
 /**
- * ContextSource implementation which uses Spring LDAP's <tt>LdapContextSource</tt> as a base
- * class. Used internally by the Spring Security LDAP namespace configuration.
+ * ContextSource implementation which uses Spring LDAP's <tt>LdapContextSource</tt> as a
+ * base class. Used internally by the Spring Security LDAP namespace configuration.
  * <p>
- * From Spring Security 3.0, Spring LDAP 1.3 is used and the <tt>ContextSource</tt> interface
- * provides support for binding with a username and password. As a result, Spring LDAP <tt>ContextSource</tt>
- * implementations such as <tt>LdapContextSource</tt> may be used directly with Spring Security.
+ * From Spring Security 3.0, Spring LDAP 1.3 is used and the <tt>ContextSource</tt>
+ * interface provides support for binding with a username and password. As a result,
+ * Spring LDAP <tt>ContextSource</tt> implementations such as <tt>LdapContextSource</tt>
+ * may be used directly with Spring Security.
  * <p>
- * Spring LDAP 1.3 doesn't have JVM-level LDAP connection pooling enabled by default. This class sets the
- * <tt>pooled</tt> property to true, but customizes the {@link DirContextAuthenticationStrategy} used to disable
- * pooling when the <tt>DN</tt> doesn't match the <tt>userDn</tt> property. This prevents pooling for calls
- * to {@link #getContext(String, String)} to authenticate as specific users.
+ * Spring LDAP 1.3 doesn't have JVM-level LDAP connection pooling enabled by default. This
+ * class sets the <tt>pooled</tt> property to true, but customizes the
+ * {@link DirContextAuthenticationStrategy} used to disable pooling when the <tt>DN</tt>
+ * doesn't match the <tt>userDn</tt> property. This prevents pooling for calls to
+ * {@link #getContext(String, String)} to authenticate as specific users.
  *
  * @author Luke Taylor
  * @since 2.0
  */
 public class DefaultSpringSecurityContextSource extends LdapContextSource {
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private String rootDn;
+	private String rootDn;
 
-    /**
-     * Create and initialize an instance which will connect to the supplied LDAP URL. If you
-     * want to use more than one server for fail-over, rather use
-     * the {@link #DefaultSpringSecurityContextSource(List, String)} constructor.
-     *
-     * @param providerUrl an LDAP URL of the form <code>ldap://localhost:389/base_dn<code>
-     */
-    public DefaultSpringSecurityContextSource(String providerUrl) {
-        Assert.hasLength(providerUrl, "An LDAP connection URL must be supplied.");
+	/**
+	 * Create and initialize an instance which will connect to the supplied LDAP URL. If
+	 * you want to use more than one server for fail-over, rather use the
+	 * {@link #DefaultSpringSecurityContextSource(List, String)} constructor.
+	 *
+	 * @param providerUrl an LDAP URL of the form <code>ldap://localhost:389/base_dn<code>
+	 */
+	public DefaultSpringSecurityContextSource(String providerUrl) {
+		Assert.hasLength(providerUrl, "An LDAP connection URL must be supplied.");
 
-        StringTokenizer st = new StringTokenizer(providerUrl);
+		StringTokenizer st = new StringTokenizer(providerUrl);
 
-        ArrayList<String> urls = new ArrayList<String>();
+		ArrayList<String> urls = new ArrayList<String>();
 
-        // Work out rootDn from the first URL and check that the other URLs (if any) match
-        while (st.hasMoreTokens()) {
-            String url = st.nextToken();
-            String urlRootDn = LdapUtils.parseRootDnFromUrl(url);
+		// Work out rootDn from the first URL and check that the other URLs (if any) match
+		while (st.hasMoreTokens()) {
+			String url = st.nextToken();
+			String urlRootDn = LdapUtils.parseRootDnFromUrl(url);
 
-            urls.add(url.substring(0, url.lastIndexOf(urlRootDn)));
+			urls.add(url.substring(0, url.lastIndexOf(urlRootDn)));
 
-            logger.info(" URL '" + url + "', root DN is '" + urlRootDn + "'");
+			logger.info(" URL '" + url + "', root DN is '" + urlRootDn + "'");
 
-            if (rootDn == null) {
-                rootDn = urlRootDn;
-            } else if (!rootDn.equals(urlRootDn)) {
-                throw new IllegalArgumentException("Root DNs must be the same when using multiple URLs");
-            }
-        }
+			if (rootDn == null) {
+				rootDn = urlRootDn;
+			}
+			else if (!rootDn.equals(urlRootDn)) {
+				throw new IllegalArgumentException(
+						"Root DNs must be the same when using multiple URLs");
+			}
+		}
 
-        setUrls(urls.toArray(new String[urls.size()]));
-        setBase(rootDn);
-        setPooled(true);
-        setAuthenticationStrategy(new SimpleDirContextAuthenticationStrategy() {
-            @Override
-            @SuppressWarnings("rawtypes")
-            public void setupEnvironment(Hashtable env, String dn, String password) {
-                super.setupEnvironment(env, dn, password);
-                // Remove the pooling flag unless we are authenticating as the 'manager' user.
-                if (!userDn.equals(dn) && env.containsKey(SUN_LDAP_POOLING_FLAG)) {
-                    logger.debug("Removing pooling flag for user " + dn);
-                    env.remove(SUN_LDAP_POOLING_FLAG);
-                }
-            }
-        });
-    }
+		setUrls(urls.toArray(new String[urls.size()]));
+		setBase(rootDn);
+		setPooled(true);
+		setAuthenticationStrategy(new SimpleDirContextAuthenticationStrategy() {
+			@Override
+			@SuppressWarnings("rawtypes")
+			public void setupEnvironment(Hashtable env, String dn, String password) {
+				super.setupEnvironment(env, dn, password);
+				// Remove the pooling flag unless we are authenticating as the 'manager'
+				// user.
+				if (!userDn.equals(dn) && env.containsKey(SUN_LDAP_POOLING_FLAG)) {
+					logger.debug("Removing pooling flag for user " + dn);
+					env.remove(SUN_LDAP_POOLING_FLAG);
+				}
+			}
+		});
+	}
 
-    /**
-     * Create and initialize an instance which will connect of the LDAP Spring Security
-     * Context Source. It will connect to any of the provided LDAP server URLs.
-     *
-     * @param urls
-     *          A list of string values which are LDAP server URLs. An example would be
-     *          <code>ldap://ldap.company.com:389</code>. LDAPS URLs (SSL-secured) may be used as well,
-     *          given that Spring Security is able to connect to the server.
-     *          Note that these <b>URLs must not include the base DN</b>!
-     * @param baseDn
-     *          The common Base DN for all provided servers, e.g.
-     *          <pre>dc=company,dc=com</pre>.
-     */
-    public DefaultSpringSecurityContextSource(List<String> urls, String baseDn) {
-        this(buildProviderUrl(urls, baseDn));
-    }
+	/**
+	 * Create and initialize an instance which will connect of the LDAP Spring Security
+	 * Context Source. It will connect to any of the provided LDAP server URLs.
+	 *
+	 * @param urls A list of string values which are LDAP server URLs. An example would be
+	 * <code>ldap://ldap.company.com:389</code>. LDAPS URLs (SSL-secured) may be used as
+	 * well, given that Spring Security is able to connect to the server. Note that these
+	 * <b>URLs must not include the base DN</b>!
+	 * @param baseDn The common Base DN for all provided servers, e.g.
+	 * 
+	 * <pre>
+	 * dc=company,dc=com
+	 * </pre>
+	 * 
+	 * .
+	 */
+	public DefaultSpringSecurityContextSource(List<String> urls, String baseDn) {
+		this(buildProviderUrl(urls, baseDn));
+	}
 
-    /**
-     * Builds a Spring LDAP-compliant Provider URL string, i.e. a space-separated list of LDAP servers
-     * with their base DNs. As the base DN must be identical for all servers, it needs to be supplied
-     * only once.
-     *
-     * @param urls
-     *          A list of string values which are LDAP server URLs. An example would be
-     *          <pre>ldap://ldap.company.com:389</pre>. LDAPS URLs may be used as well,
-     *          given that Spring Security is able to connect to the server.
-     * @param baseDn
-     *          The common Base DN for all provided servers, e.g.
-     *          <pre>dc=company,dc=com</pre>.
-     * @return A Spring Security/Spring LDAP-compliant Provider URL string.
-     */
-    private static String buildProviderUrl(List<String> urls, String baseDn) {
-        Assert.notNull(baseDn, "The Base DN for the LDAP server must not be null.");
-        Assert.notEmpty(urls, "At least one LDAP server URL must be provided.");
+	/**
+	 * Builds a Spring LDAP-compliant Provider URL string, i.e. a space-separated list of
+	 * LDAP servers with their base DNs. As the base DN must be identical for all servers,
+	 * it needs to be supplied only once.
+	 *
+	 * @param urls A list of string values which are LDAP server URLs. An example would be
+	 * 
+	 * <pre>
+	 * ldap://ldap.company.com:389
+	 * </pre>
+	 * 
+	 * . LDAPS URLs may be used as well, given that Spring Security is able to connect to
+	 * the server.
+	 * @param baseDn The common Base DN for all provided servers, e.g.
+	 * 
+	 * <pre>
+	 * dc=company,dc=com
+	 * </pre>
+	 * 
+	 * .
+	 * @return A Spring Security/Spring LDAP-compliant Provider URL string.
+	 */
+	private static String buildProviderUrl(List<String> urls, String baseDn) {
+		Assert.notNull(baseDn, "The Base DN for the LDAP server must not be null.");
+		Assert.notEmpty(urls, "At least one LDAP server URL must be provided.");
 
-        String trimmedBaseDn = baseDn.trim();
-        StringBuilder providerUrl = new StringBuilder();
+		String trimmedBaseDn = baseDn.trim();
+		StringBuilder providerUrl = new StringBuilder();
 
-        for (String serverUrl : urls) {
-            String trimmedUrl = serverUrl.trim();
-            if ("".equals(trimmedUrl)) {
-                continue;
-            }
+		for (String serverUrl : urls) {
+			String trimmedUrl = serverUrl.trim();
+			if ("".equals(trimmedUrl)) {
+				continue;
+			}
 
-            providerUrl.append(trimmedUrl);
-            if (! trimmedUrl.endsWith("/")) {
-                providerUrl.append("/");
-            }
-            providerUrl.append(trimmedBaseDn);
-            providerUrl.append(" ");
-        }
+			providerUrl.append(trimmedUrl);
+			if (!trimmedUrl.endsWith("/")) {
+				providerUrl.append("/");
+			}
+			providerUrl.append(trimmedBaseDn);
+			providerUrl.append(" ");
+		}
 
-        return providerUrl.toString();
+		return providerUrl.toString();
 
-    }
+	}
 
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java b/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java
index 406a98d30f..b761b3539d 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java
@@ -22,8 +22,8 @@ import org.springframework.ldap.BadLdapGrammarException;
  * Helper class to encode and decode ldap names and values.
  * 
  * <p>
- * NOTE: This is a copy from Spring LDAP so that both Spring LDAP 1.x and 2.x
- * can be supported without reflection.
+ * NOTE: This is a copy from Spring LDAP so that both Spring LDAP 1.x and 2.x can be
+ * supported without reflection.
  * </p>
  * 
  * @author Adam Skogman
@@ -31,207 +31,211 @@ import org.springframework.ldap.BadLdapGrammarException;
  */
 final class LdapEncoder {
 
-    private static final int HEX = 16;
-    private static String[] NAME_ESCAPE_TABLE = new String[96];
+	private static final int HEX = 16;
+	private static String[] NAME_ESCAPE_TABLE = new String[96];
 
-    private static String[] FILTER_ESCAPE_TABLE = new String['\\' + 1];
+	private static String[] FILTER_ESCAPE_TABLE = new String['\\' + 1];
 
-    static {
+	static {
 
-        // Name encoding table -------------------------------------
+		// Name encoding table -------------------------------------
 
-        // all below 0x20 (control chars)
-        for (char c = 0; c < ' '; c++) {
-            NAME_ESCAPE_TABLE[c] = "\\" + toTwoCharHex(c);
-        }
+		// all below 0x20 (control chars)
+		for (char c = 0; c < ' '; c++) {
+			NAME_ESCAPE_TABLE[c] = "\\" + toTwoCharHex(c);
+		}
 
-        NAME_ESCAPE_TABLE['#'] = "\\#";
-        NAME_ESCAPE_TABLE[','] = "\\,";
-        NAME_ESCAPE_TABLE[';'] = "\\;";
-        NAME_ESCAPE_TABLE['='] = "\\=";
-        NAME_ESCAPE_TABLE['+'] = "\\+";
-        NAME_ESCAPE_TABLE['<'] = "\\<";
-        NAME_ESCAPE_TABLE['>'] = "\\>";
-        NAME_ESCAPE_TABLE['\"'] = "\\\"";
-        NAME_ESCAPE_TABLE['\\'] = "\\\\";
+		NAME_ESCAPE_TABLE['#'] = "\\#";
+		NAME_ESCAPE_TABLE[','] = "\\,";
+		NAME_ESCAPE_TABLE[';'] = "\\;";
+		NAME_ESCAPE_TABLE['='] = "\\=";
+		NAME_ESCAPE_TABLE['+'] = "\\+";
+		NAME_ESCAPE_TABLE['<'] = "\\<";
+		NAME_ESCAPE_TABLE['>'] = "\\>";
+		NAME_ESCAPE_TABLE['\"'] = "\\\"";
+		NAME_ESCAPE_TABLE['\\'] = "\\\\";
 
-        // Filter encoding table -------------------------------------
+		// Filter encoding table -------------------------------------
 
-        // fill with char itself
-        for (char c = 0; c < FILTER_ESCAPE_TABLE.length; c++) {
-            FILTER_ESCAPE_TABLE[c] = String.valueOf(c);
-        }
+		// fill with char itself
+		for (char c = 0; c < FILTER_ESCAPE_TABLE.length; c++) {
+			FILTER_ESCAPE_TABLE[c] = String.valueOf(c);
+		}
 
-        // escapes (RFC2254)
-        FILTER_ESCAPE_TABLE['*'] = "\\2a";
-        FILTER_ESCAPE_TABLE['('] = "\\28";
-        FILTER_ESCAPE_TABLE[')'] = "\\29";
-        FILTER_ESCAPE_TABLE['\\'] = "\\5c";
-        FILTER_ESCAPE_TABLE[0] = "\\00";
+		// escapes (RFC2254)
+		FILTER_ESCAPE_TABLE['*'] = "\\2a";
+		FILTER_ESCAPE_TABLE['('] = "\\28";
+		FILTER_ESCAPE_TABLE[')'] = "\\29";
+		FILTER_ESCAPE_TABLE['\\'] = "\\5c";
+		FILTER_ESCAPE_TABLE[0] = "\\00";
 
-    }
+	}
 
-    /**
-     * All static methods - not to be instantiated.
-     */
-    private LdapEncoder() {
-    }
+	/**
+	 * All static methods - not to be instantiated.
+	 */
+	private LdapEncoder() {
+	}
 
-    protected static String toTwoCharHex(char c) {
+	protected static String toTwoCharHex(char c) {
 
-        String raw = Integer.toHexString(c).toUpperCase();
+		String raw = Integer.toHexString(c).toUpperCase();
 
-        if (raw.length() > 1) {
-            return raw;
-        } else {
-            return "0" + raw;
-        }
-    }
+		if (raw.length() > 1) {
+			return raw;
+		}
+		else {
+			return "0" + raw;
+		}
+	}
 
-    /**
-     * Escape a value for use in a filter.
-     * 
-     * @param value
-     *            the value to escape.
-     * @return a properly escaped representation of the supplied value.
-     */
-    public static String filterEncode(String value) {
+	/**
+	 * Escape a value for use in a filter.
+	 * 
+	 * @param value the value to escape.
+	 * @return a properly escaped representation of the supplied value.
+	 */
+	public static String filterEncode(String value) {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer roomy
-        StringBuilder encodedValue = new StringBuilder(value.length() * 2);
+		// make buffer roomy
+		StringBuilder encodedValue = new StringBuilder(value.length() * 2);
 
-        int length = value.length();
+		int length = value.length();
 
-        for (int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 
-            char c = value.charAt(i);
+			char c = value.charAt(i);
 
-            if (c < FILTER_ESCAPE_TABLE.length) {
-                encodedValue.append(FILTER_ESCAPE_TABLE[c]);
-            } else {
-                // default: add the char
-                encodedValue.append(c);
-            }
-        }
+			if (c < FILTER_ESCAPE_TABLE.length) {
+				encodedValue.append(FILTER_ESCAPE_TABLE[c]);
+			}
+			else {
+				// default: add the char
+				encodedValue.append(c);
+			}
+		}
 
-        return encodedValue.toString();
-    }
+		return encodedValue.toString();
+	}
 
-    /**
-     * LDAP Encodes a value for use with a DN. Escapes for LDAP, not JNDI!
-     * 
-     * <br/>Escapes:<br/> ' ' [space] - "\ " [if first or last] <br/> '#'
-     * [hash] - "\#" <br/> ',' [comma] - "\," <br/> ';' [semicolon] - "\;" <br/> '=
-     * [equals] - "\=" <br/> '+' [plus] - "\+" <br/> '&lt;' [less than] -
-     * "\&lt;" <br/> '&gt;' [greater than] - "\&gt;" <br/> '"' [double quote] -
-     * "\"" <br/> '\' [backslash] - "\\" <br/>
-     * 
-     * @param value
-     *            the value to escape.
-     * @return The escaped value.
-     */
-    public static String nameEncode(String value) {
+	/**
+	 * LDAP Encodes a value for use with a DN. Escapes for LDAP, not JNDI!
+	 * 
+	 * <br/>
+	 * Escapes:<br/>
+	 * ' ' [space] - "\ " [if first or last] <br/>
+	 * '#' [hash] - "\#" <br/>
+	 * ',' [comma] - "\," <br/>
+	 * ';' [semicolon] - "\;" <br/>
+	 * '= [equals] - "\=" <br/>
+	 * '+' [plus] - "\+" <br/>
+	 * '&lt;' [less than] - "\&lt;" <br/>
+	 * '&gt;' [greater than] - "\&gt;" <br/>
+	 * '"' [double quote] - "\"" <br/>
+	 * '\' [backslash] - "\\" <br/>
+	 * 
+	 * @param value the value to escape.
+	 * @return The escaped value.
+	 */
+	public static String nameEncode(String value) {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer roomy
-        StringBuilder encodedValue = new StringBuilder(value.length() * 2);
+		// make buffer roomy
+		StringBuilder encodedValue = new StringBuilder(value.length() * 2);
 
-        int length = value.length();
-        int last = length - 1;
+		int length = value.length();
+		int last = length - 1;
 
-        for (int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 
-            char c = value.charAt(i);
+			char c = value.charAt(i);
 
-            // space first or last
-            if (c == ' ' && (i == 0 || i == last)) {
-                encodedValue.append("\\ ");
-                continue;
-            }
+			// space first or last
+			if (c == ' ' && (i == 0 || i == last)) {
+				encodedValue.append("\\ ");
+				continue;
+			}
 
-            if (c < NAME_ESCAPE_TABLE.length) {
-                // check in table for escapes
-                String esc = NAME_ESCAPE_TABLE[c];
+			if (c < NAME_ESCAPE_TABLE.length) {
+				// check in table for escapes
+				String esc = NAME_ESCAPE_TABLE[c];
 
-                if (esc != null) {
-                    encodedValue.append(esc);
-                    continue;
-                }
-            }
+				if (esc != null) {
+					encodedValue.append(esc);
+					continue;
+				}
+			}
 
-            // default: add the char
-            encodedValue.append(c);
-        }
+			// default: add the char
+			encodedValue.append(c);
+		}
 
-        return encodedValue.toString();
+		return encodedValue.toString();
 
-    }
+	}
 
-    /**
-     * Decodes a value. Converts escaped chars to ordinary chars.
-     * 
-     * @param value
-     *            Trimmed value, so no leading an trailing blanks, except an
-     *            escaped space last.
-     * @return The decoded value as a string.
-     * @throws BadLdapGrammarException
-     */
-    static public String nameDecode(String value)
-            throws BadLdapGrammarException {
+	/**
+	 * Decodes a value. Converts escaped chars to ordinary chars.
+	 * 
+	 * @param value Trimmed value, so no leading an trailing blanks, except an escaped
+	 * space last.
+	 * @return The decoded value as a string.
+	 * @throws BadLdapGrammarException
+	 */
+	static public String nameDecode(String value) throws BadLdapGrammarException {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer same size
-        StringBuilder decoded = new StringBuilder(value.length());
+		// make buffer same size
+		StringBuilder decoded = new StringBuilder(value.length());
 
-        int i = 0;
-        while (i < value.length()) {
-            char currentChar = value.charAt(i);
-            if (currentChar == '\\') {
-                if (value.length() <= i + 1) {
-                    // Ending with a single backslash is not allowed
-                    throw new BadLdapGrammarException(
-                            "Unexpected end of value " + "unterminated '\\'");
-                } else {
-                    char nextChar = value.charAt(i + 1);
-                    if (nextChar == ',' || nextChar == '=' || nextChar == '+'
-                            || nextChar == '<' || nextChar == '>'
-                            || nextChar == '#' || nextChar == ';'
-                            || nextChar == '\\' || nextChar == '\"'
-                            || nextChar == ' ') {
-                        // Normal backslash escape
-                        decoded.append(nextChar);
-                        i += 2;
-                    } else {
-                        if (value.length() <= i + 2) {
-                            throw new BadLdapGrammarException(
-                                    "Unexpected end of value "
-                                            + "expected special or hex, found '"
-                                            + nextChar + "'");
-                        } else {
-                            // This should be a hex value
-                            String hexString = "" + nextChar
-                                    + value.charAt(i + 2);
-                            decoded.append((char) Integer.parseInt(hexString,
-                                    HEX));
-                            i += 3;
-                        }
-                    }
-                }
-            } else {
-                // This character wasn't escaped - just append it
-                decoded.append(currentChar);
-                i++;
-            }
-        }
+		int i = 0;
+		while (i < value.length()) {
+			char currentChar = value.charAt(i);
+			if (currentChar == '\\') {
+				if (value.length() <= i + 1) {
+					// Ending with a single backslash is not allowed
+					throw new BadLdapGrammarException("Unexpected end of value "
+							+ "unterminated '\\'");
+				}
+				else {
+					char nextChar = value.charAt(i + 1);
+					if (nextChar == ',' || nextChar == '=' || nextChar == '+'
+							|| nextChar == '<' || nextChar == '>' || nextChar == '#'
+							|| nextChar == ';' || nextChar == '\\' || nextChar == '\"'
+							|| nextChar == ' ') {
+						// Normal backslash escape
+						decoded.append(nextChar);
+						i += 2;
+					}
+					else {
+						if (value.length() <= i + 2) {
+							throw new BadLdapGrammarException("Unexpected end of value "
+									+ "expected special or hex, found '" + nextChar + "'");
+						}
+						else {
+							// This should be a hex value
+							String hexString = "" + nextChar + value.charAt(i + 2);
+							decoded.append((char) Integer.parseInt(hexString, HEX));
+							i += 3;
+						}
+					}
+				}
+			}
+			else {
+				// This character wasn't escaped - just append it
+				decoded.append(currentChar);
+				i++;
+			}
+		}
 
-        return decoded.toString();
+		return decoded.toString();
 
-    }
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUsernameToDnMapper.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUsernameToDnMapper.java
index 2be0ee9aff..5f71b6ab99 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/LdapUsernameToDnMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUsernameToDnMapper.java
@@ -8,5 +8,5 @@ import org.springframework.ldap.core.DistinguishedName;
  * @author Luke Taylor
  */
 public interface LdapUsernameToDnMapper {
-    DistinguishedName buildDn(String username);
+	DistinguishedName buildDn(String username);
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java
index 4254002308..5959402f6b 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java
@@ -29,156 +29,173 @@ import javax.naming.NamingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-
 /**
  * LDAP Utility methods.
  *
  * @author Luke Taylor
  */
 public final class LdapUtils {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(LdapUtils.class);
+	private static final Log logger = LogFactory.getLog(LdapUtils.class);
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    private LdapUtils() {
-    }
+	private LdapUtils() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static void closeContext(Context ctx) {
-        if(ctx instanceof DirContextAdapter) {
-            return;
-        }
+	public static void closeContext(Context ctx) {
+		if (ctx instanceof DirContextAdapter) {
+			return;
+		}
 
-        try {
-            if (ctx != null) {
-                ctx.close();
-            }
-        } catch (NamingException e) {
-            logger.error("Failed to close context.", e);
-        }
-    }
+		try {
+			if (ctx != null) {
+				ctx.close();
+			}
+		}
+		catch (NamingException e) {
+			logger.error("Failed to close context.", e);
+		}
+	}
 
-    public static void closeEnumeration(NamingEnumeration ne) {
-        try {
-            if (ne != null) {
-                ne.close();
-            }
-        } catch (NamingException e) {
-            logger.error("Failed to close enumeration.", e);
-        }
-    }
+	public static void closeEnumeration(NamingEnumeration ne) {
+		try {
+			if (ne != null) {
+				ne.close();
+			}
+		}
+		catch (NamingException e) {
+			logger.error("Failed to close enumeration.", e);
+		}
+	}
 
-    /**
-     * Obtains the part of a DN relative to a supplied base context.
-     * <p>If the DN is "cn=bob,ou=people,dc=springframework,dc=org" and the base context name is
-     * "ou=people,dc=springframework,dc=org" it would return "cn=bob".
-     * </p>
-     *
-     * @param fullDn the DN
-     * @param baseCtx the context to work out the name relative to.
-     *
-     * @return the
-     *
-     * @throws NamingException any exceptions thrown by the context are propagated.
-     */
-    public static String getRelativeName(String fullDn, Context baseCtx) throws NamingException {
+	/**
+	 * Obtains the part of a DN relative to a supplied base context.
+	 * <p>
+	 * If the DN is "cn=bob,ou=people,dc=springframework,dc=org" and the base context name
+	 * is "ou=people,dc=springframework,dc=org" it would return "cn=bob".
+	 * </p>
+	 *
+	 * @param fullDn the DN
+	 * @param baseCtx the context to work out the name relative to.
+	 *
+	 * @return the
+	 *
+	 * @throws NamingException any exceptions thrown by the context are propagated.
+	 */
+	public static String getRelativeName(String fullDn, Context baseCtx)
+			throws NamingException {
 
-        String baseDn = baseCtx.getNameInNamespace();
+		String baseDn = baseCtx.getNameInNamespace();
 
-        if (baseDn.length() == 0) {
-            return fullDn;
-        }
+		if (baseDn.length() == 0) {
+			return fullDn;
+		}
 
-        DistinguishedName base = new DistinguishedName(baseDn);
-        DistinguishedName full = new DistinguishedName(fullDn);
+		DistinguishedName base = new DistinguishedName(baseDn);
+		DistinguishedName full = new DistinguishedName(fullDn);
 
-        if(base.equals(full)) {
-            return "";
-        }
+		if (base.equals(full)) {
+			return "";
+		}
 
-        Assert.isTrue(full.startsWith(base), "Full DN does not start with base DN");
+		Assert.isTrue(full.startsWith(base), "Full DN does not start with base DN");
 
-        full.removeFirst(base);
+		full.removeFirst(base);
 
-        return full.toString();
-    }
+		return full.toString();
+	}
 
-    /**
-     * Gets the full dn of a name by prepending the name of the context it is relative to.
-     * If the name already contains the base name, it is returned unaltered.
-     */
-    public static DistinguishedName getFullDn(DistinguishedName dn, Context baseCtx)
-            throws NamingException {
-        DistinguishedName baseDn = new DistinguishedName(baseCtx.getNameInNamespace());
+	/**
+	 * Gets the full dn of a name by prepending the name of the context it is relative to.
+	 * If the name already contains the base name, it is returned unaltered.
+	 */
+	public static DistinguishedName getFullDn(DistinguishedName dn, Context baseCtx)
+			throws NamingException {
+		DistinguishedName baseDn = new DistinguishedName(baseCtx.getNameInNamespace());
 
-        if(dn.contains(baseDn)) {
-            return dn;
-        }
+		if (dn.contains(baseDn)) {
+			return dn;
+		}
 
-        baseDn.append(dn);
+		baseDn.append(dn);
 
-        return baseDn;
-    }
+		return baseDn;
+	}
 
-    public static String convertPasswordToString(Object passObj) {
-        Assert.notNull(passObj, "Password object to convert must not be null");
+	public static String convertPasswordToString(Object passObj) {
+		Assert.notNull(passObj, "Password object to convert must not be null");
 
-        if(passObj instanceof byte[]) {
-            return Utf8.decode((byte[])passObj);
-        } else if (passObj instanceof String) {
-            return (String)passObj;
-        } else {
-            throw new IllegalArgumentException("Password object was not a String or byte array.");
-        }
-    }
+		if (passObj instanceof byte[]) {
+			return Utf8.decode((byte[]) passObj);
+		}
+		else if (passObj instanceof String) {
+			return (String) passObj;
+		}
+		else {
+			throw new IllegalArgumentException(
+					"Password object was not a String or byte array.");
+		}
+	}
 
-    /**
-     * Works out the root DN for an LDAP URL.<p>For example, the URL
-     * <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt> has the root DN "dc=springframework,dc=org".</p>
-     *
-     * @param url the LDAP URL
-     *
-     * @return the root DN
-     */
-    public static String parseRootDnFromUrl(String url) {
-        Assert.hasLength(url);
+	/**
+	 * Works out the root DN for an LDAP URL.
+	 * <p>
+	 * For example, the URL <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt>
+	 * has the root DN "dc=springframework,dc=org".
+	 * </p>
+	 *
+	 * @param url the LDAP URL
+	 *
+	 * @return the root DN
+	 */
+	public static String parseRootDnFromUrl(String url) {
+		Assert.hasLength(url);
 
-        String urlRootDn;
+		String urlRootDn;
 
-        if (url.startsWith("ldap:") || url.startsWith("ldaps:")) {
-            URI uri = parseLdapUrl(url);
-            urlRootDn = uri.getRawPath();
-        } else {
-            // Assume it's an embedded server
-            urlRootDn = url;
-        }
+		if (url.startsWith("ldap:") || url.startsWith("ldaps:")) {
+			URI uri = parseLdapUrl(url);
+			urlRootDn = uri.getRawPath();
+		}
+		else {
+			// Assume it's an embedded server
+			urlRootDn = url;
+		}
 
-        if (urlRootDn.startsWith("/")) {
-            urlRootDn = urlRootDn.substring(1);
-        }
+		if (urlRootDn.startsWith("/")) {
+			urlRootDn = urlRootDn.substring(1);
+		}
 
-        return urlRootDn;
-    }
+		return urlRootDn;
+	}
 
-    /**
-     * Parses the supplied LDAP URL.
-     * @param url the URL (e.g. <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt>).
-     * @return the URI object created from the URL
-     * @throws IllegalArgumentException if the URL is null, empty or the URI syntax is invalid.
-     */
+	/**
+	 * Parses the supplied LDAP URL.
+	 * @param url the URL (e.g.
+	 * <tt>ldap://monkeymachine:11389/dc=springframework,dc=org</tt>).
+	 * @return the URI object created from the URL
+	 * @throws IllegalArgumentException if the URL is null, empty or the URI syntax is
+	 * invalid.
+	 */
 
-    private static URI parseLdapUrl(String url) {
-        Assert.hasLength(url);
+	private static URI parseLdapUrl(String url) {
+		Assert.hasLength(url);
 
-        try {
-            return new URI(url);
-        } catch (URISyntaxException e) {
-            IllegalArgumentException iae = new IllegalArgumentException("Unable to parse url: " + url);
-            iae.initCause(e);
-            throw iae;
-        }
-    }
+		try {
+			return new URI(url);
+		}
+		catch (URISyntaxException e) {
+			IllegalArgumentException iae = new IllegalArgumentException(
+					"Unable to parse url: " + url);
+			iae.initCause(e);
+			throw iae;
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
index 62c4f99e73..98766e6564 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
@@ -44,9 +44,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-
 /**
- * Extension of Spring LDAP's LdapTemplate class which adds extra functionality required by Spring Security.
+ * Extension of Spring LDAP's LdapTemplate class which adds extra functionality required
+ * by Spring Security.
  *
  * @author Ben Alex
  * @author Luke Taylor
@@ -54,310 +54,340 @@ import java.util.Set;
  * @since 2.0
  */
 public class SpringSecurityLdapTemplate extends LdapTemplate {
-    //~ Static fields/initializers =====================================================================================
-    private static final Log logger = LogFactory.getLog(SpringSecurityLdapTemplate.class);
+	// ~ Static fields/initializers
+	// =====================================================================================
+	private static final Log logger = LogFactory.getLog(SpringSecurityLdapTemplate.class);
 
-    public static final String[] NO_ATTRS = new String[0];
-    
-    /**
-     * Every search results where a record is defined by a Map&lt;String,String[]&gt;
-     * contains at least this key - the DN of the record itself.
-     */
-    public static final String DN_KEY = "spring.security.ldap.dn";
+	public static final String[] NO_ATTRS = new String[0];
 
-    private static final boolean RETURN_OBJECT = true;
+	/**
+	 * Every search results where a record is defined by a Map&lt;String,String[]&gt;
+	 * contains at least this key - the DN of the record itself.
+	 */
+	public static final String DN_KEY = "spring.security.ldap.dn";
 
-    //~ Instance fields ================================================================================================
+	private static final boolean RETURN_OBJECT = true;
 
-    /** Default search controls */
-    private SearchControls searchControls = new SearchControls();
+	// ~ Instance fields
+	// ================================================================================================
 
-    //~ Constructors ===================================================================================================
+	/** Default search controls */
+	private SearchControls searchControls = new SearchControls();
 
-    public SpringSecurityLdapTemplate(ContextSource contextSource) {
-        Assert.notNull(contextSource, "ContextSource cannot be null");
-        setContextSource(contextSource);
+	// ~ Constructors
+	// ===================================================================================================
 
-        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
-    }
+	public SpringSecurityLdapTemplate(ContextSource contextSource) {
+		Assert.notNull(contextSource, "ContextSource cannot be null");
+		setContextSource(contextSource);
 
-    //~ Methods ========================================================================================================
+		searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+	}
 
-    /**
-     * Performs an LDAP compare operation of the value of an attribute for a particular directory entry.
-     *
-     * @param dn the entry who's attribute is to be used
-     * @param attributeName the attribute who's value we want to compare
-     * @param value the value to be checked against the directory value
-     *
-     * @return true if the supplied value matches that in the directory
-     */
-    public boolean compare(final String dn, final String attributeName, final Object value) {
-        final String comparisonFilter = "(" + attributeName + "={0})";
+	// ~ Methods
+	// ========================================================================================================
 
-        class LdapCompareCallback implements ContextExecutor {
+	/**
+	 * Performs an LDAP compare operation of the value of an attribute for a particular
+	 * directory entry.
+	 *
+	 * @param dn the entry who's attribute is to be used
+	 * @param attributeName the attribute who's value we want to compare
+	 * @param value the value to be checked against the directory value
+	 *
+	 * @return true if the supplied value matches that in the directory
+	 */
+	public boolean compare(final String dn, final String attributeName, final Object value) {
+		final String comparisonFilter = "(" + attributeName + "={0})";
 
-            public Object executeWithContext(DirContext ctx) throws NamingException {
-                SearchControls ctls = new SearchControls();
-                ctls.setReturningAttributes(NO_ATTRS);
-                ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
+		class LdapCompareCallback implements ContextExecutor {
 
-                NamingEnumeration<SearchResult> results = ctx.search(dn, comparisonFilter, new Object[] {value}, ctls);
+			public Object executeWithContext(DirContext ctx) throws NamingException {
+				SearchControls ctls = new SearchControls();
+				ctls.setReturningAttributes(NO_ATTRS);
+				ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
 
-                Boolean match = Boolean.valueOf(results.hasMore());
-                LdapUtils.closeEnumeration(results);
+				NamingEnumeration<SearchResult> results = ctx.search(dn,
+						comparisonFilter, new Object[] { value }, ctls);
 
-                return match;
-            }
-        }
+				Boolean match = Boolean.valueOf(results.hasMore());
+				LdapUtils.closeEnumeration(results);
 
-        Boolean matches = (Boolean) executeReadOnly(new LdapCompareCallback());
+				return match;
+			}
+		}
 
-        return matches.booleanValue();
-    }
+		Boolean matches = (Boolean) executeReadOnly(new LdapCompareCallback());
 
-    /**
-     * Composes an object from the attributes of the given DN.
-     *
-     * @param dn the directory entry which will be read
-     * @param attributesToRetrieve the named attributes which will be retrieved from the directory entry.
-     *
-     * @return the object created by the mapper
-     */
-    public DirContextOperations retrieveEntry(final String dn, final String[] attributesToRetrieve) {
+		return matches.booleanValue();
+	}
 
-        return (DirContextOperations) executeReadOnly(new ContextExecutor() {
-                public Object executeWithContext(DirContext ctx) throws NamingException {
-                    Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve);
+	/**
+	 * Composes an object from the attributes of the given DN.
+	 *
+	 * @param dn the directory entry which will be read
+	 * @param attributesToRetrieve the named attributes which will be retrieved from the
+	 * directory entry.
+	 *
+	 * @return the object created by the mapper
+	 */
+	public DirContextOperations retrieveEntry(final String dn,
+			final String[] attributesToRetrieve) {
 
-                    // Object object = ctx.lookup(LdapUtils.getRelativeName(dn, ctx));
+		return (DirContextOperations) executeReadOnly(new ContextExecutor() {
+			public Object executeWithContext(DirContext ctx) throws NamingException {
+				Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve);
 
-                    return new DirContextAdapter(attrs, new DistinguishedName(dn),
-                            new DistinguishedName(ctx.getNameInNamespace()));
-                }
-            });
-    }
+				// Object object = ctx.lookup(LdapUtils.getRelativeName(dn, ctx));
 
-    /**
-     * Performs a search using the supplied filter and returns the union of the values of the named attribute
-     * found in all entries matched by the search. Note that one directory entry may have several values for the
-     * attribute. Intended for role searches and similar scenarios.
-     *
-     * @param base the DN to search in
-     * @param filter search filter to use
-     * @param params the parameters to substitute in the search filter
-     * @param attributeName the attribute who's values are to be retrieved.
-     *
-     * @return the set of String values for the attribute as a union of the values found in all the matching entries.
-     */
-    public Set<String> searchForSingleAttributeValues(final String base, final String filter, final Object[] params,
-            final String attributeName) {
-        String[] attributeNames = new String[]{attributeName};
-        Set<Map<String, List<String>>> multipleAttributeValues = searchForMultipleAttributeValues(base, filter, params, attributeNames);
-        Set<String> result = new HashSet<String>();
-        for (Map<String, List<String>> map : multipleAttributeValues) {
-            List<String> values = map.get(attributeName);
-            if (values != null) {
-                result.addAll(values);
-            }
-        }
-        return result;
-    }
+				return new DirContextAdapter(attrs, new DistinguishedName(dn),
+						new DistinguishedName(ctx.getNameInNamespace()));
+			}
+		});
+	}
 
-    /**
-     * Performs a search using the supplied filter and returns the values of each named attribute
-     * found in all entries matched by the search. Note that one directory entry may have several values for the
-     * attribute. Intended for role searches and similar scenarios.
-     *
-     * @param base the DN to search in
-     * @param filter search filter to use
-     * @param params the parameters to substitute in the search filter
-     * @param attributeNames the attributes' values that are to be retrieved.
-     *
-     * @return the set of String values for each attribute found in all the matching entries.
-     * The attribute name is the key for each set of values. In addition each map contains the DN as a String
-     * with the key predefined key {@link #DN_KEY}.
-     */
-    public Set<Map<String, List<String>>> searchForMultipleAttributeValues(final String base, final String filter, final Object[] params,
-            final String[] attributeNames) {
-        // Escape the params acording to RFC2254
-        Object[] encodedParams = new String[params.length];
+	/**
+	 * Performs a search using the supplied filter and returns the union of the values of
+	 * the named attribute found in all entries matched by the search. Note that one
+	 * directory entry may have several values for the attribute. Intended for role
+	 * searches and similar scenarios.
+	 *
+	 * @param base the DN to search in
+	 * @param filter search filter to use
+	 * @param params the parameters to substitute in the search filter
+	 * @param attributeName the attribute who's values are to be retrieved.
+	 *
+	 * @return the set of String values for the attribute as a union of the values found
+	 * in all the matching entries.
+	 */
+	public Set<String> searchForSingleAttributeValues(final String base,
+			final String filter, final Object[] params, final String attributeName) {
+		String[] attributeNames = new String[] { attributeName };
+		Set<Map<String, List<String>>> multipleAttributeValues = searchForMultipleAttributeValues(
+				base, filter, params, attributeNames);
+		Set<String> result = new HashSet<String>();
+		for (Map<String, List<String>> map : multipleAttributeValues) {
+			List<String> values = map.get(attributeName);
+			if (values != null) {
+				result.addAll(values);
+			}
+		}
+		return result;
+	}
 
-        for (int i = 0; i < params.length; i++) {
-            encodedParams[i] = LdapEncoder.filterEncode(params[i].toString());
-        }
+	/**
+	 * Performs a search using the supplied filter and returns the values of each named
+	 * attribute found in all entries matched by the search. Note that one directory entry
+	 * may have several values for the attribute. Intended for role searches and similar
+	 * scenarios.
+	 *
+	 * @param base the DN to search in
+	 * @param filter search filter to use
+	 * @param params the parameters to substitute in the search filter
+	 * @param attributeNames the attributes' values that are to be retrieved.
+	 *
+	 * @return the set of String values for each attribute found in all the matching
+	 * entries. The attribute name is the key for each set of values. In addition each map
+	 * contains the DN as a String with the key predefined key {@link #DN_KEY}.
+	 */
+	public Set<Map<String, List<String>>> searchForMultipleAttributeValues(
+			final String base, final String filter, final Object[] params,
+			final String[] attributeNames) {
+		// Escape the params acording to RFC2254
+		Object[] encodedParams = new String[params.length];
 
-        String formattedFilter = MessageFormat.format(filter, encodedParams);
-        logger.debug("Using filter: " + formattedFilter);
+		for (int i = 0; i < params.length; i++) {
+			encodedParams[i] = LdapEncoder.filterEncode(params[i].toString());
+		}
 
-        final HashSet<Map<String, List<String>>> set = new HashSet<Map<String, List<String>>>();
+		String formattedFilter = MessageFormat.format(filter, encodedParams);
+		logger.debug("Using filter: " + formattedFilter);
 
-        ContextMapper roleMapper = new ContextMapper() {
-            public Object mapFromContext(Object ctx) {
-                DirContextAdapter adapter = (DirContextAdapter) ctx;
-                Map<String, List<String>> record = new HashMap<String, List<String>>();
-                if (attributeNames == null || attributeNames.length == 0) {
-                    try {
-                        for (NamingEnumeration ae = adapter.getAttributes().getAll(); ae.hasMore(); ) {
-                            Attribute attr = (Attribute) ae.next();
-                            extractStringAttributeValues(adapter, record, attr.getID());
-                        }
-                    } catch (NamingException x) {
-                        org.springframework.ldap.support.LdapUtils.convertLdapException(x);
-                    }
-                } else {
-                    for (String attributeName : attributeNames) {
-                        extractStringAttributeValues(adapter, record, attributeName);
-                    }
-                }
-                record.put(DN_KEY, Arrays.asList(getAdapterDN(adapter)));
-                set.add(record);
-                return null;
-            }
-        };
+		final HashSet<Map<String, List<String>>> set = new HashSet<Map<String, List<String>>>();
 
-        SearchControls ctls = new SearchControls();
-        ctls.setSearchScope(searchControls.getSearchScope());
-        ctls.setReturningAttributes(attributeNames != null && attributeNames.length > 0 ? attributeNames : null);
+		ContextMapper roleMapper = new ContextMapper() {
+			public Object mapFromContext(Object ctx) {
+				DirContextAdapter adapter = (DirContextAdapter) ctx;
+				Map<String, List<String>> record = new HashMap<String, List<String>>();
+				if (attributeNames == null || attributeNames.length == 0) {
+					try {
+						for (NamingEnumeration ae = adapter.getAttributes().getAll(); ae
+								.hasMore();) {
+							Attribute attr = (Attribute) ae.next();
+							extractStringAttributeValues(adapter, record, attr.getID());
+						}
+					}
+					catch (NamingException x) {
+						org.springframework.ldap.support.LdapUtils
+								.convertLdapException(x);
+					}
+				}
+				else {
+					for (String attributeName : attributeNames) {
+						extractStringAttributeValues(adapter, record, attributeName);
+					}
+				}
+				record.put(DN_KEY, Arrays.asList(getAdapterDN(adapter)));
+				set.add(record);
+				return null;
+			}
+		};
 
-        search(base, formattedFilter, ctls, roleMapper);
+		SearchControls ctls = new SearchControls();
+		ctls.setSearchScope(searchControls.getSearchScope());
+		ctls.setReturningAttributes(attributeNames != null && attributeNames.length > 0 ? attributeNames
+				: null);
 
-        return set;
-    }
+		search(base, formattedFilter, ctls, roleMapper);
 
-    /**
-     * Returns the DN for the context representing this LDAP record.
-     * By default this is using {@link javax.naming.Context#getNameInNamespace()}
-     * instead of {@link org.springframework.ldap.core.DirContextAdapter#getDn()} since the 
-     * latter returns a partial DN if a base has been specified.
-     * @param adapter - the Context to extract the DN from
-     * @return - the String representing the full DN
-     */
-    private String getAdapterDN(DirContextAdapter adapter) {
-        //returns the full DN rather than the sub DN if a base is specified
-        return adapter.getNameInNamespace();
-    }
+		return set;
+	}
 
-    /**
-     * Extracts String values for a specified attribute name and places them in the map representing the ldap record If
-     * a value is not of type String, it will derive it's value from the {@link Object#toString()}
-     *
-     * @param adapter       - the adapter that contains the values
-     * @param record        - the map holding the attribute names and values
-     * @param attributeName - the name for which to fetch the values from
-     */
-    private void extractStringAttributeValues(DirContextAdapter adapter, Map<String, List<String>> record, String attributeName) {
-        Object[] values = adapter.getObjectAttributes(attributeName);
-        if (values == null || values.length == 0) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("No attribute value found for '" + attributeName + "'");
-            }
-            return;
-        }
-        List<String> svalues = new ArrayList<String>();
-        for (Object o : values) {
-            if (o != null) {
-                if (String.class.isAssignableFrom(o.getClass())) {
-                    svalues.add((String) o);
-                } else {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Attribute:" + attributeName + " contains a non string value of type[" + o.getClass() + "]");
-                    }
-                    svalues.add(o.toString());
-                }
-            }
-        }
-        record.put(attributeName, svalues);
-    }
+	/**
+	 * Returns the DN for the context representing this LDAP record. By default this is
+	 * using {@link javax.naming.Context#getNameInNamespace()} instead of
+	 * {@link org.springframework.ldap.core.DirContextAdapter#getDn()} since the latter
+	 * returns a partial DN if a base has been specified.
+	 * @param adapter - the Context to extract the DN from
+	 * @return - the String representing the full DN
+	 */
+	private String getAdapterDN(DirContextAdapter adapter) {
+		// returns the full DN rather than the sub DN if a base is specified
+		return adapter.getNameInNamespace();
+	}
 
-    /**
-     * Performs a search, with the requirement that the search shall return a single directory entry, and uses
-     * the supplied mapper to create the object from that entry.
-     * <p>
-     * Ignores <tt>PartialResultException</tt> if thrown, for compatibility with Active Directory
-     * (see {@link LdapTemplate#setIgnorePartialResultException(boolean)}).
-     *
-     * @param base the search base, relative to the base context supplied by the context source.
-     * @param filter the LDAP search filter
-     * @param params parameters to be substituted in the search.
-     *
-     * @return a DirContextOperations instance created from the matching entry.
-     *
-     * @throws IncorrectResultSizeDataAccessException if no results are found or the search returns more than one
-     *         result.
-     */
-    public DirContextOperations searchForSingleEntry(final String base, final String filter, final Object[] params) {
+	/**
+	 * Extracts String values for a specified attribute name and places them in the map
+	 * representing the ldap record If a value is not of type String, it will derive it's
+	 * value from the {@link Object#toString()}
+	 *
+	 * @param adapter - the adapter that contains the values
+	 * @param record - the map holding the attribute names and values
+	 * @param attributeName - the name for which to fetch the values from
+	 */
+	private void extractStringAttributeValues(DirContextAdapter adapter,
+			Map<String, List<String>> record, String attributeName) {
+		Object[] values = adapter.getObjectAttributes(attributeName);
+		if (values == null || values.length == 0) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("No attribute value found for '" + attributeName + "'");
+			}
+			return;
+		}
+		List<String> svalues = new ArrayList<String>();
+		for (Object o : values) {
+			if (o != null) {
+				if (String.class.isAssignableFrom(o.getClass())) {
+					svalues.add((String) o);
+				}
+				else {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Attribute:" + attributeName
+								+ " contains a non string value of type[" + o.getClass()
+								+ "]");
+					}
+					svalues.add(o.toString());
+				}
+			}
+		}
+		record.put(attributeName, svalues);
+	}
 
-        return (DirContextOperations) executeReadOnly(new ContextExecutor() {
-                public Object executeWithContext(DirContext ctx) throws NamingException {
-                    return searchForSingleEntryInternal(ctx, searchControls, base, filter, params);
-                }
-        });
-    }
+	/**
+	 * Performs a search, with the requirement that the search shall return a single
+	 * directory entry, and uses the supplied mapper to create the object from that entry.
+	 * <p>
+	 * Ignores <tt>PartialResultException</tt> if thrown, for compatibility with Active
+	 * Directory (see {@link LdapTemplate#setIgnorePartialResultException(boolean)}).
+	 *
+	 * @param base the search base, relative to the base context supplied by the context
+	 * source.
+	 * @param filter the LDAP search filter
+	 * @param params parameters to be substituted in the search.
+	 *
+	 * @return a DirContextOperations instance created from the matching entry.
+	 *
+	 * @throws IncorrectResultSizeDataAccessException if no results are found or the
+	 * search returns more than one result.
+	 */
+	public DirContextOperations searchForSingleEntry(final String base,
+			final String filter, final Object[] params) {
 
-    /**
-     * Internal method extracted to avoid code duplication in AD search.
-     */
-    public static DirContextOperations searchForSingleEntryInternal(DirContext ctx, SearchControls searchControls,
-            String base, String filter, Object[] params) throws NamingException {
-        final DistinguishedName ctxBaseDn = new DistinguishedName(ctx.getNameInNamespace());
-        final DistinguishedName searchBaseDn = new DistinguishedName(base);
-        final NamingEnumeration<SearchResult> resultsEnum = ctx.search(searchBaseDn, filter, params, buildControls(searchControls));
+		return (DirContextOperations) executeReadOnly(new ContextExecutor() {
+			public Object executeWithContext(DirContext ctx) throws NamingException {
+				return searchForSingleEntryInternal(ctx, searchControls, base, filter,
+						params);
+			}
+		});
+	}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Searching for entry under DN '" + ctxBaseDn
-                    + "', base = '" + searchBaseDn + "', filter = '" + filter + "'");
-        }
+	/**
+	 * Internal method extracted to avoid code duplication in AD search.
+	 */
+	public static DirContextOperations searchForSingleEntryInternal(DirContext ctx,
+			SearchControls searchControls, String base, String filter, Object[] params)
+			throws NamingException {
+		final DistinguishedName ctxBaseDn = new DistinguishedName(
+				ctx.getNameInNamespace());
+		final DistinguishedName searchBaseDn = new DistinguishedName(base);
+		final NamingEnumeration<SearchResult> resultsEnum = ctx.search(searchBaseDn,
+				filter, params, buildControls(searchControls));
 
-        Set<DirContextOperations> results = new HashSet<DirContextOperations>();
-        try {
-            while (resultsEnum.hasMore()) {
-                SearchResult searchResult = resultsEnum.next();
-                DirContextAdapter dca = (DirContextAdapter) searchResult.getObject();
-                Assert.notNull(dca, "No object returned by search, DirContext is not correctly configured");
+		if (logger.isDebugEnabled()) {
+			logger.debug("Searching for entry under DN '" + ctxBaseDn + "', base = '"
+					+ searchBaseDn + "', filter = '" + filter + "'");
+		}
 
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Found DN: " + dca.getDn());
-                }
-                results.add(dca);
-            }
-        } catch (PartialResultException e) {
-            LdapUtils.closeEnumeration(resultsEnum);
-            logger.info("Ignoring PartialResultException");
-        }
+		Set<DirContextOperations> results = new HashSet<DirContextOperations>();
+		try {
+			while (resultsEnum.hasMore()) {
+				SearchResult searchResult = resultsEnum.next();
+				DirContextAdapter dca = (DirContextAdapter) searchResult.getObject();
+				Assert.notNull(dca,
+						"No object returned by search, DirContext is not correctly configured");
 
-        if (results.size() == 0) {
-            throw new IncorrectResultSizeDataAccessException(1, 0);
-        }
+				if (logger.isDebugEnabled()) {
+					logger.debug("Found DN: " + dca.getDn());
+				}
+				results.add(dca);
+			}
+		}
+		catch (PartialResultException e) {
+			LdapUtils.closeEnumeration(resultsEnum);
+			logger.info("Ignoring PartialResultException");
+		}
 
-        if (results.size() > 1) {
-            throw new IncorrectResultSizeDataAccessException(1, results.size());
-        }
+		if (results.size() == 0) {
+			throw new IncorrectResultSizeDataAccessException(1, 0);
+		}
 
-        return results.iterator().next();
-    }
+		if (results.size() > 1) {
+			throw new IncorrectResultSizeDataAccessException(1, results.size());
+		}
 
-    /**
-     * We need to make sure the search controls has the return object flag set to true, in order for
-     * the search to return DirContextAdapter instances.
-     * @param originalControls
-     * @return
-     */
-    private static SearchControls buildControls(SearchControls originalControls) {
-        return new SearchControls(originalControls.getSearchScope(),
-                originalControls.getCountLimit(),
-                originalControls.getTimeLimit(),
-                originalControls.getReturningAttributes(),
-                RETURN_OBJECT,
-                originalControls.getDerefLinkFlag());
-    }
+		return results.iterator().next();
+	}
 
-    /**
-     * Sets the search controls which will be used for search operations by the template.
-     *
-     * @param searchControls the SearchControls instance which will be cached in the template.
-     */
-    public void setSearchControls(SearchControls searchControls) {
-        this.searchControls = searchControls;
-    }
+	/**
+	 * We need to make sure the search controls has the return object flag set to true, in
+	 * order for the search to return DirContextAdapter instances.
+	 * @param originalControls
+	 * @return
+	 */
+	private static SearchControls buildControls(SearchControls originalControls) {
+		return new SearchControls(originalControls.getSearchScope(),
+				originalControls.getCountLimit(), originalControls.getTimeLimit(),
+				originalControls.getReturningAttributes(), RETURN_OBJECT,
+				originalControls.getDerefLinkFlag());
+	}
+
+	/**
+	 * Sets the search controls which will be used for search operations by the template.
+	 *
+	 * @param searchControls the SearchControls instance which will be cached in the
+	 * template.
+	 */
+	public void setSearchControls(SearchControls searchControls) {
+		this.searchControls = searchControls;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticationProvider.java
index f5aff4fa41..85ab08e5f8 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticationProvider.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticationProvider.java
@@ -44,110 +44,126 @@ import java.util.*;
  * @author Luke Taylor
  * @since 3.1
  */
-public abstract class AbstractLdapAuthenticationProvider implements AuthenticationProvider, MessageSourceAware {
-    protected final Log logger = LogFactory.getLog(getClass());
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private boolean useAuthenticationRequestCredentials = true;
-    private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
-    protected UserDetailsContextMapper userDetailsContextMapper = new LdapUserDetailsMapper();
+public abstract class AbstractLdapAuthenticationProvider implements
+		AuthenticationProvider, MessageSourceAware {
+	protected final Log logger = LogFactory.getLog(getClass());
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private boolean useAuthenticationRequestCredentials = true;
+	private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
+	protected UserDetailsContextMapper userDetailsContextMapper = new LdapUserDetailsMapper();
 
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
-            messages.getMessage("LdapAuthenticationProvider.onlySupports",
-                "Only UsernamePasswordAuthenticationToken is supported"));
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
+				messages.getMessage("LdapAuthenticationProvider.onlySupports",
+						"Only UsernamePasswordAuthenticationToken is supported"));
 
-        final UsernamePasswordAuthenticationToken userToken = (UsernamePasswordAuthenticationToken)authentication;
+		final UsernamePasswordAuthenticationToken userToken = (UsernamePasswordAuthenticationToken) authentication;
 
-        String username = userToken.getName();
-        String password = (String) authentication.getCredentials();
+		String username = userToken.getName();
+		String password = (String) authentication.getCredentials();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Processing authentication request for user: " + username);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Processing authentication request for user: " + username);
+		}
 
-        if (!StringUtils.hasLength(username)) {
-            throw new BadCredentialsException(messages.getMessage("LdapAuthenticationProvider.emptyUsername",
-                    "Empty Username"));
-        }
+		if (!StringUtils.hasLength(username)) {
+			throw new BadCredentialsException(messages.getMessage(
+					"LdapAuthenticationProvider.emptyUsername", "Empty Username"));
+		}
 
-        if (!StringUtils.hasLength(password)) {
-            throw new BadCredentialsException(messages.getMessage("AbstractLdapAuthenticationProvider.emptyPassword",
-                    "Empty Password"));
-        }
+		if (!StringUtils.hasLength(password)) {
+			throw new BadCredentialsException(messages.getMessage(
+					"AbstractLdapAuthenticationProvider.emptyPassword", "Empty Password"));
+		}
 
-        Assert.notNull(password, "Null password was supplied in authentication token");
+		Assert.notNull(password, "Null password was supplied in authentication token");
 
-        DirContextOperations userData = doAuthentication(userToken);
+		DirContextOperations userData = doAuthentication(userToken);
 
-        UserDetails user = userDetailsContextMapper.mapUserFromContext(userData, authentication.getName(),
-                    loadUserAuthorities(userData, authentication.getName(), (String)authentication.getCredentials()));
+		UserDetails user = userDetailsContextMapper.mapUserFromContext(
+				userData,
+				authentication.getName(),
+				loadUserAuthorities(userData, authentication.getName(),
+						(String) authentication.getCredentials()));
 
-        return createSuccessfulAuthentication(userToken, user);
-    }
+		return createSuccessfulAuthentication(userToken, user);
+	}
 
-    protected abstract DirContextOperations doAuthentication(UsernamePasswordAuthenticationToken auth);
+	protected abstract DirContextOperations doAuthentication(
+			UsernamePasswordAuthenticationToken auth);
 
-    protected abstract Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username, String password);
+	protected abstract Collection<? extends GrantedAuthority> loadUserAuthorities(
+			DirContextOperations userData, String username, String password);
 
-    /**
-     * Creates the final {@code Authentication} object which will be returned from the {@code authenticate} method.
-     *
-     * @param authentication the original authentication request token
-     * @param user the <tt>UserDetails</tt> instance returned by the configured <tt>UserDetailsContextMapper</tt>.
-     * @return the Authentication object for the fully authenticated user.
-     */
-    protected Authentication createSuccessfulAuthentication(UsernamePasswordAuthenticationToken authentication,
-            UserDetails user) {
-        Object password = useAuthenticationRequestCredentials ? authentication.getCredentials() : user.getPassword();
+	/**
+	 * Creates the final {@code Authentication} object which will be returned from the
+	 * {@code authenticate} method.
+	 *
+	 * @param authentication the original authentication request token
+	 * @param user the <tt>UserDetails</tt> instance returned by the configured
+	 * <tt>UserDetailsContextMapper</tt>.
+	 * @return the Authentication object for the fully authenticated user.
+	 */
+	protected Authentication createSuccessfulAuthentication(
+			UsernamePasswordAuthenticationToken authentication, UserDetails user) {
+		Object password = useAuthenticationRequestCredentials ? authentication
+				.getCredentials() : user.getPassword();
 
-        UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(user, password,
-                authoritiesMapper.mapAuthorities(user.getAuthorities()));
-        result.setDetails(authentication.getDetails());
+		UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(
+				user, password, authoritiesMapper.mapAuthorities(user.getAuthorities()));
+		result.setDetails(authentication.getDetails());
 
-        return result;
-    }
+		return result;
+	}
 
-    public boolean supports(Class<?> authentication) {
-        return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication);
-    }
+	public boolean supports(Class<?> authentication) {
+		return UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication);
+	}
 
-    /**
-     * Determines whether the supplied password will be used as the credentials in the successful authentication
-     * token. If set to false, then the password will be obtained from the UserDetails object
-     * created by the configured {@code UserDetailsContextMapper}.
-     * Often it will not be possible to read the password from the directory, so defaults to true.
-     *
-     * @param useAuthenticationRequestCredentials
-     */
-    public void setUseAuthenticationRequestCredentials(boolean useAuthenticationRequestCredentials) {
-        this.useAuthenticationRequestCredentials = useAuthenticationRequestCredentials;
-    }
+	/**
+	 * Determines whether the supplied password will be used as the credentials in the
+	 * successful authentication token. If set to false, then the password will be
+	 * obtained from the UserDetails object created by the configured
+	 * {@code UserDetailsContextMapper}. Often it will not be possible to read the
+	 * password from the directory, so defaults to true.
+	 *
+	 * @param useAuthenticationRequestCredentials
+	 */
+	public void setUseAuthenticationRequestCredentials(
+			boolean useAuthenticationRequestCredentials) {
+		this.useAuthenticationRequestCredentials = useAuthenticationRequestCredentials;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
-        this.authoritiesMapper = authoritiesMapper;
-    }
+	public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
+		this.authoritiesMapper = authoritiesMapper;
+	}
 
-    /**
-     * Allows a custom strategy to be used for creating the <tt>UserDetails</tt> which will be stored as the principal
-     * in the <tt>Authentication</tt> returned by the
-     * {@link #createSuccessfulAuthentication(org.springframework.security.authentication.UsernamePasswordAuthenticationToken, org.springframework.security.core.userdetails.UserDetails)} method.
-     *
-     * @param userDetailsContextMapper the strategy instance. If not set, defaults to a simple
-     * <tt>LdapUserDetailsMapper</tt>.
-     */
-    public void setUserDetailsContextMapper(UserDetailsContextMapper userDetailsContextMapper) {
-        Assert.notNull(userDetailsContextMapper, "UserDetailsContextMapper must not be null");
-        this.userDetailsContextMapper = userDetailsContextMapper;
-    }
+	/**
+	 * Allows a custom strategy to be used for creating the <tt>UserDetails</tt> which
+	 * will be stored as the principal in the <tt>Authentication</tt> returned by the
+	 * {@link #createSuccessfulAuthentication(org.springframework.security.authentication.UsernamePasswordAuthenticationToken, org.springframework.security.core.userdetails.UserDetails)}
+	 * method.
+	 *
+	 * @param userDetailsContextMapper the strategy instance. If not set, defaults to a
+	 * simple <tt>LdapUserDetailsMapper</tt>.
+	 */
+	public void setUserDetailsContextMapper(
+			UserDetailsContextMapper userDetailsContextMapper) {
+		Assert.notNull(userDetailsContextMapper,
+				"UserDetailsContextMapper must not be null");
+		this.userDetailsContextMapper = userDetailsContextMapper;
+	}
 
-    /**
-     * Provides access to the injected {@code UserDetailsContextMapper} strategy for use by subclasses.
-     */
-    protected UserDetailsContextMapper getUserDetailsContextMapper() {
-        return userDetailsContextMapper;
-    }
+	/**
+	 * Provides access to the injected {@code UserDetailsContextMapper} strategy for use
+	 * by subclasses.
+	 */
+	protected UserDetailsContextMapper getUserDetailsContextMapper() {
+		return userDetailsContextMapper;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java
index 27ee5e0c1d..57ee94a198 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java
@@ -29,116 +29,130 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * Base class for the authenticator implementations.
  *
  * @author Luke Taylor
  */
-public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, InitializingBean, MessageSourceAware {
-    //~ Instance fields ================================================================================================
+public abstract class AbstractLdapAuthenticator implements LdapAuthenticator,
+		InitializingBean, MessageSourceAware {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final ContextSource contextSource;
+	private final ContextSource contextSource;
 
-    /** Optional search object which can be used to locate a user when a simple DN match isn't sufficient */
-    private LdapUserSearch userSearch;
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	/**
+	 * Optional search object which can be used to locate a user when a simple DN match
+	 * isn't sufficient
+	 */
+	private LdapUserSearch userSearch;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-    /** The attributes which will be retrieved from the directory. Null means all attributes */
-    private String[] userAttributes = null;
+	/**
+	 * The attributes which will be retrieved from the directory. Null means all
+	 * attributes
+	 */
+	private String[] userAttributes = null;
 
-    //private String[] userDnPattern = null;
-    /** Stores the patterns which are used as potential DN matches */
-    private MessageFormat[] userDnFormat = null;
+	// private String[] userDnPattern = null;
+	/** Stores the patterns which are used as potential DN matches */
+	private MessageFormat[] userDnFormat = null;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Create an initialized instance with the {@link ContextSource} provided.
-     *
-     * @param contextSource
-     */
-    public AbstractLdapAuthenticator(ContextSource contextSource) {
-        Assert.notNull(contextSource, "contextSource must not be null.");
-        this.contextSource = contextSource;
-    }
+	/**
+	 * Create an initialized instance with the {@link ContextSource} provided.
+	 *
+	 * @param contextSource
+	 */
+	public AbstractLdapAuthenticator(ContextSource contextSource) {
+		Assert.notNull(contextSource, "contextSource must not be null.");
+		this.contextSource = contextSource;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.isTrue((userDnFormat != null) || (userSearch != null),
-                "Either an LdapUserSearch or DN pattern (or both) must be supplied.");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.isTrue((userDnFormat != null) || (userSearch != null),
+				"Either an LdapUserSearch or DN pattern (or both) must be supplied.");
+	}
 
-    protected ContextSource getContextSource() {
-        return contextSource;
-    }
+	protected ContextSource getContextSource() {
+		return contextSource;
+	}
 
-    public String[] getUserAttributes() {
-        return userAttributes;
-    }
+	public String[] getUserAttributes() {
+		return userAttributes;
+	}
 
-    /**
-     * Builds list of possible DNs for the user, worked out from the <tt>userDnPatterns</tt> property.
-     *
-     * @param username the user's login name
-     *
-     * @return the list of possible DN matches, empty if <tt>userDnPatterns</tt> wasn't set.
-     */
-    protected List<String> getUserDns(String username) {
-        if (userDnFormat == null) {
-            return Collections.emptyList();
-        }
+	/**
+	 * Builds list of possible DNs for the user, worked out from the
+	 * <tt>userDnPatterns</tt> property.
+	 *
+	 * @param username the user's login name
+	 *
+	 * @return the list of possible DN matches, empty if <tt>userDnPatterns</tt> wasn't
+	 * set.
+	 */
+	protected List<String> getUserDns(String username) {
+		if (userDnFormat == null) {
+			return Collections.emptyList();
+		}
 
-        List<String> userDns = new ArrayList<String>(userDnFormat.length);
-        String[] args = new String[] {LdapEncoder.nameEncode(username)};
+		List<String> userDns = new ArrayList<String>(userDnFormat.length);
+		String[] args = new String[] { LdapEncoder.nameEncode(username) };
 
-        synchronized (userDnFormat) {
-            for (MessageFormat formatter : userDnFormat) {
-                userDns.add(formatter.format(args));
-            }
-        }
+		synchronized (userDnFormat) {
+			for (MessageFormat formatter : userDnFormat) {
+				userDns.add(formatter.format(args));
+			}
+		}
 
-        return userDns;
-    }
+		return userDns;
+	}
 
-    protected LdapUserSearch getUserSearch() {
-        return userSearch;
-    }
+	protected LdapUserSearch getUserSearch() {
+		return userSearch;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        Assert.notNull("Message source must not be null");
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		Assert.notNull("Message source must not be null");
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    /**
-     * Sets the user attributes which will be retrieved from the directory.
-     *
-     * @param userAttributes
-     */
-    public void setUserAttributes(String[] userAttributes) {
-        Assert.notNull(userAttributes, "The userAttributes property cannot be set to null");
-        this.userAttributes = userAttributes;
-    }
+	/**
+	 * Sets the user attributes which will be retrieved from the directory.
+	 *
+	 * @param userAttributes
+	 */
+	public void setUserAttributes(String[] userAttributes) {
+		Assert.notNull(userAttributes,
+				"The userAttributes property cannot be set to null");
+		this.userAttributes = userAttributes;
+	}
 
-    /**
-     * Sets the pattern which will be used to supply a DN for the user. The pattern should be the name relative
-     * to the root DN. The pattern argument {0} will contain the username. An example would be "cn={0},ou=people".
-     *
-     * @param dnPattern the array of patterns which will be tried when converting a username to a DN.
-     */
-    public void setUserDnPatterns(String[] dnPattern) {
-        Assert.notNull(dnPattern, "The array of DN patterns cannot be set to null");
-//        this.userDnPattern = dnPattern;
-        userDnFormat = new MessageFormat[dnPattern.length];
+	/**
+	 * Sets the pattern which will be used to supply a DN for the user. The pattern should
+	 * be the name relative to the root DN. The pattern argument {0} will contain the
+	 * username. An example would be "cn={0},ou=people".
+	 *
+	 * @param dnPattern the array of patterns which will be tried when converting a
+	 * username to a DN.
+	 */
+	public void setUserDnPatterns(String[] dnPattern) {
+		Assert.notNull(dnPattern, "The array of DN patterns cannot be set to null");
+		// this.userDnPattern = dnPattern;
+		userDnFormat = new MessageFormat[dnPattern.length];
 
-        for (int i = 0; i < dnPattern.length; i++) {
-            userDnFormat[i] = new MessageFormat(dnPattern[i]);
-        }
-    }
+		for (int i = 0; i < dnPattern.length; i++) {
+			userDnFormat[i] = new MessageFormat(dnPattern[i]);
+		}
+	}
 
-    public void setUserSearch(LdapUserSearch userSearch) {
-        Assert.notNull(userSearch, "The userSearch cannot be set to null");
-        this.userSearch = userSearch;
-    }
+	public void setUserSearch(LdapUserSearch userSearch) {
+		Assert.notNull(userSearch, "The userSearch cannot be set to null");
+		this.userSearch = userSearch;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java
index 9ab1c7933b..70868ec56f 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/BindAuthenticator.java
@@ -34,7 +34,6 @@ import org.springframework.security.ldap.ppolicy.PasswordPolicyControlExtractor;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-
 /**
  * An authenticator which binds as a user.
  *
@@ -43,113 +42,126 @@ import org.springframework.util.StringUtils;
  * @see AbstractLdapAuthenticator
  */
 public class BindAuthenticator extends AbstractLdapAuthenticator {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(BindAuthenticator.class);
+	private static final Log logger = LogFactory.getLog(BindAuthenticator.class);
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Create an initialized instance using the {@link BaseLdapPathContextSource} provided.
-     *
-     * @param contextSource the BaseLdapPathContextSource instance against which bind operations will be
-     * performed.
-     *
-     */
-    public BindAuthenticator(BaseLdapPathContextSource contextSource) {
-        super(contextSource);
-    }
+	/**
+	 * Create an initialized instance using the {@link BaseLdapPathContextSource}
+	 * provided.
+	 *
+	 * @param contextSource the BaseLdapPathContextSource instance against which bind
+	 * operations will be performed.
+	 *
+	 */
+	public BindAuthenticator(BaseLdapPathContextSource contextSource) {
+		super(contextSource);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public DirContextOperations authenticate(Authentication authentication) {
-        DirContextOperations user = null;
-        Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
-                "Can only process UsernamePasswordAuthenticationToken objects");
+	public DirContextOperations authenticate(Authentication authentication) {
+		DirContextOperations user = null;
+		Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
+				"Can only process UsernamePasswordAuthenticationToken objects");
 
-        String username = authentication.getName();
-        String password = (String)authentication.getCredentials();
+		String username = authentication.getName();
+		String password = (String) authentication.getCredentials();
 
-        if (!StringUtils.hasLength(password)) {
-            logger.debug("Rejecting empty password for user " + username);
-            throw new BadCredentialsException(messages.getMessage("BindAuthenticator.emptyPassword",
-                    "Empty Password"));
-        }
+		if (!StringUtils.hasLength(password)) {
+			logger.debug("Rejecting empty password for user " + username);
+			throw new BadCredentialsException(messages.getMessage(
+					"BindAuthenticator.emptyPassword", "Empty Password"));
+		}
 
-        // If DN patterns are configured, try authenticating with them directly
-        for (String dn : getUserDns(username)) {
-            user = bindWithDn(dn, username, password);
+		// If DN patterns are configured, try authenticating with them directly
+		for (String dn : getUserDns(username)) {
+			user = bindWithDn(dn, username, password);
 
-            if (user != null) {
-                break;
-            }
-        }
+			if (user != null) {
+				break;
+			}
+		}
 
-        // Otherwise use the configured search object to find the user and authenticate with the returned DN.
-        if (user == null && getUserSearch() != null) {
-            DirContextOperations userFromSearch = getUserSearch().searchForUser(username);
-            user = bindWithDn(userFromSearch.getDn().toString(), username, password);
-        }
+		// Otherwise use the configured search object to find the user and authenticate
+		// with the returned DN.
+		if (user == null && getUserSearch() != null) {
+			DirContextOperations userFromSearch = getUserSearch().searchForUser(username);
+			user = bindWithDn(userFromSearch.getDn().toString(), username, password);
+		}
 
-        if (user == null) {
-            throw new BadCredentialsException(
-                    messages.getMessage("BindAuthenticator.badCredentials", "Bad credentials"));
-        }
+		if (user == null) {
+			throw new BadCredentialsException(messages.getMessage(
+					"BindAuthenticator.badCredentials", "Bad credentials"));
+		}
 
-        return user;
-    }
+		return user;
+	}
 
-    private DirContextOperations bindWithDn(String userDnStr, String username, String password) {
-        BaseLdapPathContextSource ctxSource = (BaseLdapPathContextSource) getContextSource();
-        DistinguishedName userDn = new DistinguishedName(userDnStr);
-        DistinguishedName fullDn = new DistinguishedName(userDn);
-        fullDn.prepend(ctxSource.getBaseLdapPath());
+	private DirContextOperations bindWithDn(String userDnStr, String username,
+			String password) {
+		BaseLdapPathContextSource ctxSource = (BaseLdapPathContextSource) getContextSource();
+		DistinguishedName userDn = new DistinguishedName(userDnStr);
+		DistinguishedName fullDn = new DistinguishedName(userDn);
+		fullDn.prepend(ctxSource.getBaseLdapPath());
 
-        logger.debug("Attempting to bind as " + fullDn);
+		logger.debug("Attempting to bind as " + fullDn);
 
-        DirContext ctx = null;
-        try {
-            ctx = getContextSource().getContext(fullDn.toString(), password);
-            // Check for password policy control
-            PasswordPolicyControl ppolicy = PasswordPolicyControlExtractor.extractControl(ctx);
+		DirContext ctx = null;
+		try {
+			ctx = getContextSource().getContext(fullDn.toString(), password);
+			// Check for password policy control
+			PasswordPolicyControl ppolicy = PasswordPolicyControlExtractor
+					.extractControl(ctx);
 
-            logger.debug("Retrieving attributes...");
+			logger.debug("Retrieving attributes...");
 
-            Attributes attrs = ctx.getAttributes(userDn, getUserAttributes());
+			Attributes attrs = ctx.getAttributes(userDn, getUserAttributes());
 
-            DirContextAdapter result = new DirContextAdapter(attrs, userDn, ctxSource.getBaseLdapPath());
+			DirContextAdapter result = new DirContextAdapter(attrs, userDn,
+					ctxSource.getBaseLdapPath());
 
-            if (ppolicy != null) {
-                result.setAttributeValue(ppolicy.getID(), ppolicy);
-            }
+			if (ppolicy != null) {
+				result.setAttributeValue(ppolicy.getID(), ppolicy);
+			}
 
-            return result;
-        } catch (NamingException e) {
-            // This will be thrown if an invalid user name is used and the method may
-            // be called multiple times to try different names, so we trap the exception
-            // unless a subclass wishes to implement more specialized behaviour.
-            if ((e instanceof org.springframework.ldap.AuthenticationException)
-                    || (e instanceof org.springframework.ldap.OperationNotSupportedException)) {
-                handleBindException(userDnStr, username, e);
-            } else {
-                throw e;
-            }
-        } catch (javax.naming.NamingException e) {
-            throw LdapUtils.convertLdapException(e);
-        } finally {
-            LdapUtils.closeContext(ctx);
-        }
+			return result;
+		}
+		catch (NamingException e) {
+			// This will be thrown if an invalid user name is used and the method may
+			// be called multiple times to try different names, so we trap the exception
+			// unless a subclass wishes to implement more specialized behaviour.
+			if ((e instanceof org.springframework.ldap.AuthenticationException)
+					|| (e instanceof org.springframework.ldap.OperationNotSupportedException)) {
+				handleBindException(userDnStr, username, e);
+			}
+			else {
+				throw e;
+			}
+		}
+		catch (javax.naming.NamingException e) {
+			throw LdapUtils.convertLdapException(e);
+		}
+		finally {
+			LdapUtils.closeContext(ctx);
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Allows subclasses to inspect the exception thrown by an attempt to bind with a particular DN.
-     * The default implementation just reports the failure to the debug logger.
-     */
-    protected void handleBindException(String userDn, String username, Throwable cause) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Failed to bind as " + userDn + ": " + cause);
-        }
-    }
+	/**
+	 * Allows subclasses to inspect the exception thrown by an attempt to bind with a
+	 * particular DN. The default implementation just reports the failure to the debug
+	 * logger.
+	 */
+	protected void handleBindException(String userDn, String username, Throwable cause) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Failed to bind as " + userDn + ": " + cause);
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java
index 10f5976690..e4750ef1bf 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticationProvider.java
@@ -32,41 +32,43 @@ import org.springframework.util.Assert;
 
 import java.util.*;
 
-
 /**
- * An {@link org.springframework.security.authentication.AuthenticationProvider} implementation that authenticates
- * against an LDAP server.
+ * An {@link org.springframework.security.authentication.AuthenticationProvider}
+ * implementation that authenticates against an LDAP server.
  * <p>
- * There are many ways in which an LDAP directory can be configured so this class delegates most of
- * its responsibilities to two separate strategy interfaces, {@link LdapAuthenticator}
- * and {@link LdapAuthoritiesPopulator}.
+ * There are many ways in which an LDAP directory can be configured so this class
+ * delegates most of its responsibilities to two separate strategy interfaces,
+ * {@link LdapAuthenticator} and {@link LdapAuthoritiesPopulator}.
  *
  * <h3>LdapAuthenticator</h3>
- * This interface is responsible for performing the user authentication and retrieving
- * the user's information from the directory. Example implementations are {@link
- * org.springframework.security.ldap.authentication.BindAuthenticator BindAuthenticator} which authenticates
- * the user by "binding" as that user, and
- * {@link org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator PasswordComparisonAuthenticator}
- * which compares the supplied password with the value stored in the directory, using an LDAP "compare"
- * operation.
+ * This interface is responsible for performing the user authentication and retrieving the
+ * user's information from the directory. Example implementations are
+ * {@link org.springframework.security.ldap.authentication.BindAuthenticator
+ * BindAuthenticator} which authenticates the user by "binding" as that user, and
+ * {@link org.springframework.security.ldap.authentication.PasswordComparisonAuthenticator
+ * PasswordComparisonAuthenticator} which compares the supplied password with the value
+ * stored in the directory, using an LDAP "compare" operation.
  * <p>
- * The task of retrieving the user attributes is delegated to the authenticator because the permissions on the
- * attributes may depend on the type of authentication being used; for example, if binding as the user, it may be
- * necessary to read them with the user's own permissions (using the same context used for the bind operation).
+ * The task of retrieving the user attributes is delegated to the authenticator because
+ * the permissions on the attributes may depend on the type of authentication being used;
+ * for example, if binding as the user, it may be necessary to read them with the user's
+ * own permissions (using the same context used for the bind operation).
  *
  * <h3>LdapAuthoritiesPopulator</h3>
- * Once the user has been authenticated, this interface is called to obtain the set of granted authorities for the
- * user.
- * The {@link DefaultLdapAuthoritiesPopulator DefaultLdapAuthoritiesPopulator}
- * can be configured to obtain user role information from the user's attributes and/or to perform a search for
- * "groups" that the user is a member of and map these to roles.
+ * Once the user has been authenticated, this interface is called to obtain the set of
+ * granted authorities for the user. The {@link DefaultLdapAuthoritiesPopulator
+ * DefaultLdapAuthoritiesPopulator} can be configured to obtain user role information from
+ * the user's attributes and/or to perform a search for "groups" that the user is a member
+ * of and map these to roles.
  *
  * <p>
- * A custom implementation could obtain the roles from a completely different source, for example from a database.
+ * A custom implementation could obtain the roles from a completely different source, for
+ * example from a database.
  *
  * <h3>Configuration</h3>
  *
  * A simple configuration might be as follows:
+ * 
  * <pre>
  *   &lt;bean id=&quot;contextSource&quot;
  *       class=&quot;org.springframework.security.ldap.DefaultSpringSecurityContextSource&quot;&gt;
@@ -74,7 +76,7 @@ import java.util.*;
  *     &lt;property name=&quot;userDn&quot; value=&quot;cn=manager,dc=springframework,dc=org&quot;/&gt;
  *     &lt;property name=&quot;password&quot; value=&quot;password&quot;/&gt;
  *   &lt;/bean&gt;
- *
+ * 
  *   &lt;bean id=&quot;ldapAuthProvider&quot;
  *       class=&quot;org.springframework.security.ldap.authentication.LdapAuthenticationProvider&quot;&gt;
  *     &lt;constructor-arg&gt;
@@ -91,22 +93,24 @@ import java.util.*;
  *       &lt;/bean&gt;
  *     &lt;/constructor-arg&gt;
  *   &lt;/bean&gt;
- *</pre>
+ * </pre>
  *
  * <p>
  * This would set up the provider to access an LDAP server with URL
- * <tt>ldap://monkeymachine:389/dc=springframework,dc=org</tt>. Authentication will be performed by attempting to bind
- * with the DN <tt>uid=&lt;user-login-name&gt;,ou=people,dc=springframework,dc=org</tt>. After successful
- * authentication, roles will be assigned to the user by searching under the DN
- * <tt>ou=groups,dc=springframework,dc=org</tt> with the default filter <tt>(member=&lt;user's-DN&gt;)</tt>. The role
- * name will be taken from the "ou" attribute of each match.
+ * <tt>ldap://monkeymachine:389/dc=springframework,dc=org</tt>. Authentication will be
+ * performed by attempting to bind with the DN
+ * <tt>uid=&lt;user-login-name&gt;,ou=people,dc=springframework,dc=org</tt>. After
+ * successful authentication, roles will be assigned to the user by searching under the DN
+ * <tt>ou=groups,dc=springframework,dc=org</tt> with the default filter
+ * <tt>(member=&lt;user's-DN&gt;)</tt>. The role name will be taken from the "ou"
+ * attribute of each match.
  * <p>
- * The authenticate method will reject empty passwords outright. LDAP servers may allow an anonymous
- * bind operation with an empty password, even if a DN is supplied. In practice this means that if
- * the LDAP directory is configured to allow unauthenticated access, it might be possible to
- * authenticate as <i>any</i> user just by supplying an empty password.
- * More information on the misuse of unauthenticated access can be found in
- * <a href="http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-authmeth-19.txt">
+ * The authenticate method will reject empty passwords outright. LDAP servers may allow an
+ * anonymous bind operation with an empty password, even if a DN is supplied. In practice
+ * this means that if the LDAP directory is configured to allow unauthenticated access, it
+ * might be possible to authenticate as <i>any</i> user just by supplying an empty
+ * password. More information on the misuse of unauthenticated access can be found in <a
+ * href="http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-authmeth-19.txt">
  * draft-ietf-ldapbis-authmeth-19.txt</a>.
  *
  *
@@ -116,86 +120,99 @@ import java.util.*;
  * @see DefaultLdapAuthoritiesPopulator
  */
 public class LdapAuthenticationProvider extends AbstractLdapAuthenticationProvider {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private LdapAuthenticator authenticator;
-    private LdapAuthoritiesPopulator authoritiesPopulator;
-    private boolean hideUserNotFoundExceptions = true;
+	private LdapAuthenticator authenticator;
+	private LdapAuthoritiesPopulator authoritiesPopulator;
+	private boolean hideUserNotFoundExceptions = true;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Create an instance with the supplied authenticator and authorities populator implementations.
-     *
-     * @param authenticator the authentication strategy (bind, password comparison, etc)
-     *          to be used by this provider for authenticating users.
-     * @param authoritiesPopulator the strategy for obtaining the authorities for a given user after they've been
-     *          authenticated.
-     */
-    public LdapAuthenticationProvider(LdapAuthenticator authenticator, LdapAuthoritiesPopulator authoritiesPopulator) {
-        this.setAuthenticator(authenticator);
-        this.setAuthoritiesPopulator(authoritiesPopulator);
-    }
+	/**
+	 * Create an instance with the supplied authenticator and authorities populator
+	 * implementations.
+	 *
+	 * @param authenticator the authentication strategy (bind, password comparison, etc)
+	 * to be used by this provider for authenticating users.
+	 * @param authoritiesPopulator the strategy for obtaining the authorities for a given
+	 * user after they've been authenticated.
+	 */
+	public LdapAuthenticationProvider(LdapAuthenticator authenticator,
+			LdapAuthoritiesPopulator authoritiesPopulator) {
+		this.setAuthenticator(authenticator);
+		this.setAuthoritiesPopulator(authoritiesPopulator);
+	}
 
-    /**
-     * Creates an instance with the supplied authenticator and a null authorities populator.
-     * In this case, the authorities must be mapped from the user context.
-     *
-     * @param authenticator the authenticator strategy.
-     */
-    public LdapAuthenticationProvider(LdapAuthenticator authenticator) {
-        this.setAuthenticator(authenticator);
-        this.setAuthoritiesPopulator(new NullLdapAuthoritiesPopulator());
-    }
+	/**
+	 * Creates an instance with the supplied authenticator and a null authorities
+	 * populator. In this case, the authorities must be mapped from the user context.
+	 *
+	 * @param authenticator the authenticator strategy.
+	 */
+	public LdapAuthenticationProvider(LdapAuthenticator authenticator) {
+		this.setAuthenticator(authenticator);
+		this.setAuthoritiesPopulator(new NullLdapAuthoritiesPopulator());
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private void setAuthenticator(LdapAuthenticator authenticator) {
-        Assert.notNull(authenticator, "An LdapAuthenticator must be supplied");
-        this.authenticator = authenticator;
-    }
+	private void setAuthenticator(LdapAuthenticator authenticator) {
+		Assert.notNull(authenticator, "An LdapAuthenticator must be supplied");
+		this.authenticator = authenticator;
+	}
 
-    private LdapAuthenticator getAuthenticator() {
-        return authenticator;
-    }
+	private LdapAuthenticator getAuthenticator() {
+		return authenticator;
+	}
 
-    private void setAuthoritiesPopulator(LdapAuthoritiesPopulator authoritiesPopulator) {
-        Assert.notNull(authoritiesPopulator, "An LdapAuthoritiesPopulator must be supplied");
-        this.authoritiesPopulator = authoritiesPopulator;
-    }
+	private void setAuthoritiesPopulator(LdapAuthoritiesPopulator authoritiesPopulator) {
+		Assert.notNull(authoritiesPopulator,
+				"An LdapAuthoritiesPopulator must be supplied");
+		this.authoritiesPopulator = authoritiesPopulator;
+	}
 
-    protected LdapAuthoritiesPopulator getAuthoritiesPopulator() {
-        return authoritiesPopulator;
-    }
+	protected LdapAuthoritiesPopulator getAuthoritiesPopulator() {
+		return authoritiesPopulator;
+	}
 
-    public void setHideUserNotFoundExceptions(boolean hideUserNotFoundExceptions) {
-        this.hideUserNotFoundExceptions = hideUserNotFoundExceptions;
-    }
+	public void setHideUserNotFoundExceptions(boolean hideUserNotFoundExceptions) {
+		this.hideUserNotFoundExceptions = hideUserNotFoundExceptions;
+	}
 
-    @Override
-    protected DirContextOperations doAuthentication(UsernamePasswordAuthenticationToken authentication) {
-        try {
-            return getAuthenticator().authenticate(authentication);
-        } catch (PasswordPolicyException ppe) {
-            // The only reason a ppolicy exception can occur during a bind is that the account is locked.
-            throw new LockedException(messages.getMessage(ppe.getStatus().getErrorCode(),
-                    ppe.getStatus().getDefaultMessage()));
-        } catch (UsernameNotFoundException notFound) {
-            if (hideUserNotFoundExceptions) {
-                throw new BadCredentialsException(messages.getMessage(
-                        "LdapAuthenticationProvider.badCredentials", "Bad credentials"));
-            } else {
-                throw notFound;
-            }
-        } catch (NamingException ldapAccessFailure) {
-            throw new InternalAuthenticationServiceException(ldapAccessFailure.getMessage(), ldapAccessFailure);
-        }
-    }
+	@Override
+	protected DirContextOperations doAuthentication(
+			UsernamePasswordAuthenticationToken authentication) {
+		try {
+			return getAuthenticator().authenticate(authentication);
+		}
+		catch (PasswordPolicyException ppe) {
+			// The only reason a ppolicy exception can occur during a bind is that the
+			// account is locked.
+			throw new LockedException(messages.getMessage(ppe.getStatus().getErrorCode(),
+					ppe.getStatus().getDefaultMessage()));
+		}
+		catch (UsernameNotFoundException notFound) {
+			if (hideUserNotFoundExceptions) {
+				throw new BadCredentialsException(messages.getMessage(
+						"LdapAuthenticationProvider.badCredentials", "Bad credentials"));
+			}
+			else {
+				throw notFound;
+			}
+		}
+		catch (NamingException ldapAccessFailure) {
+			throw new InternalAuthenticationServiceException(
+					ldapAccessFailure.getMessage(), ldapAccessFailure);
+		}
+	}
 
-    @Override
-    protected Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username, String password) {
-        return getAuthoritiesPopulator().getGrantedAuthorities(userData, username);
-    }
+	@Override
+	protected Collection<? extends GrantedAuthority> loadUserAuthorities(
+			DirContextOperations userData, String username, String password) {
+		return getAuthoritiesPopulator().getGrantedAuthorities(userData, username);
+	}
 
 }
-
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java
index fec5cd2f4f..fc51a1ba75 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapAuthenticator.java
@@ -18,12 +18,11 @@ package org.springframework.security.ldap.authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.ldap.core.DirContextOperations;
 
-
 /**
  * The strategy interface for locating and authenticating an Ldap user.
  * <p>
- * The LdapAuthenticationProvider calls this interface to authenticate a user
- * and obtain the information for that user from the directory.
+ * The LdapAuthenticationProvider calls this interface to authenticate a user and obtain
+ * the information for that user from the directory.
  *
  * @author Luke Taylor
  *
@@ -31,13 +30,14 @@ import org.springframework.ldap.core.DirContextOperations;
  * @see org.springframework.security.ldap.authentication.UserDetailsServiceLdapAuthoritiesPopulator
  */
 public interface LdapAuthenticator {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Authenticates as a user and obtains additional user information from the directory.
-     *
-     * @param authentication
-     * @return the details of the successfully authenticated user.
-     */
-    DirContextOperations authenticate(Authentication authentication);
+	/**
+	 * Authenticates as a user and obtains additional user information from the directory.
+	 *
+	 * @param authentication
+	 * @return the details of the successfully authenticated user.
+	 */
+	DirContextOperations authenticate(Authentication authentication);
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java
index 71f5ca9575..99a28541c1 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java
@@ -22,8 +22,8 @@ import org.springframework.ldap.BadLdapGrammarException;
  * Helper class to encode and decode ldap names and values.
  * 
  * <p>
- * NOTE: This is a copy from Spring LDAP so that both Spring LDAP 1.x and 2.x
- * can be supported without reflection.
+ * NOTE: This is a copy from Spring LDAP so that both Spring LDAP 1.x and 2.x can be
+ * supported without reflection.
  * </p>
  * 
  * @author Adam Skogman
@@ -31,207 +31,211 @@ import org.springframework.ldap.BadLdapGrammarException;
  */
 final class LdapEncoder {
 
-    private static final int HEX = 16;
-    private static String[] NAME_ESCAPE_TABLE = new String[96];
+	private static final int HEX = 16;
+	private static String[] NAME_ESCAPE_TABLE = new String[96];
 
-    private static String[] FILTER_ESCAPE_TABLE = new String['\\' + 1];
+	private static String[] FILTER_ESCAPE_TABLE = new String['\\' + 1];
 
-    static {
+	static {
 
-        // Name encoding table -------------------------------------
+		// Name encoding table -------------------------------------
 
-        // all below 0x20 (control chars)
-        for (char c = 0; c < ' '; c++) {
-            NAME_ESCAPE_TABLE[c] = "\\" + toTwoCharHex(c);
-        }
+		// all below 0x20 (control chars)
+		for (char c = 0; c < ' '; c++) {
+			NAME_ESCAPE_TABLE[c] = "\\" + toTwoCharHex(c);
+		}
 
-        NAME_ESCAPE_TABLE['#'] = "\\#";
-        NAME_ESCAPE_TABLE[','] = "\\,";
-        NAME_ESCAPE_TABLE[';'] = "\\;";
-        NAME_ESCAPE_TABLE['='] = "\\=";
-        NAME_ESCAPE_TABLE['+'] = "\\+";
-        NAME_ESCAPE_TABLE['<'] = "\\<";
-        NAME_ESCAPE_TABLE['>'] = "\\>";
-        NAME_ESCAPE_TABLE['\"'] = "\\\"";
-        NAME_ESCAPE_TABLE['\\'] = "\\\\";
+		NAME_ESCAPE_TABLE['#'] = "\\#";
+		NAME_ESCAPE_TABLE[','] = "\\,";
+		NAME_ESCAPE_TABLE[';'] = "\\;";
+		NAME_ESCAPE_TABLE['='] = "\\=";
+		NAME_ESCAPE_TABLE['+'] = "\\+";
+		NAME_ESCAPE_TABLE['<'] = "\\<";
+		NAME_ESCAPE_TABLE['>'] = "\\>";
+		NAME_ESCAPE_TABLE['\"'] = "\\\"";
+		NAME_ESCAPE_TABLE['\\'] = "\\\\";
 
-        // Filter encoding table -------------------------------------
+		// Filter encoding table -------------------------------------
 
-        // fill with char itself
-        for (char c = 0; c < FILTER_ESCAPE_TABLE.length; c++) {
-            FILTER_ESCAPE_TABLE[c] = String.valueOf(c);
-        }
+		// fill with char itself
+		for (char c = 0; c < FILTER_ESCAPE_TABLE.length; c++) {
+			FILTER_ESCAPE_TABLE[c] = String.valueOf(c);
+		}
 
-        // escapes (RFC2254)
-        FILTER_ESCAPE_TABLE['*'] = "\\2a";
-        FILTER_ESCAPE_TABLE['('] = "\\28";
-        FILTER_ESCAPE_TABLE[')'] = "\\29";
-        FILTER_ESCAPE_TABLE['\\'] = "\\5c";
-        FILTER_ESCAPE_TABLE[0] = "\\00";
+		// escapes (RFC2254)
+		FILTER_ESCAPE_TABLE['*'] = "\\2a";
+		FILTER_ESCAPE_TABLE['('] = "\\28";
+		FILTER_ESCAPE_TABLE[')'] = "\\29";
+		FILTER_ESCAPE_TABLE['\\'] = "\\5c";
+		FILTER_ESCAPE_TABLE[0] = "\\00";
 
-    }
+	}
 
-    /**
-     * All static methods - not to be instantiated.
-     */
-    private LdapEncoder() {
-    }
+	/**
+	 * All static methods - not to be instantiated.
+	 */
+	private LdapEncoder() {
+	}
 
-    protected static String toTwoCharHex(char c) {
+	protected static String toTwoCharHex(char c) {
 
-        String raw = Integer.toHexString(c).toUpperCase();
+		String raw = Integer.toHexString(c).toUpperCase();
 
-        if (raw.length() > 1) {
-            return raw;
-        } else {
-            return "0" + raw;
-        }
-    }
+		if (raw.length() > 1) {
+			return raw;
+		}
+		else {
+			return "0" + raw;
+		}
+	}
 
-    /**
-     * Escape a value for use in a filter.
-     * 
-     * @param value
-     *            the value to escape.
-     * @return a properly escaped representation of the supplied value.
-     */
-    public static String filterEncode(String value) {
+	/**
+	 * Escape a value for use in a filter.
+	 * 
+	 * @param value the value to escape.
+	 * @return a properly escaped representation of the supplied value.
+	 */
+	public static String filterEncode(String value) {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer roomy
-        StringBuilder encodedValue = new StringBuilder(value.length() * 2);
+		// make buffer roomy
+		StringBuilder encodedValue = new StringBuilder(value.length() * 2);
 
-        int length = value.length();
+		int length = value.length();
 
-        for (int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 
-            char c = value.charAt(i);
+			char c = value.charAt(i);
 
-            if (c < FILTER_ESCAPE_TABLE.length) {
-                encodedValue.append(FILTER_ESCAPE_TABLE[c]);
-            } else {
-                // default: add the char
-                encodedValue.append(c);
-            }
-        }
+			if (c < FILTER_ESCAPE_TABLE.length) {
+				encodedValue.append(FILTER_ESCAPE_TABLE[c]);
+			}
+			else {
+				// default: add the char
+				encodedValue.append(c);
+			}
+		}
 
-        return encodedValue.toString();
-    }
+		return encodedValue.toString();
+	}
 
-    /**
-     * LDAP Encodes a value for use with a DN. Escapes for LDAP, not JNDI!
-     * 
-     * <br/>Escapes:<br/> ' ' [space] - "\ " [if first or last] <br/> '#'
-     * [hash] - "\#" <br/> ',' [comma] - "\," <br/> ';' [semicolon] - "\;" <br/> '=
-     * [equals] - "\=" <br/> '+' [plus] - "\+" <br/> '&lt;' [less than] -
-     * "\&lt;" <br/> '&gt;' [greater than] - "\&gt;" <br/> '"' [double quote] -
-     * "\"" <br/> '\' [backslash] - "\\" <br/>
-     * 
-     * @param value
-     *            the value to escape.
-     * @return The escaped value.
-     */
-    public static String nameEncode(String value) {
+	/**
+	 * LDAP Encodes a value for use with a DN. Escapes for LDAP, not JNDI!
+	 * 
+	 * <br/>
+	 * Escapes:<br/>
+	 * ' ' [space] - "\ " [if first or last] <br/>
+	 * '#' [hash] - "\#" <br/>
+	 * ',' [comma] - "\," <br/>
+	 * ';' [semicolon] - "\;" <br/>
+	 * '= [equals] - "\=" <br/>
+	 * '+' [plus] - "\+" <br/>
+	 * '&lt;' [less than] - "\&lt;" <br/>
+	 * '&gt;' [greater than] - "\&gt;" <br/>
+	 * '"' [double quote] - "\"" <br/>
+	 * '\' [backslash] - "\\" <br/>
+	 * 
+	 * @param value the value to escape.
+	 * @return The escaped value.
+	 */
+	public static String nameEncode(String value) {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer roomy
-        StringBuilder encodedValue = new StringBuilder(value.length() * 2);
+		// make buffer roomy
+		StringBuilder encodedValue = new StringBuilder(value.length() * 2);
 
-        int length = value.length();
-        int last = length - 1;
+		int length = value.length();
+		int last = length - 1;
 
-        for (int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 
-            char c = value.charAt(i);
+			char c = value.charAt(i);
 
-            // space first or last
-            if (c == ' ' && (i == 0 || i == last)) {
-                encodedValue.append("\\ ");
-                continue;
-            }
+			// space first or last
+			if (c == ' ' && (i == 0 || i == last)) {
+				encodedValue.append("\\ ");
+				continue;
+			}
 
-            if (c < NAME_ESCAPE_TABLE.length) {
-                // check in table for escapes
-                String esc = NAME_ESCAPE_TABLE[c];
+			if (c < NAME_ESCAPE_TABLE.length) {
+				// check in table for escapes
+				String esc = NAME_ESCAPE_TABLE[c];
 
-                if (esc != null) {
-                    encodedValue.append(esc);
-                    continue;
-                }
-            }
+				if (esc != null) {
+					encodedValue.append(esc);
+					continue;
+				}
+			}
 
-            // default: add the char
-            encodedValue.append(c);
-        }
+			// default: add the char
+			encodedValue.append(c);
+		}
 
-        return encodedValue.toString();
+		return encodedValue.toString();
 
-    }
+	}
 
-    /**
-     * Decodes a value. Converts escaped chars to ordinary chars.
-     * 
-     * @param value
-     *            Trimmed value, so no leading an trailing blanks, except an
-     *            escaped space last.
-     * @return The decoded value as a string.
-     * @throws BadLdapGrammarException
-     */
-    static public String nameDecode(String value)
-            throws BadLdapGrammarException {
+	/**
+	 * Decodes a value. Converts escaped chars to ordinary chars.
+	 * 
+	 * @param value Trimmed value, so no leading an trailing blanks, except an escaped
+	 * space last.
+	 * @return The decoded value as a string.
+	 * @throws BadLdapGrammarException
+	 */
+	static public String nameDecode(String value) throws BadLdapGrammarException {
 
-        if (value == null)
-            return null;
+		if (value == null)
+			return null;
 
-        // make buffer same size
-        StringBuilder decoded = new StringBuilder(value.length());
+		// make buffer same size
+		StringBuilder decoded = new StringBuilder(value.length());
 
-        int i = 0;
-        while (i < value.length()) {
-            char currentChar = value.charAt(i);
-            if (currentChar == '\\') {
-                if (value.length() <= i + 1) {
-                    // Ending with a single backslash is not allowed
-                    throw new BadLdapGrammarException(
-                            "Unexpected end of value " + "unterminated '\\'");
-                } else {
-                    char nextChar = value.charAt(i + 1);
-                    if (nextChar == ',' || nextChar == '=' || nextChar == '+'
-                            || nextChar == '<' || nextChar == '>'
-                            || nextChar == '#' || nextChar == ';'
-                            || nextChar == '\\' || nextChar == '\"'
-                            || nextChar == ' ') {
-                        // Normal backslash escape
-                        decoded.append(nextChar);
-                        i += 2;
-                    } else {
-                        if (value.length() <= i + 2) {
-                            throw new BadLdapGrammarException(
-                                    "Unexpected end of value "
-                                            + "expected special or hex, found '"
-                                            + nextChar + "'");
-                        } else {
-                            // This should be a hex value
-                            String hexString = "" + nextChar
-                                    + value.charAt(i + 2);
-                            decoded.append((char) Integer.parseInt(hexString,
-                                    HEX));
-                            i += 3;
-                        }
-                    }
-                }
-            } else {
-                // This character wasn't escaped - just append it
-                decoded.append(currentChar);
-                i++;
-            }
-        }
+		int i = 0;
+		while (i < value.length()) {
+			char currentChar = value.charAt(i);
+			if (currentChar == '\\') {
+				if (value.length() <= i + 1) {
+					// Ending with a single backslash is not allowed
+					throw new BadLdapGrammarException("Unexpected end of value "
+							+ "unterminated '\\'");
+				}
+				else {
+					char nextChar = value.charAt(i + 1);
+					if (nextChar == ',' || nextChar == '=' || nextChar == '+'
+							|| nextChar == '<' || nextChar == '>' || nextChar == '#'
+							|| nextChar == ';' || nextChar == '\\' || nextChar == '\"'
+							|| nextChar == ' ') {
+						// Normal backslash escape
+						decoded.append(nextChar);
+						i += 2;
+					}
+					else {
+						if (value.length() <= i + 2) {
+							throw new BadLdapGrammarException("Unexpected end of value "
+									+ "expected special or hex, found '" + nextChar + "'");
+						}
+						else {
+							// This should be a hex value
+							String hexString = "" + nextChar + value.charAt(i + 2);
+							decoded.append((char) Integer.parseInt(hexString, HEX));
+							i += 3;
+						}
+					}
+				}
+			}
+			else {
+				// This character wasn't escaped - just append it
+				decoded.append(currentChar);
+				i++;
+			}
+		}
 
-        return decoded.toString();
+		return decoded.toString();
 
-    }
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/NullLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/NullLdapAuthoritiesPopulator.java
index ea82385fb0..8bc3076679 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/NullLdapAuthoritiesPopulator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/NullLdapAuthoritiesPopulator.java
@@ -13,7 +13,8 @@ import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
  * @since 3.0
  */
 public final class NullLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-    public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userDetails, String username) {
-        return AuthorityUtils.NO_AUTHORITIES;
-    }
+	public Collection<GrantedAuthority> getGrantedAuthorities(
+			DirContextOperations userDetails, String username) {
+		return AuthorityUtils.NO_AUTHORITIES;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java
index f661700e81..2d4b7a7a9d 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticator.java
@@ -31,132 +31,145 @@ import org.springframework.security.crypto.codec.Utf8;
 import org.springframework.security.ldap.SpringSecurityLdapTemplate;
 import org.springframework.util.Assert;
 
-
 /**
- * An {@link org.springframework.security.ldap.authentication.LdapAuthenticator LdapAuthenticator} which compares the login
- * password with the value stored in the directory using a remote LDAP "compare" operation.
+ * An {@link org.springframework.security.ldap.authentication.LdapAuthenticator
+ * LdapAuthenticator} which compares the login password with the value stored in the
+ * directory using a remote LDAP "compare" operation.
  *
  * <p>
- * If passwords are stored in digest form in the repository, then a suitable {@link PasswordEncoder}
- * implementation must be supplied. By default, passwords are encoded using the {@link LdapShaPasswordEncoder}.
- * Note that compare operations will not work if salted-SHA (SSHA) passwords are used, as it is not possible to
- * know the salt value which is a random byte sequence generated by the directory.
+ * If passwords are stored in digest form in the repository, then a suitable
+ * {@link PasswordEncoder} implementation must be supplied. By default, passwords are
+ * encoded using the {@link LdapShaPasswordEncoder}. Note that compare operations will not
+ * work if salted-SHA (SSHA) passwords are used, as it is not possible to know the salt
+ * value which is a random byte sequence generated by the directory.
  *
  * @author Luke Taylor
  */
 public final class PasswordComparisonAuthenticator extends AbstractLdapAuthenticator {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(PasswordComparisonAuthenticator.class);
+	private static final Log logger = LogFactory
+			.getLog(PasswordComparisonAuthenticator.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PasswordEncoder passwordEncoder = new LdapShaPasswordEncoder();
-    private String passwordAttributeName = "userPassword";
-    private boolean usePasswordAttrCompare = false;
+	private PasswordEncoder passwordEncoder = new LdapShaPasswordEncoder();
+	private String passwordAttributeName = "userPassword";
+	private boolean usePasswordAttrCompare = false;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public PasswordComparisonAuthenticator(BaseLdapPathContextSource contextSource) {
-        super(contextSource);
-    }
+	public PasswordComparisonAuthenticator(BaseLdapPathContextSource contextSource) {
+		super(contextSource);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public DirContextOperations authenticate(final Authentication authentication) {
-        Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
-                "Can only process UsernamePasswordAuthenticationToken objects");
-        // locate the user and check the password
+	public DirContextOperations authenticate(final Authentication authentication) {
+		Assert.isInstanceOf(UsernamePasswordAuthenticationToken.class, authentication,
+				"Can only process UsernamePasswordAuthenticationToken objects");
+		// locate the user and check the password
 
-        DirContextOperations user = null;
-        String username = authentication.getName();
-        String password = (String)authentication.getCredentials();
+		DirContextOperations user = null;
+		String username = authentication.getName();
+		String password = (String) authentication.getCredentials();
 
-        SpringSecurityLdapTemplate ldapTemplate = new SpringSecurityLdapTemplate(getContextSource());
+		SpringSecurityLdapTemplate ldapTemplate = new SpringSecurityLdapTemplate(
+				getContextSource());
 
-        for (String userDn : getUserDns(username)) {
-            try {
-                user = ldapTemplate.retrieveEntry(userDn, getUserAttributes());
-            } catch (NameNotFoundException ignore) {
-            }
-            if (user != null) {
-                break;
-            }
-        }
+		for (String userDn : getUserDns(username)) {
+			try {
+				user = ldapTemplate.retrieveEntry(userDn, getUserAttributes());
+			}
+			catch (NameNotFoundException ignore) {
+			}
+			if (user != null) {
+				break;
+			}
+		}
 
-        if (user == null && getUserSearch() != null) {
-            user = getUserSearch().searchForUser(username);
-        }
+		if (user == null && getUserSearch() != null) {
+			user = getUserSearch().searchForUser(username);
+		}
 
-        if (user == null) {
-            throw new UsernameNotFoundException("User not found: " + username);
-        }
+		if (user == null) {
+			throw new UsernameNotFoundException("User not found: " + username);
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Performing LDAP compare of password attribute '" + passwordAttributeName + "' for user '" +
-                    user.getDn() +"'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Performing LDAP compare of password attribute '"
+					+ passwordAttributeName + "' for user '" + user.getDn() + "'");
+		}
 
-        if (usePasswordAttrCompare && isPasswordAttrCompare(user, password)) {
-            return user;
-        } else if(isLdapPasswordCompare(user, ldapTemplate, password)) {
-            return user;
-        }
-        throw new BadCredentialsException(messages.getMessage("PasswordComparisonAuthenticator.badCredentials",
-                "Bad credentials"));
-    }
+		if (usePasswordAttrCompare && isPasswordAttrCompare(user, password)) {
+			return user;
+		}
+		else if (isLdapPasswordCompare(user, ldapTemplate, password)) {
+			return user;
+		}
+		throw new BadCredentialsException(messages.getMessage(
+				"PasswordComparisonAuthenticator.badCredentials", "Bad credentials"));
+	}
 
-    private boolean isPasswordAttrCompare(DirContextOperations user, String password) {
-        Object passwordAttrValue = user.getObjectAttribute(passwordAttributeName);
-        return passwordEncoder.isPasswordValid(new String((byte[])passwordAttrValue), password, null);
-    }
+	private boolean isPasswordAttrCompare(DirContextOperations user, String password) {
+		Object passwordAttrValue = user.getObjectAttribute(passwordAttributeName);
+		return passwordEncoder.isPasswordValid(new String((byte[]) passwordAttrValue),
+				password, null);
+	}
 
-    private boolean isLdapPasswordCompare(DirContextOperations user,
-            SpringSecurityLdapTemplate ldapTemplate, String password) {
-        String encodedPassword = passwordEncoder.encodePassword(password, null);
-        byte[] passwordBytes = Utf8.encode(encodedPassword);
-        return ldapTemplate.compare(user.getDn().toString(), passwordAttributeName, passwordBytes);
-    }
+	private boolean isLdapPasswordCompare(DirContextOperations user,
+			SpringSecurityLdapTemplate ldapTemplate, String password) {
+		String encodedPassword = passwordEncoder.encodePassword(password, null);
+		byte[] passwordBytes = Utf8.encode(encodedPassword);
+		return ldapTemplate.compare(user.getDn().toString(), passwordAttributeName,
+				passwordBytes);
+	}
 
-    public void setPasswordAttributeName(String passwordAttribute) {
-        Assert.hasLength(passwordAttribute, "passwordAttributeName must not be empty or null");
-        this.passwordAttributeName = passwordAttribute;
-    }
+	public void setPasswordAttributeName(String passwordAttribute) {
+		Assert.hasLength(passwordAttribute,
+				"passwordAttributeName must not be empty or null");
+		this.passwordAttributeName = passwordAttribute;
+	}
 
-    private void setPasswordEncoder(PasswordEncoder passwordEncoder) {
-        Assert.notNull(passwordEncoder, "passwordEncoder must not be null.");
-        this.passwordEncoder = passwordEncoder;
-    }
+	private void setPasswordEncoder(PasswordEncoder passwordEncoder) {
+		Assert.notNull(passwordEncoder, "passwordEncoder must not be null.");
+		this.passwordEncoder = passwordEncoder;
+	}
 
-    public void setPasswordEncoder(Object passwordEncoder) {
-        if (passwordEncoder instanceof PasswordEncoder) {
-            this.usePasswordAttrCompare = false;
-            setPasswordEncoder((PasswordEncoder) passwordEncoder);
-            return;
-        }
+	public void setPasswordEncoder(Object passwordEncoder) {
+		if (passwordEncoder instanceof PasswordEncoder) {
+			this.usePasswordAttrCompare = false;
+			setPasswordEncoder((PasswordEncoder) passwordEncoder);
+			return;
+		}
 
-        if (passwordEncoder instanceof org.springframework.security.crypto.password.PasswordEncoder) {
-            final org.springframework.security.crypto.password.PasswordEncoder delegate =
-                    (org.springframework.security.crypto.password.PasswordEncoder)passwordEncoder;
-            setPasswordEncoder(new PasswordEncoder() {
-                public String encodePassword(String rawPass, Object salt) {
-                    checkSalt(salt);
-                    return delegate.encode(rawPass);
-                }
+		if (passwordEncoder instanceof org.springframework.security.crypto.password.PasswordEncoder) {
+			final org.springframework.security.crypto.password.PasswordEncoder delegate = (org.springframework.security.crypto.password.PasswordEncoder) passwordEncoder;
+			setPasswordEncoder(new PasswordEncoder() {
+				public String encodePassword(String rawPass, Object salt) {
+					checkSalt(salt);
+					return delegate.encode(rawPass);
+				}
 
-                public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
-                    checkSalt(salt);
-                    return delegate.matches(rawPass, encPass);
-                }
+				public boolean isPasswordValid(String encPass, String rawPass, Object salt) {
+					checkSalt(salt);
+					return delegate.matches(rawPass, encPass);
+				}
 
-                private void checkSalt(Object salt) {
-                    Assert.isNull(salt, "Salt value must be null when used with crypto module PasswordEncoder");
-                }
-            });
-            this.usePasswordAttrCompare = true;
-            return;
-        }
+				private void checkSalt(Object salt) {
+					Assert.isNull(salt,
+							"Salt value must be null when used with crypto module PasswordEncoder");
+				}
+			});
+			this.usePasswordAttrCompare = true;
+			return;
+		}
 
-        throw new IllegalArgumentException("passwordEncoder must be a PasswordEncoder instance");
-    }
+		throw new IllegalArgumentException(
+				"passwordEncoder must be a PasswordEncoder instance");
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/SpringSecurityAuthenticationSource.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/SpringSecurityAuthenticationSource.java
index b3b7cc3a6b..765d16547c 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/SpringSecurityAuthenticationSource.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/SpringSecurityAuthenticationSource.java
@@ -10,59 +10,65 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * An AuthenticationSource to retrieve authentication information stored in Spring Security's
- * {@link SecurityContextHolder}.
+ * An AuthenticationSource to retrieve authentication information stored in Spring
+ * Security's {@link SecurityContextHolder}.
  * <p>
- * This is a copy of Spring LDAP's AcegiAuthenticationSource, updated for use with Spring Security 2.0.
+ * This is a copy of Spring LDAP's AcegiAuthenticationSource, updated for use with Spring
+ * Security 2.0.
  *
  * @author Mattias Arthursson
  * @author Luke Taylor
  * @since 2.0
  */
 public class SpringSecurityAuthenticationSource implements AuthenticationSource {
-    private static final Log log = LogFactory.getLog(SpringSecurityAuthenticationSource.class);
+	private static final Log log = LogFactory
+			.getLog(SpringSecurityAuthenticationSource.class);
 
-    /**
-     * Get the principals of the logged in user, in this case the distinguished
-     * name.
-     *
-     * @return the distinguished name of the logged in user.
-     */
-    public String getPrincipal() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Get the principals of the logged in user, in this case the distinguished name.
+	 *
+	 * @return the distinguished name of the logged in user.
+	 */
+	public String getPrincipal() {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (authentication == null) {
-            log.warn("No Authentication object set in SecurityContext - returning empty String as Principal");
-            return "";
-        }
+		if (authentication == null) {
+			log.warn("No Authentication object set in SecurityContext - returning empty String as Principal");
+			return "";
+		}
 
-        Object principal = authentication.getPrincipal();
+		Object principal = authentication.getPrincipal();
 
-        if (principal instanceof LdapUserDetails) {
-            LdapUserDetails details = (LdapUserDetails) principal;
-            return details.getDn();
-        } else if (authentication instanceof AnonymousAuthenticationToken) {
-            if (log.isDebugEnabled()) {
-                log.debug("Anonymous Authentication, returning empty String as Principal");
-            }
-            return "";
-        } else {
-            throw new IllegalArgumentException("The principal property of the authentication object"
-                            + "needs to be an LdapUserDetails.");
-        }
-    }
+		if (principal instanceof LdapUserDetails) {
+			LdapUserDetails details = (LdapUserDetails) principal;
+			return details.getDn();
+		}
+		else if (authentication instanceof AnonymousAuthenticationToken) {
+			if (log.isDebugEnabled()) {
+				log.debug("Anonymous Authentication, returning empty String as Principal");
+			}
+			return "";
+		}
+		else {
+			throw new IllegalArgumentException(
+					"The principal property of the authentication object"
+							+ "needs to be an LdapUserDetails.");
+		}
+	}
 
-    /**
-     * @see org.springframework.ldap.core.AuthenticationSource#getCredentials()
-     */
-    public String getCredentials() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * @see org.springframework.ldap.core.AuthenticationSource#getCredentials()
+	 */
+	public String getCredentials() {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (authentication == null) {
-            log.warn("No Authentication object set in SecurityContext - returning empty String as Credentials");
-            return "";
-        }
+		if (authentication == null) {
+			log.warn("No Authentication object set in SecurityContext - returning empty String as Credentials");
+			return "";
+		}
 
-        return (String) authentication.getCredentials();
-    }
+		return (String) authentication.getCredentials();
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java
index f95cb3fb02..7edc849fdc 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/UserDetailsServiceLdapAuthoritiesPopulator.java
@@ -9,22 +9,24 @@ import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.util.Assert;
 
 /**
- * Simple LdapAuthoritiesPopulator which delegates to a UserDetailsService, using the name which
- * was supplied at login as the username.
+ * Simple LdapAuthoritiesPopulator which delegates to a UserDetailsService, using the name
+ * which was supplied at login as the username.
  *
  *
  * @author Luke Taylor
  * @since 2.0
  */
-public class UserDetailsServiceLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-    private final UserDetailsService userDetailsService;
+public class UserDetailsServiceLdapAuthoritiesPopulator implements
+		LdapAuthoritiesPopulator {
+	private final UserDetailsService userDetailsService;
 
-    public UserDetailsServiceLdapAuthoritiesPopulator(UserDetailsService userService) {
-        Assert.notNull(userService, "userDetailsService cannot be null");
-        this.userDetailsService = userService;
-    }
+	public UserDetailsServiceLdapAuthoritiesPopulator(UserDetailsService userService) {
+		Assert.notNull(userService, "userDetailsService cannot be null");
+		this.userDetailsService = userService;
+	}
 
-    public Collection<? extends GrantedAuthority> getGrantedAuthorities(DirContextOperations userData, String username) {
-        return userDetailsService.loadUserByUsername(username).getAuthorities();
-    }
+	public Collection<? extends GrantedAuthority> getGrantedAuthorities(
+			DirContextOperations userData, String username) {
+		return userDetailsService.loadUserByUsername(username).getAuthorities();
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java
index 54a5f68e41..184e256eea 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryAuthenticationException.java
@@ -16,15 +16,18 @@ import org.springframework.security.core.AuthenticationException;
 
 /**
  * <p>
- * Thrown as a translation of an {@link javax.naming.AuthenticationException} when attempting to authenticate against
- * Active Directory using {@link ActiveDirectoryLdapAuthenticationProvider}. Typically this error is wrapped by an
- * {@link AuthenticationException} since it does not provide a user friendly message. When wrapped, the original
- * Exception can be caught and {@link ActiveDirectoryAuthenticationException} can be accessed using
+ * Thrown as a translation of an {@link javax.naming.AuthenticationException} when
+ * attempting to authenticate against Active Directory using
+ * {@link ActiveDirectoryLdapAuthenticationProvider}. Typically this error is wrapped by
+ * an {@link AuthenticationException} since it does not provide a user friendly message.
+ * When wrapped, the original Exception can be caught and
+ * {@link ActiveDirectoryAuthenticationException} can be accessed using
  * {@link AuthenticationException#getCause()} for custom error handling.
  * </p>
  * <p>
- * The {@link #getDataCode()} will return the error code associated with the data portion of the error message. For
- * example, the following error message would return 773 for {@link #getDataCode()}.
+ * The {@link #getDataCode()} will return the error code associated with the data portion
+ * of the error message. For example, the following error message would return 773 for
+ * {@link #getDataCode()}.
  * </p>
  *
  * <pre>
@@ -35,14 +38,15 @@ import org.springframework.security.core.AuthenticationException;
  */
 @SuppressWarnings("serial")
 public final class ActiveDirectoryAuthenticationException extends AuthenticationException {
-    private final String dataCode;
+	private final String dataCode;
 
-    ActiveDirectoryAuthenticationException(String dataCode, String message, Throwable cause) {
-        super(message, cause);
-        this.dataCode = dataCode;
-    }
+	ActiveDirectoryAuthenticationException(String dataCode, String message,
+			Throwable cause) {
+		super(message, cause);
+		this.dataCode = dataCode;
+	}
 
-    public String getDataCode() {
-        return dataCode;
-    }
+	public String getDataCode() {
+		return dataCode;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
index a80f0e2100..8f2e8bf378 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java
@@ -44,23 +44,28 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Specialized LDAP authentication provider which uses Active Directory configuration conventions.
+ * Specialized LDAP authentication provider which uses Active Directory configuration
+ * conventions.
  * <p>
- * It will authenticate using the Active Directory
- * <a href="http://msdn.microsoft.com/en-us/library/ms680857%28VS.85%29.aspx">{@code userPrincipalName}</a> or
- * <a href="http://msdn.microsoft.com/en-us/library/ms679635%28v=vs.85%29.aspx">{@code sAMAccountName}</a> (or a custom
- * {@link #setSearchFilter(String) searchFilter}) in the form {@code username@domain}. If the username does not
- * already end with the domain name, the {@code userPrincipalName} will be built by appending the configured domain
- * name to the username supplied in the authentication request. If no domain name is configured, it is assumed that
- * the username will always contain the domain name.
+ * It will authenticate using the Active Directory <a
+ * href="http://msdn.microsoft.com/en-us/library/ms680857%28VS.85%29.aspx">
+ * {@code userPrincipalName}</a> or <a
+ * href="http://msdn.microsoft.com/en-us/library/ms679635%28v=vs.85%29.aspx">
+ * {@code sAMAccountName}</a> (or a custom {@link #setSearchFilter(String) searchFilter})
+ * in the form {@code username@domain}. If the username does not already end with the
+ * domain name, the {@code userPrincipalName} will be built by appending the configured
+ * domain name to the username supplied in the authentication request. If no domain name
+ * is configured, it is assumed that the username will always contain the domain name.
  * <p>
- * The user authorities are obtained from the data contained in the {@code memberOf} attribute.
+ * The user authorities are obtained from the data contained in the {@code memberOf}
+ * attribute.
  *
  * <h3>Active Directory Sub-Error Codes</h3>
  *
- * When an authentication fails, resulting in a standard LDAP 49 error code, Active Directory also supplies its own
- * sub-error codes within the error message. These will be used to provide additional log information on why an
- * authentication has failed. Typical examples are
+ * When an authentication fails, resulting in a standard LDAP 49 error code, Active
+ * Directory also supplies its own sub-error codes within the error message. These will be
+ * used to provide additional log information on why an authentication has failed. Typical
+ * examples are
  *
  * <ul>
  * <li>525 - user not found</li>
@@ -73,297 +78,327 @@ import java.util.regex.Pattern;
  * <li>775 - account locked</li>
  * </ul>
  *
- * If you set the {@link #setConvertSubErrorCodesToExceptions(boolean) convertSubErrorCodesToExceptions} property to
- * {@code true}, the codes will also be used to control the exception raised.
+ * If you set the {@link #setConvertSubErrorCodesToExceptions(boolean)
+ * convertSubErrorCodesToExceptions} property to {@code true}, the codes will also be used
+ * to control the exception raised.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.1
  */
-public final class ActiveDirectoryLdapAuthenticationProvider extends AbstractLdapAuthenticationProvider {
-    private static final Pattern SUB_ERROR_CODE = Pattern.compile(".*data\\s([0-9a-f]{3,4}).*");
+public final class ActiveDirectoryLdapAuthenticationProvider extends
+		AbstractLdapAuthenticationProvider {
+	private static final Pattern SUB_ERROR_CODE = Pattern
+			.compile(".*data\\s([0-9a-f]{3,4}).*");
 
-    // Error codes
-    private static final int USERNAME_NOT_FOUND = 0x525;
-    private static final int INVALID_PASSWORD = 0x52e;
-    private static final int NOT_PERMITTED = 0x530;
-    private static final int PASSWORD_EXPIRED = 0x532;
-    private static final int ACCOUNT_DISABLED = 0x533;
-    private static final int ACCOUNT_EXPIRED = 0x701;
-    private static final int PASSWORD_NEEDS_RESET = 0x773;
-    private static final int ACCOUNT_LOCKED = 0x775;
+	// Error codes
+	private static final int USERNAME_NOT_FOUND = 0x525;
+	private static final int INVALID_PASSWORD = 0x52e;
+	private static final int NOT_PERMITTED = 0x530;
+	private static final int PASSWORD_EXPIRED = 0x532;
+	private static final int ACCOUNT_DISABLED = 0x533;
+	private static final int ACCOUNT_EXPIRED = 0x701;
+	private static final int PASSWORD_NEEDS_RESET = 0x773;
+	private static final int ACCOUNT_LOCKED = 0x775;
 
-    private final String domain;
-    private final String rootDn;
-    private final String url;
-    private boolean convertSubErrorCodesToExceptions;
-    private String searchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
+	private final String domain;
+	private final String rootDn;
+	private final String url;
+	private boolean convertSubErrorCodesToExceptions;
+	private String searchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
 
-    // Only used to allow tests to substitute a mock LdapContext
-    ContextFactory contextFactory = new ContextFactory();
+	// Only used to allow tests to substitute a mock LdapContext
+	ContextFactory contextFactory = new ContextFactory();
 
-    /**
-     * @param domain the domain name (may be null or empty)
-     * @param url an LDAP url (or multiple URLs)
-     * @param rootDn the root DN (may be null or empty)
-     */
-    public ActiveDirectoryLdapAuthenticationProvider(String domain, String url, String rootDn) {
-        Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
-        this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
-        this.url = url;
-        this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
-    }
+	/**
+	 * @param domain the domain name (may be null or empty)
+	 * @param url an LDAP url (or multiple URLs)
+	 * @param rootDn the root DN (may be null or empty)
+	 */
+	public ActiveDirectoryLdapAuthenticationProvider(String domain, String url,
+			String rootDn) {
+		Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
+		this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
+		this.url = url;
+		this.rootDn = StringUtils.hasText(rootDn) ? rootDn.toLowerCase() : null;
+	}
 
-    /**
-     * @param domain the domain name (may be null or empty)
-     * @param url an LDAP url (or multiple URLs)
-     */
-    public ActiveDirectoryLdapAuthenticationProvider(String domain, String url) {
-        Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
-        this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
-        this.url = url;
-        rootDn = this.domain == null ? null : rootDnFromDomain(this.domain);
-    }
+	/**
+	 * @param domain the domain name (may be null or empty)
+	 * @param url an LDAP url (or multiple URLs)
+	 */
+	public ActiveDirectoryLdapAuthenticationProvider(String domain, String url) {
+		Assert.isTrue(StringUtils.hasText(url), "Url cannot be empty");
+		this.domain = StringUtils.hasText(domain) ? domain.toLowerCase() : null;
+		this.url = url;
+		rootDn = this.domain == null ? null : rootDnFromDomain(this.domain);
+	}
 
-    @Override
-    protected DirContextOperations doAuthentication(UsernamePasswordAuthenticationToken auth) {
-        String username = auth.getName();
-        String password = (String) auth.getCredentials();
+	@Override
+	protected DirContextOperations doAuthentication(
+			UsernamePasswordAuthenticationToken auth) {
+		String username = auth.getName();
+		String password = (String) auth.getCredentials();
 
-        DirContext ctx = bindAsUser(username, password);
+		DirContext ctx = bindAsUser(username, password);
 
-        try {
-            return searchForUser(ctx, username);
-        } catch (NamingException e) {
-            logger.error("Failed to locate directory entry for authenticated user: " + username, e);
-            throw badCredentials(e);
-        } finally {
-            LdapUtils.closeContext(ctx);
-        }
-    }
+		try {
+			return searchForUser(ctx, username);
+		}
+		catch (NamingException e) {
+			logger.error("Failed to locate directory entry for authenticated user: "
+					+ username, e);
+			throw badCredentials(e);
+		}
+		finally {
+			LdapUtils.closeContext(ctx);
+		}
+	}
 
-    /**
-     * Creates the user authority list from the values of the {@code memberOf} attribute obtained from the user's
-     * Active Directory entry.
-     */
-    @Override
-    protected Collection<? extends GrantedAuthority> loadUserAuthorities(DirContextOperations userData, String username, String password) {
-        String[] groups = userData.getStringAttributes("memberOf");
+	/**
+	 * Creates the user authority list from the values of the {@code memberOf} attribute
+	 * obtained from the user's Active Directory entry.
+	 */
+	@Override
+	protected Collection<? extends GrantedAuthority> loadUserAuthorities(
+			DirContextOperations userData, String username, String password) {
+		String[] groups = userData.getStringAttributes("memberOf");
 
-        if (groups == null) {
-            logger.debug("No values for 'memberOf' attribute.");
+		if (groups == null) {
+			logger.debug("No values for 'memberOf' attribute.");
 
-            return AuthorityUtils.NO_AUTHORITIES;
-        }
+			return AuthorityUtils.NO_AUTHORITIES;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("'memberOf' attribute values: " + Arrays.asList(groups));
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("'memberOf' attribute values: " + Arrays.asList(groups));
+		}
 
-        ArrayList<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(groups.length);
+		ArrayList<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(
+				groups.length);
 
-        for (String group : groups) {
-            authorities.add(new SimpleGrantedAuthority(new DistinguishedName(group).removeLast().getValue()));
-        }
+		for (String group : groups) {
+			authorities.add(new SimpleGrantedAuthority(new DistinguishedName(group)
+					.removeLast().getValue()));
+		}
 
-        return authorities;
-    }
+		return authorities;
+	}
 
-    private DirContext bindAsUser(String username, String password) {
-        // TODO. add DNS lookup based on domain
-        final String bindUrl = url;
+	private DirContext bindAsUser(String username, String password) {
+		// TODO. add DNS lookup based on domain
+		final String bindUrl = url;
 
-        Hashtable<String, String> env = new Hashtable<String, String>();
-        env.put(Context.SECURITY_AUTHENTICATION, "simple");
-        String bindPrincipal = createBindPrincipal(username);
-        env.put(Context.SECURITY_PRINCIPAL, bindPrincipal);
-        env.put(Context.PROVIDER_URL, bindUrl);
-        env.put(Context.SECURITY_CREDENTIALS, password);
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-        env.put(Context.OBJECT_FACTORIES, DefaultDirObjectFactory.class.getName());
+		Hashtable<String, String> env = new Hashtable<String, String>();
+		env.put(Context.SECURITY_AUTHENTICATION, "simple");
+		String bindPrincipal = createBindPrincipal(username);
+		env.put(Context.SECURITY_PRINCIPAL, bindPrincipal);
+		env.put(Context.PROVIDER_URL, bindUrl);
+		env.put(Context.SECURITY_CREDENTIALS, password);
+		env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+		env.put(Context.OBJECT_FACTORIES, DefaultDirObjectFactory.class.getName());
 
-        try {
-            return contextFactory.createContext(env);
-        } catch (NamingException e) {
-            if ((e instanceof AuthenticationException) || (e instanceof OperationNotSupportedException)) {
-                handleBindException(bindPrincipal, e);
-                throw badCredentials(e);
-            } else {
-                throw LdapUtils.convertLdapException(e);
-            }
-        }
-    }
+		try {
+			return contextFactory.createContext(env);
+		}
+		catch (NamingException e) {
+			if ((e instanceof AuthenticationException)
+					|| (e instanceof OperationNotSupportedException)) {
+				handleBindException(bindPrincipal, e);
+				throw badCredentials(e);
+			}
+			else {
+				throw LdapUtils.convertLdapException(e);
+			}
+		}
+	}
 
-    private void handleBindException(String bindPrincipal, NamingException exception) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication for " + bindPrincipal + " failed:" + exception);
-        }
+	private void handleBindException(String bindPrincipal, NamingException exception) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication for " + bindPrincipal + " failed:" + exception);
+		}
 
-        int subErrorCode = parseSubErrorCode(exception.getMessage());
+		int subErrorCode = parseSubErrorCode(exception.getMessage());
 
-        if (subErrorCode <= 0) {
-            logger.debug("Failed to locate AD-specific sub-error code in message");
-            return;
-        }
+		if (subErrorCode <= 0) {
+			logger.debug("Failed to locate AD-specific sub-error code in message");
+			return;
+		}
 
-        logger.info("Active Directory authentication failed: " + subCodeToLogMessage(subErrorCode));
+		logger.info("Active Directory authentication failed: "
+				+ subCodeToLogMessage(subErrorCode));
 
-        if (convertSubErrorCodesToExceptions) {
-            raiseExceptionForErrorCode(subErrorCode, exception);
-        }
-    }
+		if (convertSubErrorCodesToExceptions) {
+			raiseExceptionForErrorCode(subErrorCode, exception);
+		}
+	}
 
-    private int parseSubErrorCode(String message) {
-        Matcher m = SUB_ERROR_CODE.matcher(message);
+	private int parseSubErrorCode(String message) {
+		Matcher m = SUB_ERROR_CODE.matcher(message);
 
-        if (m.matches()) {
-            return Integer.parseInt(m.group(1), 16);
-        }
+		if (m.matches()) {
+			return Integer.parseInt(m.group(1), 16);
+		}
 
-        return -1;
-    }
+		return -1;
+	}
 
-    private void raiseExceptionForErrorCode(int code, NamingException exception) {
-        String hexString = Integer.toHexString(code);
-        Throwable cause = new ActiveDirectoryAuthenticationException(hexString, exception.getMessage(), exception);
-        switch (code) {
-            case PASSWORD_EXPIRED:
-                throw new CredentialsExpiredException(messages.getMessage("LdapAuthenticationProvider.credentialsExpired",
-                        "User credentials have expired"), cause);
-            case ACCOUNT_DISABLED:
-                throw new DisabledException(messages.getMessage("LdapAuthenticationProvider.disabled",
-                        "User is disabled"), cause);
-            case ACCOUNT_EXPIRED:
-                throw new AccountExpiredException(messages.getMessage("LdapAuthenticationProvider.expired",
-                        "User account has expired"), cause);
-            case ACCOUNT_LOCKED:
-                throw new LockedException(messages.getMessage("LdapAuthenticationProvider.locked",
-                        "User account is locked"), cause);
-            default:
-                throw badCredentials(cause);
-        }
-    }
+	private void raiseExceptionForErrorCode(int code, NamingException exception) {
+		String hexString = Integer.toHexString(code);
+		Throwable cause = new ActiveDirectoryAuthenticationException(hexString,
+				exception.getMessage(), exception);
+		switch (code) {
+		case PASSWORD_EXPIRED:
+			throw new CredentialsExpiredException(messages.getMessage(
+					"LdapAuthenticationProvider.credentialsExpired",
+					"User credentials have expired"), cause);
+		case ACCOUNT_DISABLED:
+			throw new DisabledException(messages.getMessage(
+					"LdapAuthenticationProvider.disabled", "User is disabled"), cause);
+		case ACCOUNT_EXPIRED:
+			throw new AccountExpiredException(messages.getMessage(
+					"LdapAuthenticationProvider.expired", "User account has expired"),
+					cause);
+		case ACCOUNT_LOCKED:
+			throw new LockedException(messages.getMessage(
+					"LdapAuthenticationProvider.locked", "User account is locked"), cause);
+		default:
+			throw badCredentials(cause);
+		}
+	}
 
-    private String subCodeToLogMessage(int code) {
-        switch (code) {
-            case USERNAME_NOT_FOUND:
-                return "User was not found in directory";
-            case INVALID_PASSWORD:
-                return "Supplied password was invalid";
-            case NOT_PERMITTED:
-                return "User not permitted to logon at this time";
-            case PASSWORD_EXPIRED:
-                return "Password has expired";
-            case ACCOUNT_DISABLED:
-                return "Account is disabled";
-            case ACCOUNT_EXPIRED:
-                return "Account expired";
-            case PASSWORD_NEEDS_RESET:
-                return "User must reset password";
-            case ACCOUNT_LOCKED:
-                return "Account locked";
-        }
+	private String subCodeToLogMessage(int code) {
+		switch (code) {
+		case USERNAME_NOT_FOUND:
+			return "User was not found in directory";
+		case INVALID_PASSWORD:
+			return "Supplied password was invalid";
+		case NOT_PERMITTED:
+			return "User not permitted to logon at this time";
+		case PASSWORD_EXPIRED:
+			return "Password has expired";
+		case ACCOUNT_DISABLED:
+			return "Account is disabled";
+		case ACCOUNT_EXPIRED:
+			return "Account expired";
+		case PASSWORD_NEEDS_RESET:
+			return "User must reset password";
+		case ACCOUNT_LOCKED:
+			return "Account locked";
+		}
 
-        return "Unknown (error code " + Integer.toHexString(code) +")";
-    }
+		return "Unknown (error code " + Integer.toHexString(code) + ")";
+	}
 
-    private BadCredentialsException badCredentials() {
-        return new BadCredentialsException(messages.getMessage(
-                        "LdapAuthenticationProvider.badCredentials", "Bad credentials"));
-    }
+	private BadCredentialsException badCredentials() {
+		return new BadCredentialsException(messages.getMessage(
+				"LdapAuthenticationProvider.badCredentials", "Bad credentials"));
+	}
 
-    private BadCredentialsException badCredentials(Throwable cause) {
-        return (BadCredentialsException) badCredentials().initCause(cause);
-    }
+	private BadCredentialsException badCredentials(Throwable cause) {
+		return (BadCredentialsException) badCredentials().initCause(cause);
+	}
 
-    private DirContextOperations searchForUser(DirContext context, String username) throws NamingException {
-        SearchControls searchControls = new SearchControls();
-        searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
+	private DirContextOperations searchForUser(DirContext context, String username)
+			throws NamingException {
+		SearchControls searchControls = new SearchControls();
+		searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
 
-        String bindPrincipal = createBindPrincipal(username);
-        String searchRoot = rootDn != null ? rootDn : searchRootFromPrincipal(bindPrincipal);
+		String bindPrincipal = createBindPrincipal(username);
+		String searchRoot = rootDn != null ? rootDn
+				: searchRootFromPrincipal(bindPrincipal);
 
-        try {
-            return SpringSecurityLdapTemplate.searchForSingleEntryInternal(context, searchControls,
-                    searchRoot, searchFilter, new Object[]{bindPrincipal});
-        } catch (IncorrectResultSizeDataAccessException incorrectResults) {
-            // Search should never return multiple results if properly configured - just rethrow
-            if (incorrectResults.getActualSize() != 0) {
-                throw incorrectResults;
-            }
-            // If we found no results, then the username/password did not match
-            UsernameNotFoundException userNameNotFoundException = new UsernameNotFoundException("User " + username
-                    + " not found in directory.", incorrectResults);
-            throw badCredentials(userNameNotFoundException);
-        }
-    }
+		try {
+			return SpringSecurityLdapTemplate.searchForSingleEntryInternal(context,
+					searchControls, searchRoot, searchFilter,
+					new Object[] { bindPrincipal });
+		}
+		catch (IncorrectResultSizeDataAccessException incorrectResults) {
+			// Search should never return multiple results if properly configured - just
+			// rethrow
+			if (incorrectResults.getActualSize() != 0) {
+				throw incorrectResults;
+			}
+			// If we found no results, then the username/password did not match
+			UsernameNotFoundException userNameNotFoundException = new UsernameNotFoundException(
+					"User " + username + " not found in directory.", incorrectResults);
+			throw badCredentials(userNameNotFoundException);
+		}
+	}
 
-    private String searchRootFromPrincipal(String bindPrincipal) {
-        int atChar = bindPrincipal.lastIndexOf('@');
+	private String searchRootFromPrincipal(String bindPrincipal) {
+		int atChar = bindPrincipal.lastIndexOf('@');
 
-        if (atChar < 0) {
-            logger.debug("User principal '" + bindPrincipal + "' does not contain the domain, and no domain has been configured");
-            throw badCredentials();
-        }
+		if (atChar < 0) {
+			logger.debug("User principal '" + bindPrincipal
+					+ "' does not contain the domain, and no domain has been configured");
+			throw badCredentials();
+		}
 
-        return rootDnFromDomain(bindPrincipal.substring(atChar + 1, bindPrincipal.length()));
-    }
+		return rootDnFromDomain(bindPrincipal.substring(atChar + 1,
+				bindPrincipal.length()));
+	}
 
-    private String rootDnFromDomain(String domain) {
-        String[] tokens = StringUtils.tokenizeToStringArray(domain, ".");
-        StringBuilder root = new StringBuilder();
+	private String rootDnFromDomain(String domain) {
+		String[] tokens = StringUtils.tokenizeToStringArray(domain, ".");
+		StringBuilder root = new StringBuilder();
 
-        for (String token : tokens) {
-            if (root.length() > 0) {
-                root.append(',');
-            }
-            root.append("dc=").append(token);
-        }
+		for (String token : tokens) {
+			if (root.length() > 0) {
+				root.append(',');
+			}
+			root.append("dc=").append(token);
+		}
 
-        return root.toString();
-    }
+		return root.toString();
+	}
 
-    String createBindPrincipal(String username) {
-        if (domain == null || username.toLowerCase().endsWith(domain)) {
-            return username;
-        }
+	String createBindPrincipal(String username) {
+		if (domain == null || username.toLowerCase().endsWith(domain)) {
+			return username;
+		}
 
-        return username + "@" + domain;
-    }
+		return username + "@" + domain;
+	}
 
-    /**
-     * By default, a failed authentication (LDAP error 49) will result in a {@code BadCredentialsException}.
-     * <p>
-     * If this property is set to {@code true}, the exception message from a failed bind attempt will be parsed
-     * for the AD-specific error code and a {@link CredentialsExpiredException}, {@link DisabledException},
-     * {@link AccountExpiredException} or {@link LockedException} will be thrown for the corresponding codes. All
-     * other codes will result in the default {@code BadCredentialsException}.
-     *
-     * @param convertSubErrorCodesToExceptions {@code true} to raise an exception based on the AD error code.
-     */
-    public void setConvertSubErrorCodesToExceptions(boolean convertSubErrorCodesToExceptions) {
-        this.convertSubErrorCodesToExceptions = convertSubErrorCodesToExceptions;
-    }
+	/**
+	 * By default, a failed authentication (LDAP error 49) will result in a
+	 * {@code BadCredentialsException}.
+	 * <p>
+	 * If this property is set to {@code true}, the exception message from a failed bind
+	 * attempt will be parsed for the AD-specific error code and a
+	 * {@link CredentialsExpiredException}, {@link DisabledException},
+	 * {@link AccountExpiredException} or {@link LockedException} will be thrown for the
+	 * corresponding codes. All other codes will result in the default
+	 * {@code BadCredentialsException}.
+	 *
+	 * @param convertSubErrorCodesToExceptions {@code true} to raise an exception based on
+	 * the AD error code.
+	 */
+	public void setConvertSubErrorCodesToExceptions(
+			boolean convertSubErrorCodesToExceptions) {
+		this.convertSubErrorCodesToExceptions = convertSubErrorCodesToExceptions;
+	}
 
-    /**
-     * The LDAP filter string to search for the user being authenticated.
-     * Occurrences of {0} are replaced with the {@code username@domain}.
-     * <p>
-     * Defaults to: {@code (&(objectClass=user)(userPrincipalName={0}))}
-     * </p>
-     *
-     * @param searchFilter the filter string
-     *
-     * @since 3.2.6
-     */
-    public void setSearchFilter(String searchFilter) {
-        Assert.hasText(searchFilter,"searchFilter must have text");
-        this.searchFilter = searchFilter;
-    }
+	/**
+	 * The LDAP filter string to search for the user being authenticated. Occurrences of
+	 * {0} are replaced with the {@code username@domain}.
+	 * <p>
+	 * Defaults to: {@code (&(objectClass=user)(userPrincipalName= 0}))}
+	 * </p>
+	 *
+	 * @param searchFilter the filter string
+	 *
+	 * @since 3.2.6
+	 */
+	public void setSearchFilter(String searchFilter) {
+		Assert.hasText(searchFilter, "searchFilter must have text");
+		this.searchFilter = searchFilter;
+	}
 
-    static class ContextFactory {
-        DirContext createContext(Hashtable<?,?> env) throws NamingException {
-            return new InitialLdapContext(env, null);
-        }
-    }
+	static class ContextFactory {
+		DirContext createContext(Hashtable<?, ?> env) throws NamingException {
+			return new InitialLdapContext(env, null);
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
index 63f04eafba..55c0dd6ec1 100755
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSource.java
@@ -10,77 +10,83 @@ import javax.naming.ldap.LdapContext;
 import org.springframework.ldap.support.LdapUtils;
 import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
 
-
 /**
- * Extended version of the <tt>DefaultSpringSecurityContextSource</tt> which adds support for
- * the use of {@link PasswordPolicyControl} to make use of user account data stored in the directory.
+ * Extended version of the <tt>DefaultSpringSecurityContextSource</tt> which adds support
+ * for the use of {@link PasswordPolicyControl} to make use of user account data stored in
+ * the directory.
  * <p>
  * When binding with specific username (not the <tt>userDn</tt>) property it will connect
- * first as the userDn, then reconnect as the user in order to retrieve any password-policy control
- * sent with the response, even if an exception occurs.
+ * first as the userDn, then reconnect as the user in order to retrieve any
+ * password-policy control sent with the response, even if an exception occurs.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class PasswordPolicyAwareContextSource extends DefaultSpringSecurityContextSource {
 
-    public PasswordPolicyAwareContextSource(String providerUrl) {
-        super(providerUrl);
-    }
+	public PasswordPolicyAwareContextSource(String providerUrl) {
+		super(providerUrl);
+	}
 
-    @Override
-    public DirContext getContext(String principal, String credentials) throws PasswordPolicyException {
-        if (principal.equals(userDn)) {
-            return super.getContext(principal, credentials);
-        }
+	@Override
+	public DirContext getContext(String principal, String credentials)
+			throws PasswordPolicyException {
+		if (principal.equals(userDn)) {
+			return super.getContext(principal, credentials);
+		}
 
-        final boolean debug = logger.isDebugEnabled();
+		final boolean debug = logger.isDebugEnabled();
 
-        if (debug) {
-            logger.debug("Binding as '" + userDn + "', prior to reconnect as user '" + principal + "'" );
-        }
+		if (debug) {
+			logger.debug("Binding as '" + userDn + "', prior to reconnect as user '"
+					+ principal + "'");
+		}
 
-        // First bind as manager user before rebinding as the specific principal.
-        LdapContext ctx = (LdapContext) super.getContext(userDn, password);
+		// First bind as manager user before rebinding as the specific principal.
+		LdapContext ctx = (LdapContext) super.getContext(userDn, password);
 
-        Control[] rctls = { new PasswordPolicyControl(false) };
+		Control[] rctls = { new PasswordPolicyControl(false) };
 
-        try {
-            ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, principal );
-            ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, credentials);
-            ctx.reconnect(rctls);
-        } catch(javax.naming.NamingException ne) {
-            PasswordPolicyResponseControl ctrl = PasswordPolicyControlExtractor.extractControl(ctx);
-            if (debug) {
-                logger.debug("Failed to obtain context", ne);
-                logger.debug("Password policy response: " + ctrl);
-            }
+		try {
+			ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, principal);
+			ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, credentials);
+			ctx.reconnect(rctls);
+		}
+		catch (javax.naming.NamingException ne) {
+			PasswordPolicyResponseControl ctrl = PasswordPolicyControlExtractor
+					.extractControl(ctx);
+			if (debug) {
+				logger.debug("Failed to obtain context", ne);
+				logger.debug("Password policy response: " + ctrl);
+			}
 
-            LdapUtils.closeContext(ctx);
+			LdapUtils.closeContext(ctx);
 
-            if (ctrl != null) {
-                if (ctrl.isLocked()) {
-                    throw new PasswordPolicyException(ctrl.getErrorStatus());
-                }
-            }
+			if (ctrl != null) {
+				if (ctrl.isLocked()) {
+					throw new PasswordPolicyException(ctrl.getErrorStatus());
+				}
+			}
 
-            throw LdapUtils.convertLdapException(ne);
-        }
+			throw LdapUtils.convertLdapException(ne);
+		}
 
-        if (debug) {
-            logger.debug("PPolicy control returned: "  + PasswordPolicyControlExtractor.extractControl(ctx));
-        }
+		if (debug) {
+			logger.debug("PPolicy control returned: "
+					+ PasswordPolicyControlExtractor.extractControl(ctx));
+		}
 
-        return ctx;
-    }
+		return ctx;
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    protected Hashtable getAuthenticatedEnv(String principal, String credentials) {
-        Hashtable env = super.getAuthenticatedEnv(principal, credentials);
+	@Override
+	@SuppressWarnings("unchecked")
+	protected Hashtable getAuthenticatedEnv(String principal, String credentials) {
+		Hashtable env = super.getAuthenticatedEnv(principal, credentials);
 
-        env.put(LdapContext.CONTROL_FACTORIES, PasswordPolicyControlFactory.class.getName());
+		env.put(LdapContext.CONTROL_FACTORIES,
+				PasswordPolicyControlFactory.class.getName());
 
-        return env;
-    }
+		return env;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
index 8a276b501d..388116079a 100755
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControl.java
@@ -17,14 +17,13 @@ package org.springframework.security.ldap.ppolicy;
 
 import javax.naming.ldap.Control;
 
-
 /**
  *
  * A Password Policy request control.
  * <p>
- * Based on the information in the corresponding
- * <a href="http://tools.ietf.org/draft/draft-behera-ldap-password-policy/draft-behera-ldap-password-policy-09.txt">
- * internet draft on LDAP password policy</a>
+ * Based on the information in the corresponding <a href=
+ * "http://tools.ietf.org/draft/draft-behera-ldap-password-policy/draft-behera-ldap-password-policy-09.txt"
+ * > internet draft on LDAP password policy</a>
  *
  * @author Stefan Zoerner
  * @author Luke Taylor
@@ -32,56 +31,60 @@ import javax.naming.ldap.Control;
  * @see PasswordPolicyResponseControl
  */
 public class PasswordPolicyControl implements Control {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /** OID of the Password Policy Control */
-    public static final String OID = "1.3.6.1.4.1.42.2.27.8.5.1";
+	/** OID of the Password Policy Control */
+	public static final String OID = "1.3.6.1.4.1.42.2.27.8.5.1";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final boolean critical;
+	private final boolean critical;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates a non-critical (request) control.
-     */
-    public PasswordPolicyControl() {
-        this(Control.NONCRITICAL);
-    }
+	/**
+	 * Creates a non-critical (request) control.
+	 */
+	public PasswordPolicyControl() {
+		this(Control.NONCRITICAL);
+	}
 
-    /**
-     * Creates a (request) control.
-     *
-     * @param critical indicates whether the control is critical for the client
-     */
-    public PasswordPolicyControl(boolean critical) {
-        this.critical = critical;
-    }
+	/**
+	 * Creates a (request) control.
+	 *
+	 * @param critical indicates whether the control is critical for the client
+	 */
+	public PasswordPolicyControl(boolean critical) {
+		this.critical = critical;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Retrieves the ASN.1 BER encoded value of the LDAP control. The request value for this control is always
-     * empty.
-     *
-     * @return always null
-     */
-    public byte[] getEncodedValue() {
-        return null;
-    }
+	/**
+	 * Retrieves the ASN.1 BER encoded value of the LDAP control. The request value for
+	 * this control is always empty.
+	 *
+	 * @return always null
+	 */
+	public byte[] getEncodedValue() {
+		return null;
+	}
 
-    /**
-     * Returns the OID of the Password Policy Control ("1.3.6.1.4.1.42.2.27.8.5.1").
-     */
-    public String getID() {
-        return OID;
-    }
+	/**
+	 * Returns the OID of the Password Policy Control ("1.3.6.1.4.1.42.2.27.8.5.1").
+	 */
+	public String getID() {
+		return OID;
+	}
 
-    /**
-     * Returns whether the control is critical for the client.
-     */
-    public boolean isCritical() {
-        return critical;
-    }
+	/**
+	 * Returns whether the control is critical for the client.
+	 */
+	public boolean isCritical() {
+		return critical;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlExtractor.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlExtractor.java
index 71236e5263..66365bb3fb 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlExtractor.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlExtractor.java
@@ -14,24 +14,26 @@ import org.apache.commons.logging.LogFactory;
  * @since 3.0
  */
 public class PasswordPolicyControlExtractor {
-    private static final Log logger = LogFactory.getLog(PasswordPolicyControlExtractor.class);
+	private static final Log logger = LogFactory
+			.getLog(PasswordPolicyControlExtractor.class);
 
-    public static PasswordPolicyResponseControl extractControl(DirContext dirCtx) {
-        LdapContext ctx = (LdapContext) dirCtx;
-        Control[] ctrls = null;
-        try {
-            ctrls = ctx.getResponseControls();
-        } catch (javax.naming.NamingException e) {
-            logger.error("Failed to obtain response controls", e);
-        }
+	public static PasswordPolicyResponseControl extractControl(DirContext dirCtx) {
+		LdapContext ctx = (LdapContext) dirCtx;
+		Control[] ctrls = null;
+		try {
+			ctrls = ctx.getResponseControls();
+		}
+		catch (javax.naming.NamingException e) {
+			logger.error("Failed to obtain response controls", e);
+		}
 
-        for (int i = 0; ctrls != null && i < ctrls.length; i++) {
-            if (ctrls[i] instanceof PasswordPolicyResponseControl) {
-                return (PasswordPolicyResponseControl) ctrls[i];
-            }
-        }
+		for (int i = 0; ctrls != null && i < ctrls.length; i++) {
+			if (ctrls[i] instanceof PasswordPolicyResponseControl) {
+				return (PasswordPolicyResponseControl) ctrls[i];
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
index c6647a38a6..8effb4ce46 100755
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactory.java
@@ -18,7 +18,6 @@ package org.springframework.security.ldap.ppolicy;
 import javax.naming.ldap.Control;
 import javax.naming.ldap.ControlFactory;
 
-
 /**
  * Transforms a control object to a PasswordPolicyResponseControl object, if appropriate.
  *
@@ -26,21 +25,23 @@ import javax.naming.ldap.ControlFactory;
  * @author Luke Taylor
  */
 public class PasswordPolicyControlFactory extends ControlFactory {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Creates an instance of PasswordPolicyResponseControl if the passed control is a response control of this
-     * type. Attributes of the result are filled with the correct values (e.g. error code).
-     *
-     * @param ctl the control the check
-     *
-     * @return a response control of type PasswordPolicyResponseControl, or null
-     */
-    public Control getControlInstance(Control ctl) {
-        if (ctl.getID().equals(PasswordPolicyControl.OID)) {
-            return new PasswordPolicyResponseControl(ctl.getEncodedValue());
-        }
+	/**
+	 * Creates an instance of PasswordPolicyResponseControl if the passed control is a
+	 * response control of this type. Attributes of the result are filled with the correct
+	 * values (e.g. error code).
+	 *
+	 * @param ctl the control the check
+	 *
+	 * @return a response control of type PasswordPolicyResponseControl, or null
+	 */
+	public Control getControlInstance(Control ctl) {
+		if (ctl.getID().equals(PasswordPolicyControl.OID)) {
+			return new PasswordPolicyResponseControl(ctl.getEncodedValue());
+		}
 
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyData.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyData.java
index c735a55436..7926359456 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyData.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyData.java
@@ -5,7 +5,7 @@ package org.springframework.security.ldap.ppolicy;
  * @since 3.0
  */
 public interface PasswordPolicyData {
-    int getTimeBeforeExpiration();
+	int getTimeBeforeExpiration();
 
-    int getGraceLoginsRemaining();
+	int getGraceLoginsRemaining();
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java
index 0a261096cd..3483dbd13d 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java
@@ -1,9 +1,8 @@
 package org.springframework.security.ldap.ppolicy;
 
-
 /**
- * Defines status codes for use with <tt>PasswordPolicyException</tt>, with error codes (for message source lookup) and default
- * messages.
+ * Defines status codes for use with <tt>PasswordPolicyException</tt>, with error codes
+ * (for message source lookup) and default messages.
  *
  * <pre>
  *    PasswordPolicyResponseValue ::= SEQUENCE {
@@ -19,35 +18,38 @@ package org.springframework.security.ldap.ppolicy;
  *           passwordInHistory           (8)
  *        } OPTIONAL
  *    }
- *</pre>
+ * </pre>
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public enum PasswordPolicyErrorStatus {
-    PASSWORD_EXPIRED                ("ppolicy.expired", "Your password has expired"),
-    ACCOUNT_LOCKED                  ("ppolicy.locked", "Account is locked"),
-    CHANGE_AFTER_RESET              ("ppolicy.change.after.reset", "Your password must be changed after being reset"),
-    PASSWORD_MOD_NOT_ALLOWED        ("ppolicy.mod.not.allowed", "Password cannot be changed"),
-    MUST_SUPPLY_OLD_PASSWORD        ("ppolicy.must.supply.old.password",  "The old password must be supplied"),
-    INSUFFICIENT_PASSWORD_QUALITY   ("ppolicy.insufficient.password.quality", "The supplied password is of insufficient quality"),
-    PASSWORD_TOO_SHORT              ("ppolicy.password.too.short", "The supplied password is too short"),
-    PASSWORD_TOO_YOUNG              ("ppolicy.password.too.young", "Your password was changed too recently to be changed again"),
-    PASSWORD_IN_HISTORY             ("ppolicy.password.in.history", "The supplied password has already been used");
+	PASSWORD_EXPIRED("ppolicy.expired", "Your password has expired"), ACCOUNT_LOCKED(
+			"ppolicy.locked", "Account is locked"), CHANGE_AFTER_RESET(
+			"ppolicy.change.after.reset",
+			"Your password must be changed after being reset"), PASSWORD_MOD_NOT_ALLOWED(
+			"ppolicy.mod.not.allowed", "Password cannot be changed"), MUST_SUPPLY_OLD_PASSWORD(
+			"ppolicy.must.supply.old.password", "The old password must be supplied"), INSUFFICIENT_PASSWORD_QUALITY(
+			"ppolicy.insufficient.password.quality",
+			"The supplied password is of insufficient quality"), PASSWORD_TOO_SHORT(
+			"ppolicy.password.too.short", "The supplied password is too short"), PASSWORD_TOO_YOUNG(
+			"ppolicy.password.too.young",
+			"Your password was changed too recently to be changed again"), PASSWORD_IN_HISTORY(
+			"ppolicy.password.in.history", "The supplied password has already been used");
 
-    private final String errorCode;
-    private final String defaultMessage;
+	private final String errorCode;
+	private final String defaultMessage;
 
-    private PasswordPolicyErrorStatus(String errorCode, String defaultMessage) {
-        this.errorCode = errorCode;
-        this.defaultMessage = defaultMessage;
-    }
+	private PasswordPolicyErrorStatus(String errorCode, String defaultMessage) {
+		this.errorCode = errorCode;
+		this.defaultMessage = defaultMessage;
+	}
 
-    public String getErrorCode() {
-        return errorCode;
-    }
+	public String getErrorCode() {
+		return errorCode;
+	}
 
-    public String getDefaultMessage() {
-        return defaultMessage;
-    }
+	public String getDefaultMessage() {
+		return defaultMessage;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
index 50d13bb27c..464f2faaa2 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyException.java
@@ -3,20 +3,21 @@ package org.springframework.security.ldap.ppolicy;
 /**
  * Generic exception raised by the ppolicy package.
  * <p>
- * The <tt>status</tt> property should be checked for more detail on the cause of the exception.
+ * The <tt>status</tt> property should be checked for more detail on the cause of the
+ * exception.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class PasswordPolicyException extends RuntimeException {
-   private final PasswordPolicyErrorStatus status;
+	private final PasswordPolicyErrorStatus status;
 
-   public PasswordPolicyException(PasswordPolicyErrorStatus status) {
-       super(status.getDefaultMessage());
-       this.status = status;
-   }
+	public PasswordPolicyException(PasswordPolicyErrorStatus status) {
+		super(status.getDefaultMessage());
+		this.status = status;
+	}
 
-   public PasswordPolicyErrorStatus getStatus() {
-       return status;
-   }
+	public PasswordPolicyErrorStatus getStatus() {
+		return status;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
index 08120ebb93..9e59b8a8f4 100755
--- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControl.java
@@ -32,11 +32,11 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.DataRetrievalFailureException;
 
-
 /**
- * Represents the response control received when a <tt>PasswordPolicyControl</tt> is used when binding to a
- * directory. Currently tested with the OpenLDAP 2.3.19 implementation of the LDAP Password Policy Draft.  It extends
- * the request control with the control specific data. This is accomplished by the properties <tt>timeBeforeExpiration</tt>,
+ * Represents the response control received when a <tt>PasswordPolicyControl</tt> is used
+ * when binding to a directory. Currently tested with the OpenLDAP 2.3.19 implementation
+ * of the LDAP Password Policy Draft. It extends the request control with the control
+ * specific data. This is accomplished by the properties <tt>timeBeforeExpiration</tt>,
  * <tt>graceLoginsRemaining</tt>.
  * <p>
  *
@@ -45,304 +45,329 @@ import org.springframework.dao.DataRetrievalFailureException;
  * @author Luke Taylor
  *
  * @see org.springframework.security.ldap.ppolicy.PasswordPolicyControl
- * @see <a href="http://www.ibm.com/developerworks/tivoli/library/t-ldap-controls/">Stefan Zoerner's IBM developerworks
- *      article on LDAP controls.</a>
+ * @see <a href="http://www.ibm.com/developerworks/tivoli/library/t-ldap-controls/">Stefan
+ * Zoerner's IBM developerworks article on LDAP controls.</a>
  */
 public class PasswordPolicyResponseControl extends PasswordPolicyControl {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(PasswordPolicyResponseControl.class);
+	private static final Log logger = LogFactory
+			.getLog(PasswordPolicyResponseControl.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final byte[] encodedValue;
+	private final byte[] encodedValue;
 
-    private PasswordPolicyErrorStatus errorStatus;
+	private PasswordPolicyErrorStatus errorStatus;
 
-    private int graceLoginsRemaining = Integer.MAX_VALUE;
-    private int timeBeforeExpiration = Integer.MAX_VALUE;
+	private int graceLoginsRemaining = Integer.MAX_VALUE;
+	private int timeBeforeExpiration = Integer.MAX_VALUE;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Decodes the Ber encoded control data. The ASN.1 value of the control data is:<pre>
-     *    PasswordPolicyResponseValue ::= SEQUENCE {       warning [0] CHOICE {
-     *           timeBeforeExpiration [0] INTEGER (0 .. maxInt),
-     *           graceAuthNsRemaining [1] INTEGER (0 .. maxInt) } OPTIONAL,       error   [1] ENUMERATED {
-     *           passwordExpired             (0),          accountLocked               (1),
-     *           changeAfterReset            (2),          passwordModNotAllowed       (3),
-     *           mustSupplyOldPassword       (4),          insufficientPasswordQuality (5),
-     *           passwordTooShort            (6),          passwordTooYoung            (7),
-     *           passwordInHistory           (8) } OPTIONAL }</pre>
-     *
-     */
-    public PasswordPolicyResponseControl(byte[] encodedValue) {
-        this.encodedValue = encodedValue;
+	/**
+	 * Decodes the Ber encoded control data. The ASN.1 value of the control data is:
+	 * 
+	 * <pre>
+	 *    PasswordPolicyResponseValue ::= SEQUENCE {       warning [0] CHOICE {
+	 *           timeBeforeExpiration [0] INTEGER (0 .. maxInt),
+	 *           graceAuthNsRemaining [1] INTEGER (0 .. maxInt) } OPTIONAL,       error   [1] ENUMERATED {
+	 *           passwordExpired             (0),          accountLocked               (1),
+	 *           changeAfterReset            (2),          passwordModNotAllowed       (3),
+	 *           mustSupplyOldPassword       (4),          insufficientPasswordQuality (5),
+	 *           passwordTooShort            (6),          passwordTooYoung            (7),
+	 *           passwordInHistory           (8) } OPTIONAL }
+	 * </pre>
+	 *
+	 */
+	public PasswordPolicyResponseControl(byte[] encodedValue) {
+		this.encodedValue = encodedValue;
 
-        //PPolicyDecoder decoder = new JLdapDecoder();
-        PPolicyDecoder decoder = new NetscapeDecoder();
+		// PPolicyDecoder decoder = new JLdapDecoder();
+		PPolicyDecoder decoder = new NetscapeDecoder();
 
-        try {
-            decoder.decode();
-        } catch (IOException e) {
-            throw new DataRetrievalFailureException("Failed to parse control value", e);
-        }
-    }
+		try {
+			decoder.decode();
+		}
+		catch (IOException e) {
+			throw new DataRetrievalFailureException("Failed to parse control value", e);
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the unchanged value of the response control.  Returns the unchanged value of the response
-     * control as byte array.
-     */
-    public byte[] getEncodedValue() {
-        return encodedValue;
-    }
+	/**
+	 * Returns the unchanged value of the response control. Returns the unchanged value of
+	 * the response control as byte array.
+	 */
+	public byte[] getEncodedValue() {
+		return encodedValue;
+	}
 
-    public PasswordPolicyErrorStatus getErrorStatus() {
-        return errorStatus;
-    }
+	public PasswordPolicyErrorStatus getErrorStatus() {
+		return errorStatus;
+	}
 
-    /**
-     * Returns the graceLoginsRemaining.
-     *
-     * @return Returns the graceLoginsRemaining.
-     */
-    public int getGraceLoginsRemaining() {
-        return graceLoginsRemaining;
-    }
+	/**
+	 * Returns the graceLoginsRemaining.
+	 *
+	 * @return Returns the graceLoginsRemaining.
+	 */
+	public int getGraceLoginsRemaining() {
+		return graceLoginsRemaining;
+	}
 
-    /**
-     * Returns the timeBeforeExpiration.
-     *
-     * @return Returns the time before expiration in seconds
-     */
-    public int getTimeBeforeExpiration() {
-        return timeBeforeExpiration;
-    }
+	/**
+	 * Returns the timeBeforeExpiration.
+	 *
+	 * @return Returns the time before expiration in seconds
+	 */
+	public int getTimeBeforeExpiration() {
+		return timeBeforeExpiration;
+	}
 
-    /**
-     * Checks whether an error is present.
-     *
-     * @return true, if an error is present
-     */
-    public boolean hasError() {
-        return errorStatus != null;
-    }
+	/**
+	 * Checks whether an error is present.
+	 *
+	 * @return true, if an error is present
+	 */
+	public boolean hasError() {
+		return errorStatus != null;
+	}
 
-    /**
-     * Checks whether a warning is present.
-     *
-     * @return true, if a warning is present
-     */
-    public boolean hasWarning() {
-        return (graceLoginsRemaining != Integer.MAX_VALUE) || (timeBeforeExpiration != Integer.MAX_VALUE);
-    }
+	/**
+	 * Checks whether a warning is present.
+	 *
+	 * @return true, if a warning is present
+	 */
+	public boolean hasWarning() {
+		return (graceLoginsRemaining != Integer.MAX_VALUE)
+				|| (timeBeforeExpiration != Integer.MAX_VALUE);
+	}
 
-    public boolean isExpired() {
-        return errorStatus == PasswordPolicyErrorStatus.PASSWORD_EXPIRED;
-    }
+	public boolean isExpired() {
+		return errorStatus == PasswordPolicyErrorStatus.PASSWORD_EXPIRED;
+	}
 
-    public boolean isChangeAfterReset() {
-        return errorStatus == PasswordPolicyErrorStatus.CHANGE_AFTER_RESET;
-    }
+	public boolean isChangeAfterReset() {
+		return errorStatus == PasswordPolicyErrorStatus.CHANGE_AFTER_RESET;
+	}
 
-    public boolean isUsingGraceLogins() {
-        return graceLoginsRemaining < Integer.MAX_VALUE;
-    }
+	public boolean isUsingGraceLogins() {
+		return graceLoginsRemaining < Integer.MAX_VALUE;
+	}
 
-    /**
-     * Determines whether an account locked error has been returned.
-     *
-     * @return true if the account is locked.
-     */
-    public boolean isLocked() {
-        return errorStatus == PasswordPolicyErrorStatus.ACCOUNT_LOCKED;
-    }
+	/**
+	 * Determines whether an account locked error has been returned.
+	 *
+	 * @return true if the account is locked.
+	 */
+	public boolean isLocked() {
+		return errorStatus == PasswordPolicyErrorStatus.ACCOUNT_LOCKED;
+	}
 
-    /**
-     * Create a textual representation containing error and warning messages, if any are present.
-     *
-     * @return error and warning messages
-     */
-    public String toString() {
-        StringBuilder sb = new StringBuilder("PasswordPolicyResponseControl");
+	/**
+	 * Create a textual representation containing error and warning messages, if any are
+	 * present.
+	 *
+	 * @return error and warning messages
+	 */
+	public String toString() {
+		StringBuilder sb = new StringBuilder("PasswordPolicyResponseControl");
 
-        if (hasError()) {
-            sb.append(", error: ").append(errorStatus.getDefaultMessage());
-        }
+		if (hasError()) {
+			sb.append(", error: ").append(errorStatus.getDefaultMessage());
+		}
 
-        if (graceLoginsRemaining != Integer.MAX_VALUE) {
-            sb.append(", warning: ").append(graceLoginsRemaining).append(" grace logins remain");
-        }
+		if (graceLoginsRemaining != Integer.MAX_VALUE) {
+			sb.append(", warning: ").append(graceLoginsRemaining)
+					.append(" grace logins remain");
+		}
 
-        if (timeBeforeExpiration != Integer.MAX_VALUE) {
-            sb.append(", warning: time before expiration is ").append(timeBeforeExpiration);
-        }
+		if (timeBeforeExpiration != Integer.MAX_VALUE) {
+			sb.append(", warning: time before expiration is ").append(
+					timeBeforeExpiration);
+		}
 
-        if (!hasError() && !hasWarning()) {
-            sb.append(" (no error, no warning)");
-        }
+		if (!hasError() && !hasWarning()) {
+			sb.append(" (no error, no warning)");
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    //~ Inner Interfaces ===============================================================================================
+	// ~ Inner Interfaces
+	// ===============================================================================================
 
-    private interface PPolicyDecoder {
-        void decode() throws IOException;
-    }
+	private interface PPolicyDecoder {
+		void decode() throws IOException;
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    /**
-     * Decoder based on Netscape ldapsdk library
-     */
-    private class NetscapeDecoder implements PPolicyDecoder {
-        public void decode() throws IOException {
-            int[] bread = {0};
-            BERSequence seq = (BERSequence) BERElement.getElement(new SpecificTagDecoder(),
-                    new ByteArrayInputStream(encodedValue), bread);
+	/**
+	 * Decoder based on Netscape ldapsdk library
+	 */
+	private class NetscapeDecoder implements PPolicyDecoder {
+		public void decode() throws IOException {
+			int[] bread = { 0 };
+			BERSequence seq = (BERSequence) BERElement.getElement(
+					new SpecificTagDecoder(), new ByteArrayInputStream(encodedValue),
+					bread);
 
-            int size = seq.size();
+			int size = seq.size();
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("PasswordPolicyResponse, ASN.1 sequence has " + size + " elements");
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("PasswordPolicyResponse, ASN.1 sequence has " + size
+						+ " elements");
+			}
 
-            for (int i = 0; i < seq.size(); i++) {
-                BERTag elt = (BERTag) seq.elementAt(i);
+			for (int i = 0; i < seq.size(); i++) {
+				BERTag elt = (BERTag) seq.elementAt(i);
 
-                int tag = elt.getTag() & 0x1F;
+				int tag = elt.getTag() & 0x1F;
 
-                if (tag == 0) {
-                    BERChoice warning = (BERChoice) elt.getValue();
+				if (tag == 0) {
+					BERChoice warning = (BERChoice) elt.getValue();
 
-                    BERTag content = (BERTag) warning.getValue();
-                    int value = ((BERInteger) content.getValue()).getValue();
+					BERTag content = (BERTag) warning.getValue();
+					int value = ((BERInteger) content.getValue()).getValue();
 
-                    if ((content.getTag() & 0x1F) == 0) {
-                        timeBeforeExpiration = value;
-                    } else {
-                        graceLoginsRemaining = value;
-                    }
-                } else if (tag == 1) {
-                    BERIntegral error = (BERIntegral) elt.getValue();
-                    errorStatus = PasswordPolicyErrorStatus.values()[error.getValue()];
-                }
-            }
-        }
+					if ((content.getTag() & 0x1F) == 0) {
+						timeBeforeExpiration = value;
+					}
+					else {
+						graceLoginsRemaining = value;
+					}
+				}
+				else if (tag == 1) {
+					BERIntegral error = (BERIntegral) elt.getValue();
+					errorStatus = PasswordPolicyErrorStatus.values()[error.getValue()];
+				}
+			}
+		}
 
-        class SpecificTagDecoder extends BERTagDecoder {
-            /** Allows us to remember which of the two options we're decoding */
-            private Boolean inChoice = null;
+		class SpecificTagDecoder extends BERTagDecoder {
+			/** Allows us to remember which of the two options we're decoding */
+			private Boolean inChoice = null;
 
-            public BERElement getElement(BERTagDecoder decoder, int tag, InputStream stream, int[] bytesRead,
-                boolean[] implicit) throws IOException {
-                tag &= 0x1F;
-                implicit[0] = false;
+			public BERElement getElement(BERTagDecoder decoder, int tag,
+					InputStream stream, int[] bytesRead, boolean[] implicit)
+					throws IOException {
+				tag &= 0x1F;
+				implicit[0] = false;
 
-                if (tag == 0) {
-                    // Either the choice or the time before expiry within it
-                    if (inChoice == null) {
-                        setInChoice(true);
+				if (tag == 0) {
+					// Either the choice or the time before expiry within it
+					if (inChoice == null) {
+						setInChoice(true);
 
-                        // Read the choice length from the stream (ignored)
-                        BERElement.readLengthOctets(stream, bytesRead);
+						// Read the choice length from the stream (ignored)
+						BERElement.readLengthOctets(stream, bytesRead);
 
-                        int[] componentLength = new int[1];
-                        BERElement choice = new BERChoice(decoder, stream, componentLength);
-                        bytesRead[0] += componentLength[0];
+						int[] componentLength = new int[1];
+						BERElement choice = new BERChoice(decoder, stream,
+								componentLength);
+						bytesRead[0] += componentLength[0];
 
-                        // inChoice = null;
-                        return choice;
-                    } else {
-                        // Must be time before expiry
-                        return new BERInteger(stream, bytesRead);
-                    }
-                } else if (tag == 1) {
-                    // Either the graceLogins or the error enumeration.
-                    if (inChoice == null) {
-                        // The enumeration
-                        setInChoice(false);
+						// inChoice = null;
+						return choice;
+					}
+					else {
+						// Must be time before expiry
+						return new BERInteger(stream, bytesRead);
+					}
+				}
+				else if (tag == 1) {
+					// Either the graceLogins or the error enumeration.
+					if (inChoice == null) {
+						// The enumeration
+						setInChoice(false);
 
-                        return new BEREnumerated(stream, bytesRead);
-                    } else {
-                        if (inChoice.booleanValue()) {
-                            // graceLogins
-                            return new BERInteger(stream, bytesRead);
-                        }
-                    }
-                }
+						return new BEREnumerated(stream, bytesRead);
+					}
+					else {
+						if (inChoice.booleanValue()) {
+							// graceLogins
+							return new BERInteger(stream, bytesRead);
+						}
+					}
+				}
 
-                throw new DataRetrievalFailureException("Unexpected tag " + tag);
-            }
+				throw new DataRetrievalFailureException("Unexpected tag " + tag);
+			}
 
-            private void setInChoice(boolean inChoice) {
-                this.inChoice = Boolean.valueOf(inChoice);
-            }
-        }
-    }
+			private void setInChoice(boolean inChoice) {
+				this.inChoice = Boolean.valueOf(inChoice);
+			}
+		}
+	}
 
-/** Decoder based on the OpenLDAP/Novell JLDAP library */
+	/** Decoder based on the OpenLDAP/Novell JLDAP library */
 
-//    private class JLdapDecoder implements PPolicyDecoder {
-//
-//        public void decode() throws IOException {
-//
-//            LBERDecoder decoder = new LBERDecoder();
-//
-//            ASN1Sequence seq = (ASN1Sequence)decoder.decode(encodedValue);
-//
-//            if(seq == null) {
-//
-//            }
-//
-//            int size = seq.size();
-//
-//            if(logger.isDebugEnabled()) {
-//                logger.debug("PasswordPolicyResponse, ASN.1 sequence has " +
-//                        size + " elements");
-//            }
-//
-//            for(int i=0; i < size; i++) {
-//
-//                ASN1Tagged taggedObject = (ASN1Tagged)seq.get(i);
-//
-//                int tag = taggedObject.getIdentifier().getTag();
-//
-//                ASN1OctetString value = (ASN1OctetString)taggedObject.taggedValue();
-//                byte[] content = value.byteValue();
-//
-//                if(tag == 0) {
-//                    parseWarning(content, decoder);
-//
-//                } else if(tag == 1) {
-//                    // Error: set the code to the value
-//                    errorCode = content[0];
-//                }
-//            }
-//        }
-//
-//        private void parseWarning(byte[] content, LBERDecoder decoder) {
-//            // It's the warning (choice). Parse the number and set either the
-//            // expiry time or number of logins remaining.
-//            ASN1Tagged taggedObject = (ASN1Tagged)decoder.decode(content);
-//            int contentTag = taggedObject.getIdentifier().getTag();
-//            content = ((ASN1OctetString)taggedObject.taggedValue()).byteValue();
-//            int number;
-//
-//            try {
-//                number = ((Long)decoder.decodeNumeric(new ByteArrayInputStream(content), content.length)).intValue();
-//            } catch(IOException e) {
-//                throw new LdapDataAccessException("Failed to parse number ", e);
-//            }
-//
-//            if(contentTag == 0) {
-//                timeBeforeExpiration = number;
-//            } else if (contentTag == 1) {
-//                graceLoginsRemaining = number;
-//            }
-//        }
-//    }
+	// private class JLdapDecoder implements PPolicyDecoder {
+	//
+	// public void decode() throws IOException {
+	//
+	// LBERDecoder decoder = new LBERDecoder();
+	//
+	// ASN1Sequence seq = (ASN1Sequence)decoder.decode(encodedValue);
+	//
+	// if(seq == null) {
+	//
+	// }
+	//
+	// int size = seq.size();
+	//
+	// if(logger.isDebugEnabled()) {
+	// logger.debug("PasswordPolicyResponse, ASN.1 sequence has " +
+	// size + " elements");
+	// }
+	//
+	// for(int i=0; i < size; i++) {
+	//
+	// ASN1Tagged taggedObject = (ASN1Tagged)seq.get(i);
+	//
+	// int tag = taggedObject.getIdentifier().getTag();
+	//
+	// ASN1OctetString value = (ASN1OctetString)taggedObject.taggedValue();
+	// byte[] content = value.byteValue();
+	//
+	// if(tag == 0) {
+	// parseWarning(content, decoder);
+	//
+	// } else if(tag == 1) {
+	// // Error: set the code to the value
+	// errorCode = content[0];
+	// }
+	// }
+	// }
+	//
+	// private void parseWarning(byte[] content, LBERDecoder decoder) {
+	// // It's the warning (choice). Parse the number and set either the
+	// // expiry time or number of logins remaining.
+	// ASN1Tagged taggedObject = (ASN1Tagged)decoder.decode(content);
+	// int contentTag = taggedObject.getIdentifier().getTag();
+	// content = ((ASN1OctetString)taggedObject.taggedValue()).byteValue();
+	// int number;
+	//
+	// try {
+	// number = ((Long)decoder.decodeNumeric(new ByteArrayInputStream(content),
+	// content.length)).intValue();
+	// } catch(IOException e) {
+	// throw new LdapDataAccessException("Failed to parse number ", e);
+	// }
+	//
+	// if(contentTag == 0) {
+	// timeBeforeExpiration = number;
+	// } else if (contentTag == 1) {
+	// graceLoginsRemaining = number;
+	// }
+	// }
+	// }
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
index 164d167a95..cb50b758e4 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/search/FilterBasedLdapUserSearch.java
@@ -18,7 +18,6 @@ package org.springframework.security.ldap.search;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.ldap.SpringSecurityLdapTemplate;
 
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -32,7 +31,6 @@ import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 
 import javax.naming.directory.SearchControls;
 
-
 /**
  * LdapUserSearch implementation which uses an Ldap filter to locate the user.
  *
@@ -42,139 +40,159 @@ import javax.naming.directory.SearchControls;
  * @see SearchControls
  */
 public class FilterBasedLdapUserSearch implements LdapUserSearch {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(FilterBasedLdapUserSearch.class);
+	private static final Log logger = LogFactory.getLog(FilterBasedLdapUserSearch.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final ContextSource contextSource;
+	private final ContextSource contextSource;
 
-    /**
-     * The LDAP SearchControls object used for the search. Shared between searches so shouldn't be modified
-     * once the bean has been configured.
-     */
-    private final SearchControls searchControls = new SearchControls();
+	/**
+	 * The LDAP SearchControls object used for the search. Shared between searches so
+	 * shouldn't be modified once the bean has been configured.
+	 */
+	private final SearchControls searchControls = new SearchControls();
 
-    /** Context name to search in, relative to the base of the configured ContextSource. */
-    private String searchBase = "";
+	/** Context name to search in, relative to the base of the configured ContextSource. */
+	private String searchBase = "";
 
-    /**
-     * The filter expression used in the user search. This is an LDAP search filter (as defined in 'RFC 2254')
-     * with optional arguments. See the documentation for the <tt>search</tt> methods in {@link
-     * javax.naming.directory.DirContext DirContext} for more information.
-     *
-     * <p>In this case, the username is the only parameter.</p>
-     *  Possible examples are:
-     *  <ul>
-     *      <li>(uid={0}) - this would search for a username match on the uid attribute.</li>
-     *  </ul>
-     */
-    private final String searchFilter;
+	/**
+	 * The filter expression used in the user search. This is an LDAP search filter (as
+	 * defined in 'RFC 2254') with optional arguments. See the documentation for the
+	 * <tt>search</tt> methods in {@link javax.naming.directory.DirContext DirContext} for
+	 * more information.
+	 *
+	 * <p>
+	 * In this case, the username is the only parameter.
+	 * </p>
+	 * Possible examples are:
+	 * <ul>
+	 * <li>(uid={0}) - this would search for a username match on the uid attribute.</li>
+	 * </ul>
+	 */
+	private final String searchFilter;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public FilterBasedLdapUserSearch(String searchBase, String searchFilter, BaseLdapPathContextSource contextSource) {
-        Assert.notNull(contextSource, "contextSource must not be null");
-        Assert.notNull(searchFilter, "searchFilter must not be null.");
-        Assert.notNull(searchBase, "searchBase must not be null (an empty string is acceptable).");
+	public FilterBasedLdapUserSearch(String searchBase, String searchFilter,
+			BaseLdapPathContextSource contextSource) {
+		Assert.notNull(contextSource, "contextSource must not be null");
+		Assert.notNull(searchFilter, "searchFilter must not be null.");
+		Assert.notNull(searchBase,
+				"searchBase must not be null (an empty string is acceptable).");
 
-        this.searchFilter = searchFilter;
-        this.contextSource = contextSource;
-        this.searchBase = searchBase;
+		this.searchFilter = searchFilter;
+		this.contextSource = contextSource;
+		this.searchBase = searchBase;
 
-        setSearchSubtree(true);
+		setSearchSubtree(true);
 
-        if (searchBase.length() == 0) {
-            logger.info("SearchBase not set. Searches will be performed from the root: "
-                + contextSource.getBaseLdapPath());
-        }
-    }
+		if (searchBase.length() == 0) {
+			logger.info("SearchBase not set. Searches will be performed from the root: "
+					+ contextSource.getBaseLdapPath());
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Return the LdapUserDetails containing the user's information
-     *
-     * @param username the username to search for.
-     *
-     * @return An LdapUserDetails object containing the details of the located user's directory entry
-     *
-     * @throws UsernameNotFoundException if no matching entry is found.
-     */
-    public DirContextOperations searchForUser(String username) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Searching for user '" + username + "', with user search " + this);
-        }
+	/**
+	 * Return the LdapUserDetails containing the user's information
+	 *
+	 * @param username the username to search for.
+	 *
+	 * @return An LdapUserDetails object containing the details of the located user's
+	 * directory entry
+	 *
+	 * @throws UsernameNotFoundException if no matching entry is found.
+	 */
+	public DirContextOperations searchForUser(String username) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Searching for user '" + username + "', with user search "
+					+ this);
+		}
 
-        SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(contextSource);
+		SpringSecurityLdapTemplate template = new SpringSecurityLdapTemplate(
+				contextSource);
 
-        template.setSearchControls(searchControls);
+		template.setSearchControls(searchControls);
 
-        try {
+		try {
 
-            return template.searchForSingleEntry(searchBase, searchFilter, new String[] {username});
+			return template.searchForSingleEntry(searchBase, searchFilter,
+					new String[] { username });
 
-        } catch (IncorrectResultSizeDataAccessException notFound) {
-            if (notFound.getActualSize() == 0) {
-                throw new UsernameNotFoundException("User " + username + " not found in directory.");
-            }
-            // Search should never return multiple results if properly configured, so just rethrow
-            throw notFound;
-        }
-    }
+		}
+		catch (IncorrectResultSizeDataAccessException notFound) {
+			if (notFound.getActualSize() == 0) {
+				throw new UsernameNotFoundException("User " + username
+						+ " not found in directory.");
+			}
+			// Search should never return multiple results if properly configured, so just
+			// rethrow
+			throw notFound;
+		}
+	}
 
-    /**
-     * Sets the corresponding property on the {@link SearchControls} instance used in the search.
-     *
-     * @param deref the derefLinkFlag value as defined in SearchControls..
-     */
-    public void setDerefLinkFlag(boolean deref) {
-        searchControls.setDerefLinkFlag(deref);
-    }
+	/**
+	 * Sets the corresponding property on the {@link SearchControls} instance used in the
+	 * search.
+	 *
+	 * @param deref the derefLinkFlag value as defined in SearchControls..
+	 */
+	public void setDerefLinkFlag(boolean deref) {
+		searchControls.setDerefLinkFlag(deref);
+	}
 
-    /**
-     * If true then searches the entire subtree as identified by context, if false (the default) then only
-     * searches the level identified by the context.
-     *
-     * @param searchSubtree true the underlying search controls should be set to SearchControls.SUBTREE_SCOPE
-     * rather than SearchControls.ONELEVEL_SCOPE.
-     */
-    public void setSearchSubtree(boolean searchSubtree) {
-        searchControls.setSearchScope(searchSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE);
-    }
+	/**
+	 * If true then searches the entire subtree as identified by context, if false (the
+	 * default) then only searches the level identified by the context.
+	 *
+	 * @param searchSubtree true the underlying search controls should be set to
+	 * SearchControls.SUBTREE_SCOPE rather than SearchControls.ONELEVEL_SCOPE.
+	 */
+	public void setSearchSubtree(boolean searchSubtree) {
+		searchControls.setSearchScope(searchSubtree ? SearchControls.SUBTREE_SCOPE
+				: SearchControls.ONELEVEL_SCOPE);
+	}
 
-    /**
-     * The time to wait before the search fails; the default is zero, meaning forever.
-     *
-     * @param searchTimeLimit the time limit for the search (in milliseconds).
-     */
-    public void setSearchTimeLimit(int searchTimeLimit) {
-        searchControls.setTimeLimit(searchTimeLimit);
-    }
+	/**
+	 * The time to wait before the search fails; the default is zero, meaning forever.
+	 *
+	 * @param searchTimeLimit the time limit for the search (in milliseconds).
+	 */
+	public void setSearchTimeLimit(int searchTimeLimit) {
+		searchControls.setTimeLimit(searchTimeLimit);
+	}
 
-    /**
-     * Specifies the attributes that will be returned as part of the search.
-     *<p>
-     * null indicates that all attributes will be returned.
-     * An empty array indicates no attributes are returned.
-     *
-     * @param attrs An array of attribute names identifying the attributes that
-     *             will be returned. Can be null.
-     */
-    public void setReturningAttributes(String[] attrs) {
-        searchControls.setReturningAttributes(attrs);
-    }
+	/**
+	 * Specifies the attributes that will be returned as part of the search.
+	 * <p>
+	 * null indicates that all attributes will be returned. An empty array indicates no
+	 * attributes are returned.
+	 *
+	 * @param attrs An array of attribute names identifying the attributes that will be
+	 * returned. Can be null.
+	 */
+	public void setReturningAttributes(String[] attrs) {
+		searchControls.setReturningAttributes(attrs);
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
 
-        sb.append("[ searchFilter: '").append(searchFilter).append("', ");
-        sb.append("searchBase: '").append(searchBase).append("'");
-        sb.append(", scope: ")
-          .append(searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "subtree" : "single-level, ");
-        sb.append(", searchTimeLimit: ").append(searchControls.getTimeLimit());
-        sb.append(", derefLinkFlag: ").append(searchControls.getDerefLinkFlag()).append(" ]");
-        return sb.toString();
-    }
+		sb.append("[ searchFilter: '").append(searchFilter).append("', ");
+		sb.append("searchBase: '").append(searchBase).append("'");
+		sb.append(", scope: ")
+				.append(searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "subtree"
+						: "single-level, ");
+		sb.append(", searchTimeLimit: ").append(searchControls.getTimeLimit());
+		sb.append(", derefLinkFlag: ").append(searchControls.getDerefLinkFlag())
+				.append(" ]");
+		return sb.toString();
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java
index cac8774f39..af21a05be9 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java
@@ -18,27 +18,29 @@ package org.springframework.security.ldap.search;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
-
 /**
  * Obtains a user's information from the LDAP directory given a login name.
  * <p>
- * May be optionally used to configure the LDAP authentication implementation when
- * a more sophisticated approach is required than just using a simple username->DN
- * mapping.
+ * May be optionally used to configure the LDAP authentication implementation when a more
+ * sophisticated approach is required than just using a simple username->DN mapping.
  * </p>
  *
  * @author Luke Taylor
  */
 public interface LdapUserSearch {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Locates a single user in the directory and returns the LDAP information for that user.
-     *
-     * @param username the login name supplied to the authentication service.
-     *
-     * @return a DirContextOperations object containing the user's full DN and requested attributes.
-     * @throws UsernameNotFoundException if no user with the supplied name could be located by the search.
-     */
-    DirContextOperations searchForUser(String username) throws UsernameNotFoundException;
+	/**
+	 * Locates a single user in the directory and returns the LDAP information for that
+	 * user.
+	 *
+	 * @param username the login name supplied to the authentication service.
+	 *
+	 * @return a DirContextOperations object containing the user's full DN and requested
+	 * attributes.
+	 * @throws UsernameNotFoundException if no user with the supplied name could be
+	 * located by the search.
+	 */
+	DirContextOperations searchForUser(String username) throws UsernameNotFoundException;
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
index 46c70b6a1a..a0008ec4c2 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
@@ -49,256 +49,275 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.Assert;
 
 /**
- * Provides lifecycle services for the embedded apacheDS server defined by the supplied configuration.
- * Used by {code LdapServerBeanDefinitionParser}. An instance will be stored in the application context for
- * each embedded server instance. It will start the server when the context is initialized and shut it down when
- * it is closed. It is intended for temporary embedded use and will not retain changes across start/stop boundaries. The
- * working directory is deleted on shutdown.
+ * Provides lifecycle services for the embedded apacheDS server defined by the supplied
+ * configuration. Used by {code LdapServerBeanDefinitionParser}. An instance will be
+ * stored in the application context for each embedded server instance. It will start the
+ * server when the context is initialized and shut it down when it is closed. It is
+ * intended for temporary embedded use and will not retain changes across start/stop
+ * boundaries. The working directory is deleted on shutdown.
  *
  * <p>
- * If used repeatedly in a single JVM process with the same configuration (for example, when
- * repeatedly loading an application context during testing), it's important that the
- * application context is closed to allow the bean to be disposed of and the server shutdown
- * prior to attempting to start it again.
+ * If used repeatedly in a single JVM process with the same configuration (for example,
+ * when repeatedly loading an application context during testing), it's important that the
+ * application context is closed to allow the bean to be disposed of and the server
+ * shutdown prior to attempting to start it again.
  * <p>
- * This class is intended for testing and internal security namespace use and is not considered part of
- * framework public API.
+ * This class is intended for testing and internal security namespace use and is not
+ * considered part of framework public API.
  *
  * @author Luke Taylor
  * @author Rob Winch
  */
-public class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle, ApplicationContextAware {
-    private final Log logger = LogFactory.getLog(getClass());
+public class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle,
+		ApplicationContextAware {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    final DefaultDirectoryService service;
-    LdapServer server;
+	final DefaultDirectoryService service;
+	LdapServer server;
 
-    private ApplicationContext ctxt;
-    private File workingDir;
+	private ApplicationContext ctxt;
+	private File workingDir;
 
-    private boolean running;
-    private final String ldifResources;
-    private final JdbmPartition partition;
-    private final String root;
-    private int port = 53389;
+	private boolean running;
+	private final String ldifResources;
+	private final JdbmPartition partition;
+	private final String root;
+	private int port = 53389;
 
-    public ApacheDSContainer(String root, String ldifs) throws Exception {
-        this.ldifResources = ldifs;
-        service = new DefaultDirectoryService();
-        List<Interceptor> list = new ArrayList<Interceptor>();
+	public ApacheDSContainer(String root, String ldifs) throws Exception {
+		this.ldifResources = ldifs;
+		service = new DefaultDirectoryService();
+		List<Interceptor> list = new ArrayList<Interceptor>();
 
-        list.add( new NormalizationInterceptor() );
-        list.add( new AuthenticationInterceptor() );
-        list.add( new ReferralInterceptor() );
-//        list.add( new AciAuthorizationInterceptor() );
-//        list.add( new DefaultAuthorizationInterceptor() );
-        list.add( new ExceptionInterceptor() );
-//       list.add( new ChangeLogInterceptor() );
-       list.add( new OperationalAttributeInterceptor() );
-//        list.add( new SchemaInterceptor() );
-        list.add( new SubentryInterceptor() );
-//        list.add( new CollectiveAttributeInterceptor() );
-//        list.add( new EventInterceptor() );
-//        list.add( new TriggerInterceptor() );
-//        list.add( new JournalInterceptor() );
+		list.add(new NormalizationInterceptor());
+		list.add(new AuthenticationInterceptor());
+		list.add(new ReferralInterceptor());
+		// list.add( new AciAuthorizationInterceptor() );
+		// list.add( new DefaultAuthorizationInterceptor() );
+		list.add(new ExceptionInterceptor());
+		// list.add( new ChangeLogInterceptor() );
+		list.add(new OperationalAttributeInterceptor());
+		// list.add( new SchemaInterceptor() );
+		list.add(new SubentryInterceptor());
+		// list.add( new CollectiveAttributeInterceptor() );
+		// list.add( new EventInterceptor() );
+		// list.add( new TriggerInterceptor() );
+		// list.add( new JournalInterceptor() );
 
-        service.setInterceptors( list );
-        partition =  new JdbmPartition();
-        partition.setId("rootPartition");
-        partition.setSuffix(root);
-        this.root = root;
-        service.addPartition(partition);
-        service.setExitVmOnShutdown(false);
-        service.setShutdownHookEnabled(false);
-        service.getChangeLog().setEnabled(false);
-        service.setDenormalizeOpAttrsEnabled(true);
-    }
+		service.setInterceptors(list);
+		partition = new JdbmPartition();
+		partition.setId("rootPartition");
+		partition.setSuffix(root);
+		this.root = root;
+		service.addPartition(partition);
+		service.setExitVmOnShutdown(false);
+		service.setShutdownHookEnabled(false);
+		service.getChangeLog().setEnabled(false);
+		service.setDenormalizeOpAttrsEnabled(true);
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        if (workingDir == null) {
-            String apacheWorkDir = System.getProperty("apacheDSWorkDir");
+	public void afterPropertiesSet() throws Exception {
+		if (workingDir == null) {
+			String apacheWorkDir = System.getProperty("apacheDSWorkDir");
 
-            if (apacheWorkDir == null) {
-                apacheWorkDir = createTempDirectory("apacheds-spring-security-");
-            }
+			if (apacheWorkDir == null) {
+				apacheWorkDir = createTempDirectory("apacheds-spring-security-");
+			}
 
-            setWorkingDirectory(new File(apacheWorkDir));
-        }
+			setWorkingDirectory(new File(apacheWorkDir));
+		}
 
-        server = new LdapServer();
-        server.setDirectoryService(service);
-        // AbstractLdapIntegrationTests assume IPv4, so we specify the same here
-        server.setTransports(new TcpTransport(port));
-        start();
-    }
+		server = new LdapServer();
+		server.setDirectoryService(service);
+		// AbstractLdapIntegrationTests assume IPv4, so we specify the same here
+		server.setTransports(new TcpTransport(port));
+		start();
+	}
 
-    public void destroy() throws Exception {
-        stop();
-    }
+	public void destroy() throws Exception {
+		stop();
+	}
 
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        ctxt = applicationContext;
-    }
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		ctxt = applicationContext;
+	}
 
-    public void setWorkingDirectory(File workingDir) {
-        Assert.notNull(workingDir);
+	public void setWorkingDirectory(File workingDir) {
+		Assert.notNull(workingDir);
 
-        logger.info("Setting working directory for LDAP_PROVIDER: " + workingDir.getAbsolutePath());
+		logger.info("Setting working directory for LDAP_PROVIDER: "
+				+ workingDir.getAbsolutePath());
 
-        if (workingDir.exists()) {
-            throw new IllegalArgumentException("The specified working directory '" + workingDir.getAbsolutePath() +
-                    "' already exists. Another directory service instance may be using it or it may be from a " +
-                    " previous unclean shutdown. Please confirm and delete it or configure a different " +
-                    "working directory");
-        }
+		if (workingDir.exists()) {
+			throw new IllegalArgumentException(
+					"The specified working directory '"
+							+ workingDir.getAbsolutePath()
+							+ "' already exists. Another directory service instance may be using it or it may be from a "
+							+ " previous unclean shutdown. Please confirm and delete it or configure a different "
+							+ "working directory");
+		}
 
-        this.workingDir = workingDir;
+		this.workingDir = workingDir;
 
-        service.setWorkingDirectory(workingDir);
-    }
+		service.setWorkingDirectory(workingDir);
+	}
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+	public void setPort(int port) {
+		this.port = port;
+	}
 
-    public DefaultDirectoryService getService() {
-        return service;
-    }
+	public DefaultDirectoryService getService() {
+		return service;
+	}
 
-    public void start() {
-        if (isRunning()) {
-            return;
-        }
+	public void start() {
+		if (isRunning()) {
+			return;
+		}
 
-        if (service.isStarted()) {
-            throw new IllegalStateException("DirectoryService is already running.");
-        }
+		if (service.isStarted()) {
+			throw new IllegalStateException("DirectoryService is already running.");
+		}
 
-        logger.info("Starting directory server...");
-        try {
-            service.startup();
-            server.start();
-        } catch (Exception e) {
-            throw new RuntimeException("Server startup failed", e);
-        }
+		logger.info("Starting directory server...");
+		try {
+			service.startup();
+			server.start();
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Server startup failed", e);
+		}
 
-        try {
-            service.getAdminSession().lookup(partition.getSuffixDn());
-        }
-        catch (LdapNameNotFoundException e) {
-            try {
-                LdapDN dn = new LdapDN(root);
-                Assert.isTrue(root.startsWith("dc="));
-                String dc = root.substring(3,root.indexOf(','));
-                ServerEntry entry = service.newEntry(dn);
-                entry.add("objectClass", "top", "domain", "extensibleObject");
-                entry.add("dc",dc);
-                service.getAdminSession().add( entry );
-            } catch (Exception e1) {
-                logger.error("Failed to create dc entry", e1);
-            }
-        } catch (Exception e) {
-            logger.error("Lookup failed", e);
-        }
+		try {
+			service.getAdminSession().lookup(partition.getSuffixDn());
+		}
+		catch (LdapNameNotFoundException e) {
+			try {
+				LdapDN dn = new LdapDN(root);
+				Assert.isTrue(root.startsWith("dc="));
+				String dc = root.substring(3, root.indexOf(','));
+				ServerEntry entry = service.newEntry(dn);
+				entry.add("objectClass", "top", "domain", "extensibleObject");
+				entry.add("dc", dc);
+				service.getAdminSession().add(entry);
+			}
+			catch (Exception e1) {
+				logger.error("Failed to create dc entry", e1);
+			}
+		}
+		catch (Exception e) {
+			logger.error("Lookup failed", e);
+		}
 
-        running = true;
+		running = true;
 
-        try {
-            importLdifs();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to import LDIF file(s)", e);
-        }
-    }
+		try {
+			importLdifs();
+		}
+		catch (Exception e) {
+			throw new RuntimeException("Failed to import LDIF file(s)", e);
+		}
+	}
 
-    public void stop() {
-        if (!isRunning()) {
-            return;
-        }
+	public void stop() {
+		if (!isRunning()) {
+			return;
+		}
 
-        logger.info("Shutting down directory server ...");
-        try {
-            server.stop();
-            service.shutdown();
-        } catch (Exception e) {
-            logger.error("Shutdown failed", e);
-            return;
-        }
+		logger.info("Shutting down directory server ...");
+		try {
+			server.stop();
+			service.shutdown();
+		}
+		catch (Exception e) {
+			logger.error("Shutdown failed", e);
+			return;
+		}
 
-        running = false;
+		running = false;
 
-        if (workingDir.exists()) {
-            logger.info("Deleting working directory " + workingDir.getAbsolutePath());
-            deleteDir(workingDir);
-        }
-    }
+		if (workingDir.exists()) {
+			logger.info("Deleting working directory " + workingDir.getAbsolutePath());
+			deleteDir(workingDir);
+		}
+	}
 
-    private void importLdifs() throws Exception {
-        // Import any ldif files
-        Resource[] ldifs;
+	private void importLdifs() throws Exception {
+		// Import any ldif files
+		Resource[] ldifs;
 
-        if (ctxt == null) {
-            // Not running within an app context
-            ldifs = new PathMatchingResourcePatternResolver().getResources(ldifResources);
-        } else {
-            ldifs = ctxt.getResources(ldifResources);
-        }
+		if (ctxt == null) {
+			// Not running within an app context
+			ldifs = new PathMatchingResourcePatternResolver().getResources(ldifResources);
+		}
+		else {
+			ldifs = ctxt.getResources(ldifResources);
+		}
 
-        // Note that we can't just import using the ServerContext returned
-        // from starting Apache DS, apparently because of the long-running issue DIRSERVER-169.
-        // We need a standard context.
-        //DirContext dirContext = contextSource.getReadWriteContext();
+		// Note that we can't just import using the ServerContext returned
+		// from starting Apache DS, apparently because of the long-running issue
+		// DIRSERVER-169.
+		// We need a standard context.
+		// DirContext dirContext = contextSource.getReadWriteContext();
 
-        if (ldifs == null || ldifs.length == 0) {
-            return;
-        }
+		if (ldifs == null || ldifs.length == 0) {
+			return;
+		}
 
-        if(ldifs.length == 1) {
-            String ldifFile;
+		if (ldifs.length == 1) {
+			String ldifFile;
 
-            try {
-                ldifFile = ldifs[0].getFile().getAbsolutePath();
-            } catch (IOException e) {
-                ldifFile = ldifs[0].getURI().toString();
-            }
-            logger.info("Loading LDIF file: " + ldifFile);
-            LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), new File(ldifFile), null, getClass().getClassLoader());
-            loader.execute();
-        } else {
-            throw new IllegalArgumentException("More than one LDIF resource found with the supplied pattern:" + ldifResources+ " Got " + Arrays.toString(ldifs));
-        }
-    }
+			try {
+				ldifFile = ldifs[0].getFile().getAbsolutePath();
+			}
+			catch (IOException e) {
+				ldifFile = ldifs[0].getURI().toString();
+			}
+			logger.info("Loading LDIF file: " + ldifFile);
+			LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(),
+					new File(ldifFile), null, getClass().getClassLoader());
+			loader.execute();
+		}
+		else {
+			throw new IllegalArgumentException(
+					"More than one LDIF resource found with the supplied pattern:"
+							+ ldifResources + " Got " + Arrays.toString(ldifs));
+		}
+	}
 
-    private String createTempDirectory(String prefix) throws IOException {
-        String parentTempDir = System.getProperty("java.io.tmpdir");
-        String fileNamePrefix = prefix + System.nanoTime();
-        String fileName = fileNamePrefix;
+	private String createTempDirectory(String prefix) throws IOException {
+		String parentTempDir = System.getProperty("java.io.tmpdir");
+		String fileNamePrefix = prefix + System.nanoTime();
+		String fileName = fileNamePrefix;
 
-        for(int i=0;i<1000;i++) {
-            File tempDir = new File(parentTempDir, fileName);
-            if(!tempDir.exists()) {
-                return tempDir.getAbsolutePath();
-            }
-            fileName = fileNamePrefix + "~" + i;
-        }
+		for (int i = 0; i < 1000; i++) {
+			File tempDir = new File(parentTempDir, fileName);
+			if (!tempDir.exists()) {
+				return tempDir.getAbsolutePath();
+			}
+			fileName = fileNamePrefix + "~" + i;
+		}
 
-        throw new IOException("Failed to create a temporary directory for file at " + new File(parentTempDir, fileNamePrefix));
-    }
+		throw new IOException("Failed to create a temporary directory for file at "
+				+ new File(parentTempDir, fileNamePrefix));
+	}
 
-    private boolean deleteDir(File dir) {
-        if (dir.isDirectory()) {
-            String[] children = dir.list();
-            for (String child : children) {
-                boolean success = deleteDir(new File(dir, child));
-                if (!success) {
-                    return false;
-                }
-            }
-        }
+	private boolean deleteDir(File dir) {
+		if (dir.isDirectory()) {
+			String[] children = dir.list();
+			for (String child : children) {
+				boolean success = deleteDir(new File(dir, child));
+				if (!success) {
+					return false;
+				}
+			}
+		}
 
-        return dir.delete();
-    }
+		return dir.delete();
+	}
 
-    public boolean isRunning() {
-        return running;
-    }
+	public boolean isRunning() {
+		return running;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java
index bbf1dc559a..7bb89f66e5 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java
@@ -35,23 +35,24 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-
 /**
  * The default strategy for obtaining user role information from the directory.
  * <p>
  * It obtains roles by performing a search for "groups" the user is a member of.
  * <p>
- * A typical group search scenario would be where each group/role is specified using the <tt>groupOfNames</tt>
- * (or <tt>groupOfUniqueNames</tt>) LDAP objectClass and the user's DN is listed in the <tt>member</tt> (or
- * <tt>uniqueMember</tt>) attribute to indicate that they should be assigned that role. The following LDIF sample has
- * the groups stored under the DN <tt>ou=groups,dc=springframework,dc=org</tt> and a group called "developers" with
- * "ben" and "luke" as members:
+ * A typical group search scenario would be where each group/role is specified using the
+ * <tt>groupOfNames</tt> (or <tt>groupOfUniqueNames</tt>) LDAP objectClass and the user's
+ * DN is listed in the <tt>member</tt> (or <tt>uniqueMember</tt>) attribute to indicate
+ * that they should be assigned that role. The following LDIF sample has the groups stored
+ * under the DN <tt>ou=groups,dc=springframework,dc=org</tt> and a group called
+ * "developers" with "ben" and "luke" as members:
+ * 
  * <pre>
  * dn: ou=groups,dc=springframework,dc=org
  * objectClass: top
  * objectClass: organizationalUnit
  * ou: groups
- *
+ * 
  * dn: cn=developers,ou=groups,dc=springframework,dc=org
  * objectClass: groupOfNames
  * objectClass: top
@@ -62,14 +63,17 @@ import java.util.Set;
  * ou: developer
  * </pre>
  * <p>
- * The group search is performed within a DN specified by the <tt>groupSearchBase</tt> property, which should
- * be relative to the root DN of its <tt>ContextSource</tt>. If the search base is null, group searching is
- * disabled. The filter used in the search is defined by the <tt>groupSearchFilter</tt> property, with the filter
- * argument {0} being the full DN of the user. You can also optionally use the parameter {1}, which will be substituted
- * with the username. You can also specify which attribute defines the role name by setting
- * the <tt>groupRoleAttribute</tt> property (the default is "cn").
+ * The group search is performed within a DN specified by the <tt>groupSearchBase</tt>
+ * property, which should be relative to the root DN of its <tt>ContextSource</tt>. If the
+ * search base is null, group searching is disabled. The filter used in the search is
+ * defined by the <tt>groupSearchFilter</tt> property, with the filter argument {0} being
+ * the full DN of the user. You can also optionally use the parameter {1}, which will be
+ * substituted with the username. You can also specify which attribute defines the role
+ * name by setting the <tt>groupRoleAttribute</tt> property (the default is "cn").
  * <p>
- * The configuration below shows how the group search might be performed with the above schema.
+ * The configuration below shows how the group search might be performed with the above
+ * schema.
+ * 
  * <pre>
  * &lt;bean id="ldapAuthoritiesPopulator"
  *       class="org.springframework.security.authentication.ldap.populator.DefaultLdapAuthoritiesPopulator">
@@ -82,291 +86,309 @@ import java.util.Set;
  *   &lt;property name="convertToUpperCase" value="true"/>
  * &lt;/bean>
  * </pre>
- * A search for roles for user "uid=ben,ou=people,dc=springframework,dc=org" would return the single granted authority
- * "ROLE_DEVELOPER".
+ * 
+ * A search for roles for user "uid=ben,ou=people,dc=springframework,dc=org" would return
+ * the single granted authority "ROLE_DEVELOPER".
  * <p>
- * The single-level search is performed by default. Setting the <tt>searchSubTree</tt> property to true will enable
- * a search of the entire subtree under <tt>groupSearchBase</tt>.
+ * The single-level search is performed by default. Setting the <tt>searchSubTree</tt>
+ * property to true will enable a search of the entire subtree under
+ * <tt>groupSearchBase</tt>.
  *
  * @author Luke Taylor
  * @author Filip Hanik
  */
 public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(DefaultLdapAuthoritiesPopulator.class);
+	private static final Log logger = LogFactory
+			.getLog(DefaultLdapAuthoritiesPopulator.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    /**
-     * A default role which will be assigned to all authenticated users if set
-     */
-    private GrantedAuthority defaultRole;
+	/**
+	 * A default role which will be assigned to all authenticated users if set
+	 */
+	private GrantedAuthority defaultRole;
 
-    /**
-     * Template that will be used for searching
-     */
-    private final SpringSecurityLdapTemplate ldapTemplate;
+	/**
+	 * Template that will be used for searching
+	 */
+	private final SpringSecurityLdapTemplate ldapTemplate;
 
-    /**
-     * Controls used to determine whether group searches should be performed over the full sub-tree from the
-     * base DN. Modified by searchSubTree property
-     */
-    private final SearchControls searchControls = new SearchControls();
+	/**
+	 * Controls used to determine whether group searches should be performed over the full
+	 * sub-tree from the base DN. Modified by searchSubTree property
+	 */
+	private final SearchControls searchControls = new SearchControls();
 
-    /**
-     * The ID of the attribute which contains the role name for a group
-     */
-    private String groupRoleAttribute = "cn";
+	/**
+	 * The ID of the attribute which contains the role name for a group
+	 */
+	private String groupRoleAttribute = "cn";
 
-    /**
-     * The base DN from which the search for group membership should be performed
-     */
-    private String groupSearchBase;
+	/**
+	 * The base DN from which the search for group membership should be performed
+	 */
+	private String groupSearchBase;
 
-    /**
-     * The pattern to be used for the user search. {0} is the user's DN
-     */
-    private String groupSearchFilter = "(member={0})";
-    /**
-     * The role prefix that will be prepended to each role name
-     */
-    private String rolePrefix = "ROLE_";
-    /**
-     * Should we convert the role name to uppercase
-     */
-    private boolean convertToUpperCase = true;
+	/**
+	 * The pattern to be used for the user search. {0} is the user's DN
+	 */
+	private String groupSearchFilter = "(member={0})";
+	/**
+	 * The role prefix that will be prepended to each role name
+	 */
+	private String rolePrefix = "ROLE_";
+	/**
+	 * Should we convert the role name to uppercase
+	 */
+	private boolean convertToUpperCase = true;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor for group search scenarios. <tt>userRoleAttributes</tt> may still be
-     * set as a property.
-     *
-     * @param contextSource supplies the contexts used to search for user roles.
-     * @param groupSearchBase          if this is an empty string the search will be performed from the root DN of the
-     *                                 context factory. If null, no search will be performed.
-     */
-    public DefaultLdapAuthoritiesPopulator(ContextSource contextSource, String groupSearchBase) {
-        Assert.notNull(contextSource, "contextSource must not be null");
-        ldapTemplate = new SpringSecurityLdapTemplate(contextSource);
-        getLdapTemplate().setSearchControls(getSearchControls());
-        this.groupSearchBase = groupSearchBase;
+	/**
+	 * Constructor for group search scenarios. <tt>userRoleAttributes</tt> may still be
+	 * set as a property.
+	 *
+	 * @param contextSource supplies the contexts used to search for user roles.
+	 * @param groupSearchBase if this is an empty string the search will be performed from
+	 * the root DN of the context factory. If null, no search will be performed.
+	 */
+	public DefaultLdapAuthoritiesPopulator(ContextSource contextSource,
+			String groupSearchBase) {
+		Assert.notNull(contextSource, "contextSource must not be null");
+		ldapTemplate = new SpringSecurityLdapTemplate(contextSource);
+		getLdapTemplate().setSearchControls(getSearchControls());
+		this.groupSearchBase = groupSearchBase;
 
-        if (groupSearchBase == null) {
-            logger.info("groupSearchBase is null. No group search will be performed.");
-        } else if (groupSearchBase.length() == 0) {
-            logger.info("groupSearchBase is empty. Searches will be performed from the context source base");
-        }
-    }
+		if (groupSearchBase == null) {
+			logger.info("groupSearchBase is null. No group search will be performed.");
+		}
+		else if (groupSearchBase.length() == 0) {
+			logger.info("groupSearchBase is empty. Searches will be performed from the context source base");
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * This method should be overridden if required to obtain any additional
-     * roles for the given user (on top of those obtained from the standard
-     * search implemented by this class).
-     *
-     * @param user the context representing the user who's roles are required
-     * @return the extra roles which will be merged with those returned by the group search
-     */
+	/**
+	 * This method should be overridden if required to obtain any additional roles for the
+	 * given user (on top of those obtained from the standard search implemented by this
+	 * class).
+	 *
+	 * @param user the context representing the user who's roles are required
+	 * @return the extra roles which will be merged with those returned by the group
+	 * search
+	 */
 
-    protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String username) {
-        return null;
-    }
+	protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user,
+			String username) {
+		return null;
+	}
 
-    /**
-     * Obtains the authorities for the user who's directory entry is represented by
-     * the supplied LdapUserDetails object.
-     *
-     * @param user the user who's authorities are required
-     * @return the set of roles granted to the user.
-     */
-    public final Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations user, String username) {
-        String userDn = user.getNameInNamespace();
+	/**
+	 * Obtains the authorities for the user who's directory entry is represented by the
+	 * supplied LdapUserDetails object.
+	 *
+	 * @param user the user who's authorities are required
+	 * @return the set of roles granted to the user.
+	 */
+	public final Collection<GrantedAuthority> getGrantedAuthorities(
+			DirContextOperations user, String username) {
+		String userDn = user.getNameInNamespace();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Getting authorities for user " + userDn);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Getting authorities for user " + userDn);
+		}
 
-        Set<GrantedAuthority> roles = getGroupMembershipRoles(userDn, username);
+		Set<GrantedAuthority> roles = getGroupMembershipRoles(userDn, username);
 
-        Set<GrantedAuthority> extraRoles = getAdditionalRoles(user, username);
+		Set<GrantedAuthority> extraRoles = getAdditionalRoles(user, username);
 
-        if (extraRoles != null) {
-            roles.addAll(extraRoles);
-        }
+		if (extraRoles != null) {
+			roles.addAll(extraRoles);
+		}
 
-        if (defaultRole != null) {
-            roles.add(defaultRole);
-        }
+		if (defaultRole != null) {
+			roles.add(defaultRole);
+		}
 
-        List<GrantedAuthority> result = new ArrayList<GrantedAuthority>(roles.size());
-        result.addAll(roles);
+		List<GrantedAuthority> result = new ArrayList<GrantedAuthority>(roles.size());
+		result.addAll(roles);
 
-        return result;
-    }
+		return result;
+	}
 
-    public Set<GrantedAuthority> getGroupMembershipRoles(String userDn, String username) {
-        if (getGroupSearchBase() == null) {
-            return new HashSet<GrantedAuthority>();
-        }
+	public Set<GrantedAuthority> getGroupMembershipRoles(String userDn, String username) {
+		if (getGroupSearchBase() == null) {
+			return new HashSet<GrantedAuthority>();
+		}
 
-        Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+		Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Searching for roles for user '" + username + "', DN = " + "'" + userDn + "', with filter "
-                    + groupSearchFilter + " in search base '" + getGroupSearchBase() + "'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Searching for roles for user '" + username + "', DN = " + "'"
+					+ userDn + "', with filter " + groupSearchFilter
+					+ " in search base '" + getGroupSearchBase() + "'");
+		}
 
-        Set<String> userRoles = getLdapTemplate().searchForSingleAttributeValues(getGroupSearchBase(), groupSearchFilter,
-            new String[]{userDn, username}, groupRoleAttribute);
+		Set<String> userRoles = getLdapTemplate().searchForSingleAttributeValues(
+				getGroupSearchBase(), groupSearchFilter,
+				new String[] { userDn, username }, groupRoleAttribute);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Roles from search: " + userRoles);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Roles from search: " + userRoles);
+		}
 
-        for (String role : userRoles) {
+		for (String role : userRoles) {
 
-            if (convertToUpperCase) {
-                role = role.toUpperCase();
-            }
+			if (convertToUpperCase) {
+				role = role.toUpperCase();
+			}
 
-            authorities.add(new SimpleGrantedAuthority(rolePrefix + role));
-        }
+			authorities.add(new SimpleGrantedAuthority(rolePrefix + role));
+		}
 
-        return authorities;
-    }
+		return authorities;
+	}
 
-    protected ContextSource getContextSource() {
-        return getLdapTemplate().getContextSource();
-    }
+	protected ContextSource getContextSource() {
+		return getLdapTemplate().getContextSource();
+	}
 
-    protected String getGroupSearchBase() {
-        return groupSearchBase;
-    }
+	protected String getGroupSearchBase() {
+		return groupSearchBase;
+	}
 
-    /**
-     * Convert the role to uppercase
-     */
-    public void setConvertToUpperCase(boolean convertToUpperCase) {
-        this.convertToUpperCase = convertToUpperCase;
-    }
+	/**
+	 * Convert the role to uppercase
+	 */
+	public void setConvertToUpperCase(boolean convertToUpperCase) {
+		this.convertToUpperCase = convertToUpperCase;
+	}
 
-    /**
-     * The default role which will be assigned to all users.
-     *
-     * @param defaultRole the role name, including any desired prefix.
-     */
-    public void setDefaultRole(String defaultRole) {
-        Assert.notNull(defaultRole, "The defaultRole property cannot be set to null");
-        this.defaultRole = new SimpleGrantedAuthority(defaultRole);
-    }
+	/**
+	 * The default role which will be assigned to all users.
+	 *
+	 * @param defaultRole the role name, including any desired prefix.
+	 */
+	public void setDefaultRole(String defaultRole) {
+		Assert.notNull(defaultRole, "The defaultRole property cannot be set to null");
+		this.defaultRole = new SimpleGrantedAuthority(defaultRole);
+	}
 
-    public void setGroupRoleAttribute(String groupRoleAttribute) {
-        Assert.notNull(groupRoleAttribute, "groupRoleAttribute must not be null");
-        this.groupRoleAttribute = groupRoleAttribute;
-    }
+	public void setGroupRoleAttribute(String groupRoleAttribute) {
+		Assert.notNull(groupRoleAttribute, "groupRoleAttribute must not be null");
+		this.groupRoleAttribute = groupRoleAttribute;
+	}
 
-    public void setGroupSearchFilter(String groupSearchFilter) {
-        Assert.notNull(groupSearchFilter, "groupSearchFilter must not be null");
-        this.groupSearchFilter = groupSearchFilter;
-    }
+	public void setGroupSearchFilter(String groupSearchFilter) {
+		Assert.notNull(groupSearchFilter, "groupSearchFilter must not be null");
+		this.groupSearchFilter = groupSearchFilter;
+	}
 
-    /**
-     * Sets the prefix which will be prepended to the values loaded from the directory.
-     * Defaults to "ROLE_" for compatibility with <tt>RoleVoter/tt>.
-     */
-    public void setRolePrefix(String rolePrefix) {
-        Assert.notNull(rolePrefix, "rolePrefix must not be null");
-        this.rolePrefix = rolePrefix;
-    }
+	/**
+	 * Sets the prefix which will be prepended to the values loaded from the directory.
+	 * Defaults to "ROLE_" for compatibility with <tt>RoleVoter/tt>.
+	 */
+	public void setRolePrefix(String rolePrefix) {
+		Assert.notNull(rolePrefix, "rolePrefix must not be null");
+		this.rolePrefix = rolePrefix;
+	}
 
-    /**
-     * If set to true, a subtree scope search will be performed. If false a single-level search is used.
-     *
-     * @param searchSubtree set to true to enable searching of the entire tree below the <tt>groupSearchBase</tt>.
-     */
-    public void setSearchSubtree(boolean searchSubtree) {
-        int searchScope = searchSubtree ? SearchControls.SUBTREE_SCOPE : SearchControls.ONELEVEL_SCOPE;
-        searchControls.setSearchScope(searchScope);
-    }
+	/**
+	 * If set to true, a subtree scope search will be performed. If false a single-level
+	 * search is used.
+	 *
+	 * @param searchSubtree set to true to enable searching of the entire tree below the
+	 * <tt>groupSearchBase</tt>.
+	 */
+	public void setSearchSubtree(boolean searchSubtree) {
+		int searchScope = searchSubtree ? SearchControls.SUBTREE_SCOPE
+				: SearchControls.ONELEVEL_SCOPE;
+		searchControls.setSearchScope(searchScope);
+	}
 
-    /**
-     * Sets the corresponding property on the underlying template, avoiding specific issues with Active Directory.
-     *
-     *   @see LdapTemplate#setIgnoreNameNotFoundException(boolean)
-     */
-    public void setIgnorePartialResultException(boolean ignore) {
-        getLdapTemplate().setIgnorePartialResultException(ignore);
-    }
+	/**
+	 * Sets the corresponding property on the underlying template, avoiding specific
+	 * issues with Active Directory.
+	 *
+	 * @see LdapTemplate#setIgnoreNameNotFoundException(boolean)
+	 */
+	public void setIgnorePartialResultException(boolean ignore) {
+		getLdapTemplate().setIgnorePartialResultException(ignore);
+	}
 
-    /**
-     * Returns the current LDAP template.
-     * Method available so that classes extending this can override the template used
-     * @return the LDAP template
-     * @see {@link org.springframework.security.ldap.SpringSecurityLdapTemplate}
-     */
-    protected SpringSecurityLdapTemplate getLdapTemplate() {
-        return ldapTemplate;
-    }
+	/**
+	 * Returns the current LDAP template. Method available so that classes extending this
+	 * can override the template used
+	 * @return the LDAP template
+	 * @see {@link org.springframework.security.ldap.SpringSecurityLdapTemplate}
+	 */
+	protected SpringSecurityLdapTemplate getLdapTemplate() {
+		return ldapTemplate;
+	}
 
-    /**
-     * Returns the attribute name of the LDAP attribute that will be mapped to the role name
-     * Method available so that classes extending this can override
-     * @return the attribute name used for role mapping
-     * @see {@link #setGroupRoleAttribute(String)}
-     */
-    protected final String getGroupRoleAttribute() {
-        return groupRoleAttribute;
-    }
+	/**
+	 * Returns the attribute name of the LDAP attribute that will be mapped to the role
+	 * name Method available so that classes extending this can override
+	 * @return the attribute name used for role mapping
+	 * @see {@link #setGroupRoleAttribute(String)}
+	 */
+	protected final String getGroupRoleAttribute() {
+		return groupRoleAttribute;
+	}
 
-    /**
-     * Returns the search filter configured for this populator
-     * Method available so that classes extending this can override
-     * @return the search filter
-     * @see {@link #setGroupSearchFilter(String)}
-     */
-    protected final String getGroupSearchFilter() {
-        return groupSearchFilter;
-    }
+	/**
+	 * Returns the search filter configured for this populator Method available so that
+	 * classes extending this can override
+	 * @return the search filter
+	 * @see {@link #setGroupSearchFilter(String)}
+	 */
+	protected final String getGroupSearchFilter() {
+		return groupSearchFilter;
+	}
 
-    /**
-     * Returns the role prefix used by this populator
-     * Method available so that classes extending this can override
-     * @return the role prefix
-     * @see {@link #setRolePrefix(String)}
-     */
-    protected final String getRolePrefix() {
-        return rolePrefix;
-    }
+	/**
+	 * Returns the role prefix used by this populator Method available so that classes
+	 * extending this can override
+	 * @return the role prefix
+	 * @see {@link #setRolePrefix(String)}
+	 */
+	protected final String getRolePrefix() {
+		return rolePrefix;
+	}
 
-    /**
-     * Returns true if role names are converted to uppercase
-     * Method available so that classes extending this can override
-     * @return true if role names are converted to uppercase.
-     * @see {@link #setConvertToUpperCase(boolean)}
-     */
-    protected final boolean isConvertToUpperCase() {
-        return convertToUpperCase;
-    }
+	/**
+	 * Returns true if role names are converted to uppercase Method available so that
+	 * classes extending this can override
+	 * @return true if role names are converted to uppercase.
+	 * @see {@link #setConvertToUpperCase(boolean)}
+	 */
+	protected final boolean isConvertToUpperCase() {
+		return convertToUpperCase;
+	}
 
-    /**
-     * Returns the default role
-     * Method available so that classes extending this can override
-     * @return the default role used
-     * @see {@link #setDefaultRole(String)}
-     */
-    private GrantedAuthority getDefaultRole() {
-        return defaultRole;
-    }
+	/**
+	 * Returns the default role Method available so that classes extending this can
+	 * override
+	 * @return the default role used
+	 * @see {@link #setDefaultRole(String)}
+	 */
+	private GrantedAuthority getDefaultRole() {
+		return defaultRole;
+	}
 
-    /**
-     * Returns the search controls
-     * Method available so that classes extending this can override the search controls used
-     * @return the search controls
-     */
-    private SearchControls getSearchControls() {
-        return searchControls;
-    }
+	/**
+	 * Returns the search controls Method available so that classes extending this can
+	 * override the search controls used
+	 * @return the search controls
+	 */
+	private SearchControls getSearchControls() {
+		return searchControls;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java
index d4e0262b4b..f497e06e68 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPerson.java
@@ -18,10 +18,9 @@ import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
- * UserDetails implementation whose properties are based on a subset of the
- * LDAP schema for <tt>inetOrgPerson</tt>.
+ * UserDetails implementation whose properties are based on a subset of the LDAP schema
+ * for <tt>inetOrgPerson</tt>.
  *
  * <p>
  * The username will be mapped from the <tt>uid</tt> attribute by default.
@@ -30,251 +29,252 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
  */
 public class InetOrgPerson extends Person {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private String carLicense;
-    // Person.cn
-    private String destinationIndicator;
-    private String departmentNumber;
-    // Person.description
-    private String displayName;
-    private String employeeNumber;
-    private String homePhone;
-    private String homePostalAddress;
-    private String initials;
-    private String mail;
-    private String mobile;
-    private String o;
-    private String ou;
-    private String postalAddress;
-    private String postalCode;
-    private String roomNumber;
-    private String street;
-    // Person.sn
-    // Person.telephoneNumber
-    private String title;
-    private String uid;
+	private String carLicense;
+	// Person.cn
+	private String destinationIndicator;
+	private String departmentNumber;
+	// Person.description
+	private String displayName;
+	private String employeeNumber;
+	private String homePhone;
+	private String homePostalAddress;
+	private String initials;
+	private String mail;
+	private String mobile;
+	private String o;
+	private String ou;
+	private String postalAddress;
+	private String postalCode;
+	private String roomNumber;
+	private String street;
+	// Person.sn
+	// Person.telephoneNumber
+	private String title;
+	private String uid;
 
-    public String getUid() {
-        return uid;
-    }
+	public String getUid() {
+		return uid;
+	}
 
-    public String getMail() {
-        return mail;
-    }
+	public String getMail() {
+		return mail;
+	}
 
-    public String getEmployeeNumber() {
-        return employeeNumber;
-    }
+	public String getEmployeeNumber() {
+		return employeeNumber;
+	}
 
-    public String getInitials() {
-        return initials;
-    }
+	public String getInitials() {
+		return initials;
+	}
 
-    public String getDestinationIndicator() {
-        return destinationIndicator;
-    }
+	public String getDestinationIndicator() {
+		return destinationIndicator;
+	}
 
-    public String getO() {
-        return o;
-    }
+	public String getO() {
+		return o;
+	}
 
-    public String getOu() {
-        return ou;
-    }
+	public String getOu() {
+		return ou;
+	}
 
-    public String getTitle() {
-        return title;
-    }
+	public String getTitle() {
+		return title;
+	}
 
-    public String getCarLicense() {
-        return carLicense;
-    }
+	public String getCarLicense() {
+		return carLicense;
+	}
 
-    public String getDepartmentNumber() {
-        return departmentNumber;
-    }
+	public String getDepartmentNumber() {
+		return departmentNumber;
+	}
 
-    public String getDisplayName() {
-        return displayName;
-    }
+	public String getDisplayName() {
+		return displayName;
+	}
 
-    public String getHomePhone() {
-        return homePhone;
-    }
+	public String getHomePhone() {
+		return homePhone;
+	}
 
-    public String getRoomNumber() {
-        return roomNumber;
-    }
+	public String getRoomNumber() {
+		return roomNumber;
+	}
 
-    public String getHomePostalAddress() {
-        return homePostalAddress;
-    }
+	public String getHomePostalAddress() {
+		return homePostalAddress;
+	}
 
-    public String getMobile() {
-        return mobile;
-    }
+	public String getMobile() {
+		return mobile;
+	}
 
-    public String getPostalAddress() {
-        return postalAddress;
-    }
+	public String getPostalAddress() {
+		return postalAddress;
+	}
 
-    public String getPostalCode() {
-        return postalCode;
-    }
+	public String getPostalCode() {
+		return postalCode;
+	}
 
-    public String getStreet() {
-        return street;
-    }
+	public String getStreet() {
+		return street;
+	}
 
-    protected void populateContext(DirContextAdapter adapter) {
-        super.populateContext(adapter);
-        adapter.setAttributeValue("carLicense", carLicense);
-        adapter.setAttributeValue("departmentNumber", departmentNumber);
-        adapter.setAttributeValue("destinationIndicator", destinationIndicator);
-        adapter.setAttributeValue("displayName", displayName);
-        adapter.setAttributeValue("employeeNumber", employeeNumber);
-        adapter.setAttributeValue("homePhone", homePhone);
-        adapter.setAttributeValue("homePostalAddress", homePostalAddress);
-        adapter.setAttributeValue("initials", initials);
-        adapter.setAttributeValue("mail", mail);
-        adapter.setAttributeValue("mobile", mobile);
-        adapter.setAttributeValue("postalAddress", postalAddress);
-        adapter.setAttributeValue("postalCode", postalCode);
-        adapter.setAttributeValue("ou", ou);
-        adapter.setAttributeValue("o", o);
-        adapter.setAttributeValue("roomNumber", roomNumber);
-        adapter.setAttributeValue("street", street);
-        adapter.setAttributeValue("uid", uid);
-        adapter.setAttributeValues("objectclass", new String[] {"top", "person", "organizationalPerson", "inetOrgPerson"});
-    }
+	protected void populateContext(DirContextAdapter adapter) {
+		super.populateContext(adapter);
+		adapter.setAttributeValue("carLicense", carLicense);
+		adapter.setAttributeValue("departmentNumber", departmentNumber);
+		adapter.setAttributeValue("destinationIndicator", destinationIndicator);
+		adapter.setAttributeValue("displayName", displayName);
+		adapter.setAttributeValue("employeeNumber", employeeNumber);
+		adapter.setAttributeValue("homePhone", homePhone);
+		adapter.setAttributeValue("homePostalAddress", homePostalAddress);
+		adapter.setAttributeValue("initials", initials);
+		adapter.setAttributeValue("mail", mail);
+		adapter.setAttributeValue("mobile", mobile);
+		adapter.setAttributeValue("postalAddress", postalAddress);
+		adapter.setAttributeValue("postalCode", postalCode);
+		adapter.setAttributeValue("ou", ou);
+		adapter.setAttributeValue("o", o);
+		adapter.setAttributeValue("roomNumber", roomNumber);
+		adapter.setAttributeValue("street", street);
+		adapter.setAttributeValue("uid", uid);
+		adapter.setAttributeValues("objectclass", new String[] { "top", "person",
+				"organizationalPerson", "inetOrgPerson" });
+	}
 
-    public static class Essence extends Person.Essence {
-        public Essence() {
-        }
+	public static class Essence extends Person.Essence {
+		public Essence() {
+		}
 
-        public Essence(InetOrgPerson copyMe) {
-            super(copyMe);
-            setCarLicense(copyMe.getCarLicense());
-            setDepartmentNumber(copyMe.getDepartmentNumber());
-            setDestinationIndicator(copyMe.getDestinationIndicator());
-            setDisplayName(copyMe.getDisplayName());
-            setEmployeeNumber(copyMe.getEmployeeNumber());
-            setHomePhone(copyMe.getHomePhone());
-            setHomePostalAddress(copyMe.getHomePostalAddress());
-            setInitials(copyMe.getInitials());
-            setMail(copyMe.getMail());
-            setMobile(copyMe.getMobile());
-            setO(copyMe.getO());
-            setOu(copyMe.getOu());
-            setPostalAddress(copyMe.getPostalAddress());
-            setPostalCode(copyMe.getPostalCode());
-            setRoomNumber(copyMe.getRoomNumber());
-            setStreet(copyMe.getStreet());
-            setTitle(copyMe.getTitle());
-            setUid(copyMe.getUid());
-        }
+		public Essence(InetOrgPerson copyMe) {
+			super(copyMe);
+			setCarLicense(copyMe.getCarLicense());
+			setDepartmentNumber(copyMe.getDepartmentNumber());
+			setDestinationIndicator(copyMe.getDestinationIndicator());
+			setDisplayName(copyMe.getDisplayName());
+			setEmployeeNumber(copyMe.getEmployeeNumber());
+			setHomePhone(copyMe.getHomePhone());
+			setHomePostalAddress(copyMe.getHomePostalAddress());
+			setInitials(copyMe.getInitials());
+			setMail(copyMe.getMail());
+			setMobile(copyMe.getMobile());
+			setO(copyMe.getO());
+			setOu(copyMe.getOu());
+			setPostalAddress(copyMe.getPostalAddress());
+			setPostalCode(copyMe.getPostalCode());
+			setRoomNumber(copyMe.getRoomNumber());
+			setStreet(copyMe.getStreet());
+			setTitle(copyMe.getTitle());
+			setUid(copyMe.getUid());
+		}
 
-        public Essence(DirContextOperations ctx) {
-            super(ctx);
-            setCarLicense(ctx.getStringAttribute("carLicense"));
-            setDepartmentNumber(ctx.getStringAttribute("departmentNumber"));
-            setDestinationIndicator(ctx.getStringAttribute("destinationIndicator"));
-            setDisplayName(ctx.getStringAttribute("displayName"));
-            setEmployeeNumber(ctx.getStringAttribute("employeeNumber"));
-            setHomePhone(ctx.getStringAttribute("homePhone"));
-            setHomePostalAddress(ctx.getStringAttribute("homePostalAddress"));
-            setInitials(ctx.getStringAttribute("initials"));
-            setMail(ctx.getStringAttribute("mail"));
-            setMobile(ctx.getStringAttribute("mobile"));
-            setO(ctx.getStringAttribute("o"));
-            setOu(ctx.getStringAttribute("ou"));
-            setPostalAddress(ctx.getStringAttribute("postalAddress"));
-            setPostalCode(ctx.getStringAttribute("postalCode"));
-            setRoomNumber(ctx.getStringAttribute("roomNumber"));
-            setStreet(ctx.getStringAttribute("street"));
-            setTitle(ctx.getStringAttribute("title"));
-            setUid(ctx.getStringAttribute("uid"));
-        }
+		public Essence(DirContextOperations ctx) {
+			super(ctx);
+			setCarLicense(ctx.getStringAttribute("carLicense"));
+			setDepartmentNumber(ctx.getStringAttribute("departmentNumber"));
+			setDestinationIndicator(ctx.getStringAttribute("destinationIndicator"));
+			setDisplayName(ctx.getStringAttribute("displayName"));
+			setEmployeeNumber(ctx.getStringAttribute("employeeNumber"));
+			setHomePhone(ctx.getStringAttribute("homePhone"));
+			setHomePostalAddress(ctx.getStringAttribute("homePostalAddress"));
+			setInitials(ctx.getStringAttribute("initials"));
+			setMail(ctx.getStringAttribute("mail"));
+			setMobile(ctx.getStringAttribute("mobile"));
+			setO(ctx.getStringAttribute("o"));
+			setOu(ctx.getStringAttribute("ou"));
+			setPostalAddress(ctx.getStringAttribute("postalAddress"));
+			setPostalCode(ctx.getStringAttribute("postalCode"));
+			setRoomNumber(ctx.getStringAttribute("roomNumber"));
+			setStreet(ctx.getStringAttribute("street"));
+			setTitle(ctx.getStringAttribute("title"));
+			setUid(ctx.getStringAttribute("uid"));
+		}
 
-        protected LdapUserDetailsImpl createTarget() {
-            return new InetOrgPerson();
-        }
+		protected LdapUserDetailsImpl createTarget() {
+			return new InetOrgPerson();
+		}
 
-        public void setMail(String email) {
-            ((InetOrgPerson) instance).mail = email;
-        }
+		public void setMail(String email) {
+			((InetOrgPerson) instance).mail = email;
+		}
 
-        public void setUid(String uid) {
-            ((InetOrgPerson) instance).uid = uid;
+		public void setUid(String uid) {
+			((InetOrgPerson) instance).uid = uid;
 
-            if(instance.getUsername() == null) {
-                setUsername(uid);
-            }
-        }
+			if (instance.getUsername() == null) {
+				setUsername(uid);
+			}
+		}
 
-        public void setInitials(String initials) {
-            ((InetOrgPerson) instance).initials = initials;
-        }
+		public void setInitials(String initials) {
+			((InetOrgPerson) instance).initials = initials;
+		}
 
-        public void setO(String organization) {
-            ((InetOrgPerson) instance).o = organization;
-        }
+		public void setO(String organization) {
+			((InetOrgPerson) instance).o = organization;
+		}
 
-        public void setOu(String ou) {
-            ((InetOrgPerson) instance).ou = ou;
-        }
+		public void setOu(String ou) {
+			((InetOrgPerson) instance).ou = ou;
+		}
 
-        public void setRoomNumber(String no) {
-            ((InetOrgPerson) instance).roomNumber = no;
-        }
+		public void setRoomNumber(String no) {
+			((InetOrgPerson) instance).roomNumber = no;
+		}
 
-        public void setTitle(String title) {
-            ((InetOrgPerson) instance).title = title;
-        }
+		public void setTitle(String title) {
+			((InetOrgPerson) instance).title = title;
+		}
 
-        public void setCarLicense(String carLicense) {
-            ((InetOrgPerson) instance).carLicense = carLicense;
-        }
+		public void setCarLicense(String carLicense) {
+			((InetOrgPerson) instance).carLicense = carLicense;
+		}
 
-        public void setDepartmentNumber(String departmentNumber) {
-            ((InetOrgPerson) instance).departmentNumber = departmentNumber;
-        }
+		public void setDepartmentNumber(String departmentNumber) {
+			((InetOrgPerson) instance).departmentNumber = departmentNumber;
+		}
 
-        public void setDisplayName(String displayName) {
-            ((InetOrgPerson) instance).displayName = displayName;
-        }
+		public void setDisplayName(String displayName) {
+			((InetOrgPerson) instance).displayName = displayName;
+		}
 
-        public void setEmployeeNumber(String no) {
-            ((InetOrgPerson) instance).employeeNumber = no;
-        }
+		public void setEmployeeNumber(String no) {
+			((InetOrgPerson) instance).employeeNumber = no;
+		}
 
-        public void setDestinationIndicator(String destination) {
-            ((InetOrgPerson) instance).destinationIndicator = destination;
-        }
+		public void setDestinationIndicator(String destination) {
+			((InetOrgPerson) instance).destinationIndicator = destination;
+		}
 
-        public void setHomePhone(String homePhone) {
-            ((InetOrgPerson) instance).homePhone = homePhone;
-        }
+		public void setHomePhone(String homePhone) {
+			((InetOrgPerson) instance).homePhone = homePhone;
+		}
 
-        public void setStreet(String street) {
-            ((InetOrgPerson) instance).street = street;
-        }
+		public void setStreet(String street) {
+			((InetOrgPerson) instance).street = street;
+		}
 
-        public void setPostalCode(String postalCode) {
-            ((InetOrgPerson) instance).postalCode = postalCode;
-        }
+		public void setPostalCode(String postalCode) {
+			((InetOrgPerson) instance).postalCode = postalCode;
+		}
 
-        public void setPostalAddress(String postalAddress) {
-            ((InetOrgPerson) instance).postalAddress = postalAddress;
-        }
+		public void setPostalAddress(String postalAddress) {
+			((InetOrgPerson) instance).postalAddress = postalAddress;
+		}
 
-        public void setMobile(String mobile) {
-            ((InetOrgPerson) instance).mobile = mobile;
-        }
+		public void setMobile(String mobile) {
+			((InetOrgPerson) instance).mobile = mobile;
+		}
 
-        public void setHomePostalAddress(String homePostalAddress) {
-            ((InetOrgPerson) instance).homePostalAddress = homePostalAddress;
-        }
-    }
+		public void setHomePostalAddress(String homePostalAddress) {
+			((InetOrgPerson) instance).homePostalAddress = homePostalAddress;
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java
index 05e19e87c2..853fced9ae 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/InetOrgPersonContextMapper.java
@@ -22,26 +22,27 @@ import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.util.Assert;
 
-
 /**
  * @author Luke Taylor
  */
 public class InetOrgPersonContextMapper implements UserDetailsContextMapper {
 
-    public UserDetails mapUserFromContext(DirContextOperations ctx, String username, Collection<? extends GrantedAuthority> authorities) {
-        InetOrgPerson.Essence p = new InetOrgPerson.Essence(ctx);
+	public UserDetails mapUserFromContext(DirContextOperations ctx, String username,
+			Collection<? extends GrantedAuthority> authorities) {
+		InetOrgPerson.Essence p = new InetOrgPerson.Essence(ctx);
 
-        p.setUsername(username);
-        p.setAuthorities(authorities);
+		p.setUsername(username);
+		p.setAuthorities(authorities);
 
-        return p.createUserDetails();
+		return p.createUserDetails();
 
-    }
+	}
 
-    public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
-        Assert.isInstanceOf(InetOrgPerson.class, user, "UserDetails must be an InetOrgPerson instance");
+	public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
+		Assert.isInstanceOf(InetOrgPerson.class, user,
+				"UserDetails must be an InetOrgPerson instance");
 
-        InetOrgPerson p = (InetOrgPerson) user;
-        p.populateContext(ctx);
-    }
+		InetOrgPerson p = (InetOrgPerson) user;
+		p.populateContext(ctx);
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java
index 4c34f3832e..89da9009cb 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthoritiesPopulator.java
@@ -21,26 +21,27 @@ import org.springframework.security.core.GrantedAuthority;
 
 import org.springframework.ldap.core.DirContextOperations;
 
-
 /**
  * Obtains a list of granted authorities for an Ldap user.
  * <p>
- * Used by the <tt>LdapAuthenticationProvider</tt> once a user has been
- * authenticated to create the final user details object.
+ * Used by the <tt>LdapAuthenticationProvider</tt> once a user has been authenticated to
+ * create the final user details object.
  * </p>
  *
  * @author Luke Taylor
  */
 public interface LdapAuthoritiesPopulator {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Get the list of authorities for the user.
-     *
-     * @param userData the context object which was returned by the LDAP authenticator.
-     *
-     * @return the granted authorities for the given user.
-     *
-     */
-    Collection<? extends GrantedAuthority> getGrantedAuthorities(DirContextOperations userData, String username);
+	/**
+	 * Get the list of authorities for the user.
+	 *
+	 * @param userData the context object which was returned by the LDAP authenticator.
+	 *
+	 * @return the granted authorities for the given user.
+	 *
+	 */
+	Collection<? extends GrantedAuthority> getGrantedAuthorities(
+			DirContextOperations userData, String username);
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
index 0e578a1a38..2515562fff 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapAuthority.java
@@ -23,133 +23,131 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * An authority that contains at least a DN and a role name for an LDAP entry but can also contain other desired
- * attributes to be fetched during an LDAP authority search.
+ * An authority that contains at least a DN and a role name for an LDAP entry but can also
+ * contain other desired attributes to be fetched during an LDAP authority search.
  *
  * @author Filip Hanik
  */
 public class LdapAuthority implements GrantedAuthority {
 
+	private String dn;
+	private String role;
+	private Map<String, List<String>> attributes;
 
-    private String dn;
-    private String role;
-    private Map<String, List<String>> attributes;
+	/**
+	 * Constructs an LdapAuthority that has a role and a DN but no other attributes
+	 *
+	 * @param role
+	 * @param dn
+	 */
+	public LdapAuthority(String role, String dn) {
+		this(role, dn, null);
+	}
 
-    /**
-     * Constructs an LdapAuthority that has a role and a DN but no other attributes
-     *
-     * @param role
-     * @param dn
-     */
-    public LdapAuthority(String role, String dn) {
-        this(role, dn, null);
-    }
+	/**
+	 * Constructs an LdapAuthority with the given role, DN and other LDAP attributes
+	 *
+	 * @param role
+	 * @param dn
+	 * @param attributes
+	 */
+	public LdapAuthority(String role, String dn, Map<String, List<String>> attributes) {
+		Assert.notNull(role, "role can not be null");
+		Assert.notNull(dn, "dn can not be null");
 
-    /**
-     * Constructs an LdapAuthority with the given role, DN and other LDAP attributes
-     *
-     * @param role
-     * @param dn
-     * @param attributes
-     */
-    public LdapAuthority(String role, String dn, Map<String, List<String>> attributes) {
-        Assert.notNull(role, "role can not be null");
-        Assert.notNull(dn, "dn can not be null");
+		this.role = role;
+		this.dn = dn;
+		this.attributes = attributes;
+	}
 
-        this.role = role;
-        this.dn = dn;
-        this.attributes = attributes;
-    }
+	/**
+	 * Returns the LDAP attributes
+	 *
+	 * @return the LDAP attributes, map can be null
+	 */
+	public Map<String, List<String>> getAttributes() {
+		return attributes;
+	}
 
-    /**
-     * Returns the LDAP attributes
-     *
-     * @return the LDAP attributes, map can be null
-     */
-    public Map<String, List<String>> getAttributes() {
-        return attributes;
-    }
+	/**
+	 * Returns the DN for this LDAP authority
+	 *
+	 * @return
+	 */
+	public String getDn() {
+		return dn;
+	}
 
-    /**
-     * Returns the DN for this LDAP authority
-     *
-     * @return
-     */
-    public String getDn() {
-        return dn;
-    }
+	/**
+	 * Returns the values for a specific attribute
+	 *
+	 * @param name the attribute name
+	 * @return a String array, never null but may be zero length
+	 */
+	public List<String> getAttributeValues(String name) {
+		List<String> result = null;
+		if (attributes != null) {
+			result = attributes.get(name);
+		}
+		if (result == null) {
+			result = Collections.emptyList();
+		}
+		return result;
+	}
 
-    /**
-     * Returns the values for a specific attribute
-     *
-     * @param name the attribute name
-     * @return a String array, never null but may be zero length
-     */
-    public List<String> getAttributeValues(String name) {
-        List<String> result = null;
-        if (attributes != null) {
-            result = attributes.get(name);
-        }
-        if (result == null) {
-            result = Collections.emptyList();
-        }
-        return result;
-    }
+	/**
+	 * Returns the first attribute value for a specified attribute
+	 *
+	 * @param name
+	 * @return the first attribute value for a specified attribute, may be null
+	 */
+	public String getFirstAttributeValue(String name) {
+		List<String> result = getAttributeValues(name);
+		if (result.isEmpty()) {
+			return null;
+		}
+		else {
+			return result.get(0);
+		}
+	}
 
-    /**
-     * Returns the first attribute value for a specified attribute
-     *
-     * @param name
-     * @return the first attribute value for a specified attribute, may be null
-     */
-    public String getFirstAttributeValue(String name) {
-        List<String> result = getAttributeValues(name);
-        if (result.isEmpty()) {
-            return null;
-        } else {
-            return result.get(0);
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getAuthority() {
+		return role;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public String getAuthority() {
-        return role;
-    }
+	/**
+	 * Compares the LdapAuthority based on {@link #getAuthority()} and {@link #getDn()}
+	 * values {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof LdapAuthority)) {
+			return false;
+		}
 
-    /**
-     * Compares the LdapAuthority based on {@link #getAuthority()} and {@link #getDn()} values {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof LdapAuthority)) {
-            return false;
-        }
+		LdapAuthority that = (LdapAuthority) o;
 
-        LdapAuthority that = (LdapAuthority) o;
+		if (!dn.equals(that.dn)) {
+			return false;
+		}
+		return role.equals(that.role);
+	}
 
-        if (!dn.equals(that.dn)) {
-            return false;
-        }
-        return role.equals(that.role);
-    }
+	@Override
+	public int hashCode() {
+		int result = dn.hashCode();
+		result = 31 * result + (role != null ? role.hashCode() : 0);
+		return result;
+	}
 
-    @Override
-    public int hashCode() {
-        int result = dn.hashCode();
-        result = 31 * result + (role != null ? role.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "LdapAuthority{" +
-                "dn='" + dn + '\'' +
-                ", role='" + role + '\'' +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "LdapAuthority{" + "dn='" + dn + '\'' + ", role='" + role + '\'' + '}';
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java
index acc0fee44c..bbf025e69d 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetails.java
@@ -23,12 +23,13 @@ import org.springframework.security.core.userdetails.UserDetails;
  * @author Luke Taylor
  */
 public interface LdapUserDetails extends UserDetails {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * The DN of the entry for this user's account.
-     *
-     * @return the user's DN
-     */
-    String getDn();
+	/**
+	 * The DN of the entry for this user's account.
+	 *
+	 * @return the user's DN
+	 */
+	String getDn();
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
index da426cb7cb..a913045a88 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java
@@ -29,237 +29,251 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.ldap.ppolicy.PasswordPolicyData;
 import org.springframework.util.Assert;
 
-
 /**
- * A UserDetails implementation which is used internally by the Ldap services. It also contains the user's
- * distinguished name and a set of attributes that have been retrieved from the Ldap server.
+ * A UserDetails implementation which is used internally by the Ldap services. It also
+ * contains the user's distinguished name and a set of attributes that have been retrieved
+ * from the Ldap server.
  * <p>
- * An instance may be created as the result of a search, or when user information is retrieved during authentication.
+ * An instance may be created as the result of a search, or when user information is
+ * retrieved during authentication.
  * <p>
- * An instance of this class will be used by the <tt>LdapAuthenticationProvider</tt> to construct the final user details
- * object that it returns.
+ * An instance of this class will be used by the <tt>LdapAuthenticationProvider</tt> to
+ * construct the final user details object that it returns.
  * <p>
- * The {@code equals} and {@code hashcode} methods are implemented using the {@code Dn} property and do not consider
- * additional state, so it is not possible two store two instances with the same DN in the same set, or use them as
- * keys in a map.
+ * The {@code equals} and {@code hashcode} methods are implemented using the {@code Dn}
+ * property and do not consider additional state, so it is not possible two store two
+ * instances with the same DN in the same set, or use them as keys in a map.
  *
  * @author Luke Taylor
  */
 public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String dn;
-    private String password;
-    private String username;
-    private Collection<GrantedAuthority> authorities = AuthorityUtils.NO_AUTHORITIES;
-    private boolean accountNonExpired = true;
-    private boolean accountNonLocked = true;
-    private boolean credentialsNonExpired = true;
-    private boolean enabled = true;
-    // PPolicy data
-    private int timeBeforeExpiration = Integer.MAX_VALUE;
-    private int graceLoginsRemaining = Integer.MAX_VALUE;
+	private String dn;
+	private String password;
+	private String username;
+	private Collection<GrantedAuthority> authorities = AuthorityUtils.NO_AUTHORITIES;
+	private boolean accountNonExpired = true;
+	private boolean accountNonLocked = true;
+	private boolean credentialsNonExpired = true;
+	private boolean enabled = true;
+	// PPolicy data
+	private int timeBeforeExpiration = Integer.MAX_VALUE;
+	private int graceLoginsRemaining = Integer.MAX_VALUE;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    protected LdapUserDetailsImpl() {}
+	protected LdapUserDetailsImpl() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
+	public Collection<GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
 
-    public String getDn() {
-        return dn;
-    }
+	public String getDn() {
+		return dn;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public boolean isAccountNonExpired() {
-        return accountNonExpired;
-    }
+	public boolean isAccountNonExpired() {
+		return accountNonExpired;
+	}
 
-    public boolean isAccountNonLocked() {
-        return accountNonLocked;
-    }
+	public boolean isAccountNonLocked() {
+		return accountNonLocked;
+	}
 
-    public boolean isCredentialsNonExpired() {
-        return credentialsNonExpired;
-    }
+	public boolean isCredentialsNonExpired() {
+		return credentialsNonExpired;
+	}
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+	public boolean isEnabled() {
+		return enabled;
+	}
 
-    public int getTimeBeforeExpiration() {
-        return timeBeforeExpiration;
-    }
+	public int getTimeBeforeExpiration() {
+		return timeBeforeExpiration;
+	}
 
-    public int getGraceLoginsRemaining() {
-        return graceLoginsRemaining;
-    }
+	public int getGraceLoginsRemaining() {
+		return graceLoginsRemaining;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof LdapUserDetailsImpl) {
-            return dn.equals(((LdapUserDetailsImpl)obj).dn);
-        }
-        return false;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof LdapUserDetailsImpl) {
+			return dn.equals(((LdapUserDetailsImpl) obj).dn);
+		}
+		return false;
+	}
 
-    @Override
-    public int hashCode() {
-        return dn.hashCode();
-    }
+	@Override
+	public int hashCode() {
+		return dn.hashCode();
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append(": ");
-        sb.append("Dn: ").append(dn).append("; ");
-        sb.append("Username: ").append(this.username).append("; ");
-        sb.append("Password: [PROTECTED]; ");
-        sb.append("Enabled: ").append(this.enabled).append("; ");
-        sb.append("AccountNonExpired: ").append(this.accountNonExpired).append("; ");
-        sb.append("CredentialsNonExpired: ").append(this.credentialsNonExpired).append("; ");
-        sb.append("AccountNonLocked: ").append(this.accountNonLocked).append("; ");
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append(": ");
+		sb.append("Dn: ").append(dn).append("; ");
+		sb.append("Username: ").append(this.username).append("; ");
+		sb.append("Password: [PROTECTED]; ");
+		sb.append("Enabled: ").append(this.enabled).append("; ");
+		sb.append("AccountNonExpired: ").append(this.accountNonExpired).append("; ");
+		sb.append("CredentialsNonExpired: ").append(this.credentialsNonExpired)
+				.append("; ");
+		sb.append("AccountNonLocked: ").append(this.accountNonLocked).append("; ");
 
-        if (this.getAuthorities() != null && !this.getAuthorities().isEmpty()) {
-            sb.append("Granted Authorities: ");
-            boolean first = true;
+		if (this.getAuthorities() != null && !this.getAuthorities().isEmpty()) {
+			sb.append("Granted Authorities: ");
+			boolean first = true;
 
-            for (Object authority : this.getAuthorities()) {
-                if (first) {
-                    first = false;
-                } else {
-                    sb.append(", ");
-                }
+			for (Object authority : this.getAuthorities()) {
+				if (first) {
+					first = false;
+				}
+				else {
+					sb.append(", ");
+				}
 
-                sb.append(authority.toString());
-            }
-        } else {
-            sb.append("Not granted any authorities");
-        }
+				sb.append(authority.toString());
+			}
+		}
+		else {
+			sb.append("Not granted any authorities");
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    /**
-     * Variation of essence pattern. Used to create mutable intermediate object
-     */
-    public static class Essence {
-        protected LdapUserDetailsImpl instance = createTarget();
-        private List<GrantedAuthority> mutableAuthorities = new ArrayList<GrantedAuthority>();
+	/**
+	 * Variation of essence pattern. Used to create mutable intermediate object
+	 */
+	public static class Essence {
+		protected LdapUserDetailsImpl instance = createTarget();
+		private List<GrantedAuthority> mutableAuthorities = new ArrayList<GrantedAuthority>();
 
-        public Essence() { }
+		public Essence() {
+		}
 
-        public Essence(DirContextOperations ctx) {
-            setDn(ctx.getDn());
-        }
+		public Essence(DirContextOperations ctx) {
+			setDn(ctx.getDn());
+		}
 
-        public Essence(LdapUserDetails copyMe) {
-            setDn(copyMe.getDn());
-            setUsername(copyMe.getUsername());
-            setPassword(copyMe.getPassword());
-            setEnabled(copyMe.isEnabled());
-            setAccountNonExpired(copyMe.isAccountNonExpired());
-            setCredentialsNonExpired(copyMe.isCredentialsNonExpired());
-            setAccountNonLocked(copyMe.isAccountNonLocked());
-            setAuthorities(copyMe.getAuthorities());
-        }
+		public Essence(LdapUserDetails copyMe) {
+			setDn(copyMe.getDn());
+			setUsername(copyMe.getUsername());
+			setPassword(copyMe.getPassword());
+			setEnabled(copyMe.isEnabled());
+			setAccountNonExpired(copyMe.isAccountNonExpired());
+			setCredentialsNonExpired(copyMe.isCredentialsNonExpired());
+			setAccountNonLocked(copyMe.isAccountNonLocked());
+			setAuthorities(copyMe.getAuthorities());
+		}
 
-        protected LdapUserDetailsImpl createTarget() {
-            return new LdapUserDetailsImpl();
-        }
+		protected LdapUserDetailsImpl createTarget() {
+			return new LdapUserDetailsImpl();
+		}
 
-        /** Adds the authority to the list, unless it is already there, in which case it is ignored */
-        public void addAuthority(GrantedAuthority a) {
-            if(!hasAuthority(a)) {
-                mutableAuthorities.add(a);
-            }
-        }
+		/**
+		 * Adds the authority to the list, unless it is already there, in which case it is
+		 * ignored
+		 */
+		public void addAuthority(GrantedAuthority a) {
+			if (!hasAuthority(a)) {
+				mutableAuthorities.add(a);
+			}
+		}
 
-        private boolean hasAuthority(GrantedAuthority a) {
-            for (GrantedAuthority authority : mutableAuthorities) {
-                if(authority.equals(a)) {
-                    return true;
-                }
-            }
-            return false;
-        }
+		private boolean hasAuthority(GrantedAuthority a) {
+			for (GrantedAuthority authority : mutableAuthorities) {
+				if (authority.equals(a)) {
+					return true;
+				}
+			}
+			return false;
+		}
 
-        public LdapUserDetails createUserDetails() {
-            Assert.notNull(instance, "Essence can only be used to create a single instance");
-            Assert.notNull(instance.username, "username must not be null");
-            Assert.notNull(instance.getDn(), "Distinguished name must not be null");
+		public LdapUserDetails createUserDetails() {
+			Assert.notNull(instance,
+					"Essence can only be used to create a single instance");
+			Assert.notNull(instance.username, "username must not be null");
+			Assert.notNull(instance.getDn(), "Distinguished name must not be null");
 
-            instance.authorities = Collections.unmodifiableList(mutableAuthorities);
+			instance.authorities = Collections.unmodifiableList(mutableAuthorities);
 
-            LdapUserDetails newInstance = instance;
+			LdapUserDetails newInstance = instance;
 
-            instance = null;
+			instance = null;
 
-            return newInstance;
-        }
+			return newInstance;
+		}
 
-        public Collection<GrantedAuthority> getGrantedAuthorities() {
-            return mutableAuthorities;
-        }
+		public Collection<GrantedAuthority> getGrantedAuthorities() {
+			return mutableAuthorities;
+		}
 
-        public void setAccountNonExpired(boolean accountNonExpired) {
-            instance.accountNonExpired = accountNonExpired;
-        }
+		public void setAccountNonExpired(boolean accountNonExpired) {
+			instance.accountNonExpired = accountNonExpired;
+		}
 
-        public void setAccountNonLocked(boolean accountNonLocked) {
-            instance.accountNonLocked = accountNonLocked;
-        }
+		public void setAccountNonLocked(boolean accountNonLocked) {
+			instance.accountNonLocked = accountNonLocked;
+		}
 
-        public void setAuthorities(Collection<? extends GrantedAuthority> authorities) {
-            mutableAuthorities = new ArrayList<GrantedAuthority>();
-            mutableAuthorities.addAll(authorities);
-        }
+		public void setAuthorities(Collection<? extends GrantedAuthority> authorities) {
+			mutableAuthorities = new ArrayList<GrantedAuthority>();
+			mutableAuthorities.addAll(authorities);
+		}
 
-        public void setCredentialsNonExpired(boolean credentialsNonExpired) {
-            instance.credentialsNonExpired = credentialsNonExpired;
-        }
+		public void setCredentialsNonExpired(boolean credentialsNonExpired) {
+			instance.credentialsNonExpired = credentialsNonExpired;
+		}
 
-        public void setDn(String dn) {
-            instance.dn = dn;
-        }
+		public void setDn(String dn) {
+			instance.dn = dn;
+		}
 
-        public void setDn(Name dn) {
-            instance.dn = dn.toString();
-        }
+		public void setDn(Name dn) {
+			instance.dn = dn.toString();
+		}
 
-        public void setEnabled(boolean enabled) {
-            instance.enabled = enabled;
-        }
+		public void setEnabled(boolean enabled) {
+			instance.enabled = enabled;
+		}
 
-        public void setPassword(String password) {
-            instance.password = password;
-        }
+		public void setPassword(String password) {
+			instance.password = password;
+		}
 
-        public void setUsername(String username) {
-            instance.username = username;
-        }
+		public void setUsername(String username) {
+			instance.username = username;
+		}
 
-        public void setTimeBeforeExpiration(int timeBeforeExpiration) {
-            instance.timeBeforeExpiration = timeBeforeExpiration;
-        }
+		public void setTimeBeforeExpiration(int timeBeforeExpiration) {
+			instance.timeBeforeExpiration = timeBeforeExpiration;
+		}
 
-        public void setGraceLoginsRemaining(int graceLoginsRemaining) {
-            instance.graceLoginsRemaining = graceLoginsRemaining;
-        }
-    }
+		public void setGraceLoginsRemaining(int graceLoginsRemaining) {
+			instance.graceLoginsRemaining = graceLoginsRemaining;
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
index 68351eb188..b68fa1478c 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java
@@ -59,331 +59,358 @@ import org.springframework.util.Assert;
 /**
  * An Ldap implementation of UserDetailsManager.
  * <p>
- * It is designed around a standard setup where users and groups/roles are stored under separate contexts,
- * defined by the "userDnBase" and "groupSearchBase" properties respectively.
+ * It is designed around a standard setup where users and groups/roles are stored under
+ * separate contexts, defined by the "userDnBase" and "groupSearchBase" properties
+ * respectively.
  * <p>
- * In this case, LDAP is being used purely to retrieve information and this class can be used in place of any other
- * UserDetailsService for authentication. Authentication isn't performed directly against the directory, unlike with the
- * LDAP authentication provider setup.
+ * In this case, LDAP is being used purely to retrieve information and this class can be
+ * used in place of any other UserDetailsService for authentication. Authentication isn't
+ * performed directly against the directory, unlike with the LDAP authentication provider
+ * setup.
  *
  * @author Luke Taylor
  * @since 2.0
  */
 public class LdapUserDetailsManager implements UserDetailsManager {
-    private final Log logger = LogFactory.getLog(LdapUserDetailsManager.class);
-
-    /**
-     * The strategy for mapping usernames to LDAP distinguished names.
-     * This will be used when building DNs for creating new users etc.
-     */
-    LdapUsernameToDnMapper usernameMapper = new DefaultLdapUsernameToDnMapper("cn=users", "uid");
-
-    /** The DN under which groups are stored */
-    private DistinguishedName groupSearchBase = new DistinguishedName("cn=groups");
-
-    /** Password attribute name */
-    private String passwordAttributeName = "userPassword";
-
-    /** The attribute which corresponds to the role name of a group. */
-    private String groupRoleAttributeName ="cn";
-    /** The attribute which contains members of a group */
-    private String groupMemberAttributeName = "uniquemember";
-
-    private final String rolePrefix = "ROLE_";
-
-    /** The pattern to be used for the user search. {0} is the user's DN */
-    private String groupSearchFilter = "(uniquemember={0})";
-    /**
-     * The strategy used to create a UserDetails object from the LDAP context, username and list of authorities.
-     * This should be set to match the required UserDetails implementation.
-     */
-    private UserDetailsContextMapper userDetailsMapper = new InetOrgPersonContextMapper();
-
-    private final LdapTemplate template;
-
-    /** Default context mapper used to create a set of roles from a list of attributes */
-    private AttributesMapper roleMapper = new AttributesMapper() {
-
-        public Object mapFromAttributes(Attributes attributes) throws NamingException {
-            Attribute roleAttr = attributes.get(groupRoleAttributeName);
-
-            NamingEnumeration<?> ne = roleAttr.getAll();
-            // assert ne.hasMore();
-            Object group = ne.next();
-            String role = group.toString();
-
-            return new SimpleGrantedAuthority(rolePrefix + role.toUpperCase());
-        }
-    };
-
-    private String[] attributesToRetrieve;
-
-    public LdapUserDetailsManager(ContextSource contextSource) {
-        template = new LdapTemplate(contextSource);
-    }
-
-    public UserDetails loadUserByUsername(String username) {
-        DistinguishedName dn = usernameMapper.buildDn(username);
-        List<GrantedAuthority> authorities = getUserAuthorities(dn, username);
-
-        logger.debug("Loading user '"+ username + "' with DN '" + dn + "'");
-
-        DirContextAdapter userCtx = loadUserAsContext(dn, username);
-
-        return userDetailsMapper.mapUserFromContext(userCtx, username, authorities);
-    }
-
-    private DirContextAdapter loadUserAsContext(final DistinguishedName dn, final String username) {
-        return (DirContextAdapter) template.executeReadOnly(new ContextExecutor() {
-            public Object executeWithContext(DirContext ctx) throws NamingException {
-                try {
-                    Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve);
-                    return new DirContextAdapter(attrs, LdapUtils.getFullDn(dn, ctx));
-                } catch(NameNotFoundException notFound) {
-                    throw new UsernameNotFoundException("User " + username + " not found", notFound);
-                }
-            }
-        });
-    }
-
-    /**
-     * Changes the password for the current user. The username is obtained from the security context.
-     * <p>
-     * If the old password is supplied, the update will be made by rebinding as the user, thus modifying the password
-     * using the user's permissions. If <code>oldPassword</code> is null, the update will be attempted using a
-     * standard read/write context supplied by the context source.
-     * </p>
-     *
-     * @param oldPassword the old password
-     * @param newPassword the new value of the password.
-     */
-    public void changePassword(final String oldPassword, final String newPassword) {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        Assert.notNull(authentication,
-                "No authentication object found in security context. Can't change current user's password!");
-
-        String username = authentication.getName();
-
-        logger.debug("Changing password for user '"+ username);
-
-        final DistinguishedName dn = usernameMapper.buildDn(username);
-        final ModificationItem[] passwordChange = new ModificationItem[] {
-                new ModificationItem(DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(passwordAttributeName, newPassword))
-        };
-
-        if(oldPassword == null) {
-            template.modifyAttributes(dn, passwordChange);
-            return;
-        }
-
-        template.executeReadWrite(new ContextExecutor() {
-
-            public Object executeWithContext(DirContext dirCtx) throws NamingException {
-                LdapContext ctx = (LdapContext) dirCtx;
-                ctx.removeFromEnvironment("com.sun.jndi.ldap.connect.pool");
-                ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, LdapUtils.getFullDn(dn, ctx).toString());
-                ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, oldPassword);
-                // TODO: reconnect doesn't appear to actually change the credentials
-                try {
-                    ctx.reconnect(null);
-                } catch (javax.naming.AuthenticationException e) {
-                    throw new BadCredentialsException("Authentication for password change failed.");
-                }
-
-                ctx.modifyAttributes(dn, passwordChange);
-
-                return null;
-            }
-        });
-    }
-
-    /**
-     *
-     * @param dn the distinguished name of the entry - may be either relative to the base context
-     * or a complete DN including the name of the context (either is supported).
-     * @param username the user whose roles are required.
-     * @return the granted authorities returned by the group search
-     */
-    @SuppressWarnings("unchecked")
-    List<GrantedAuthority> getUserAuthorities(final DistinguishedName dn, final String username) {
-        SearchExecutor se = new SearchExecutor() {
-            public NamingEnumeration<SearchResult> executeSearch(DirContext ctx) throws NamingException {
-                DistinguishedName fullDn = LdapUtils.getFullDn(dn, ctx);
-                SearchControls ctrls = new SearchControls();
-                ctrls.setReturningAttributes(new String[] {groupRoleAttributeName});
-
-                return ctx.search(groupSearchBase, groupSearchFilter, new String[] {fullDn.toUrl(), username}, ctrls);
-            }
-        };
-
-        AttributesMapperCallbackHandler roleCollector =
-                new AttributesMapperCallbackHandler(roleMapper);
-
-        template.search(se, roleCollector);
-        return roleCollector.getList();
-    }
-
-    public void createUser(UserDetails user) {
-        DirContextAdapter ctx = new DirContextAdapter();
-        copyToContext(user, ctx);
-        DistinguishedName dn = usernameMapper.buildDn(user.getUsername());
-
-        logger.debug("Creating new user '"+ user.getUsername() + "' with DN '" + dn + "'");
-
-        template.bind(dn, ctx, null);
-
-        // Check for any existing authorities which might be set for this DN and remove them
-        List<GrantedAuthority> authorities = getUserAuthorities(dn, user.getUsername());
-
-        if(authorities.size() > 0) {
-            removeAuthorities(dn, authorities);
-        }
-
-        addAuthorities(dn, user.getAuthorities());
-    }
-
-    public void updateUser(UserDetails user) {
-        DistinguishedName dn = usernameMapper.buildDn(user.getUsername());
-
-        logger.debug("Updating user '"+ user.getUsername() + "' with DN '" + dn + "'");
-
-        List<GrantedAuthority> authorities = getUserAuthorities(dn, user.getUsername());
-
-        DirContextAdapter ctx = loadUserAsContext(dn, user.getUsername());
-        ctx.setUpdateMode(true);
-        copyToContext(user, ctx);
-
-        // Remove the objectclass attribute from the list of mods (if present).
-        List<ModificationItem> mods = new LinkedList<ModificationItem>(Arrays.asList(ctx.getModificationItems()));
-        ListIterator<ModificationItem> modIt = mods.listIterator();
-
-        while(modIt.hasNext()) {
-            ModificationItem mod = (ModificationItem) modIt.next();
-            Attribute a = mod.getAttribute();
-            if("objectclass".equalsIgnoreCase(a.getID())) {
-                modIt.remove();
-            }
-        }
-
-        template.modifyAttributes(dn, mods.toArray(new ModificationItem[mods.size()]));
-
-//        template.rebind(dn, ctx, null);
-        // Remove the old authorities and replace them with the new one
-        removeAuthorities(dn, authorities);
-        addAuthorities(dn, user.getAuthorities());
-    }
-
-    public void deleteUser(String username) {
-        DistinguishedName dn = usernameMapper.buildDn(username);
-        removeAuthorities(dn, getUserAuthorities(dn, username));
-        template.unbind(dn);
-    }
-
-    public boolean userExists(String username) {
-        DistinguishedName dn = usernameMapper.buildDn(username);
-
-        try {
-            Object obj = template.lookup(dn);
-            if (obj instanceof Context) {
-                LdapUtils.closeContext((Context) obj);
-            }
-            return true;
-        } catch(org.springframework.ldap.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Creates a DN from a group name.
-     *
-     * @param group the name of the group
-     * @return the DN of the corresponding group, including the groupSearchBase
-     */
-    protected DistinguishedName buildGroupDn(String group) {
-        DistinguishedName dn = new DistinguishedName(groupSearchBase);
-        dn.add(groupRoleAttributeName, group.toLowerCase());
-
-        return dn;
-    }
-
-    protected void copyToContext(UserDetails user, DirContextAdapter ctx) {
-        userDetailsMapper.mapUserToContext(user, ctx);
-    }
-
-    protected void addAuthorities(DistinguishedName userDn, Collection<? extends GrantedAuthority> authorities) {
-        modifyAuthorities(userDn, authorities, DirContext.ADD_ATTRIBUTE);
-    }
-
-    protected void removeAuthorities(DistinguishedName userDn, Collection<? extends GrantedAuthority> authorities) {
-        modifyAuthorities(userDn, authorities, DirContext.REMOVE_ATTRIBUTE);
-    }
-
-    private void modifyAuthorities(final DistinguishedName userDn, final Collection<? extends GrantedAuthority> authorities, final int modType) {
-        template.executeReadWrite(new ContextExecutor() {
-            public Object executeWithContext(DirContext ctx) throws NamingException {
-                for(GrantedAuthority authority : authorities) {
-                    String group = convertAuthorityToGroup(authority);
-                    DistinguishedName fullDn = LdapUtils.getFullDn(userDn, ctx);
-                    ModificationItem addGroup = new ModificationItem(modType,
-                            new BasicAttribute(groupMemberAttributeName, fullDn.toUrl()));
-
-                    ctx.modifyAttributes(buildGroupDn(group), new ModificationItem[] {addGroup});
-                }
-                return null;
-            }
-        });
-    }
-
-    private String convertAuthorityToGroup(GrantedAuthority authority) {
-        String group = authority.getAuthority();
-
-        if(group.startsWith(rolePrefix)) {
-            group = group.substring(rolePrefix.length());
-        }
-
-        return group;
-    }
-
-    public void setUsernameMapper(LdapUsernameToDnMapper usernameMapper) {
-        this.usernameMapper = usernameMapper;
-    }
-
-    public void setPasswordAttributeName(String passwordAttributeName) {
-        this.passwordAttributeName = passwordAttributeName;
-    }
-
-    public void setGroupSearchBase(String groupSearchBase) {
-        this.groupSearchBase = new DistinguishedName(groupSearchBase);
-    }
-
-    public void setGroupRoleAttributeName(String groupRoleAttributeName) {
-        this.groupRoleAttributeName = groupRoleAttributeName;
-    }
-
-    public void setAttributesToRetrieve(String[] attributesToRetrieve) {
-        Assert.notNull(attributesToRetrieve);
-        this.attributesToRetrieve = attributesToRetrieve;
-    }
-
-    public void setUserDetailsMapper(UserDetailsContextMapper userDetailsMapper) {
-        this.userDetailsMapper = userDetailsMapper;
-    }
-
-    /**
-     * Sets the name of the multi-valued attribute which holds the DNs of users who are members of a group.
-     * <p>
-     * Usually this will be <tt>uniquemember</tt> (the default value) or <tt>member</tt>.
-     * </p>
-     *
-     * @param groupMemberAttributeName the name of the attribute used to store group members.
-     */
-    public void setGroupMemberAttributeName(String groupMemberAttributeName) {
-        Assert.hasText(groupMemberAttributeName);
-        this.groupMemberAttributeName = groupMemberAttributeName;
-        this.groupSearchFilter = "(" + groupMemberAttributeName + "={0})";
-    }
-
-    public void setRoleMapper(AttributesMapper roleMapper) {
-        this.roleMapper = roleMapper;
-    }
+	private final Log logger = LogFactory.getLog(LdapUserDetailsManager.class);
+
+	/**
+	 * The strategy for mapping usernames to LDAP distinguished names. This will be used
+	 * when building DNs for creating new users etc.
+	 */
+	LdapUsernameToDnMapper usernameMapper = new DefaultLdapUsernameToDnMapper("cn=users",
+			"uid");
+
+	/** The DN under which groups are stored */
+	private DistinguishedName groupSearchBase = new DistinguishedName("cn=groups");
+
+	/** Password attribute name */
+	private String passwordAttributeName = "userPassword";
+
+	/** The attribute which corresponds to the role name of a group. */
+	private String groupRoleAttributeName = "cn";
+	/** The attribute which contains members of a group */
+	private String groupMemberAttributeName = "uniquemember";
+
+	private final String rolePrefix = "ROLE_";
+
+	/** The pattern to be used for the user search. {0} is the user's DN */
+	private String groupSearchFilter = "(uniquemember={0})";
+	/**
+	 * The strategy used to create a UserDetails object from the LDAP context, username
+	 * and list of authorities. This should be set to match the required UserDetails
+	 * implementation.
+	 */
+	private UserDetailsContextMapper userDetailsMapper = new InetOrgPersonContextMapper();
+
+	private final LdapTemplate template;
+
+	/** Default context mapper used to create a set of roles from a list of attributes */
+	private AttributesMapper roleMapper = new AttributesMapper() {
+
+		public Object mapFromAttributes(Attributes attributes) throws NamingException {
+			Attribute roleAttr = attributes.get(groupRoleAttributeName);
+
+			NamingEnumeration<?> ne = roleAttr.getAll();
+			// assert ne.hasMore();
+			Object group = ne.next();
+			String role = group.toString();
+
+			return new SimpleGrantedAuthority(rolePrefix + role.toUpperCase());
+		}
+	};
+
+	private String[] attributesToRetrieve;
+
+	public LdapUserDetailsManager(ContextSource contextSource) {
+		template = new LdapTemplate(contextSource);
+	}
+
+	public UserDetails loadUserByUsername(String username) {
+		DistinguishedName dn = usernameMapper.buildDn(username);
+		List<GrantedAuthority> authorities = getUserAuthorities(dn, username);
+
+		logger.debug("Loading user '" + username + "' with DN '" + dn + "'");
+
+		DirContextAdapter userCtx = loadUserAsContext(dn, username);
+
+		return userDetailsMapper.mapUserFromContext(userCtx, username, authorities);
+	}
+
+	private DirContextAdapter loadUserAsContext(final DistinguishedName dn,
+			final String username) {
+		return (DirContextAdapter) template.executeReadOnly(new ContextExecutor() {
+			public Object executeWithContext(DirContext ctx) throws NamingException {
+				try {
+					Attributes attrs = ctx.getAttributes(dn, attributesToRetrieve);
+					return new DirContextAdapter(attrs, LdapUtils.getFullDn(dn, ctx));
+				}
+				catch (NameNotFoundException notFound) {
+					throw new UsernameNotFoundException(
+							"User " + username + " not found", notFound);
+				}
+			}
+		});
+	}
+
+	/**
+	 * Changes the password for the current user. The username is obtained from the
+	 * security context.
+	 * <p>
+	 * If the old password is supplied, the update will be made by rebinding as the user,
+	 * thus modifying the password using the user's permissions. If
+	 * <code>oldPassword</code> is null, the update will be attempted using a standard
+	 * read/write context supplied by the context source.
+	 * </p>
+	 *
+	 * @param oldPassword the old password
+	 * @param newPassword the new value of the password.
+	 */
+	public void changePassword(final String oldPassword, final String newPassword) {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		Assert.notNull(
+				authentication,
+				"No authentication object found in security context. Can't change current user's password!");
+
+		String username = authentication.getName();
+
+		logger.debug("Changing password for user '" + username);
+
+		final DistinguishedName dn = usernameMapper.buildDn(username);
+		final ModificationItem[] passwordChange = new ModificationItem[] { new ModificationItem(
+				DirContext.REPLACE_ATTRIBUTE, new BasicAttribute(passwordAttributeName,
+						newPassword)) };
+
+		if (oldPassword == null) {
+			template.modifyAttributes(dn, passwordChange);
+			return;
+		}
+
+		template.executeReadWrite(new ContextExecutor() {
+
+			public Object executeWithContext(DirContext dirCtx) throws NamingException {
+				LdapContext ctx = (LdapContext) dirCtx;
+				ctx.removeFromEnvironment("com.sun.jndi.ldap.connect.pool");
+				ctx.addToEnvironment(Context.SECURITY_PRINCIPAL,
+						LdapUtils.getFullDn(dn, ctx).toString());
+				ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, oldPassword);
+				// TODO: reconnect doesn't appear to actually change the credentials
+				try {
+					ctx.reconnect(null);
+				}
+				catch (javax.naming.AuthenticationException e) {
+					throw new BadCredentialsException(
+							"Authentication for password change failed.");
+				}
+
+				ctx.modifyAttributes(dn, passwordChange);
+
+				return null;
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @param dn the distinguished name of the entry - may be either relative to the base
+	 * context or a complete DN including the name of the context (either is supported).
+	 * @param username the user whose roles are required.
+	 * @return the granted authorities returned by the group search
+	 */
+	@SuppressWarnings("unchecked")
+	List<GrantedAuthority> getUserAuthorities(final DistinguishedName dn,
+			final String username) {
+		SearchExecutor se = new SearchExecutor() {
+			public NamingEnumeration<SearchResult> executeSearch(DirContext ctx)
+					throws NamingException {
+				DistinguishedName fullDn = LdapUtils.getFullDn(dn, ctx);
+				SearchControls ctrls = new SearchControls();
+				ctrls.setReturningAttributes(new String[] { groupRoleAttributeName });
+
+				return ctx.search(groupSearchBase, groupSearchFilter, new String[] {
+						fullDn.toUrl(), username }, ctrls);
+			}
+		};
+
+		AttributesMapperCallbackHandler roleCollector = new AttributesMapperCallbackHandler(
+				roleMapper);
+
+		template.search(se, roleCollector);
+		return roleCollector.getList();
+	}
+
+	public void createUser(UserDetails user) {
+		DirContextAdapter ctx = new DirContextAdapter();
+		copyToContext(user, ctx);
+		DistinguishedName dn = usernameMapper.buildDn(user.getUsername());
+
+		logger.debug("Creating new user '" + user.getUsername() + "' with DN '" + dn
+				+ "'");
+
+		template.bind(dn, ctx, null);
+
+		// Check for any existing authorities which might be set for this DN and remove
+		// them
+		List<GrantedAuthority> authorities = getUserAuthorities(dn, user.getUsername());
+
+		if (authorities.size() > 0) {
+			removeAuthorities(dn, authorities);
+		}
+
+		addAuthorities(dn, user.getAuthorities());
+	}
+
+	public void updateUser(UserDetails user) {
+		DistinguishedName dn = usernameMapper.buildDn(user.getUsername());
+
+		logger.debug("Updating user '" + user.getUsername() + "' with DN '" + dn + "'");
+
+		List<GrantedAuthority> authorities = getUserAuthorities(dn, user.getUsername());
+
+		DirContextAdapter ctx = loadUserAsContext(dn, user.getUsername());
+		ctx.setUpdateMode(true);
+		copyToContext(user, ctx);
+
+		// Remove the objectclass attribute from the list of mods (if present).
+		List<ModificationItem> mods = new LinkedList<ModificationItem>(Arrays.asList(ctx
+				.getModificationItems()));
+		ListIterator<ModificationItem> modIt = mods.listIterator();
+
+		while (modIt.hasNext()) {
+			ModificationItem mod = (ModificationItem) modIt.next();
+			Attribute a = mod.getAttribute();
+			if ("objectclass".equalsIgnoreCase(a.getID())) {
+				modIt.remove();
+			}
+		}
+
+		template.modifyAttributes(dn, mods.toArray(new ModificationItem[mods.size()]));
+
+		// template.rebind(dn, ctx, null);
+		// Remove the old authorities and replace them with the new one
+		removeAuthorities(dn, authorities);
+		addAuthorities(dn, user.getAuthorities());
+	}
+
+	public void deleteUser(String username) {
+		DistinguishedName dn = usernameMapper.buildDn(username);
+		removeAuthorities(dn, getUserAuthorities(dn, username));
+		template.unbind(dn);
+	}
+
+	public boolean userExists(String username) {
+		DistinguishedName dn = usernameMapper.buildDn(username);
+
+		try {
+			Object obj = template.lookup(dn);
+			if (obj instanceof Context) {
+				LdapUtils.closeContext((Context) obj);
+			}
+			return true;
+		}
+		catch (org.springframework.ldap.NameNotFoundException e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Creates a DN from a group name.
+	 *
+	 * @param group the name of the group
+	 * @return the DN of the corresponding group, including the groupSearchBase
+	 */
+	protected DistinguishedName buildGroupDn(String group) {
+		DistinguishedName dn = new DistinguishedName(groupSearchBase);
+		dn.add(groupRoleAttributeName, group.toLowerCase());
+
+		return dn;
+	}
+
+	protected void copyToContext(UserDetails user, DirContextAdapter ctx) {
+		userDetailsMapper.mapUserToContext(user, ctx);
+	}
+
+	protected void addAuthorities(DistinguishedName userDn,
+			Collection<? extends GrantedAuthority> authorities) {
+		modifyAuthorities(userDn, authorities, DirContext.ADD_ATTRIBUTE);
+	}
+
+	protected void removeAuthorities(DistinguishedName userDn,
+			Collection<? extends GrantedAuthority> authorities) {
+		modifyAuthorities(userDn, authorities, DirContext.REMOVE_ATTRIBUTE);
+	}
+
+	private void modifyAuthorities(final DistinguishedName userDn,
+			final Collection<? extends GrantedAuthority> authorities, final int modType) {
+		template.executeReadWrite(new ContextExecutor() {
+			public Object executeWithContext(DirContext ctx) throws NamingException {
+				for (GrantedAuthority authority : authorities) {
+					String group = convertAuthorityToGroup(authority);
+					DistinguishedName fullDn = LdapUtils.getFullDn(userDn, ctx);
+					ModificationItem addGroup = new ModificationItem(modType,
+							new BasicAttribute(groupMemberAttributeName, fullDn.toUrl()));
+
+					ctx.modifyAttributes(buildGroupDn(group),
+							new ModificationItem[] { addGroup });
+				}
+				return null;
+			}
+		});
+	}
+
+	private String convertAuthorityToGroup(GrantedAuthority authority) {
+		String group = authority.getAuthority();
+
+		if (group.startsWith(rolePrefix)) {
+			group = group.substring(rolePrefix.length());
+		}
+
+		return group;
+	}
+
+	public void setUsernameMapper(LdapUsernameToDnMapper usernameMapper) {
+		this.usernameMapper = usernameMapper;
+	}
+
+	public void setPasswordAttributeName(String passwordAttributeName) {
+		this.passwordAttributeName = passwordAttributeName;
+	}
+
+	public void setGroupSearchBase(String groupSearchBase) {
+		this.groupSearchBase = new DistinguishedName(groupSearchBase);
+	}
+
+	public void setGroupRoleAttributeName(String groupRoleAttributeName) {
+		this.groupRoleAttributeName = groupRoleAttributeName;
+	}
+
+	public void setAttributesToRetrieve(String[] attributesToRetrieve) {
+		Assert.notNull(attributesToRetrieve);
+		this.attributesToRetrieve = attributesToRetrieve;
+	}
+
+	public void setUserDetailsMapper(UserDetailsContextMapper userDetailsMapper) {
+		this.userDetailsMapper = userDetailsMapper;
+	}
+
+	/**
+	 * Sets the name of the multi-valued attribute which holds the DNs of users who are
+	 * members of a group.
+	 * <p>
+	 * Usually this will be <tt>uniquemember</tt> (the default value) or <tt>member</tt>.
+	 * </p>
+	 *
+	 * @param groupMemberAttributeName the name of the attribute used to store group
+	 * members.
+	 */
+	public void setGroupMemberAttributeName(String groupMemberAttributeName) {
+		Assert.hasText(groupMemberAttributeName);
+		this.groupMemberAttributeName = groupMemberAttributeName;
+		this.groupSearchFilter = "(" + groupMemberAttributeName + "={0})";
+	}
+
+	public void setRoleMapper(AttributesMapper roleMapper) {
+		this.roleMapper = roleMapper;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java
index 963c9fa708..6e060236aa 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapper.java
@@ -28,158 +28,165 @@ import org.springframework.security.ldap.ppolicy.PasswordPolicyControl;
 import org.springframework.security.ldap.ppolicy.PasswordPolicyResponseControl;
 import org.springframework.util.Assert;
 
-
 /**
- * The context mapper used by the LDAP authentication provider to create an LDAP user object.
+ * The context mapper used by the LDAP authentication provider to create an LDAP user
+ * object.
  *
  * @author Luke Taylor
  */
 public class LdapUserDetailsMapper implements UserDetailsContextMapper {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Log logger = LogFactory.getLog(LdapUserDetailsMapper.class);
-    private String passwordAttributeName = "userPassword";
-    private String rolePrefix = "ROLE_";
-    private String[] roleAttributes = null;
-    private boolean convertToUpperCase = true;
+	private final Log logger = LogFactory.getLog(LdapUserDetailsMapper.class);
+	private String passwordAttributeName = "userPassword";
+	private String rolePrefix = "ROLE_";
+	private String[] roleAttributes = null;
+	private boolean convertToUpperCase = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public UserDetails mapUserFromContext(DirContextOperations ctx, String username, Collection<? extends GrantedAuthority> authorities) {
-        String dn = ctx.getNameInNamespace();
+	public UserDetails mapUserFromContext(DirContextOperations ctx, String username,
+			Collection<? extends GrantedAuthority> authorities) {
+		String dn = ctx.getNameInNamespace();
 
-        logger.debug("Mapping user details from context with DN: " + dn);
+		logger.debug("Mapping user details from context with DN: " + dn);
 
-        LdapUserDetailsImpl.Essence essence = new LdapUserDetailsImpl.Essence();
-        essence.setDn(dn);
+		LdapUserDetailsImpl.Essence essence = new LdapUserDetailsImpl.Essence();
+		essence.setDn(dn);
 
-        Object passwordValue = ctx.getObjectAttribute(passwordAttributeName);
+		Object passwordValue = ctx.getObjectAttribute(passwordAttributeName);
 
-        if (passwordValue != null) {
-            essence.setPassword(mapPassword(passwordValue));
-        }
+		if (passwordValue != null) {
+			essence.setPassword(mapPassword(passwordValue));
+		}
 
-        essence.setUsername(username);
+		essence.setUsername(username);
 
-        // Map the roles
-        for (int i = 0; (roleAttributes != null) && (i < roleAttributes.length); i++) {
-            String[] rolesForAttribute = ctx.getStringAttributes(roleAttributes[i]);
+		// Map the roles
+		for (int i = 0; (roleAttributes != null) && (i < roleAttributes.length); i++) {
+			String[] rolesForAttribute = ctx.getStringAttributes(roleAttributes[i]);
 
-            if (rolesForAttribute == null) {
-                logger.debug("Couldn't read role attribute '" + roleAttributes[i] + "' for user " + dn);
-                continue;
-            }
+			if (rolesForAttribute == null) {
+				logger.debug("Couldn't read role attribute '" + roleAttributes[i]
+						+ "' for user " + dn);
+				continue;
+			}
 
-            for (String role : rolesForAttribute) {
-                GrantedAuthority authority = createAuthority(role);
+			for (String role : rolesForAttribute) {
+				GrantedAuthority authority = createAuthority(role);
 
-                if (authority != null) {
-                    essence.addAuthority(authority);
-                }
-            }
-        }
+				if (authority != null) {
+					essence.addAuthority(authority);
+				}
+			}
+		}
 
-        // Add the supplied authorities
+		// Add the supplied authorities
 
-        for (GrantedAuthority authority : authorities) {
-            essence.addAuthority(authority);
-        }
+		for (GrantedAuthority authority : authorities) {
+			essence.addAuthority(authority);
+		}
 
-        // Check for PPolicy data
+		// Check for PPolicy data
 
-        PasswordPolicyResponseControl ppolicy = (PasswordPolicyResponseControl) ctx.getObjectAttribute(PasswordPolicyControl.OID);
+		PasswordPolicyResponseControl ppolicy = (PasswordPolicyResponseControl) ctx
+				.getObjectAttribute(PasswordPolicyControl.OID);
 
-        if (ppolicy != null) {
-            essence.setTimeBeforeExpiration(ppolicy.getTimeBeforeExpiration());
-            essence.setGraceLoginsRemaining(ppolicy.getGraceLoginsRemaining());
-        }
+		if (ppolicy != null) {
+			essence.setTimeBeforeExpiration(ppolicy.getTimeBeforeExpiration());
+			essence.setGraceLoginsRemaining(ppolicy.getGraceLoginsRemaining());
+		}
 
-        return essence.createUserDetails();
+		return essence.createUserDetails();
 
-    }
+	}
 
-    public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
-        throw new UnsupportedOperationException("LdapUserDetailsMapper only supports reading from a context. Please" +
-                "use a subclass if mapUserToContext() is required.");
-    }
+	public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
+		throw new UnsupportedOperationException(
+				"LdapUserDetailsMapper only supports reading from a context. Please"
+						+ "use a subclass if mapUserToContext() is required.");
+	}
 
-    /**
-     * Extension point to allow customized creation of the user's password from
-     * the attribute stored in the directory.
-     *
-     * @param passwordValue the value of the password attribute
-     * @return a String representation of the password.
-     */
-    protected String mapPassword(Object passwordValue) {
+	/**
+	 * Extension point to allow customized creation of the user's password from the
+	 * attribute stored in the directory.
+	 *
+	 * @param passwordValue the value of the password attribute
+	 * @return a String representation of the password.
+	 */
+	protected String mapPassword(Object passwordValue) {
 
-        if (!(passwordValue instanceof String)) {
-            // Assume it's binary
-            passwordValue = new String((byte[]) passwordValue);
-        }
+		if (!(passwordValue instanceof String)) {
+			// Assume it's binary
+			passwordValue = new String((byte[]) passwordValue);
+		}
 
-        return (String) passwordValue;
+		return (String) passwordValue;
 
-    }
+	}
 
-    /**
-     * Creates a GrantedAuthority from a role attribute. Override to customize
-     * authority object creation.
-     * <p>
-     * The default implementation converts string attributes to roles, making use of the <tt>rolePrefix</tt>
-     * and <tt>convertToUpperCase</tt> properties. Non-String attributes are ignored.
-     * </p>
-     *
-     * @param role the attribute returned from
-     * @return the authority to be added to the list of authorities for the user, or null
-     * if this attribute should be ignored.
-     */
-    protected GrantedAuthority createAuthority(Object role) {
-        if (role instanceof String) {
-            if (convertToUpperCase) {
-                role = ((String) role).toUpperCase();
-            }
-            return new SimpleGrantedAuthority(rolePrefix + role);
-        }
-        return null;
-    }
+	/**
+	 * Creates a GrantedAuthority from a role attribute. Override to customize authority
+	 * object creation.
+	 * <p>
+	 * The default implementation converts string attributes to roles, making use of the
+	 * <tt>rolePrefix</tt> and <tt>convertToUpperCase</tt> properties. Non-String
+	 * attributes are ignored.
+	 * </p>
+	 *
+	 * @param role the attribute returned from
+	 * @return the authority to be added to the list of authorities for the user, or null
+	 * if this attribute should be ignored.
+	 */
+	protected GrantedAuthority createAuthority(Object role) {
+		if (role instanceof String) {
+			if (convertToUpperCase) {
+				role = ((String) role).toUpperCase();
+			}
+			return new SimpleGrantedAuthority(rolePrefix + role);
+		}
+		return null;
+	}
 
-    /**
-     * Determines whether role field values will be converted to upper case when loaded.
-     * The default is true.
-     *
-     * @param convertToUpperCase true if the roles should be converted to upper case.
-     */
-    public void setConvertToUpperCase(boolean convertToUpperCase) {
-        this.convertToUpperCase = convertToUpperCase;
-    }
+	/**
+	 * Determines whether role field values will be converted to upper case when loaded.
+	 * The default is true.
+	 *
+	 * @param convertToUpperCase true if the roles should be converted to upper case.
+	 */
+	public void setConvertToUpperCase(boolean convertToUpperCase) {
+		this.convertToUpperCase = convertToUpperCase;
+	}
 
-    /**
-     * The name of the attribute which contains the user's password.
-     * Defaults to "userPassword".
-     *
-     * @param passwordAttributeName the name of the attribute
-     */
-    public void setPasswordAttributeName(String passwordAttributeName) {
-        this.passwordAttributeName = passwordAttributeName;
-    }
+	/**
+	 * The name of the attribute which contains the user's password. Defaults to
+	 * "userPassword".
+	 *
+	 * @param passwordAttributeName the name of the attribute
+	 */
+	public void setPasswordAttributeName(String passwordAttributeName) {
+		this.passwordAttributeName = passwordAttributeName;
+	}
 
-    /**
-     * The names of any attributes in the user's  entry which represent application
-     * roles. These will be converted to <tt>GrantedAuthority</tt>s and added to the
-     * list in the returned LdapUserDetails object. The attribute values must be Strings by default.
-     *
-     * @param roleAttributes the names of the role attributes.
-     */
-    public void setRoleAttributes(String[] roleAttributes) {
-        Assert.notNull(roleAttributes, "roleAttributes array cannot be null");
-        this.roleAttributes = roleAttributes;
-    }
+	/**
+	 * The names of any attributes in the user's entry which represent application roles.
+	 * These will be converted to <tt>GrantedAuthority</tt>s and added to the list in the
+	 * returned LdapUserDetails object. The attribute values must be Strings by default.
+	 *
+	 * @param roleAttributes the names of the role attributes.
+	 */
+	public void setRoleAttributes(String[] roleAttributes) {
+		Assert.notNull(roleAttributes, "roleAttributes array cannot be null");
+		this.roleAttributes = roleAttributes;
+	}
 
-    /**
-     * The prefix that should be applied to the role names
-     * @param rolePrefix the prefix (defaults to "ROLE_").
-     */
-    public void setRolePrefix(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-    }
+	/**
+	 * The prefix that should be applied to the role names
+	 * @param rolePrefix the prefix (defaults to "ROLE_").
+	 */
+	public void setRolePrefix(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java
index 045f7800d3..e9df2e9d2b 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsService.java
@@ -12,43 +12,48 @@ import org.springframework.security.ldap.search.LdapUserSearch;
 import org.springframework.util.Assert;
 
 /**
- * LDAP implementation of UserDetailsService based around an {@link LdapUserSearch}
- * and an {@link LdapAuthoritiesPopulator}. The final <tt>UserDetails</tt> object
- * returned from <tt>loadUserByUsername</tt> is created by the configured <tt>UserDetailsContextMapper</tt>.
+ * LDAP implementation of UserDetailsService based around an {@link LdapUserSearch} and an
+ * {@link LdapAuthoritiesPopulator}. The final <tt>UserDetails</tt> object returned from
+ * <tt>loadUserByUsername</tt> is created by the configured
+ * <tt>UserDetailsContextMapper</tt>.
  *
  * @author Luke Taylor
  */
 public class LdapUserDetailsService implements UserDetailsService {
-    private final LdapUserSearch userSearch;
-    private final LdapAuthoritiesPopulator authoritiesPopulator;
-    private UserDetailsContextMapper userDetailsMapper = new LdapUserDetailsMapper();
+	private final LdapUserSearch userSearch;
+	private final LdapAuthoritiesPopulator authoritiesPopulator;
+	private UserDetailsContextMapper userDetailsMapper = new LdapUserDetailsMapper();
 
-    public LdapUserDetailsService(LdapUserSearch userSearch) {
-        this(userSearch, new NullLdapAuthoritiesPopulator());
-    }
+	public LdapUserDetailsService(LdapUserSearch userSearch) {
+		this(userSearch, new NullLdapAuthoritiesPopulator());
+	}
 
-    public LdapUserDetailsService(LdapUserSearch userSearch, LdapAuthoritiesPopulator authoritiesPopulator) {
-        Assert.notNull(userSearch, "userSearch must not be null");
-        Assert.notNull(authoritiesPopulator, "authoritiesPopulator must not be null");
-        this.userSearch = userSearch;
-        this.authoritiesPopulator = authoritiesPopulator;
-    }
+	public LdapUserDetailsService(LdapUserSearch userSearch,
+			LdapAuthoritiesPopulator authoritiesPopulator) {
+		Assert.notNull(userSearch, "userSearch must not be null");
+		Assert.notNull(authoritiesPopulator, "authoritiesPopulator must not be null");
+		this.userSearch = userSearch;
+		this.authoritiesPopulator = authoritiesPopulator;
+	}
 
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        DirContextOperations userData = userSearch.searchForUser(username);
+	public UserDetails loadUserByUsername(String username)
+			throws UsernameNotFoundException {
+		DirContextOperations userData = userSearch.searchForUser(username);
 
-        return userDetailsMapper.mapUserFromContext(userData, username,
-                authoritiesPopulator.getGrantedAuthorities(userData, username));
-    }
+		return userDetailsMapper.mapUserFromContext(userData, username,
+				authoritiesPopulator.getGrantedAuthorities(userData, username));
+	}
 
-    public void setUserDetailsMapper(UserDetailsContextMapper userDetailsMapper) {
-        Assert.notNull(userDetailsMapper, "userDetailsMapper must not be null");
-        this.userDetailsMapper = userDetailsMapper;
-    }
+	public void setUserDetailsMapper(UserDetailsContextMapper userDetailsMapper) {
+		Assert.notNull(userDetailsMapper, "userDetailsMapper must not be null");
+		this.userDetailsMapper = userDetailsMapper;
+	}
 
-    private static final class NullLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-        public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userDetails, String username) {
-            return AuthorityUtils.NO_AUTHORITIES;
-        }
-    }
+	private static final class NullLdapAuthoritiesPopulator implements
+			LdapAuthoritiesPopulator {
+		public Collection<GrantedAuthority> getGrantedAuthorities(
+				DirContextOperations userDetails, String username) {
+			return AuthorityUtils.NO_AUTHORITIES;
+		}
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java
index b8dcc685bd..dd7fce5553 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java
@@ -25,10 +25,13 @@ import org.springframework.util.StringUtils;
 import java.util.*;
 
 /**
- * A LDAP authority populator that can recursively search static nested groups. <p>An example of nested groups can be
+ * A LDAP authority populator that can recursively search static nested groups.
+ * <p>
+ * An example of nested groups can be
+ * 
  * <pre>
  *  #Nested groups data
- *
+ * 
  *  dn: uid=javadude,ou=people,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: person
@@ -38,7 +41,7 @@ import java.util.*;
  *  sn: Dude
  *  uid: javadude
  *  userPassword: javadudespassword
- *
+ * 
  *  dn: uid=groovydude,ou=people,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: person
@@ -48,7 +51,7 @@ import java.util.*;
  *  sn: Dude
  *  uid: groovydude
  *  userPassword: groovydudespassword
- *
+ * 
  *  dn: uid=closuredude,ou=people,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: person
@@ -58,7 +61,7 @@ import java.util.*;
  *  sn: Dude
  *  uid: closuredude
  *  userPassword: closuredudespassword
- *
+ * 
  *  dn: uid=scaladude,ou=people,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: person
@@ -68,14 +71,14 @@ import java.util.*;
  *  sn: Dude
  *  uid: scaladude
  *  userPassword: scaladudespassword
- *
+ * 
  *  dn: cn=j-developers,ou=jdeveloper,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: groupOfNames
  *  cn: j-developers
  *  ou: jdeveloper
  *  member: cn=java-developers,ou=groups,dc=springframework,dc=org
- *
+ * 
  *  dn: cn=java-developers,ou=jdeveloper,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: groupOfNames
@@ -84,7 +87,7 @@ import java.util.*;
  *  member: cn=groovy-developers,ou=groups,dc=springframework,dc=org
  *  member: cn=scala-developers,ou=groups,dc=springframework,dc=org
  *  member: uid=javadude,ou=people,dc=springframework,dc=org
- *
+ * 
  *  dn: cn=groovy-developers,ou=jdeveloper,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: groupOfNames
@@ -92,20 +95,22 @@ import java.util.*;
  *  ou: jdeveloper
  *  member: cn=closure-developers,ou=groups,dc=springframework,dc=org
  *  member: uid=groovydude,ou=people,dc=springframework,dc=org
- *
+ * 
  *  dn: cn=closure-developers,ou=jdeveloper,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: groupOfNames
  *  cn: java-developers
  *  ou: jdeveloper
  *  member: uid=closuredude,ou=people,dc=springframework,dc=org
- *
+ * 
  *  dn: cn=scala-developers,ou=jdeveloper,dc=springframework,dc=org
  *  objectclass: top
  *  objectclass: groupOfNames
  *  cn: java-developers
  *  ou: jdeveloper
- *  member: uid=scaladude,ou=people,dc=springframework,dc=org * </pre>
+ *  member: uid=scaladude,ou=people,dc=springframework,dc=org *
+ * </pre>
+ * 
  * </pre>
  * </p>
  *
@@ -113,146 +118,159 @@ import java.util.*;
  */
 
 public class NestedLdapAuthoritiesPopulator extends DefaultLdapAuthoritiesPopulator {
-    private static final Log logger = LogFactory.getLog(NestedLdapAuthoritiesPopulator.class);
+	private static final Log logger = LogFactory
+			.getLog(NestedLdapAuthoritiesPopulator.class);
 
-    /**
-     * The attribute names to retrieve for each LDAP group
-     */
-    private Set<String> attributeNames;
+	/**
+	 * The attribute names to retrieve for each LDAP group
+	 */
+	private Set<String> attributeNames;
 
-    /**
-     * Maximum search depth - represents the number of recursive searches performed
-     */
-    private int maxSearchDepth = 10;
+	/**
+	 * Maximum search depth - represents the number of recursive searches performed
+	 */
+	private int maxSearchDepth = 10;
 
-    /**
-     * Constructor for group search scenarios. <tt>userRoleAttributes</tt> may still be set as a property.
-     *
-     * @param contextSource   supplies the contexts used to search for user roles.
-     * @param groupSearchBase if this is an empty string the search will be performed from the root DN of the
-     */
-    public NestedLdapAuthoritiesPopulator(ContextSource contextSource, String groupSearchBase) {
-        super(contextSource, groupSearchBase);
-    }
+	/**
+	 * Constructor for group search scenarios. <tt>userRoleAttributes</tt> may still be
+	 * set as a property.
+	 *
+	 * @param contextSource supplies the contexts used to search for user roles.
+	 * @param groupSearchBase if this is an empty string the search will be performed from
+	 * the root DN of the
+	 */
+	public NestedLdapAuthoritiesPopulator(ContextSource contextSource,
+			String groupSearchBase) {
+		super(contextSource, groupSearchBase);
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Set<GrantedAuthority> getGroupMembershipRoles(String userDn, String username) {
-        if (getGroupSearchBase() == null) {
-            return new HashSet<GrantedAuthority>();
-        }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Set<GrantedAuthority> getGroupMembershipRoles(String userDn, String username) {
+		if (getGroupSearchBase() == null) {
+			return new HashSet<GrantedAuthority>();
+		}
 
-        Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
+		Set<GrantedAuthority> authorities = new HashSet<GrantedAuthority>();
 
-        performNestedSearch(userDn, username, authorities, getMaxSearchDepth());
+		performNestedSearch(userDn, username, authorities, getMaxSearchDepth());
 
-        return authorities;
-    }
+		return authorities;
+	}
 
-    /**
-     * Performs the nested group search
-     *
-     * @param userDn      - the userDN to search for, will become the group DN for subsequent searches
-     * @param username    - the username of the user
-     * @param authorities - the authorities set that will be populated, must not be null
-     * @param depth       - the depth remaining, when 0 recursion will end
-     */
-    private void performNestedSearch(String userDn, String username, Set<GrantedAuthority> authorities, int depth) {
-        if (depth == 0) {
-            //back out of recursion
-            if (logger.isDebugEnabled()) {
-                logger.debug("Search aborted, max depth reached," +
-                        " for roles for user '" + username + "', DN = " + "'" + userDn + "', with filter "
-                        + getGroupSearchFilter() + " in search base '" + getGroupSearchBase() + "'");
-            }
-            return;
-        }
+	/**
+	 * Performs the nested group search
+	 *
+	 * @param userDn - the userDN to search for, will become the group DN for subsequent
+	 * searches
+	 * @param username - the username of the user
+	 * @param authorities - the authorities set that will be populated, must not be null
+	 * @param depth - the depth remaining, when 0 recursion will end
+	 */
+	private void performNestedSearch(String userDn, String username,
+			Set<GrantedAuthority> authorities, int depth) {
+		if (depth == 0) {
+			// back out of recursion
+			if (logger.isDebugEnabled()) {
+				logger.debug("Search aborted, max depth reached,"
+						+ " for roles for user '" + username + "', DN = " + "'" + userDn
+						+ "', with filter " + getGroupSearchFilter()
+						+ " in search base '" + getGroupSearchBase() + "'");
+			}
+			return;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Searching for roles for user '" + username + "', DN = " + "'" + userDn + "', with filter "
-                    + getGroupSearchFilter() + " in search base '" + getGroupSearchBase() + "'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Searching for roles for user '" + username + "', DN = " + "'"
+					+ userDn + "', with filter " + getGroupSearchFilter()
+					+ " in search base '" + getGroupSearchBase() + "'");
+		}
 
-        if (getAttributeNames() == null) {
-            setAttributeNames(new HashSet<String>());
-        }
-        if (StringUtils.hasText(getGroupRoleAttribute()) && !getAttributeNames().contains(getGroupRoleAttribute())) {
-            getAttributeNames().add(getGroupRoleAttribute());
-        }
+		if (getAttributeNames() == null) {
+			setAttributeNames(new HashSet<String>());
+		}
+		if (StringUtils.hasText(getGroupRoleAttribute())
+				&& !getAttributeNames().contains(getGroupRoleAttribute())) {
+			getAttributeNames().add(getGroupRoleAttribute());
+		}
 
-        Set<Map<String, List<String>>> userRoles = getLdapTemplate().searchForMultipleAttributeValues(
-                getGroupSearchBase(),
-                getGroupSearchFilter(),
-                new String[]{userDn, username},
-                getAttributeNames().toArray(new String[getAttributeNames().size()]));
+		Set<Map<String, List<String>>> userRoles = getLdapTemplate()
+				.searchForMultipleAttributeValues(
+						getGroupSearchBase(),
+						getGroupSearchFilter(),
+						new String[] { userDn, username },
+						getAttributeNames().toArray(
+								new String[getAttributeNames().size()]));
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Roles from search: " + userRoles);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Roles from search: " + userRoles);
+		}
 
-        for (Map<String, List<String>> record : userRoles) {
-            boolean circular = false;
-            String dn = record.get(SpringSecurityLdapTemplate.DN_KEY).get(0);
-            List<String> roleValues = record.get(getGroupRoleAttribute());
-            Set<String> roles = new HashSet<String>();
-            if(roleValues != null) {
-                roles.addAll(roleValues);
-            }
-            for (String role : roles) {
-                if (isConvertToUpperCase()) {
-                    role = role.toUpperCase();
-                }
-                role = getRolePrefix() + role;
-                //if the group already exist, we will not search for it's parents again.
-                //this prevents a forever loop for a misconfigured ldap directory
-                circular = circular | (!authorities.add(new LdapAuthority(role, dn, record)));
-            }
-            String roleName = roles.size() > 0 ? roles.iterator().next() : dn;
-            if (!circular) {
-                performNestedSearch(dn, roleName, authorities, (depth - 1));
-            }
+		for (Map<String, List<String>> record : userRoles) {
+			boolean circular = false;
+			String dn = record.get(SpringSecurityLdapTemplate.DN_KEY).get(0);
+			List<String> roleValues = record.get(getGroupRoleAttribute());
+			Set<String> roles = new HashSet<String>();
+			if (roleValues != null) {
+				roles.addAll(roleValues);
+			}
+			for (String role : roles) {
+				if (isConvertToUpperCase()) {
+					role = role.toUpperCase();
+				}
+				role = getRolePrefix() + role;
+				// if the group already exist, we will not search for it's parents again.
+				// this prevents a forever loop for a misconfigured ldap directory
+				circular = circular
+						| (!authorities.add(new LdapAuthority(role, dn, record)));
+			}
+			String roleName = roles.size() > 0 ? roles.iterator().next() : dn;
+			if (!circular) {
+				performNestedSearch(dn, roleName, authorities, (depth - 1));
+			}
 
-        }
-    }
+		}
+	}
 
-    /**
-     * Returns the attribute names that this populator has been configured to retrieve Value can be null, represents
-     * fetch all attributes
-     *
-     * @return the attribute names or null for all
-     */
-    private Set<String> getAttributeNames() {
-        return attributeNames;
-    }
+	/**
+	 * Returns the attribute names that this populator has been configured to retrieve
+	 * Value can be null, represents fetch all attributes
+	 *
+	 * @return the attribute names or null for all
+	 */
+	private Set<String> getAttributeNames() {
+		return attributeNames;
+	}
 
-    /**
-     * Sets the attribute names to retrieve for each ldap groups. Null means retrieve all
-     *
-     * @param attributeNames - the names of the LDAP attributes to retrieve
-     */
-    public void setAttributeNames(Set<String> attributeNames) {
-        this.attributeNames = attributeNames;
-    }
+	/**
+	 * Sets the attribute names to retrieve for each ldap groups. Null means retrieve all
+	 *
+	 * @param attributeNames - the names of the LDAP attributes to retrieve
+	 */
+	public void setAttributeNames(Set<String> attributeNames) {
+		this.attributeNames = attributeNames;
+	}
 
-    /**
-     * How far should a nested search go. Depth is calculated in the number of levels we search up for parent groups.
-     *
-     * @return the max search depth, default is 10
-     */
-    private  int getMaxSearchDepth() {
-        return maxSearchDepth;
-    }
-
-    /**
-     * How far should a nested search go. Depth is calculated in the number of levels we search up for parent groups.
-     *
-     * @param maxSearchDepth the max search depth
-     */
-    public void setMaxSearchDepth(int maxSearchDepth) {
-        this.maxSearchDepth = maxSearchDepth;
-    }
+	/**
+	 * How far should a nested search go. Depth is calculated in the number of levels we
+	 * search up for parent groups.
+	 *
+	 * @return the max search depth, default is 10
+	 */
+	private int getMaxSearchDepth() {
+		return maxSearchDepth;
+	}
 
+	/**
+	 * How far should a nested search go. Depth is calculated in the number of levels we
+	 * search up for parent groups.
+	 *
+	 * @param maxSearchDepth the max search depth
+	 */
+	public void setMaxSearchDepth(int maxSearchDepth) {
+		this.maxSearchDepth = maxSearchDepth;
+	}
 
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java
index 879d8859d1..cd96cd9f65 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java
@@ -14,7 +14,6 @@
  */
 package org.springframework.security.ldap.userdetails;
 
-
 import org.springframework.security.core.SpringSecurityCoreVersion;
 import org.springframework.util.Assert;
 
@@ -28,128 +27,122 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
- * UserDetails implementation whose properties are based on the LDAP schema for <tt>Person</tt>.
+ * UserDetails implementation whose properties are based on the LDAP schema for
+ * <tt>Person</tt>.
  *
  * @author Luke
  * @since 2.0
  */
 public class Person extends LdapUserDetailsImpl {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private String givenName;
-    private String sn;
-    private String description;
-    private String telephoneNumber;
-    private List<String> cn = new ArrayList<String>();
+	private String givenName;
+	private String sn;
+	private String description;
+	private String telephoneNumber;
+	private List<String> cn = new ArrayList<String>();
 
-    protected Person() {
-    }
+	protected Person() {
+	}
 
-    public String getGivenName() {
-        return givenName;
-    }
+	public String getGivenName() {
+		return givenName;
+	}
 
-    public String getSn() {
-        return sn;
-    }
+	public String getSn() {
+		return sn;
+	}
 
-    public String[] getCn() {
-        return cn.toArray(new String[cn.size()]);
-    }
+	public String[] getCn() {
+		return cn.toArray(new String[cn.size()]);
+	}
 
-    public String getDescription() {
-        return description;
-    }
+	public String getDescription() {
+		return description;
+	}
 
-    public String getTelephoneNumber() {
-        return telephoneNumber;
-    }
+	public String getTelephoneNumber() {
+		return telephoneNumber;
+	}
 
-    protected void populateContext(DirContextAdapter adapter) {
-        adapter.setAttributeValue("givenName", givenName);
-        adapter.setAttributeValue("sn", sn);
-        adapter.setAttributeValues("cn", getCn());
-        adapter.setAttributeValue("description", getDescription());
-        adapter.setAttributeValue("telephoneNumber", getTelephoneNumber());
+	protected void populateContext(DirContextAdapter adapter) {
+		adapter.setAttributeValue("givenName", givenName);
+		adapter.setAttributeValue("sn", sn);
+		adapter.setAttributeValues("cn", getCn());
+		adapter.setAttributeValue("description", getDescription());
+		adapter.setAttributeValue("telephoneNumber", getTelephoneNumber());
 
-        if(getPassword() != null) {
-            adapter.setAttributeValue("userPassword", getPassword());
-        }
-        adapter.setAttributeValues("objectclass", new String[] {"top", "person"});
-    }
+		if (getPassword() != null) {
+			adapter.setAttributeValue("userPassword", getPassword());
+		}
+		adapter.setAttributeValues("objectclass", new String[] { "top", "person" });
+	}
 
-    public static class Essence extends LdapUserDetailsImpl.Essence {
+	public static class Essence extends LdapUserDetailsImpl.Essence {
 
-        public Essence() {
-        }
+		public Essence() {
+		}
 
-        public Essence(DirContextOperations ctx) {
-            super(ctx);
-            setCn(ctx.getStringAttributes("cn"));
-            setGivenName(ctx.getStringAttribute("givenName"));
-            setSn(ctx.getStringAttribute("sn"));
-            setDescription(ctx.getStringAttribute("description"));
-            setTelephoneNumber(ctx.getStringAttribute("telephoneNumber"));
-            Object passo = ctx.getObjectAttribute("userPassword");
+		public Essence(DirContextOperations ctx) {
+			super(ctx);
+			setCn(ctx.getStringAttributes("cn"));
+			setGivenName(ctx.getStringAttribute("givenName"));
+			setSn(ctx.getStringAttribute("sn"));
+			setDescription(ctx.getStringAttribute("description"));
+			setTelephoneNumber(ctx.getStringAttribute("telephoneNumber"));
+			Object passo = ctx.getObjectAttribute("userPassword");
 
-            if(passo != null) {
-                String password = LdapUtils.convertPasswordToString(passo);
-                setPassword(password);
-            }
-        }
+			if (passo != null) {
+				String password = LdapUtils.convertPasswordToString(passo);
+				setPassword(password);
+			}
+		}
 
-        public Essence(Person copyMe) {
-            super(copyMe);
-            setGivenName(copyMe.givenName);
-            setSn(copyMe.sn);
-            setDescription(copyMe.getDescription());
-            setTelephoneNumber(copyMe.getTelephoneNumber());
-            ((Person) instance).cn = new ArrayList<String>(copyMe.cn);
-        }
+		public Essence(Person copyMe) {
+			super(copyMe);
+			setGivenName(copyMe.givenName);
+			setSn(copyMe.sn);
+			setDescription(copyMe.getDescription());
+			setTelephoneNumber(copyMe.getTelephoneNumber());
+			((Person) instance).cn = new ArrayList<String>(copyMe.cn);
+		}
 
-        protected LdapUserDetailsImpl createTarget() {
-            return new Person();
-        }
+		protected LdapUserDetailsImpl createTarget() {
+			return new Person();
+		}
 
-        public void setGivenName(String givenName) {
-            ((Person) instance).givenName = givenName;
-        }
+		public void setGivenName(String givenName) {
+			((Person) instance).givenName = givenName;
+		}
 
-        public void setSn(String sn) {
-            ((Person) instance).sn = sn;
-        }
+		public void setSn(String sn) {
+			((Person) instance).sn = sn;
+		}
 
-        public void setCn(String[] cn) {
-            ((Person) instance).cn = Arrays.asList(cn);
-        }
+		public void setCn(String[] cn) {
+			((Person) instance).cn = Arrays.asList(cn);
+		}
 
-        public void addCn(String value) {
-            ((Person) instance).cn.add(value);
-        }
+		public void addCn(String value) {
+			((Person) instance).cn.add(value);
+		}
 
-        public void setTelephoneNumber(String tel) {
-            ((Person) instance).telephoneNumber = tel;
-        }
+		public void setTelephoneNumber(String tel) {
+			((Person) instance).telephoneNumber = tel;
+		}
 
-        public void setDescription(String desc) {
-            ((Person) instance).description = desc;
-        }
+		public void setDescription(String desc) {
+			((Person) instance).description = desc;
+		}
 
-        public LdapUserDetails createUserDetails() {
-            Person p = (Person) super.createUserDetails();
-            Assert.hasLength(p.sn);
-            Assert.notNull(p.cn);
-            Assert.notEmpty(p.cn);
-            // TODO: Check contents for null entries
-            return p;
-        }
-    }
+		public LdapUserDetails createUserDetails() {
+			Person p = (Person) super.createUserDetails();
+			Assert.hasLength(p.sn);
+			Assert.notNull(p.cn);
+			Assert.notEmpty(p.cn);
+			// TODO: Check contents for null entries
+			return p;
+		}
+	}
 }
-
-
-
-
-
-
-
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java
index 444c6d7153..a8ce363ddb 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/PersonContextMapper.java
@@ -13,20 +13,21 @@ import org.springframework.util.Assert;
  */
 public class PersonContextMapper implements UserDetailsContextMapper {
 
-    public UserDetails mapUserFromContext(DirContextOperations ctx, String username, Collection<? extends GrantedAuthority> authorities) {
-        Person.Essence p = new Person.Essence(ctx);
+	public UserDetails mapUserFromContext(DirContextOperations ctx, String username,
+			Collection<? extends GrantedAuthority> authorities) {
+		Person.Essence p = new Person.Essence(ctx);
 
-        p.setUsername(username);
-        p.setAuthorities(authorities);
+		p.setUsername(username);
+		p.setAuthorities(authorities);
 
-        return p.createUserDetails();
+		return p.createUserDetails();
 
-    }
+	}
 
-    public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
-        Assert.isInstanceOf(Person.class, user, "UserDetails must be a Person instance");
+	public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
+		Assert.isInstanceOf(Person.class, user, "UserDetails must be a Person instance");
 
-        Person p = (Person) user;
-        p.populateContext(ctx);
-    }
+		Person p = (Person) user;
+		p.populateContext(ctx);
+	}
 }
diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java
index 79c3f60e36..556c2c188e 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/UserDetailsContextMapper.java
@@ -22,28 +22,31 @@ import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.ldap.core.DirContextAdapter;
 
 /**
- * Operations to map a UserDetails object to and from a Spring LDAP {@code DirContextOperations} implementation.
- * Used by {@code LdapUserDetailsManager} when loading and saving/creating user information, and also by the
- * {@code LdapAuthenticationProvider} to allow customization of the user data loaded during authentication.
+ * Operations to map a UserDetails object to and from a Spring LDAP
+ * {@code DirContextOperations} implementation. Used by {@code LdapUserDetailsManager}
+ * when loading and saving/creating user information, and also by the
+ * {@code LdapAuthenticationProvider} to allow customization of the user data loaded
+ * during authentication.
  *
  * @author Luke Taylor
  * @since 2.0
  */
 public interface UserDetailsContextMapper {
 
-    /**
-     * Creates a fully populated UserDetails object for use by the security framework.
-     *
-     * @param ctx the context object which contains the user information.
-     * @param username the user's supplied login name.
-     * @param authorities
-     * @return the user object.
-     */
-    UserDetails mapUserFromContext(DirContextOperations ctx, String username, Collection<? extends GrantedAuthority> authorities);
+	/**
+	 * Creates a fully populated UserDetails object for use by the security framework.
+	 *
+	 * @param ctx the context object which contains the user information.
+	 * @param username the user's supplied login name.
+	 * @param authorities
+	 * @return the user object.
+	 */
+	UserDetails mapUserFromContext(DirContextOperations ctx, String username,
+			Collection<? extends GrantedAuthority> authorities);
 
-    /**
-     * Reverse of the above operation. Populates a context object from the supplied user object.
-     * Called when saving a user, for example.
-     */
-    void mapUserToContext(UserDetails user, DirContextAdapter ctx);
+	/**
+	 * Reverse of the above operation. Populates a context object from the supplied user
+	 * object. Called when saving a user, for example.
+	 */
+	void mapUserToContext(UserDetails user, DirContextAdapter ctx);
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
index 8e817a2295..3a0694d160 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/LdapUtilsTests.java
@@ -23,7 +23,6 @@ import javax.naming.directory.DirContext;
 
 import org.junit.Test;
 
-
 /**
  * Tests {@link LdapUtils}
  *
@@ -31,57 +30,68 @@ import org.junit.Test;
  */
 public class LdapUtilsTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testCloseContextSwallowsNamingException() throws Exception {
-        final DirContext dirCtx = mock(DirContext.class);
-        doThrow(new NamingException()).when(dirCtx).close();
+	@Test
+	public void testCloseContextSwallowsNamingException() throws Exception {
+		final DirContext dirCtx = mock(DirContext.class);
+		doThrow(new NamingException()).when(dirCtx).close();
 
-        LdapUtils.closeContext(dirCtx);
-    }
+		LdapUtils.closeContext(dirCtx);
+	}
 
-    @Test
-    public void testGetRelativeNameReturnsEmptyStringForDnEqualToBaseName() throws Exception {
-        final DirContext mockCtx = mock(DirContext.class);
+	@Test
+	public void testGetRelativeNameReturnsEmptyStringForDnEqualToBaseName()
+			throws Exception {
+		final DirContext mockCtx = mock(DirContext.class);
 
-        when(mockCtx.getNameInNamespace()).thenReturn("dc=springframework,dc=org");
+		when(mockCtx.getNameInNamespace()).thenReturn("dc=springframework,dc=org");
 
-        assertEquals("", LdapUtils.getRelativeName("dc=springframework,dc=org", mockCtx));
-    }
+		assertEquals("", LdapUtils.getRelativeName("dc=springframework,dc=org", mockCtx));
+	}
 
-    @Test
-    public void testGetRelativeNameReturnsFullDnWithEmptyBaseName() throws Exception {
-        final DirContext mockCtx = mock(DirContext.class);
-        when(mockCtx.getNameInNamespace()).thenReturn("");
+	@Test
+	public void testGetRelativeNameReturnsFullDnWithEmptyBaseName() throws Exception {
+		final DirContext mockCtx = mock(DirContext.class);
+		when(mockCtx.getNameInNamespace()).thenReturn("");
 
-        assertEquals("cn=jane,dc=springframework,dc=org",
-            LdapUtils.getRelativeName("cn=jane,dc=springframework,dc=org", mockCtx));
-    }
+		assertEquals("cn=jane,dc=springframework,dc=org",
+				LdapUtils.getRelativeName("cn=jane,dc=springframework,dc=org", mockCtx));
+	}
 
-    @Test
-    public void testGetRelativeNameWorksWithArbitrarySpaces() throws Exception {
-        final DirContext mockCtx = mock(DirContext.class);
-        when(mockCtx.getNameInNamespace()).thenReturn("dc=springsecurity,dc = org");
+	@Test
+	public void testGetRelativeNameWorksWithArbitrarySpaces() throws Exception {
+		final DirContext mockCtx = mock(DirContext.class);
+		when(mockCtx.getNameInNamespace()).thenReturn("dc=springsecurity,dc = org");
 
-        assertEquals("cn=jane smith",
-            LdapUtils.getRelativeName("cn=jane smith, dc = springsecurity , dc=org", mockCtx));
-    }
+		assertEquals("cn=jane smith", LdapUtils.getRelativeName(
+				"cn=jane smith, dc = springsecurity , dc=org", mockCtx));
+	}
 
-    @Test
-    public void testRootDnsAreParsedFromUrlsCorrectly() {
-        assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine"));
-        assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine:11389"));
-        assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine/"));
-        assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk/"));
-        assertEquals("dc=springframework,dc=org",
-            LdapUtils.parseRootDnFromUrl("ldaps://monkeymachine.co.uk/dc=springframework,dc=org"));
-        assertEquals("dc=springframework,dc=org", LdapUtils.parseRootDnFromUrl("ldap:///dc=springframework,dc=org"));
-        assertEquals("dc=springframework,dc=org",
-            LdapUtils.parseRootDnFromUrl("ldap://monkeymachine/dc=springframework,dc=org"));
-        assertEquals("dc=springframework,dc=org/ou=blah",
-            LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk/dc=springframework,dc=org/ou=blah"));
-        assertEquals("dc=springframework,dc=org/ou=blah",
-            LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk:389/dc=springframework,dc=org/ou=blah"));
-    }
+	@Test
+	public void testRootDnsAreParsedFromUrlsCorrectly() {
+		assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine"));
+		assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine:11389"));
+		assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine/"));
+		assertEquals("", LdapUtils.parseRootDnFromUrl("ldap://monkeymachine.co.uk/"));
+		assertEquals(
+				"dc=springframework,dc=org",
+				LdapUtils
+						.parseRootDnFromUrl("ldaps://monkeymachine.co.uk/dc=springframework,dc=org"));
+		assertEquals("dc=springframework,dc=org",
+				LdapUtils.parseRootDnFromUrl("ldap:///dc=springframework,dc=org"));
+		assertEquals(
+				"dc=springframework,dc=org",
+				LdapUtils
+						.parseRootDnFromUrl("ldap://monkeymachine/dc=springframework,dc=org"));
+		assertEquals(
+				"dc=springframework,dc=org/ou=blah",
+				LdapUtils
+						.parseRootDnFromUrl("ldap://monkeymachine.co.uk/dc=springframework,dc=org/ou=blah"));
+		assertEquals(
+				"dc=springframework,dc=org/ou=blah",
+				LdapUtils
+						.parseRootDnFromUrl("ldap://monkeymachine.co.uk:389/dc=springframework,dc=org/ou=blah"));
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java
index a6a129edd1..41bef7be4f 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityAuthenticationSourceTests.java
@@ -18,53 +18,56 @@ import org.junit.Test;
  * @author Luke Taylor
  */
 public class SpringSecurityAuthenticationSourceTests {
-    @Before
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void principalAndCredentialsAreEmptyWithNoAuthentication() {
-        AuthenticationSource source = new SpringSecurityAuthenticationSource();
-        assertEquals("", source.getPrincipal());
-        assertEquals("", source.getCredentials());
-    }
+	@Test
+	public void principalAndCredentialsAreEmptyWithNoAuthentication() {
+		AuthenticationSource source = new SpringSecurityAuthenticationSource();
+		assertEquals("", source.getPrincipal());
+		assertEquals("", source.getCredentials());
+	}
 
-    @Test
-    public void principalIsEmptyForAnonymousUser() {
-        AuthenticationSource source = new SpringSecurityAuthenticationSource();
+	@Test
+	public void principalIsEmptyForAnonymousUser() {
+		AuthenticationSource source = new SpringSecurityAuthenticationSource();
 
-        SecurityContextHolder.getContext().setAuthentication(
-                new AnonymousAuthenticationToken("key", "anonUser", AuthorityUtils.createAuthorityList("ignored")));
-        assertEquals("", source.getPrincipal());
-    }
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("key", "anonUser", AuthorityUtils
+						.createAuthorityList("ignored")));
+		assertEquals("", source.getPrincipal());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void getPrincipalRejectsNonLdapUserDetailsObject() {
-        AuthenticationSource source = new SpringSecurityAuthenticationSource();
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(new Object(), "password"));
+	@Test(expected = IllegalArgumentException.class)
+	public void getPrincipalRejectsNonLdapUserDetailsObject() {
+		AuthenticationSource source = new SpringSecurityAuthenticationSource();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(new Object(), "password"));
 
-        source.getPrincipal();
-    }
+		source.getPrincipal();
+	}
 
-    @Test
-    public void expectedCredentialsAreReturned() {
-        AuthenticationSource source = new SpringSecurityAuthenticationSource();
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(new Object(), "password"));
+	@Test
+	public void expectedCredentialsAreReturned() {
+		AuthenticationSource source = new SpringSecurityAuthenticationSource();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(new Object(), "password"));
 
-        assertEquals("password", source.getCredentials());
-    }
+		assertEquals("password", source.getCredentials());
+	}
 
-    @Test
-    public void expectedPrincipalIsReturned() {
-        LdapUserDetailsImpl.Essence user = new LdapUserDetailsImpl.Essence();
-        user.setUsername("joe");
-        user.setDn(new DistinguishedName("uid=joe,ou=users"));
-        AuthenticationSource source = new SpringSecurityAuthenticationSource();
-        SecurityContextHolder.getContext().setAuthentication(
-                new TestingAuthenticationToken(user.createUserDetails(), null));
+	@Test
+	public void expectedPrincipalIsReturned() {
+		LdapUserDetailsImpl.Essence user = new LdapUserDetailsImpl.Essence();
+		user.setUsername("joe");
+		user.setDn(new DistinguishedName("uid=joe,ou=users"));
+		AuthenticationSource source = new SpringSecurityAuthenticationSource();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(user.createUserDetails(), null));
 
-        assertEquals("uid=joe,ou=users", source.getPrincipal());
-    }
+		assertEquals("uid=joe,ou=users", source.getPrincipal());
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
index 384fb24495..f37ce4f386 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateTests.java
@@ -36,33 +36,36 @@ import org.springframework.ldap.core.DistinguishedName;
 @RunWith(MockitoJUnitRunner.class)
 public class SpringSecurityLdapTemplateTests {
 
-    @Mock
-    private DirContext ctx;
-    @Captor
-    private ArgumentCaptor<SearchControls> searchControls;
-    @Mock
-    private NamingEnumeration<SearchResult> resultsEnum;
-    @Mock
-    private SearchResult searchResult;
+	@Mock
+	private DirContext ctx;
+	@Captor
+	private ArgumentCaptor<SearchControls> searchControls;
+	@Mock
+	private NamingEnumeration<SearchResult> resultsEnum;
+	@Mock
+	private SearchResult searchResult;
 
-    // SEC-2405
-    @Test
-    public void searchForSingleEntryInternalAllowsReferrals() throws Exception {
-        String base = "";
-        String filter = "";
-        String searchResultName = "ldap://example.com/dc=springframework,dc=org";
-        Object[] params = new Object[] {};
-        DirContextAdapter searchResultObject = mock(DirContextAdapter.class);
+	// SEC-2405
+	@Test
+	public void searchForSingleEntryInternalAllowsReferrals() throws Exception {
+		String base = "";
+		String filter = "";
+		String searchResultName = "ldap://example.com/dc=springframework,dc=org";
+		Object[] params = new Object[] {};
+		DirContextAdapter searchResultObject = mock(DirContextAdapter.class);
 
-        when(ctx.search(any(DistinguishedName.class), eq(filter), eq(params), searchControls.capture())).thenReturn(resultsEnum);
-        when(resultsEnum.hasMore()).thenReturn(true, false);
-        when(resultsEnum.next()).thenReturn(searchResult);
-        when(searchResult.getName()).thenReturn(searchResultName);
-        when(searchResult.getObject()).thenReturn(searchResultObject);
+		when(
+				ctx.search(any(DistinguishedName.class), eq(filter), eq(params),
+						searchControls.capture())).thenReturn(resultsEnum);
+		when(resultsEnum.hasMore()).thenReturn(true, false);
+		when(resultsEnum.next()).thenReturn(searchResult);
+		when(searchResult.getName()).thenReturn(searchResultName);
+		when(searchResult.getObject()).thenReturn(searchResultObject);
 
-        SpringSecurityLdapTemplate.searchForSingleEntryInternal(ctx, mock(SearchControls.class), base, filter, params);
+		SpringSecurityLdapTemplate.searchForSingleEntryInternal(ctx,
+				mock(SearchControls.class), base, filter, params);
 
-        assertThat(searchControls.getValue().getReturningObjFlag()).isTrue();
-    }
+		assertThat(searchControls.getValue().getReturningObjFlag()).isTrue();
+	}
 
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
index 8ec29e2940..6b6eebea1b 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapAuthenticationProviderTests.java
@@ -36,7 +36,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.ldap.userdetails.LdapAuthoritiesPopulator;
 import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
 
-
 /**
  * Tests {@link LdapAuthenticationProvider}.
  *
@@ -45,163 +44,193 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
  */
 public class LdapAuthenticationProviderTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testSupportsUsernamePasswordAuthenticationToken() {
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(),
-                new MockAuthoritiesPopulator());
+	@Test
+	public void testSupportsUsernamePasswordAuthenticationToken() {
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator(), new MockAuthoritiesPopulator());
 
-        assertTrue(ldapProvider.supports(UsernamePasswordAuthenticationToken.class));
-    }
+		assertTrue(ldapProvider.supports(UsernamePasswordAuthenticationToken.class));
+	}
 
-    @Test
-    public void testDefaultMapperIsSet() {
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(),
-                new MockAuthoritiesPopulator());
+	@Test
+	public void testDefaultMapperIsSet() {
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator(), new MockAuthoritiesPopulator());
 
-        assertTrue(ldapProvider.getUserDetailsContextMapper() instanceof LdapUserDetailsMapper);
-    }
+		assertTrue(ldapProvider.getUserDetailsContextMapper() instanceof LdapUserDetailsMapper);
+	}
 
-    @Test
-    public void testEmptyOrNullUserNameThrowsException() {
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(),
-                new MockAuthoritiesPopulator());
+	@Test
+	public void testEmptyOrNullUserNameThrowsException() {
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator(), new MockAuthoritiesPopulator());
 
-        try {
-            ldapProvider.authenticate(new UsernamePasswordAuthenticationToken(null, "password"));
-            fail("Expected BadCredentialsException for empty username");
-        } catch (BadCredentialsException expected) {}
+		try {
+			ldapProvider.authenticate(new UsernamePasswordAuthenticationToken(null,
+					"password"));
+			fail("Expected BadCredentialsException for empty username");
+		}
+		catch (BadCredentialsException expected) {
+		}
 
-        try {
-            ldapProvider.authenticate(new UsernamePasswordAuthenticationToken("", "bobspassword"));
-            fail("Expected BadCredentialsException for null username");
-        } catch (BadCredentialsException expected) {}
-    }
+		try {
+			ldapProvider.authenticate(new UsernamePasswordAuthenticationToken("",
+					"bobspassword"));
+			fail("Expected BadCredentialsException for null username");
+		}
+		catch (BadCredentialsException expected) {
+		}
+	}
 
-    @Test(expected=BadCredentialsException.class)
-    public void usernameNotFoundExceptionIsHiddenByDefault() {
-        final LdapAuthenticator authenticator = mock(LdapAuthenticator.class);
-        final UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken("joe", "password");
-        when(authenticator.authenticate(joe)).thenThrow(new UsernameNotFoundException("nobody"));
+	@Test(expected = BadCredentialsException.class)
+	public void usernameNotFoundExceptionIsHiddenByDefault() {
+		final LdapAuthenticator authenticator = mock(LdapAuthenticator.class);
+		final UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken(
+				"joe", "password");
+		when(authenticator.authenticate(joe)).thenThrow(
+				new UsernameNotFoundException("nobody"));
 
-        LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-        provider.authenticate(joe);
-    }
+		LdapAuthenticationProvider provider = new LdapAuthenticationProvider(
+				authenticator);
+		provider.authenticate(joe);
+	}
 
-    @Test(expected=UsernameNotFoundException.class)
-    public void usernameNotFoundExceptionIsNotHiddenIfConfigured() {
-        final LdapAuthenticator authenticator = mock(LdapAuthenticator.class);
-        final UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken("joe", "password");
-        when(authenticator.authenticate(joe)).thenThrow(new UsernameNotFoundException("nobody"));
+	@Test(expected = UsernameNotFoundException.class)
+	public void usernameNotFoundExceptionIsNotHiddenIfConfigured() {
+		final LdapAuthenticator authenticator = mock(LdapAuthenticator.class);
+		final UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken(
+				"joe", "password");
+		when(authenticator.authenticate(joe)).thenThrow(
+				new UsernameNotFoundException("nobody"));
 
-        LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-        provider.setHideUserNotFoundExceptions(false);
-        provider.authenticate(joe);
-    }
+		LdapAuthenticationProvider provider = new LdapAuthenticationProvider(
+				authenticator);
+		provider.setHideUserNotFoundExceptions(false);
+		provider.authenticate(joe);
+	}
 
-    @Test
-    public void normalUsage() {
-        MockAuthoritiesPopulator populator = new MockAuthoritiesPopulator();
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(), populator);
-        LdapUserDetailsMapper userMapper = new LdapUserDetailsMapper();
-        userMapper.setRoleAttributes(new String[] {"ou"});
-        ldapProvider.setUserDetailsContextMapper(userMapper);
+	@Test
+	public void normalUsage() {
+		MockAuthoritiesPopulator populator = new MockAuthoritiesPopulator();
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator(), populator);
+		LdapUserDetailsMapper userMapper = new LdapUserDetailsMapper();
+		userMapper.setRoleAttributes(new String[] { "ou" });
+		ldapProvider.setUserDetailsContextMapper(userMapper);
 
-        assertNotNull(ldapProvider.getAuthoritiesPopulator());
+		assertNotNull(ldapProvider.getAuthoritiesPopulator());
 
-        UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-        Object authDetails = new Object();
-        authRequest.setDetails(authDetails);
-        Authentication authResult = ldapProvider.authenticate(authRequest);
-        assertEquals("benspassword", authResult.getCredentials());
-        assertSame(authDetails, authResult.getDetails());
-        UserDetails user = (UserDetails) authResult.getPrincipal();
-        assertEquals(2, user.getAuthorities().size());
-        assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", user.getPassword());
-        assertEquals("ben", user.getUsername());
-        assertEquals("ben", populator.getRequestedUsername());
+		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				"ben", "benspassword");
+		Object authDetails = new Object();
+		authRequest.setDetails(authDetails);
+		Authentication authResult = ldapProvider.authenticate(authRequest);
+		assertEquals("benspassword", authResult.getCredentials());
+		assertSame(authDetails, authResult.getDetails());
+		UserDetails user = (UserDetails) authResult.getPrincipal();
+		assertEquals(2, user.getAuthorities().size());
+		assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", user.getPassword());
+		assertEquals("ben", user.getUsername());
+		assertEquals("ben", populator.getRequestedUsername());
 
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_FROM_ENTRY"));
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_FROM_POPULATOR"));
-    }
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_FROM_ENTRY"));
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_FROM_POPULATOR"));
+	}
 
-    @Test
-    public void passwordIsSetFromUserDataIfUseAuthenticationRequestCredentialsIsFalse() {
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator(),
-                new MockAuthoritiesPopulator());
-        ldapProvider.setUseAuthenticationRequestCredentials(false);
+	@Test
+	public void passwordIsSetFromUserDataIfUseAuthenticationRequestCredentialsIsFalse() {
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator(), new MockAuthoritiesPopulator());
+		ldapProvider.setUseAuthenticationRequestCredentials(false);
 
-        UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-        Authentication authResult = ldapProvider.authenticate(authRequest);
-        assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", authResult.getCredentials());
+		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				"ben", "benspassword");
+		Authentication authResult = ldapProvider.authenticate(authRequest);
+		assertEquals("{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=", authResult.getCredentials());
 
-    }
+	}
 
-    @Test
-    public void useWithNullAuthoritiesPopulatorReturnsCorrectRole() {
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(new MockAuthenticator());
-        LdapUserDetailsMapper userMapper = new LdapUserDetailsMapper();
-        userMapper.setRoleAttributes(new String[] {"ou"});
-        ldapProvider.setUserDetailsContextMapper(userMapper);
-        UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-        UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest).getPrincipal();
-        assertEquals(1, user.getAuthorities().size());
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_FROM_ENTRY"));
-    }
+	@Test
+	public void useWithNullAuthoritiesPopulatorReturnsCorrectRole() {
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				new MockAuthenticator());
+		LdapUserDetailsMapper userMapper = new LdapUserDetailsMapper();
+		userMapper.setRoleAttributes(new String[] { "ou" });
+		ldapProvider.setUserDetailsContextMapper(userMapper);
+		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				"ben", "benspassword");
+		UserDetails user = (UserDetails) ldapProvider.authenticate(authRequest)
+				.getPrincipal();
+		assertEquals(1, user.getAuthorities().size());
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_FROM_ENTRY"));
+	}
 
-    @Test
-    public void authenticateWithNamingException() {
-        UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken("ben", "benspassword");
-        LdapAuthenticator mockAuthenticator = mock(LdapAuthenticator.class);
-        CommunicationException expectedCause = new CommunicationException(new javax.naming.CommunicationException());
-        when(mockAuthenticator.authenticate(authRequest)).thenThrow(expectedCause);
+	@Test
+	public void authenticateWithNamingException() {
+		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				"ben", "benspassword");
+		LdapAuthenticator mockAuthenticator = mock(LdapAuthenticator.class);
+		CommunicationException expectedCause = new CommunicationException(
+				new javax.naming.CommunicationException());
+		when(mockAuthenticator.authenticate(authRequest)).thenThrow(expectedCause);
 
-        LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(mockAuthenticator);
-        try {
-            ldapProvider.authenticate(authRequest);
-            fail("Expected Exception");
-        } catch(InternalAuthenticationServiceException success) {
-            assertSame(expectedCause, success.getCause());
-        }
-    }
+		LdapAuthenticationProvider ldapProvider = new LdapAuthenticationProvider(
+				mockAuthenticator);
+		try {
+			ldapProvider.authenticate(authRequest);
+			fail("Expected Exception");
+		}
+		catch (InternalAuthenticationServiceException success) {
+			assertSame(expectedCause, success.getCause());
+		}
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    class MockAuthenticator implements LdapAuthenticator {
+	class MockAuthenticator implements LdapAuthenticator {
 
-        public DirContextOperations authenticate(Authentication authentication) {
-            DirContextAdapter ctx = new DirContextAdapter();
-            ctx.setAttributeValue("ou", "FROM_ENTRY");
-            String username = authentication.getName();
-            String password = (String) authentication.getCredentials();
+		public DirContextOperations authenticate(Authentication authentication) {
+			DirContextAdapter ctx = new DirContextAdapter();
+			ctx.setAttributeValue("ou", "FROM_ENTRY");
+			String username = authentication.getName();
+			String password = (String) authentication.getCredentials();
 
+			if (username.equals("ben") && password.equals("benspassword")) {
+				ctx.setDn(new DistinguishedName(
+						"cn=ben,ou=people,dc=springframework,dc=org"));
+				ctx.setAttributeValue("userPassword", "{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=");
 
-            if (username.equals("ben") && password.equals("benspassword")) {
-                ctx.setDn(new DistinguishedName("cn=ben,ou=people,dc=springframework,dc=org"));
-                ctx.setAttributeValue("userPassword","{SHA}nFCebWjxfaLbHHG1Qk5UU4trbvQ=");
+				return ctx;
+			}
+			else if (username.equals("jen") && password.equals("")) {
+				ctx.setDn(new DistinguishedName(
+						"cn=jen,ou=people,dc=springframework,dc=org"));
 
-                return ctx;
-            } else if (username.equals("jen") && password.equals("")) {
-                ctx.setDn(new DistinguishedName("cn=jen,ou=people,dc=springframework,dc=org"));
+				return ctx;
+			}
 
-                return ctx;
-            }
+			throw new BadCredentialsException("Authentication failed.");
+		}
+	}
 
-            throw new BadCredentialsException("Authentication failed.");
-        }
-    }
+	class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
+		String username;
 
-    class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-        String username;
+		public Collection<GrantedAuthority> getGrantedAuthorities(
+				DirContextOperations userCtx, String username) {
+			this.username = username;
+			return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");
+		}
 
-        public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userCtx, String username) {
-            this.username = username;
-            return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");
-        }
-
-        String getRequestedUsername() {
-            return username;
-        }
-    }
+		String getRequestedUsername() {
+			return username;
+		}
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java
index e30e9dc36e..e0c4de9927 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/LdapShaPasswordEncoderTests.java
@@ -21,95 +21,113 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.security.authentication.encoding.LdapShaPasswordEncoder;
 
-
 /**
  * Tests {@link LdapShaPasswordEncoder}.
  *
  * @author Luke Taylor
  */
 public class LdapShaPasswordEncoderTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    LdapShaPasswordEncoder sha;
+	LdapShaPasswordEncoder sha;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        sha = new LdapShaPasswordEncoder();
-    }
+	@Before
+	public void setUp() throws Exception {
+		sha = new LdapShaPasswordEncoder();
+	}
 
-    @Test
-    public void invalidPasswordFails() {
-        assertFalse(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "wrongpassword", null));
-    }
+	@Test
+	public void invalidPasswordFails() {
+		assertFalse(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				"wrongpassword", null));
+	}
 
-    @Test
-    public void invalidSaltedPasswordFails() {
-        assertFalse(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "wrongpassword", null));
-        assertFalse(sha.isPasswordValid("{SSHA}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd", "wrongpassword", null));
-    }
+	@Test
+	public void invalidSaltedPasswordFails() {
+		assertFalse(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX",
+				"wrongpassword", null));
+		assertFalse(sha.isPasswordValid("{SSHA}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd",
+				"wrongpassword", null));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void nonByteArraySaltThrowsException() {
-        sha.encodePassword("password", "AStringNotAByteArray");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void nonByteArraySaltThrowsException() {
+		sha.encodePassword("password", "AStringNotAByteArray");
+	}
 
-    /**
-     * Test values generated by 'slappasswd -h {SHA} -s boabspasswurd'
-     */
-    @Test
-    public void validPasswordSucceeds() {
-        sha.setForceLowerCasePrefix(false);
-        assertTrue(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "boabspasswurd", null));
-        assertTrue(sha.isPasswordValid("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "boabspasswurd", null));
-        sha.setForceLowerCasePrefix(true);
-        assertTrue(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "boabspasswurd", null));
-        assertTrue(sha.isPasswordValid("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", "boabspasswurd", null));
-    }
+	/**
+	 * Test values generated by 'slappasswd -h {SHA} -s boabspasswurd'
+	 */
+	@Test
+	public void validPasswordSucceeds() {
+		sha.setForceLowerCasePrefix(false);
+		assertTrue(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				"boabspasswurd", null));
+		assertTrue(sha.isPasswordValid("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				"boabspasswurd", null));
+		sha.setForceLowerCasePrefix(true);
+		assertTrue(sha.isPasswordValid("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				"boabspasswurd", null));
+		assertTrue(sha.isPasswordValid("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				"boabspasswurd", null));
+	}
 
-    /**
-     * Test values generated by 'slappasswd -s boabspasswurd'
-     */
-    @Test
-    public void validSaltedPasswordSucceeds() {
-        sha.setForceLowerCasePrefix(false);
-        assertTrue(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "boabspasswurd", null));
-        assertTrue(sha.isPasswordValid("{ssha}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd", "boabspasswurd", null));
-        sha.setForceLowerCasePrefix(true);
-        assertTrue(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "boabspasswurd", null));
-        assertTrue(sha.isPasswordValid("{ssha}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd", "boabspasswurd", null));
-    }
+	/**
+	 * Test values generated by 'slappasswd -s boabspasswurd'
+	 */
+	@Test
+	public void validSaltedPasswordSucceeds() {
+		sha.setForceLowerCasePrefix(false);
+		assertTrue(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX",
+				"boabspasswurd", null));
+		assertTrue(sha.isPasswordValid("{ssha}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd",
+				"boabspasswurd", null));
+		sha.setForceLowerCasePrefix(true);
+		assertTrue(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgX",
+				"boabspasswurd", null));
+		assertTrue(sha.isPasswordValid("{ssha}PQy2j+6n5ytA+YlAKkM8Fh4p6u2JxfVd",
+				"boabspasswurd", null));
+	}
 
-    @Test
-    // SEC-1031
-    public void fullLengthOfHashIsUsedInComparison() throws Exception {
-        // Change the first hash character from '2' to '3'
-        assertFalse(sha.isPasswordValid("{SSHA}35ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "boabspasswurd", null));
-     // Change the last hash character from 'X' to 'Y'
-        assertFalse(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgY", "boabspasswurd", null));
-    }
+	@Test
+	// SEC-1031
+	public void fullLengthOfHashIsUsedInComparison() throws Exception {
+		// Change the first hash character from '2' to '3'
+		assertFalse(sha.isPasswordValid("{SSHA}35ro4PKC8jhQZ26jVsozhX/xaP0suHgX",
+				"boabspasswurd", null));
+		// Change the last hash character from 'X' to 'Y'
+		assertFalse(sha.isPasswordValid("{SSHA}25ro4PKC8jhQZ26jVsozhX/xaP0suHgY",
+				"boabspasswurd", null));
+	}
 
-    @Test
-    public void correctPrefixCaseIsUsed() {
-        sha.setForceLowerCasePrefix(false);
-        assertEquals("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", sha.encodePassword("boabspasswurd", null));
-        assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith("{SSHA}"));
+	@Test
+	public void correctPrefixCaseIsUsed() {
+		sha.setForceLowerCasePrefix(false);
+		assertEquals("{SHA}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				sha.encodePassword("boabspasswurd", null));
+		assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith(
+				"{SSHA}"));
 
-        sha.setForceLowerCasePrefix(true);
-        assertEquals("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=", sha.encodePassword("boabspasswurd", null));
-        assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith("{ssha}"));
+		sha.setForceLowerCasePrefix(true);
+		assertEquals("{sha}ddSFGmjXYPbZC+NXR2kCzBRjqiE=",
+				sha.encodePassword("boabspasswurd", null));
+		assertTrue(sha.encodePassword("somepassword", "salt".getBytes()).startsWith(
+				"{ssha}"));
 
-    }
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void invalidPrefixIsRejected() {
-        sha.isPasswordValid("{MD9}xxxxxxxxxx" , "somepassword", null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidPrefixIsRejected() {
+		sha.isPasswordValid("{MD9}xxxxxxxxxx", "somepassword", null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void malformedPrefixIsRejected() {
-        // No right brace
-        sha.isPasswordValid("{SSHA25ro4PKC8jhQZ26jVsozhX/xaP0suHgX" , "somepassword", null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void malformedPrefixIsRejected() {
+		// No right brace
+		sha.isPasswordValid("{SSHA25ro4PKC8jhQZ26jVsozhX/xaP0suHgX", "somepassword", null);
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java
index d0fc3b6b68..9eb6a1b51a 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/MockUserSearch.java
@@ -19,29 +19,31 @@ import org.springframework.security.ldap.search.LdapUserSearch;
 
 import org.springframework.ldap.core.DirContextOperations;
 
-
 /**
  *
  *
  * @author Luke Taylor
  */
 public class MockUserSearch implements LdapUserSearch {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    DirContextOperations user;
+	DirContextOperations user;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public MockUserSearch() {
-    }
+	public MockUserSearch() {
+	}
 
-    public MockUserSearch(DirContextOperations user) {
-        this.user = user;
-    }
+	public MockUserSearch(DirContextOperations user) {
+		this.user = user;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public DirContextOperations searchForUser(String username) {
-        return user;
-    }
+	public DirContextOperations searchForUser(String username) {
+		return user;
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java
index 20472f9b62..1ac22bca2f 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/PasswordComparisonAuthenticatorMockTests.java
@@ -29,39 +29,42 @@ import org.junit.Test;
 import org.springframework.ldap.core.support.BaseLdapPathContextSource;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
-
 /**
  *
  * @author Luke Taylor
  */
 public class PasswordComparisonAuthenticatorMockTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void ldapCompareOperationIsUsedWhenPasswordIsNotRetrieved() throws Exception {
-        final DirContext dirCtx = mock(DirContext.class);
-        final BaseLdapPathContextSource source = mock(BaseLdapPathContextSource.class);
-        final BasicAttributes attrs = new BasicAttributes();
-        attrs.put(new BasicAttribute("uid", "bob"));
+	@Test
+	public void ldapCompareOperationIsUsedWhenPasswordIsNotRetrieved() throws Exception {
+		final DirContext dirCtx = mock(DirContext.class);
+		final BaseLdapPathContextSource source = mock(BaseLdapPathContextSource.class);
+		final BasicAttributes attrs = new BasicAttributes();
+		attrs.put(new BasicAttribute("uid", "bob"));
 
-        PasswordComparisonAuthenticator authenticator = new PasswordComparisonAuthenticator(source);
+		PasswordComparisonAuthenticator authenticator = new PasswordComparisonAuthenticator(
+				source);
 
-        authenticator.setUserDnPatterns(new String[] {"cn={0},ou=people"});
+		authenticator.setUserDnPatterns(new String[] { "cn={0},ou=people" });
 
-        // Get the mock to return an empty attribute set
-        when(source.getReadOnlyContext()).thenReturn(dirCtx);
-        when(dirCtx.getAttributes(eq("cn=Bob,ou=people"), any(String[].class))).thenReturn(attrs);
-        when(dirCtx.getNameInNamespace()).thenReturn("dc=springframework,dc=org");
+		// Get the mock to return an empty attribute set
+		when(source.getReadOnlyContext()).thenReturn(dirCtx);
+		when(dirCtx.getAttributes(eq("cn=Bob,ou=people"), any(String[].class)))
+				.thenReturn(attrs);
+		when(dirCtx.getNameInNamespace()).thenReturn("dc=springframework,dc=org");
 
-        // Setup a single return value (i.e. success)
-        final NamingEnumeration searchResults = new BasicAttributes("", null).getAll();
+		// Setup a single return value (i.e. success)
+		final NamingEnumeration searchResults = new BasicAttributes("", null).getAll();
 
-        when(dirCtx.search(eq("cn=Bob,ou=people"),
-                            eq("(userPassword={0})"),
-                            any(Object[].class),
-                            any(SearchControls.class))).thenReturn(searchResults);
+		when(
+				dirCtx.search(eq("cn=Bob,ou=people"), eq("(userPassword={0})"),
+						any(Object[].class), any(SearchControls.class))).thenReturn(
+				searchResults);
 
-        authenticator.authenticate(new UsernamePasswordAuthenticationToken("Bob","bobspassword"));
-    }
+		authenticator.authenticate(new UsernamePasswordAuthenticationToken("Bob",
+				"bobspassword"));
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java
index 90692d7fa7..cb15d5df34 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java
@@ -57,367 +57,413 @@ import static org.springframework.security.ldap.authentication.ad.ActiveDirector
  * @author Rob Winch
  */
 public class ActiveDirectoryLdapAuthenticationProviderTests {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    ActiveDirectoryLdapAuthenticationProvider provider;
-    UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken("joe", "password");
-
-    @Before
-    public void setUp() throws Exception {
-        provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/");
-    }
-
-    @Test
-    public void bindPrincipalIsCreatedCorrectly() throws Exception {
-        assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe"));
-        assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe@mydomain.eu"));
-    }
-
-    @Test
-    public void successfulAuthenticationProducesExpectedAuthorities() throws Exception {
-        checkAuthentication("dc=mydomain,dc=eu", provider);
-    }
-
-    // SEC-1915
-    @Test
-    public void customSearchFilterIsUsedForSuccessfulAuthentication() throws Exception {
-        //given
-        String customSearchFilter = "(&(objectClass=user)(sAMAccountName={0}))";
-
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-
-        DirContextAdapter dca = new DirContextAdapter();
-        SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
-        when(ctx.search(any(Name.class), eq(customSearchFilter), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(new MockNamingEnumeration(sr));
-
-        ActiveDirectoryLdapAuthenticationProvider customProvider
-                = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/");
-        customProvider.contextFactory = createContextFactoryReturning(ctx);
-
-        //when
-        customProvider.setSearchFilter(customSearchFilter);
-        Authentication result = customProvider.authenticate(joe);
-
-        //then
-        assertTrue(result.isAuthenticated());
-    }
-
-    @Test
-    public void defaultSearchFilter() throws Exception {
-        //given
-        final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
-
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-
-        DirContextAdapter dca = new DirContextAdapter();
-        SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
-        when(ctx.search(any(Name.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(new MockNamingEnumeration(sr));
-
-        ActiveDirectoryLdapAuthenticationProvider customProvider
-                = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/");
-        customProvider.contextFactory = createContextFactoryReturning(ctx);
-
-        //when
-        Authentication result = customProvider.authenticate(joe);
-
-        //then
-        assertTrue(result.isAuthenticated());
-        verify(ctx).search(any(DistinguishedName.class), eq(defaultSearchFilter), any(Object[].class), any(SearchControls.class));
-    }
-
-    // SEC-2897
-    @Test
-    public void bindPrincipalUsed() throws Exception {
-        //given
-        final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
-        ArgumentCaptor<Object[]> captor = ArgumentCaptor.forClass(Object[].class);
-
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-
-        DirContextAdapter dca = new DirContextAdapter();
-        SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
-        when(ctx.search(any(Name.class), eq(defaultSearchFilter), captor.capture(), any(SearchControls.class)))
-                .thenReturn(new MockNamingEnumeration(sr));
-
-        ActiveDirectoryLdapAuthenticationProvider customProvider
-                = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/");
-        customProvider.contextFactory = createContextFactoryReturning(ctx);
-
-        //when
-        Authentication result = customProvider.authenticate(joe);
-
-        //then
-        assertThat(captor.getValue()).containsOnly("joe@mydomain.eu");
-        assertTrue(result.isAuthenticated());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setSearchFilterNull() {
-        provider.setSearchFilter(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setSearchFilterEmpty() {
-        provider.setSearchFilter(" ");
-    }
-
-    @Test
-    public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal() throws Exception {
-        provider = new ActiveDirectoryLdapAuthenticationProvider(null, "ldap://192.168.1.200/");
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-
-        DirContextAdapter dca = new DirContextAdapter();
-        SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
-        when(ctx.search(eq(new DistinguishedName("DC=mydomain,DC=eu")), any(String.class), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(new MockNamingEnumeration(sr));
-        provider.contextFactory = createContextFactoryReturning(ctx);
-
-        try {
-            provider.authenticate(joe);
-            fail("Expected BadCredentialsException for user with no domain information");
-        } catch (BadCredentialsException expected) {
-        }
-
-        provider.authenticate(new UsernamePasswordAuthenticationToken("joe@mydomain.eu", "password"));
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void failedUserSearchCausesBadCredentials() throws Exception {
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-        when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
-                .thenThrow(new NameNotFoundException());
-
-        provider.contextFactory = createContextFactoryReturning(ctx);
-
-        provider.authenticate(joe);
-    }
-
-    // SEC-2017
-    @Test(expected = BadCredentialsException.class)
-    public void noUserSearchCausesUsernameNotFound() throws Exception {
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-        when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(new EmptyEnumeration<SearchResult>());
-
-        provider.contextFactory = createContextFactoryReturning(ctx);
-
-        provider.authenticate(joe);
-    }
-
-    // SEC-2500
-    @Test(expected = BadCredentialsException.class)
-    public void sec2500PreventAnonymousBind() {
-        provider.authenticate(new UsernamePasswordAuthenticationToken("rwinch", ""));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test(expected = IncorrectResultSizeDataAccessException.class)
-    public void duplicateUserSearchCausesError() throws Exception {
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-        NamingEnumeration<SearchResult> searchResults = mock(NamingEnumeration.class);
-        when(searchResults.hasMore()).thenReturn(true,true,false);
-        SearchResult searchResult = mock(SearchResult.class);
-        when(searchResult.getObject()).thenReturn(new DirContextAdapter("ou=1"),new DirContextAdapter("ou=2"));
-        when(searchResults.next()).thenReturn(searchResult);
-        when(ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(searchResults );
-
-        provider.contextFactory = createContextFactoryReturning(ctx);
-
-        provider.authenticate(joe);
-    }
-
-    static final String msg = "[LDAP: error code 49 - 80858585: LdapErr: DSID-DECAFF0, comment: AcceptSecurityContext error, data ";
-
-    @Test(expected = BadCredentialsException.class)
-    public void userNotFoundIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "525, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void incorrectPasswordIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "52e, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void notPermittedIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "530, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test
-    public void passwordNeedsResetIsCorrectlyMapped() {
-        final String dataCode = "773";
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + dataCode+", xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-
-        thrown.expect(BadCredentialsException.class);
-        thrown.expect(new BaseMatcher<BadCredentialsException>() {
-            private Matcher<Object> causeInstance = CoreMatchers.instanceOf(ActiveDirectoryAuthenticationException.class);
-            private Matcher<String> causeDataCode = CoreMatchers.equalTo(dataCode);
-            public boolean matches(Object that) {
-                Throwable t = (Throwable) that;
-                ActiveDirectoryAuthenticationException cause = (ActiveDirectoryAuthenticationException) t.getCause();
-                return causeInstance.matches(cause) && causeDataCode.matches(cause.getDataCode());
-            }
-
-            public void describeTo(Description desc) {
-                desc.appendText("getCause() ");
-                causeInstance.describeTo(desc);
-                desc.appendText("getCause().getDataCode() ");
-                causeDataCode.describeTo(desc);
-            }
-        });
-
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = CredentialsExpiredException.class)
-    public void expiredPasswordIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "532, xxxx]"));
-
-        try {
-            provider.authenticate(joe);
-            fail();
-        } catch (BadCredentialsException expected) {
-        }
-
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = DisabledException.class)
-    public void accountDisabledIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "533, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = AccountExpiredException.class)
-    public void accountExpiredIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "701, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = LockedException.class)
-    public void accountLockedIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "775, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void unknownErrorCodeIsCorrectlyMapped() {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg + "999, xxxx]"));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = BadCredentialsException.class)
-    public void errorWithNoSubcodeIsHandledCleanly() throws Exception {
-        provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(msg));
-        provider.setConvertSubErrorCodesToExceptions(true);
-        provider.authenticate(joe);
-    }
-
-    @Test(expected = org.springframework.ldap.CommunicationException.class)
-    public void nonAuthenticationExceptionIsConvertedToSpringLdapException() throws Exception {
-        provider.contextFactory = createContextFactoryThrowing(new CommunicationException(msg));
-        provider.authenticate(joe);
-    }
-
-    @Test
-    public void rootDnProvidedSeparatelyFromDomainAlsoWorks() throws Exception {
-        ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu", "ldap://192.168.1.200/", "dc=ad,dc=eu,dc=mydomain");
-        checkAuthentication("dc=ad,dc=eu,dc=mydomain", provider);
-
-    }
-
-    ContextFactory createContextFactoryThrowing(final NamingException e) {
-        return new ContextFactory() {
-            @Override
-            DirContext createContext(Hashtable<?, ?> env) throws NamingException {
-                throw e;
-            }
-        };
-    }
-
-
-    ContextFactory createContextFactoryReturning(final DirContext ctx) {
-        return new ContextFactory() {
-            @Override
-            DirContext createContext(Hashtable<?, ?> env) throws NamingException {
-                return ctx;
-            }
-        };
-    }
-
-    private void checkAuthentication(String rootDn, ActiveDirectoryLdapAuthenticationProvider provider) throws NamingException {
-        DirContext ctx = mock(DirContext.class);
-        when(ctx.getNameInNamespace()).thenReturn("");
-
-        DirContextAdapter dca = new DirContextAdapter();
-        SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca, dca.getAttributes());
-        @SuppressWarnings("deprecation") DistinguishedName searchBaseDn = new DistinguishedName(rootDn);
-        when(ctx.search(eq(searchBaseDn), any(String.class), any(Object[].class), any(SearchControls.class)))
-                .thenReturn(new MockNamingEnumeration(sr))
-                .thenReturn(new MockNamingEnumeration(sr));
-
-        provider.contextFactory = createContextFactoryReturning(ctx);
-
-        Authentication result = provider.authenticate(joe);
-
-        assertEquals(0, result.getAuthorities().size());
-
-        dca.addAttributeValue("memberOf","CN=Admin,CN=Users,DC=mydomain,DC=eu");
-
-        result = provider.authenticate(joe);
-
-        assertEquals(1, result.getAuthorities().size());
-    }
-
-    static class MockNamingEnumeration implements NamingEnumeration<SearchResult> {
-        private SearchResult sr;
-
-        public MockNamingEnumeration(SearchResult sr) {
-            this.sr = sr;
-        }
-
-        public SearchResult next() {
-            SearchResult result = sr;
-            sr = null;
-            return result;
-        }
-
-        public boolean hasMore() {
-            return sr != null;
-        }
-
-        public void close() {
-        }
-
-        public boolean hasMoreElements() {
-            return hasMore();
-        }
-
-        public SearchResult nextElement() {
-            return next();
-        }
-    }
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	ActiveDirectoryLdapAuthenticationProvider provider;
+	UsernamePasswordAuthenticationToken joe = new UsernamePasswordAuthenticationToken(
+			"joe", "password");
+
+	@Before
+	public void setUp() throws Exception {
+		provider = new ActiveDirectoryLdapAuthenticationProvider("mydomain.eu",
+				"ldap://192.168.1.200/");
+	}
+
+	@Test
+	public void bindPrincipalIsCreatedCorrectly() throws Exception {
+		assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe"));
+		assertEquals("joe@mydomain.eu", provider.createBindPrincipal("joe@mydomain.eu"));
+	}
+
+	@Test
+	public void successfulAuthenticationProducesExpectedAuthorities() throws Exception {
+		checkAuthentication("dc=mydomain,dc=eu", provider);
+	}
+
+	// SEC-1915
+	@Test
+	public void customSearchFilterIsUsedForSuccessfulAuthentication() throws Exception {
+		// given
+		String customSearchFilter = "(&(objectClass=user)(sAMAccountName={0}))";
+
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+
+		DirContextAdapter dca = new DirContextAdapter();
+		SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca,
+				dca.getAttributes());
+		when(
+				ctx.search(any(Name.class), eq(customSearchFilter), any(Object[].class),
+						any(SearchControls.class))).thenReturn(
+				new MockNamingEnumeration(sr));
+
+		ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
+				"mydomain.eu", "ldap://192.168.1.200/");
+		customProvider.contextFactory = createContextFactoryReturning(ctx);
+
+		// when
+		customProvider.setSearchFilter(customSearchFilter);
+		Authentication result = customProvider.authenticate(joe);
+
+		// then
+		assertTrue(result.isAuthenticated());
+	}
+
+	@Test
+	public void defaultSearchFilter() throws Exception {
+		// given
+		final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
+
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+
+		DirContextAdapter dca = new DirContextAdapter();
+		SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca,
+				dca.getAttributes());
+		when(
+				ctx.search(any(Name.class), eq(defaultSearchFilter), any(Object[].class),
+						any(SearchControls.class))).thenReturn(
+				new MockNamingEnumeration(sr));
+
+		ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
+				"mydomain.eu", "ldap://192.168.1.200/");
+		customProvider.contextFactory = createContextFactoryReturning(ctx);
+
+		// when
+		Authentication result = customProvider.authenticate(joe);
+
+		// then
+		assertTrue(result.isAuthenticated());
+		verify(ctx).search(any(DistinguishedName.class), eq(defaultSearchFilter),
+				any(Object[].class), any(SearchControls.class));
+	}
+
+	// SEC-2897
+	@Test
+	public void bindPrincipalUsed() throws Exception {
+		// given
+		final String defaultSearchFilter = "(&(objectClass=user)(userPrincipalName={0}))";
+		ArgumentCaptor<Object[]> captor = ArgumentCaptor.forClass(Object[].class);
+
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+
+		DirContextAdapter dca = new DirContextAdapter();
+		SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca,
+				dca.getAttributes());
+		when(
+				ctx.search(any(Name.class), eq(defaultSearchFilter), captor.capture(),
+						any(SearchControls.class))).thenReturn(
+				new MockNamingEnumeration(sr));
+
+		ActiveDirectoryLdapAuthenticationProvider customProvider = new ActiveDirectoryLdapAuthenticationProvider(
+				"mydomain.eu", "ldap://192.168.1.200/");
+		customProvider.contextFactory = createContextFactoryReturning(ctx);
+
+		// when
+		Authentication result = customProvider.authenticate(joe);
+
+		// then
+		assertThat(captor.getValue()).containsOnly("joe@mydomain.eu");
+		assertTrue(result.isAuthenticated());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void setSearchFilterNull() {
+		provider.setSearchFilter(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void setSearchFilterEmpty() {
+		provider.setSearchFilter(" ");
+	}
+
+	@Test
+	public void nullDomainIsSupportedIfAuthenticatingWithFullUserPrincipal()
+			throws Exception {
+		provider = new ActiveDirectoryLdapAuthenticationProvider(null,
+				"ldap://192.168.1.200/");
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+
+		DirContextAdapter dca = new DirContextAdapter();
+		SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca,
+				dca.getAttributes());
+		when(
+				ctx.search(eq(new DistinguishedName("DC=mydomain,DC=eu")),
+						any(String.class), any(Object[].class), any(SearchControls.class)))
+				.thenReturn(new MockNamingEnumeration(sr));
+		provider.contextFactory = createContextFactoryReturning(ctx);
+
+		try {
+			provider.authenticate(joe);
+			fail("Expected BadCredentialsException for user with no domain information");
+		}
+		catch (BadCredentialsException expected) {
+		}
+
+		provider.authenticate(new UsernamePasswordAuthenticationToken("joe@mydomain.eu",
+				"password"));
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void failedUserSearchCausesBadCredentials() throws Exception {
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+		when(
+				ctx.search(any(Name.class), any(String.class), any(Object[].class),
+						any(SearchControls.class)))
+				.thenThrow(new NameNotFoundException());
+
+		provider.contextFactory = createContextFactoryReturning(ctx);
+
+		provider.authenticate(joe);
+	}
+
+	// SEC-2017
+	@Test(expected = BadCredentialsException.class)
+	public void noUserSearchCausesUsernameNotFound() throws Exception {
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+		when(
+				ctx.search(any(Name.class), any(String.class), any(Object[].class),
+						any(SearchControls.class))).thenReturn(
+				new EmptyEnumeration<SearchResult>());
+
+		provider.contextFactory = createContextFactoryReturning(ctx);
+
+		provider.authenticate(joe);
+	}
+
+	// SEC-2500
+	@Test(expected = BadCredentialsException.class)
+	public void sec2500PreventAnonymousBind() {
+		provider.authenticate(new UsernamePasswordAuthenticationToken("rwinch", ""));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Test(expected = IncorrectResultSizeDataAccessException.class)
+	public void duplicateUserSearchCausesError() throws Exception {
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+		NamingEnumeration<SearchResult> searchResults = mock(NamingEnumeration.class);
+		when(searchResults.hasMore()).thenReturn(true, true, false);
+		SearchResult searchResult = mock(SearchResult.class);
+		when(searchResult.getObject()).thenReturn(new DirContextAdapter("ou=1"),
+				new DirContextAdapter("ou=2"));
+		when(searchResults.next()).thenReturn(searchResult);
+		when(
+				ctx.search(any(Name.class), any(String.class), any(Object[].class),
+						any(SearchControls.class))).thenReturn(searchResults);
+
+		provider.contextFactory = createContextFactoryReturning(ctx);
+
+		provider.authenticate(joe);
+	}
+
+	static final String msg = "[LDAP: error code 49 - 80858585: LdapErr: DSID-DECAFF0, comment: AcceptSecurityContext error, data ";
+
+	@Test(expected = BadCredentialsException.class)
+	public void userNotFoundIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "525, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void incorrectPasswordIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "52e, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void notPermittedIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "530, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test
+	public void passwordNeedsResetIsCorrectlyMapped() {
+		final String dataCode = "773";
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + dataCode + ", xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+
+		thrown.expect(BadCredentialsException.class);
+		thrown.expect(new BaseMatcher<BadCredentialsException>() {
+			private Matcher<Object> causeInstance = CoreMatchers
+					.instanceOf(ActiveDirectoryAuthenticationException.class);
+			private Matcher<String> causeDataCode = CoreMatchers.equalTo(dataCode);
+
+			public boolean matches(Object that) {
+				Throwable t = (Throwable) that;
+				ActiveDirectoryAuthenticationException cause = (ActiveDirectoryAuthenticationException) t
+						.getCause();
+				return causeInstance.matches(cause)
+						&& causeDataCode.matches(cause.getDataCode());
+			}
+
+			public void describeTo(Description desc) {
+				desc.appendText("getCause() ");
+				causeInstance.describeTo(desc);
+				desc.appendText("getCause().getDataCode() ");
+				causeDataCode.describeTo(desc);
+			}
+		});
+
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = CredentialsExpiredException.class)
+	public void expiredPasswordIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "532, xxxx]"));
+
+		try {
+			provider.authenticate(joe);
+			fail();
+		}
+		catch (BadCredentialsException expected) {
+		}
+
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = DisabledException.class)
+	public void accountDisabledIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "533, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = AccountExpiredException.class)
+	public void accountExpiredIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "701, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = LockedException.class)
+	public void accountLockedIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "775, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void unknownErrorCodeIsCorrectlyMapped() {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg + "999, xxxx]"));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = BadCredentialsException.class)
+	public void errorWithNoSubcodeIsHandledCleanly() throws Exception {
+		provider.contextFactory = createContextFactoryThrowing(new AuthenticationException(
+				msg));
+		provider.setConvertSubErrorCodesToExceptions(true);
+		provider.authenticate(joe);
+	}
+
+	@Test(expected = org.springframework.ldap.CommunicationException.class)
+	public void nonAuthenticationExceptionIsConvertedToSpringLdapException()
+			throws Exception {
+		provider.contextFactory = createContextFactoryThrowing(new CommunicationException(
+				msg));
+		provider.authenticate(joe);
+	}
+
+	@Test
+	public void rootDnProvidedSeparatelyFromDomainAlsoWorks() throws Exception {
+		ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider(
+				"mydomain.eu", "ldap://192.168.1.200/", "dc=ad,dc=eu,dc=mydomain");
+		checkAuthentication("dc=ad,dc=eu,dc=mydomain", provider);
+
+	}
+
+	ContextFactory createContextFactoryThrowing(final NamingException e) {
+		return new ContextFactory() {
+			@Override
+			DirContext createContext(Hashtable<?, ?> env) throws NamingException {
+				throw e;
+			}
+		};
+	}
+
+	ContextFactory createContextFactoryReturning(final DirContext ctx) {
+		return new ContextFactory() {
+			@Override
+			DirContext createContext(Hashtable<?, ?> env) throws NamingException {
+				return ctx;
+			}
+		};
+	}
+
+	private void checkAuthentication(String rootDn,
+			ActiveDirectoryLdapAuthenticationProvider provider) throws NamingException {
+		DirContext ctx = mock(DirContext.class);
+		when(ctx.getNameInNamespace()).thenReturn("");
+
+		DirContextAdapter dca = new DirContextAdapter();
+		SearchResult sr = new SearchResult("CN=Joe Jannsen,CN=Users", dca,
+				dca.getAttributes());
+		@SuppressWarnings("deprecation")
+		DistinguishedName searchBaseDn = new DistinguishedName(rootDn);
+		when(
+				ctx.search(eq(searchBaseDn), any(String.class), any(Object[].class),
+						any(SearchControls.class))).thenReturn(
+				new MockNamingEnumeration(sr)).thenReturn(new MockNamingEnumeration(sr));
+
+		provider.contextFactory = createContextFactoryReturning(ctx);
+
+		Authentication result = provider.authenticate(joe);
+
+		assertEquals(0, result.getAuthorities().size());
+
+		dca.addAttributeValue("memberOf", "CN=Admin,CN=Users,DC=mydomain,DC=eu");
+
+		result = provider.authenticate(joe);
+
+		assertEquals(1, result.getAuthorities().size());
+	}
+
+	static class MockNamingEnumeration implements NamingEnumeration<SearchResult> {
+		private SearchResult sr;
+
+		public MockNamingEnumeration(SearchResult sr) {
+			this.sr = sr;
+		}
+
+		public SearchResult next() {
+			SearchResult result = sr;
+			sr = null;
+			return result;
+		}
+
+		public boolean hasMore() {
+			return sr != null;
+		}
+
+		public void close() {
+		}
+
+		public boolean hasMoreElements() {
+			return hasMore();
+		}
+
+		public SearchResult nextElement() {
+			return next();
+		}
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/OpenLDAPIntegrationTestSuite.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/OpenLDAPIntegrationTestSuite.java
index 38a81bd5ad..521ed1b285 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/OpenLDAPIntegrationTestSuite.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/OpenLDAPIntegrationTestSuite.java
@@ -15,52 +15,44 @@ import org.springframework.security.ldap.userdetails.LdapUserDetailsImpl;
 /**
  * Test cases which run against an OpenLDAP server.
  * <p>
- * Run the script in the module root to start the server and import the data before running.
+ * Run the script in the module root to start the server and import the data before
+ * running.
  * @author Luke Taylor
  * @since 3.0
  */
 public class OpenLDAPIntegrationTestSuite {
-    PasswordPolicyAwareContextSource cs;
-/*
-    @Before
-    public void createContextSource() throws Exception {
-        cs = new PasswordPolicyAwareContextSource("ldap://localhost:22389/dc=springsource,dc=com");
-        cs.setUserDn("cn=admin,dc=springsource,dc=com");
-        cs.setPassword("password");
-        cs.afterPropertiesSet();
-    }
-
-    @Test
-    public void simpleBindSucceeds() throws Exception {
-        BindAuthenticator authenticator = new BindAuthenticator(cs);
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=users"});
-        LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-        provider.authenticate(new UsernamePasswordAuthenticationToken("luke","password"));
-    }
-
-    @Test(expected=LockedException.class)
-    public void repeatedBindWithWrongPasswordLocksAccount() throws Exception {
-        BindAuthenticator authenticator = new BindAuthenticator(cs);
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=users"});
-        LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-        for (int count=1; count < 4; count++) {
-            try {
-                Authentication a = provider.authenticate(new UsernamePasswordAuthenticationToken("lockme","wrong"));
-                LdapUserDetailsImpl ud = (LdapUserDetailsImpl) a.getPrincipal();
-                assertTrue(ud.getTimeBeforeExpiration() < Integer.MAX_VALUE && ud.getTimeBeforeExpiration() > 0);
-            } catch (BadCredentialsException expected) {
-            }
-        }
-    }
-
-    @Test
-    public void passwordExpiryTimeIsDetectedCorrectly() throws Exception {
-        BindAuthenticator authenticator = new BindAuthenticator(cs);
-        authenticator.setUserDnPatterns(new String[] {"uid={0},ou=users"});
-        LdapAuthenticationProvider provider = new LdapAuthenticationProvider(authenticator);
-        Authentication a = provider.authenticate(new UsernamePasswordAuthenticationToken("expireme","password"));
-        PasswordPolicyData ud = (LdapUserDetailsImpl) a.getPrincipal();
-        assertTrue(ud.getTimeBeforeExpiration() < Integer.MAX_VALUE && ud.getTimeBeforeExpiration() > 0);
-    }
-*/
+	PasswordPolicyAwareContextSource cs;
+	/*
+	 * @Before public void createContextSource() throws Exception { cs = new
+	 * PasswordPolicyAwareContextSource("ldap://localhost:22389/dc=springsource,dc=com");
+	 * cs.setUserDn("cn=admin,dc=springsource,dc=com"); cs.setPassword("password");
+	 * cs.afterPropertiesSet(); }
+	 * 
+	 * @Test public void simpleBindSucceeds() throws Exception { BindAuthenticator
+	 * authenticator = new BindAuthenticator(cs); authenticator.setUserDnPatterns(new
+	 * String[] {"uid={0},ou=users"}); LdapAuthenticationProvider provider = new
+	 * LdapAuthenticationProvider(authenticator); provider.authenticate(new
+	 * UsernamePasswordAuthenticationToken("luke","password")); }
+	 * 
+	 * @Test(expected=LockedException.class) public void
+	 * repeatedBindWithWrongPasswordLocksAccount() throws Exception { BindAuthenticator
+	 * authenticator = new BindAuthenticator(cs); authenticator.setUserDnPatterns(new
+	 * String[] {"uid={0},ou=users"}); LdapAuthenticationProvider provider = new
+	 * LdapAuthenticationProvider(authenticator); for (int count=1; count < 4; count++) {
+	 * try { Authentication a = provider.authenticate(new
+	 * UsernamePasswordAuthenticationToken("lockme","wrong")); LdapUserDetailsImpl ud =
+	 * (LdapUserDetailsImpl) a.getPrincipal(); assertTrue(ud.getTimeBeforeExpiration() <
+	 * Integer.MAX_VALUE && ud.getTimeBeforeExpiration() > 0); } catch
+	 * (BadCredentialsException expected) { } } }
+	 * 
+	 * @Test public void passwordExpiryTimeIsDetectedCorrectly() throws Exception {
+	 * BindAuthenticator authenticator = new BindAuthenticator(cs);
+	 * authenticator.setUserDnPatterns(new String[] {"uid={0},ou=users"});
+	 * LdapAuthenticationProvider provider = new
+	 * LdapAuthenticationProvider(authenticator); Authentication a =
+	 * provider.authenticate(new
+	 * UsernamePasswordAuthenticationToken("expireme","password")); PasswordPolicyData ud
+	 * = (LdapUserDetailsImpl) a.getPrincipal(); assertTrue(ud.getTimeBeforeExpiration() <
+	 * Integer.MAX_VALUE && ud.getTimeBeforeExpiration() > 0); }
+	 */
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java
index 386e34f46e..59cf07358a 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyAwareContextSourceTests.java
@@ -17,46 +17,53 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class PasswordPolicyAwareContextSourceTests {
-    private PasswordPolicyAwareContextSource ctxSource;
-    private final LdapContext ctx = mock(LdapContext.class);
+	private PasswordPolicyAwareContextSource ctxSource;
+	private final LdapContext ctx = mock(LdapContext.class);
 
-    @Before
-    public void setUp() throws Exception {
-        reset(ctx);
-        ctxSource = new PasswordPolicyAwareContextSource("ldap://blah:789/dc=springframework,dc=org") {
-            @Override
-            protected DirContext createContext(Hashtable env) {
-                if ("manager".equals(env.get(Context.SECURITY_PRINCIPAL))) {
-                    return ctx;
-                }
+	@Before
+	public void setUp() throws Exception {
+		reset(ctx);
+		ctxSource = new PasswordPolicyAwareContextSource(
+				"ldap://blah:789/dc=springframework,dc=org") {
+			@Override
+			protected DirContext createContext(Hashtable env) {
+				if ("manager".equals(env.get(Context.SECURITY_PRINCIPAL))) {
+					return ctx;
+				}
 
-                return null;
-            }
-        };
-        ctxSource.setUserDn("manager");
-        ctxSource.setPassword("password");
-        ctxSource.afterPropertiesSet();
-    }
+				return null;
+			}
+		};
+		ctxSource.setUserDn("manager");
+		ctxSource.setPassword("password");
+		ctxSource.afterPropertiesSet();
+	}
 
-    @Test
-    public void contextIsReturnedWhenNoControlsAreSetAndReconnectIsSuccessful() throws Exception {
-        assertNotNull(ctxSource.getContext("user", "ignored"));
-    }
+	@Test
+	public void contextIsReturnedWhenNoControlsAreSetAndReconnectIsSuccessful()
+			throws Exception {
+		assertNotNull(ctxSource.getContext("user", "ignored"));
+	}
 
-    @Test(expected=UncategorizedLdapException.class)
-    public void standardExceptionIsPropagatedWhenExceptionRaisedAndNoControlsAreSet() throws Exception {
-        doThrow(new NamingException("some LDAP exception")).when(ctx).reconnect(any(Control[].class));
+	@Test(expected = UncategorizedLdapException.class)
+	public void standardExceptionIsPropagatedWhenExceptionRaisedAndNoControlsAreSet()
+			throws Exception {
+		doThrow(new NamingException("some LDAP exception")).when(ctx).reconnect(
+				any(Control[].class));
 
-        ctxSource.getContext("user", "ignored");
-    }
+		ctxSource.getContext("user", "ignored");
+	}
 
-    @Test(expected=PasswordPolicyException.class)
-    public void lockedPasswordPolicyControlRaisesPasswordPolicyException() throws Exception {
-        when(ctx.getResponseControls()).thenReturn(new Control[] {
-                new PasswordPolicyResponseControl(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL) });
+	@Test(expected = PasswordPolicyException.class)
+	public void lockedPasswordPolicyControlRaisesPasswordPolicyException()
+			throws Exception {
+		when(ctx.getResponseControls()).thenReturn(
+				new Control[] { new PasswordPolicyResponseControl(
+						PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL) });
 
-        doThrow(new NamingException("locked message")).when(ctx).reconnect(any(Control[].class));
+		doThrow(new NamingException("locked message")).when(ctx).reconnect(
+				any(Control[].class));
 
-        ctxSource.getContext("user", "ignored");
-    }
+		ctxSource.getContext("user", "ignored");
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java
index cdbb8ab4cc..258cbdb63f 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyControlFactoryTests.java
@@ -13,24 +13,26 @@ import java.util.*;
  */
 public class PasswordPolicyControlFactoryTests {
 
-    @Test
-    public void returnsNullForUnrecognisedOID() throws Exception {
-        PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
-        Control wrongCtrl = mock(Control.class);
+	@Test
+	public void returnsNullForUnrecognisedOID() throws Exception {
+		PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
+		Control wrongCtrl = mock(Control.class);
 
-        when(wrongCtrl.getID()).thenReturn("wrongId");
-        assertNull(ctrlFactory.getControlInstance(wrongCtrl));
-    }
+		when(wrongCtrl.getID()).thenReturn("wrongId");
+		assertNull(ctrlFactory.getControlInstance(wrongCtrl));
+	}
 
-    @Test
-    public void returnsControlForCorrectOID() throws Exception {
-        PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
-        Control control = mock(Control.class);
+	@Test
+	public void returnsControlForCorrectOID() throws Exception {
+		PasswordPolicyControlFactory ctrlFactory = new PasswordPolicyControlFactory();
+		Control control = mock(Control.class);
 
-        when(control.getID()).thenReturn(PasswordPolicyControl.OID);
-        when(control.getEncodedValue()).thenReturn(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL);
-        Control result = ctrlFactory.getControlInstance(control);
-        assertNotNull(result);
-        assertTrue(Arrays.equals(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL, result.getEncodedValue()));
-    }
+		when(control.getID()).thenReturn(PasswordPolicyControl.OID);
+		when(control.getEncodedValue()).thenReturn(
+				PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL);
+		Control result = ctrlFactory.getControlInstance(control);
+		assertNotNull(result);
+		assertTrue(Arrays.equals(PasswordPolicyResponseControlTests.OPENLDAP_LOCKED_CTRL,
+				result.getEncodedValue()));
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
index a37c017895..065c60953a 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/ppolicy/PasswordPolicyResponseControlTests.java
@@ -28,106 +28,113 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class PasswordPolicyResponseControlTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Useful method for obtaining data from a server for use in tests
-     */
-//    public void testAgainstServer() throws Exception {
-//        Hashtable env = new Hashtable();
-//        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
-//        env.put(Context.PROVIDER_URL, "ldap://gorille:389/");
-//        env.put(Context.SECURITY_AUTHENTICATION, "simple");
-//        env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=security,dc=org");
-//        env.put(Context.SECURITY_CREDENTIALS, "security");
-//        env.put(LdapContext.CONTROL_FACTORIES, PasswordPolicyControlFactory.class.getName());
-//
-//        InitialLdapContext ctx = new InitialLdapContext(env, null);
-//
-//        Control[] rctls = { new PasswordPolicyControl(false) };
-//
-//        ctx.setRequestControls(rctls);
-//
-//        try {
-//            ctx.addToEnvironment(Context.SECURITY_PRINCIPAL, "uid=bob,ou=people,dc=security,dc=org" );
-//            ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, "bobspassword");
-//            Object o = ctx.lookup("");
-//
-//            System.out.println(o);
-//
-//        } catch(NamingException ne) {
-//            // Ok.
-//            System.err.println(ne);
-//        }
-//
-//        PasswordPolicyResponseControl ctrl = getPPolicyResponseCtl(ctx);
-//        System.out.println(ctrl);
-//
-//        assertNotNull(ctrl);
-//
-//        //com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
-//    }
+	/**
+	 * Useful method for obtaining data from a server for use in tests
+	 */
+	// public void testAgainstServer() throws Exception {
+	// Hashtable env = new Hashtable();
+	// env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+	// env.put(Context.PROVIDER_URL, "ldap://gorille:389/");
+	// env.put(Context.SECURITY_AUTHENTICATION, "simple");
+	// env.put(Context.SECURITY_PRINCIPAL, "cn=manager,dc=security,dc=org");
+	// env.put(Context.SECURITY_CREDENTIALS, "security");
+	// env.put(LdapContext.CONTROL_FACTORIES,
+	// PasswordPolicyControlFactory.class.getName());
+	//
+	// InitialLdapContext ctx = new InitialLdapContext(env, null);
+	//
+	// Control[] rctls = { new PasswordPolicyControl(false) };
+	//
+	// ctx.setRequestControls(rctls);
+	//
+	// try {
+	// ctx.addToEnvironment(Context.SECURITY_PRINCIPAL,
+	// "uid=bob,ou=people,dc=security,dc=org" );
+	// ctx.addToEnvironment(Context.SECURITY_CREDENTIALS, "bobspassword");
+	// Object o = ctx.lookup("");
+	//
+	// System.out.println(o);
+	//
+	// } catch(NamingException ne) {
+	// // Ok.
+	// System.err.println(ne);
+	// }
+	//
+	// PasswordPolicyResponseControl ctrl = getPPolicyResponseCtl(ctx);
+	// System.out.println(ctrl);
+	//
+	// assertNotNull(ctrl);
+	//
+	// //com.sun.jndi.ldap.LdapPoolManager.showStats(System.out);
+	// }
 
+	// private PasswordPolicyResponseControl getPPolicyResponseCtl(InitialLdapContext ctx)
+	// throws NamingException {
+	// Control[] ctrls = ctx.getResponseControls();
+	//
+	// for (int i = 0; ctrls != null && i < ctrls.length; i++) {
+	// if (ctrls[i] instanceof PasswordPolicyResponseControl) {
+	// return (PasswordPolicyResponseControl) ctrls[i];
+	// }
+	// }
+	//
+	// return null;
+	// }
 
-//    private PasswordPolicyResponseControl getPPolicyResponseCtl(InitialLdapContext ctx) throws NamingException {
-//        Control[] ctrls = ctx.getResponseControls();
-//
-//        for (int i = 0; ctrls != null && i < ctrls.length; i++) {
-//            if (ctrls[i] instanceof PasswordPolicyResponseControl) {
-//                return (PasswordPolicyResponseControl) ctrls[i];
-//            }
-//        }
-//
-//        return null;
-//    }
+	@Test
+	public void openLDAP33SecondsTillPasswordExpiryCtrlIsParsedCorrectly() {
+		byte[] ctrlBytes = { 0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA0, 0x1, 0x21 };
 
-    @Test
-    public void openLDAP33SecondsTillPasswordExpiryCtrlIsParsedCorrectly() {
-        byte[] ctrlBytes = {0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA0, 0x1, 0x21};
+		PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
 
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
+		assertTrue(ctrl.hasWarning());
+		assertEquals(33, ctrl.getTimeBeforeExpiration());
+	}
 
-        assertTrue(ctrl.hasWarning());
-        assertEquals(33, ctrl.getTimeBeforeExpiration());
-    }
+	@Test
+	public void openLDAP496GraceLoginsRemainingCtrlIsParsedCorrectly() {
+		byte[] ctrlBytes = { 0x30, 0x06, (byte) 0xA0, 0x04, (byte) 0xA1, 0x02, 0x01,
+				(byte) 0xF0 };
 
-    @Test
-    public void openLDAP496GraceLoginsRemainingCtrlIsParsedCorrectly() {
-        byte[] ctrlBytes = {0x30, 0x06, (byte) 0xA0, 0x04, (byte) 0xA1, 0x02, 0x01, (byte) 0xF0};
+		PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
 
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
+		assertTrue(ctrl.hasWarning());
+		assertEquals(496, ctrl.getGraceLoginsRemaining());
+	}
 
-        assertTrue(ctrl.hasWarning());
-        assertEquals(496, ctrl.getGraceLoginsRemaining());
-    }
+	static final byte[] OPENLDAP_5_LOGINS_REMAINING_CTRL = { 0x30, 0x05, (byte) 0xA0,
+			0x03, (byte) 0xA1, 0x01, 0x05 };
 
-    static final byte[] OPENLDAP_5_LOGINS_REMAINING_CTRL = {0x30, 0x05, (byte) 0xA0, 0x03, (byte) 0xA1, 0x01, 0x05};
+	@Test
+	public void openLDAP5GraceLoginsRemainingCtrlIsParsedCorrectly() {
+		PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(
+				OPENLDAP_5_LOGINS_REMAINING_CTRL);
 
-    @Test
-    public void openLDAP5GraceLoginsRemainingCtrlIsParsedCorrectly() {
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(OPENLDAP_5_LOGINS_REMAINING_CTRL);
+		assertTrue(ctrl.hasWarning());
+		assertEquals(5, ctrl.getGraceLoginsRemaining());
+	}
 
-        assertTrue(ctrl.hasWarning());
-        assertEquals(5, ctrl.getGraceLoginsRemaining());
-    }
+	static final byte[] OPENLDAP_LOCKED_CTRL = { 0x30, 0x03, (byte) 0xA1, 0x01, 0x01 };
 
-    static final byte[] OPENLDAP_LOCKED_CTRL = {0x30, 0x03, (byte) 0xA1, 0x01, 0x01};
+	@Test
+	public void openLDAPAccountLockedCtrlIsParsedCorrectly() {
+		PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(
+				OPENLDAP_LOCKED_CTRL);
 
-    @Test
-    public void openLDAPAccountLockedCtrlIsParsedCorrectly() {
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(OPENLDAP_LOCKED_CTRL);
+		assertTrue(ctrl.hasError() && ctrl.isLocked());
+		assertFalse(ctrl.hasWarning());
+	}
 
-        assertTrue(ctrl.hasError() && ctrl.isLocked());
-        assertFalse(ctrl.hasWarning());
-    }
+	@Test
+	public void openLDAPPasswordExpiredCtrlIsParsedCorrectly() {
+		byte[] ctrlBytes = { 0x30, 0x03, (byte) 0xA1, 0x01, 0x00 };
 
-    @Test
-    public void openLDAPPasswordExpiredCtrlIsParsedCorrectly() {
-        byte[] ctrlBytes = {0x30, 0x03, (byte) 0xA1, 0x01, 0x00};
+		PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
 
-        PasswordPolicyResponseControl ctrl = new PasswordPolicyResponseControl(ctrlBytes);
-
-        assertTrue(ctrl.hasError() && ctrl.isExpired());
-        assertFalse(ctrl.hasWarning());
-    }
+		assertTrue(ctrl.hasError() && ctrl.isExpired());
+		assertFalse(ctrl.hasWarning());
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java
index 4c48ff0c17..ccc2c78f34 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java
@@ -14,122 +14,127 @@ import org.springframework.ldap.core.DistinguishedName;
  */
 public class InetOrgPersonTests {
 
-    @Test
-    public void testUsernameIsMappedFromContextUidIfNotSet() {
-        InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
-        InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
+	@Test
+	public void testUsernameIsMappedFromContextUidIfNotSet() {
+		InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
+		InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
 
-        assertEquals("ghengis", p.getUsername());
-    }
+		assertEquals("ghengis", p.getUsername());
+	}
 
-    @Test
-    public void hashLookupViaEqualObjectRetrievesOriginal() throws Exception {
-        InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
-        InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
-        essence = new InetOrgPerson.Essence(createUserContext());
-        InetOrgPerson p2 = (InetOrgPerson) essence.createUserDetails();
-        Set<InetOrgPerson> set =  new HashSet<InetOrgPerson>();
-        set.add(p);
-        assertTrue(set.contains(p2));
-    }
+	@Test
+	public void hashLookupViaEqualObjectRetrievesOriginal() throws Exception {
+		InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
+		InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
+		essence = new InetOrgPerson.Essence(createUserContext());
+		InetOrgPerson p2 = (InetOrgPerson) essence.createUserDetails();
+		Set<InetOrgPerson> set = new HashSet<InetOrgPerson>();
+		set.add(p);
+		assertTrue(set.contains(p2));
+	}
 
-    @Test
-    public void usernameIsDifferentFromContextUidIfSet() {
-        InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
-        essence.setUsername("joe");
-        InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
+	@Test
+	public void usernameIsDifferentFromContextUidIfSet() {
+		InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
+		essence.setUsername("joe");
+		InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
 
-        assertEquals("joe", p.getUsername());
-        assertEquals("ghengis", p.getUid());
-    }
+		assertEquals("joe", p.getUsername());
+		assertEquals("ghengis", p.getUid());
+	}
 
-    @Test
-    public void attributesMapCorrectlyFromContext() {
-        InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
-        InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
+	@Test
+	public void attributesMapCorrectlyFromContext() {
+		InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
+		InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
 
-        assertEquals("HORS1", p.getCarLicense());
-        assertEquals("ghengis@mongolia", p.getMail());
-        assertEquals("Ghengis", p.getGivenName());
-        assertEquals("Khan", p.getSn());
-        assertEquals("Ghengis Khan", p.getCn()[0]);
-        assertEquals("00001", p.getEmployeeNumber());
-        assertEquals("+442075436521", p.getTelephoneNumber());
-        assertEquals("Steppes", p.getHomePostalAddress());
-        assertEquals("+467575436521", p.getHomePhone());
-        assertEquals("Hordes", p.getO());
-        assertEquals("Horde1", p.getOu());
-        assertEquals("On the Move", p.getPostalAddress());
-        assertEquals("Changes Frequently", p.getPostalCode());
-        assertEquals("Yurt 1", p.getRoomNumber());
-        assertEquals("Westward Avenue", p.getStreet());
-        assertEquals("Scary", p.getDescription());
-        assertEquals("Ghengis McCann", p.getDisplayName());
-        assertEquals("G", p.getInitials());
-    }
+		assertEquals("HORS1", p.getCarLicense());
+		assertEquals("ghengis@mongolia", p.getMail());
+		assertEquals("Ghengis", p.getGivenName());
+		assertEquals("Khan", p.getSn());
+		assertEquals("Ghengis Khan", p.getCn()[0]);
+		assertEquals("00001", p.getEmployeeNumber());
+		assertEquals("+442075436521", p.getTelephoneNumber());
+		assertEquals("Steppes", p.getHomePostalAddress());
+		assertEquals("+467575436521", p.getHomePhone());
+		assertEquals("Hordes", p.getO());
+		assertEquals("Horde1", p.getOu());
+		assertEquals("On the Move", p.getPostalAddress());
+		assertEquals("Changes Frequently", p.getPostalCode());
+		assertEquals("Yurt 1", p.getRoomNumber());
+		assertEquals("Westward Avenue", p.getStreet());
+		assertEquals("Scary", p.getDescription());
+		assertEquals("Ghengis McCann", p.getDisplayName());
+		assertEquals("G", p.getInitials());
+	}
 
-    @Test
-    public void testPasswordIsSetFromContextUserPassword() {
-        InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
-        InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
+	@Test
+	public void testPasswordIsSetFromContextUserPassword() {
+		InetOrgPerson.Essence essence = new InetOrgPerson.Essence(createUserContext());
+		InetOrgPerson p = (InetOrgPerson) essence.createUserDetails();
 
-        assertEquals("pillage", p.getPassword());
-    }
+		assertEquals("pillage", p.getPassword());
+	}
 
-    @Test
-    public void mappingBackToContextMatchesOriginalData() {
-        DirContextAdapter ctx1 = createUserContext();
-        DirContextAdapter ctx2 = new DirContextAdapter();
-        ctx1.setAttributeValues("objectclass", new String[] {"top", "person", "organizationalPerson", "inetOrgPerson"});
-        ctx2.setDn(new DistinguishedName("ignored=ignored"));
-        InetOrgPerson p = (InetOrgPerson) (new InetOrgPerson.Essence(ctx1)).createUserDetails();
-        p.populateContext(ctx2);
+	@Test
+	public void mappingBackToContextMatchesOriginalData() {
+		DirContextAdapter ctx1 = createUserContext();
+		DirContextAdapter ctx2 = new DirContextAdapter();
+		ctx1.setAttributeValues("objectclass", new String[] { "top", "person",
+				"organizationalPerson", "inetOrgPerson" });
+		ctx2.setDn(new DistinguishedName("ignored=ignored"));
+		InetOrgPerson p = (InetOrgPerson) (new InetOrgPerson.Essence(ctx1))
+				.createUserDetails();
+		p.populateContext(ctx2);
 
-        assertEquals(ctx1, ctx2);
-    }
+		assertEquals(ctx1, ctx2);
+	}
 
-    @Test
-    public void copyMatchesOriginalData() {
-        DirContextAdapter ctx1 = createUserContext();
-        DirContextAdapter ctx2 = new DirContextAdapter();
-        ctx2.setDn(new DistinguishedName("ignored=ignored"));
-        ctx1.setAttributeValues("objectclass", new String[] {"top", "person", "organizationalPerson", "inetOrgPerson"});
-        InetOrgPerson p = (InetOrgPerson) (new InetOrgPerson.Essence(ctx1)).createUserDetails();
-        InetOrgPerson p2 = (InetOrgPerson) new InetOrgPerson.Essence(p).createUserDetails();
-        p2.populateContext(ctx2);
+	@Test
+	public void copyMatchesOriginalData() {
+		DirContextAdapter ctx1 = createUserContext();
+		DirContextAdapter ctx2 = new DirContextAdapter();
+		ctx2.setDn(new DistinguishedName("ignored=ignored"));
+		ctx1.setAttributeValues("objectclass", new String[] { "top", "person",
+				"organizationalPerson", "inetOrgPerson" });
+		InetOrgPerson p = (InetOrgPerson) (new InetOrgPerson.Essence(ctx1))
+				.createUserDetails();
+		InetOrgPerson p2 = (InetOrgPerson) new InetOrgPerson.Essence(p)
+				.createUserDetails();
+		p2.populateContext(ctx2);
 
-        assertEquals(ctx1, ctx2);
-    }
+		assertEquals(ctx1, ctx2);
+	}
 
-    private DirContextAdapter createUserContext() {
-        DirContextAdapter ctx = new DirContextAdapter();
+	private DirContextAdapter createUserContext() {
+		DirContextAdapter ctx = new DirContextAdapter();
 
-        ctx.setDn(new DistinguishedName("ignored=ignored"));
-        ctx.setAttributeValue("uid", "ghengis");
-        ctx.setAttributeValue("userPassword", "pillage");
-        ctx.setAttributeValue("carLicense", "HORS1");
-        ctx.setAttributeValue("cn", "Ghengis Khan");
-        ctx.setAttributeValue("description", "Scary");
-        ctx.setAttributeValue("destinationIndicator", "West");
-        ctx.setAttributeValue("displayName", "Ghengis McCann");
-        ctx.setAttributeValue("givenName", "Ghengis");
-        ctx.setAttributeValue("homePhone", "+467575436521");
-        ctx.setAttributeValue("initials", "G");
-        ctx.setAttributeValue("employeeNumber", "00001");
-        ctx.setAttributeValue("homePostalAddress", "Steppes");
-        ctx.setAttributeValue("mail", "ghengis@mongolia");
-        ctx.setAttributeValue("mobile", "always");
-        ctx.setAttributeValue("o", "Hordes");
-        ctx.setAttributeValue("ou", "Horde1");
-        ctx.setAttributeValue("postalAddress", "On the Move");
-        ctx.setAttributeValue("postalCode", "Changes Frequently");
-        ctx.setAttributeValue("roomNumber", "Yurt 1");
-        ctx.setAttributeValue("roomNumber", "Yurt 1");
-        ctx.setAttributeValue("sn", "Khan");
-        ctx.setAttributeValue("street", "Westward Avenue");
-        ctx.setAttributeValue("telephoneNumber", "+442075436521");
+		ctx.setDn(new DistinguishedName("ignored=ignored"));
+		ctx.setAttributeValue("uid", "ghengis");
+		ctx.setAttributeValue("userPassword", "pillage");
+		ctx.setAttributeValue("carLicense", "HORS1");
+		ctx.setAttributeValue("cn", "Ghengis Khan");
+		ctx.setAttributeValue("description", "Scary");
+		ctx.setAttributeValue("destinationIndicator", "West");
+		ctx.setAttributeValue("displayName", "Ghengis McCann");
+		ctx.setAttributeValue("givenName", "Ghengis");
+		ctx.setAttributeValue("homePhone", "+467575436521");
+		ctx.setAttributeValue("initials", "G");
+		ctx.setAttributeValue("employeeNumber", "00001");
+		ctx.setAttributeValue("homePostalAddress", "Steppes");
+		ctx.setAttributeValue("mail", "ghengis@mongolia");
+		ctx.setAttributeValue("mobile", "always");
+		ctx.setAttributeValue("o", "Hordes");
+		ctx.setAttributeValue("ou", "Horde1");
+		ctx.setAttributeValue("postalAddress", "On the Move");
+		ctx.setAttributeValue("postalCode", "Changes Frequently");
+		ctx.setAttributeValue("roomNumber", "Yurt 1");
+		ctx.setAttributeValue("roomNumber", "Yurt 1");
+		ctx.setAttributeValue("sn", "Khan");
+		ctx.setAttributeValue("street", "Westward Avenue");
+		ctx.setAttributeValue("telephoneNumber", "+442075436521");
 
-        return ctx;
-    }
+		return ctx;
+	}
 
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java
index fe5cb8cb3d..fcabde8a11 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java
@@ -17,38 +17,41 @@ import static org.junit.Assert.assertNotNull;
  */
 public class LdapAuthorityTests {
 
-    public static final String DN = "cn=filip,ou=Users,dc=test,dc=com";
-    LdapAuthority authority;
+	public static final String DN = "cn=filip,ou=Users,dc=test,dc=com";
+	LdapAuthority authority;
 
-    @Before
-    public void setUp() {
-        Map<String, List<String>> attributes = new HashMap<String, List<String>>();
-        attributes.put(SpringSecurityLdapTemplate.DN_KEY, Arrays.asList(DN));
-        attributes.put("mail", Arrays.asList("filip@ldap.test.org", "filip@ldap.test2.org"));
-        authority = new LdapAuthority("testRole", DN, attributes);
-    }
+	@Before
+	public void setUp() {
+		Map<String, List<String>> attributes = new HashMap<String, List<String>>();
+		attributes.put(SpringSecurityLdapTemplate.DN_KEY, Arrays.asList(DN));
+		attributes.put("mail",
+				Arrays.asList("filip@ldap.test.org", "filip@ldap.test2.org"));
+		authority = new LdapAuthority("testRole", DN, attributes);
+	}
 
-    @Test
-    public void testGetDn() throws Exception {
-        assertEquals(DN, authority.getDn());
-        assertNotNull(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY));
-        assertEquals(1, authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY).size());
-        assertEquals(DN, authority.getFirstAttributeValue(SpringSecurityLdapTemplate.DN_KEY));
-    }
+	@Test
+	public void testGetDn() throws Exception {
+		assertEquals(DN, authority.getDn());
+		assertNotNull(authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY));
+		assertEquals(1, authority.getAttributeValues(SpringSecurityLdapTemplate.DN_KEY)
+				.size());
+		assertEquals(DN,
+				authority.getFirstAttributeValue(SpringSecurityLdapTemplate.DN_KEY));
+	}
 
-    @Test
-    public void testGetAttributes() throws Exception {
-        assertNotNull(authority.getAttributes());
-        assertNotNull(authority.getAttributeValues("mail"));
-        assertEquals(2, authority.getAttributeValues("mail").size());
-        assertEquals("filip@ldap.test.org", authority.getFirstAttributeValue("mail"));
-        assertEquals("filip@ldap.test.org", authority.getAttributeValues("mail").get(0));
-        assertEquals("filip@ldap.test2.org", authority.getAttributeValues("mail").get(1));
-    }
+	@Test
+	public void testGetAttributes() throws Exception {
+		assertNotNull(authority.getAttributes());
+		assertNotNull(authority.getAttributeValues("mail"));
+		assertEquals(2, authority.getAttributeValues("mail").size());
+		assertEquals("filip@ldap.test.org", authority.getFirstAttributeValue("mail"));
+		assertEquals("filip@ldap.test.org", authority.getAttributeValues("mail").get(0));
+		assertEquals("filip@ldap.test2.org", authority.getAttributeValues("mail").get(1));
+	}
 
-    @Test
-    public void testGetAuthority() throws Exception {
-        assertNotNull(authority.getAuthority());
-        assertEquals("testRole", authority.getAuthority());
-    }
+	@Test
+	public void testGetAuthority() throws Exception {
+		assertNotNull(authority.getAuthority());
+		assertEquals("testRole", authority.getAuthority());
+	}
 }
\ No newline at end of file
diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java
index 46b44d0346..ba361a4014 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsMapperTests.java
@@ -31,55 +31,61 @@ import org.springframework.security.core.authority.AuthorityUtils;
  */
 public class LdapUserDetailsMapperTests extends TestCase {
 
-    public void testMultipleRoleAttributeValuesAreMappedToAuthorities() throws Exception {
-        LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
-        mapper.setConvertToUpperCase(false);
-        mapper.setRolePrefix("");
+	public void testMultipleRoleAttributeValuesAreMappedToAuthorities() throws Exception {
+		LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
+		mapper.setConvertToUpperCase(false);
+		mapper.setRolePrefix("");
 
-        mapper.setRoleAttributes(new String[] {"userRole"});
+		mapper.setRoleAttributes(new String[] { "userRole" });
 
-        DirContextAdapter ctx = new DirContextAdapter();
+		DirContextAdapter ctx = new DirContextAdapter();
 
-        ctx.setAttributeValues("userRole", new String[] {"X", "Y", "Z"});
-        ctx.setAttributeValue("uid", "ani");
+		ctx.setAttributeValues("userRole", new String[] { "X", "Y", "Z" });
+		ctx.setAttributeValue("uid", "ani");
 
-        LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES);
+		LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx,
+				"ani", AuthorityUtils.NO_AUTHORITIES);
 
-        assertEquals(3, user.getAuthorities().size());
-    }
+		assertEquals(3, user.getAuthorities().size());
+	}
 
-    /**
-     * SEC-303. Non-retrieved role attribute causes NullPointerException
-     */
-    public void testNonRetrievedRoleAttributeIsIgnored() throws Exception {
-        LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
+	/**
+	 * SEC-303. Non-retrieved role attribute causes NullPointerException
+	 */
+	public void testNonRetrievedRoleAttributeIsIgnored() throws Exception {
+		LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
 
-        mapper.setRoleAttributes(new String[] {"userRole", "nonRetrievedAttribute"});
+		mapper.setRoleAttributes(new String[] { "userRole", "nonRetrievedAttribute" });
 
-        BasicAttributes attrs = new BasicAttributes();
-        attrs.put(new BasicAttribute("userRole", "x"));
+		BasicAttributes attrs = new BasicAttributes();
+		attrs.put(new BasicAttribute("userRole", "x"));
 
-        DirContextAdapter ctx = new DirContextAdapter(attrs, new DistinguishedName("cn=someName"));
-        ctx.setAttributeValue("uid", "ani");
+		DirContextAdapter ctx = new DirContextAdapter(attrs, new DistinguishedName(
+				"cn=someName"));
+		ctx.setAttributeValue("uid", "ani");
 
-        LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES);
+		LdapUserDetailsImpl user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx,
+				"ani", AuthorityUtils.NO_AUTHORITIES);
 
-        assertEquals(1, user.getAuthorities().size());
-        assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains("ROLE_X"));
-    }
+		assertEquals(1, user.getAuthorities().size());
+		assertTrue(AuthorityUtils.authorityListToSet(user.getAuthorities()).contains(
+				"ROLE_X"));
+	}
 
-    public void testPasswordAttributeIsMappedCorrectly() throws Exception {
-        LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
+	public void testPasswordAttributeIsMappedCorrectly() throws Exception {
+		LdapUserDetailsMapper mapper = new LdapUserDetailsMapper();
 
-        mapper.setPasswordAttributeName("myappsPassword");
-        BasicAttributes attrs = new BasicAttributes();
-        attrs.put(new BasicAttribute("myappsPassword", "mypassword".getBytes()));
+		mapper.setPasswordAttributeName("myappsPassword");
+		BasicAttributes attrs = new BasicAttributes();
+		attrs.put(new BasicAttribute("myappsPassword", "mypassword".getBytes()));
 
-        DirContextAdapter ctx = new DirContextAdapter(attrs, new DistinguishedName("cn=someName"));
-        ctx.setAttributeValue("uid", "ani");
+		DirContextAdapter ctx = new DirContextAdapter(attrs, new DistinguishedName(
+				"cn=someName"));
+		ctx.setAttributeValue("uid", "ani");
 
-        LdapUserDetails user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx, "ani", AuthorityUtils.NO_AUTHORITIES);
+		LdapUserDetails user = (LdapUserDetailsImpl) mapper.mapUserFromContext(ctx,
+				"ani", AuthorityUtils.NO_AUTHORITIES);
 
-        assertEquals("mypassword", user.getPassword());
-    }
+		assertEquals("mypassword", user.getPassword());
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java
index cb985aade8..d8c377064b 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsServiceTests.java
@@ -22,43 +22,48 @@ import org.springframework.security.ldap.authentication.NullLdapAuthoritiesPopul
  */
 public class LdapUserDetailsServiceTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsNullSearchObject() {
-        new LdapUserDetailsService(null, new NullLdapAuthoritiesPopulator());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullSearchObject() {
+		new LdapUserDetailsService(null, new NullLdapAuthoritiesPopulator());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rejectsNullAuthoritiesPopulator() {
-        new LdapUserDetailsService(new MockUserSearch(), null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void rejectsNullAuthoritiesPopulator() {
+		new LdapUserDetailsService(new MockUserSearch(), null);
+	}
 
-    @Test
-    public void correctAuthoritiesAreReturned() {
-        DirContextAdapter userData = new DirContextAdapter(new DistinguishedName("uid=joe"));
+	@Test
+	public void correctAuthoritiesAreReturned() {
+		DirContextAdapter userData = new DirContextAdapter(new DistinguishedName(
+				"uid=joe"));
 
-        LdapUserDetailsService service =
-                new LdapUserDetailsService(new MockUserSearch(userData), new MockAuthoritiesPopulator());
-        service.setUserDetailsMapper(new LdapUserDetailsMapper());
+		LdapUserDetailsService service = new LdapUserDetailsService(new MockUserSearch(
+				userData), new MockAuthoritiesPopulator());
+		service.setUserDetailsMapper(new LdapUserDetailsMapper());
 
-        UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway");
+		UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway");
 
-        Set<String> authorities = AuthorityUtils.authorityListToSet(user.getAuthorities());
-        assertEquals(1, authorities.size());
-        assertTrue(authorities.contains("ROLE_FROM_POPULATOR"));
-    }
+		Set<String> authorities = AuthorityUtils
+				.authorityListToSet(user.getAuthorities());
+		assertEquals(1, authorities.size());
+		assertTrue(authorities.contains("ROLE_FROM_POPULATOR"));
+	}
 
-    @Test
-    public void nullPopulatorConstructorReturnsEmptyAuthoritiesList() throws Exception {
-        DirContextAdapter userData = new DirContextAdapter(new DistinguishedName("uid=joe"));
+	@Test
+	public void nullPopulatorConstructorReturnsEmptyAuthoritiesList() throws Exception {
+		DirContextAdapter userData = new DirContextAdapter(new DistinguishedName(
+				"uid=joe"));
 
-        LdapUserDetailsService service = new LdapUserDetailsService(new MockUserSearch(userData));
-        UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway");
-        assertEquals(0, user.getAuthorities().size());
-    }
+		LdapUserDetailsService service = new LdapUserDetailsService(new MockUserSearch(
+				userData));
+		UserDetails user = service.loadUserByUsername("doesntmatterwegetjoeanyway");
+		assertEquals(0, user.getAuthorities().size());
+	}
 
-    class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
-        public Collection<GrantedAuthority> getGrantedAuthorities(DirContextOperations userCtx, String username) {
-            return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");
-        }
-    }
+	class MockAuthoritiesPopulator implements LdapAuthoritiesPopulator {
+		public Collection<GrantedAuthority> getGrantedAuthorities(
+				DirContextOperations userCtx, String username) {
+			return AuthorityUtils.createAuthorityList("ROLE_FROM_POPULATOR");
+		}
+	}
 }
diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java
index bb47306f1f..f53ccc128e 100644
--- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java
+++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/UserDetailsServiceLdapAuthoritiesPopulatorTests.java
@@ -19,18 +19,20 @@ import org.springframework.security.ldap.authentication.UserDetailsServiceLdapAu
  */
 public class UserDetailsServiceLdapAuthoritiesPopulatorTests {
 
-    @Test
-    public void delegationToUserDetailsServiceReturnsCorrectRoles() throws Exception {
-        UserDetailsService uds = mock(UserDetailsService.class);
-        UserDetails user = mock(UserDetails.class);
-        when(uds.loadUserByUsername("joe")).thenReturn(user);
-        List authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
-        when(user.getAuthorities()).thenReturn(authorities);
+	@Test
+	public void delegationToUserDetailsServiceReturnsCorrectRoles() throws Exception {
+		UserDetailsService uds = mock(UserDetailsService.class);
+		UserDetails user = mock(UserDetails.class);
+		when(uds.loadUserByUsername("joe")).thenReturn(user);
+		List authorities = AuthorityUtils.createAuthorityList("ROLE_USER");
+		when(user.getAuthorities()).thenReturn(authorities);
 
-        UserDetailsServiceLdapAuthoritiesPopulator populator = new UserDetailsServiceLdapAuthoritiesPopulator(uds);
-        Collection<? extends GrantedAuthority> auths =  populator.getGrantedAuthorities(new DirContextAdapter(), "joe");
+		UserDetailsServiceLdapAuthoritiesPopulator populator = new UserDetailsServiceLdapAuthoritiesPopulator(
+				uds);
+		Collection<? extends GrantedAuthority> auths = populator.getGrantedAuthorities(
+				new DirContextAdapter(), "joe");
 
-        assertEquals(1, auths.size());
-        assertTrue(AuthorityUtils.authorityListToSet(auths).contains("ROLE_USER"));
-    }
+		assertEquals(1, auths.size());
+		assertTrue(AuthorityUtils.authorityListToSet(auths).contains("ROLE_USER"));
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java
index 72129161c4..cfd9c837e4 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandler.java
@@ -25,28 +25,32 @@ import org.springframework.security.core.Authentication;
 import org.springframework.util.Assert;
 
 /**
- * The default implementation of {@link SecurityExpressionHandler} which uses a {@link MessageSecurityExpressionRoot}.
+ * The default implementation of {@link SecurityExpressionHandler} which uses a
+ * {@link MessageSecurityExpressionRoot}.
  *
  * @param <T> the type for the body of the Message
  *
  * @since 4.0
  * @author Rob Winch
  */
-public class DefaultMessageSecurityExpressionHandler<T> extends AbstractSecurityExpressionHandler<Message<T>> {
+public class DefaultMessageSecurityExpressionHandler<T> extends
+		AbstractSecurityExpressionHandler<Message<T>> {
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
 
-    @Override
-    protected SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, Message<T> invocation) {
-        MessageSecurityExpressionRoot root = new MessageSecurityExpressionRoot(authentication,invocation);
-        root.setPermissionEvaluator(getPermissionEvaluator());
-        root.setTrustResolver(trustResolver);
-        root.setRoleHierarchy(getRoleHierarchy());
-        return root;
-    }
+	@Override
+	protected SecurityExpressionOperations createSecurityExpressionRoot(
+			Authentication authentication, Message<T> invocation) {
+		MessageSecurityExpressionRoot root = new MessageSecurityExpressionRoot(
+				authentication, invocation);
+		root.setPermissionEvaluator(getPermissionEvaluator());
+		root.setTrustResolver(trustResolver);
+		root.setRoleHierarchy(getRoleHierarchy());
+		return root;
+	}
 
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver,"trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
index 964b6d6c9e..6573c5a367 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java
@@ -27,57 +27,62 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * A class used to create a {@link MessageSecurityMetadataSource} that uses {@link MessageMatcher} mapped to Spring
- * Expressions.
+ * A class used to create a {@link MessageSecurityMetadataSource} that uses
+ * {@link MessageMatcher} mapped to Spring Expressions.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public final class ExpressionBasedMessageSecurityMetadataSourceFactory {
 
-    /**
-     * Create a {@link MessageSecurityMetadataSource} that uses {@link MessageMatcher} mapped to Spring
-     * Expressions. Each entry is considered in order and only the first match is used.
-     *
-     * For example:
-     *
-     * <pre>
-     *     LinkedHashMap<MessageMatcher<?> matcherToExpression = new LinkedHashMap<MessageMatcher<Object>();
-     *     matcherToExpression.put(new SimDestinationMessageMatcher("/public/**"), "permitAll");
-     *     matcherToExpression.put(new SimDestinationMessageMatcher("/admin/**"), "hasRole('ROLE_ADMIN')");
-     *     matcherToExpression.put(new SimDestinationMessageMatcher("/**"), "authenticated");
-     *
-     *     MessageSecurityMetadataSource metadataSource = createExpressionMessageMetadataSource(matcherToExpression);
-     * </pre>
-     *
-     * <p>
-     * If our destination is "/public/hello", it would match on "/public/**" and on "/**". However, only "/public/**"
-     * would be used since it is the first entry. That means that a destination of "/public/hello" will be mapped to
-     * "permitAll".
-     * </p>
-     *
-     * <p>
-     * For a complete listing of expressions see {@link MessageSecurityExpressionRoot}
-     * </p>
-     *
-     * @param matcherToExpression an ordered mapping of {@link MessageMatcher} to Strings that are turned into an
-     *                            Expression using {@link DefaultMessageSecurityExpressionHandler#getExpressionParser()}
-     * @return the {@link MessageSecurityMetadataSource} to use. Cannot be null.
-     */
-    public static MessageSecurityMetadataSource createExpressionMessageMetadataSource(LinkedHashMap<MessageMatcher<?>,String> matcherToExpression) {
-        DefaultMessageSecurityExpressionHandler<Object> handler = new DefaultMessageSecurityExpressionHandler<Object>();
+	/**
+	 * Create a {@link MessageSecurityMetadataSource} that uses {@link MessageMatcher}
+	 * mapped to Spring Expressions. Each entry is considered in order and only the first
+	 * match is used.
+	 *
+	 * For example:
+	 *
+	 * <pre>
+	 *     LinkedHashMap<MessageMatcher<?> matcherToExpression = new LinkedHashMap<MessageMatcher<Object>();
+	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/public/**"), "permitAll");
+	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/admin/**"), "hasRole('ROLE_ADMIN')");
+	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/**"), "authenticated");
+	 * 
+	 *     MessageSecurityMetadataSource metadataSource = createExpressionMessageMetadataSource(matcherToExpression);
+	 * </pre>
+	 *
+	 * <p>
+	 * If our destination is "/public/hello", it would match on "/public/**" and on "/**".
+	 * However, only "/public/**" would be used since it is the first entry. That means
+	 * that a destination of "/public/hello" will be mapped to "permitAll".
+	 * </p>
+	 *
+	 * <p>
+	 * For a complete listing of expressions see {@link MessageSecurityExpressionRoot}
+	 * </p>
+	 *
+	 * @param matcherToExpression an ordered mapping of {@link MessageMatcher} to Strings
+	 * that are turned into an Expression using
+	 * {@link DefaultMessageSecurityExpressionHandler#getExpressionParser()}
+	 * @return the {@link MessageSecurityMetadataSource} to use. Cannot be null.
+	 */
+	public static MessageSecurityMetadataSource createExpressionMessageMetadataSource(
+			LinkedHashMap<MessageMatcher<?>, String> matcherToExpression) {
+		DefaultMessageSecurityExpressionHandler<Object> handler = new DefaultMessageSecurityExpressionHandler<Object>();
 
-        LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> matcherToAttrs = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
+		LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> matcherToAttrs = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
 
-        for(Map.Entry<MessageMatcher<?>,String> entry : matcherToExpression.entrySet()) {
-            MessageMatcher<?> matcher = entry.getKey();
-            String rawExpression = entry.getValue();
-            Expression expression = handler.getExpressionParser().parseExpression(rawExpression);
-            ConfigAttribute attribute = new MessageExpressionConfigAttribute(expression);
-            matcherToAttrs.put(matcher, Arrays.asList(attribute));
-        }
-        return new DefaultMessageSecurityMetadataSource(matcherToAttrs);
-    }
+		for (Map.Entry<MessageMatcher<?>, String> entry : matcherToExpression.entrySet()) {
+			MessageMatcher<?> matcher = entry.getKey();
+			String rawExpression = entry.getValue();
+			Expression expression = handler.getExpressionParser().parseExpression(
+					rawExpression);
+			ConfigAttribute attribute = new MessageExpressionConfigAttribute(expression);
+			matcherToAttrs.put(matcher, Arrays.asList(attribute));
+		}
+		return new DefaultMessageSecurityMetadataSource(matcherToAttrs);
+	}
 
-    private ExpressionBasedMessageSecurityMetadataSourceFactory() {}
+	private ExpressionBasedMessageSecurityMetadataSourceFactory() {
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
index 9c355c35f6..5fad2532ab 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java
@@ -21,36 +21,36 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.util.Assert;
 
 /**
- * Simple expression configuration attribute for use in {@link Message}  authorizations.
+ * Simple expression configuration attribute for use in {@link Message} authorizations.
  *
  * @since 4.0
  * @author Rob Winch
  */
 @SuppressWarnings("serial")
 class MessageExpressionConfigAttribute implements ConfigAttribute {
-    private final Expression authorizeExpression;
+	private final Expression authorizeExpression;
 
-    /**
-     * Creates a new instance
-     *
-     * @param authorizeExpression the {@link Expression} to use. Cannot be null
-     */
-    public MessageExpressionConfigAttribute(Expression authorizeExpression) {
-        Assert.notNull(authorizeExpression, "authorizeExpression cannot be null");
+	/**
+	 * Creates a new instance
+	 *
+	 * @param authorizeExpression the {@link Expression} to use. Cannot be null
+	 */
+	public MessageExpressionConfigAttribute(Expression authorizeExpression) {
+		Assert.notNull(authorizeExpression, "authorizeExpression cannot be null");
 
-        this.authorizeExpression = authorizeExpression;
-    }
+		this.authorizeExpression = authorizeExpression;
+	}
 
-    Expression getAuthorizeExpression() {
-        return authorizeExpression;
-    }
+	Expression getAuthorizeExpression() {
+		return authorizeExpression;
+	}
 
-    public String getAttribute() {
-        return null;
-    }
+	public String getAttribute() {
+		return null;
+	}
 
-    @Override
-    public String toString() {
-        return authorizeExpression.getExpressionString();
-    }
+	@Override
+	public String toString() {
+		return authorizeExpression.getExpressionString();
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
index b9a0022e89..8d9060982e 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java
@@ -27,52 +27,58 @@ import org.springframework.util.Assert;
 import java.util.Collection;
 
 /**
- * Voter which handles {@link Message} authorisation decisions. If a {@link MessageExpressionConfigAttribute} is found,
- * then its expression is evaluated. If true, {@code ACCESS_GRANTED} is returned. If false, {@code ACCESS_DENIED} is
- * returned. If no {@code MessageExpressionConfigAttribute} is found, then {@code ACCESS_ABSTAIN} is returned.
+ * Voter which handles {@link Message} authorisation decisions. If a
+ * {@link MessageExpressionConfigAttribute} is found, then its expression is evaluated. If
+ * true, {@code ACCESS_GRANTED} is returned. If false, {@code ACCESS_DENIED} is returned.
+ * If no {@code MessageExpressionConfigAttribute} is found, then {@code ACCESS_ABSTAIN} is
+ * returned.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public class MessageExpressionVoter<T> implements AccessDecisionVoter<Message<T>> {
-    private SecurityExpressionHandler<Message<T>> expressionHandler = new DefaultMessageSecurityExpressionHandler<T>();
+	private SecurityExpressionHandler<Message<T>> expressionHandler = new DefaultMessageSecurityExpressionHandler<T>();
 
-    public int vote(Authentication authentication, Message<T> message, Collection<ConfigAttribute> attributes) {
-        assert authentication != null;
-        assert message != null;
-        assert attributes != null;
+	public int vote(Authentication authentication, Message<T> message,
+			Collection<ConfigAttribute> attributes) {
+		assert authentication != null;
+		assert message != null;
+		assert attributes != null;
 
-        MessageExpressionConfigAttribute attr = findConfigAttribute(attributes);
+		MessageExpressionConfigAttribute attr = findConfigAttribute(attributes);
 
-        if (attr == null) {
-            return ACCESS_ABSTAIN;
-        }
+		if (attr == null) {
+			return ACCESS_ABSTAIN;
+		}
 
-        EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, message);
+		EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication,
+				message);
 
-        return ExpressionUtils.evaluateAsBoolean(attr.getAuthorizeExpression(), ctx) ?
-                ACCESS_GRANTED : ACCESS_DENIED;
-    }
+		return ExpressionUtils.evaluateAsBoolean(attr.getAuthorizeExpression(), ctx) ? ACCESS_GRANTED
+				: ACCESS_DENIED;
+	}
 
-    private MessageExpressionConfigAttribute findConfigAttribute(Collection<ConfigAttribute> attributes) {
-        for (ConfigAttribute attribute : attributes) {
-            if (attribute instanceof MessageExpressionConfigAttribute) {
-                return (MessageExpressionConfigAttribute)attribute;
-            }
-        }
-        return null;
-    }
+	private MessageExpressionConfigAttribute findConfigAttribute(
+			Collection<ConfigAttribute> attributes) {
+		for (ConfigAttribute attribute : attributes) {
+			if (attribute instanceof MessageExpressionConfigAttribute) {
+				return (MessageExpressionConfigAttribute) attribute;
+			}
+		}
+		return null;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof MessageExpressionConfigAttribute;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return attribute instanceof MessageExpressionConfigAttribute;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return Message.class.isAssignableFrom(clazz);
-    }
+	public boolean supports(Class<?> clazz) {
+		return Message.class.isAssignableFrom(clazz);
+	}
 
-    public void setExpressionHandler(SecurityExpressionHandler<Message<T>> expressionHandler) {
-        Assert.notNull(expressionHandler, "expressionHandler cannot be null");
-        this.expressionHandler = expressionHandler;
-    }
+	public void setExpressionHandler(
+			SecurityExpressionHandler<Message<T>> expressionHandler) {
+		Assert.notNull(expressionHandler, "expressionHandler cannot be null");
+		this.expressionHandler = expressionHandler;
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageSecurityExpressionRoot.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageSecurityExpressionRoot.java
index bb2e5b7e1c..3f209e8293 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageSecurityExpressionRoot.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageSecurityExpressionRoot.java
@@ -27,10 +27,10 @@ import org.springframework.security.core.Authentication;
  */
 public final class MessageSecurityExpressionRoot extends SecurityExpressionRoot {
 
-    public final Message<?> message;
+	public final Message<?> message;
 
-    public MessageSecurityExpressionRoot(Authentication authentication, Message<?> message) {
-        super(authentication);
-        this.message = message;
-    }
+	public MessageSecurityExpressionRoot(Authentication authentication, Message<?> message) {
+		super(authentication);
+		this.message = message;
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
index 786bc60e00..0250fd0882 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
@@ -25,10 +25,11 @@ import org.springframework.security.messaging.access.expression.ExpressionBasedM
 import org.springframework.util.Assert;
 
 /**
- * Performs security handling of Message resources via a ChannelInterceptor implementation.
+ * Performs security handling of Message resources via a ChannelInterceptor
+ * implementation.
  * <p>
- * The <code>SecurityMetadataSource</code> required by this security interceptor is of type {@link
- * MessageSecurityMetadataSource}.
+ * The <code>SecurityMetadataSource</code> required by this security interceptor is of
+ * type {@link MessageSecurityMetadataSource}.
  * </p>
  * <p>
  * Refer to {@link AbstractSecurityInterceptor} for details on the workflow.
@@ -37,66 +38,69 @@ import org.springframework.util.Assert;
  * @see 4.0
  * @author Rob Winch
  */
-public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor implements ChannelInterceptor {
-    private static final ThreadLocal<InterceptorStatusToken> tokenHolder = new ThreadLocal<InterceptorStatusToken>();
+public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor
+		implements ChannelInterceptor {
+	private static final ThreadLocal<InterceptorStatusToken> tokenHolder = new ThreadLocal<InterceptorStatusToken>();
 
-    private final MessageSecurityMetadataSource metadataSource;
+	private final MessageSecurityMetadataSource metadataSource;
 
-    /**
-     * Creates a new instance
-     *
-     * @param metadataSource the MessageSecurityMetadataSource to use. Cannot be null.
-     *
-     * @see DefaultMessageSecurityMetadataSource
-     * @see ExpressionBasedMessageSecurityMetadataSourceFactory
-     */
-    public ChannelSecurityInterceptor(MessageSecurityMetadataSource metadataSource) {
-        Assert.notNull(metadataSource, "metadataSource cannot be null");
-        this.metadataSource = metadataSource;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param metadataSource the MessageSecurityMetadataSource to use. Cannot be null.
+	 *
+	 * @see DefaultMessageSecurityMetadataSource
+	 * @see ExpressionBasedMessageSecurityMetadataSourceFactory
+	 */
+	public ChannelSecurityInterceptor(MessageSecurityMetadataSource metadataSource) {
+		Assert.notNull(metadataSource, "metadataSource cannot be null");
+		this.metadataSource = metadataSource;
+	}
 
-    @Override
-    public Class<?> getSecureObjectClass() {
-        return Message.class;
-    }
+	@Override
+	public Class<?> getSecureObjectClass() {
+		return Message.class;
+	}
 
-    @Override
-    public SecurityMetadataSource obtainSecurityMetadataSource() {
-        return metadataSource;
-    }
+	@Override
+	public SecurityMetadataSource obtainSecurityMetadataSource() {
+		return metadataSource;
+	}
 
-    public Message<?> preSend(Message<?> message, MessageChannel channel) {
-        InterceptorStatusToken token = beforeInvocation(message);
-        if(token != null) {
-            tokenHolder.set(token);
-        }
-        return message;
-    }
+	public Message<?> preSend(Message<?> message, MessageChannel channel) {
+		InterceptorStatusToken token = beforeInvocation(message);
+		if (token != null) {
+			tokenHolder.set(token);
+		}
+		return message;
+	}
 
-    public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
-        InterceptorStatusToken token = clearToken();
-        afterInvocation(token, null);
-    }
+	public void postSend(Message<?> message, MessageChannel channel, boolean sent) {
+		InterceptorStatusToken token = clearToken();
+		afterInvocation(token, null);
+	}
 
-    public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, Exception ex) {
-        InterceptorStatusToken token = clearToken();
-        finallyInvocation(token);
-    }
+	public void afterSendCompletion(Message<?> message, MessageChannel channel,
+			boolean sent, Exception ex) {
+		InterceptorStatusToken token = clearToken();
+		finallyInvocation(token);
+	}
 
-    public boolean preReceive(MessageChannel channel) {
-        return true;
-    }
+	public boolean preReceive(MessageChannel channel) {
+		return true;
+	}
 
-    public Message<?> postReceive(Message<?> message, MessageChannel channel) {
-        return message;
-    }
+	public Message<?> postReceive(Message<?> message, MessageChannel channel) {
+		return message;
+	}
 
-    public void afterReceiveCompletion(Message<?> message, MessageChannel channel, Exception ex) {
-    }
+	public void afterReceiveCompletion(Message<?> message, MessageChannel channel,
+			Exception ex) {
+	}
 
-    private InterceptorStatusToken clearToken() {
-        InterceptorStatusToken token = tokenHolder.get();
-        tokenHolder.remove();
-        return token;
-    }
+	private InterceptorStatusToken clearToken() {
+		InterceptorStatusToken token = tokenHolder.get();
+		tokenHolder.remove();
+		return token;
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
index 02f857b21c..86a5b77729 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java
@@ -23,12 +23,12 @@ import org.springframework.security.messaging.util.matcher.MessageMatcher;
 import java.util.*;
 
 /**
- * A default implementation of {@link MessageSecurityMetadataSource} that looks up the {@link ConfigAttribute} instances
- * using a {@link MessageMatcher}.
+ * A default implementation of {@link MessageSecurityMetadataSource} that looks up the
+ * {@link ConfigAttribute} instances using a {@link MessageMatcher}.
  *
  * <p>
- * Each entry is considered in order. The first entry that matches, the corresponding {@code Collection<ConfigAttribute>}
- * is returned.
+ * Each entry is considered in order. The first entry that matches, the corresponding
+ * {@code Collection<ConfigAttribute>} is returned.
  * </p>
  *
  * @see ChannelSecurityInterceptor
@@ -37,35 +37,39 @@ import java.util.*;
  * @since 4.0
  * @author Rob Winch
  */
-public final class DefaultMessageSecurityMetadataSource implements MessageSecurityMetadataSource {
-    private final Map<MessageMatcher<?>,Collection<ConfigAttribute>> messageMap;
+public final class DefaultMessageSecurityMetadataSource implements
+		MessageSecurityMetadataSource {
+	private final Map<MessageMatcher<?>, Collection<ConfigAttribute>> messageMap;
 
-    public DefaultMessageSecurityMetadataSource(LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> messageMap) {
-        this.messageMap = messageMap;
-    }
+	public DefaultMessageSecurityMetadataSource(
+			LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> messageMap) {
+		this.messageMap = messageMap;
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public Collection<ConfigAttribute> getAttributes(Object object) throws IllegalArgumentException {
-        final Message message = (Message) object;
-        for (Map.Entry<MessageMatcher<?>, Collection<ConfigAttribute>> entry : messageMap.entrySet()) {
-            if (entry.getKey().matches(message)) {
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public Collection<ConfigAttribute> getAttributes(Object object)
+			throws IllegalArgumentException {
+		final Message message = (Message) object;
+		for (Map.Entry<MessageMatcher<?>, Collection<ConfigAttribute>> entry : messageMap
+				.entrySet()) {
+			if (entry.getKey().matches(message)) {
+				return entry.getValue();
+			}
+		}
+		return null;
+	}
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
 
-        for (Collection<ConfigAttribute> entry : messageMap.values()) {
-            allAttributes.addAll(entry);
-        }
+		for (Collection<ConfigAttribute> entry : messageMap.values()) {
+			allAttributes.addAll(entry);
+		}
 
-        return allAttributes;
-    }
+		return allAttributes;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return Message.class.isAssignableFrom(clazz);
-    }
+	public boolean supports(Class<?> clazz) {
+		return Message.class.isAssignableFrom(clazz);
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
index 27285df1c6..f2e3267683 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
@@ -26,7 +26,6 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 
-
 /**
  * Allows resolving the {@link Authentication#getPrincipal()} using the
  * {@link AuthenticationPrincipal} annotation. For example, the following
@@ -42,12 +41,12 @@ import org.springframework.stereotype.Controller;
  * </pre>
  *
  * <p>
- * Will resolve the CustomUser argument using
- * {@link Authentication#getPrincipal()} from the {@link SecurityContextHolder}.
- * If the {@link Authentication} or {@link Authentication#getPrincipal()} is
- * null, it will return null. If the types do not match, null will be returned
- * unless {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which
- * case a {@link ClassCastException} will be thrown.
+ * Will resolve the CustomUser argument using {@link Authentication#getPrincipal()} from
+ * the {@link SecurityContextHolder}. If the {@link Authentication} or
+ * {@link Authentication#getPrincipal()} is null, it will return null. If the types do not
+ * match, null will be returned unless
+ * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
+ * {@link ClassCastException} will be thrown.
  * </p>
  *
  * <p>
@@ -79,56 +78,72 @@ import org.springframework.stereotype.Controller;
  * @since 4.0
  */
 public final class AuthenticationPrincipalArgumentResolver implements
-    HandlerMethodArgumentResolver {
+		HandlerMethodArgumentResolver {
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter)
-     */
-    public boolean supportsParameter(MethodParameter parameter) {
-        return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver#
+	 * supportsParameter(org.springframework.core.MethodParameter)
+	 */
+	public boolean supportsParameter(MethodParameter parameter) {
+		return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
+	}
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.messaging.Message)
-     */
-    public Object resolveArgument(MethodParameter parameter, Message<?> message) throws Exception {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if(authentication == null) {
-            return null;
-        }
-        Object principal = authentication.getPrincipal();
-        if(principal != null && !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
-            AuthenticationPrincipal authPrincipal = findMethodAnnotation(AuthenticationPrincipal.class, parameter);
-            if(authPrincipal.errorOnInvalidType()) {
-                throw new ClassCastException(principal + " is not assignable to " + parameter.getParameterType());
-            } else {
-                return null;
-            }
-        }
-        return principal;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver#
+	 * resolveArgument(org.springframework.core.MethodParameter,
+	 * org.springframework.messaging.Message)
+	 */
+	public Object resolveArgument(MethodParameter parameter, Message<?> message)
+			throws Exception {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (authentication == null) {
+			return null;
+		}
+		Object principal = authentication.getPrincipal();
+		if (principal != null
+				&& !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
+			AuthenticationPrincipal authPrincipal = findMethodAnnotation(
+					AuthenticationPrincipal.class, parameter);
+			if (authPrincipal.errorOnInvalidType()) {
+				throw new ClassCastException(principal + " is not assignable to "
+						+ parameter.getParameterType());
+			}
+			else {
+				return null;
+			}
+		}
+		return principal;
+	}
 
-    /**
-     * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
-     *
-     * @param annotationClass the class of the {@link Annotation} to find on the {@link MethodParameter}
-     * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
-     * @return the {@link Annotation} that was found or null.
-     */
-    private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass, MethodParameter parameter) {
-        T annotation = parameter.getParameterAnnotation(annotationClass);
-        if(annotation != null) {
-            return annotation;
-        }
-        Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
-        for(Annotation toSearch : annotationsToSearch) {
-            annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(), annotationClass);
-            if(annotation != null) {
-                return annotation;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
+	 *
+	 * @param annotationClass the class of the {@link Annotation} to find on the
+	 * {@link MethodParameter}
+	 * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
+	 * @return the {@link Annotation} that was found or null.
+	 */
+	private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass,
+			MethodParameter parameter) {
+		T annotation = parameter.getParameterAnnotation(annotationClass);
+		if (annotation != null) {
+			return annotation;
+		}
+		Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
+		for (Annotation toSearch : annotationsToSearch) {
+			annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(),
+					annotationClass);
+			if (annotation != null) {
+				return annotation;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java
index 293b4cf2ef..453737935c 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java
@@ -32,115 +32,130 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * Creates a {@link ExecutorChannelInterceptor} that will obtain the {@link Authentication} from the specified
- * {@link Message#getHeaders()}.
+ * Creates a {@link ExecutorChannelInterceptor} that will obtain the
+ * {@link Authentication} from the specified {@link Message#getHeaders()}.
  * </p>
  *
  * @since 4.0
  * @author Rob Winch
  */
-public final class SecurityContextChannelInterceptor extends ChannelInterceptorAdapter implements ExecutorChannelInterceptor {
-    private final SecurityContext EMPTY_CONTEXT = SecurityContextHolder.createEmptyContext();
-    private static final ThreadLocal<Stack<SecurityContext>> ORIGINAL_CONTEXT = new ThreadLocal<Stack<SecurityContext>>();
+public final class SecurityContextChannelInterceptor extends ChannelInterceptorAdapter
+		implements ExecutorChannelInterceptor {
+	private final SecurityContext EMPTY_CONTEXT = SecurityContextHolder
+			.createEmptyContext();
+	private static final ThreadLocal<Stack<SecurityContext>> ORIGINAL_CONTEXT = new ThreadLocal<Stack<SecurityContext>>();
 
-    private final String authenticationHeaderName;
+	private final String authenticationHeaderName;
 
-    private Authentication anonymous = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+	private Authentication anonymous = new AnonymousAuthenticationToken("key",
+			"anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
 
-    /**
-     * Creates a new instance using the header of the name {@link SimpMessageHeaderAccessor#USER_HEADER}.
-     */
-    public SecurityContextChannelInterceptor() {
-        this(SimpMessageHeaderAccessor.USER_HEADER);
-    }
+	/**
+	 * Creates a new instance using the header of the name
+	 * {@link SimpMessageHeaderAccessor#USER_HEADER}.
+	 */
+	public SecurityContextChannelInterceptor() {
+		this(SimpMessageHeaderAccessor.USER_HEADER);
+	}
 
-    /**
-     * Creates a new instance that uses the specified header to obtain the {@link Authentication}.
-     *
-     * @param authenticationHeaderName the header name to obtain the {@link Authentication}. Cannot be null.
-     */
-    public SecurityContextChannelInterceptor(String authenticationHeaderName) {
-        Assert.notNull(authenticationHeaderName, "authenticationHeaderName cannot be null");
-        this.authenticationHeaderName = authenticationHeaderName;
-    }
+	/**
+	 * Creates a new instance that uses the specified header to obtain the
+	 * {@link Authentication}.
+	 *
+	 * @param authenticationHeaderName the header name to obtain the
+	 * {@link Authentication}. Cannot be null.
+	 */
+	public SecurityContextChannelInterceptor(String authenticationHeaderName) {
+		Assert.notNull(authenticationHeaderName,
+				"authenticationHeaderName cannot be null");
+		this.authenticationHeaderName = authenticationHeaderName;
+	}
 
-    /**
-     * Allows setting the Authentication used for anonymous authentication. Default is:
-     *
-     * <pre>
-     * new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
-     * </pre>
-     *
-     * @param authentication the Authentication used for anonymous authentication. Cannot be null.
-     */
-    public void setAnonymousAuthentication(Authentication authentication) {
-        Assert.notNull(authentication, "authentication cannot be null");
-        this.anonymous = authentication;
-    }
+	/**
+	 * Allows setting the Authentication used for anonymous authentication. Default is:
+	 *
+	 * <pre>
+	 * new AnonymousAuthenticationToken(&quot;key&quot;, &quot;anonymous&quot;,
+	 * 		AuthorityUtils.createAuthorityList(&quot;ROLE_ANONYMOUS&quot;));
+	 * </pre>
+	 *
+	 * @param authentication the Authentication used for anonymous authentication. Cannot
+	 * be null.
+	 */
+	public void setAnonymousAuthentication(Authentication authentication) {
+		Assert.notNull(authentication, "authentication cannot be null");
+		this.anonymous = authentication;
+	}
 
-    @Override
-    public Message<?> preSend(Message<?> message, MessageChannel channel) {
-        setup(message);
-        return message;
-    }
+	@Override
+	public Message<?> preSend(Message<?> message, MessageChannel channel) {
+		setup(message);
+		return message;
+	}
 
-    @Override
-    public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, Exception ex) {
-        cleanup();
-    }
+	@Override
+	public void afterSendCompletion(Message<?> message, MessageChannel channel,
+			boolean sent, Exception ex) {
+		cleanup();
+	}
 
-    public Message<?> beforeHandle(Message<?> message, MessageChannel channel, MessageHandler handler) {
-        setup(message);
-        return message;
-    }
+	public Message<?> beforeHandle(Message<?> message, MessageChannel channel,
+			MessageHandler handler) {
+		setup(message);
+		return message;
+	}
 
-    public void afterMessageHandled(Message<?> message, MessageChannel channel, MessageHandler handler, Exception ex) {
-        cleanup();
-    }
+	public void afterMessageHandled(Message<?> message, MessageChannel channel,
+			MessageHandler handler, Exception ex) {
+		cleanup();
+	}
 
-    private void setup(Message<?> message) {
-        SecurityContext currentContext = SecurityContextHolder.getContext();
+	private void setup(Message<?> message) {
+		SecurityContext currentContext = SecurityContextHolder.getContext();
 
-        Stack<SecurityContext> contextStack = ORIGINAL_CONTEXT.get();
-        if(contextStack == null) {
-            contextStack = new Stack<SecurityContext>();
-            ORIGINAL_CONTEXT.set(contextStack);
-        }
-        contextStack.push(currentContext);
+		Stack<SecurityContext> contextStack = ORIGINAL_CONTEXT.get();
+		if (contextStack == null) {
+			contextStack = new Stack<SecurityContext>();
+			ORIGINAL_CONTEXT.set(contextStack);
+		}
+		contextStack.push(currentContext);
 
-        Object user = message.getHeaders().get(authenticationHeaderName);
+		Object user = message.getHeaders().get(authenticationHeaderName);
 
-        Authentication authentication;
-        if((user instanceof Authentication)) {
-            authentication = (Authentication) user;
-        } else {
-            authentication = this.anonymous;
-        }
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(authentication);
-        SecurityContextHolder.setContext(context);
-    }
+		Authentication authentication;
+		if ((user instanceof Authentication)) {
+			authentication = (Authentication) user;
+		}
+		else {
+			authentication = this.anonymous;
+		}
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(authentication);
+		SecurityContextHolder.setContext(context);
+	}
 
-    private void cleanup() {
-        Stack<SecurityContext> contextStack = ORIGINAL_CONTEXT.get();
+	private void cleanup() {
+		Stack<SecurityContext> contextStack = ORIGINAL_CONTEXT.get();
 
-        if(contextStack == null || contextStack.isEmpty()) {
-            SecurityContextHolder.clearContext();
-            ORIGINAL_CONTEXT.remove();
-            return;
-        }
+		if (contextStack == null || contextStack.isEmpty()) {
+			SecurityContextHolder.clearContext();
+			ORIGINAL_CONTEXT.remove();
+			return;
+		}
 
-        SecurityContext originalContext = contextStack.pop();
+		SecurityContext originalContext = contextStack.pop();
 
-        try {
-            if(EMPTY_CONTEXT.equals(originalContext)) {
-                SecurityContextHolder.clearContext();
-                ORIGINAL_CONTEXT.remove();
-            } else {
-                SecurityContextHolder.setContext(originalContext);
-            }
-        } catch(Throwable t) {
-            SecurityContextHolder.clearContext();
-        }
-    }
+		try {
+			if (EMPTY_CONTEXT.equals(originalContext)) {
+				SecurityContextHolder.clearContext();
+				ORIGINAL_CONTEXT.remove();
+			}
+			else {
+				SecurityContextHolder.setContext(originalContext);
+			}
+		}
+		catch (Throwable t) {
+			SecurityContextHolder.clearContext();
+		}
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
index b102c6089f..eb3daf3abe 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java
@@ -29,40 +29,41 @@ import org.apache.commons.logging.Log;
  * @since 4.0
  */
 abstract class AbstractMessageMatcherComposite<T> implements MessageMatcher<T> {
-    protected final Log LOGGER = getLog(getClass());
+	protected final Log LOGGER = getLog(getClass());
 
-    private final List<MessageMatcher<T>> messageMatchers;
+	private final List<MessageMatcher<T>> messageMatchers;
 
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    public AbstractMessageMatcherComposite(List<MessageMatcher<T>> messageMatchers) {
-        notEmpty(messageMatchers, "messageMatchers must contain a value");
-        if (messageMatchers.contains(null)) {
-            throw new IllegalArgumentException("messageMatchers cannot contain null values");
-        }
-        this.messageMatchers = messageMatchers;
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	public AbstractMessageMatcherComposite(List<MessageMatcher<T>> messageMatchers) {
+		notEmpty(messageMatchers, "messageMatchers must contain a value");
+		if (messageMatchers.contains(null)) {
+			throw new IllegalArgumentException(
+					"messageMatchers cannot contain null values");
+		}
+		this.messageMatchers = messageMatchers;
 
-    }
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    @SafeVarargs
-    public AbstractMessageMatcherComposite(MessageMatcher<T>... messageMatchers) {
-        this(asList(messageMatchers));
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	@SafeVarargs
+	public AbstractMessageMatcherComposite(MessageMatcher<T>... messageMatchers) {
+		this(asList(messageMatchers));
+	}
 
-    public List<MessageMatcher<T>> getMessageMatchers() {
-        return messageMatchers;
-    }
+	public List<MessageMatcher<T>> getMessageMatchers() {
+		return messageMatchers;
+	}
 
-    @Override
-    public String toString() {
-        return getClass().getSimpleName()+ "[messageMatchers=" + messageMatchers + "]";
-    }
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "[messageMatchers=" + messageMatchers + "]";
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
index 78f54e2fcc..5f23c106ed 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AndMessageMatcher.java
@@ -20,42 +20,43 @@ import java.util.List;
 import org.springframework.messaging.Message;
 
 /**
- * {@link MessageMatcher} that will return true if all of the passed in {@link MessageMatcher} instances match.
+ * {@link MessageMatcher} that will return true if all of the passed in
+ * {@link MessageMatcher} instances match.
  *
  * @since 4.0
  */
 public final class AndMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    public AndMessageMatcher(List<MessageMatcher<T>> messageMatchers) {
-        super(messageMatchers);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	public AndMessageMatcher(List<MessageMatcher<T>> messageMatchers) {
+		super(messageMatchers);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    @SafeVarargs
-    public AndMessageMatcher(MessageMatcher<T>... messageMatchers) {
-        super(messageMatchers);
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	@SafeVarargs
+	public AndMessageMatcher(MessageMatcher<T>... messageMatchers) {
+		super(messageMatchers);
 
-    }
+	}
 
-    public boolean matches(Message<? extends T> message) {
-        for (MessageMatcher<T> matcher : getMessageMatchers()) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Trying to match using " + matcher);
-            }
-            if (!matcher.matches(message)) {
-                LOGGER.debug("Did not match");
-                return false;
-            }
-        }
-        LOGGER.debug("All messageMatchers returned true");
-        return true;
-    }
+	public boolean matches(Message<? extends T> message) {
+		for (MessageMatcher<T> matcher : getMessageMatchers()) {
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Trying to match using " + matcher);
+			}
+			if (!matcher.matches(message)) {
+				LOGGER.debug("Did not match");
+				return false;
+			}
+		}
+		LOGGER.debug("All messageMatchers returned true");
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
index e41c13fc07..33d74afeb8 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java
@@ -25,23 +25,23 @@ import org.springframework.messaging.Message;
  */
 public interface MessageMatcher<T> {
 
-    /**
-     * Returns true if the {@link Message} matches, else false
-     * @param message the {@link Message} to match on
-     * @return true if the {@link Message} matches, else false
-     */
-    boolean matches(Message<? extends T> message);
+	/**
+	 * Returns true if the {@link Message} matches, else false
+	 * @param message the {@link Message} to match on
+	 * @return true if the {@link Message} matches, else false
+	 */
+	boolean matches(Message<? extends T> message);
 
-    /**
-     * Matches every {@link Message}
-     */
-    MessageMatcher<Object> ANY_MESSAGE = new MessageMatcher<Object>() {
-        public boolean matches(Message<? extends Object> message) {
-            return true;
-        }
+	/**
+	 * Matches every {@link Message}
+	 */
+	MessageMatcher<Object> ANY_MESSAGE = new MessageMatcher<Object>() {
+		public boolean matches(Message<? extends Object> message) {
+			return true;
+		}
 
-        public String toString() {
-            return "ANY_MESSAGE";
-        }
-    };
+		public String toString() {
+			return "ANY_MESSAGE";
+		}
+	};
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
index 42fdc9982c..7162104e25 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/OrMessageMatcher.java
@@ -20,42 +20,43 @@ import java.util.List;
 import org.springframework.messaging.Message;
 
 /**
- * {@link MessageMatcher} that will return true if any of the passed in {@link MessageMatcher} instances match.
+ * {@link MessageMatcher} that will return true if any of the passed in
+ * {@link MessageMatcher} instances match.
  *
  * @since 4.0
  */
 public final class OrMessageMatcher<T> extends AbstractMessageMatcherComposite<T> {
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    public OrMessageMatcher(List<MessageMatcher<T>> messageMatchers) {
-        super(messageMatchers);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	public OrMessageMatcher(List<MessageMatcher<T>> messageMatchers) {
+		super(messageMatchers);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param messageMatchers the {@link MessageMatcher} instances to try
-     */
-    @SafeVarargs
-    public OrMessageMatcher(MessageMatcher<T>... messageMatchers) {
-        super(messageMatchers);
+	/**
+	 * Creates a new instance
+	 *
+	 * @param messageMatchers the {@link MessageMatcher} instances to try
+	 */
+	@SafeVarargs
+	public OrMessageMatcher(MessageMatcher<T>... messageMatchers) {
+		super(messageMatchers);
 
-    }
+	}
 
-    public boolean matches(Message<? extends T> message) {
-        for (MessageMatcher<T> matcher : getMessageMatchers()) {
-            if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Trying to match using " + matcher);
-            }
-            if (matcher.matches(message)) {
-                LOGGER.debug("matched");
-                return true;
-            }
-        }
-        LOGGER.debug("No matches found");
-        return false;
-    }
+	public boolean matches(Message<? extends T> message) {
+		for (MessageMatcher<T> matcher : getMessageMatchers()) {
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Trying to match using " + matcher);
+			}
+			if (matcher.matches(message)) {
+				LOGGER.debug("matched");
+				return true;
+			}
+		}
+		LOGGER.debug("No matches found");
+		return false;
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
index 77b719b66f..5471ce3115 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
@@ -24,147 +24,160 @@ import org.springframework.util.PathMatcher;
 
 /**
  * <p>
- * MessageMatcher which compares a pre-defined pattern against the destination
- * of a {@link Message}. There is also support for optionally matching on a
- * specified {@link SimpMessageType}.
+ * MessageMatcher which compares a pre-defined pattern against the destination of a
+ * {@link Message}. There is also support for optionally matching on a specified
+ * {@link SimpMessageType}.
  * </p>
  *
  * @since 4.0
  * @author Rob Winch
  */
 public final class SimpDestinationMessageMatcher implements MessageMatcher<Object> {
-    public static final MessageMatcher<Object> NULL_DESTINATION_MATCHER = new MessageMatcher<Object>() {
-        public boolean matches(Message<? extends Object> message) {
-            String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders());
-            return destination == null;
-        }
-    };
+	public static final MessageMatcher<Object> NULL_DESTINATION_MATCHER = new MessageMatcher<Object>() {
+		public boolean matches(Message<? extends Object> message) {
+			String destination = SimpMessageHeaderAccessor.getDestination(message
+					.getHeaders());
+			return destination == null;
+		}
+	};
 
-    private final PathMatcher matcher;
+	private final PathMatcher matcher;
 
-    /**
-     * The {@link MessageMatcher} that determines if the type matches. If the
-     * type was null, this matcher will match every Message.
-     */
-    private final MessageMatcher<Object> messageTypeMatcher;
-    private final String pattern;
+	/**
+	 * The {@link MessageMatcher} that determines if the type matches. If the type was
+	 * null, this matcher will match every Message.
+	 */
+	private final MessageMatcher<Object> messageTypeMatcher;
+	private final String pattern;
 
-    /**
-     * <p>
-     * Creates a new instance with the specified pattern, null
-     * {@link SimpMessageType} (matches any type), and a {@link AntPathMatcher}
-     * created from the default constructor.
-     * </p>
-     *
-     * <p>
-     * The mapping matches destinations despite the using the following rules:
-     *
-     * <ul>
-     * <li>? matches one character</li>
-     * <li>* matches zero or more characters</li>
-     * <li>** matches zero or more 'directories' in a path</li>
-     * </ul>
-     *
-     * <p>
-     * Some examples:
-     *
-     * <ul>
-     * <li>{@code com/t?st.jsp} - matches {@code com/test} but also
-     * {@code com/tast} or {@code com/txst}</li>
-     * <li>{@code com/*suffix} - matches all files ending in {@code suffix} in
-     * the {@code com} directory</li>
-     * <li>{@code com/&#42;&#42;/test} - matches all destinations ending with
-     * {@code test} underneath the {@code com} path</li>
-     * </ul>
-     *
-     * @param pattern
-     *            the pattern to use
-     */
-    public SimpDestinationMessageMatcher(String pattern) {
-        this(pattern, new AntPathMatcher());
-    }
+	/**
+	 * <p>
+	 * Creates a new instance with the specified pattern, null {@link SimpMessageType}
+	 * (matches any type), and a {@link AntPathMatcher} created from the default
+	 * constructor.
+	 * </p>
+	 *
+	 * <p>
+	 * The mapping matches destinations despite the using the following rules:
+	 *
+	 * <ul>
+	 * <li>? matches one character</li>
+	 * <li>* matches zero or more characters</li>
+	 * <li>** matches zero or more 'directories' in a path</li>
+	 * </ul>
+	 *
+	 * <p>
+	 * Some examples:
+	 *
+	 * <ul>
+	 * <li>{@code com/t?st.jsp} - matches {@code com/test} but also {@code com/tast} or
+	 * {@code com/txst}</li>
+	 * <li>{@code com/*suffix} - matches all files ending in {@code suffix} in the
+	 * {@code com} directory</li>
+	 * <li>{@code com/&#42;&#42;/test} - matches all destinations ending with {@code test}
+	 * underneath the {@code com} path</li>
+	 * </ul>
+	 *
+	 * @param pattern the pattern to use
+	 */
+	public SimpDestinationMessageMatcher(String pattern) {
+		this(pattern, new AntPathMatcher());
+	}
 
-    /**
-     * <p>
-     * Creates a new instance with the specified pattern and {@link PathMatcher}.
-     * </p>
-     *
-     * @param pattern the pattern to use
-     * @param pathMatcher the {@link PathMatcher} to use.
-     */
-    public SimpDestinationMessageMatcher(String pattern, PathMatcher pathMatcher) {
-        this(pattern, null, pathMatcher);
-    }
+	/**
+	 * <p>
+	 * Creates a new instance with the specified pattern and {@link PathMatcher}.
+	 * </p>
+	 *
+	 * @param pattern the pattern to use
+	 * @param pathMatcher the {@link PathMatcher} to use.
+	 */
+	public SimpDestinationMessageMatcher(String pattern, PathMatcher pathMatcher) {
+		this(pattern, null, pathMatcher);
+	}
 
-    /**
-     * <p>
-     * Creates a new instance with the specified pattern, {@link SimpMessageType}, and {@link PathMatcher}.
-     * </p>
-     *
-     * @param pattern the pattern to use
-     * @param type the {@link SimpMessageType} to match on or null if any {@link SimpMessageType} should be matched.
-     * @param pathMatcher the {@link PathMatcher} to use.
-     */
-    private SimpDestinationMessageMatcher(String pattern, SimpMessageType type, PathMatcher pathMatcher) {
-        Assert.notNull(pattern, "pattern cannot be null");
-        Assert.notNull(pathMatcher, "pathMatcher cannot be null");
-        if(!isTypeWithDestination(type)) {
-            throw new IllegalArgumentException("SimpMessageType " + type + " does not contain a destination and so cannot be matched on.");
-        }
+	/**
+	 * <p>
+	 * Creates a new instance with the specified pattern, {@link SimpMessageType}, and
+	 * {@link PathMatcher}.
+	 * </p>
+	 *
+	 * @param pattern the pattern to use
+	 * @param type the {@link SimpMessageType} to match on or null if any
+	 * {@link SimpMessageType} should be matched.
+	 * @param pathMatcher the {@link PathMatcher} to use.
+	 */
+	private SimpDestinationMessageMatcher(String pattern, SimpMessageType type,
+			PathMatcher pathMatcher) {
+		Assert.notNull(pattern, "pattern cannot be null");
+		Assert.notNull(pathMatcher, "pathMatcher cannot be null");
+		if (!isTypeWithDestination(type)) {
+			throw new IllegalArgumentException("SimpMessageType " + type
+					+ " does not contain a destination and so cannot be matched on.");
+		}
 
-        this.matcher = pathMatcher;
-        this.messageTypeMatcher = type == null ? ANY_MESSAGE : new SimpMessageTypeMatcher(type);
-        this.pattern = pattern;
-    }
+		this.matcher = pathMatcher;
+		this.messageTypeMatcher = type == null ? ANY_MESSAGE
+				: new SimpMessageTypeMatcher(type);
+		this.pattern = pattern;
+	}
 
-    public boolean matches(Message<? extends Object> message) {
-        if(!messageTypeMatcher.matches(message)) {
-            return false;
-        }
+	public boolean matches(Message<? extends Object> message) {
+		if (!messageTypeMatcher.matches(message)) {
+			return false;
+		}
 
-        String destination = SimpMessageHeaderAccessor.getDestination(message.getHeaders());
-        return destination != null && matcher.match(pattern, destination);
-    }
+		String destination = SimpMessageHeaderAccessor.getDestination(message
+				.getHeaders());
+		return destination != null && matcher.match(pattern, destination);
+	}
 
-    public MessageMatcher<Object> getMessageTypeMatcher() {
-        return messageTypeMatcher;
-    }
+	public MessageMatcher<Object> getMessageTypeMatcher() {
+		return messageTypeMatcher;
+	}
 
-    @Override
-    public String toString() {
-        return "SimpDestinationMessageMatcher [matcher=" + matcher
-                + ", messageTypeMatcher=" + messageTypeMatcher + ", pattern="
-                + pattern + "]";
-    }
+	@Override
+	public String toString() {
+		return "SimpDestinationMessageMatcher [matcher=" + matcher
+				+ ", messageTypeMatcher=" + messageTypeMatcher + ", pattern=" + pattern
+				+ "]";
+	}
 
-    private boolean isTypeWithDestination(SimpMessageType type) {
-        if(type == null) {
-            return true;
-        }
-        return SimpMessageType.MESSAGE.equals(type) || SimpMessageType.SUBSCRIBE.equals(type);
-    }
+	private boolean isTypeWithDestination(SimpMessageType type) {
+		if (type == null) {
+			return true;
+		}
+		return SimpMessageType.MESSAGE.equals(type)
+				|| SimpMessageType.SUBSCRIBE.equals(type);
+	}
 
-    /**
-     * <p>
-     * Creates a new instance with the specified pattern, {@code SimpMessageType.SUBSCRIBE}, and {@link PathMatcher}.
-     * </p>
-     *
-     * @param pattern the pattern to use
-     * @param pathMatcher the {@link PathMatcher} to use.
-     */
-    public static SimpDestinationMessageMatcher createSubscribeMatcher(String pattern, PathMatcher matcher) {
-        return new SimpDestinationMessageMatcher(pattern, SimpMessageType.SUBSCRIBE, matcher);
-    }
+	/**
+	 * <p>
+	 * Creates a new instance with the specified pattern,
+	 * {@code SimpMessageType.SUBSCRIBE}, and {@link PathMatcher}.
+	 * </p>
+	 *
+	 * @param pattern the pattern to use
+	 * @param pathMatcher the {@link PathMatcher} to use.
+	 */
+	public static SimpDestinationMessageMatcher createSubscribeMatcher(String pattern,
+			PathMatcher matcher) {
+		return new SimpDestinationMessageMatcher(pattern, SimpMessageType.SUBSCRIBE,
+				matcher);
+	}
 
-    /**
-     * <p>
-     * Creates a new instance with the specified pattern, {@code SimpMessageType.MESSAGE}, and {@link PathMatcher}.
-     * </p>
-     *
-     * @param pattern the pattern to use
-     * @param pathMatcher the {@link PathMatcher} to use.
-     */
-    public static SimpDestinationMessageMatcher createMessageMatcher(String pattern, PathMatcher matcher) {
-        return new SimpDestinationMessageMatcher(pattern, SimpMessageType.MESSAGE, matcher);
-    }
+	/**
+	 * <p>
+	 * Creates a new instance with the specified pattern, {@code SimpMessageType.MESSAGE},
+	 * and {@link PathMatcher}.
+	 * </p>
+	 *
+	 * @param pattern the pattern to use
+	 * @param pathMatcher the {@link PathMatcher} to use.
+	 */
+	public static SimpDestinationMessageMatcher createMessageMatcher(String pattern,
+			PathMatcher matcher) {
+		return new SimpDestinationMessageMatcher(pattern, SimpMessageType.MESSAGE,
+				matcher);
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java
index 543d56402a..07021cd627 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java
@@ -23,58 +23,54 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * A {@link MessageMatcher} that matches if the provided {@link Message} has a
- * type that is the same as the {@link SimpMessageType} that was specified in
- * the constructor.
+ * A {@link MessageMatcher} that matches if the provided {@link Message} has a type that
+ * is the same as the {@link SimpMessageType} that was specified in the constructor.
  *
  * @since 4.0
  * @author Rob Winch
  *
  */
 public class SimpMessageTypeMatcher implements MessageMatcher<Object> {
-    private final SimpMessageType typeToMatch;
+	private final SimpMessageType typeToMatch;
 
-    /**
-     * Creates a new instance
-     *
-     * @param typeToMatch
-     *            the {@link SimpMessageType} that will result in a match.
-     *            Cannot be null.
-     */
-    public SimpMessageTypeMatcher(SimpMessageType typeToMatch) {
-        Assert.notNull(typeToMatch, "typeToMatch cannot be null");
-        this.typeToMatch = typeToMatch;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param typeToMatch the {@link SimpMessageType} that will result in a match. Cannot
+	 * be null.
+	 */
+	public SimpMessageTypeMatcher(SimpMessageType typeToMatch) {
+		Assert.notNull(typeToMatch, "typeToMatch cannot be null");
+		this.typeToMatch = typeToMatch;
+	}
 
-    public boolean matches(Message<? extends Object> message) {
-        MessageHeaders headers = message.getHeaders();
-        SimpMessageType messageType = SimpMessageHeaderAccessor
-                .getMessageType(headers);
+	public boolean matches(Message<? extends Object> message) {
+		MessageHeaders headers = message.getHeaders();
+		SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers);
 
-        return typeToMatch == messageType;
-    }
+		return typeToMatch == messageType;
+	}
 
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-        if (!(other instanceof SimpMessageTypeMatcher)) {
-            return false;
-        }
-        SimpMessageTypeMatcher otherMatcher = (SimpMessageTypeMatcher) other;
-        return ObjectUtils.nullSafeEquals(this.typeToMatch,
-                otherMatcher.typeToMatch);
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof SimpMessageTypeMatcher)) {
+			return false;
+		}
+		SimpMessageTypeMatcher otherMatcher = (SimpMessageTypeMatcher) other;
+		return ObjectUtils.nullSafeEquals(this.typeToMatch, otherMatcher.typeToMatch);
 
-    }
+	}
 
-    public int hashCode() {
-        // Using nullSafeHashCode for proper array hashCode handling
-        return ObjectUtils.nullSafeHashCode(this.typeToMatch);
-    }
+	public int hashCode() {
+		// Using nullSafeHashCode for proper array hashCode handling
+		return ObjectUtils.nullSafeHashCode(this.typeToMatch);
+	}
 
-    @Override
-    public String toString() {
-        return "SimpMessageTypeMatcher [typeToMatch=" + typeToMatch + "]";
-    }
+	@Override
+	public String toString() {
+		return "SimpMessageTypeMatcher [typeToMatch=" + typeToMatch + "]";
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java
index 66c798b755..edfefaf05b 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptor.java
@@ -29,34 +29,39 @@ import org.springframework.security.web.csrf.InvalidCsrfTokenException;
 import org.springframework.security.web.csrf.MissingCsrfTokenException;
 
 /**
- * {@link ChannelInterceptorAdapter} that validates that a valid CSRF is included in the header of any
- * {@link SimpMessageType#CONNECT} message. The expected {@link CsrfToken} is populated by CsrfTokenHandshakeInterceptor.
+ * {@link ChannelInterceptorAdapter} that validates that a valid CSRF is included in the
+ * header of any {@link SimpMessageType#CONNECT} message. The expected {@link CsrfToken}
+ * is populated by CsrfTokenHandshakeInterceptor.
  *
  * @author Rob Winch
  * @since 4.0
  */
 public final class CsrfChannelInterceptor extends ChannelInterceptorAdapter {
-    private final MessageMatcher<Object> matcher = new SimpMessageTypeMatcher(SimpMessageType.CONNECT);
+	private final MessageMatcher<Object> matcher = new SimpMessageTypeMatcher(
+			SimpMessageType.CONNECT);
 
-    @Override
-    public Message<?> preSend(Message<?> message, MessageChannel channel) {
-        if(!matcher.matches(message)) {
-            return message;
-        }
+	@Override
+	public Message<?> preSend(Message<?> message, MessageChannel channel) {
+		if (!matcher.matches(message)) {
+			return message;
+		}
 
-        Map<String, Object> sessionAttributes = SimpMessageHeaderAccessor.getSessionAttributes(message.getHeaders());
-        CsrfToken expectedToken = sessionAttributes == null ? null : (CsrfToken) sessionAttributes.get(CsrfToken.class.getName());
+		Map<String, Object> sessionAttributes = SimpMessageHeaderAccessor
+				.getSessionAttributes(message.getHeaders());
+		CsrfToken expectedToken = sessionAttributes == null ? null
+				: (CsrfToken) sessionAttributes.get(CsrfToken.class.getName());
 
-        if(expectedToken == null) {
-            throw new MissingCsrfTokenException(null);
-        }
+		if (expectedToken == null) {
+			throw new MissingCsrfTokenException(null);
+		}
 
-        String actualTokenValue = SimpMessageHeaderAccessor.wrap(message).getFirstNativeHeader(expectedToken.getHeaderName());
+		String actualTokenValue = SimpMessageHeaderAccessor.wrap(message)
+				.getFirstNativeHeader(expectedToken.getHeaderName());
 
-        boolean csrfCheckPassed = expectedToken.getToken().equals(actualTokenValue);
-        if(csrfCheckPassed) {
-            return message;
-        }
-        throw new InvalidCsrfTokenException(expectedToken, actualTokenValue);
-    }
+		boolean csrfCheckPassed = expectedToken.getToken().equals(actualTokenValue);
+		if (csrfCheckPassed) {
+			return message;
+		}
+		throw new InvalidCsrfTokenException(expectedToken, actualTokenValue);
+	}
 }
diff --git a/messaging/src/main/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptor.java
index dad7c181ed..697f30d616 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptor.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptor.java
@@ -27,28 +27,29 @@ import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.server.HandshakeInterceptor;
 
 /**
- * Copies a CsrfToken from the HttpServletRequest's attributes to the WebSocket attributes. This is used as the
- * expected CsrfToken when validating connection requests to ensure only the same origin connects.
+ * Copies a CsrfToken from the HttpServletRequest's attributes to the WebSocket
+ * attributes. This is used as the expected CsrfToken when validating connection requests
+ * to ensure only the same origin connects.
  *
  * @author Rob Winch
  * @since 4.0
  */
 public final class CsrfTokenHandshakeInterceptor implements HandshakeInterceptor {
 
-    public boolean beforeHandshake(ServerHttpRequest request,
-            ServerHttpResponse response, WebSocketHandler wsHandler,
-            Map<String, Object> attributes) throws Exception {
-        HttpServletRequest httpRequest = ((ServletServerHttpRequest)request).getServletRequest();
-        CsrfToken token = (CsrfToken) httpRequest.getAttribute(CsrfToken.class.getName());
-        if(token == null) {
-            return true;
-        }
-        attributes.put(CsrfToken.class.getName(), token);
-        return true;
-    }
+	public boolean beforeHandshake(ServerHttpRequest request,
+			ServerHttpResponse response, WebSocketHandler wsHandler,
+			Map<String, Object> attributes) throws Exception {
+		HttpServletRequest httpRequest = ((ServletServerHttpRequest) request)
+				.getServletRequest();
+		CsrfToken token = (CsrfToken) httpRequest.getAttribute(CsrfToken.class.getName());
+		if (token == null) {
+			return true;
+		}
+		attributes.put(CsrfToken.class.getName(), token);
+		return true;
+	}
 
-    public void afterHandshake(ServerHttpRequest request,
-            ServerHttpResponse response, WebSocketHandler wsHandler,
-            Exception exception) {
-    }
+	public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response,
+			WebSocketHandler wsHandler, Exception exception) {
+	}
 }
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java
index e8e024b934..8f7d009558 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java
@@ -38,68 +38,78 @@ import org.springframework.security.core.authority.AuthorityUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultMessageSecurityExpressionHandlerTests {
-    @Mock
-    AuthenticationTrustResolver trustResolver;
-    @Mock
-    PermissionEvaluator permissionEvaluator;
+	@Mock
+	AuthenticationTrustResolver trustResolver;
+	@Mock
+	PermissionEvaluator permissionEvaluator;
 
-    DefaultMessageSecurityExpressionHandler<Object> handler;
+	DefaultMessageSecurityExpressionHandler<Object> handler;
 
-    Message<Object> message;
+	Message<Object> message;
 
-    Authentication authentication;
+	Authentication authentication;
 
-    @Before
-    public void setup() {
-        handler = new DefaultMessageSecurityExpressionHandler<Object>();
+	@Before
+	public void setup() {
+		handler = new DefaultMessageSecurityExpressionHandler<Object>();
 
-        message = new GenericMessage<Object>("");
-        authentication = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
-    }
+		message = new GenericMessage<Object>("");
+		authentication = new AnonymousAuthenticationToken("key", "anonymous",
+				AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+	}
 
-    // SEC-2705
-    @Test
-    public void trustResolverPopulated() {
-        EvaluationContext context = handler.createEvaluationContext(authentication, message);
-        Expression expression = handler.getExpressionParser().parseExpression("authenticated");
+	// SEC-2705
+	@Test
+	public void trustResolverPopulated() {
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				message);
+		Expression expression = handler.getExpressionParser().parseExpression(
+				"authenticated");
 
-        assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isFalse();
-    }
+		assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isFalse();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void trustResolverNull() {
-        handler.setTrustResolver(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void trustResolverNull() {
+		handler.setTrustResolver(null);
+	}
 
-    @Test
-    public void trustResolverCustom() {
-        handler.setTrustResolver(trustResolver);
-        EvaluationContext context = handler.createEvaluationContext(authentication, message);
-        Expression expression = handler.getExpressionParser().parseExpression("authenticated");
-        when(trustResolver.isAnonymous(authentication)).thenReturn(false);
+	@Test
+	public void trustResolverCustom() {
+		handler.setTrustResolver(trustResolver);
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				message);
+		Expression expression = handler.getExpressionParser().parseExpression(
+				"authenticated");
+		when(trustResolver.isAnonymous(authentication)).thenReturn(false);
 
-        assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
-    }
+		assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
+	}
 
-    @Test
-    public void roleHierarchy() {
-        authentication = new TestingAuthenticationToken("admin", "pass", "ROLE_ADMIN");
-        RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
-        roleHierarchy.setHierarchy("ROLE_ADMIN > ROLE_USER");
-        handler.setRoleHierarchy(roleHierarchy);
-        EvaluationContext context = handler.createEvaluationContext(authentication, message);
-        Expression expression = handler.getExpressionParser().parseExpression("hasRole('ROLE_USER')");
+	@Test
+	public void roleHierarchy() {
+		authentication = new TestingAuthenticationToken("admin", "pass", "ROLE_ADMIN");
+		RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
+		roleHierarchy.setHierarchy("ROLE_ADMIN > ROLE_USER");
+		handler.setRoleHierarchy(roleHierarchy);
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				message);
+		Expression expression = handler.getExpressionParser().parseExpression(
+				"hasRole('ROLE_USER')");
 
-        assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
-    }
+		assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
+	}
 
-    @Test
-    public void permissionEvaluator() {
-        handler.setPermissionEvaluator(permissionEvaluator);
-        EvaluationContext context = handler.createEvaluationContext(authentication, message);
-        Expression expression = handler.getExpressionParser().parseExpression("hasPermission(message, 'read')");
-        when(permissionEvaluator.hasPermission(authentication, message, "read")).thenReturn(true);
+	@Test
+	public void permissionEvaluator() {
+		handler.setPermissionEvaluator(permissionEvaluator);
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				message);
+		Expression expression = handler.getExpressionParser().parseExpression(
+				"hasPermission(message, 'read')");
+		when(permissionEvaluator.hasPermission(authentication, message, "read"))
+				.thenReturn(true);
 
-        assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
-    }
+		assertThat(ExpressionUtils.evaluateAsBoolean(expression, context)).isTrue();
+	}
 }
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
index f6d3a9c78b..a03d612d9f 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java
@@ -35,66 +35,70 @@ import java.util.LinkedHashMap;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
-    @Mock
-    MessageMatcher<Object> matcher1;
-    @Mock
-    MessageMatcher<Object> matcher2;
-    @Mock
-    Message<Object> message;
-    @Mock
-    Authentication authentication;
+	@Mock
+	MessageMatcher<Object> matcher1;
+	@Mock
+	MessageMatcher<Object> matcher2;
+	@Mock
+	Message<Object> message;
+	@Mock
+	Authentication authentication;
 
-    String expression1;
+	String expression1;
 
-    String expression2;
+	String expression2;
 
-    LinkedHashMap<MessageMatcher<?>,String> matcherToExpression;
+	LinkedHashMap<MessageMatcher<?>, String> matcherToExpression;
 
-    MessageSecurityMetadataSource source;
+	MessageSecurityMetadataSource source;
 
-    MessageSecurityExpressionRoot rootObject;
+	MessageSecurityExpressionRoot rootObject;
 
-    @Before
-    public void setup() {
-        expression1 = "permitAll";
-        expression2 = "denyAll";
-        matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
-        matcherToExpression.put(matcher1, expression1);
-        matcherToExpression.put(matcher2, expression2);
+	@Before
+	public void setup() {
+		expression1 = "permitAll";
+		expression2 = "denyAll";
+		matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
+		matcherToExpression.put(matcher1, expression1);
+		matcherToExpression.put(matcher2, expression2);
 
-        source = createExpressionMessageMetadataSource(matcherToExpression);
-        rootObject = new MessageSecurityExpressionRoot(authentication, message);
-    }
+		source = createExpressionMessageMetadataSource(matcherToExpression);
+		rootObject = new MessageSecurityExpressionRoot(authentication, message);
+	}
 
-    @Test
-    public void createExpressionMessageMetadataSourceNoMatch() {
+	@Test
+	public void createExpressionMessageMetadataSourceNoMatch() {
 
-        Collection<ConfigAttribute> attrs = source.getAttributes(message);
+		Collection<ConfigAttribute> attrs = source.getAttributes(message);
 
-        assertThat(attrs).isNull();
-    }
+		assertThat(attrs).isNull();
+	}
 
-    @Test
-    public void createExpressionMessageMetadataSourceMatchFirst() {
-        when(matcher1.matches(message)).thenReturn(true);
+	@Test
+	public void createExpressionMessageMetadataSourceMatchFirst() {
+		when(matcher1.matches(message)).thenReturn(true);
 
-        Collection<ConfigAttribute> attrs = source.getAttributes(message);
+		Collection<ConfigAttribute> attrs = source.getAttributes(message);
 
-        assertThat(attrs.size()).isEqualTo(1);
-        ConfigAttribute attr = attrs.iterator().next();
-        assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
-        assertThat(((MessageExpressionConfigAttribute)attr).getAuthorizeExpression().getValue(rootObject)).isEqualTo(true);
-    }
+		assertThat(attrs.size()).isEqualTo(1);
+		ConfigAttribute attr = attrs.iterator().next();
+		assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
+		assertThat(
+				((MessageExpressionConfigAttribute) attr).getAuthorizeExpression()
+						.getValue(rootObject)).isEqualTo(true);
+	}
 
-    @Test
-    public void createExpressionMessageMetadataSourceMatchSecond() {
-        when(matcher2.matches(message)).thenReturn(true);
+	@Test
+	public void createExpressionMessageMetadataSourceMatchSecond() {
+		when(matcher2.matches(message)).thenReturn(true);
 
-        Collection<ConfigAttribute> attrs = source.getAttributes(message);
+		Collection<ConfigAttribute> attrs = source.getAttributes(message);
 
-        assertThat(attrs.size()).isEqualTo(1);
-        ConfigAttribute attr = attrs.iterator().next();
-        assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
-        assertThat(((MessageExpressionConfigAttribute)attr).getAuthorizeExpression().getValue(rootObject)).isEqualTo(false);
-    }
+		assertThat(attrs.size()).isEqualTo(1);
+		ConfigAttribute attr = attrs.iterator().next();
+		assertThat(attr).isInstanceOf(MessageExpressionConfigAttribute.class);
+		assertThat(
+				((MessageExpressionConfigAttribute) attr).getAuthorizeExpression()
+						.getValue(rootObject)).isEqualTo(false);
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
index 0185cfcc98..3fa59c4c13 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttributeTests.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.messaging.access.expression;
 
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,35 +27,35 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MessageExpressionConfigAttributeTests {
-    @Mock
-    Expression expression;
+	@Mock
+	Expression expression;
 
-    MessageExpressionConfigAttribute attribute;
+	MessageExpressionConfigAttribute attribute;
 
-    @Before
-    public void setup() {
-        attribute = new MessageExpressionConfigAttribute(expression);
-    }
+	@Before
+	public void setup() {
+		attribute = new MessageExpressionConfigAttribute(expression);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullExpression() {
-        new MessageExpressionConfigAttribute(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullExpression() {
+		new MessageExpressionConfigAttribute(null);
+	}
 
-    @Test
-    public void getAuthorizeExpression() {
-        assertThat(attribute.getAuthorizeExpression()).isSameAs(expression);
-    }
+	@Test
+	public void getAuthorizeExpression() {
+		assertThat(attribute.getAuthorizeExpression()).isSameAs(expression);
+	}
 
-    @Test
-    public void getAttribute() {
-        assertThat(attribute.getAttribute()).isNull();
-    }
+	@Test
+	public void getAttribute() {
+		assertThat(attribute.getAttribute()).isNull();
+	}
 
-    @Test
-    public void toStringUsesExpressionString() {
-        when(expression.getExpressionString()).thenReturn("toString");
+	@Test
+	public void toStringUsesExpressionString() {
+		when(expression.getExpressionString()).thenReturn("toString");
 
-        assertThat(attribute.toString()).isEqualTo(expression.getExpressionString());
-    }
+		assertThat(attribute.toString()).isEqualTo(expression.getExpressionString());
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
index 12052c09b2..9c817a58eb 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/MessageExpressionVoterTests.java
@@ -37,78 +37,87 @@ import static org.springframework.security.access.AccessDecisionVoter.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MessageExpressionVoterTests {
-    @Mock
-    Authentication authentication;
-    @Mock
-    Message<Object> message;
-    Collection<ConfigAttribute> attributes;
-    @Mock
-    Expression expression;
-    @Mock
-    SecurityExpressionHandler<Message> expressionHandler;
-    @Mock
-    EvaluationContext evaluationContext;
+	@Mock
+	Authentication authentication;
+	@Mock
+	Message<Object> message;
+	Collection<ConfigAttribute> attributes;
+	@Mock
+	Expression expression;
+	@Mock
+	SecurityExpressionHandler<Message> expressionHandler;
+	@Mock
+	EvaluationContext evaluationContext;
 
-    MessageExpressionVoter voter;
+	MessageExpressionVoter voter;
 
-    @Before
-    public void setup() {
-        attributes = Arrays.<ConfigAttribute>asList(new MessageExpressionConfigAttribute(expression));
+	@Before
+	public void setup() {
+		attributes = Arrays
+				.<ConfigAttribute> asList(new MessageExpressionConfigAttribute(expression));
 
-        voter = new MessageExpressionVoter();
-    }
+		voter = new MessageExpressionVoter();
+	}
 
-    @Test
-    public void voteGranted() {
-        when(expression.getValue(any(EvaluationContext.class),eq(Boolean.class))).thenReturn(true);
-        assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED);
-    }
+	@Test
+	public void voteGranted() {
+		when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class)))
+				.thenReturn(true);
+		assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
+				ACCESS_GRANTED);
+	}
 
-    @Test
-    public void voteDenied() {
-        when(expression.getValue(any(EvaluationContext.class),eq(Boolean.class))).thenReturn(false);
-        assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_DENIED);
-    }
+	@Test
+	public void voteDenied() {
+		when(expression.getValue(any(EvaluationContext.class), eq(Boolean.class)))
+				.thenReturn(false);
+		assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
+				ACCESS_DENIED);
+	}
 
-    @Test
-    public void voteAbstain() {
-        attributes = Arrays.<ConfigAttribute>asList(new SecurityConfig("ROLE_USER"));
-        assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_ABSTAIN);
-    }
+	@Test
+	public void voteAbstain() {
+		attributes = Arrays.<ConfigAttribute> asList(new SecurityConfig("ROLE_USER"));
+		assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
+				ACCESS_ABSTAIN);
+	}
 
-    @Test
-    public void supportsObjectClassFalse() {
-        assertThat(voter.supports(Object.class)).isFalse();
-    }
+	@Test
+	public void supportsObjectClassFalse() {
+		assertThat(voter.supports(Object.class)).isFalse();
+	}
 
-    @Test
-    public void supportsMessageClassTrue() {
-        assertThat(voter.supports(Message.class)).isTrue();
-    }
+	@Test
+	public void supportsMessageClassTrue() {
+		assertThat(voter.supports(Message.class)).isTrue();
+	}
 
-    @Test
-    public void supportsSecurityConfigFalse() {
-        assertThat(voter.supports(new SecurityConfig("ROLE_USER"))).isFalse();
-    }
+	@Test
+	public void supportsSecurityConfigFalse() {
+		assertThat(voter.supports(new SecurityConfig("ROLE_USER"))).isFalse();
+	}
 
-    @Test
-    public void supportsMessageExpressionConfigAttributeTrue() {
-        assertThat(voter.supports(new MessageExpressionConfigAttribute(expression))).isTrue();
-    }
+	@Test
+	public void supportsMessageExpressionConfigAttributeTrue() {
+		assertThat(voter.supports(new MessageExpressionConfigAttribute(expression)))
+				.isTrue();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setExpressionHandlerNull() {
-        voter.setExpressionHandler(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setExpressionHandlerNull() {
+		voter.setExpressionHandler(null);
+	}
 
-    @Test
-    public void customExpressionHandler() {
-        voter.setExpressionHandler(expressionHandler);
-        when(expressionHandler.createEvaluationContext(authentication, message)).thenReturn(evaluationContext);
-        when(expression.getValue(evaluationContext, Boolean.class)).thenReturn(true);
+	@Test
+	public void customExpressionHandler() {
+		voter.setExpressionHandler(expressionHandler);
+		when(expressionHandler.createEvaluationContext(authentication, message))
+				.thenReturn(evaluationContext);
+		when(expression.getValue(evaluationContext, Boolean.class)).thenReturn(true);
 
-        assertThat(voter.vote(authentication, message, attributes)).isEqualTo(ACCESS_GRANTED);
+		assertThat(voter.vote(authentication, message, attributes)).isEqualTo(
+				ACCESS_GRANTED);
 
-        verify(expressionHandler).createEvaluationContext(authentication, message);
-    }
+		verify(expressionHandler).createEvaluationContext(authentication, message);
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
index e8107f16fa..eea4db176f 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptorTests.java
@@ -44,126 +44,135 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ChannelSecurityInterceptorTests {
-    @Mock
-    Message<Object> message;
-    @Mock
-    MessageChannel channel;
-    @Mock
-    MessageSecurityMetadataSource source;
-    @Mock
-    AccessDecisionManager accessDecisionManager;
-    @Mock
-    RunAsManager runAsManager;
-    @Mock
-    Authentication runAs;
+	@Mock
+	Message<Object> message;
+	@Mock
+	MessageChannel channel;
+	@Mock
+	MessageSecurityMetadataSource source;
+	@Mock
+	AccessDecisionManager accessDecisionManager;
+	@Mock
+	RunAsManager runAsManager;
+	@Mock
+	Authentication runAs;
 
-    Authentication originalAuth;
+	Authentication originalAuth;
 
-    List<ConfigAttribute> attrs;
+	List<ConfigAttribute> attrs;
 
-    ChannelSecurityInterceptor interceptor;
+	ChannelSecurityInterceptor interceptor;
 
-    @Before
-    public void setup() {
-        attrs = Arrays.<ConfigAttribute>asList(new SecurityConfig("ROLE_USER"));
-        interceptor = new ChannelSecurityInterceptor(source);
-        interceptor.setAccessDecisionManager(accessDecisionManager);
-        interceptor.setRunAsManager(runAsManager);
+	@Before
+	public void setup() {
+		attrs = Arrays.<ConfigAttribute> asList(new SecurityConfig("ROLE_USER"));
+		interceptor = new ChannelSecurityInterceptor(source);
+		interceptor.setAccessDecisionManager(accessDecisionManager);
+		interceptor.setRunAsManager(runAsManager);
 
-        originalAuth = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(originalAuth);
-    }
+		originalAuth = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(originalAuth);
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorMessageSecurityMetadataSourceNull() {
-        new ChannelSecurityInterceptor(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorMessageSecurityMetadataSourceNull() {
+		new ChannelSecurityInterceptor(null);
+	}
 
-    @Test
-    public void getSecureObjectClass() throws Exception {
-        assertThat(interceptor.getSecureObjectClass()).isEqualTo(Message.class);
-    }
+	@Test
+	public void getSecureObjectClass() throws Exception {
+		assertThat(interceptor.getSecureObjectClass()).isEqualTo(Message.class);
+	}
 
-    @Test
-    public void obtainSecurityMetadataSource() throws Exception {
-        assertThat(interceptor.obtainSecurityMetadataSource()).isEqualTo(source);
-    }
+	@Test
+	public void obtainSecurityMetadataSource() throws Exception {
+		assertThat(interceptor.obtainSecurityMetadataSource()).isEqualTo(source);
+	}
 
-    @Test
-    public void preSendNullAttributes() throws Exception {
-        assertThat(interceptor.preSend(message, channel)).isSameAs(message);
-    }
+	@Test
+	public void preSendNullAttributes() throws Exception {
+		assertThat(interceptor.preSend(message, channel)).isSameAs(message);
+	}
 
-    @Test
-    public void preSendGrant() throws Exception {
-        when(source.getAttributes(message)).thenReturn(attrs);
+	@Test
+	public void preSendGrant() throws Exception {
+		when(source.getAttributes(message)).thenReturn(attrs);
 
-        Message<?> result = interceptor.preSend(message, channel);
+		Message<?> result = interceptor.preSend(message, channel);
 
-        assertThat(result).isSameAs(message);
-    }
+		assertThat(result).isSameAs(message);
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void preSendDeny() throws Exception {
-        when(source.getAttributes(message)).thenReturn(attrs);
-        doThrow(new AccessDeniedException("")).when(accessDecisionManager).decide(any(Authentication.class), eq(message), eq(attrs));
+	@Test(expected = AccessDeniedException.class)
+	public void preSendDeny() throws Exception {
+		when(source.getAttributes(message)).thenReturn(attrs);
+		doThrow(new AccessDeniedException("")).when(accessDecisionManager).decide(
+				any(Authentication.class), eq(message), eq(attrs));
 
-        interceptor.preSend(message, channel);
-    }
+		interceptor.preSend(message, channel);
+	}
 
+	@SuppressWarnings("unchecked")
+	@Test
+	public void preSendPostSendRunAs() throws Exception {
+		when(source.getAttributes(message)).thenReturn(attrs);
+		when(
+				runAsManager.buildRunAs(any(Authentication.class), any(),
+						any(Collection.class))).thenReturn(runAs);
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void preSendPostSendRunAs() throws Exception {
-        when(source.getAttributes(message)).thenReturn(attrs);
-        when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs);
+		Message<?> preSend = interceptor.preSend(message, channel);
 
-        Message<?> preSend = interceptor.preSend(message,channel);
+		assertThat(SecurityContextHolder.getContext().getAuthentication())
+				.isSameAs(runAs);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs);
+		interceptor.postSend(preSend, channel, true);
 
-        interceptor.postSend(preSend, channel, true);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				originalAuth);
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth);
-    }
+	@Test
+	public void afterSendCompletionNotTokenMessageNoExceptionThrown() throws Exception {
+		interceptor.afterSendCompletion(message, channel, true, null);
+	}
 
-    @Test
-    public void afterSendCompletionNotTokenMessageNoExceptionThrown() throws Exception {
-        interceptor.afterSendCompletion(message, channel, true, null);
-    }
+	@SuppressWarnings("unchecked")
+	@Test
+	public void preSendFinallySendRunAs() throws Exception {
+		when(source.getAttributes(message)).thenReturn(attrs);
+		when(
+				runAsManager.buildRunAs(any(Authentication.class), any(),
+						any(Collection.class))).thenReturn(runAs);
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void preSendFinallySendRunAs() throws Exception {
-        when(source.getAttributes(message)).thenReturn(attrs);
-        when(runAsManager.buildRunAs(any(Authentication.class), any(), any(Collection.class))).thenReturn(runAs);
+		Message<?> preSend = interceptor.preSend(message, channel);
 
-        Message<?> preSend = interceptor.preSend(message,channel);
+		assertThat(SecurityContextHolder.getContext().getAuthentication())
+				.isSameAs(runAs);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(runAs);
+		interceptor.afterSendCompletion(preSend, channel, true, new RuntimeException());
 
-        interceptor.afterSendCompletion(preSend, channel, true, new RuntimeException());
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				originalAuth);
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(originalAuth);
-    }
+	@Test
+	public void preReceive() throws Exception {
+		assertThat(interceptor.preReceive(channel)).isTrue();
+		;
+	}
 
-    @Test
-    public void preReceive() throws Exception {
-        assertThat(interceptor.preReceive(channel)).isTrue();;
-    }
+	@Test
+	public void postReceive() throws Exception {
+		assertThat(interceptor.postReceive(message, channel)).isSameAs(message);
+	}
 
-    @Test
-    public void postReceive() throws Exception {
-        assertThat(interceptor.postReceive(message, channel)).isSameAs(message);
-    }
-
-    @Test
-    public void afterReceiveCompletionNullExceptionNoExceptionThrown() throws Exception {
-        interceptor.afterReceiveCompletion(message, channel, null);
-    }
+	@Test
+	public void afterReceiveCompletionNullExceptionNoExceptionThrown() throws Exception {
+		interceptor.afterReceiveCompletion(message, channel, null);
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
index 425e4a01fd..7be6d7a643 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java
@@ -35,63 +35,63 @@ import static org.powermock.api.mockito.PowerMockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultMessageSecurityMetadataSourceTests {
-    @Mock
-    MessageMatcher<Object> matcher1;
-    @Mock
-    MessageMatcher<Object> matcher2;
-    @Mock
-    Message<?> message;
-    @Mock
-    Authentication authentication;
+	@Mock
+	MessageMatcher<Object> matcher1;
+	@Mock
+	MessageMatcher<Object> matcher2;
+	@Mock
+	Message<?> message;
+	@Mock
+	Authentication authentication;
 
-    SecurityConfig config1;
+	SecurityConfig config1;
 
-    SecurityConfig config2;
+	SecurityConfig config2;
 
-    LinkedHashMap<MessageMatcher<?>,Collection<ConfigAttribute>> messageMap;
+	LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> messageMap;
 
-    MessageSecurityMetadataSource source;
+	MessageSecurityMetadataSource source;
 
-    @Before
-    public void setup() {
-        messageMap = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
-        messageMap.put(matcher1, Arrays.<ConfigAttribute>asList(config1));
-        messageMap.put(matcher2, Arrays.<ConfigAttribute>asList(config2));
+	@Before
+	public void setup() {
+		messageMap = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
+		messageMap.put(matcher1, Arrays.<ConfigAttribute> asList(config1));
+		messageMap.put(matcher2, Arrays.<ConfigAttribute> asList(config2));
 
-        source = new DefaultMessageSecurityMetadataSource(messageMap);
-    }
+		source = new DefaultMessageSecurityMetadataSource(messageMap);
+	}
 
-    @Test
-    public void getAttributesNull() {
-        assertThat(source.getAttributes(message)).isNull();
-    }
+	@Test
+	public void getAttributesNull() {
+		assertThat(source.getAttributes(message)).isNull();
+	}
 
-    @Test
-    public void getAttributesFirst() {
-        when(matcher1.matches(message)).thenReturn(true);
+	@Test
+	public void getAttributesFirst() {
+		when(matcher1.matches(message)).thenReturn(true);
 
-        assertThat(source.getAttributes(message)).containsOnly(config1);
-    }
+		assertThat(source.getAttributes(message)).containsOnly(config1);
+	}
 
-    @Test
-    public void getAttributesSecond() {
-        when(matcher1.matches(message)).thenReturn(true);
+	@Test
+	public void getAttributesSecond() {
+		when(matcher1.matches(message)).thenReturn(true);
 
-        assertThat(source.getAttributes(message)).containsOnly(config2);
-    }
+		assertThat(source.getAttributes(message)).containsOnly(config2);
+	}
 
-    @Test
-    public void getAllConfigAttributes() {
-        assertThat(source.getAllConfigAttributes()).containsOnly(config1,config2);
-    }
+	@Test
+	public void getAllConfigAttributes() {
+		assertThat(source.getAllConfigAttributes()).containsOnly(config1, config2);
+	}
 
-    @Test
-    public void supportsFalse() {
-        assertThat(source.supports(Object.class)).isFalse();
-    }
+	@Test
+	public void supportsFalse() {
+		assertThat(source.supports(Object.class)).isFalse();
+	}
 
-    @Test
-    public void supportsTrue() {
-        assertThat(source.supports(Message.class)).isTrue();
-    }
+	@Test
+	public void supportsTrue() {
+		assertThat(source.supports(Message.class)).isTrue();
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java
index 2181bc14c3..9390950487 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.messaging.context;
 
-
 import static org.fest.assertions.Assertions.assertThat;
 
 import java.lang.annotation.ElementType;
@@ -41,162 +40,194 @@ import org.springframework.util.ReflectionUtils;
  *
  */
 public class AuthenticationPrincipalArgumentResolverTests {
-    private Object expectedPrincipal;
-    private AuthenticationPrincipalArgumentResolver resolver;
+	private Object expectedPrincipal;
+	private AuthenticationPrincipalArgumentResolver resolver;
 
-    @Before
-    public void setup() {
-        resolver = new AuthenticationPrincipalArgumentResolver();
-    }
+	@Before
+	public void setup() {
+		resolver = new AuthenticationPrincipalArgumentResolver();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void supportsParameterNoAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
-    }
+	@Test
+	public void supportsParameterNoAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
+	}
 
-    @Test
-    public void supportsParameterAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
-    }
+	@Test
+	public void supportsParameterAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
+	}
 
-    @Test
-    public void supportsParameterCustomAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
-    }
+	@Test
+	public void supportsParameterCustomAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
+	}
 
-    @Test
-    public void resolveArgumentNullAuthentication() throws Exception {
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullAuthentication() throws Exception {
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
+	}
 
-    @Test
-    public void resolveArgumentNullPrincipal() throws Exception {
-        setAuthenticationPrincipal(null);
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullPrincipal() throws Exception {
+		setAuthenticationPrincipal(null);
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
+	}
 
-    @Test
-    public void resolveArgumentString() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentString() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isEqualTo(
+				expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentPrincipalStringOnObject() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentPrincipalStringOnObject() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(
+				expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentUserDetails() throws Exception {
-        setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")));
-        assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentUserDetails() throws Exception {
+		setAuthenticationPrincipal(new User("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
+		assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomUserPrincipal() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomUserPrincipal() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(
+				resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomAnnotation() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomAnnotation() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null)).isEqualTo(
+				expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentNullOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null)).isNull();
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null);
-    }
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null);
+	}
 
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null);
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null);
-    }
+	@Test
+	public void resolveArgumentObject() throws Exception {
+		setAuthenticationPrincipal(new Object());
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(
+				expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentObject() throws Exception {
-        setAuthenticationPrincipal(new Object());
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null)).isEqualTo(expectedPrincipal);
-    }
+	private MethodParameter showUserNoAnnotation() {
+		return getMethodParameter("showUserNoAnnotation", String.class);
+	}
 
-    private MethodParameter showUserNoAnnotation() {
-        return getMethodParameter("showUserNoAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationString() {
+		return getMethodParameter("showUserAnnotation", String.class);
+	}
 
-    private MethodParameter showUserAnnotationString() {
-        return getMethodParameter("showUserAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
+	}
 
-    private MethodParameter showUserAnnotationErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType",
+				String.class);
+	}
 
-    private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationUserDetails() {
+		return getMethodParameter("showUserAnnotation", UserDetails.class);
+	}
 
-    private MethodParameter showUserAnnotationUserDetails() {
-        return getMethodParameter("showUserAnnotation", UserDetails.class);
-    }
+	private MethodParameter showUserAnnotationCustomUserPrincipal() {
+		return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserAnnotationCustomUserPrincipal() {
-        return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserCustomAnnotation() {
+		return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserCustomAnnotation() {
-        return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserAnnotationObject() {
+		return getMethodParameter("showUserAnnotation", Object.class);
+	}
 
-    private MethodParameter showUserAnnotationObject() {
-        return getMethodParameter("showUserAnnotation", Object.class);
-    }
+	private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
+		Method method = ReflectionUtils.findMethod(TestController.class, methodName,
+				paramTypes);
+		return new MethodParameter(method, 0);
+	}
 
-    private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
-        Method method = ReflectionUtils.findMethod(TestController.class, methodName,paramTypes);
-        return new MethodParameter(method,0);
-    }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal
+	static @interface CurrentUser {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal
-    static @interface CurrentUser { }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal(errorOnInvalidType = true)
+	static @interface CurrentUserErrorOnInvalidType {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal(errorOnInvalidType = true)
-    static @interface CurrentUserErrorOnInvalidType { }
+	public static class TestController {
+		public void showUserNoAnnotation(String user) {
+		}
 
-    public static class TestController {
-        public void showUserNoAnnotation(String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal String user) {}
-        public void showUserAnnotationErrorOnInvalidType(@AuthenticationPrincipal(errorOnInvalidType=true) String user) {}
-        public void showUserAnnotationCurrentUserErrorOnInvalidType(@CurrentUserErrorOnInvalidType String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {}
-        public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal Object user) {}
-    }
+		public void showUserAnnotation(@AuthenticationPrincipal String user) {
+		}
 
-    private static class CustomUserPrincipal {}
+		public void showUserAnnotationErrorOnInvalidType(
+				@AuthenticationPrincipal(errorOnInvalidType = true) String user) {
+		}
 
-    private void setAuthenticationPrincipal(Object principal) {
-        this.expectedPrincipal = principal;
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER"));
-    }
+		public void showUserAnnotationCurrentUserErrorOnInvalidType(
+				@CurrentUserErrorOnInvalidType String user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {
+		}
+
+		public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal Object user) {
+		}
+	}
+
+	private static class CustomUserPrincipal {
+	}
+
+	private void setAuthenticationPrincipal(Object principal) {
+		this.expectedPrincipal = principal;
+		SecurityContextHolder.getContext()
+				.setAuthentication(
+						new TestingAuthenticationToken(expectedPrincipal, "password",
+								"ROLE_USER"));
+	}
 }
diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java
index 61218aff27..0805ba2b61 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptorTests.java
@@ -25,217 +25,233 @@ import static org.springframework.security.core.context.SecurityContextHolder.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SecurityContextChannelInterceptorTests {
-    @Mock
-    MessageChannel channel;
-    @Mock
-    MessageHandler handler;
-    @Mock
-    Principal principal;
+	@Mock
+	MessageChannel channel;
+	@Mock
+	MessageHandler handler;
+	@Mock
+	Principal principal;
 
-    MessageBuilder<String> messageBuilder;
+	MessageBuilder<String> messageBuilder;
 
-    Authentication authentication;
+	Authentication authentication;
 
-    SecurityContextChannelInterceptor interceptor;
+	SecurityContextChannelInterceptor interceptor;
 
-    AnonymousAuthenticationToken expectedAnonymous;
+	AnonymousAuthenticationToken expectedAnonymous;
 
-    @Before
-    public void setup() {
-        authentication = new TestingAuthenticationToken("user","pass", "ROLE_USER");
-        messageBuilder = MessageBuilder.withPayload("payload");
-        expectedAnonymous = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+	@Before
+	public void setup() {
+		authentication = new TestingAuthenticationToken("user", "pass", "ROLE_USER");
+		messageBuilder = MessageBuilder.withPayload("payload");
+		expectedAnonymous = new AnonymousAuthenticationToken("key", "anonymous",
+				AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
 
-        interceptor = new SecurityContextChannelInterceptor();
-    }
+		interceptor = new SecurityContextChannelInterceptor();
+	}
 
-    @After
-    public void cleanup() {
-        clearContext();
-    }
+	@After
+	public void cleanup() {
+		clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeader() {
-        new SecurityContextChannelInterceptor(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeader() {
+		new SecurityContextChannelInterceptor(null);
+	}
 
-    @Test
-    public void preSendCustomHeader() throws Exception {
-        String headerName = "header";
-        interceptor = new SecurityContextChannelInterceptor(headerName);
-        messageBuilder.setHeader(headerName, authentication);
+	@Test
+	public void preSendCustomHeader() throws Exception {
+		String headerName = "header";
+		interceptor = new SecurityContextChannelInterceptor(headerName);
+		messageBuilder.setHeader(headerName, authentication);
 
-        interceptor.preSend(messageBuilder.build(), channel);
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
+	}
 
-    @Test
-    public void preSendUserSet() throws Exception {
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
+	@Test
+	public void preSendUserSet() throws Exception {
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
 
-        interceptor.preSend(messageBuilder.build(), channel);
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setAnonymousAuthenticationNull() {
-        interceptor.setAnonymousAuthentication(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setAnonymousAuthenticationNull() {
+		interceptor.setAnonymousAuthentication(null);
+	}
 
-    @Test
-    public void preSendUsesCustomAnonymous() throws Exception {
-        expectedAnonymous = new AnonymousAuthenticationToken("customKey", "customAnonymous", AuthorityUtils.createAuthorityList("ROLE_CUSTOM"));
-        interceptor.setAnonymousAuthentication(expectedAnonymous);
+	@Test
+	public void preSendUsesCustomAnonymous() throws Exception {
+		expectedAnonymous = new AnonymousAuthenticationToken("customKey",
+				"customAnonymous", AuthorityUtils.createAuthorityList("ROLE_CUSTOM"));
+		interceptor.setAnonymousAuthentication(expectedAnonymous);
 
-        interceptor.preSend(messageBuilder.build(), channel);
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
-    // SEC-2845
-    @Test
-    public void preSendUserNotAuthentication() throws Exception {
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal);
+	// SEC-2845
+	@Test
+	public void preSendUserNotAuthentication() throws Exception {
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal);
 
-        interceptor.preSend(messageBuilder.build(), channel);
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
-    // SEC-2845
-    @Test
-    public void preSendUserNotSet() throws Exception {
-        interceptor.preSend(messageBuilder.build(), channel);
+	// SEC-2845
+	@Test
+	public void preSendUserNotSet() throws Exception {
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
-    // SEC-2845
-    @Test
-    public void preSendUserNotSetCustomAnonymous() throws Exception {
-        interceptor.preSend(messageBuilder.build(), channel);
+	// SEC-2845
+	@Test
+	public void preSendUserNotSetCustomAnonymous() throws Exception {
+		interceptor.preSend(messageBuilder.build(), channel);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
-    @Test
-    public void afterSendCompletion() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+	@Test
+	public void afterSendCompletion() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null);
+		interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-    @Test
-    public void afterSendCompletionNullAuthentication() throws Exception {
-        interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null);
+	@Test
+	public void afterSendCompletionNullAuthentication() throws Exception {
+		interceptor.afterSendCompletion(messageBuilder.build(), channel, true, null);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-    @Test
-    public void beforeHandleUserSet() throws Exception {
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
+	@Test
+	public void beforeHandleUserSet() throws Exception {
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
 
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
+	}
 
-    // SEC-2845
-    @Test
-    public void beforeHandleUserNotAuthentication() throws Exception {
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal);
+	// SEC-2845
+	@Test
+	public void beforeHandleUserNotAuthentication() throws Exception {
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, principal);
 
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
-    // SEC-2845
-    @Test
-    public void beforeHandleUserNotSet() throws Exception {
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+	// SEC-2845
+	@Test
+	public void beforeHandleUserNotSet() throws Exception {
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        assertAnonymous();
-    }
+		assertAnonymous();
+	}
 
+	@Test
+	public void afterMessageHandledUserNotSet() throws Exception {
+		interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
 
-    @Test
-    public void afterMessageHandledUserNotSet() throws Exception {
-        interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+	@Test
+	public void afterMessageHandled() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-    @Test
-    public void afterMessageHandled() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+		interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
 
-        interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+	// SEC-2829
+	@Test
+	public void restoresOriginalContext() throws Exception {
+		TestingAuthenticationToken original = new TestingAuthenticationToken("original",
+				"original", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(original);
 
-    // SEC-2829
-    @Test
-    public void restoresOriginalContext() throws Exception {
-        TestingAuthenticationToken original = new TestingAuthenticationToken("original", "original", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(original);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
+		interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
 
-        interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				original);
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(original);
-    }
+	/**
+	 * If a user sends a websocket when processing another websocket
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void restoresOriginalContextNestedThreeDeep() throws Exception {
+		AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key",
+				"anonymous", AuthorityUtils.createAuthorityList("ROLE_USER"));
 
-    /**
-     * If a user sends a websocket when processing another websocket
-     *
-     * @throws Exception
-     */
-    @Test
-    public void restoresOriginalContextNestedThreeDeep() throws Exception {
-        AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_USER"));
+		TestingAuthenticationToken origional = new TestingAuthenticationToken("original",
+				"origional", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(origional);
 
-        TestingAuthenticationToken origional = new TestingAuthenticationToken("original", "origional", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(origional);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, authentication);
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
+		// start send websocket
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, null);
+		interceptor.beforeHandle(messageBuilder.build(), channel, handler);
 
-        // start send websocket
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.USER_HEADER, null);
-        interceptor.beforeHandle(messageBuilder.build(), channel, handler);
+		assertThat(SecurityContextHolder.getContext().getAuthentication().getName())
+				.isEqualTo(anonymous.getName());
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo(anonymous.getName());
+		interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
 
-        interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				authentication);
+		// end send websocket
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(authentication);
-        // end send websocket
+		interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
 
-        interceptor.afterMessageHandled(messageBuilder.build(), channel, handler, null);
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				origional);
+	}
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(origional);
-    }
+	private void assertAnonymous() {
+		Authentication currentAuthentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		assertThat(currentAuthentication)
+				.isInstanceOf(AnonymousAuthenticationToken.class);
 
-    private void assertAnonymous() {
-        Authentication currentAuthentication = SecurityContextHolder.getContext().getAuthentication();
-        assertThat(currentAuthentication).isInstanceOf(AnonymousAuthenticationToken.class);
-
-        AnonymousAuthenticationToken anonymous = (AnonymousAuthenticationToken) currentAuthentication;
-        assertThat(anonymous.getName()).isEqualTo(expectedAnonymous.getName());
-        assertThat(anonymous.getAuthorities()).containsOnly(expectedAnonymous.getAuthorities().toArray());
-        assertThat(anonymous.getKeyHash()).isEqualTo(expectedAnonymous.getKeyHash());
-    }
+		AnonymousAuthenticationToken anonymous = (AnonymousAuthenticationToken) currentAuthentication;
+		assertThat(anonymous.getName()).isEqualTo(expectedAnonymous.getName());
+		assertThat(anonymous.getAuthorities()).containsOnly(
+				expectedAnonymous.getAuthorities().toArray());
+		assertThat(anonymous.getKeyHash()).isEqualTo(expectedAnonymous.getKeyHash());
+	}
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java
index d7f26c044f..cb8d33c209 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java
@@ -30,90 +30,88 @@ import org.springframework.messaging.Message;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AndMessageMatcherTest {
-    @Mock
-    private MessageMatcher<Object> delegate;
+	@Mock
+	private MessageMatcher<Object> delegate;
 
-    @Mock
-    private MessageMatcher<Object> delegate2;
+	@Mock
+	private MessageMatcher<Object> delegate2;
 
-    @Mock
-    private Message<Object> message;
+	@Mock
+	private Message<Object> message;
 
-    private MessageMatcher<Object> matcher;
+	private MessageMatcher<Object> matcher;
 
-    @Test(expected = NullPointerException.class)
-    public void constructorNullArray() {
-        new AndMessageMatcher<Object>((MessageMatcher<Object>[]) null);
-    }
+	@Test(expected = NullPointerException.class)
+	public void constructorNullArray() {
+		new AndMessageMatcher<Object>((MessageMatcher<Object>[]) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorArrayContainsNull() {
-        new AndMessageMatcher<Object>((MessageMatcher<Object>)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorArrayContainsNull() {
+		new AndMessageMatcher<Object>((MessageMatcher<Object>) null);
+	}
 
-    @SuppressWarnings("unchecked")
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyArray() {
-        new AndMessageMatcher<Object>((MessageMatcher<Object>[])new MessageMatcher[0]);
-    }
+	@SuppressWarnings("unchecked")
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyArray() {
+		new AndMessageMatcher<Object>((MessageMatcher<Object>[]) new MessageMatcher[0]);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullList() {
-        new AndMessageMatcher<Object>((List<MessageMatcher<Object>>) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullList() {
+		new AndMessageMatcher<Object>((List<MessageMatcher<Object>>) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorListContainsNull() {
-        new AndMessageMatcher<Object>(Arrays.asList((MessageMatcher<Object>)null));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorListContainsNull() {
+		new AndMessageMatcher<Object>(Arrays.asList((MessageMatcher<Object>) null));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyList() {
-        new AndMessageMatcher<Object>(Collections.<MessageMatcher<Object>>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyList() {
+		new AndMessageMatcher<Object>(Collections.<MessageMatcher<Object>> emptyList());
+	}
 
-    @Test
-    public void matchesSingleTrue() {
-        when(delegate.matches(message)).thenReturn(true);
-        matcher = new AndMessageMatcher<Object>(delegate);
+	@Test
+	public void matchesSingleTrue() {
+		when(delegate.matches(message)).thenReturn(true);
+		matcher = new AndMessageMatcher<Object>(delegate);
 
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 
-    @Test
-    public void matchesMultiTrue() {
-        when(delegate.matches(message)).thenReturn(true);
-        when(delegate2.matches(message)).thenReturn(true);
-        matcher = new AndMessageMatcher<Object>(delegate, delegate2);
+	@Test
+	public void matchesMultiTrue() {
+		when(delegate.matches(message)).thenReturn(true);
+		when(delegate2.matches(message)).thenReturn(true);
+		matcher = new AndMessageMatcher<Object>(delegate, delegate2);
 
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 
+	@Test
+	public void matchesSingleFalse() {
+		when(delegate.matches(message)).thenReturn(false);
+		matcher = new AndMessageMatcher<Object>(delegate);
 
-    @Test
-    public void matchesSingleFalse() {
-        when(delegate.matches(message)).thenReturn(false);
-        matcher = new AndMessageMatcher<Object>(delegate);
+		assertThat(matcher.matches(message)).isFalse();
+	}
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+	@Test
+	public void matchesMultiBothFalse() {
+		when(delegate.matches(message)).thenReturn(false);
+		when(delegate2.matches(message)).thenReturn(false);
+		matcher = new AndMessageMatcher<Object>(delegate, delegate2);
 
-    @Test
-    public void matchesMultiBothFalse() {
-        when(delegate.matches(message)).thenReturn(false);
-        when(delegate2.matches(message)).thenReturn(false);
-        matcher = new AndMessageMatcher<Object>(delegate, delegate2);
+		assertThat(matcher.matches(message)).isFalse();
+	}
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+	@Test
+	public void matchesMultiSingleFalse() {
+		when(delegate.matches(message)).thenReturn(true);
+		when(delegate2.matches(message)).thenReturn(false);
+		matcher = new AndMessageMatcher<Object>(delegate, delegate2);
 
-    @Test
-    public void matchesMultiSingleFalse() {
-        when(delegate.matches(message)).thenReturn(true);
-        when(delegate2.matches(message)).thenReturn(false);
-        matcher = new AndMessageMatcher<Object>(delegate, delegate2);
-
-        assertThat(matcher.matches(message)).isFalse();
-    }
+		assertThat(matcher.matches(message)).isFalse();
+	}
 }
-
diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java
index 16f1d0530b..748a253c32 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java
@@ -30,90 +30,88 @@ import org.springframework.messaging.Message;
 
 @RunWith(MockitoJUnitRunner.class)
 public class OrMessageMatcherTest {
-    @Mock
-    private MessageMatcher<Object> delegate;
+	@Mock
+	private MessageMatcher<Object> delegate;
 
-    @Mock
-    private MessageMatcher<Object> delegate2;
+	@Mock
+	private MessageMatcher<Object> delegate2;
 
-    @Mock
-    private Message<Object> message;
+	@Mock
+	private Message<Object> message;
 
-    private MessageMatcher<Object> matcher;
+	private MessageMatcher<Object> matcher;
 
-    @Test(expected = NullPointerException.class)
-    public void constructorNullArray() {
-        new OrMessageMatcher<Object>((MessageMatcher<Object>[]) null);
-    }
+	@Test(expected = NullPointerException.class)
+	public void constructorNullArray() {
+		new OrMessageMatcher<Object>((MessageMatcher<Object>[]) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorArrayContainsNull() {
-        new OrMessageMatcher<Object>((MessageMatcher<Object>)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorArrayContainsNull() {
+		new OrMessageMatcher<Object>((MessageMatcher<Object>) null);
+	}
 
-    @SuppressWarnings("unchecked")
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyArray() {
-        new OrMessageMatcher<Object>((MessageMatcher<Object>[])new MessageMatcher[0]);
-    }
+	@SuppressWarnings("unchecked")
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyArray() {
+		new OrMessageMatcher<Object>((MessageMatcher<Object>[]) new MessageMatcher[0]);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullList() {
-        new OrMessageMatcher<Object>((List<MessageMatcher<Object>>) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullList() {
+		new OrMessageMatcher<Object>((List<MessageMatcher<Object>>) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorListContainsNull() {
-        new OrMessageMatcher<Object>(Arrays.asList((MessageMatcher<Object>)null));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorListContainsNull() {
+		new OrMessageMatcher<Object>(Arrays.asList((MessageMatcher<Object>) null));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyList() {
-        new OrMessageMatcher<Object>(Collections.<MessageMatcher<Object>>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyList() {
+		new OrMessageMatcher<Object>(Collections.<MessageMatcher<Object>> emptyList());
+	}
 
-    @Test
-    public void matchesSingleTrue() {
-        when(delegate.matches(message)).thenReturn(true);
-        matcher = new OrMessageMatcher<Object>(delegate);
+	@Test
+	public void matchesSingleTrue() {
+		when(delegate.matches(message)).thenReturn(true);
+		matcher = new OrMessageMatcher<Object>(delegate);
 
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 
-    @Test
-    public void matchesMultiTrue() {
-        when(delegate.matches(message)).thenReturn(true);
-        when(delegate2.matches(message)).thenReturn(true);
-        matcher = new OrMessageMatcher<Object>(delegate, delegate2);
+	@Test
+	public void matchesMultiTrue() {
+		when(delegate.matches(message)).thenReturn(true);
+		when(delegate2.matches(message)).thenReturn(true);
+		matcher = new OrMessageMatcher<Object>(delegate, delegate2);
 
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 
+	@Test
+	public void matchesSingleFalse() {
+		when(delegate.matches(message)).thenReturn(false);
+		matcher = new OrMessageMatcher<Object>(delegate);
 
-    @Test
-    public void matchesSingleFalse() {
-        when(delegate.matches(message)).thenReturn(false);
-        matcher = new OrMessageMatcher<Object>(delegate);
+		assertThat(matcher.matches(message)).isFalse();
+	}
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+	@Test
+	public void matchesMultiBothFalse() {
+		when(delegate.matches(message)).thenReturn(false);
+		when(delegate2.matches(message)).thenReturn(false);
+		matcher = new OrMessageMatcher<Object>(delegate, delegate2);
 
-    @Test
-    public void matchesMultiBothFalse() {
-        when(delegate.matches(message)).thenReturn(false);
-        when(delegate2.matches(message)).thenReturn(false);
-        matcher = new OrMessageMatcher<Object>(delegate, delegate2);
+		assertThat(matcher.matches(message)).isFalse();
+	}
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+	@Test
+	public void matchesMultiSingleFalse() {
+		when(delegate.matches(message)).thenReturn(true);
+		when(delegate2.matches(message)).thenReturn(false);
+		matcher = new OrMessageMatcher<Object>(delegate, delegate2);
 
-    @Test
-    public void matchesMultiSingleFalse() {
-        when(delegate.matches(message)).thenReturn(true);
-        when(delegate2.matches(message)).thenReturn(false);
-        matcher = new OrMessageMatcher<Object>(delegate, delegate2);
-
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 }
-
diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java
index ec23fde157..1e2c3a9a5f 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcherTests.java
@@ -25,107 +25,118 @@ import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 
-
 public class SimpDestinationMessageMatcherTests {
-    MessageBuilder<String> messageBuilder;
+	MessageBuilder<String> messageBuilder;
 
-    SimpDestinationMessageMatcher matcher;
+	SimpDestinationMessageMatcher matcher;
 
-    PathMatcher pathMatcher;
+	PathMatcher pathMatcher;
 
-    @Before
-    public void setup() {
-        messageBuilder = MessageBuilder.withPayload("M");
-        matcher = new SimpDestinationMessageMatcher("/**");
-        pathMatcher = new AntPathMatcher();
-    }
+	@Before
+	public void setup() {
+		messageBuilder = MessageBuilder.withPayload("M");
+		matcher = new SimpDestinationMessageMatcher("/**");
+		pathMatcher = new AntPathMatcher();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorPatternNull() {
-        new SimpDestinationMessageMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorPatternNull() {
+		new SimpDestinationMessageMatcher(null);
+	}
 
-    public void constructorOnlyPathNoError() {
-        new SimpDestinationMessageMatcher("/path");
-    }
+	public void constructorOnlyPathNoError() {
+		new SimpDestinationMessageMatcher("/path");
+	}
 
-    @Test
-    public void matchesDoesNotMatchNullDestination() throws Exception {
-        assertThat(matcher.matches(messageBuilder.build())).isFalse();
-    }
+	@Test
+	public void matchesDoesNotMatchNullDestination() throws Exception {
+		assertThat(matcher.matches(messageBuilder.build())).isFalse();
+	}
 
-    @Test
-    public void matchesAllWithDestination() throws Exception {
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/destination/1");
+	@Test
+	public void matchesAllWithDestination() throws Exception {
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+				"/destination/1");
 
-        assertThat(matcher.matches(messageBuilder.build())).isTrue();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isTrue();
+	}
 
-    @Test
-    public void matchesSpecificWithDestination() throws Exception {
-        matcher = new SimpDestinationMessageMatcher("/destination/1");
+	@Test
+	public void matchesSpecificWithDestination() throws Exception {
+		matcher = new SimpDestinationMessageMatcher("/destination/1");
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/destination/1");
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+				"/destination/1");
 
-        assertThat(matcher.matches(messageBuilder.build())).isTrue();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isTrue();
+	}
 
-    @Test
-    public void matchesFalseWithDestination() throws Exception {
-        matcher = new SimpDestinationMessageMatcher("/nomatch");
+	@Test
+	public void matchesFalseWithDestination() throws Exception {
+		matcher = new SimpDestinationMessageMatcher("/nomatch");
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/destination/1");
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,
+				"/destination/1");
 
-        assertThat(matcher.matches(messageBuilder.build())).isFalse();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isFalse();
+	}
 
-    @Test
-    public void matchesFalseMessageTypeNotDisconnectType() throws Exception {
-        matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
+	@Test
+	public void matchesFalseMessageTypeNotDisconnectType() throws Exception {
+		matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
+				pathMatcher);
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.DISCONNECT);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+				SimpMessageType.DISCONNECT);
 
-        assertThat(matcher.matches(messageBuilder.build())).isFalse();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isFalse();
+	}
 
-    @Test
-    public void matchesTrueMessageType() throws Exception {
-        matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
+	@Test
+	public void matchesTrueMessageType() throws Exception {
+		matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
+				pathMatcher);
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/match");
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+				SimpMessageType.MESSAGE);
 
-        assertThat(matcher.matches(messageBuilder.build())).isTrue();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isTrue();
+	}
 
-    @Test
-    public void matchesTrueSubscribeType() throws Exception {
-        matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match", pathMatcher);
+	@Test
+	public void matchesTrueSubscribeType() throws Exception {
+		matcher = SimpDestinationMessageMatcher.createSubscribeMatcher("/match",
+				pathMatcher);
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/match");
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.SUBSCRIBE);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+				SimpMessageType.SUBSCRIBE);
 
-        assertThat(matcher.matches(messageBuilder.build())).isTrue();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isTrue();
+	}
 
-    @Test
-    public void matchesNullMessageType() throws Exception {
-        matcher = new SimpDestinationMessageMatcher("/match");
+	@Test
+	public void matchesNullMessageType() throws Exception {
+		matcher = new SimpDestinationMessageMatcher("/match");
 
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER,"/match");
-        messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE);
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.DESTINATION_HEADER, "/match");
+		messageBuilder.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+				SimpMessageType.MESSAGE);
 
-        assertThat(matcher.matches(messageBuilder.build())).isTrue();
-    }
+		assertThat(matcher.matches(messageBuilder.build())).isTrue();
+	}
 
-    @Test
-    public void typeConstructorParameterIsTransmitted() throws Exception {
-        matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match", pathMatcher);
+	@Test
+	public void typeConstructorParameterIsTransmitted() throws Exception {
+		matcher = SimpDestinationMessageMatcher.createMessageMatcher("/match",
+				pathMatcher);
 
-        MessageMatcher<Object> expectedTypeMatcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE);
+		MessageMatcher<Object> expectedTypeMatcher = new SimpMessageTypeMatcher(
+				SimpMessageType.MESSAGE);
 
-        assertThat(matcher.getMessageTypeMatcher()).isEqualTo(expectedTypeMatcher);
+		assertThat(matcher.getMessageTypeMatcher()).isEqualTo(expectedTypeMatcher);
 
-    }
+	}
 
 }
\ No newline at end of file
diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java
index 188d84cd4e..f6985f65bf 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcherTests.java
@@ -25,44 +25,42 @@ import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.support.MessageBuilder;
 
 public class SimpMessageTypeMatcherTests {
-    private SimpMessageTypeMatcher matcher;
+	private SimpMessageTypeMatcher matcher;
 
-    @Before
-    public void setup() {
-        matcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE);
-    }
+	@Before
+	public void setup() {
+		matcher = new SimpMessageTypeMatcher(SimpMessageType.MESSAGE);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullType() {
-        new SimpMessageTypeMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullType() {
+		new SimpMessageTypeMatcher(null);
+	}
 
-    @Test
-    public void matchesMessageMessageTrue() {
-        Message<String> message = MessageBuilder
-            .withPayload("Hi")
-            .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.MESSAGE)
-            .build();
+	@Test
+	public void matchesMessageMessageTrue() {
+		Message<String> message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+						SimpMessageType.MESSAGE).build();
 
-        assertThat(matcher.matches(message)).isTrue();
-    }
+		assertThat(matcher.matches(message)).isTrue();
+	}
 
-    @Test
-    public void matchesMessageConnectFalse() {
-        Message<String> message = MessageBuilder
-            .withPayload("Hi")
-            .setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER, SimpMessageType.CONNECT)
-            .build();
+	@Test
+	public void matchesMessageConnectFalse() {
+		Message<String> message = MessageBuilder
+				.withPayload("Hi")
+				.setHeader(SimpMessageHeaderAccessor.MESSAGE_TYPE_HEADER,
+						SimpMessageType.CONNECT).build();
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+		assertThat(matcher.matches(message)).isFalse();
+	}
 
-    @Test
-    public void matchesMessageNullFalse() {
-        Message<String> message = MessageBuilder
-            .withPayload("Hi")
-            .build();
+	@Test
+	public void matchesMessageNullFalse() {
+		Message<String> message = MessageBuilder.withPayload("Hi").build();
 
-        assertThat(matcher.matches(message)).isFalse();
-    }
+		assertThat(matcher.matches(message)).isFalse();
+	}
 }
diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java
index 69b9785a5e..848e2e4777 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java
@@ -35,120 +35,118 @@ import org.springframework.security.web.csrf.MissingCsrfTokenException;
 
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfChannelInterceptorTests {
-    @Mock
-    MessageChannel channel;
+	@Mock
+	MessageChannel channel;
 
-    SimpMessageHeaderAccessor messageHeaders;
+	SimpMessageHeaderAccessor messageHeaders;
 
-    CsrfToken token;
+	CsrfToken token;
 
-    CsrfChannelInterceptor interceptor;
+	CsrfChannelInterceptor interceptor;
 
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("header", "param", "token");
-        interceptor = new CsrfChannelInterceptor();
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("header", "param", "token");
+		interceptor = new CsrfChannelInterceptor();
 
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
-        messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken());
-        messageHeaders.setSessionAttributes(new HashMap<String,Object>());
-        messageHeaders.getSessionAttributes().put(CsrfToken.class.getName(), token);
-    }
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
+		messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken());
+		messageHeaders.setSessionAttributes(new HashMap<String, Object>());
+		messageHeaders.getSessionAttributes().put(CsrfToken.class.getName(), token);
+	}
 
-    @Test
-    public void preSendValidToken() {
-        interceptor.preSend(message(), channel);
-    }
+	@Test
+	public void preSendValidToken() {
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresConnectAck() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK);
+	@Test
+	public void preSendIgnoresConnectAck() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresDisconnect() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT);
+	@Test
+	public void preSendIgnoresDisconnect() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresDisconnectAck() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT_ACK);
+	@Test
+	public void preSendIgnoresDisconnectAck() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.DISCONNECT_ACK);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresHeartbeat() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.HEARTBEAT);
+	@Test
+	public void preSendIgnoresHeartbeat() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.HEARTBEAT);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresMessage() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE);
+	@Test
+	public void preSendIgnoresMessage() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.MESSAGE);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresOther() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.OTHER);
+	@Test
+	public void preSendIgnoresOther() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.OTHER);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresSubscribe() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE);
+	@Test
+	public void preSendIgnoresSubscribe() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.SUBSCRIBE);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test
-    public void preSendIgnoresUnsubscribe() {
-        messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.UNSUBSCRIBE);
+	@Test
+	public void preSendIgnoresUnsubscribe() {
+		messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.UNSUBSCRIBE);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test(expected = InvalidCsrfTokenException.class)
-    public void preSendNoToken() {
-        messageHeaders.removeNativeHeader(token.getHeaderName());
+	@Test(expected = InvalidCsrfTokenException.class)
+	public void preSendNoToken() {
+		messageHeaders.removeNativeHeader(token.getHeaderName());
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test(expected = InvalidCsrfTokenException.class)
-    public void preSendInvalidToken() {
-        messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken() + "invalid");
+	@Test(expected = InvalidCsrfTokenException.class)
+	public void preSendInvalidToken() {
+		messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken()
+				+ "invalid");
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test(expected = MissingCsrfTokenException.class)
-    public void preSendMissingToken() {
-        messageHeaders.getSessionAttributes().clear();
+	@Test(expected = MissingCsrfTokenException.class)
+	public void preSendMissingToken() {
+		messageHeaders.getSessionAttributes().clear();
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    @Test(expected = MissingCsrfTokenException.class)
-    public void preSendMissingTokenNullSessionAttributes() {
-        messageHeaders.setSessionAttributes(null);
+	@Test(expected = MissingCsrfTokenException.class)
+	public void preSendMissingTokenNullSessionAttributes() {
+		messageHeaders.setSessionAttributes(null);
 
-        interceptor.preSend(message(), channel);
-    }
+		interceptor.preSend(message(), channel);
+	}
 
-    private Message<String> message() {
-        Map<String, Object> headersToCopy = messageHeaders.toMap();
-        return MessageBuilder
-                    .withPayload("hi")
-                    .copyHeaders(headersToCopy)
-                    .build();
-    }
+	private Message<String> message() {
+		Map<String, Object> headersToCopy = messageHeaders.toMap();
+		return MessageBuilder.withPayload("hi").copyHeaders(headersToCopy).build();
+	}
 }
diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java
index d7f29c4dea..34674ed489 100644
--- a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java
+++ b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java
@@ -33,51 +33,50 @@ import java.util.Map;
 
 import static org.fest.assertions.Assertions.assertThat;
 
-
 /**
  *
  * @author Rob Winch
  */
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfTokenHandshakeInterceptorTests {
-    @Mock
-    WebSocketHandler wsHandler;
-    @Mock
-    ServerHttpResponse response;
+	@Mock
+	WebSocketHandler wsHandler;
+	@Mock
+	ServerHttpResponse response;
 
-    Map<String, Object> attributes;
+	Map<String, Object> attributes;
 
-    ServerHttpRequest request;
+	ServerHttpRequest request;
 
-    MockHttpServletRequest httpRequest;
+	MockHttpServletRequest httpRequest;
 
-    CsrfTokenHandshakeInterceptor interceptor;
+	CsrfTokenHandshakeInterceptor interceptor;
 
-    @Before
-    public void setup() {
-        httpRequest = new MockHttpServletRequest();
-        attributes = new HashMap<String,Object>();
-        request = new ServletServerHttpRequest(httpRequest);
+	@Before
+	public void setup() {
+		httpRequest = new MockHttpServletRequest();
+		attributes = new HashMap<String, Object>();
+		request = new ServletServerHttpRequest(httpRequest);
 
-        interceptor = new CsrfTokenHandshakeInterceptor();
-    }
+		interceptor = new CsrfTokenHandshakeInterceptor();
+	}
 
-    @Test
-    public void beforeHandshakeNoAttribute() throws Exception {
-        interceptor.beforeHandshake(request, response, wsHandler, attributes);
+	@Test
+	public void beforeHandshakeNoAttribute() throws Exception {
+		interceptor.beforeHandshake(request, response, wsHandler, attributes);
 
-        assertThat(attributes).isEmpty();
-    }
+		assertThat(attributes).isEmpty();
+	}
 
-    @Test
-    public void beforeHandshake() throws Exception {
-        CsrfToken token = new DefaultCsrfToken("header", "param", "token");
-        httpRequest.setAttribute(CsrfToken.class.getName(), token);
+	@Test
+	public void beforeHandshake() throws Exception {
+		CsrfToken token = new DefaultCsrfToken("header", "param", "token");
+		httpRequest.setAttribute(CsrfToken.class.getName(), token);
 
-        interceptor.beforeHandshake(request, response, wsHandler, attributes);
+		interceptor.beforeHandshake(request, response, wsHandler, attributes);
 
-        assertThat(attributes.keySet()).containsOnly(CsrfToken.class.getName());
-        assertThat(attributes.values()).containsOnly(token);
-    }
+		assertThat(attributes.keySet()).containsOnly(CsrfToken.class.getName());
+		assertThat(attributes.values()).containsOnly(token);
+	}
 
 }
\ No newline at end of file
diff --git a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java
index f36a1b5d2e..0b6963fd18 100644
--- a/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java
+++ b/openid/src/main/java/org/springframework/security/openid/AuthenticationCancelledException.java
@@ -16,20 +16,20 @@ package org.springframework.security.openid;
 
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
  * Indicates that OpenID authentication was cancelled
  *
  * @author Robin Bramley, Opsera Ltd
  */
 public class AuthenticationCancelledException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AuthenticationCancelledException(String msg) {
-        super(msg);
-    }
+	public AuthenticationCancelledException(String msg) {
+		super(msg);
+	}
 
-    public AuthenticationCancelledException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	public AuthenticationCancelledException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java
index e2a90afb64..fa0fb42707 100644
--- a/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java
+++ b/openid/src/main/java/org/springframework/security/openid/AxFetchListFactory.java
@@ -3,23 +3,23 @@ package org.springframework.security.openid;
 import java.util.List;
 
 /**
- * A strategy which can be used by an OpenID consumer implementation, to dynamically determine
- * the attribute exchange information based on the OpenID identifier.
+ * A strategy which can be used by an OpenID consumer implementation, to dynamically
+ * determine the attribute exchange information based on the OpenID identifier.
  * <p>
- * This allows the list of attributes for a fetch request to be tailored for different OpenID providers, since they
- * do not all support the same attributes.
+ * This allows the list of attributes for a fetch request to be tailored for different
+ * OpenID providers, since they do not all support the same attributes.
  *
  * @author Luke Taylor
  * @since 3.1
  */
 public interface AxFetchListFactory {
 
-    /**
-     * Builds the list of attributes which should be added to the fetch request for the
-     * supplied OpenID identifier.
-     *
-     * @param identifier the claimed_identity
-     * @return the attributes to fetch for this identifier
-     */
-    List<OpenIDAttribute> createAttributeList(String identifier);
+	/**
+	 * Builds the list of attributes which should be added to the fetch request for the
+	 * supplied OpenID identifier.
+	 *
+	 * @param identifier the claimed_identity
+	 * @return the attributes to fetch for this identifier
+	 */
+	List<OpenIDAttribute> createAttributeList(String identifier);
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java
index 8b1f6dd109..12358712ff 100644
--- a/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java
+++ b/openid/src/main/java/org/springframework/security/openid/NullAxFetchListFactory.java
@@ -8,7 +8,7 @@ import java.util.List;
  * @since 3.1
  */
 public class NullAxFetchListFactory implements AxFetchListFactory {
-    public List<OpenIDAttribute> createAttributeList(String identifier) {
-        return Collections.emptyList();
-    }
+	public List<OpenIDAttribute> createAttributeList(String identifier) {
+		return Collections.emptyList();
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
index 8beaef52ca..ca8fce0657 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
@@ -39,172 +39,195 @@ import org.openid4java.message.ax.FetchRequest;
 import org.openid4java.message.ax.FetchResponse;
 import org.springframework.util.StringUtils;
 
-
 /**
  * @author Ray Krueger
  * @author Luke Taylor
  */
 @SuppressWarnings("unchecked")
 public class OpenID4JavaConsumer implements OpenIDConsumer {
-    private static final String DISCOVERY_INFO_KEY = DiscoveryInformation.class.getName();
-    private static final String ATTRIBUTE_LIST_KEY = "SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST";
+	private static final String DISCOVERY_INFO_KEY = DiscoveryInformation.class.getName();
+	private static final String ATTRIBUTE_LIST_KEY = "SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final ConsumerManager consumerManager;
-    private final AxFetchListFactory attributesToFetchFactory;
+	private final ConsumerManager consumerManager;
+	private final AxFetchListFactory attributesToFetchFactory;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public OpenID4JavaConsumer() throws ConsumerException {
-        this(new ConsumerManager(), new NullAxFetchListFactory());
-    }
+	public OpenID4JavaConsumer() throws ConsumerException {
+		this(new ConsumerManager(), new NullAxFetchListFactory());
+	}
 
-    public OpenID4JavaConsumer(AxFetchListFactory attributesToFetchFactory) throws ConsumerException {
-        this(new ConsumerManager(), attributesToFetchFactory);
-    }
+	public OpenID4JavaConsumer(AxFetchListFactory attributesToFetchFactory)
+			throws ConsumerException {
+		this(new ConsumerManager(), attributesToFetchFactory);
+	}
 
-    public OpenID4JavaConsumer(ConsumerManager consumerManager, AxFetchListFactory attributesToFetchFactory)
-            throws ConsumerException {
-        this.consumerManager = consumerManager;
-        this.attributesToFetchFactory = attributesToFetchFactory;
-    }
+	public OpenID4JavaConsumer(ConsumerManager consumerManager,
+			AxFetchListFactory attributesToFetchFactory) throws ConsumerException {
+		this.consumerManager = consumerManager;
+		this.attributesToFetchFactory = attributesToFetchFactory;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String beginConsumption(HttpServletRequest req, String identityUrl, String returnToUrl, String realm)
-            throws OpenIDConsumerException {
-        List<DiscoveryInformation> discoveries;
+	public String beginConsumption(HttpServletRequest req, String identityUrl,
+			String returnToUrl, String realm) throws OpenIDConsumerException {
+		List<DiscoveryInformation> discoveries;
 
-        try {
-            discoveries = consumerManager.discover(identityUrl);
-        } catch (DiscoveryException e) {
-            throw new OpenIDConsumerException("Error during discovery", e);
-        }
+		try {
+			discoveries = consumerManager.discover(identityUrl);
+		}
+		catch (DiscoveryException e) {
+			throw new OpenIDConsumerException("Error during discovery", e);
+		}
 
-        DiscoveryInformation information = consumerManager.associate(discoveries);
-        req.getSession().setAttribute(DISCOVERY_INFO_KEY, information);
+		DiscoveryInformation information = consumerManager.associate(discoveries);
+		req.getSession().setAttribute(DISCOVERY_INFO_KEY, information);
 
-        AuthRequest authReq;
+		AuthRequest authReq;
 
-        try {
-            authReq = consumerManager.authenticate(information, returnToUrl, realm);
+		try {
+			authReq = consumerManager.authenticate(information, returnToUrl, realm);
 
-            logger.debug("Looking up attribute fetch list for identifier: " + identityUrl);
+			logger.debug("Looking up attribute fetch list for identifier: " + identityUrl);
 
-            List<OpenIDAttribute> attributesToFetch = attributesToFetchFactory.createAttributeList(identityUrl);
+			List<OpenIDAttribute> attributesToFetch = attributesToFetchFactory
+					.createAttributeList(identityUrl);
 
-            if (!attributesToFetch.isEmpty()) {
-                req.getSession().setAttribute(ATTRIBUTE_LIST_KEY, attributesToFetch);
-                FetchRequest fetchRequest = FetchRequest.createFetchRequest();
-                for (OpenIDAttribute attr : attributesToFetch) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Adding attribute " + attr.getType() + " to fetch request");
-                    }
-                    fetchRequest.addAttribute(attr.getName(), attr.getType(), attr.isRequired(), attr.getCount());
-                }
-                authReq.addExtension(fetchRequest);
-            }
-        } catch (MessageException e) {
-            throw new OpenIDConsumerException("Error processing ConsumerManager authentication", e);
-        } catch (ConsumerException e) {
-            throw new OpenIDConsumerException("Error processing ConsumerManager authentication", e);
-        }
+			if (!attributesToFetch.isEmpty()) {
+				req.getSession().setAttribute(ATTRIBUTE_LIST_KEY, attributesToFetch);
+				FetchRequest fetchRequest = FetchRequest.createFetchRequest();
+				for (OpenIDAttribute attr : attributesToFetch) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Adding attribute " + attr.getType()
+								+ " to fetch request");
+					}
+					fetchRequest.addAttribute(attr.getName(), attr.getType(),
+							attr.isRequired(), attr.getCount());
+				}
+				authReq.addExtension(fetchRequest);
+			}
+		}
+		catch (MessageException e) {
+			throw new OpenIDConsumerException(
+					"Error processing ConsumerManager authentication", e);
+		}
+		catch (ConsumerException e) {
+			throw new OpenIDConsumerException(
+					"Error processing ConsumerManager authentication", e);
+		}
 
-        return authReq.getDestinationUrl(true);
-    }
+		return authReq.getDestinationUrl(true);
+	}
 
-    public OpenIDAuthenticationToken endConsumption(HttpServletRequest request) throws OpenIDConsumerException {
-        // extract the parameters from the authentication response
-        // (which comes in as a HTTP request from the OpenID provider)
-        ParameterList openidResp = new ParameterList(request.getParameterMap());
+	public OpenIDAuthenticationToken endConsumption(HttpServletRequest request)
+			throws OpenIDConsumerException {
+		// extract the parameters from the authentication response
+		// (which comes in as a HTTP request from the OpenID provider)
+		ParameterList openidResp = new ParameterList(request.getParameterMap());
 
-        // retrieve the previously stored discovery information
-        DiscoveryInformation discovered = (DiscoveryInformation) request.getSession().getAttribute(DISCOVERY_INFO_KEY);
+		// retrieve the previously stored discovery information
+		DiscoveryInformation discovered = (DiscoveryInformation) request.getSession()
+				.getAttribute(DISCOVERY_INFO_KEY);
 
-        if (discovered == null) {
-            throw new OpenIDConsumerException("DiscoveryInformation is not available. Possible causes are lost session or replay attack");
-        }
+		if (discovered == null) {
+			throw new OpenIDConsumerException(
+					"DiscoveryInformation is not available. Possible causes are lost session or replay attack");
+		}
 
-        List<OpenIDAttribute> attributesToFetch = (List<OpenIDAttribute>) request.getSession().getAttribute(ATTRIBUTE_LIST_KEY);
+		List<OpenIDAttribute> attributesToFetch = (List<OpenIDAttribute>) request
+				.getSession().getAttribute(ATTRIBUTE_LIST_KEY);
 
-        request.getSession().removeAttribute(DISCOVERY_INFO_KEY);
-        request.getSession().removeAttribute(ATTRIBUTE_LIST_KEY);
+		request.getSession().removeAttribute(DISCOVERY_INFO_KEY);
+		request.getSession().removeAttribute(ATTRIBUTE_LIST_KEY);
 
-        // extract the receiving URL from the HTTP request
-        StringBuffer receivingURL = request.getRequestURL();
-        String queryString = request.getQueryString();
+		// extract the receiving URL from the HTTP request
+		StringBuffer receivingURL = request.getRequestURL();
+		String queryString = request.getQueryString();
 
-        if (StringUtils.hasLength(queryString)) {
-            receivingURL.append("?").append(request.getQueryString());
-        }
+		if (StringUtils.hasLength(queryString)) {
+			receivingURL.append("?").append(request.getQueryString());
+		}
 
-        // verify the response
-        VerificationResult verification;
+		// verify the response
+		VerificationResult verification;
 
-        try {
-            verification = consumerManager.verify(receivingURL.toString(), openidResp, discovered);
-        } catch (MessageException e) {
-            throw new OpenIDConsumerException("Error verifying openid response", e);
-        } catch (DiscoveryException e) {
-            throw new OpenIDConsumerException("Error verifying openid response", e);
-        } catch (AssociationException e) {
-            throw new OpenIDConsumerException("Error verifying openid response", e);
-        }
+		try {
+			verification = consumerManager.verify(receivingURL.toString(), openidResp,
+					discovered);
+		}
+		catch (MessageException e) {
+			throw new OpenIDConsumerException("Error verifying openid response", e);
+		}
+		catch (DiscoveryException e) {
+			throw new OpenIDConsumerException("Error verifying openid response", e);
+		}
+		catch (AssociationException e) {
+			throw new OpenIDConsumerException("Error verifying openid response", e);
+		}
 
-        // examine the verification result and extract the verified identifier
-        Identifier verified = verification.getVerifiedId();
+		// examine the verification result and extract the verified identifier
+		Identifier verified = verification.getVerifiedId();
 
-        if (verified == null) {
-            Identifier id = discovered.getClaimedIdentifier();
-            return new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.FAILURE,
-                    id == null ? "Unknown" : id.getIdentifier(),
-                    "Verification status message: [" + verification.getStatusMsg() + "]",
-                    Collections.<OpenIDAttribute>emptyList());
-        }
+		if (verified == null) {
+			Identifier id = discovered.getClaimedIdentifier();
+			return new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.FAILURE,
+					id == null ? "Unknown" : id.getIdentifier(),
+					"Verification status message: [" + verification.getStatusMsg() + "]",
+					Collections.<OpenIDAttribute> emptyList());
+		}
 
-        List<OpenIDAttribute> attributes = fetchAxAttributes(verification.getAuthResponse(), attributesToFetch);
+		List<OpenIDAttribute> attributes = fetchAxAttributes(
+				verification.getAuthResponse(), attributesToFetch);
 
-        return new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.SUCCESS, verified.getIdentifier(),
-                        "some message", attributes);
-    }
+		return new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.SUCCESS,
+				verified.getIdentifier(), "some message", attributes);
+	}
 
-    List<OpenIDAttribute> fetchAxAttributes(Message authSuccess, List<OpenIDAttribute> attributesToFetch)
-            throws OpenIDConsumerException {
+	List<OpenIDAttribute> fetchAxAttributes(Message authSuccess,
+			List<OpenIDAttribute> attributesToFetch) throws OpenIDConsumerException {
 
-        if (attributesToFetch == null || !authSuccess.hasExtension(AxMessage.OPENID_NS_AX)) {
-            return Collections.emptyList();
-        }
+		if (attributesToFetch == null
+				|| !authSuccess.hasExtension(AxMessage.OPENID_NS_AX)) {
+			return Collections.emptyList();
+		}
 
-        logger.debug("Extracting attributes retrieved by attribute exchange");
+		logger.debug("Extracting attributes retrieved by attribute exchange");
 
-        List<OpenIDAttribute> attributes = Collections.emptyList();
+		List<OpenIDAttribute> attributes = Collections.emptyList();
 
-        try {
-            MessageExtension ext = authSuccess.getExtension(AxMessage.OPENID_NS_AX);
-            if (ext instanceof FetchResponse) {
-                FetchResponse fetchResp = (FetchResponse) ext;
-                attributes = new ArrayList<OpenIDAttribute>(attributesToFetch.size());
+		try {
+			MessageExtension ext = authSuccess.getExtension(AxMessage.OPENID_NS_AX);
+			if (ext instanceof FetchResponse) {
+				FetchResponse fetchResp = (FetchResponse) ext;
+				attributes = new ArrayList<OpenIDAttribute>(attributesToFetch.size());
 
-                for (OpenIDAttribute attr : attributesToFetch) {
-                    List<String> values = fetchResp.getAttributeValues(attr.getName());
-                    if (!values.isEmpty()) {
-                        OpenIDAttribute fetched = new OpenIDAttribute(attr.getName(), attr.getType(), values);
-                        fetched.setRequired(attr.isRequired());
-                        attributes.add(fetched);
-                    }
-                }
-            }
-        } catch (MessageException e) {
-            throw new OpenIDConsumerException("Attribute retrieval failed", e);
-        }
+				for (OpenIDAttribute attr : attributesToFetch) {
+					List<String> values = fetchResp.getAttributeValues(attr.getName());
+					if (!values.isEmpty()) {
+						OpenIDAttribute fetched = new OpenIDAttribute(attr.getName(),
+								attr.getType(), values);
+						fetched.setRequired(attr.isRequired());
+						attributes.add(fetched);
+					}
+				}
+			}
+		}
+		catch (MessageException e) {
+			throw new OpenIDConsumerException("Attribute retrieval failed", e);
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Retrieved attributes" + attributes);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Retrieved attributes" + attributes);
+		}
 
-        return attributes;
-    }
+		return attributes;
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java
index ebe6269c7c..f33f571050 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java
@@ -8,86 +8,89 @@ import org.springframework.util.Assert;
 /**
  * Represents an OpenID subject identity attribute.
  * <p>
- * Can be used for configuring the <tt>OpenID4JavaConsumer</tt> with the attributes which should be requested during a
- * fetch request, or to hold values for an attribute which are returned during the authentication process.
+ * Can be used for configuring the <tt>OpenID4JavaConsumer</tt> with the attributes which
+ * should be requested during a fetch request, or to hold values for an attribute which
+ * are returned during the authentication process.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class OpenIDAttribute implements Serializable {
-    private final String name;
-    private final String typeIdentifier;
-    private boolean required = false;
-    private int count = 1;
+	private final String name;
+	private final String typeIdentifier;
+	private boolean required = false;
+	private int count = 1;
 
-    private final List<String> values;
+	private final List<String> values;
 
-    public OpenIDAttribute(String name, String type) {
-        this.name = name;
-        this.typeIdentifier = type;
-        this.values = null;
-    }
+	public OpenIDAttribute(String name, String type) {
+		this.name = name;
+		this.typeIdentifier = type;
+		this.values = null;
+	}
 
-    public OpenIDAttribute(String name, String type, List<String> values) {
-        Assert.notEmpty(values);
-        this.name = name;
-        this.typeIdentifier = type;
-        this.values = values;
-    }
+	public OpenIDAttribute(String name, String type, List<String> values) {
+		Assert.notEmpty(values);
+		this.name = name;
+		this.typeIdentifier = type;
+		this.values = values;
+	}
 
-    /**
-     * The attribute name
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * The attribute name
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * The attribute type Identifier (a URI).
-     */
-    public String getType() {
-        return typeIdentifier;
-    }
+	/**
+	 * The attribute type Identifier (a URI).
+	 */
+	public String getType() {
+		return typeIdentifier;
+	}
 
-    /**
-     * The "required" flag for the attribute when used with an authentication request. Defaults to "false".
-     */
-    public boolean isRequired() {
-        return required;
-    }
+	/**
+	 * The "required" flag for the attribute when used with an authentication request.
+	 * Defaults to "false".
+	 */
+	public boolean isRequired() {
+		return required;
+	}
 
-    public void setRequired(boolean required) {
-        this.required = required;
-    }
+	public void setRequired(boolean required) {
+		this.required = required;
+	}
 
-    /**
-     * The requested count for the attribute when it is used as part of an authentication
-     * request. Defaults to 1.
-     */
-    public int getCount() {
-        return count;
-    }
+	/**
+	 * The requested count for the attribute when it is used as part of an authentication
+	 * request. Defaults to 1.
+	 */
+	public int getCount() {
+		return count;
+	}
 
-    public void setCount(int count) {
-        this.count = count;
-    }
+	public void setCount(int count) {
+		this.count = count;
+	}
 
-    /**
-     * The values obtained from an attribute exchange.
-     */
-    public List<String> getValues() {
-        Assert.notNull(values, "Cannot read values from an authentication request attribute");
-        return values;
-    }
+	/**
+	 * The values obtained from an attribute exchange.
+	 */
+	public List<String> getValues() {
+		Assert.notNull(values,
+				"Cannot read values from an authentication request attribute");
+		return values;
+	}
 
-    public String toString() {
-        StringBuilder result = new StringBuilder("[");
-        result.append(name);
-        if (values != null) {
-            result.append(":");
-            result.append(values.toString());
-        }
-        result.append("]");
-        return result.toString();
-    }
+	public String toString() {
+		StringBuilder result = new StringBuilder("[");
+		result.append(name);
+		if (values != null) {
+			result.append(":");
+			result.append(values.toString());
+		}
+		result.append("]");
+		return result.toString();
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
index fdec58144a..9562c110e5 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
@@ -33,7 +33,6 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
 
-
 /**
  * Filter which processes OpenID authentication requests.
  * <p>
@@ -41,20 +40,23 @@ import java.util.*;
  *
  * <h2>Submission of OpenID identity</h2>
  *
- * The user's OpenID identity is submitted via a login form, just as it would be for a normal form login. At this stage
- * the filter will extract the identity from the submitted request (by default, the parameter is called
- * <tt>openid_identifier</tt>, as recommended by the OpenID 2.0 Specification). It then passes the identity to the
- * configured <tt>OpenIDConsumer</tt>, which returns the URL to which the request should be redirected for authentication.
- * A "return_to" URL is also supplied, which matches the URL processed by this filter, to allow the filter to handle
- * the request once the user has been successfully authenticated. The OpenID server will then authenticate the user and
- * redirect back to the application.
+ * The user's OpenID identity is submitted via a login form, just as it would be for a
+ * normal form login. At this stage the filter will extract the identity from the
+ * submitted request (by default, the parameter is called <tt>openid_identifier</tt>, as
+ * recommended by the OpenID 2.0 Specification). It then passes the identity to the
+ * configured <tt>OpenIDConsumer</tt>, which returns the URL to which the request should
+ * be redirected for authentication. A "return_to" URL is also supplied, which matches the
+ * URL processed by this filter, to allow the filter to handle the request once the user
+ * has been successfully authenticated. The OpenID server will then authenticate the user
+ * and redirect back to the application.
  *
  * <h2>Processing the Redirect from the OpenID Server</h2>
  *
- * Once the user has been authenticated externally, the redirected request will be passed to the <tt>OpenIDConsumer</tt>
- * again for validation. The returned <tt>OpenIDAuthentication</tt> will be passed to the <tt>AuthenticationManager</tt>
- * where it should (normally) be processed by an <tt>OpenIDAuthenticationProvider</tt> in order to load the authorities
- * for the user.
+ * Once the user has been authenticated externally, the redirected request will be passed
+ * to the <tt>OpenIDConsumer</tt> again for validation. The returned
+ * <tt>OpenIDAuthentication</tt> will be passed to the <tt>AuthenticationManager</tt>
+ * where it should (normally) be processed by an <tt>OpenIDAuthenticationProvider</tt> in
+ * order to load the authorities for the user.
  *
  * @author Robin Bramley
  * @author Ray Krueger
@@ -63,227 +65,246 @@ import java.util.*;
  * @see OpenIDAuthenticationProvider
  */
 public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    public static final String DEFAULT_CLAIMED_IDENTITY_FIELD = "openid_identifier";
+	public static final String DEFAULT_CLAIMED_IDENTITY_FIELD = "openid_identifier";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private OpenIDConsumer consumer;
-    private String claimedIdentityFieldName = DEFAULT_CLAIMED_IDENTITY_FIELD;
-    private Map<String,String> realmMapping = Collections.emptyMap();
-    private Set<String> returnToUrlParameters = Collections.emptySet();
+	private OpenIDConsumer consumer;
+	private String claimedIdentityFieldName = DEFAULT_CLAIMED_IDENTITY_FIELD;
+	private Map<String, String> realmMapping = Collections.emptyMap();
+	private Set<String> returnToUrlParameters = Collections.emptySet();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public OpenIDAuthenticationFilter() {
-        super("/login/openid");
-    }
+	public OpenIDAuthenticationFilter() {
+		super("/login/openid");
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        super.afterPropertiesSet();
+	@Override
+	public void afterPropertiesSet() {
+		super.afterPropertiesSet();
 
-        if (consumer == null) {
-            try {
-                consumer = new OpenID4JavaConsumer();
-            } catch (ConsumerException e) {
-                throw new IllegalArgumentException("Failed to initialize OpenID", e);
-            }
-        }
+		if (consumer == null) {
+			try {
+				consumer = new OpenID4JavaConsumer();
+			}
+			catch (ConsumerException e) {
+				throw new IllegalArgumentException("Failed to initialize OpenID", e);
+			}
+		}
 
-        if (returnToUrlParameters.isEmpty() &&
-                getRememberMeServices() instanceof AbstractRememberMeServices) {
-            returnToUrlParameters = new HashSet<String>();
-            returnToUrlParameters.add(((AbstractRememberMeServices)getRememberMeServices()).getParameter());
-        }
-    }
+		if (returnToUrlParameters.isEmpty()
+				&& getRememberMeServices() instanceof AbstractRememberMeServices) {
+			returnToUrlParameters = new HashSet<String>();
+			returnToUrlParameters
+					.add(((AbstractRememberMeServices) getRememberMeServices())
+							.getParameter());
+		}
+	}
 
-    /**
-     * Authentication has two phases.
-     * <ol>
-     * <li>The initial submission of the claimed OpenID. A redirect to the URL returned from the consumer
-     * will be performed and null will be returned.</li>
-     * <li>The redirection from the OpenID server to the return_to URL, once it has authenticated the user</li>
-     * </ol>
-     */
-    @Override
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
-            throws AuthenticationException, IOException {
-        OpenIDAuthenticationToken token;
+	/**
+	 * Authentication has two phases.
+	 * <ol>
+	 * <li>The initial submission of the claimed OpenID. A redirect to the URL returned
+	 * from the consumer will be performed and null will be returned.</li>
+	 * <li>The redirection from the OpenID server to the return_to URL, once it has
+	 * authenticated the user</li>
+	 * </ol>
+	 */
+	@Override
+	public Authentication attemptAuthentication(HttpServletRequest request,
+			HttpServletResponse response) throws AuthenticationException, IOException {
+		OpenIDAuthenticationToken token;
 
-        String identity = request.getParameter("openid.identity");
+		String identity = request.getParameter("openid.identity");
 
-        if (!StringUtils.hasText(identity)) {
-            String claimedIdentity = obtainUsername(request);
+		if (!StringUtils.hasText(identity)) {
+			String claimedIdentity = obtainUsername(request);
 
-            try {
-                String returnToUrl = buildReturnToUrl(request);
-                String realm = lookupRealm(returnToUrl);
-                String openIdUrl = consumer.beginConsumption(request, claimedIdentity, returnToUrl, realm);
-                if (logger.isDebugEnabled()) {
-                    logger.debug("return_to is '" + returnToUrl + "', realm is '" + realm + "'");
-                    logger.debug("Redirecting to " + openIdUrl);
-                }
-                response.sendRedirect(openIdUrl);
+			try {
+				String returnToUrl = buildReturnToUrl(request);
+				String realm = lookupRealm(returnToUrl);
+				String openIdUrl = consumer.beginConsumption(request, claimedIdentity,
+						returnToUrl, realm);
+				if (logger.isDebugEnabled()) {
+					logger.debug("return_to is '" + returnToUrl + "', realm is '" + realm
+							+ "'");
+					logger.debug("Redirecting to " + openIdUrl);
+				}
+				response.sendRedirect(openIdUrl);
 
-                // Indicate to parent class that authentication is continuing.
-                return null;
-            } catch (OpenIDConsumerException e) {
-                logger.debug("Failed to consume claimedIdentity: " + claimedIdentity, e);
-                throw new AuthenticationServiceException("Unable to process claimed identity '" + claimedIdentity + "'");
-            }
-        }
+				// Indicate to parent class that authentication is continuing.
+				return null;
+			}
+			catch (OpenIDConsumerException e) {
+				logger.debug("Failed to consume claimedIdentity: " + claimedIdentity, e);
+				throw new AuthenticationServiceException(
+						"Unable to process claimed identity '" + claimedIdentity + "'");
+			}
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Supplied OpenID identity is " + identity);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Supplied OpenID identity is " + identity);
+		}
 
-        try {
-            token = consumer.endConsumption(request);
-        } catch (OpenIDConsumerException oice) {
-            throw new AuthenticationServiceException("Consumer error", oice);
-        }
+		try {
+			token = consumer.endConsumption(request);
+		}
+		catch (OpenIDConsumerException oice) {
+			throw new AuthenticationServiceException("Consumer error", oice);
+		}
 
-        token.setDetails(authenticationDetailsSource.buildDetails(request));
+		token.setDetails(authenticationDetailsSource.buildDetails(request));
 
-        // delegate to the authentication provider
-        Authentication authentication = this.getAuthenticationManager().authenticate(token);
+		// delegate to the authentication provider
+		Authentication authentication = this.getAuthenticationManager().authenticate(
+				token);
 
-        return authentication;
-    }
+		return authentication;
+	}
 
-    protected String lookupRealm(String returnToUrl) {
-        String mapping = realmMapping.get(returnToUrl);
+	protected String lookupRealm(String returnToUrl) {
+		String mapping = realmMapping.get(returnToUrl);
 
-        if (mapping == null) {
-            try {
-                URL url = new URL(returnToUrl);
-                int port = url.getPort();
+		if (mapping == null) {
+			try {
+				URL url = new URL(returnToUrl);
+				int port = url.getPort();
 
-                StringBuilder realmBuffer = new StringBuilder(returnToUrl.length())
-                        .append(url.getProtocol())
-                        .append("://")
-                        .append(url.getHost());
-                if (port > 0) {
-                    realmBuffer.append(":").append(port);
-                }
-                realmBuffer.append("/");
-                mapping = realmBuffer.toString();
-            } catch (MalformedURLException e) {
-                logger.warn("returnToUrl was not a valid URL: [" + returnToUrl + "]", e);
-            }
-        }
+				StringBuilder realmBuffer = new StringBuilder(returnToUrl.length())
+						.append(url.getProtocol()).append("://").append(url.getHost());
+				if (port > 0) {
+					realmBuffer.append(":").append(port);
+				}
+				realmBuffer.append("/");
+				mapping = realmBuffer.toString();
+			}
+			catch (MalformedURLException e) {
+				logger.warn("returnToUrl was not a valid URL: [" + returnToUrl + "]", e);
+			}
+		}
 
-        return mapping;
-    }
+		return mapping;
+	}
 
-    /**
-     * Builds the <tt>return_to</tt> URL that will be sent to the OpenID service provider.
-     * By default returns the URL of the current request.
-     *
-     * @param request the current request which is being processed by this filter
-     * @return The <tt>return_to</tt> URL.
-     */
-    protected String buildReturnToUrl(HttpServletRequest request) {
-        StringBuffer sb = request.getRequestURL();
+	/**
+	 * Builds the <tt>return_to</tt> URL that will be sent to the OpenID service provider.
+	 * By default returns the URL of the current request.
+	 *
+	 * @param request the current request which is being processed by this filter
+	 * @return The <tt>return_to</tt> URL.
+	 */
+	protected String buildReturnToUrl(HttpServletRequest request) {
+		StringBuffer sb = request.getRequestURL();
 
-        Iterator<String> iterator = returnToUrlParameters.iterator();
-        boolean isFirst = true;
+		Iterator<String> iterator = returnToUrlParameters.iterator();
+		boolean isFirst = true;
 
-        while (iterator.hasNext()) {
-            String name = iterator.next();
-            // Assume for simplicity that there is only one value
-            String value = request.getParameter(name);
+		while (iterator.hasNext()) {
+			String name = iterator.next();
+			// Assume for simplicity that there is only one value
+			String value = request.getParameter(name);
 
-            if (value == null) {
-                continue;
-            }
+			if (value == null) {
+				continue;
+			}
 
-            if (isFirst) {
-                sb.append("?");
-                isFirst = false;
-            }
-            sb.append(utf8UrlEncode(name)).append("=").append(utf8UrlEncode(value));
+			if (isFirst) {
+				sb.append("?");
+				isFirst = false;
+			}
+			sb.append(utf8UrlEncode(name)).append("=").append(utf8UrlEncode(value));
 
-            if (iterator.hasNext()) {
-                sb.append("&");
-            }
-        }
-        return sb.toString();
-    }
+			if (iterator.hasNext()) {
+				sb.append("&");
+			}
+		}
+		return sb.toString();
+	}
 
-    /**
-     * Reads the <tt>claimedIdentityFieldName</tt> from the submitted request.
-     */
-    protected String obtainUsername(HttpServletRequest req) {
-        String claimedIdentity = req.getParameter(claimedIdentityFieldName);
+	/**
+	 * Reads the <tt>claimedIdentityFieldName</tt> from the submitted request.
+	 */
+	protected String obtainUsername(HttpServletRequest req) {
+		String claimedIdentity = req.getParameter(claimedIdentityFieldName);
 
-        if (!StringUtils.hasText(claimedIdentity)) {
-            logger.error("No claimed identity supplied in authentication request");
-            return "";
-        }
+		if (!StringUtils.hasText(claimedIdentity)) {
+			logger.error("No claimed identity supplied in authentication request");
+			return "";
+		}
 
-        return claimedIdentity.trim();
-    }
+		return claimedIdentity.trim();
+	}
 
-    /**
-     * Maps the <tt>return_to url</tt> to a realm, for example:
-     * <pre>
-     * http://www.example.com/login/openid -> http://www.example.com/realm</tt>
-     * </pre>
-     * If no mapping is provided then the returnToUrl will be parsed to extract the protocol, hostname and port followed
-     * by a trailing slash.
-     * This means that <tt>http://www.example.com/login/openid</tt> will automatically become
-     * <tt>http://www.example.com:80/</tt>
-     *
-     * @param realmMapping containing returnToUrl -> realm mappings
-     */
-    public void setRealmMapping(Map<String,String> realmMapping) {
-        this.realmMapping = realmMapping;
-    }
+	/**
+	 * Maps the <tt>return_to url</tt> to a realm, for example:
+	 * 
+	 * <pre>
+	 * http://www.example.com/login/openid -> http://www.example.com/realm</tt>
+	 * </pre>
+	 * 
+	 * If no mapping is provided then the returnToUrl will be parsed to extract the
+	 * protocol, hostname and port followed by a trailing slash. This means that
+	 * <tt>http://www.example.com/login/openid</tt> will automatically become
+	 * <tt>http://www.example.com:80/</tt>
+	 *
+	 * @param realmMapping containing returnToUrl -> realm mappings
+	 */
+	public void setRealmMapping(Map<String, String> realmMapping) {
+		this.realmMapping = realmMapping;
+	}
 
-    /**
-     * The name of the request parameter containing the OpenID identity, as submitted from the initial login form.
-     *
-     * @param claimedIdentityFieldName defaults to "openid_identifier"
-     */
-    public void setClaimedIdentityFieldName(String claimedIdentityFieldName) {
-        this.claimedIdentityFieldName = claimedIdentityFieldName;
-    }
+	/**
+	 * The name of the request parameter containing the OpenID identity, as submitted from
+	 * the initial login form.
+	 *
+	 * @param claimedIdentityFieldName defaults to "openid_identifier"
+	 */
+	public void setClaimedIdentityFieldName(String claimedIdentityFieldName) {
+		this.claimedIdentityFieldName = claimedIdentityFieldName;
+	}
 
-    public void setConsumer(OpenIDConsumer consumer) {
-        this.consumer = consumer;
-    }
+	public void setConsumer(OpenIDConsumer consumer) {
+		this.consumer = consumer;
+	}
 
-    /**
-     * Specifies any extra parameters submitted along with the identity field which should be appended to the
-     * {@code return_to} URL which is assembled by {@link #buildReturnToUrl}.
-     *
-     * @param returnToUrlParameters
-     *      the set of parameter names. If not set, it will default to the parameter name used by the
-     *      {@code RememberMeServices} obtained from the parent class (if one is set).
-     */
-    public void setReturnToUrlParameters(Set<String> returnToUrlParameters) {
-        Assert.notNull(returnToUrlParameters, "returnToUrlParameters cannot be null");
-        this.returnToUrlParameters = returnToUrlParameters;
-    }
+	/**
+	 * Specifies any extra parameters submitted along with the identity field which should
+	 * be appended to the {@code return_to} URL which is assembled by
+	 * {@link #buildReturnToUrl}.
+	 *
+	 * @param returnToUrlParameters the set of parameter names. If not set, it will
+	 * default to the parameter name used by the {@code RememberMeServices} obtained from
+	 * the parent class (if one is set).
+	 */
+	public void setReturnToUrlParameters(Set<String> returnToUrlParameters) {
+		Assert.notNull(returnToUrlParameters, "returnToUrlParameters cannot be null");
+		this.returnToUrlParameters = returnToUrlParameters;
+	}
 
-    /**
-     * Performs URL encoding with UTF-8
-     *
-     * @param value the value to URL encode
-     * @return the encoded value
-     */
-    private String utf8UrlEncode(String value) {
-        try {
-            return URLEncoder.encode(value, "UTF-8");
-        } catch(UnsupportedEncodingException e) {
-            Error err = new AssertionError("The Java platform guarantees UTF-8 support, but it seemingly is not present.");
-            err.initCause(e);
-            throw err;
-        }
-    }
+	/**
+	 * Performs URL encoding with UTF-8
+	 *
+	 * @param value the value to URL encode
+	 * @return the encoded value
+	 */
+	private String utf8UrlEncode(String value) {
+		try {
+			return URLEncoder.encode(value, "UTF-8");
+		}
+		catch (UnsupportedEncodingException e) {
+			Error err = new AssertionError(
+					"The Java platform guarantees UTF-8 support, but it seemingly is not present.");
+			err.initCause(e);
+			throw err;
+		}
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java
index b1b03f50d6..43f77d5a8a 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java
@@ -28,108 +28,136 @@ import org.springframework.security.core.userdetails.UserDetailsByNameServiceWra
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.util.Assert;
 
-
 /**
- * Finalises the OpenID authentication by obtaining local authorities for the authenticated user.
+ * Finalises the OpenID authentication by obtaining local authorities for the
+ * authenticated user.
  * <p>
- * The authorities are obtained by calling the configured {@code UserDetailsService}.
- * The {@code UserDetails} it returns must, at minimum, contain the username and {@code GrantedAuthority}
- * objects applicable to the authenticated user. Note that by default, Spring Security ignores the password and
- * enabled/disabled status of the {@code UserDetails} because this is authentication-related and should have been
+ * The authorities are obtained by calling the configured {@code UserDetailsService}. The
+ * {@code UserDetails} it returns must, at minimum, contain the username and
+ * {@code GrantedAuthority} objects applicable to the authenticated user. Note that by
+ * default, Spring Security ignores the password and enabled/disabled status of the
+ * {@code UserDetails} because this is authentication-related and should have been
  * enforced by another provider server.
  * <p>
- * The {@code UserDetails} returned by implementations is stored in the generated {@code Authentication} token,
- * so additional properties such as email addresses, telephone numbers etc can easily be stored.
+ * The {@code UserDetails} returned by implementations is stored in the generated
+ * {@code Authentication} token, so additional properties such as email addresses,
+ * telephone numbers etc can easily be stored.
  *
  * @author Robin Bramley, Opsera Ltd.
  * @author Luke Taylor
  */
-public class OpenIDAuthenticationProvider implements AuthenticationProvider, InitializingBean {
-    //~ Instance fields ================================================================================================
+public class OpenIDAuthenticationProvider implements AuthenticationProvider,
+		InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationUserDetailsService<OpenIDAuthenticationToken> userDetailsService;
-    private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
+	private AuthenticationUserDetailsService<OpenIDAuthenticationToken> userDetailsService;
+	private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(this.userDetailsService, "The userDetailsService must be set");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(this.userDetailsService, "The userDetailsService must be set");
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.authentication.AuthenticationProvider#authenticate(org.springframework.security.Authentication)
-     */
-    public Authentication authenticate(final Authentication authentication) throws AuthenticationException {
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.authentication.AuthenticationProvider#authenticate
+	 * (org.springframework.security.Authentication)
+	 */
+	public Authentication authenticate(final Authentication authentication)
+			throws AuthenticationException {
 
-        if (!supports(authentication.getClass())) {
-            return null;
-        }
+		if (!supports(authentication.getClass())) {
+			return null;
+		}
 
-        if (authentication instanceof OpenIDAuthenticationToken) {
-            OpenIDAuthenticationToken response = (OpenIDAuthenticationToken) authentication;
-            OpenIDAuthenticationStatus status = response.getStatus();
+		if (authentication instanceof OpenIDAuthenticationToken) {
+			OpenIDAuthenticationToken response = (OpenIDAuthenticationToken) authentication;
+			OpenIDAuthenticationStatus status = response.getStatus();
 
-            // handle the various possibilities
-            if (status == OpenIDAuthenticationStatus.SUCCESS) {
-                // Lookup user details
-                UserDetails userDetails = userDetailsService.loadUserDetails(response);
+			// handle the various possibilities
+			if (status == OpenIDAuthenticationStatus.SUCCESS) {
+				// Lookup user details
+				UserDetails userDetails = userDetailsService.loadUserDetails(response);
 
-                return createSuccessfulAuthentication(userDetails, response);
+				return createSuccessfulAuthentication(userDetails, response);
 
-            } else if (status == OpenIDAuthenticationStatus.CANCELLED) {
-                throw new AuthenticationCancelledException("Log in cancelled");
-            } else if (status == OpenIDAuthenticationStatus.ERROR) {
-                throw new AuthenticationServiceException("Error message from server: " + response.getMessage());
-            } else if (status == OpenIDAuthenticationStatus.FAILURE) {
-                throw new BadCredentialsException("Log in failed - identity could not be verified");
-            } else if (status == OpenIDAuthenticationStatus.SETUP_NEEDED) {
-                throw new AuthenticationServiceException(
-                        "The server responded setup was needed, which shouldn't happen");
-            } else {
-                throw new AuthenticationServiceException("Unrecognized return value " + status.toString());
-            }
-        }
+			}
+			else if (status == OpenIDAuthenticationStatus.CANCELLED) {
+				throw new AuthenticationCancelledException("Log in cancelled");
+			}
+			else if (status == OpenIDAuthenticationStatus.ERROR) {
+				throw new AuthenticationServiceException("Error message from server: "
+						+ response.getMessage());
+			}
+			else if (status == OpenIDAuthenticationStatus.FAILURE) {
+				throw new BadCredentialsException(
+						"Log in failed - identity could not be verified");
+			}
+			else if (status == OpenIDAuthenticationStatus.SETUP_NEEDED) {
+				throw new AuthenticationServiceException(
+						"The server responded setup was needed, which shouldn't happen");
+			}
+			else {
+				throw new AuthenticationServiceException("Unrecognized return value "
+						+ status.toString());
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Handles the creation of the final <tt>Authentication</tt> object which will be returned by the provider.
-     * <p>
-     * The default implementation just creates a new OpenIDAuthenticationToken from the original, but with the
-     * UserDetails as the principal and including the authorities loaded by the UserDetailsService.
-     *
-     * @param userDetails the loaded UserDetails object
-     * @param auth the token passed to the authenticate method, containing
-     * @return the token which will represent the authenticated user.
-     */
-    protected Authentication createSuccessfulAuthentication(UserDetails userDetails, OpenIDAuthenticationToken auth) {
-        return new OpenIDAuthenticationToken(userDetails, authoritiesMapper.mapAuthorities(userDetails.getAuthorities()),
-                auth.getIdentityUrl(), auth.getAttributes());
-    }
+	/**
+	 * Handles the creation of the final <tt>Authentication</tt> object which will be
+	 * returned by the provider.
+	 * <p>
+	 * The default implementation just creates a new OpenIDAuthenticationToken from the
+	 * original, but with the UserDetails as the principal and including the authorities
+	 * loaded by the UserDetailsService.
+	 *
+	 * @param userDetails the loaded UserDetails object
+	 * @param auth the token passed to the authenticate method, containing
+	 * @return the token which will represent the authenticated user.
+	 */
+	protected Authentication createSuccessfulAuthentication(UserDetails userDetails,
+			OpenIDAuthenticationToken auth) {
+		return new OpenIDAuthenticationToken(userDetails,
+				authoritiesMapper.mapAuthorities(userDetails.getAuthorities()),
+				auth.getIdentityUrl(), auth.getAttributes());
+	}
 
-    /**
-     * Used to load the {@code UserDetails} for the authenticated OpenID user.
-     */
-    public void setUserDetailsService(UserDetailsService userDetailsService) {
-        this.userDetailsService = new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(userDetailsService);
-    }
+	/**
+	 * Used to load the {@code UserDetails} for the authenticated OpenID user.
+	 */
+	public void setUserDetailsService(UserDetailsService userDetailsService) {
+		this.userDetailsService = new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(
+				userDetailsService);
+	}
 
-    /**
-     * Used to load the {@code UserDetails} for the authenticated OpenID user.
-     */
-    public void setAuthenticationUserDetailsService(AuthenticationUserDetailsService<OpenIDAuthenticationToken> userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
+	/**
+	 * Used to load the {@code UserDetails} for the authenticated OpenID user.
+	 */
+	public void setAuthenticationUserDetailsService(
+			AuthenticationUserDetailsService<OpenIDAuthenticationToken> userDetailsService) {
+		this.userDetailsService = userDetailsService;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.authentication.AuthenticationProvider#supports(java.lang.Class)
-     */
-    public boolean supports(Class<?> authentication) {
-        return OpenIDAuthenticationToken.class.isAssignableFrom(authentication);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.authentication.AuthenticationProvider#supports(java
+	 * .lang.Class)
+	 */
+	public boolean supports(Class<?> authentication) {
+		return OpenIDAuthenticationToken.class.isAssignableFrom(authentication);
+	}
 
-    public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
-        this.authoritiesMapper = authoritiesMapper;
-    }
+	public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
+		this.authoritiesMapper = authoritiesMapper;
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java
index 9d7eecc17c..7065a30a5f 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java
@@ -23,30 +23,34 @@ package org.springframework.security.openid;
  */
 public enum OpenIDAuthenticationStatus {
 
-    /** This code indicates a successful authentication request */
-    SUCCESS("success"),
+	/** This code indicates a successful authentication request */
+	SUCCESS("success"),
 
-    /** This code indicates a failed authentication request */
-    FAILURE("failure"),
+	/** This code indicates a failed authentication request */
+	FAILURE("failure"),
 
-    /** This code indicates the server reported an error */
-    ERROR("error"),
+	/** This code indicates the server reported an error */
+	ERROR("error"),
 
-    /** This code indicates that the user needs to do additional work to prove their identity */
-    SETUP_NEEDED("setup needed"),
+	/**
+	 * This code indicates that the user needs to do additional work to prove their
+	 * identity
+	 */
+	SETUP_NEEDED("setup needed"),
 
-    /** This code indicates that the user cancelled their login request */
-    CANCELLED("cancelled");
+	/** This code indicates that the user cancelled their login request */
+	CANCELLED("cancelled");
 
-    private final String name;
+	private final String name;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    private OpenIDAuthenticationStatus(String name) {
-        this.name = name;
-    }
+	private OpenIDAuthenticationStatus(String name) {
+		this.name = name;
+	}
 
-    public String toString() {
-        return name;
-    }
+	public String toString() {
+		return name;
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java
index c0d7dac9d6..ab721923d8 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java
@@ -29,85 +29,89 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
  */
 public class OpenIDAuthenticationToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final OpenIDAuthenticationStatus status;
-    private final Object principal;
-    private final String identityUrl;
-    private final String message;
-    private final List<OpenIDAttribute> attributes;
+	private final OpenIDAuthenticationStatus status;
+	private final Object principal;
+	private final String identityUrl;
+	private final String message;
+	private final List<OpenIDAttribute> attributes;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public OpenIDAuthenticationToken(OpenIDAuthenticationStatus status, String identityUrl,
-            String message, List<OpenIDAttribute> attributes) {
-        super(new ArrayList<GrantedAuthority>(0));
-        this.principal = identityUrl;
-        this.status = status;
-        this.identityUrl = identityUrl;
-        this.message = message;
-        this.attributes = attributes;
-        setAuthenticated(false);
-    }
+	public OpenIDAuthenticationToken(OpenIDAuthenticationStatus status,
+			String identityUrl, String message, List<OpenIDAttribute> attributes) {
+		super(new ArrayList<GrantedAuthority>(0));
+		this.principal = identityUrl;
+		this.status = status;
+		this.identityUrl = identityUrl;
+		this.message = message;
+		this.attributes = attributes;
+		setAuthenticated(false);
+	}
 
-    /**
-     * Created by the <tt>OpenIDAuthenticationProvider</tt> on successful authentication.
-     *
-     * @param principal usually the <tt>UserDetails</tt> returned by the the configured <tt>UserDetailsService</tt>
-     * used by the <tt>OpenIDAuthenticationProvider</tt>.
-     *
-     */
-    public OpenIDAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities,
-            String identityUrl, List<OpenIDAttribute> attributes) {
-        super(authorities);
-        this.principal = principal;
-        this.status = OpenIDAuthenticationStatus.SUCCESS;
-        this.identityUrl = identityUrl;
-        this.message = null;
-        this.attributes = attributes;
+	/**
+	 * Created by the <tt>OpenIDAuthenticationProvider</tt> on successful authentication.
+	 *
+	 * @param principal usually the <tt>UserDetails</tt> returned by the the configured
+	 * <tt>UserDetailsService</tt> used by the <tt>OpenIDAuthenticationProvider</tt>.
+	 *
+	 */
+	public OpenIDAuthenticationToken(Object principal,
+			Collection<? extends GrantedAuthority> authorities, String identityUrl,
+			List<OpenIDAttribute> attributes) {
+		super(authorities);
+		this.principal = principal;
+		this.status = OpenIDAuthenticationStatus.SUCCESS;
+		this.identityUrl = identityUrl;
+		this.message = null;
+		this.attributes = attributes;
 
-        setAuthenticated(true);
-    }
+		setAuthenticated(true);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns 'null' always, as no credentials are processed by the OpenID provider.
-     * @see org.springframework.security.core.Authentication#getCredentials()
-     */
-    public Object getCredentials() {
-        return null;
-    }
+	/**
+	 * Returns 'null' always, as no credentials are processed by the OpenID provider.
+	 * @see org.springframework.security.core.Authentication#getCredentials()
+	 */
+	public Object getCredentials() {
+		return null;
+	}
 
-    public String getIdentityUrl() {
-        return identityUrl;
-    }
+	public String getIdentityUrl() {
+		return identityUrl;
+	}
 
-    public String getMessage() {
-        return message;
-    }
+	public String getMessage() {
+		return message;
+	}
 
-    /**
-     * Returns the <tt>principal</tt> value.
-     *
-     * @see org.springframework.security.core.Authentication#getPrincipal()
-     */
-    public Object getPrincipal() {
-        return principal;
-    }
+	/**
+	 * Returns the <tt>principal</tt> value.
+	 *
+	 * @see org.springframework.security.core.Authentication#getPrincipal()
+	 */
+	public Object getPrincipal() {
+		return principal;
+	}
 
-    public OpenIDAuthenticationStatus getStatus() {
-        return status;
-    }
+	public OpenIDAuthenticationStatus getStatus() {
+		return status;
+	}
 
-    public List<OpenIDAttribute> getAttributes() {
-        return attributes;
-    }
+	public List<OpenIDAttribute> getAttributes() {
+		return attributes;
+	}
 
-    @Override
-    public String toString() {
-        return "[" + super.toString() + ", attributes : " + attributes +"]";
-    }
+	@Override
+	public String toString() {
+		return "[" + super.toString() + ", attributes : " + attributes + "]";
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java
index 5c12cc898e..d5b9efbcf4 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java
@@ -14,10 +14,8 @@
  */
 package org.springframework.security.openid;
 
-
 import javax.servlet.http.HttpServletRequest;
 
-
 /**
  * An interface for OpenID library implementations
  *
@@ -26,21 +24,21 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface OpenIDConsumer {
 
-    /**
-     * Given the request, the claimedIdentity, the return to url, and a realm, lookup the openId authentication
-     * page the user should be redirected to.
-     *
-     * @param req HttpServletRequest
-     * @param claimedIdentity String URI the user presented during authentication
-     * @param returnToUrl String URI of the URL we want the user sent back to by the OP
-     * @param realm URI pattern matching the realm we want the user to see
-     * @return String URI to redirect user to for authentication
-     * @throws OpenIDConsumerException if anything bad happens
-     */
-    public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm)
-            throws OpenIDConsumerException;
+	/**
+	 * Given the request, the claimedIdentity, the return to url, and a realm, lookup the
+	 * openId authentication page the user should be redirected to.
+	 *
+	 * @param req HttpServletRequest
+	 * @param claimedIdentity String URI the user presented during authentication
+	 * @param returnToUrl String URI of the URL we want the user sent back to by the OP
+	 * @param realm URI pattern matching the realm we want the user to see
+	 * @return String URI to redirect user to for authentication
+	 * @throws OpenIDConsumerException if anything bad happens
+	 */
+	public String beginConsumption(HttpServletRequest req, String claimedIdentity,
+			String returnToUrl, String realm) throws OpenIDConsumerException;
 
-    public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
-            throws OpenIDConsumerException;
+	public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
+			throws OpenIDConsumerException;
 
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java
index 64a2f8e6fb..b20a62ab8c 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumerException.java
@@ -20,13 +20,14 @@ package org.springframework.security.openid;
  * @author Robin Bramley, Opsera Ltd
  */
 public class OpenIDConsumerException extends Exception {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public OpenIDConsumerException(String message) {
-        super(message);
-    }
+	public OpenIDConsumerException(String message) {
+		super(message);
+	}
 
-    public OpenIDConsumerException(String message, Throwable t) {
-        super(message, t);
-    }
+	public OpenIDConsumerException(String message, Throwable t) {
+		super(message, t);
+	}
 }
diff --git a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java
index eb3d50d548..a25dc6c3d7 100644
--- a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java
+++ b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java
@@ -12,31 +12,31 @@ import java.util.regex.Pattern;
  * @since 3.1
  */
 public class RegexBasedAxFetchListFactory implements AxFetchListFactory {
-    private final Map<Pattern, List<OpenIDAttribute>> idToAttributes;
+	private final Map<Pattern, List<OpenIDAttribute>> idToAttributes;
 
-    /**
-     * @param regexMap map of regular-expressions (matching the identifier) to attributes which should be fetched for
-     * that pattern.
-     */
-    public RegexBasedAxFetchListFactory(Map<String, List<OpenIDAttribute>> regexMap) {
-        idToAttributes = new LinkedHashMap<Pattern, List<OpenIDAttribute>>();
-        for (Map.Entry<String, List<OpenIDAttribute>> entry : regexMap.entrySet()) {
-            idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue());
-        }
-    }
+	/**
+	 * @param regexMap map of regular-expressions (matching the identifier) to attributes
+	 * which should be fetched for that pattern.
+	 */
+	public RegexBasedAxFetchListFactory(Map<String, List<OpenIDAttribute>> regexMap) {
+		idToAttributes = new LinkedHashMap<Pattern, List<OpenIDAttribute>>();
+		for (Map.Entry<String, List<OpenIDAttribute>> entry : regexMap.entrySet()) {
+			idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue());
+		}
+	}
 
-    /**
-     * Iterates through the patterns stored in the map and returns the list of attributes defined for the
-     * first match. If no match is found, returns an empty list.
-     */
-    public List<OpenIDAttribute> createAttributeList(String identifier) {
-        for (Map.Entry<Pattern, List<OpenIDAttribute>> entry : idToAttributes.entrySet()) {
-            if (entry.getKey().matcher(identifier).matches()) {
-                return entry.getValue();
-            }
-        }
+	/**
+	 * Iterates through the patterns stored in the map and returns the list of attributes
+	 * defined for the first match. If no match is found, returns an empty list.
+	 */
+	public List<OpenIDAttribute> createAttributeList(String identifier) {
+		for (Map.Entry<Pattern, List<OpenIDAttribute>> entry : idToAttributes.entrySet()) {
+			if (entry.getKey().matcher(identifier).matches()) {
+				return entry.getValue();
+			}
+		}
 
-        return Collections.emptyList();
-    }
+		return Collections.emptyList();
+	}
 
 }
diff --git a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java
index 0911840723..96359a12fb 100644
--- a/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java
+++ b/openid/src/test/java/org/springframework/security/openid/MockOpenIDConsumer.java
@@ -20,62 +20,64 @@ import org.springframework.security.openid.OpenIDConsumerException;
 
 import javax.servlet.http.HttpServletRequest;
 
-
 /**
  * @author Robin Bramley, Opsera Ltd
  */
 public class MockOpenIDConsumer implements OpenIDConsumer {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private OpenIDAuthenticationToken token;
-    private String redirectUrl;
+	private OpenIDAuthenticationToken token;
+	private String redirectUrl;
 
-    public MockOpenIDConsumer() {
-    }
+	public MockOpenIDConsumer() {
+	}
 
-    public MockOpenIDConsumer(String redirectUrl, OpenIDAuthenticationToken token) {
-        this.redirectUrl = redirectUrl;
-        this.token = token;
-    }
+	public MockOpenIDConsumer(String redirectUrl, OpenIDAuthenticationToken token) {
+		this.redirectUrl = redirectUrl;
+		this.token = token;
+	}
 
-    public MockOpenIDConsumer(String redirectUrl) {
-        this.redirectUrl = redirectUrl;
-    }
+	public MockOpenIDConsumer(String redirectUrl) {
+		this.redirectUrl = redirectUrl;
+	}
 
-    public MockOpenIDConsumer(OpenIDAuthenticationToken token) {
-        this.token = token;
-    }
+	public MockOpenIDConsumer(OpenIDAuthenticationToken token) {
+		this.token = token;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) throws OpenIDConsumerException {
-        return redirectUrl;
-    }
+	public String beginConsumption(HttpServletRequest req, String claimedIdentity,
+			String returnToUrl, String realm) throws OpenIDConsumerException {
+		return redirectUrl;
+	}
 
-    public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
-            throws OpenIDConsumerException {
-        return token;
-    }
+	public OpenIDAuthenticationToken endConsumption(HttpServletRequest req)
+			throws OpenIDConsumerException {
+		return token;
+	}
 
-    /**
-     * Set the redirectUrl to be returned by beginConsumption
-     *
-     * @param redirectUrl
-     */
-    public void setRedirectUrl(String redirectUrl) {
-        this.redirectUrl = redirectUrl;
-    }
+	/**
+	 * Set the redirectUrl to be returned by beginConsumption
+	 *
+	 * @param redirectUrl
+	 */
+	public void setRedirectUrl(String redirectUrl) {
+		this.redirectUrl = redirectUrl;
+	}
 
-    public void setReturnToUrl(String returnToUrl) {
-        // TODO Auto-generated method stub
-    }
+	public void setReturnToUrl(String returnToUrl) {
+		// TODO Auto-generated method stub
+	}
 
-    /**
-     * Set the token to be returned by endConsumption
-     *
-     * @param token
-     */
-    public void setToken(OpenIDAuthenticationToken token) {
-        this.token = token;
-    }
+	/**
+	 * Set the token to be returned by endConsumption
+	 *
+	 * @param token
+	 */
+	public void setToken(OpenIDAuthenticationToken token) {
+		this.token = token;
+	}
 }
diff --git a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java
index dbc0b5d034..5152723452 100644
--- a/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java
+++ b/openid/src/test/java/org/springframework/security/openid/OpenID4JavaConsumerTests.java
@@ -27,184 +27,214 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class OpenID4JavaConsumerTests {
-    List<OpenIDAttribute> attributes = Arrays.asList(new OpenIDAttribute("a","b"), new OpenIDAttribute("b","b", Arrays.asList("c")));
+	List<OpenIDAttribute> attributes = Arrays.asList(new OpenIDAttribute("a", "b"),
+			new OpenIDAttribute("b", "b", Arrays.asList("c")));
 
-    @SuppressWarnings("deprecation")
-    @Test
-    public void beginConsumptionCreatesExpectedSessionData() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        AuthRequest authReq = mock(AuthRequest.class);
-        DiscoveryInformation di = mock(DiscoveryInformation.class);
+	@SuppressWarnings("deprecation")
+	@Test
+	public void beginConsumptionCreatesExpectedSessionData() throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		AuthRequest authReq = mock(AuthRequest.class);
+		DiscoveryInformation di = mock(DiscoveryInformation.class);
 
-        when(mgr.authenticate(any(DiscoveryInformation.class), anyString(), anyString())).thenReturn(authReq);
-        when(mgr.associate(anyList())).thenReturn(di);
+		when(mgr.authenticate(any(DiscoveryInformation.class), anyString(), anyString()))
+				.thenReturn(authReq);
+		when(mgr.associate(anyList())).thenReturn(di);
 
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new MockAttributesFactory());
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new MockAttributesFactory());
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        consumer.beginConsumption(request, "", "", "");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		consumer.beginConsumption(request, "", "", "");
 
-        assertEquals(attributes, request.getSession().getAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST"));
-        assertSame(di, request.getSession().getAttribute(DiscoveryInformation.class.getName()));
+		assertEquals(
+				attributes,
+				request.getSession().getAttribute(
+						"SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST"));
+		assertSame(di,
+				request.getSession().getAttribute(DiscoveryInformation.class.getName()));
 
-        // Check with empty attribute fetch list
-        consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
+		// Check with empty attribute fetch list
+		consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
 
-        request = new MockHttpServletRequest();
-        consumer.beginConsumption(request, "", "", "");
-    }
+		request = new MockHttpServletRequest();
+		consumer.beginConsumption(request, "", "", "");
+	}
 
-    @Test(expected = OpenIDConsumerException.class)
-    public void discoveryExceptionRaisesOpenIDException() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
-        when(mgr.discover(anyString())).thenThrow(new DiscoveryException("msg"));
-        consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
-    }
+	@Test(expected = OpenIDConsumerException.class)
+	public void discoveryExceptionRaisesOpenIDException() throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new NullAxFetchListFactory());
+		when(mgr.discover(anyString())).thenThrow(new DiscoveryException("msg"));
+		consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
+	}
 
-    @Test
-    public void messageOrConsumerAuthenticationExceptionRaisesOpenIDException() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
+	@Test
+	public void messageOrConsumerAuthenticationExceptionRaisesOpenIDException()
+			throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new NullAxFetchListFactory());
 
-        when(mgr.authenticate(any(DiscoveryInformation.class), anyString(), anyString()))
-                .thenThrow(new MessageException("msg"), new ConsumerException("msg"));
+		when(mgr.authenticate(any(DiscoveryInformation.class), anyString(), anyString()))
+				.thenThrow(new MessageException("msg"), new ConsumerException("msg"));
 
-        try {
-            consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
-            fail();
-        } catch (OpenIDConsumerException expected) {
-        }
+		try {
+			consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
+			fail();
+		}
+		catch (OpenIDConsumerException expected) {
+		}
 
-        try {
-            consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
-            fail();
-        } catch (OpenIDConsumerException expected) {
-        }
-    }
+		try {
+			consumer.beginConsumption(new MockHttpServletRequest(), "", "", "");
+			fail();
+		}
+		catch (OpenIDConsumerException expected) {
+		}
+	}
 
-    @Test
-    public void failedVerificationReturnsFailedAuthenticationStatus() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
-        VerificationResult vr = mock(VerificationResult.class);
-        DiscoveryInformation di = mock(DiscoveryInformation.class);
+	@Test
+	public void failedVerificationReturnsFailedAuthenticationStatus() throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new NullAxFetchListFactory());
+		VerificationResult vr = mock(VerificationResult.class);
+		DiscoveryInformation di = mock(DiscoveryInformation.class);
 
-        when(mgr.verify(anyString(), any(ParameterList.class), any(DiscoveryInformation.class))).thenReturn(vr);
+		when(
+				mgr.verify(anyString(), any(ParameterList.class),
+						any(DiscoveryInformation.class))).thenReturn(vr);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        request.getSession().setAttribute(DiscoveryInformation.class.getName(), di);
+		request.getSession().setAttribute(DiscoveryInformation.class.getName(), di);
 
-        OpenIDAuthenticationToken auth = consumer.endConsumption(request);
+		OpenIDAuthenticationToken auth = consumer.endConsumption(request);
 
-        assertEquals(OpenIDAuthenticationStatus.FAILURE, auth.getStatus());
-    }
+		assertEquals(OpenIDAuthenticationStatus.FAILURE, auth.getStatus());
+	}
 
-    @Test
-    public void verificationExceptionsRaiseOpenIDException() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
+	@Test
+	public void verificationExceptionsRaiseOpenIDException() throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new NullAxFetchListFactory());
 
-        when(mgr.verify(anyString(), any(ParameterList.class), any(DiscoveryInformation.class)))
-                .thenThrow(new MessageException(""))
-                .thenThrow(new AssociationException(""))
-                .thenThrow(new DiscoveryException(""));
+		when(
+				mgr.verify(anyString(), any(ParameterList.class),
+						any(DiscoveryInformation.class)))
+				.thenThrow(new MessageException(""))
+				.thenThrow(new AssociationException(""))
+				.thenThrow(new DiscoveryException(""));
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("x=5");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("x=5");
 
-        try {
-            consumer.endConsumption(request);
-            fail();
-        } catch (OpenIDConsumerException expected) {
-        }
+		try {
+			consumer.endConsumption(request);
+			fail();
+		}
+		catch (OpenIDConsumerException expected) {
+		}
 
-        try {
-            consumer.endConsumption(request);
-            fail();
-        } catch (OpenIDConsumerException expected) {
-        }
+		try {
+			consumer.endConsumption(request);
+			fail();
+		}
+		catch (OpenIDConsumerException expected) {
+		}
 
-        try {
-            consumer.endConsumption(request);
-            fail();
-        } catch (OpenIDConsumerException expected) {
-        }
+		try {
+			consumer.endConsumption(request);
+			fail();
+		}
+		catch (OpenIDConsumerException expected) {
+		}
 
-    }
+	}
 
-    @SuppressWarnings("serial")
-    @Test
-    public void successfulVerificationReturnsExpectedAuthentication() throws Exception {
-        ConsumerManager mgr = mock(ConsumerManager.class);
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr, new NullAxFetchListFactory());
-        VerificationResult vr = mock(VerificationResult.class);
-        DiscoveryInformation di = mock(DiscoveryInformation.class);
-        Identifier id = new Identifier() {
-            public String getIdentifier() {
-                return "id";
-            }
-        };
-        Message msg = mock(Message.class);
+	@SuppressWarnings("serial")
+	@Test
+	public void successfulVerificationReturnsExpectedAuthentication() throws Exception {
+		ConsumerManager mgr = mock(ConsumerManager.class);
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(mgr,
+				new NullAxFetchListFactory());
+		VerificationResult vr = mock(VerificationResult.class);
+		DiscoveryInformation di = mock(DiscoveryInformation.class);
+		Identifier id = new Identifier() {
+			public String getIdentifier() {
+				return "id";
+			}
+		};
+		Message msg = mock(Message.class);
 
-        when(mgr.verify(anyString(), any(ParameterList.class), any(DiscoveryInformation.class))).thenReturn(vr);
-        when(vr.getVerifiedId()).thenReturn(id);
-        when(vr.getAuthResponse()).thenReturn(msg);
+		when(
+				mgr.verify(anyString(), any(ParameterList.class),
+						any(DiscoveryInformation.class))).thenReturn(vr);
+		when(vr.getVerifiedId()).thenReturn(id);
+		when(vr.getAuthResponse()).thenReturn(msg);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        request.getSession().setAttribute(DiscoveryInformation.class.getName(), di);
-        request.getSession().setAttribute("SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST", attributes);
+		request.getSession().setAttribute(DiscoveryInformation.class.getName(), di);
+		request.getSession().setAttribute(
+				"SPRING_SECURITY_OPEN_ID_ATTRIBUTES_FETCH_LIST", attributes);
 
-        OpenIDAuthenticationToken auth = consumer.endConsumption(request);
+		OpenIDAuthenticationToken auth = consumer.endConsumption(request);
 
-        assertEquals(OpenIDAuthenticationStatus.SUCCESS, auth.getStatus());
-    }
+		assertEquals(OpenIDAuthenticationStatus.SUCCESS, auth.getStatus());
+	}
 
-    @Test
-    public void fetchAttributesReturnsExpectedValues() throws Exception {
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(new NullAxFetchListFactory());
-        Message msg = mock(Message.class);
-        FetchResponse fr = mock(FetchResponse.class);
-        when(msg.hasExtension(AxMessage.OPENID_NS_AX)).thenReturn(true);
-        when(msg.getExtension(AxMessage.OPENID_NS_AX)).thenReturn(fr);
-        when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x","y"));
+	@Test
+	public void fetchAttributesReturnsExpectedValues() throws Exception {
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(
+				new NullAxFetchListFactory());
+		Message msg = mock(Message.class);
+		FetchResponse fr = mock(FetchResponse.class);
+		when(msg.hasExtension(AxMessage.OPENID_NS_AX)).thenReturn(true);
+		when(msg.getExtension(AxMessage.OPENID_NS_AX)).thenReturn(fr);
+		when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x", "y"));
 
-        List<OpenIDAttribute> fetched = consumer.fetchAxAttributes(msg, attributes);
+		List<OpenIDAttribute> fetched = consumer.fetchAxAttributes(msg, attributes);
 
-        assertEquals(1, fetched.size());
-        assertEquals(2, fetched.get(0).getValues().size());
-    }
+		assertEquals(1, fetched.size());
+		assertEquals(2, fetched.get(0).getValues().size());
+	}
 
-    @Test(expected = OpenIDConsumerException.class)
-    public void messageExceptionFetchingAttributesRaisesOpenIDException() throws Exception {
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(new NullAxFetchListFactory());
-        Message msg = mock(Message.class);
-        FetchResponse fr = mock(FetchResponse.class);
-        when(msg.hasExtension(AxMessage.OPENID_NS_AX)).thenReturn(true);
-        when(msg.getExtension(AxMessage.OPENID_NS_AX)).thenThrow(new MessageException(""));
-        when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x","y"));
+	@Test(expected = OpenIDConsumerException.class)
+	public void messageExceptionFetchingAttributesRaisesOpenIDException()
+			throws Exception {
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(
+				new NullAxFetchListFactory());
+		Message msg = mock(Message.class);
+		FetchResponse fr = mock(FetchResponse.class);
+		when(msg.hasExtension(AxMessage.OPENID_NS_AX)).thenReturn(true);
+		when(msg.getExtension(AxMessage.OPENID_NS_AX))
+				.thenThrow(new MessageException(""));
+		when(fr.getAttributeValues("a")).thenReturn(Arrays.asList("x", "y"));
 
-        consumer.fetchAxAttributes(msg, attributes);
-    }
+		consumer.fetchAxAttributes(msg, attributes);
+	}
 
-    @Test(expected=OpenIDConsumerException.class)
-    public void missingDiscoveryInformationThrowsException() throws Exception {
-        OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(new NullAxFetchListFactory());
-        consumer.endConsumption(new MockHttpServletRequest());
-    }
+	@Test(expected = OpenIDConsumerException.class)
+	public void missingDiscoveryInformationThrowsException() throws Exception {
+		OpenID4JavaConsumer consumer = new OpenID4JavaConsumer(
+				new NullAxFetchListFactory());
+		consumer.endConsumption(new MockHttpServletRequest());
+	}
 
-    @Test
-    public void additionalConstructorsWork() throws Exception {
-        new OpenID4JavaConsumer();
-        new OpenID4JavaConsumer(new MockAttributesFactory());
-    }
+	@Test
+	public void additionalConstructorsWork() throws Exception {
+		new OpenID4JavaConsumer();
+		new OpenID4JavaConsumer(new MockAttributesFactory());
+	}
 
-    private class MockAttributesFactory implements AxFetchListFactory {
+	private class MockAttributesFactory implements AxFetchListFactory {
 
-        public List<OpenIDAttribute> createAttributeList(String identifier) {
-            return attributes;
-        }
-    }
+		public List<OpenIDAttribute> createAttributeList(String identifier) {
+			return attributes;
+		}
+	}
 }
diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java
index edf1d0b426..f47b0086fd 100644
--- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java
+++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationFilterTests.java
@@ -21,83 +21,87 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
 
 public class OpenIDAuthenticationFilterTests {
 
-    OpenIDAuthenticationFilter filter;
-    private static final String REDIRECT_URL = "http://www.example.com/redirect";
-    private static final String CLAIMED_IDENTITY_URL = "http://www.example.com/identity";
-    private static final String REQUEST_PATH = "/login/openid";
-    private static final String FILTER_PROCESS_URL = "http://localhost:8080" + REQUEST_PATH;
-    private static final String DEFAULT_TARGET_URL = FILTER_PROCESS_URL;
+	OpenIDAuthenticationFilter filter;
+	private static final String REDIRECT_URL = "http://www.example.com/redirect";
+	private static final String CLAIMED_IDENTITY_URL = "http://www.example.com/identity";
+	private static final String REQUEST_PATH = "/login/openid";
+	private static final String FILTER_PROCESS_URL = "http://localhost:8080"
+			+ REQUEST_PATH;
+	private static final String DEFAULT_TARGET_URL = FILTER_PROCESS_URL;
 
-    @Before
-    public void setUp() throws Exception {
-        filter = new OpenIDAuthenticationFilter();
-        filter.setConsumer(new MockOpenIDConsumer(REDIRECT_URL));
-        SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
-        filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler());
-        successHandler.setDefaultTargetUrl(DEFAULT_TARGET_URL);
-        filter.setAuthenticationManager(new AuthenticationManager() {
-            public Authentication authenticate(Authentication a) {
-                return a;
-            }
-        });
-        filter.afterPropertiesSet();
-    }
+	@Before
+	public void setUp() throws Exception {
+		filter = new OpenIDAuthenticationFilter();
+		filter.setConsumer(new MockOpenIDConsumer(REDIRECT_URL));
+		SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+		filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler());
+		successHandler.setDefaultTargetUrl(DEFAULT_TARGET_URL);
+		filter.setAuthenticationManager(new AuthenticationManager() {
+			public Authentication authenticate(Authentication a) {
+				return a;
+			}
+		});
+		filter.afterPropertiesSet();
+	}
 
-    @Test
-    public void testFilterOperation() throws Exception {
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        req.setServletPath(REQUEST_PATH);
-        req.setRequestURI(REQUEST_PATH);
-        req.setServerPort(8080);
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testFilterOperation() throws Exception {
+		MockHttpServletRequest req = new MockHttpServletRequest();
+		req.setServletPath(REQUEST_PATH);
+		req.setRequestURI(REQUEST_PATH);
+		req.setServerPort(8080);
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        req.setParameter("openid_identifier", " " + CLAIMED_IDENTITY_URL);
-        req.setRemoteHost("www.example.com");
+		req.setParameter("openid_identifier", " " + CLAIMED_IDENTITY_URL);
+		req.setRemoteHost("www.example.com");
 
-        filter.setConsumer(new MockOpenIDConsumer() {
-            public String beginConsumption(HttpServletRequest req, String claimedIdentity, String returnToUrl, String realm) throws OpenIDConsumerException {
-                assertEquals(CLAIMED_IDENTITY_URL, claimedIdentity);
-                assertEquals(DEFAULT_TARGET_URL, returnToUrl);
-                assertEquals("http://localhost:8080/", realm);
-                return REDIRECT_URL;
-            }
-        });
+		filter.setConsumer(new MockOpenIDConsumer() {
+			public String beginConsumption(HttpServletRequest req,
+					String claimedIdentity, String returnToUrl, String realm)
+					throws OpenIDConsumerException {
+				assertEquals(CLAIMED_IDENTITY_URL, claimedIdentity);
+				assertEquals(DEFAULT_TARGET_URL, returnToUrl);
+				assertEquals("http://localhost:8080/", realm);
+				return REDIRECT_URL;
+			}
+		});
 
-        FilterChain fc = mock(FilterChain.class);
-        filter.doFilter(req, response, fc);
-        assertEquals(REDIRECT_URL, response.getRedirectedUrl());
-        // Filter chain shouldn't proceed
-        verify(fc, never()).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		FilterChain fc = mock(FilterChain.class);
+		filter.doFilter(req, response, fc);
+		assertEquals(REDIRECT_URL, response.getRedirectedUrl());
+		// Filter chain shouldn't proceed
+		verify(fc, never()).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    /**
-     * Tests that the filter encodes any query parameters on the return_to URL.
-     */
-    @Test
-    public void encodesUrlParameters() throws Exception {
-        // Arbitrary parameter name and value that will both need to be encoded:
-        String paramName = "foo&bar";
-        String paramValue = "http://example.com/path?a=b&c=d";
-        MockHttpServletRequest req = new MockHttpServletRequest("GET", REQUEST_PATH);
-        req.addParameter(paramName, paramValue);
-        filter.setReturnToUrlParameters(Collections.singleton(paramName));
+	/**
+	 * Tests that the filter encodes any query parameters on the return_to URL.
+	 */
+	@Test
+	public void encodesUrlParameters() throws Exception {
+		// Arbitrary parameter name and value that will both need to be encoded:
+		String paramName = "foo&bar";
+		String paramValue = "http://example.com/path?a=b&c=d";
+		MockHttpServletRequest req = new MockHttpServletRequest("GET", REQUEST_PATH);
+		req.addParameter(paramName, paramValue);
+		filter.setReturnToUrlParameters(Collections.singleton(paramName));
 
-        URI returnTo = new URI(filter.buildReturnToUrl(req));
-        String query = returnTo.getRawQuery();
-        assertEquals(1, count(query, '='));
-        assertEquals(0, count(query, '&'));
-    }
+		URI returnTo = new URI(filter.buildReturnToUrl(req));
+		String query = returnTo.getRawQuery();
+		assertEquals(1, count(query, '='));
+		assertEquals(0, count(query, '&'));
+	}
 
-    /**
-     * Counts the number of occurrences of {@code c} in {@code s}.
-     */
-    private static int count(String s, char c) {
-        int count = 0;
-        for(char ch : s.toCharArray()) {
-            if(c == ch) {
-                count += 1;
-            }
-        }
-        return count;
-    }
+	/**
+	 * Counts the number of occurrences of {@code c} in {@code s}.
+	 */
+	private static int count(String s, char c) {
+		int count = 0;
+		for (char ch : s.toCharArray()) {
+			if (c == ch) {
+				count += 1;
+			}
+		}
+		return count;
+	}
 }
diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java
index 86b5537d41..2be560d104 100644
--- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java
+++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java
@@ -28,180 +28,205 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-
 /**
  * Tests {@link OpenIDAuthenticationProvider}
  *
  * @author Robin Bramley, Opsera Ltd
  */
 public class OpenIDAuthenticationProviderTests extends TestCase {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final String USERNAME = "user.acegiopenid.com";
+	private static final String USERNAME = "user.acegiopenid.com";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testAuthenticateCancel() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
-        provider.setAuthoritiesMapper(new NullAuthoritiesMapper());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testAuthenticateCancel() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
+		provider.setAuthoritiesMapper(new NullAuthoritiesMapper());
 
-        Authentication preAuth = new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.CANCELLED, USERNAME, "" ,null);
+		Authentication preAuth = new OpenIDAuthenticationToken(
+				OpenIDAuthenticationStatus.CANCELLED, USERNAME, "", null);
 
-        assertFalse(preAuth.isAuthenticated());
+		assertFalse(preAuth.isAuthenticated());
 
-        try {
-            provider.authenticate(preAuth);
-            fail("Should throw an AuthenticationException");
-        } catch (AuthenticationCancelledException expected) {
-            assertEquals("Log in cancelled", expected.getMessage());
-        }
-    }
+		try {
+			provider.authenticate(preAuth);
+			fail("Should throw an AuthenticationException");
+		}
+		catch (AuthenticationCancelledException expected) {
+			assertEquals("Log in cancelled", expected.getMessage());
+		}
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testAuthenticateError() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testAuthenticateError() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        Authentication preAuth = new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.ERROR, USERNAME, "", null);
+		Authentication preAuth = new OpenIDAuthenticationToken(
+				OpenIDAuthenticationStatus.ERROR, USERNAME, "", null);
 
-        assertFalse(preAuth.isAuthenticated());
+		assertFalse(preAuth.isAuthenticated());
 
-        try {
-            provider.authenticate(preAuth);
-            fail("Should throw an AuthenticationException");
-        } catch (AuthenticationServiceException expected) {
-            assertEquals("Error message from server: ", expected.getMessage());
-        }
-    }
+		try {
+			provider.authenticate(preAuth);
+			fail("Should throw an AuthenticationException");
+		}
+		catch (AuthenticationServiceException expected) {
+			assertEquals("Error message from server: ", expected.getMessage());
+		}
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testAuthenticateFailure() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setAuthenticationUserDetailsService(new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(new MockUserDetailsService()));
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testAuthenticateFailure() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setAuthenticationUserDetailsService(new UserDetailsByNameServiceWrapper<OpenIDAuthenticationToken>(
+				new MockUserDetailsService()));
 
-        Authentication preAuth = new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.FAILURE, USERNAME, "", null);
+		Authentication preAuth = new OpenIDAuthenticationToken(
+				OpenIDAuthenticationStatus.FAILURE, USERNAME, "", null);
 
-        assertFalse(preAuth.isAuthenticated());
+		assertFalse(preAuth.isAuthenticated());
 
-        try {
-            provider.authenticate(preAuth);
-            fail("Should throw an AuthenticationException");
-        } catch (BadCredentialsException expected) {
-            assertEquals("Log in failed - identity could not be verified", expected.getMessage());
-        }
-    }
+		try {
+			provider.authenticate(preAuth);
+			fail("Should throw an AuthenticationException");
+		}
+		catch (BadCredentialsException expected) {
+			assertEquals("Log in failed - identity could not be verified",
+					expected.getMessage());
+		}
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testAuthenticateSetupNeeded() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testAuthenticateSetupNeeded() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        Authentication preAuth = new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.SETUP_NEEDED, USERNAME, "", null);
+		Authentication preAuth = new OpenIDAuthenticationToken(
+				OpenIDAuthenticationStatus.SETUP_NEEDED, USERNAME, "", null);
 
-        assertFalse(preAuth.isAuthenticated());
+		assertFalse(preAuth.isAuthenticated());
 
-        try {
-            provider.authenticate(preAuth);
-            fail("Should throw an AuthenticationException");
-        } catch (AuthenticationServiceException expected) {
-            assertEquals("The server responded setup was needed, which shouldn't happen", expected.getMessage());
-        }
-    }
+		try {
+			provider.authenticate(preAuth);
+			fail("Should throw an AuthenticationException");
+		}
+		catch (AuthenticationServiceException expected) {
+			assertEquals("The server responded setup was needed, which shouldn't happen",
+					expected.getMessage());
+		}
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testAuthenticateSuccess() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testAuthenticateSuccess() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        Authentication preAuth = new OpenIDAuthenticationToken(OpenIDAuthenticationStatus.SUCCESS, USERNAME, "", null);
+		Authentication preAuth = new OpenIDAuthenticationToken(
+				OpenIDAuthenticationStatus.SUCCESS, USERNAME, "", null);
 
-        assertFalse(preAuth.isAuthenticated());
+		assertFalse(preAuth.isAuthenticated());
 
-        Authentication postAuth = provider.authenticate(preAuth);
+		Authentication postAuth = provider.authenticate(preAuth);
 
-        assertNotNull(postAuth);
-        assertTrue(postAuth instanceof OpenIDAuthenticationToken);
-        assertTrue(postAuth.isAuthenticated());
-        assertNotNull(postAuth.getPrincipal());
-        assertTrue(postAuth.getPrincipal() instanceof UserDetails);
-        assertNotNull(postAuth.getAuthorities());
-        assertTrue(postAuth.getAuthorities().size() > 0);
-        assertTrue(((OpenIDAuthenticationToken) postAuth).getStatus() == OpenIDAuthenticationStatus.SUCCESS);
-        assertTrue(((OpenIDAuthenticationToken) postAuth).getMessage() == null);
-    }
+		assertNotNull(postAuth);
+		assertTrue(postAuth instanceof OpenIDAuthenticationToken);
+		assertTrue(postAuth.isAuthenticated());
+		assertNotNull(postAuth.getPrincipal());
+		assertTrue(postAuth.getPrincipal() instanceof UserDetails);
+		assertNotNull(postAuth.getAuthorities());
+		assertTrue(postAuth.getAuthorities().size() > 0);
+		assertTrue(((OpenIDAuthenticationToken) postAuth).getStatus() == OpenIDAuthenticationStatus.SUCCESS);
+		assertTrue(((OpenIDAuthenticationToken) postAuth).getMessage() == null);
+	}
 
-    public void testDetectsMissingAuthoritiesPopulator() throws Exception {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+	public void testDetectsMissingAuthoritiesPopulator() throws Exception {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
 
-        try {
-            provider.afterPropertiesSet();
-            fail("Should have thrown Exception");
-        } catch (IllegalArgumentException expected) {
-            //ignored
-        }
-    }
+		try {
+			provider.afterPropertiesSet();
+			fail("Should have thrown Exception");
+		}
+		catch (IllegalArgumentException expected) {
+			// ignored
+		}
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.supports(Class)'
-     */
-    public void testDoesntSupport() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.supports(Class)'
+	 */
+	public void testDoesntSupport() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        assertFalse(provider.supports(UsernamePasswordAuthenticationToken.class));
-    }
+		assertFalse(provider.supports(UsernamePasswordAuthenticationToken.class));
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
-     */
-    public void testIgnoresUserPassAuthToken() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.authenticate(Authentication)'
+	 */
+	public void testIgnoresUserPassAuthToken() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(USERNAME, "password");
-        assertEquals(null, provider.authenticate(token));
-    }
+		UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(
+				USERNAME, "password");
+		assertEquals(null, provider.authenticate(token));
+	}
 
-    /*
-     * Test method for 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.supports(Class)'
-     */
-    public void testSupports() {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
+	/*
+	 * Test method for
+	 * 'org.springframework.security.authentication.openid.OpenIDAuthenticationProvider.supports(Class)'
+	 */
+	public void testSupports() {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
 
-        assertTrue(provider.supports(OpenIDAuthenticationToken.class));
-    }
+		assertTrue(provider.supports(OpenIDAuthenticationToken.class));
+	}
 
-    public void testValidation() throws Exception {
-        OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
-        try {
-            provider.afterPropertiesSet();
-            fail("IllegalArgumentException expected, ssoAuthoritiesPopulator is null");
-        } catch (IllegalArgumentException e) {
-            //expected
-        }
+	public void testValidation() throws Exception {
+		OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider();
+		try {
+			provider.afterPropertiesSet();
+			fail("IllegalArgumentException expected, ssoAuthoritiesPopulator is null");
+		}
+		catch (IllegalArgumentException e) {
+			// expected
+		}
 
-        provider = new OpenIDAuthenticationProvider();
-        provider.setUserDetailsService(new MockUserDetailsService());
-        provider.afterPropertiesSet();
-    }
+		provider = new OpenIDAuthenticationProvider();
+		provider.setUserDetailsService(new MockUserDetailsService());
+		provider.afterPropertiesSet();
+	}
 
-    static class MockUserDetailsService implements UserDetailsService {
-        public UserDetails loadUserByUsername(String ssoUserId) throws AuthenticationException {
-            return new User(ssoUserId, "password", true, true, true, true,
-                    AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B"));
-        }
-    }
+	static class MockUserDetailsService implements UserDetailsService {
+		public UserDetails loadUserByUsername(String ssoUserId)
+				throws AuthenticationException {
+			return new User(ssoUserId, "password", true, true, true, true,
+					AuthorityUtils.createAuthorityList("ROLE_A", "ROLE_B"));
+		}
+	}
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java
index 7410b72bd7..0d08bd201f 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsEntryNotFoundException.java
@@ -16,7 +16,6 @@
 
 package org.springframework.security.remoting.dns;
 
-
 /**
  * This will be thrown if no entry matches the specified DNS query.
  *
@@ -25,15 +24,14 @@ package org.springframework.security.remoting.dns;
  */
 public class DnsEntryNotFoundException extends DnsLookupException {
 
-    private static final long serialVersionUID = -947232730426775162L;
+	private static final long serialVersionUID = -947232730426775162L;
 
-    public DnsEntryNotFoundException(String msg) {
-        super(msg);
-    }
-
-    public DnsEntryNotFoundException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
+	public DnsEntryNotFoundException(String msg) {
+		super(msg);
+	}
 
+	public DnsEntryNotFoundException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java
index 127239d237..fe17fe3d3f 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsLookupException.java
@@ -24,12 +24,12 @@ package org.springframework.security.remoting.dns;
  */
 public class DnsLookupException extends RuntimeException {
 
-    public DnsLookupException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
+	public DnsLookupException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
 
-    public DnsLookupException(String msg) {
-        super(msg);
-    }
+	public DnsLookupException(String msg) {
+		super(msg);
+	}
 
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
index cfa558bb26..461c870474 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
@@ -24,50 +24,65 @@ package org.springframework.security.remoting.dns;
  */
 public interface DnsResolver {
 
-    /**
-     * Resolves the IP Address (A record) to the specified host name.
-     * Throws DnsEntryNotFoundException if there is no record.
-     *
-     * @param hostname The hostname for which you need the IP Address
-     * @return IP Address as a String
-     * @throws DnsEntryNotFoundException No record found
-     * @throws DnsLookupException Unknown DNS error
-     */
-    public String resolveIpAddress(String hostname) throws DnsEntryNotFoundException, DnsLookupException;
+	/**
+	 * Resolves the IP Address (A record) to the specified host name. Throws
+	 * DnsEntryNotFoundException if there is no record.
+	 *
+	 * @param hostname The hostname for which you need the IP Address
+	 * @return IP Address as a String
+	 * @throws DnsEntryNotFoundException No record found
+	 * @throws DnsLookupException Unknown DNS error
+	 */
+	public String resolveIpAddress(String hostname) throws DnsEntryNotFoundException,
+			DnsLookupException;
 
-    /**
-     * <p>Resolves the host name for the specified service in the specified domain</p>
-     * <p>For example, if you need the host name for an LDAP server running in the
-     * domain springsource.com, you would call <b>resolveServiceEntry("ldap", "springsource.com")</b>.</p>
-     *
-     * <p>The DNS server needs to provide the service records for this, in the example above, it
-     * would look like this:
-     *
-     * <pre>_ldap._tcp.springsource.com IN SRV 10 0 88 ldap.springsource.com.</pre>
-     *
-     * The method will return the record with highest priority (which means the lowest number in the DNS record)
-     * and if there are more than one records with the same priority, it will return the one with the highest weight.
-     * You will find more informatione about DNS service records at <a href="http://en.wikipedia.org/wiki/SRV_record">Wikipedia</a>.</p>
-     *
-     * @param serviceType The service type you are searching for, e.g. ldap, kerberos, ...
-     * @param domain The domain, in which you are searching for the service
-     * @return The hostname of the service
-     * @throws DnsEntryNotFoundException No record found
-     * @throws DnsLookupException Unknown DNS error
-     */
-    public String resolveServiceEntry(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException;
+	/**
+	 * <p>
+	 * Resolves the host name for the specified service in the specified domain
+	 * </p>
+	 * <p>
+	 * For example, if you need the host name for an LDAP server running in the domain
+	 * springsource.com, you would call <b>resolveServiceEntry("ldap",
+	 * "springsource.com")</b>.
+	 * </p>
+	 *
+	 * <p>
+	 * The DNS server needs to provide the service records for this, in the example above,
+	 * it would look like this:
+	 *
+	 * <pre>
+	 * _ldap._tcp.springsource.com IN SRV 10 0 88 ldap.springsource.com.
+	 * </pre>
+	 *
+	 * The method will return the record with highest priority (which means the lowest
+	 * number in the DNS record) and if there are more than one records with the same
+	 * priority, it will return the one with the highest weight. You will find more
+	 * informatione about DNS service records at <a
+	 * href="http://en.wikipedia.org/wiki/SRV_record">Wikipedia</a>.
+	 * </p>
+	 *
+	 * @param serviceType The service type you are searching for, e.g. ldap, kerberos, ...
+	 * @param domain The domain, in which you are searching for the service
+	 * @return The hostname of the service
+	 * @throws DnsEntryNotFoundException No record found
+	 * @throws DnsLookupException Unknown DNS error
+	 */
+	public String resolveServiceEntry(String serviceType, String domain)
+			throws DnsEntryNotFoundException, DnsLookupException;
 
-    /**
-     * Resolves the host name for the specified service and then the IP Address for this host in one call.
-     *
-     * @param serviceType The service type you are searching for, e.g. ldap, kerberos, ...
-     * @param domain The domain, in which you are searching for the service
-     * @return IP Address of the service
-     * @throws DnsEntryNotFoundException No record found
-     * @throws DnsLookupException Unknown DNS error
-     * @see #resolveServiceEntry(String, String)
-     * @see #resolveIpAddress(String)
-     */
-    public String resolveServiceIpAddress(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException;
+	/**
+	 * Resolves the host name for the specified service and then the IP Address for this
+	 * host in one call.
+	 *
+	 * @param serviceType The service type you are searching for, e.g. ldap, kerberos, ...
+	 * @param domain The domain, in which you are searching for the service
+	 * @return IP Address of the service
+	 * @throws DnsEntryNotFoundException No record found
+	 * @throws DnsLookupException Unknown DNS error
+	 * @see #resolveServiceEntry(String, String)
+	 * @see #resolveIpAddress(String)
+	 */
+	public String resolveServiceIpAddress(String serviceType, String domain)
+			throws DnsEntryNotFoundException, DnsLookupException;
 
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java
index da8c030edb..dc4c25b648 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java
@@ -16,7 +16,6 @@
 
 package org.springframework.security.remoting.dns;
 
-
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
@@ -31,11 +30,10 @@ import javax.naming.directory.InitialDirContext;
  */
 public interface InitialContextFactory {
 
-
-    /**
-     * Must return a DirContext which can be used for DNS queries
-     * @return JNDI DirContext
-     */
-    public DirContext getCtx();
+	/**
+	 * Must return a DirContext which can be used for DNS queries
+	 * @return JNDI DirContext
+	 */
+	public DirContext getCtx();
 
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java
index 2df9c5d5d5..d9df813120 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java
@@ -27,12 +27,12 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
-
 /**
  * Implementation of DnsResolver which uses JNDI for the DNS queries.
  *
- * Uses an <b>InitialContextFactory</b> to get the JNDI DirContext. The default implementation
- * will just create a new Context with the context factory <b>com.sun.jndi.dns.DnsContextFactory</b>
+ * Uses an <b>InitialContextFactory</b> to get the JNDI DirContext. The default
+ * implementation will just create a new Context with the context factory
+ * <b>com.sun.jndi.dns.DnsContextFactory</b>
  *
  * @author Mike Wiesner
  * @since 3.0
@@ -41,128 +41,146 @@ import javax.naming.directory.InitialDirContext;
  */
 public class JndiDnsResolver implements DnsResolver {
 
-    private InitialContextFactory ctxFactory = new DefaultInitialContextFactory();
+	private InitialContextFactory ctxFactory = new DefaultInitialContextFactory();
 
-    /**
-     * Allows to inject an own JNDI context factory.
-     *
-     * @param ctxFactory factory to use, when a DirContext is needed
-     * @see InitialDirContext
-     * @see DirContext
-     */
-    public void setCtxFactory(InitialContextFactory ctxFactory) {
-        this.ctxFactory = ctxFactory;
-    }
+	/**
+	 * Allows to inject an own JNDI context factory.
+	 *
+	 * @param ctxFactory factory to use, when a DirContext is needed
+	 * @see InitialDirContext
+	 * @see DirContext
+	 */
+	public void setCtxFactory(InitialContextFactory ctxFactory) {
+		this.ctxFactory = ctxFactory;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.remoting.dns.DnsResolver#resolveIpAddress(java.lang.String)
-     */
-    public String resolveIpAddress(String hostname) {
-        return resolveIpAddress(hostname, ctxFactory.getCtx());
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.remoting.dns.DnsResolver#resolveIpAddress(java.lang
+	 * .String)
+	 */
+	public String resolveIpAddress(String hostname) {
+		return resolveIpAddress(hostname, ctxFactory.getCtx());
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.remoting.dns.DnsResolver#resolveServiceEntry(java.lang.String, java.lang.String)
-     */
-    public String resolveServiceEntry(String serviceType, String domain) {
-        return resolveServiceEntry(serviceType, domain, ctxFactory.getCtx());
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.remoting.dns.DnsResolver#resolveServiceEntry(java.
+	 * lang.String, java.lang.String)
+	 */
+	public String resolveServiceEntry(String serviceType, String domain) {
+		return resolveServiceEntry(serviceType, domain, ctxFactory.getCtx());
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.remoting.dns.DnsResolver#resolveServiceIpAddress(java.lang.String, java.lang.String)
-     */
-    public String resolveServiceIpAddress(String serviceType, String domain) {
-        DirContext ctx = ctxFactory.getCtx();
-        String hostname = resolveServiceEntry(serviceType, domain, ctx);
-        return resolveIpAddress(hostname, ctx);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.remoting.dns.DnsResolver#resolveServiceIpAddress(java
+	 * .lang.String, java.lang.String)
+	 */
+	public String resolveServiceIpAddress(String serviceType, String domain) {
+		DirContext ctx = ctxFactory.getCtx();
+		String hostname = resolveServiceEntry(serviceType, domain, ctx);
+		return resolveIpAddress(hostname, ctx);
+	}
 
+	// This method is needed, so that we can use only one DirContext for
+	// resolveServiceIpAddress().
+	private String resolveIpAddress(String hostname, DirContext ctx) {
+		try {
+			Attribute dnsRecord = lookup(hostname, ctx, "A");
+			// There should be only one A record, therefore it is save to return
+			// only the first.
+			return dnsRecord.get().toString();
+		}
+		catch (NamingException e) {
+			throw new DnsLookupException("DNS lookup failed for: " + hostname, e);
+		}
 
+	}
 
-    // This method is needed, so that we can use only one DirContext for
-    // resolveServiceIpAddress().
-    private String resolveIpAddress(String hostname, DirContext ctx) {
-        try {
-            Attribute dnsRecord = lookup(hostname, ctx, "A");
-            // There should be only one A record, therefore it is save to return
-            // only the first.
-            return dnsRecord.get().toString();
-        } catch (NamingException e) {
-            throw new DnsLookupException("DNS lookup failed for: "+ hostname, e);
-        }
+	// This method is needed, so that we can use only one DirContext for
+	// resolveServiceIpAddress().
+	private String resolveServiceEntry(String serviceType, String domain, DirContext ctx) {
+		String result = null;
+		try {
+			String query = new StringBuilder("_").append(serviceType).append("._tcp.")
+					.append(domain).toString();
+			Attribute dnsRecord = lookup(query, ctx, "SRV");
+			// There are maybe more records defined, we will return the one
+			// with the highest priority (lowest number) and the highest weight
+			// (highest number)
+			int highestPriority = -1;
+			int highestWeight = -1;
 
-    }
+			for (NamingEnumeration<?> recordEnum = dnsRecord.getAll(); recordEnum
+					.hasMoreElements();) {
+				String[] record = recordEnum.next().toString().split(" ");
+				if (record.length != 4) {
+					throw new DnsLookupException("Wrong service record for query "
+							+ query + ": [" + Arrays.toString(record) + "]");
+				}
+				int priority = Integer.parseInt(record[0]);
+				int weight = Integer.parseInt(record[1]);
+				// we have a new highest Priority, so forget also the highest weight
+				if (priority < highestPriority || highestPriority == -1) {
+					highestPriority = priority;
+					highestWeight = weight;
+					result = record[3].trim();
+				}
+				// same priority, but higher weight
+				if (priority == highestPriority && weight > highestWeight) {
+					highestWeight = weight;
+					result = record[3].trim();
+				}
+			}
+		}
+		catch (NamingException e) {
+			throw new DnsLookupException("DNS lookup failed for service " + serviceType
+					+ " at " + domain, e);
+		}
 
-    // This method is needed, so that we can use only one DirContext for
-    // resolveServiceIpAddress().
-    private String resolveServiceEntry(String serviceType, String domain, DirContext ctx) {
-        String result = null;
-        try {
-            String query = new StringBuilder("_").append(serviceType).append("._tcp.").append(domain).toString();
-            Attribute dnsRecord = lookup(query, ctx, "SRV");
-            // There are maybe more records defined, we will return the one
-            // with the highest priority (lowest number) and the highest weight
-            // (highest number)
-            int highestPriority = -1;
-            int highestWeight = -1;
+		// remove the "." at the end
+		if (result.endsWith(".")) {
+			result = result.substring(0, result.length() - 1);
+		}
+		return result;
+	}
 
-            for (NamingEnumeration<?> recordEnum = dnsRecord.getAll(); recordEnum.hasMoreElements();) {
-                String[] record = recordEnum.next().toString().split(" ");
-                if (record.length != 4) {
-                    throw new DnsLookupException("Wrong service record for query " + query + ": [" + Arrays.toString(record) + "]");
-                }
-                int priority = Integer.parseInt(record[0]);
-                int weight = Integer.parseInt(record[1]);
-                // we have a new highest Priority, so forget also the highest weight
-                if (priority < highestPriority || highestPriority == -1) {
-                    highestPriority = priority;
-                    highestWeight = weight;
-                    result = record[3].trim();
-                }
-                // same priority, but higher weight
-                if (priority == highestPriority && weight > highestWeight) {
-                    highestWeight = weight;
-                    result = record[3].trim();
-                }
-            }
-        } catch (NamingException e) {
-            throw new DnsLookupException("DNS lookup failed for service " + serviceType + " at " + domain, e);
-        }
+	private Attribute lookup(String query, DirContext ictx, String recordType) {
+		try {
+			Attributes dnsResult = ictx.getAttributes(query, new String[] { recordType });
 
-        // remove the "." at the end
-        if (result.endsWith(".")) {
-            result = result.substring(0, result.length() - 1);
-        }
-        return result;
-    }
+			return dnsResult.get(recordType);
+		}
+		catch (NamingException e) {
+			if (e instanceof NameNotFoundException) {
+				throw new DnsEntryNotFoundException("DNS entry not found for:" + query, e);
+			}
+			throw new DnsLookupException("DNS lookup failed for: " + query, e);
+		}
+	}
 
-    private Attribute lookup(String query, DirContext ictx, String recordType) {
-        try {
-            Attributes dnsResult = ictx.getAttributes(query, new String[] { recordType });
+	private static class DefaultInitialContextFactory implements InitialContextFactory {
 
-            return dnsResult.get(recordType);
-        } catch (NamingException e) {
-            if (e instanceof NameNotFoundException) {
-                throw new DnsEntryNotFoundException("DNS entry not found for:" + query, e);
-            }
-            throw new DnsLookupException("DNS lookup failed for: " + query, e);
-        }
-    }
-
-
-    private static class DefaultInitialContextFactory implements InitialContextFactory {
-
-        public DirContext getCtx() {
-            Hashtable<String, String> env = new Hashtable<String, String>();
-            env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory");
-            env.put(Context.PROVIDER_URL, "dns:"); // This is needed for IBM JDK/JRE
-            InitialDirContext ictx;
-            try {
-                ictx = new InitialDirContext(env);
-            } catch (NamingException e) {
-                throw new DnsLookupException("Cannot create InitialDirContext for DNS lookup", e);
-            }
-            return ictx;
-        }
-    }
+		public DirContext getCtx() {
+			Hashtable<String, String> env = new Hashtable<String, String>();
+			env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory");
+			env.put(Context.PROVIDER_URL, "dns:"); // This is needed for IBM JDK/JRE
+			InitialDirContext ictx;
+			try {
+				ictx = new InitialDirContext(env);
+			}
+			catch (NamingException e) {
+				throw new DnsLookupException(
+						"Cannot create InitialDirContext for DNS lookup", e);
+			}
+			return ictx;
+		}
+	}
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java b/remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java
index 3144434ea5..b8f860a456 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/package-info.java
@@ -2,3 +2,4 @@
  * DNS resolution.
  */
 package org.springframework.security.remoting.dns;
+
diff --git a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
index b9c00c253e..9e5c32f138 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutor.java
@@ -27,66 +27,82 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-
 /**
  * Adds BASIC authentication support to <code>SimpleHttpInvokerRequestExecutor</code>.
  *
  * @author Ben Alex
  * @author Rob Winch
  */
-public class AuthenticationSimpleHttpInvokerRequestExecutor extends SimpleHttpInvokerRequestExecutor {
-    //~ Static fields/initializers =====================================================================================
+public class AuthenticationSimpleHttpInvokerRequestExecutor extends
+		SimpleHttpInvokerRequestExecutor {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(AuthenticationSimpleHttpInvokerRequestExecutor.class);
+	private static final Log logger = LogFactory
+			.getLog(AuthenticationSimpleHttpInvokerRequestExecutor.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Provided so subclasses can perform additional configuration if required (eg set additional request
-     * headers for non-security related information etc).
-     *
-     * @param con the HTTP connection to prepare
-     * @param contentLength the length of the content to send
-     *
-     * @throws IOException if thrown by HttpURLConnection methods
-     */
-    protected void doPrepareConnection(HttpURLConnection con, int contentLength)
-        throws IOException {}
+	/**
+	 * Provided so subclasses can perform additional configuration if required (eg set
+	 * additional request headers for non-security related information etc).
+	 *
+	 * @param con the HTTP connection to prepare
+	 * @param contentLength the length of the content to send
+	 *
+	 * @throws IOException if thrown by HttpURLConnection methods
+	 */
+	protected void doPrepareConnection(HttpURLConnection con, int contentLength)
+			throws IOException {
+	}
 
-    /**
-     * Called every time a HTTP invocation is made.<p>Simply allows the parent to setup the connection, and
-     * then adds an <code>Authorization</code> HTTP header property that will be used for BASIC authentication.</p>
-     *  <p>The <code>SecurityContextHolder</code> is used to obtain the relevant principal and credentials.</p>
-     *
-     * @param con the HTTP connection to prepare
-     * @param contentLength the length of the content to send
-     *
-     * @throws IOException if thrown by HttpURLConnection methods
-     */
-    protected void prepareConnection(HttpURLConnection con, int contentLength) throws IOException {
-        super.prepareConnection(con, contentLength);
+	/**
+	 * Called every time a HTTP invocation is made.
+	 * <p>
+	 * Simply allows the parent to setup the connection, and then adds an
+	 * <code>Authorization</code> HTTP header property that will be used for BASIC
+	 * authentication.
+	 * </p>
+	 * <p>
+	 * The <code>SecurityContextHolder</code> is used to obtain the relevant principal and
+	 * credentials.
+	 * </p>
+	 *
+	 * @param con the HTTP connection to prepare
+	 * @param contentLength the length of the content to send
+	 *
+	 * @throws IOException if thrown by HttpURLConnection methods
+	 */
+	protected void prepareConnection(HttpURLConnection con, int contentLength)
+			throws IOException {
+		super.prepareConnection(con, contentLength);
 
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        if ((auth != null) && (auth.getName() != null) && (auth.getCredentials() != null) && !trustResolver.isAnonymous(auth)) {
-            String base64 = auth.getName() + ":" + auth.getCredentials().toString();
-            con.setRequestProperty("Authorization", "Basic " + new String(Base64.encode(base64.getBytes())));
+		if ((auth != null) && (auth.getName() != null) && (auth.getCredentials() != null)
+				&& !trustResolver.isAnonymous(auth)) {
+			String base64 = auth.getName() + ":" + auth.getCredentials().toString();
+			con.setRequestProperty("Authorization",
+					"Basic " + new String(Base64.encode(base64.getBytes())));
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("HttpInvocation now presenting via BASIC authentication SecurityContextHolder-derived: "
-                    + auth.toString());
-            }
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Unable to set BASIC authentication header as SecurityContext did not provide "
-                        + "valid Authentication: " + auth);
-            }
-        }
+			if (logger.isDebugEnabled()) {
+				logger.debug("HttpInvocation now presenting via BASIC authentication SecurityContextHolder-derived: "
+						+ auth.toString());
+			}
+		}
+		else {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Unable to set BASIC authentication header as SecurityContext did not provide "
+						+ "valid Authentication: " + auth);
+			}
+		}
 
-        doPrepareConnection(con, contentLength);
-    }
+		doPrepareConnection(con, contentLength);
+	}
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java
index c8a9b993f8..7fa55a82e4 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/httpinvoker/package-info.java
@@ -17,3 +17,4 @@
  * </pre>
  */
 package org.springframework.security.remoting.httpinvoker;
+
diff --git a/remoting/src/main/java/org/springframework/security/remoting/package-info.java b/remoting/src/main/java/org/springframework/security/remoting/package-info.java
index caa6c8a372..88381c1f43 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/package-info.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/package-info.java
@@ -2,3 +2,4 @@
  * Remote client related functionality.
  */
 package org.springframework.security.remoting;
+
diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java
index edba7638e9..816ed9a253 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocation.java
@@ -26,16 +26,16 @@ import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.lang.reflect.InvocationTargetException;
 
-
 /**
  * The actual {@code RemoteInvocation} that is passed from the client to the server.
  * <p>
- * The principal and credentials information will be extracted from the current
- * security context and passed to the server as part of the invocation object.
+ * The principal and credentials information will be extracted from the current security
+ * context and passed to the server as part of the invocation object.
  * <p>
- * To avoid potential serialization-based attacks, this implementation interprets the values as {@code String}s
- * and creates a {@code UsernamePasswordAuthenticationToken} on the server side to hold them. If a different
- * token type is required you can override the {@code createAuthenticationRequest} method.
+ * To avoid potential serialization-based attacks, this implementation interprets the
+ * values as {@code String}s and creates a {@code UsernamePasswordAuthenticationToken} on
+ * the server side to hold them. If a different token type is required you can override
+ * the {@code createAuthenticationRequest} method.
  *
  * @author James Monaghan
  * @author Ben Alex
@@ -43,87 +43,95 @@ import java.lang.reflect.InvocationTargetException;
  */
 public class ContextPropagatingRemoteInvocation extends RemoteInvocation {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private static final Log logger = LogFactory.getLog(ContextPropagatingRemoteInvocation.class);
+	private static final Log logger = LogFactory
+			.getLog(ContextPropagatingRemoteInvocation.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String principal;
-    private final String credentials;
+	private final String principal;
+	private final String credentials;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs the object, storing the principal and credentials extracted from the client-side
-     * security context.
-     *
-     * @param methodInvocation the method to invoke
-     */
-    public ContextPropagatingRemoteInvocation(MethodInvocation methodInvocation) {
-        super(methodInvocation);
-        Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Constructs the object, storing the principal and credentials extracted from the
+	 * client-side security context.
+	 *
+	 * @param methodInvocation the method to invoke
+	 */
+	public ContextPropagatingRemoteInvocation(MethodInvocation methodInvocation) {
+		super(methodInvocation);
+		Authentication currentUser = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (currentUser != null) {
-            principal = currentUser.getName();
-            Object userCredentials = currentUser.getCredentials();
-            credentials = userCredentials == null ? null : userCredentials.toString();
-        } else {
-            principal = credentials = null;
-        }
+		if (currentUser != null) {
+			principal = currentUser.getName();
+			Object userCredentials = currentUser.getCredentials();
+			credentials = userCredentials == null ? null : userCredentials.toString();
+		}
+		else {
+			principal = credentials = null;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("RemoteInvocation now has principal: " + principal);
-            if(credentials == null) {
-                logger.debug("RemoteInvocation now has null credentials.");
-            }
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("RemoteInvocation now has principal: " + principal);
+			if (credentials == null) {
+				logger.debug("RemoteInvocation now has null credentials.");
+			}
+		}
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Invoked on the server-side.
-     * <p>
-     * The transmitted principal and credentials will be used to create an unauthenticated {@code Authentication}
-     * instance for processing by the {@code AuthenticationManager}.
-     *
-     * @param targetObject the target object to apply the invocation to
-     *
-     * @return the invocation result
-     *
-     * @throws NoSuchMethodException if the method name could not be resolved
-     * @throws IllegalAccessException if the method could not be accessed
-     * @throws InvocationTargetException if the method invocation resulted in an exception
-     */
-    public Object invoke(Object targetObject)
-            throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
+	/**
+	 * Invoked on the server-side.
+	 * <p>
+	 * The transmitted principal and credentials will be used to create an unauthenticated
+	 * {@code Authentication} instance for processing by the {@code AuthenticationManager}.
+	 *
+	 * @param targetObject the target object to apply the invocation to
+	 *
+	 * @return the invocation result
+	 *
+	 * @throws NoSuchMethodException if the method name could not be resolved
+	 * @throws IllegalAccessException if the method could not be accessed
+	 * @throws InvocationTargetException if the method invocation resulted in an exception
+	 */
+	public Object invoke(Object targetObject) throws NoSuchMethodException,
+			IllegalAccessException, InvocationTargetException {
 
-        if (principal != null) {
-            Authentication request = createAuthenticationRequest(principal, credentials);
-            request.setAuthenticated(false);
-            SecurityContextHolder.getContext().setAuthentication(request);
+		if (principal != null) {
+			Authentication request = createAuthenticationRequest(principal, credentials);
+			request.setAuthenticated(false);
+			SecurityContextHolder.getContext().setAuthentication(request);
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Set SecurityContextHolder to contain: " + request);
-            }
-        }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Set SecurityContextHolder to contain: " + request);
+			}
+		}
 
-        try {
-            return super.invoke(targetObject);
-        } finally {
-            SecurityContextHolder.clearContext();
+		try {
+			return super.invoke(targetObject);
+		}
+		finally {
+			SecurityContextHolder.clearContext();
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Cleared SecurityContextHolder.");
-            }
-        }
-    }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Cleared SecurityContextHolder.");
+			}
+		}
+	}
 
-    /**
-     * Creates the server-side authentication request object.
-     */
-    protected Authentication createAuthenticationRequest(String principal, String credentials) {
-        return new UsernamePasswordAuthenticationToken(principal, credentials);
-    }
+	/**
+	 * Creates the server-side authentication request object.
+	 */
+	protected Authentication createAuthenticationRequest(String principal,
+			String credentials) {
+		return new UsernamePasswordAuthenticationToken(principal, credentials);
+	}
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java
index 300ae3e324..084538b95c 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationFactory.java
@@ -20,19 +20,23 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.remoting.support.RemoteInvocation;
 import org.springframework.remoting.support.RemoteInvocationFactory;
 
-
 /**
- * Called by a client-side instance of <code>org.springframework.remoting.rmi.RmiProxyFactoryBean</code> when it
- * wishes to create a remote invocation.<P>Set an instance of this bean against the above class'
- * <code>remoteInvocationFactory</code> property.</p>
+ * Called by a client-side instance of
+ * <code>org.springframework.remoting.rmi.RmiProxyFactoryBean</code> when it wishes to
+ * create a remote invocation.
+ * <P>
+ * Set an instance of this bean against the above class'
+ * <code>remoteInvocationFactory</code> property.
+ * </p>
  *
  * @author James Monaghan
  * @author Ben Alex
  */
 public class ContextPropagatingRemoteInvocationFactory implements RemoteInvocationFactory {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
-        return new ContextPropagatingRemoteInvocation(methodInvocation);
-    }
+	public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) {
+		return new ContextPropagatingRemoteInvocation(methodInvocation);
+	}
 }
diff --git a/remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java b/remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java
index 4ed18fc06d..3cd834d060 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/rmi/package-info.java
@@ -16,3 +16,4 @@
  * </pre>
  */
 package org.springframework.security.remoting.rmi;
+
diff --git a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java
index 0a24da297a..99b1f0b149 100644
--- a/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java
+++ b/remoting/src/test/java/org/springframework/security/remoting/dns/JndiDnsResolverTests.java
@@ -36,84 +36,89 @@ import org.junit.Test;
  */
 public class JndiDnsResolverTests {
 
-    private JndiDnsResolver dnsResolver;
-    private InitialContextFactory contextFactory;
-    private DirContext context;
+	private JndiDnsResolver dnsResolver;
+	private InitialContextFactory contextFactory;
+	private DirContext context;
 
-    @Before
-    public void setup() {
-        contextFactory = mock(InitialContextFactory.class);
-        context = mock(DirContext.class);
-        dnsResolver = new JndiDnsResolver();
-        dnsResolver.setCtxFactory(contextFactory);
-        when(contextFactory.getCtx()).thenReturn(context);
-    }
+	@Before
+	public void setup() {
+		contextFactory = mock(InitialContextFactory.class);
+		context = mock(DirContext.class);
+		dnsResolver = new JndiDnsResolver();
+		dnsResolver.setCtxFactory(contextFactory);
+		when(contextFactory.getCtx()).thenReturn(context);
+	}
 
-    @Test
-    public void testResolveIpAddress() throws Exception {
-        Attributes records = new BasicAttributes("A","63.246.7.80");
+	@Test
+	public void testResolveIpAddress() throws Exception {
+		Attributes records = new BasicAttributes("A", "63.246.7.80");
 
-        when(context.getAttributes("www.springsource.com", new String[] {"A"})).thenReturn(records);
+		when(context.getAttributes("www.springsource.com", new String[] { "A" }))
+				.thenReturn(records);
 
-        String ipAddress = dnsResolver.resolveIpAddress("www.springsource.com");
-        assertEquals("63.246.7.80", ipAddress);
-    }
+		String ipAddress = dnsResolver.resolveIpAddress("www.springsource.com");
+		assertEquals("63.246.7.80", ipAddress);
+	}
 
-    @Test(expected=DnsEntryNotFoundException.class)
-    public void testResolveIpAddressNotExisting() throws Exception {
-        when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(new NameNotFoundException("not found"));
+	@Test(expected = DnsEntryNotFoundException.class)
+	public void testResolveIpAddressNotExisting() throws Exception {
+		when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(
+				new NameNotFoundException("not found"));
 
-        dnsResolver.resolveIpAddress("notexisting.ansdansdugiuzgguzgioansdiandwq.foo");
-    }
+		dnsResolver.resolveIpAddress("notexisting.ansdansdugiuzgguzgioansdiandwq.foo");
+	}
 
-    @Test
-    public void testResolveServiceEntry() throws Exception {
-        BasicAttributes records = createSrvRecords();
+	@Test
+	public void testResolveServiceEntry() throws Exception {
+		BasicAttributes records = createSrvRecords();
 
-        when(context.getAttributes("_ldap._tcp.springsource.com", new String[] {"SRV"})).thenReturn(records);
+		when(context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" }))
+				.thenReturn(records);
 
-        String hostname = dnsResolver.resolveServiceEntry("ldap", "springsource.com");
-        assertEquals("kdc.springsource.com", hostname);
-    }
+		String hostname = dnsResolver.resolveServiceEntry("ldap", "springsource.com");
+		assertEquals("kdc.springsource.com", hostname);
+	}
 
+	@Test(expected = DnsEntryNotFoundException.class)
+	public void testResolveServiceEntryNotExisting() throws Exception {
+		when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(
+				new NameNotFoundException("not found"));
 
-    @Test(expected=DnsEntryNotFoundException.class)
-    public void testResolveServiceEntryNotExisting() throws Exception {
-        when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(new NameNotFoundException("not found"));
+		dnsResolver.resolveServiceEntry("wrong", "secpod.de");
+	}
 
-        dnsResolver.resolveServiceEntry("wrong", "secpod.de");
-    }
+	@Test
+	public void testResolveServiceIpAddress() throws Exception {
+		BasicAttributes srvRecords = createSrvRecords();
+		BasicAttributes aRecords = new BasicAttributes("A", "63.246.7.80");
+		when(context.getAttributes("_ldap._tcp.springsource.com", new String[] { "SRV" }))
+				.thenReturn(srvRecords);
+		when(context.getAttributes("kdc.springsource.com", new String[] { "A" }))
+				.thenReturn(aRecords);
 
-    @Test
-    public void testResolveServiceIpAddress() throws Exception {
-        BasicAttributes srvRecords = createSrvRecords();
-        BasicAttributes aRecords = new BasicAttributes("A", "63.246.7.80");
-        when(context.getAttributes("_ldap._tcp.springsource.com", new String[] {"SRV"})).thenReturn(srvRecords);
-        when(context.getAttributes("kdc.springsource.com", new String[] {"A"})).thenReturn(aRecords);
+		String ipAddress = dnsResolver
+				.resolveServiceIpAddress("ldap", "springsource.com");
+		assertEquals("63.246.7.80", ipAddress);
+	}
 
-        String ipAddress = dnsResolver.resolveServiceIpAddress("ldap", "springsource.com");
-        assertEquals("63.246.7.80", ipAddress);
-    }
+	@Test(expected = DnsLookupException.class)
+	public void testUnknowError() throws Exception {
+		when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(
+				new NamingException("error"));
+		dnsResolver.resolveIpAddress("");
+	}
 
-    @Test(expected=DnsLookupException.class)
-    public void testUnknowError() throws Exception {
-        when(context.getAttributes(any(String.class), any(String[].class))).thenThrow(new NamingException("error"));
-        dnsResolver.resolveIpAddress("");
-    }
-
-
-
-    private BasicAttributes createSrvRecords() {
-        BasicAttributes records = new BasicAttributes();
-        BasicAttribute record = new BasicAttribute("SRV");
-        // the structure of the service records is:
-        // priority weight port hostname
-        // for more information: http://en.wikipedia.org/wiki/SRV_record
-        record.add("20 80 389 kdc3.springsource.com.");
-        record.add("10 70 389 kdc.springsource.com.");
-        record.add("20 20 389 kdc4.springsource.com.");
-        record.add("10 30 389 kdc2.springsource.com");
-        records.put(record);
-        return records;
-    }
+	private BasicAttributes createSrvRecords() {
+		BasicAttributes records = new BasicAttributes();
+		BasicAttribute record = new BasicAttribute("SRV");
+		// the structure of the service records is:
+		// priority weight port hostname
+		// for more information: http://en.wikipedia.org/wiki/SRV_record
+		record.add("20 80 389 kdc3.springsource.com.");
+		record.add("10 70 389 kdc.springsource.com.");
+		record.add("20 20 389 kdc4.springsource.com.");
+		record.add("10 30 389 kdc2.springsource.com");
+		records.put(record);
+		return records;
+	}
 }
diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
index 0990a2bccb..ae3a056848 100644
--- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
+++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java
@@ -17,7 +17,6 @@ package org.springframework.security.remoting.httpinvoker;
 
 import junit.framework.TestCase;
 
-
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -34,7 +33,6 @@ import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
  * Tests {@link AuthenticationSimpleHttpInvokerRequestExecutor}.
  *
@@ -43,86 +41,90 @@ import java.util.Map;
  */
 public class AuthenticationSimpleHttpInvokerRequestExecutorTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        SecurityContextHolder.clearContext();
-    }
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		SecurityContextHolder.clearContext();
+	}
 
-    public void testNormalOperation() throws Exception {
-        // Setup client-side context
-        Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken("Aladdin", "open sesame");
-        SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
+	public void testNormalOperation() throws Exception {
+		// Setup client-side context
+		Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken(
+				"Aladdin", "open sesame");
+		SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
 
-        // Create a connection and ensure our executor sets its
-        // properties correctly
-        AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
-        HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
-        executor.prepareConnection(conn, 10);
+		// Create a connection and ensure our executor sets its
+		// properties correctly
+		AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
+		HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
+		executor.prepareConnection(conn, 10);
 
-        // Check connection properties
-        // See http://www.faqs.org/rfcs/rfc1945.html section 11.1 for example
-        // we are comparing against
-        assertEquals("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", conn.getRequestProperty("Authorization"));
-    }
+		// Check connection properties
+		// See http://www.faqs.org/rfcs/rfc1945.html section 11.1 for example
+		// we are comparing against
+		assertEquals("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==",
+				conn.getRequestProperty("Authorization"));
+	}
 
-    public void testNullContextHolderIsNull() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(null);
+	public void testNullContextHolderIsNull() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(null);
 
-        // Create a connection and ensure our executor sets its
-        // properties correctly
-        AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
-        HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
-        executor.prepareConnection(conn, 10);
+		// Create a connection and ensure our executor sets its
+		// properties correctly
+		AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
+		HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
+		executor.prepareConnection(conn, 10);
 
-        // Check connection properties (shouldn't be an Authorization header)
-        assertNull(conn.getRequestProperty("Authorization"));
-    }
+		// Check connection properties (shouldn't be an Authorization header)
+		assertNull(conn.getRequestProperty("Authorization"));
+	}
 
-    // SEC-1975
-    public void testNullContextHolderWhenAnonymous() throws Exception {
-        AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key", "principal",
-                AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
-        SecurityContextHolder.getContext().setAuthentication(anonymous);
+	// SEC-1975
+	public void testNullContextHolderWhenAnonymous() throws Exception {
+		AnonymousAuthenticationToken anonymous = new AnonymousAuthenticationToken("key",
+				"principal", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+		SecurityContextHolder.getContext().setAuthentication(anonymous);
 
-        // Create a connection and ensure our executor sets its
-        // properties correctly
-        AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
-        HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
-        executor.prepareConnection(conn, 10);
+		// Create a connection and ensure our executor sets its
+		// properties correctly
+		AuthenticationSimpleHttpInvokerRequestExecutor executor = new AuthenticationSimpleHttpInvokerRequestExecutor();
+		HttpURLConnection conn = new MockHttpURLConnection(new URL("http://localhost/"));
+		executor.prepareConnection(conn, 10);
 
-        // Check connection properties (shouldn't be an Authorization header)
-        assertNull(conn.getRequestProperty("Authorization"));
-    }
+		// Check connection properties (shouldn't be an Authorization header)
+		assertNull(conn.getRequestProperty("Authorization"));
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockHttpURLConnection extends HttpURLConnection {
-        private Map<String,String> requestProperties = new HashMap<String,String>();
+	private class MockHttpURLConnection extends HttpURLConnection {
+		private Map<String, String> requestProperties = new HashMap<String, String>();
 
-        public MockHttpURLConnection(URL u) {
-            super(u);
-        }
+		public MockHttpURLConnection(URL u) {
+			super(u);
+		}
 
-        public void connect() throws IOException {
-            throw new UnsupportedOperationException("mock not implemented");
-        }
+		public void connect() throws IOException {
+			throw new UnsupportedOperationException("mock not implemented");
+		}
 
-        public void disconnect() {
-            throw new UnsupportedOperationException("mock not implemented");
-        }
+		public void disconnect() {
+			throw new UnsupportedOperationException("mock not implemented");
+		}
 
-        public String getRequestProperty(String key) {
-            return requestProperties.get(key);
-        }
+		public String getRequestProperty(String key) {
+			return requestProperties.get(key);
+		}
 
-        public void setRequestProperty(String key, String value) {
-            requestProperties.put(key, value);
-        }
+		public void setRequestProperty(String key, String value) {
+			requestProperties.put(key, value);
+		}
 
-        public boolean usingProxy() {
-            throw new UnsupportedOperationException("mock not implemented");
-        }
-    }
+		public boolean usingProxy() {
+			throw new UnsupportedOperationException("mock not implemented");
+		}
+	}
 }
diff --git a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java
index 47f4565a80..659090b01d 100644
--- a/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java
+++ b/remoting/src/test/java/org/springframework/security/remoting/rmi/ContextPropagatingRemoteInvocationTests.java
@@ -26,83 +26,92 @@ import org.springframework.test.util.ReflectionTestUtils;
 
 import java.lang.reflect.Method;
 
-
 /**
- * Tests {@link ContextPropagatingRemoteInvocation} and {@link ContextPropagatingRemoteInvocationFactory}.
+ * Tests {@link ContextPropagatingRemoteInvocation} and
+ * {@link ContextPropagatingRemoteInvocationFactory}.
  *
  * @author Ben Alex
  */
 public class ContextPropagatingRemoteInvocationTests extends TestCase {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        SecurityContextHolder.clearContext();
-    }
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		SecurityContextHolder.clearContext();
+	}
 
-    private ContextPropagatingRemoteInvocation getRemoteInvocation() throws Exception {
-        Class<TargetObject> clazz = TargetObject.class;
-        Method method = clazz.getMethod("makeLowerCase", new Class[] {String.class});
-        MethodInvocation mi = new SimpleMethodInvocation(new TargetObject(), method, "SOME_STRING");
+	private ContextPropagatingRemoteInvocation getRemoteInvocation() throws Exception {
+		Class<TargetObject> clazz = TargetObject.class;
+		Method method = clazz.getMethod("makeLowerCase", new Class[] { String.class });
+		MethodInvocation mi = new SimpleMethodInvocation(new TargetObject(), method,
+				"SOME_STRING");
 
-        ContextPropagatingRemoteInvocationFactory factory = new ContextPropagatingRemoteInvocationFactory();
+		ContextPropagatingRemoteInvocationFactory factory = new ContextPropagatingRemoteInvocationFactory();
 
-        return (ContextPropagatingRemoteInvocation) factory.createRemoteInvocation(mi);
-    }
+		return (ContextPropagatingRemoteInvocation) factory.createRemoteInvocation(mi);
+	}
 
-    public void testContextIsResetEvenIfExceptionOccurs() throws Exception {
-        // Setup client-side context
-        Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken("rod", "koala");
-        SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
+	public void testContextIsResetEvenIfExceptionOccurs() throws Exception {
+		// Setup client-side context
+		Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+		SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
 
-        ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
+		ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
 
-        try {
-            // Set up the wrong arguments.
-            remoteInvocation.setArguments(new Object[] {});
-            remoteInvocation.invoke(TargetObject.class.newInstance());
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
+		try {
+			// Set up the wrong arguments.
+			remoteInvocation.setArguments(new Object[] {});
+			remoteInvocation.invoke(TargetObject.class.newInstance());
+			fail("Expected IllegalArgumentException");
+		}
+		catch (IllegalArgumentException e) {
+			// expected
+		}
 
-        assertNull("Authentication must be null ", SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertNull("Authentication must be null ", SecurityContextHolder.getContext()
+				.getAuthentication());
+	}
 
-    public void testNormalOperation() throws Exception {
-        // Setup client-side context
-        Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken("rod", "koala");
-        SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
+	public void testNormalOperation() throws Exception {
+		// Setup client-side context
+		Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+		SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
 
-        ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
+		ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
 
-        // Set to null, as ContextPropagatingRemoteInvocation already obtained
-        // a copy and nulling is necessary to ensure the Context delivered by
-        // ContextPropagatingRemoteInvocation is used on server-side
-        SecurityContextHolder.clearContext();
+		// Set to null, as ContextPropagatingRemoteInvocation already obtained
+		// a copy and nulling is necessary to ensure the Context delivered by
+		// ContextPropagatingRemoteInvocation is used on server-side
+		SecurityContextHolder.clearContext();
 
-        // The result from invoking the TargetObject should contain the
-        // Authentication class delivered via the SecurityContextHolder
-        assertEquals("some_string org.springframework.security.authentication.UsernamePasswordAuthenticationToken false",
-            remoteInvocation.invoke(new TargetObject()));
-    }
+		// The result from invoking the TargetObject should contain the
+		// Authentication class delivered via the SecurityContextHolder
+		assertEquals(
+				"some_string org.springframework.security.authentication.UsernamePasswordAuthenticationToken false",
+				remoteInvocation.invoke(new TargetObject()));
+	}
 
-    public void testNullContextHolderDoesNotCauseInvocationProblems() throws Exception {
-        SecurityContextHolder.clearContext(); // just to be explicit
+	public void testNullContextHolderDoesNotCauseInvocationProblems() throws Exception {
+		SecurityContextHolder.clearContext(); // just to be explicit
 
-        ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
-        SecurityContextHolder.clearContext(); // unnecessary, but for explicitness
+		ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
+		SecurityContextHolder.clearContext(); // unnecessary, but for explicitness
 
-        assertEquals("some_string Authentication empty", remoteInvocation.invoke(new TargetObject()));
-    }
+		assertEquals("some_string Authentication empty",
+				remoteInvocation.invoke(new TargetObject()));
+	}
 
-    // SEC-1867
-    public void testNullCredentials() throws Exception {
-        Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken("rod", null);
-        SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
+	// SEC-1867
+	public void testNullCredentials() throws Exception {
+		Authentication clientSideAuthentication = new UsernamePasswordAuthenticationToken(
+				"rod", null);
+		SecurityContextHolder.getContext().setAuthentication(clientSideAuthentication);
 
-        ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
-        assertEquals(null, ReflectionTestUtils.getField(remoteInvocation, "credentials"));
-    }
+		ContextPropagatingRemoteInvocation remoteInvocation = getRemoteInvocation();
+		assertEquals(null, ReflectionTestUtils.getField(remoteInvocation, "credentials"));
+	}
 }
diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java b/samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java
index 8138cd6b13..5eeba7b60c 100644
--- a/samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java
+++ b/samples/aspectj-jc/src/main/java/sample/aspectj/AspectjSecurityConfig.java
@@ -25,7 +25,7 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
 /**
  * @author Rob Winch
  */
-@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ,securedEnabled = true)
+@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ, securedEnabled = true)
 public class AspectjSecurityConfig {
 	@Bean
 	public Service service() {
diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java b/samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java
index b6e9e7f075..fa16cf6269 100644
--- a/samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java
+++ b/samples/aspectj-jc/src/main/java/sample/aspectj/SecuredService.java
@@ -11,8 +11,8 @@ import org.springframework.security.access.annotation.Secured;
 @Secured("ROLE_USER")
 public class SecuredService {
 
-    public void secureMethod() {
-        // nothing
-    }
+	public void secureMethod() {
+		// nothing
+	}
 
 }
diff --git a/samples/aspectj-jc/src/main/java/sample/aspectj/Service.java b/samples/aspectj-jc/src/main/java/sample/aspectj/Service.java
index 8e450a6045..778dc0cc04 100644
--- a/samples/aspectj-jc/src/main/java/sample/aspectj/Service.java
+++ b/samples/aspectj-jc/src/main/java/sample/aspectj/Service.java
@@ -10,13 +10,13 @@ import org.springframework.security.access.annotation.Secured;
  */
 public class Service {
 
-    @Secured("ROLE_USER")
-    public void secureMethod() {
-        // nothing
-    }
+	@Secured("ROLE_USER")
+	public void secureMethod() {
+		// nothing
+	}
 
-    public void publicMethod() {
-        // nothing
-    }
+	public void publicMethod() {
+		// nothing
+	}
 
 }
diff --git a/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java
index a8f04f937c..d8161f1eac 100644
--- a/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java
+++ b/samples/aspectj-jc/src/test/java/sample/aspectj/AspectJInterceptorTests.java
@@ -23,71 +23,73 @@ import java.lang.reflect.Proxy;
 import static org.fest.assertions.Assertions.assertThat;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=AspectjSecurityConfig.class)
+@ContextConfiguration(classes = AspectjSecurityConfig.class)
 public class AspectJInterceptorTests {
-    private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
-    private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_USER"));
+	private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
+	private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_USER"));
 
-    @Autowired
-    private Service service;
+	@Autowired
+	private Service service;
 
-    @Autowired
-    private SecuredService securedService;
+	@Autowired
+	private SecuredService securedService;
 
-    @Test
-    public void publicMethod() throws Exception {
-        service.publicMethod();
-    }
+	@Test
+	public void publicMethod() throws Exception {
+		service.publicMethod();
+	}
 
-    @Test(expected = AuthenticationCredentialsNotFoundException.class)
-    public void securedMethodNotAuthenticated() throws Exception {
-        service.secureMethod();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void securedMethodNotAuthenticated() throws Exception {
+		service.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void securedMethodWrongRole() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        service.secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securedMethodWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		service.secureMethod();
+	}
 
-    @Test
-    public void securedMethodEverythingOk() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(user);
-        service.secureMethod();
-    }
+	@Test
+	public void securedMethodEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		service.secureMethod();
+	}
 
-    @Test(expected = AuthenticationCredentialsNotFoundException.class)
-    public void securedClassNotAuthenticated() throws Exception {
-        securedService.secureMethod();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void securedClassNotAuthenticated() throws Exception {
+		securedService.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void securedClassWrongRole() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        securedService.secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securedClassWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		securedService.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void securedClassWrongRoleOnNewedInstance() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        new SecuredService().secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void securedClassWrongRoleOnNewedInstance() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		new SecuredService().secureMethod();
+	}
 
-    @Test
-    public void securedClassEverythingOk() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(user);
-        securedService.secureMethod();
-        new SecuredService().secureMethod();
-    }
+	@Test
+	public void securedClassEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		securedService.secureMethod();
+		new SecuredService().secureMethod();
+	}
 
-    // SEC-2595
-    @Test
-    public void notProxy() {
-        assertThat(Proxy.isProxyClass(securedService.getClass())).isFalse();
-    }
+	// SEC-2595
+	@Test
+	public void notProxy() {
+		assertThat(Proxy.isProxyClass(securedService.getClass())).isFalse();
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 }
diff --git a/samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java b/samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java
index b6e9e7f075..fa16cf6269 100644
--- a/samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java
+++ b/samples/aspectj-xml/src/main/java/sample/aspectj/SecuredService.java
@@ -11,8 +11,8 @@ import org.springframework.security.access.annotation.Secured;
 @Secured("ROLE_USER")
 public class SecuredService {
 
-    public void secureMethod() {
-        // nothing
-    }
+	public void secureMethod() {
+		// nothing
+	}
 
 }
diff --git a/samples/aspectj-xml/src/main/java/sample/aspectj/Service.java b/samples/aspectj-xml/src/main/java/sample/aspectj/Service.java
index 8e450a6045..778dc0cc04 100644
--- a/samples/aspectj-xml/src/main/java/sample/aspectj/Service.java
+++ b/samples/aspectj-xml/src/main/java/sample/aspectj/Service.java
@@ -10,13 +10,13 @@ import org.springframework.security.access.annotation.Secured;
  */
 public class Service {
 
-    @Secured("ROLE_USER")
-    public void secureMethod() {
-        // nothing
-    }
+	@Secured("ROLE_USER")
+	public void secureMethod() {
+		// nothing
+	}
 
-    public void publicMethod() {
-        // nothing
-    }
+	public void publicMethod() {
+		// nothing
+	}
 
 }
diff --git a/samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java
index b857968b93..cf44ba1c8e 100644
--- a/samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java
+++ b/samples/aspectj-xml/src/test/java/sample/aspectj/AspectJInterceptorTests.java
@@ -16,64 +16,66 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:aspectj-context.xml")
 public class AspectJInterceptorTests {
-    private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
-    private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_USER"));
+	private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
+	private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx",
+			AuthorityUtils.createAuthorityList("ROLE_USER"));
 
-    @Autowired
-    private Service service;
+	@Autowired
+	private Service service;
 
-    @Autowired
-    private SecuredService securedService;
+	@Autowired
+	private SecuredService securedService;
 
-    @Test
-    public void testPublicMethod() throws Exception {
-        service.publicMethod();
-    }
+	@Test
+	public void testPublicMethod() throws Exception {
+		service.publicMethod();
+	}
 
-    @Test(expected = AuthenticationCredentialsNotFoundException.class)
-    public void testSecuredMethodNotAuthenticated() throws Exception {
-        service.secureMethod();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void testSecuredMethodNotAuthenticated() throws Exception {
+		service.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void testSecuredMethodWrongRole() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        service.secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredMethodWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		service.secureMethod();
+	}
 
-    @Test
-    public void testSecuredMethodEverythingOk() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(user);
-        service.secureMethod();
-    }
+	@Test
+	public void testSecuredMethodEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		service.secureMethod();
+	}
 
-    @Test(expected = AuthenticationCredentialsNotFoundException.class)
-    public void testSecuredClassNotAuthenticated() throws Exception {
-        securedService.secureMethod();
-    }
+	@Test(expected = AuthenticationCredentialsNotFoundException.class)
+	public void testSecuredClassNotAuthenticated() throws Exception {
+		securedService.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void testSecuredClassWrongRole() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        securedService.secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredClassWrongRole() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		securedService.secureMethod();
+	}
 
-    @Test(expected = AccessDeniedException.class)
-    public void testSecuredClassWrongRoleOnNewedInstance() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(admin);
-        new SecuredService().secureMethod();
-    }
+	@Test(expected = AccessDeniedException.class)
+	public void testSecuredClassWrongRoleOnNewedInstance() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(admin);
+		new SecuredService().secureMethod();
+	}
 
-    @Test
-    public void testSecuredClassEverythingOk() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(user);
-        securedService.secureMethod();
-        new SecuredService().secureMethod();
-    }
+	@Test
+	public void testSecuredClassEverythingOk() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(user);
+		securedService.secureMethod();
+		new SecuredService().secureMethod();
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
 }
diff --git a/samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java b/samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java
index f5c7654143..04d4080bad 100644
--- a/samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java
+++ b/samples/cas/sample-xml/src/main/java/org/springframework/security/samples/cas/web/ProxyTicketSampleServlet.java
@@ -29,51 +29,61 @@ import org.springframework.security.cas.authentication.CasAuthenticationToken;
 
 /**
  * <p>
- * {@link ProxyTicketSampleServlet} demonstrates how to obtain a proxy ticket
- * and then use it to make a remote call. To learn how proxy tickets work, see
- * the <a href="https://wiki.jasig.org/display/CAS/Proxy+CAS+Walkthrough">Proxy
- * CAS Walkthrough</a>
+ * {@link ProxyTicketSampleServlet} demonstrates how to obtain a proxy ticket and then use
+ * it to make a remote call. To learn how proxy tickets work, see the <a
+ * href="https://wiki.jasig.org/display/CAS/Proxy+CAS+Walkthrough">Proxy CAS
+ * Walkthrough</a>
  * </p>
  *
  * @author Rob Winch
  */
 public final class ProxyTicketSampleServlet extends HttpServlet {
-    /**
-     * This is the URL that will be called and authenticate a proxy ticket.
-     */
-    private String targetUrl;
+	/**
+	 * This is the URL that will be called and authenticate a proxy ticket.
+	 */
+	private String targetUrl;
 
-    @Override
-    protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        // NOTE: The CasAuthenticationToken can also be obtained using SecurityContextHolder.getContext().getAuthentication()
-        final CasAuthenticationToken token = (CasAuthenticationToken) request.getUserPrincipal();
-        // proxyTicket could be reused to make calls to to the CAS service even if the target url differs
-        final String proxyTicket = token.getAssertion().getPrincipal().getProxyTicketFor(targetUrl);
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		// NOTE: The CasAuthenticationToken can also be obtained using
+		// SecurityContextHolder.getContext().getAuthentication()
+		final CasAuthenticationToken token = (CasAuthenticationToken) request
+				.getUserPrincipal();
+		// proxyTicket could be reused to make calls to to the CAS service even if the
+		// target url differs
+		final String proxyTicket = token.getAssertion().getPrincipal()
+				.getProxyTicketFor(targetUrl);
 
-        // Make a remote call to ourself. This is a bit silly, but it works well to demonstrate how to use proxy tickets.
-        final String serviceUrl = targetUrl+"?ticket="+URLEncoder.encode(proxyTicket, "UTF-8");
-        String proxyResponse = CommonUtils.getResponseFromServer(serviceUrl, "UTF-8");
+		// Make a remote call to ourself. This is a bit silly, but it works well to
+		// demonstrate how to use proxy tickets.
+		final String serviceUrl = targetUrl + "?ticket="
+				+ URLEncoder.encode(proxyTicket, "UTF-8");
+		String proxyResponse = CommonUtils.getResponseFromServer(serviceUrl, "UTF-8");
 
-        // modify the response and write it out to inform the user that it was obtained using a proxy ticket.
-        proxyResponse = proxyResponse.replaceFirst("Secure Page", "Secure Page using a Proxy Ticket");
-        proxyResponse = proxyResponse.replaceFirst("<p>",
-                "<p>This page is rendered by "+getClass().getSimpleName()+" by making a remote call to the Secure Page using a proxy ticket ("+proxyTicket+") and inserts this message. ");
-        final PrintWriter writer = response.getWriter();
-        writer.write(proxyResponse);
-    }
+		// modify the response and write it out to inform the user that it was obtained
+		// using a proxy ticket.
+		proxyResponse = proxyResponse.replaceFirst("Secure Page",
+				"Secure Page using a Proxy Ticket");
+		proxyResponse = proxyResponse.replaceFirst("<p>", "<p>This page is rendered by "
+				+ getClass().getSimpleName()
+				+ " by making a remote call to the Secure Page using a proxy ticket ("
+				+ proxyTicket + ") and inserts this message. ");
+		final PrintWriter writer = response.getWriter();
+		writer.write(proxyResponse);
+	}
 
-    /**
-     * Initialize the target URL. It allows for the host to change based upon
-     * the "cas.service.host" system property. If the property is not set, the
-     * default is "localhost:8443".
-     */
-    @Override
-    public void init() throws ServletException {
-        super.init();
-        String casServiceHost = System.getProperty("cas.service.host", "localhost:8443");
-        targetUrl = "https://"+casServiceHost+"/cas-sample/secure/";
-    }
+	/**
+	 * Initialize the target URL. It allows for the host to change based upon the
+	 * "cas.service.host" system property. If the property is not set, the default is
+	 * "localhost:8443".
+	 */
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		String casServiceHost = System.getProperty("cas.service.host", "localhost:8443");
+		targetUrl = "https://" + casServiceHost + "/cas-sample/secure/";
+	}
 
-    private static final long serialVersionUID = -7720161771819727775L;
+	private static final long serialVersionUID = -7720161771819727775L;
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java b/samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java
index 952d82d387..f31d8753ca 100644
--- a/samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java
+++ b/samples/chat-jc/src/main/java/sample/config/ChatApplicationInitializer.java
@@ -7,31 +7,31 @@ import javax.servlet.Filter;
 import javax.servlet.ServletRegistration;
 
 public class ChatApplicationInitializer extends
-        AbstractAnnotationConfigDispatcherServletInitializer {
+		AbstractAnnotationConfigDispatcherServletInitializer {
 
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        // TODO Auto-generated method stub
-        return null;
-    }
+	@Override
+	protected Class<?>[] getRootConfigClasses() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return new Class[] { WebMvcConfiguration.class };
-    }
+	@Override
+	protected Class<?>[] getServletConfigClasses() {
+		return new Class[] { WebMvcConfiguration.class };
+	}
 
-    @Override
-    protected String[] getServletMappings() {
-        return new String[] { "/" };
-    }
+	@Override
+	protected String[] getServletMappings() {
+		return new String[] { "/" };
+	}
 
-    @Override
-    protected Filter[] getServletFilters() {
-        return new Filter[] { new HiddenHttpMethodFilter() };
-    }
+	@Override
+	protected Filter[] getServletFilters() {
+		return new Filter[] { new HiddenHttpMethodFilter() };
+	}
 
-    @Override
-    protected void customizeRegistration(ServletRegistration.Dynamic registration) {
-        registration.setInitParameter("dispatchOptionsRequest", "true");
-    }
+	@Override
+	protected void customizeRegistration(ServletRegistration.Dynamic registration) {
+		registration.setInitParameter("dispatchOptionsRequest", "true");
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java b/samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java
index 06d68cc3ea..4e4020f053 100644
--- a/samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java
+++ b/samples/chat-jc/src/main/java/sample/config/ChatSecurityWebApplicationInitializer.java
@@ -23,11 +23,12 @@ import org.springframework.web.servlet.support.AbstractDispatcherServletInitiali
  *
  * @author Rob Winch
  */
-public class ChatSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class ChatSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 
-    @Override
-    protected String getDispatcherWebApplicationContextSuffix() {
-        return AbstractDispatcherServletInitializer.DEFAULT_SERVLET_NAME;
-    }
+	@Override
+	protected String getDispatcherWebApplicationContextSuffix() {
+		return AbstractDispatcherServletInitializer.DEFAULT_SERVLET_NAME;
+	}
 
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java b/samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java
index 7a68ff5bb9..1563b00a62 100644
--- a/samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/DataSourceConfig.java
@@ -19,41 +19,41 @@ import sample.data.User;
 @Configuration
 public class DataSourceConfig {
 
-    @Bean
-    public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.HSQL).build();
-    }
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+	}
 
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        vendorAdapter.setDatabase(Database.HSQL);
-        vendorAdapter.setGenerateDdl(true);
+	@Bean
+	public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setDatabase(Database.HSQL);
+		vendorAdapter.setGenerateDdl(true);
 
-        LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-        factory.setJpaVendorAdapter(vendorAdapter);
-        factory.setPackagesToScan(User.class.getPackage().getName());
-        factory.setDataSource(dataSource());
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setJpaVendorAdapter(vendorAdapter);
+		factory.setPackagesToScan(User.class.getPackage().getName());
+		factory.setDataSource(dataSource());
 
-        return factory;
-    }
+		return factory;
+	}
 
-    @Bean
-    @DependsOn("entityManagerFactory")
-    public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
-        ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-        populator.addScript(new ClassPathResource("data.sql"));
-        populator.addScript(new ClassPathResource("password-encode.sql"));
-        populator.populate(dataSource.getConnection());
-        return populator;
-    }
+	@Bean
+	@DependsOn("entityManagerFactory")
+	public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
+		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
+		populator.addScript(new ClassPathResource("data.sql"));
+		populator.addScript(new ClassPathResource("password-encode.sql"));
+		populator.populate(dataSource.getConnection());
+		return populator;
+	}
+
+	@Bean
+	public PlatformTransactionManager transactionManager() {
+		JpaTransactionManager txManager = new JpaTransactionManager();
+		txManager.setEntityManagerFactory(entityManagerFactory().getObject());
+		return txManager;
+	}
 
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        JpaTransactionManager txManager = new JpaTransactionManager();
-        txManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return txManager;
-    }
-	
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java b/samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java
index 2103f7d187..f2dc82e265 100644
--- a/samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/EmbeddedRedisConfig.java
@@ -1,4 +1,5 @@
 package sample.config;
+
 /*
  * Copyright 2002-2014 the original author or authors.
  *
@@ -30,53 +31,58 @@ import org.springframework.context.annotation.Configuration;
 import redis.embedded.RedisServer;
 
 /**
- * Runs an embedded Redis instance. This is only necessary since we do not want
- * users to have to setup a Redis instance. In a production environment, this
- * would not be used since a Redis Server would be setup.
+ * Runs an embedded Redis instance. This is only necessary since we do not want users to
+ * have to setup a Redis instance. In a production environment, this would not be used
+ * since a Redis Server would be setup.
  *
  * @author Rob Winch
  */
 @Configuration
 public class EmbeddedRedisConfig {
 
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
+	@Bean
+	public static RedisServerBean redisServer() {
+		return new RedisServerBean();
+	}
 
-    /**
-     * Implements BeanDefinitionRegistryPostProcessor to ensure this Bean
-     * is initialized before any other Beans. Specifically, we want to ensure
-     * that the Redis Server is started before RedisHttpSessionConfiguration
-     * attempts to enable Keyspace notifications.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor, RedisConnectionProperties {
-        private RedisServer redisServer;
+	/**
+	 * Implements BeanDefinitionRegistryPostProcessor to ensure this Bean is initialized
+	 * before any other Beans. Specifically, we want to ensure that the Redis Server is
+	 * started before RedisHttpSessionConfiguration attempts to enable Keyspace
+	 * notifications.
+	 */
+	static class RedisServerBean implements InitializingBean, DisposableBean,
+			BeanDefinitionRegistryPostProcessor, RedisConnectionProperties {
+		private RedisServer redisServer;
 
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(getPort());
-            redisServer.start();
-        }
+		public void afterPropertiesSet() throws Exception {
+			redisServer = new RedisServer(getPort());
+			redisServer.start();
+		}
 
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
+		public void destroy() throws Exception {
+			if (redisServer != null) {
+				redisServer.stop();
+			}
+		}
 
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
+		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
+				throws BeansException {
+		}
 
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
+		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
+				throws BeansException {
+		}
 
-        private Integer availablePort;
+		private Integer availablePort;
 
-        public int getPort() throws IOException {
-            if(availablePort == null) {
-                ServerSocket socket = new ServerSocket(0);
-                availablePort = socket.getLocalPort();
-                socket.close();
-            }
-            return availablePort;
-        }
-    }
+		public int getPort() throws IOException {
+			if (availablePort == null) {
+				ServerSocket socket = new ServerSocket(0);
+				availablePort = socket.getLocalPort();
+				socket.close();
+			}
+			return availablePort;
+		}
+	}
 }
\ No newline at end of file
diff --git a/samples/chat-jc/src/main/java/sample/config/RedisConfig.java b/samples/chat-jc/src/main/java/sample/config/RedisConfig.java
index 3d91458eac..65e08d6566 100644
--- a/samples/chat-jc/src/main/java/sample/config/RedisConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/RedisConfig.java
@@ -27,10 +27,11 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 @EnableRedisHttpSession
 public class RedisConfig {
 
-    @Bean
-    public JedisConnectionFactory connectionFactory(RedisConnectionProperties conn) throws Exception {
-        JedisConnectionFactory factory = new JedisConnectionFactory();
-        factory.setPort(conn.getPort());
-        return factory;
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(RedisConnectionProperties conn)
+			throws Exception {
+		JedisConnectionFactory factory = new JedisConnectionFactory();
+		factory.setPort(conn.getPort());
+		return factory;
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java b/samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java
index 9708983ced..53b70394c2 100644
--- a/samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java
+++ b/samples/chat-jc/src/main/java/sample/config/RedisConnectionProperties.java
@@ -6,5 +6,5 @@ import java.io.IOException;
  * @author Rob Winch
  */
 public interface RedisConnectionProperties {
-    int getPort() throws IOException;
+	int getPort() throws IOException;
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java b/samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java
index e8c3f0fbca..11d5941801 100644
--- a/samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java
+++ b/samples/chat-jc/src/main/java/sample/config/SessionAppInitializer.java
@@ -21,11 +21,10 @@ import org.springframework.web.servlet.support.AbstractDispatcherServletInitiali
 /**
  * @author Rob Winch
  */
-public class SessionAppInitializer
-       extends AbstractHttpSessionApplicationInitializer {
+public class SessionAppInitializer extends AbstractHttpSessionApplicationInitializer {
 
-    @Override
-    protected String getDispatcherWebApplicationContextSuffix() {
-        return AbstractDispatcherServletInitializer.DEFAULT_SERVLET_NAME;
-    }
+	@Override
+	protected String getDispatcherWebApplicationContextSuffix() {
+		return AbstractDispatcherServletInitializer.DEFAULT_SERVLET_NAME;
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java b/samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java
index 8e30b70b8e..90d890be55 100644
--- a/samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java
+++ b/samples/chat-jc/src/main/java/sample/config/WebMvcConfiguration.java
@@ -21,59 +21,60 @@ import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 @ComponentScan("sample")
 public class WebMvcConfiguration extends WebMvcConfigurerAdapter {
 
-    @Autowired
-    private FormattingConversionService mvcConversionService;
+	@Autowired
+	private FormattingConversionService mvcConversionService;
 
+	@Override
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/login").setViewName("login");
+	}
 
-    @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/login").setViewName("login");
-    }
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/resources/**")
+				.addResourceLocations("classpath:/resources/").setCachePeriod(31556926);
+	}
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/").setCachePeriod(31556926);
-    }
+	@Override
+	public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
+		configurer.enable();
+	}
 
-    @Override
-    public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
-        configurer.enable();
-    }
+	@Bean
+	public ClassLoaderTemplateResolver templateResolver() {
+		ClassLoaderTemplateResolver result = new ClassLoaderTemplateResolver();
+		result.setPrefix("views/");
+		result.setSuffix(".html");
+		result.setTemplateMode("HTML5");
+		return result;
+	}
 
-    @Bean
-    public ClassLoaderTemplateResolver templateResolver() {
-        ClassLoaderTemplateResolver result = new ClassLoaderTemplateResolver();
-        result.setPrefix("views/");
-        result.setSuffix(".html");
-        result.setTemplateMode("HTML5");
-        return result;
-    }
+	@Bean
+	public ThymeleafTilesConfigurer tilesConfigurer() {
+		ThymeleafTilesConfigurer tilesConfigurer = new ThymeleafTilesConfigurer();
+		tilesConfigurer.setDefinitions(new String[] { "classpath:tiles/tiles-def.xml" });
+		return tilesConfigurer;
+	}
 
-    @Bean
-    public ThymeleafTilesConfigurer tilesConfigurer() {
-        ThymeleafTilesConfigurer tilesConfigurer = new ThymeleafTilesConfigurer();
-        tilesConfigurer.setDefinitions(new String[] { "classpath:tiles/tiles-def.xml"});
-        return tilesConfigurer;
-    }
+	@Bean
+	public SpringTemplateEngine templateEngine(
+			ClassLoaderTemplateResolver templateResolver) {
+		SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+		templateEngine.setTemplateResolver(templateResolver);
+		templateEngine.addDialect(new TilesDialect());
+		return templateEngine;
+	}
 
-    @Bean
-    public SpringTemplateEngine templateEngine(ClassLoaderTemplateResolver templateResolver) {
-        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-        templateEngine.setTemplateResolver(templateResolver);
-        templateEngine.addDialect(new TilesDialect());
-        return templateEngine;
-    }
+	@Bean
+	public ThymeleafViewResolver viewResolver(SpringTemplateEngine templateEngine) {
+		ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+		viewResolver.setTemplateEngine(templateEngine);
+		viewResolver.setViewClass(ThymeleafTilesView.class);
+		return viewResolver;
+	}
 
-    @Bean
-    public ThymeleafViewResolver viewResolver(SpringTemplateEngine templateEngine) {
-        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
-        viewResolver.setTemplateEngine(templateEngine);
-        viewResolver.setViewClass(ThymeleafTilesView.class);
-        return viewResolver;
-    }
-
-    @Bean
-    public DomainClassConverter<?> domainClassConverter() {
-        return new DomainClassConverter<FormattingConversionService>(mvcConversionService);
-    }
+	@Bean
+	public DomainClassConverter<?> domainClassConverter() {
+		return new DomainClassConverter<FormattingConversionService>(mvcConversionService);
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java b/samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java
index 8c565b9106..9de7d39d75 100644
--- a/samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/WebSecurityConfig.java
@@ -27,44 +27,46 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension;
 
-
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class WebSecurityConfig
-    extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
 
-        http
-            .headers()
-                .frameOptions().sameOrigin()
-                .and()
-            .csrf()
-                .ignoringAntMatchers("/chat/**")
-                .and()
-            .authorizeRequests()
-                .antMatchers("/resources/**").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin()
-                .loginPage("/login")
-                .permitAll()
-                .and()
-            .logout()
-                .permitAll();
-    }
+		http
+			.headers()
+				.frameOptions().sameOrigin()
+				.and()
+			.csrf()
+				.ignoringAntMatchers("/chat/**")
+				.and()
+			.authorizeRequests()
+				.antMatchers("/resources/**").permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin()
+				.loginPage("/login")
+				.permitAll()
+				.and()
+			.logout()
+				.permitAll();
+	}
+	// @formatter:on
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth, UserDetailsService userDetailsService) throws Exception {
-        auth
-            .userDetailsService(userDetailsService)
-                .passwordEncoder(new BCryptPasswordEncoder());
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth, UserDetailsService userDetailsService) throws Exception {
+		auth
+			.userDetailsService(userDetailsService)
+				.passwordEncoder(new BCryptPasswordEncoder());
+	}
+	// @formatter:on
 
-    @Bean
-    public SecurityEvaluationContextExtension securityEvaluationContextExtension() {
-        return new SecurityEvaluationContextExtension();
-    }
+	@Bean
+	public SecurityEvaluationContextExtension securityEvaluationContextExtension() {
+		return new SecurityEvaluationContextExtension();
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java b/samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java
index 398030c8a0..1463c568c2 100644
--- a/samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/WebSocketConfig.java
@@ -1,6 +1,5 @@
 package sample.config;
 
-
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.SimpMessageSendingOperations;
@@ -17,28 +16,31 @@ import sample.websocket.WebSocketDisconnectHandler;
 @Configuration
 @EnableScheduling
 @EnableWebSocketMessageBroker
-public class WebSocketConfig<S extends ExpiringSession> extends AbstractSessionWebSocketMessageBrokerConfigurer<S> {
+public class WebSocketConfig<S extends ExpiringSession> extends
+		AbstractSessionWebSocketMessageBrokerConfigurer<S> {
 
-    @Override
-    protected void configureStompEndpoints(StompEndpointRegistry registry) {
-        registry
-                .addEndpoint("/chat")
-                .withSockJS();
-    }
+	@Override
+	protected void configureStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/chat").withSockJS();
+	}
 
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.enableSimpleBroker("/queue/", "/topic/");
-        registry.setApplicationDestinationPrefixes("/app");
-    }
+	@Override
+	public void configureMessageBroker(MessageBrokerRegistry registry) {
+		registry.enableSimpleBroker("/queue/", "/topic/");
+		registry.setApplicationDestinationPrefixes("/app");
+	}
 
-    @Bean
-    public WebSocketConnectHandler webSocketConnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
-        return new WebSocketConnectHandler(messagingTemplate, repository);
-    }
+	@Bean
+	public WebSocketConnectHandler webSocketConnectHandler(
+			SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
+		return new WebSocketConnectHandler(messagingTemplate, repository);
+	}
 
-    @Bean
-    public WebSocketDisconnectHandler webSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
-        return new WebSocketDisconnectHandler(messagingTemplate, repository);
-    }
+	@Bean
+	public WebSocketDisconnectHandler webSocketDisconnectHandler(
+			SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
+		return new WebSocketDisconnectHandler(messagingTemplate, repository);
+	}
 }
\ No newline at end of file
diff --git a/samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java b/samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java
index f45380adc6..c610f4e01b 100644
--- a/samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java
+++ b/samples/chat-jc/src/main/java/sample/config/WebSocketSecurityConfig.java
@@ -26,24 +26,27 @@ import static org.springframework.messaging.simp.SimpMessageType.SUBSCRIBE;
  * @author Rob Winch
  */
 @Configuration
-public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
+public class WebSocketSecurityConfig extends
+		AbstractSecurityWebSocketMessageBrokerConfigurer {
 
-    protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
-        messages
-            // message types other than MESSAGE and SUBSCRIBE
-            .nullDestMatcher().authenticated()
-            // anyone can subscribe to the errors
-            .simpSubscribeDestMatchers("/user/queue/errors").permitAll()
-            // matches any destination that starts with /app/
-            .simpDestMatchers("/app/**").authenticated()
-            // matches any destination for SimpMessageType.SUBSCRIBE that starts with /user/ or /topic/friends/
-            .simpSubscribeDestMatchers("/user/**", "/topic/friends/*").authenticated()
+	protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
+		messages
+		// message types other than MESSAGE and SUBSCRIBE
+		.nullDestMatcher().authenticated()
+				// anyone can subscribe to the errors
+				.simpSubscribeDestMatchers("/user/queue/errors").permitAll()
+				// matches any destination that starts with /app/
+				.simpDestMatchers("/app/**").authenticated()
+				// matches any destination for SimpMessageType.SUBSCRIBE that starts with
+				// /user/ or /topic/friends/
+				.simpSubscribeDestMatchers("/user/**", "/topic/friends/*")
+				.authenticated()
 
-
-            // (i.e. cannot send messages directly to /topic/, /queue/)
-            // (i.e. cannot subscribe to /topic/messages/* to get messages sent to /topic/messages-user<id>)
-            .simpTypeMatchers(MESSAGE, SUBSCRIBE).denyAll()
-            // catch all
-            .anyMessage().denyAll();
-    }
+				// (i.e. cannot send messages directly to /topic/, /queue/)
+				// (i.e. cannot subscribe to /topic/messages/* to get messages sent to
+				// /topic/messages-user<id>)
+				.simpTypeMatchers(MESSAGE, SUBSCRIBE).denyAll()
+				// catch all
+				.anyMessage().denyAll();
+	}
 }
\ No newline at end of file
diff --git a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java b/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java
index 29baf726ff..2fbfa53a7e 100644
--- a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java
+++ b/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUser.java
@@ -1,6 +1,5 @@
 package sample.data;
 
-
 import java.util.Calendar;
 
 import javax.persistence.Entity;
@@ -10,13 +9,14 @@ import javax.persistence.Id;
 public class ActiveWebSocketUser {
 	@Id
 	private String id;
-	
+
 	private String username;
-	
+
 	private Calendar connectionTime;
 
-	public ActiveWebSocketUser() {}
-	
+	public ActiveWebSocketUser() {
+	}
+
 	public ActiveWebSocketUser(String id, String username, Calendar connectionTime) {
 		super();
 		this.id = id;
@@ -39,6 +39,5 @@ public class ActiveWebSocketUser {
 	public void setConnectionTime(Calendar connectionTime) {
 		this.connectionTime = connectionTime;
 	}
-	
-	
+
 }
diff --git a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java b/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java
index 06da959056..0e2580c547 100644
--- a/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java
+++ b/samples/chat-jc/src/main/java/sample/data/ActiveWebSocketUserRepository.java
@@ -5,7 +5,8 @@ import java.util.List;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
-public interface ActiveWebSocketUserRepository extends CrudRepository<ActiveWebSocketUser,String> {
+public interface ActiveWebSocketUserRepository extends
+		CrudRepository<ActiveWebSocketUser, String> {
 
 	@Query("select DISTINCT(u.username) from ActiveWebSocketUser u where u.username != ?#{principal?.username}")
 	List<String> findAllActiveUsers();
diff --git a/samples/chat-jc/src/main/java/sample/data/InstantMessage.java b/samples/chat-jc/src/main/java/sample/data/InstantMessage.java
index acdfdc23e7..79cd0dce55 100644
--- a/samples/chat-jc/src/main/java/sample/data/InstantMessage.java
+++ b/samples/chat-jc/src/main/java/sample/data/InstantMessage.java
@@ -4,11 +4,11 @@ import java.util.Calendar;
 
 public class InstantMessage {
 	private String to;
-	
+
 	private String from;
-	
+
 	private String message;
-	
+
 	private Calendar created = Calendar.getInstance();
 
 	public String getTo() {
@@ -42,7 +42,5 @@ public class InstantMessage {
 	public void setCreated(Calendar created) {
 		this.created = created;
 	}
-	
-	
 
 }
diff --git a/samples/chat-jc/src/main/java/sample/data/User.java b/samples/chat-jc/src/main/java/sample/data/User.java
index d6dd3f77b5..2fedd8b10b 100644
--- a/samples/chat-jc/src/main/java/sample/data/User.java
+++ b/samples/chat-jc/src/main/java/sample/data/User.java
@@ -40,100 +40,100 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Entity
 public class User implements Serializable {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
 
-    @NotEmpty(message = "First name is required.")
-    private String firstName;
+	@NotEmpty(message = "First name is required.")
+	private String firstName;
 
-    @NotEmpty(message = "Last name is required.")
-    private String lastName;
+	@NotEmpty(message = "Last name is required.")
+	private String lastName;
 
-    @Email(message = "Please provide a valid email address.")
-    @NotEmpty(message = "Email is required.")
-    @Column(unique=true, nullable = false)
-    private String email;
+	@Email(message = "Please provide a valid email address.")
+	@NotEmpty(message = "Email is required.")
+	@Column(unique = true, nullable = false)
+	private String email;
 
-    @NotEmpty(message = "Password is required.")
-    private String password;
+	@NotEmpty(message = "Password is required.")
+	private String password;
 
-    public User() {}
+	public User() {
+	}
 
-    public User(User user) {
-        this.id = user.id;
-        this.firstName = user.firstName;
-        this.lastName = user.lastName;
-        this.email = user.email;
-        this.password = user.password;
-    }
+	public User(User user) {
+		this.id = user.id;
+		this.firstName = user.firstName;
+		this.lastName = user.lastName;
+		this.email = user.email;
+		this.password = user.password;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getFirstName() {
-        return firstName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        User other = (User) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		User other = (User) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		}
+		else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
 
-
-
-    private static final long serialVersionUID = 2738859149330833739L;
+	private static final long serialVersionUID = 2738859149330833739L;
 }
\ No newline at end of file
diff --git a/samples/chat-jc/src/main/java/sample/data/UserRepository.java b/samples/chat-jc/src/main/java/sample/data/UserRepository.java
index 5339e23a8f..12afee3dd0 100644
--- a/samples/chat-jc/src/main/java/sample/data/UserRepository.java
+++ b/samples/chat-jc/src/main/java/sample/data/UserRepository.java
@@ -25,5 +25,5 @@ import org.springframework.data.repository.CrudRepository;
  */
 public interface UserRepository extends CrudRepository<User, Long> {
 
-    User findByEmail(String email);
+	User findByEmail(String email);
 }
diff --git a/samples/chat-jc/src/main/java/sample/mvc/CsrfController.java b/samples/chat-jc/src/main/java/sample/mvc/CsrfController.java
index cd243a00f2..5add151859 100644
--- a/samples/chat-jc/src/main/java/sample/mvc/CsrfController.java
+++ b/samples/chat-jc/src/main/java/sample/mvc/CsrfController.java
@@ -25,8 +25,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class CsrfController {
 
-    @RequestMapping("/csrf")
-    public CsrfToken csrf(CsrfToken csrfToken) {
-        return csrfToken;
-    }
+	@RequestMapping("/csrf")
+	public CsrfToken csrf(CsrfToken csrfToken) {
+		return csrfToken;
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/mvc/MessageController.java b/samples/chat-jc/src/main/java/sample/mvc/MessageController.java
index df43bc11fd..a364c57e3b 100644
--- a/samples/chat-jc/src/main/java/sample/mvc/MessageController.java
+++ b/samples/chat-jc/src/main/java/sample/mvc/MessageController.java
@@ -37,29 +37,30 @@ import sample.security.CurrentUser;
  */
 @Controller
 public class MessageController {
-    private SimpMessageSendingOperations messagingTemplate;
-    private ActiveWebSocketUserRepository activeUserRepository;
+	private SimpMessageSendingOperations messagingTemplate;
+	private ActiveWebSocketUserRepository activeUserRepository;
 
-    @Autowired
-    public MessageController(ActiveWebSocketUserRepository activeUserRepository,SimpMessageSendingOperations messagingTemplate) {
-        this.activeUserRepository = activeUserRepository;
-        this.messagingTemplate = messagingTemplate;
-    }
+	@Autowired
+	public MessageController(ActiveWebSocketUserRepository activeUserRepository,
+			SimpMessageSendingOperations messagingTemplate) {
+		this.activeUserRepository = activeUserRepository;
+		this.messagingTemplate = messagingTemplate;
+	}
 
-    @RequestMapping("/")
-    public String chat() {
-        return "chat";
-    }
+	@RequestMapping("/")
+	public String chat() {
+		return "chat";
+	}
 
-    @MessageMapping("/im")
-    public void im(InstantMessage im, @CurrentUser User user) {
-        im.setFrom(user.getEmail());
-        messagingTemplate.convertAndSendToUser(im.getTo(),"/queue/messages",im);
-        messagingTemplate.convertAndSendToUser(im.getFrom(),"/queue/messages",im);
-    }
+	@MessageMapping("/im")
+	public void im(InstantMessage im, @CurrentUser User user) {
+		im.setFrom(user.getEmail());
+		messagingTemplate.convertAndSendToUser(im.getTo(), "/queue/messages", im);
+		messagingTemplate.convertAndSendToUser(im.getFrom(), "/queue/messages", im);
+	}
 
-    @SubscribeMapping("/users")
-    public List<String> subscribeMessages() throws Exception {
-        return activeUserRepository.findAllActiveUsers();
-    }
+	@SubscribeMapping("/users")
+	public List<String> subscribeMessages() throws Exception {
+		return activeUserRepository.findAllActiveUsers();
+	}
 }
\ No newline at end of file
diff --git a/samples/chat-jc/src/main/java/sample/security/CurrentUser.java b/samples/chat-jc/src/main/java/sample/security/CurrentUser.java
index 4eab1069c6..5643bbb570 100644
--- a/samples/chat-jc/src/main/java/sample/security/CurrentUser.java
+++ b/samples/chat-jc/src/main/java/sample/security/CurrentUser.java
@@ -26,16 +26,14 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Annotate Spring MVC method arguments with this annotation to indicate you
- * wish to specify the argument with the value of the current
- * {@link Authentication#getPrincipal()} found on the
- * {@link SecurityContextHolder}.
+ * Annotate Spring MVC method arguments with this annotation to indicate you wish to
+ * specify the argument with the value of the current
+ * {@link Authentication#getPrincipal()} found on the {@link SecurityContextHolder}.
  *
  * <p>
- * Creating your own annotation that uses {@link AuthenticationPrincipal} as a
- * meta annotation creates a layer of indirection between your code and Spring
- * Security's. For simplicity, you could instead use the
- * {@link AuthenticationPrincipal} directly.
+ * Creating your own annotation that uses {@link AuthenticationPrincipal} as a meta
+ * annotation creates a layer of indirection between your code and Spring Security's. For
+ * simplicity, you could instead use the {@link AuthenticationPrincipal} directly.
  * </p>
  *
  * @author Rob Winch
diff --git a/samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java b/samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java
index dad930954d..ebea6b7056 100644
--- a/samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java
+++ b/samples/chat-jc/src/main/java/sample/security/UserRepositoryUserDetailsService.java
@@ -33,55 +33,59 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class UserRepositoryUserDetailsService implements UserDetailsService {
-    private final UserRepository userRepository;
+	private final UserRepository userRepository;
 
-    @Autowired
-    public UserRepositoryUserDetailsService(UserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
+	@Autowired
+	public UserRepositoryUserDetailsService(UserRepository userRepository) {
+		this.userRepository = userRepository;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername(java.lang.String)
-     */
-    public UserDetails loadUserByUsername(String username)
-            throws UsernameNotFoundException {
-        User user = userRepository.findByEmail(username);
-        if(user == null) {
-            throw new UsernameNotFoundException("Could not find user " + username);
-        }
-        return new CustomUserDetails(user);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.core.userdetails.UserDetailsService#loadUserByUsername
+	 * (java.lang.String)
+	 */
+	public UserDetails loadUserByUsername(String username)
+			throws UsernameNotFoundException {
+		User user = userRepository.findByEmail(username);
+		if (user == null) {
+			throw new UsernameNotFoundException("Could not find user " + username);
+		}
+		return new CustomUserDetails(user);
+	}
 
-    private final static class CustomUserDetails extends User implements UserDetails {
+	private final static class CustomUserDetails extends User implements UserDetails {
 
-        private CustomUserDetails(User user) {
-            super(user);
-        }
+		private CustomUserDetails(User user) {
+			super(user);
+		}
 
-        public Collection<? extends GrantedAuthority> getAuthorities() {
-            return AuthorityUtils.createAuthorityList("ROLE_USER");
-        }
+		public Collection<? extends GrantedAuthority> getAuthorities() {
+			return AuthorityUtils.createAuthorityList("ROLE_USER");
+		}
 
-        public String getUsername() {
-            return getEmail();
-        }
+		public String getUsername() {
+			return getEmail();
+		}
 
-        public boolean isAccountNonExpired() {
-            return true;
-        }
+		public boolean isAccountNonExpired() {
+			return true;
+		}
 
-        public boolean isAccountNonLocked() {
-            return true;
-        }
+		public boolean isAccountNonLocked() {
+			return true;
+		}
 
-        public boolean isCredentialsNonExpired() {
-            return true;
-        }
+		public boolean isCredentialsNonExpired() {
+			return true;
+		}
 
-        public boolean isEnabled() {
-            return true;
-        }
+		public boolean isEnabled() {
+			return true;
+		}
 
-        private static final long serialVersionUID = 5639683223516504866L;
-    }
+		private static final long serialVersionUID = 5639683223516504866L;
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java b/samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java
index 3de37368f9..dc1809793d 100644
--- a/samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java
+++ b/samples/chat-jc/src/main/java/sample/websocket/WebSocketConnectHandler.java
@@ -31,23 +31,26 @@ import java.util.Calendar;
  * @author Rob Winch
  */
 public class WebSocketConnectHandler implements ApplicationListener<SessionConnectEvent> {
-    private ActiveWebSocketUserRepository repository;
-    private SimpMessageSendingOperations messagingTemplate;
+	private ActiveWebSocketUserRepository repository;
+	private SimpMessageSendingOperations messagingTemplate;
 
-    public WebSocketConnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
-        super();
-        this.messagingTemplate = messagingTemplate;
-        this.repository = repository;
-    }
+	public WebSocketConnectHandler(SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
+		super();
+		this.messagingTemplate = messagingTemplate;
+		this.repository = repository;
+	}
 
-    public void onApplicationEvent(SessionConnectEvent event) {
-        MessageHeaders headers = event.getMessage().getHeaders();
-        Principal user = SimpMessageHeaderAccessor.getUser(headers);
-        if(user == null) {
-            return;
-        }
-        String id = SimpMessageHeaderAccessor.getSessionId(headers);
-        repository.save(new ActiveWebSocketUser(id, user.getName(), Calendar.getInstance()));
-        messagingTemplate.convertAndSend("/topic/friends/signin", Arrays.asList(user.getName()));
-    }
+	public void onApplicationEvent(SessionConnectEvent event) {
+		MessageHeaders headers = event.getMessage().getHeaders();
+		Principal user = SimpMessageHeaderAccessor.getUser(headers);
+		if (user == null) {
+			return;
+		}
+		String id = SimpMessageHeaderAccessor.getSessionId(headers);
+		repository.save(new ActiveWebSocketUser(id, user.getName(), Calendar
+				.getInstance()));
+		messagingTemplate.convertAndSend("/topic/friends/signin",
+				Arrays.asList(user.getName()));
+	}
 }
diff --git a/samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java b/samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
index d6505969b8..6bc136db0f 100644
--- a/samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
+++ b/samples/chat-jc/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
@@ -26,29 +26,32 @@ import java.util.Arrays;
 /**
  * @author Rob Winch
  */
-public class WebSocketDisconnectHandler implements ApplicationListener<SessionDisconnectEvent> {
-    private ActiveWebSocketUserRepository repository;
-    private SimpMessageSendingOperations messagingTemplate;
+public class WebSocketDisconnectHandler implements
+		ApplicationListener<SessionDisconnectEvent> {
+	private ActiveWebSocketUserRepository repository;
+	private SimpMessageSendingOperations messagingTemplate;
 
-    public WebSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate, ActiveWebSocketUserRepository repository) {
-        super();
-        this.messagingTemplate = messagingTemplate;
-        this.repository = repository;
-    }
+	public WebSocketDisconnectHandler(SimpMessageSendingOperations messagingTemplate,
+			ActiveWebSocketUserRepository repository) {
+		super();
+		this.messagingTemplate = messagingTemplate;
+		this.repository = repository;
+	}
 
-    public void onApplicationEvent(SessionDisconnectEvent event) {
-        String id = event.getSessionId();
-        if(id == null) {
-            return;
-        }
-        ActiveWebSocketUser user = repository.findOne(id);
-        if(user == null) {
-            return;
-        }
+	public void onApplicationEvent(SessionDisconnectEvent event) {
+		String id = event.getSessionId();
+		if (id == null) {
+			return;
+		}
+		ActiveWebSocketUser user = repository.findOne(id);
+		if (user == null) {
+			return;
+		}
 
-        repository.delete(id);
+		repository.delete(id);
 
-        messagingTemplate.convertAndSend("/topic/friends/signout", Arrays.asList(user.getUsername()));
-    }
+		messagingTemplate.convertAndSend("/topic/friends/signout",
+				Arrays.asList(user.getUsername()));
+	}
 
 }
diff --git a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index 375244c49f..607e38d495 100644
--- a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -24,10 +24,11 @@ import org.springframework.security.web.session.HttpSessionEventPublisher;
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 
-    @Override
-    protected boolean enableHttpSessionEventPublisher() {
-        return true;
-    }
+	@Override
+	protected boolean enableHttpSessionEventPublisher() {
+		return true;
+	}
 }
diff --git a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 0f42077292..6008b7cfd0 100644
--- a/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/concurrency-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,35 +1,38 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled=true)
+@EnableGlobalMethodSecurity(prePostEnabled = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 
-    @Override
-    protected void configure(
-            HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin()
-                .and()
-            .sessionManagement()
-                .maximumSessions(1)
-                    .expiredUrl("/login?expired");
-    }
+	// @formatter:off
+	@Override
+	protected void configure(
+			HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin()
+				.and()
+			.sessionManagement()
+				.maximumSessions(1)
+					.expiredUrl("/login?expired");
+	}
+	// @formatter:on
 }
diff --git a/samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/concurrency-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java b/samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java
index 228bd6e2b0..e6c7ef8c9c 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/AddDeleteContactController.java
@@ -18,46 +18,46 @@ import org.springframework.web.servlet.ModelAndView;
  */
 @Controller
 public class AddDeleteContactController {
-    @Autowired
-    private ContactManager contactManager;
-    private final Validator validator = new WebContactValidator();
+	@Autowired
+	private ContactManager contactManager;
+	private final Validator validator = new WebContactValidator();
 
-    /**
-     * Displays the "add contact" form.
-     */
-    @RequestMapping(value="/secure/add.htm", method=RequestMethod.GET)
-    public ModelAndView addContactDisplay() {
-        return new ModelAndView("add", "webContact", new WebContact());
-    }
+	/**
+	 * Displays the "add contact" form.
+	 */
+	@RequestMapping(value = "/secure/add.htm", method = RequestMethod.GET)
+	public ModelAndView addContactDisplay() {
+		return new ModelAndView("add", "webContact", new WebContact());
+	}
 
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        System.out.println("A binder for object: " + binder.getObjectName());
-    }
+	@InitBinder
+	public void initBinder(WebDataBinder binder) {
+		System.out.println("A binder for object: " + binder.getObjectName());
+	}
 
-    /**
-     * Handles the submission of the contact form, creating a new instance if
-     * the username and email are valid.
-     */
-    @RequestMapping(value="/secure/add.htm", method=RequestMethod.POST)
-    public String addContact(WebContact form, BindingResult result) {
-        validator.validate(form, result);
+	/**
+	 * Handles the submission of the contact form, creating a new instance if the username
+	 * and email are valid.
+	 */
+	@RequestMapping(value = "/secure/add.htm", method = RequestMethod.POST)
+	public String addContact(WebContact form, BindingResult result) {
+		validator.validate(form, result);
 
-        if (result.hasErrors()) {
-            return "add";
-        }
+		if (result.hasErrors()) {
+			return "add";
+		}
 
-        Contact contact = new Contact(form.getName(), form.getEmail());
-        contactManager.create(contact);
+		Contact contact = new Contact(form.getName(), form.getEmail());
+		contactManager.create(contact);
 
-        return "redirect:/secure/index.htm";
-    }
+		return "redirect:/secure/index.htm";
+	}
 
-    @RequestMapping(value="/secure/del.htm", method=RequestMethod.GET)
-    public ModelAndView handleRequest(@RequestParam("contactId") int contactId) {
-        Contact contact = contactManager.getById(Long.valueOf(contactId));
-        contactManager.delete(contact);
+	@RequestMapping(value = "/secure/del.htm", method = RequestMethod.GET)
+	public ModelAndView handleRequest(@RequestParam("contactId") int contactId) {
+		Contact contact = contactManager.getById(Long.valueOf(contactId));
+		contactManager.delete(contact);
 
-        return new ModelAndView("deleted", "contact", contact);
-    }
+		return new ModelAndView("deleted", "contact", contact);
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddPermission.java b/samples/contacts-xml/src/main/java/sample/contact/AddPermission.java
index 6c260fde1e..f175a9bd3c 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/AddPermission.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/AddPermission.java
@@ -16,42 +16,43 @@ package sample.contact;
 
 import org.springframework.security.acls.domain.BasePermission;
 
-
 /**
  * Model object for add permission use case.
  *
  * @author Ben Alex
  */
 public class AddPermission {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    public Contact contact;
-    public Integer permission = BasePermission.READ.getMask();
-    public String recipient;
+	public Contact contact;
+	public Integer permission = BasePermission.READ.getMask();
+	public String recipient;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Contact getContact() {
-        return contact;
-    }
+	public Contact getContact() {
+		return contact;
+	}
 
-    public Integer getPermission() {
-        return permission;
-    }
+	public Integer getPermission() {
+		return permission;
+	}
 
-    public String getRecipient() {
-        return recipient;
-    }
+	public String getRecipient() {
+		return recipient;
+	}
 
-    public void setContact(Contact contact) {
-        this.contact = contact;
-    }
+	public void setContact(Contact contact) {
+		this.contact = contact;
+	}
 
-    public void setPermission(Integer permission) {
-        this.permission = permission;
-    }
+	public void setPermission(Integer permission) {
+		this.permission = permission;
+	}
 
-    public void setRecipient(String recipient) {
-        this.recipient = recipient;
-    }
+	public void setRecipient(String recipient) {
+		this.recipient = recipient;
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java b/samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java
index cdea87f9ae..c116c502fd 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/AddPermissionValidator.java
@@ -20,40 +20,44 @@ import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
 
-
 /**
  * Validates {@link AddPermission}.
  *
  * @author Ben Alex
  */
 public class AddPermissionValidator implements Validator {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @SuppressWarnings("unchecked")
-    public boolean supports(Class clazz) {
-        return clazz.equals(AddPermission.class);
-    }
+	@SuppressWarnings("unchecked")
+	public boolean supports(Class clazz) {
+		return clazz.equals(AddPermission.class);
+	}
 
-    public void validate(Object obj, Errors errors) {
-        AddPermission addPermission = (AddPermission) obj;
+	public void validate(Object obj, Errors errors) {
+		AddPermission addPermission = (AddPermission) obj;
 
-        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", "Permission is required. *");
-        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", "Recipient is required. *");
+		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission",
+				"Permission is required. *");
+		ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient",
+				"Recipient is required. *");
 
-        if (addPermission.getPermission() != null) {
-            int permission = addPermission.getPermission().intValue();
+		if (addPermission.getPermission() != null) {
+			int permission = addPermission.getPermission().intValue();
 
-            if ((permission != BasePermission.ADMINISTRATION.getMask())
-                && (permission != BasePermission.READ.getMask()) && (permission != BasePermission.DELETE.getMask())) {
-                errors.rejectValue("permission", "err.permission.invalid", "The indicated permission is invalid. *");
-            }
-        }
+			if ((permission != BasePermission.ADMINISTRATION.getMask())
+					&& (permission != BasePermission.READ.getMask())
+					&& (permission != BasePermission.DELETE.getMask())) {
+				errors.rejectValue("permission", "err.permission.invalid",
+						"The indicated permission is invalid. *");
+			}
+		}
 
-        if (addPermission.getRecipient() != null) {
-            if (addPermission.getRecipient().length() > 100) {
-                errors.rejectValue("recipient", "err.recipient.length",
-                    "The recipient is too long (maximum 100 characters). *");
-            }
-        }
-    }
+		if (addPermission.getRecipient() != null) {
+			if (addPermission.getRecipient().length() > 100) {
+				errors.rejectValue("recipient", "err.recipient.length",
+						"The recipient is too long (maximum 100 characters). *");
+			}
+		}
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java b/samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java
index 424430be5a..726d43a7c0 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/AdminPermissionController.java
@@ -31,137 +31,143 @@ import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
- * Web controller to handle <tt>Permission</tt> administration functions - adding and deleting
- * permissions for contacts.
+ * Web controller to handle <tt>Permission</tt> administration functions - adding and
+ * deleting permissions for contacts.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 @Controller
 @SessionAttributes("addPermission")
-public final class AdminPermissionController implements MessageSourceAware{
-    @Autowired
-    private AclService aclService;
-    @Autowired
-    private ContactManager contactManager;
-    private MessageSourceAccessor messages;
-    private final Validator addPermissionValidator = new AddPermissionValidator();
-    private final PermissionFactory permissionFactory = new DefaultPermissionFactory();
+public final class AdminPermissionController implements MessageSourceAware {
+	@Autowired
+	private AclService aclService;
+	@Autowired
+	private ContactManager contactManager;
+	private MessageSourceAccessor messages;
+	private final Validator addPermissionValidator = new AddPermissionValidator();
+	private final PermissionFactory permissionFactory = new DefaultPermissionFactory();
 
-    /**
-     * Displays the permission admin page for a particular contact.
-     */
-    @RequestMapping(value="/secure/adminPermission.htm", method=RequestMethod.GET)
-    public ModelAndView displayAdminPage(@RequestParam("contactId") int contactId) {
-        Contact contact = contactManager.getById(Long.valueOf(contactId));
-        Acl acl = aclService.readAclById(new ObjectIdentityImpl(contact));
+	/**
+	 * Displays the permission admin page for a particular contact.
+	 */
+	@RequestMapping(value = "/secure/adminPermission.htm", method = RequestMethod.GET)
+	public ModelAndView displayAdminPage(@RequestParam("contactId") int contactId) {
+		Contact contact = contactManager.getById(Long.valueOf(contactId));
+		Acl acl = aclService.readAclById(new ObjectIdentityImpl(contact));
 
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("contact", contact);
-        model.put("acl", acl);
+		Map<String, Object> model = new HashMap<String, Object>();
+		model.put("contact", contact);
+		model.put("acl", acl);
 
-        return new ModelAndView("adminPermission", "model", model);
-    }
+		return new ModelAndView("adminPermission", "model", model);
+	}
 
-    /**
-     * Displays the "add permission" page for a contact.
-     */
-    @RequestMapping(value="/secure/addPermission.htm", method=RequestMethod.GET)
-    public ModelAndView displayAddPermissionPageForContact(@RequestParam("contactId") int contactId) {
-        Contact contact = contactManager.getById(new Long(contactId));
+	/**
+	 * Displays the "add permission" page for a contact.
+	 */
+	@RequestMapping(value = "/secure/addPermission.htm", method = RequestMethod.GET)
+	public ModelAndView displayAddPermissionPageForContact(
+			@RequestParam("contactId") int contactId) {
+		Contact contact = contactManager.getById(new Long(contactId));
 
-        AddPermission addPermission = new AddPermission();
-        addPermission.setContact(contact);
+		AddPermission addPermission = new AddPermission();
+		addPermission.setContact(contact);
 
-        Map<String,Object> model = new HashMap<String,Object>();
-        model.put("addPermission", addPermission);
-        model.put("recipients", listRecipients());
-        model.put("permissions", listPermissions());
+		Map<String, Object> model = new HashMap<String, Object>();
+		model.put("addPermission", addPermission);
+		model.put("recipients", listRecipients());
+		model.put("permissions", listPermissions());
 
-        return new ModelAndView("addPermission", model);
-    }
+		return new ModelAndView("addPermission", model);
+	}
 
-    @InitBinder("addPermission")
-    public void initBinder(WebDataBinder binder) {
-        binder.setAllowedFields("recipient", "permission");
-    }
+	@InitBinder("addPermission")
+	public void initBinder(WebDataBinder binder) {
+		binder.setAllowedFields("recipient", "permission");
+	}
 
-    /**
-     * Handles submission of the "add permission" form.
-     */
-    @RequestMapping(value="/secure/addPermission.htm", method=RequestMethod.POST)
-    public String addPermission(AddPermission addPermission, BindingResult result, ModelMap model) {
-        addPermissionValidator.validate(addPermission, result);
+	/**
+	 * Handles submission of the "add permission" form.
+	 */
+	@RequestMapping(value = "/secure/addPermission.htm", method = RequestMethod.POST)
+	public String addPermission(AddPermission addPermission, BindingResult result,
+			ModelMap model) {
+		addPermissionValidator.validate(addPermission, result);
 
-        if (result.hasErrors()) {
-            model.put("recipients", listRecipients());
-            model.put("permissions", listPermissions());
+		if (result.hasErrors()) {
+			model.put("recipients", listRecipients());
+			model.put("permissions", listPermissions());
 
-            return "addPermission";
-        }
+			return "addPermission";
+		}
 
-        PrincipalSid sid = new PrincipalSid(addPermission.getRecipient());
-        Permission permission = permissionFactory.buildFromMask(addPermission.getPermission());
+		PrincipalSid sid = new PrincipalSid(addPermission.getRecipient());
+		Permission permission = permissionFactory.buildFromMask(addPermission
+				.getPermission());
 
-        try {
-            contactManager.addPermission(addPermission.getContact(), sid, permission);
-        } catch (DataAccessException existingPermission) {
-            existingPermission.printStackTrace();
-            result.rejectValue("recipient", "err.recipientExistsForContact", "Addition failure.");
+		try {
+			contactManager.addPermission(addPermission.getContact(), sid, permission);
+		}
+		catch (DataAccessException existingPermission) {
+			existingPermission.printStackTrace();
+			result.rejectValue("recipient", "err.recipientExistsForContact",
+					"Addition failure.");
 
-            model.put("recipients", listRecipients());
-            model.put("permissions", listPermissions());
-            return "addPermission";
-        }
+			model.put("recipients", listRecipients());
+			model.put("permissions", listPermissions());
+			return "addPermission";
+		}
 
-        return "redirect:/secure/index.htm";
-    }
+		return "redirect:/secure/index.htm";
+	}
 
-    /**
-     * Deletes a permission
-     */
-    @RequestMapping(value="/secure/deletePermission.htm")
-    public ModelAndView deletePermission(
-            @RequestParam("contactId") int contactId,
-            @RequestParam("sid") String sid,
-            @RequestParam("permission") int mask) {
+	/**
+	 * Deletes a permission
+	 */
+	@RequestMapping(value = "/secure/deletePermission.htm")
+	public ModelAndView deletePermission(@RequestParam("contactId") int contactId,
+			@RequestParam("sid") String sid, @RequestParam("permission") int mask) {
 
-        Contact contact = contactManager.getById(new Long(contactId));
+		Contact contact = contactManager.getById(new Long(contactId));
 
-        Sid sidObject = new PrincipalSid(sid);
-        Permission permission = permissionFactory.buildFromMask(mask);
+		Sid sidObject = new PrincipalSid(sid);
+		Permission permission = permissionFactory.buildFromMask(mask);
 
-        contactManager.deletePermission(contact, sidObject, permission);
+		contactManager.deletePermission(contact, sidObject, permission);
 
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("contact", contact);
-        model.put("sid", sidObject);
-        model.put("permission", permission);
+		Map<String, Object> model = new HashMap<String, Object>();
+		model.put("contact", contact);
+		model.put("sid", sidObject);
+		model.put("permission", permission);
 
-        return new ModelAndView("deletePermission", "model", model);
-    }
+		return new ModelAndView("deletePermission", "model", model);
+	}
 
-    private Map<Integer, String> listPermissions() {
-        Map<Integer, String> map = new LinkedHashMap<Integer, String>();
-        map.put(Integer.valueOf(BasePermission.ADMINISTRATION.getMask()), messages.getMessage("select.administer", "Administer"));
-        map.put(Integer.valueOf(BasePermission.READ.getMask()), messages.getMessage("select.read", "Read"));
-        map.put(Integer.valueOf(BasePermission.DELETE.getMask()), messages.getMessage("select.delete", "Delete"));
+	private Map<Integer, String> listPermissions() {
+		Map<Integer, String> map = new LinkedHashMap<Integer, String>();
+		map.put(Integer.valueOf(BasePermission.ADMINISTRATION.getMask()),
+				messages.getMessage("select.administer", "Administer"));
+		map.put(Integer.valueOf(BasePermission.READ.getMask()),
+				messages.getMessage("select.read", "Read"));
+		map.put(Integer.valueOf(BasePermission.DELETE.getMask()),
+				messages.getMessage("select.delete", "Delete"));
 
-        return map;
-    }
+		return map;
+	}
 
-    private Map<String, String> listRecipients() {
-        Map<String, String> map = new LinkedHashMap<String, String>();
-        map.put("", messages.getMessage("select.pleaseSelect", "-- please select --"));
+	private Map<String, String> listRecipients() {
+		Map<String, String> map = new LinkedHashMap<String, String>();
+		map.put("", messages.getMessage("select.pleaseSelect", "-- please select --"));
 
-        for (String recipient : contactManager.getAllRecipients()) {
-            map.put(recipient, recipient);
-        }
+		for (String recipient : contactManager.getAllRecipients()) {
+			map.put(recipient, recipient);
+		}
 
-        return map;
-    }
+		return map;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java b/samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java
index 99dffb82a8..fe31e224aa 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/ClientApplication.java
@@ -15,7 +15,6 @@
 
 package sample.contact;
 
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -28,7 +27,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.StopWatch;
 
-
 /**
  * Demonstrates accessing the {@link ContactManager} via remoting protocols.
  * <p>
@@ -37,104 +35,127 @@ import org.springframework.util.StopWatch;
  * @author Ben Alex
  */
 public class ClientApplication {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final ListableBeanFactory beanFactory;
+	private final ListableBeanFactory beanFactory;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public ClientApplication(ListableBeanFactory beanFactory) {
-        this.beanFactory = beanFactory;
-    }
+	public ClientApplication(ListableBeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void invokeContactManager(Authentication authentication, int nrOfCalls) {
-        StopWatch stopWatch = new StopWatch(nrOfCalls + " ContactManager call(s)");
-        Map<String, ContactManager> contactServices = this.beanFactory.getBeansOfType(ContactManager.class, true, true);
+	public void invokeContactManager(Authentication authentication, int nrOfCalls) {
+		StopWatch stopWatch = new StopWatch(nrOfCalls + " ContactManager call(s)");
+		Map<String, ContactManager> contactServices = this.beanFactory.getBeansOfType(
+				ContactManager.class, true, true);
 
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        for (String beanName : contactServices.keySet()) {
-            Object object = this.beanFactory.getBean("&" + beanName);
+		for (String beanName : contactServices.keySet()) {
+			Object object = this.beanFactory.getBean("&" + beanName);
 
-            try {
-                System.out.println("Trying to find setUsername(String) method on: " + object.getClass().getName());
+			try {
+				System.out.println("Trying to find setUsername(String) method on: "
+						+ object.getClass().getName());
 
-                Method method = object.getClass().getMethod("setUsername", new Class[] {String.class});
-                System.out.println("Found; Trying to setUsername(String) to " + authentication.getPrincipal());
-                method.invoke(object, authentication.getPrincipal());
-            } catch (NoSuchMethodException ignored) {
-                System.out.println("This client proxy factory does not have a setUsername(String) method");
-            } catch (IllegalAccessException ignored) {
-                ignored.printStackTrace();
-            } catch (InvocationTargetException ignored) {
-                ignored.printStackTrace();
-            }
+				Method method = object.getClass().getMethod("setUsername",
+						new Class[] { String.class });
+				System.out.println("Found; Trying to setUsername(String) to "
+						+ authentication.getPrincipal());
+				method.invoke(object, authentication.getPrincipal());
+			}
+			catch (NoSuchMethodException ignored) {
+				System.out
+						.println("This client proxy factory does not have a setUsername(String) method");
+			}
+			catch (IllegalAccessException ignored) {
+				ignored.printStackTrace();
+			}
+			catch (InvocationTargetException ignored) {
+				ignored.printStackTrace();
+			}
 
-            try {
-                System.out.println("Trying to find setPassword(String) method on: " + object.getClass().getName());
+			try {
+				System.out.println("Trying to find setPassword(String) method on: "
+						+ object.getClass().getName());
 
-                Method method = object.getClass().getMethod("setPassword", new Class[] {String.class});
-                method.invoke(object, authentication.getCredentials());
-                System.out.println("Found; Trying to setPassword(String) to " + authentication.getCredentials());
-            } catch (NoSuchMethodException ignored) {
-                System.out.println("This client proxy factory does not have a setPassword(String) method");
-            } catch (IllegalAccessException ignored) {}
-            catch (InvocationTargetException ignored) {}
+				Method method = object.getClass().getMethod("setPassword",
+						new Class[] { String.class });
+				method.invoke(object, authentication.getCredentials());
+				System.out.println("Found; Trying to setPassword(String) to "
+						+ authentication.getCredentials());
+			}
+			catch (NoSuchMethodException ignored) {
+				System.out
+						.println("This client proxy factory does not have a setPassword(String) method");
+			}
+			catch (IllegalAccessException ignored) {
+			}
+			catch (InvocationTargetException ignored) {
+			}
 
-            ContactManager remoteContactManager = contactServices.get(beanName);
-            System.out.println("Calling ContactManager '" + beanName + "'");
+			ContactManager remoteContactManager = contactServices.get(beanName);
+			System.out.println("Calling ContactManager '" + beanName + "'");
 
-            stopWatch.start(beanName);
+			stopWatch.start(beanName);
 
-            List<Contact> contacts = null;
+			List<Contact> contacts = null;
 
-            for (int i = 0; i < nrOfCalls; i++) {
-                contacts = remoteContactManager.getAll();
-            }
+			for (int i = 0; i < nrOfCalls; i++) {
+				contacts = remoteContactManager.getAll();
+			}
 
-            stopWatch.stop();
+			stopWatch.stop();
 
-            if (contacts.size() != 0) {
-                for(Contact contact : contacts) {
-                    System.out.println("Contact: " + contact);
-                }
-            } else {
-                System.out.println("No contacts found which this user has permission to");
-            }
+			if (contacts.size() != 0) {
+				for (Contact contact : contacts) {
+					System.out.println("Contact: " + contact);
+				}
+			}
+			else {
+				System.out.println("No contacts found which this user has permission to");
+			}
 
-            System.out.println();
-            System.out.println(stopWatch.prettyPrint());
-        }
+			System.out.println();
+			System.out.println(stopWatch.prettyPrint());
+		}
 
-        SecurityContextHolder.clearContext();
-    }
+		SecurityContextHolder.clearContext();
+	}
 
-    public static void main(String[] args) {
-        String username = System.getProperty("username", "");
-        String password = System.getProperty("password", "");
-        String nrOfCallsString = System.getProperty("nrOfCalls", "");
+	public static void main(String[] args) {
+		String username = System.getProperty("username", "");
+		String password = System.getProperty("password", "");
+		String nrOfCallsString = System.getProperty("nrOfCalls", "");
 
-        if ("".equals(username) || "".equals(password)) {
-            System.out.println(
-                "You need to specify the user ID to use, the password to use, and optionally a number of calls "
-                + "using the username, password, and nrOfCalls system properties respectively. eg for user rod, "
-                + "use: -Dusername=rod -Dpassword=koala' for a single call per service and "
-                + "use: -Dusername=rod -Dpassword=koala -DnrOfCalls=10 for ten calls per service.");
-            System.exit(-1);
-        } else {
-            int nrOfCalls = 1;
+		if ("".equals(username) || "".equals(password)) {
+			System.out
+					.println("You need to specify the user ID to use, the password to use, and optionally a number of calls "
+							+ "using the username, password, and nrOfCalls system properties respectively. eg for user rod, "
+							+ "use: -Dusername=rod -Dpassword=koala' for a single call per service and "
+							+ "use: -Dusername=rod -Dpassword=koala -DnrOfCalls=10 for ten calls per service.");
+			System.exit(-1);
+		}
+		else {
+			int nrOfCalls = 1;
 
-            if (!"".equals(nrOfCallsString)) {
-                nrOfCalls = Integer.parseInt(nrOfCallsString);
-            }
+			if (!"".equals(nrOfCallsString)) {
+				nrOfCalls = Integer.parseInt(nrOfCallsString);
+			}
 
-            ListableBeanFactory beanFactory = new FileSystemXmlApplicationContext("clientContext.xml");
-            ClientApplication client = new ClientApplication(beanFactory);
+			ListableBeanFactory beanFactory = new FileSystemXmlApplicationContext(
+					"clientContext.xml");
+			ClientApplication client = new ClientApplication(beanFactory);
 
-            client.invokeContactManager(new UsernamePasswordAuthenticationToken(username, password), nrOfCalls);
-            System.exit(0);
-        }
-    }
+			client.invokeContactManager(new UsernamePasswordAuthenticationToken(username,
+					password), nrOfCalls);
+			System.exit(0);
+		}
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/Contact.java b/samples/contacts-xml/src/main/java/sample/contact/Contact.java
index fc1d034a57..1883b3c9ce 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/Contact.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/Contact.java
@@ -17,76 +17,79 @@ package sample.contact;
 
 import java.io.Serializable;
 
-
 /**
  * Represents a contact.
  *
  * @author Ben Alex
  */
 public class Contact implements Serializable {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private Long id;
-    private String email;
-    private String name;
+	private Long id;
+	private String email;
+	private String name;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public Contact(String name, String email) {
-        this.name = name;
-        this.email = email;
-    }
+	public Contact(String name, String email) {
+		this.name = name;
+		this.email = email;
+	}
 
-    public Contact() {}
+	public Contact() {
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * @return Returns the email.
-     */
-    public String getEmail() {
-        return email;
-    }
+	/**
+	 * @return Returns the email.
+	 */
+	public String getEmail() {
+		return email;
+	}
 
-    /**
-     * @return Returns the id.
-     */
-    public Long getId() {
-        return id;
-    }
+	/**
+	 * @return Returns the id.
+	 */
+	public Long getId() {
+		return id;
+	}
 
-    /**
-     * @return Returns the name.
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * @return Returns the name.
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * @param email The email to set.
-     */
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	/**
+	 * @param email The email to set.
+	 */
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    /**
-     * @param name The name to set.
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
+	/**
+	 * @param name The name to set.
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString() + ": ");
-        sb.append("Id: " + this.getId() + "; ");
-        sb.append("Name: " + this.getName() + "; ");
-        sb.append("Email: " + this.getEmail());
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString() + ": ");
+		sb.append("Id: " + this.getId() + "; ");
+		sb.append("Name: " + this.getName() + "; ");
+		sb.append("Email: " + this.getEmail());
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactDao.java b/samples/contacts-xml/src/main/java/sample/contact/ContactDao.java
index a2d48ca75d..bebb205769 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/ContactDao.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/ContactDao.java
@@ -17,26 +17,26 @@ package sample.contact;
 
 import java.util.List;
 
-
 /**
  * Provides access to the application's persistence layer.
  *
  * @author Ben Alex
  */
 public interface ContactDao {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void create(Contact contact);
+	public void create(Contact contact);
 
-    public void delete(Long contactId);
+	public void delete(Long contactId);
 
-    public List<Contact> findAll();
+	public List<Contact> findAll();
 
-    public List<String> findAllPrincipals();
+	public List<String> findAllPrincipals();
 
-    public List<String> findAllRoles();
+	public List<String> findAllRoles();
 
-    public Contact getById(Long id);
+	public Contact getById(Long id);
 
-    public void update(Contact contact);
+	public void update(Contact contact);
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java b/samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java
index eef45656a0..1fbec2867e 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/ContactDaoSpring.java
@@ -24,7 +24,6 @@ import org.springframework.jdbc.core.PreparedStatementSetter;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
-
 /**
  * Base implementation of {@link ContactDao} that uses Spring's JdbcTemplate.
  *
@@ -33,73 +32,85 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
  */
 public class ContactDaoSpring extends JdbcDaoSupport implements ContactDao {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void create(final Contact contact) {
-        getJdbcTemplate().update("insert into contacts values (?, ?, ?)", new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setLong(1, contact.getId());
-                ps.setString(2, contact.getName());
-                ps.setString(3, contact.getEmail());
-            }
-        });
-    }
+	public void create(final Contact contact) {
+		getJdbcTemplate().update("insert into contacts values (?, ?, ?)",
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						ps.setLong(1, contact.getId());
+						ps.setString(2, contact.getName());
+						ps.setString(3, contact.getEmail());
+					}
+				});
+	}
 
-    public void delete(final Long contactId) {
-        getJdbcTemplate().update("delete from contacts where id = ?", new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setLong(1, contactId);
-            }
-        });
-    }
+	public void delete(final Long contactId) {
+		getJdbcTemplate().update("delete from contacts where id = ?",
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						ps.setLong(1, contactId);
+					}
+				});
+	}
 
-    public void update(final Contact contact) {
-        getJdbcTemplate().update("update contacts set contact_name = ?, address = ? where id = ?", new PreparedStatementSetter() {
-            public void setValues(PreparedStatement ps) throws SQLException {
-                ps.setString(1, contact.getName());
-                ps.setString(2, contact.getEmail());
-                ps.setLong(3, contact.getId());
-            }
-        });
-    }
+	public void update(final Contact contact) {
+		getJdbcTemplate().update(
+				"update contacts set contact_name = ?, address = ? where id = ?",
+				new PreparedStatementSetter() {
+					public void setValues(PreparedStatement ps) throws SQLException {
+						ps.setString(1, contact.getName());
+						ps.setString(2, contact.getEmail());
+						ps.setLong(3, contact.getId());
+					}
+				});
+	}
 
-    public List<Contact> findAll() {
-        return getJdbcTemplate().query("select id, contact_name, email from contacts order by id", new RowMapper<Contact>() {
-            public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
-                return mapContact(rs);
-            }
-        });
-    }
+	public List<Contact> findAll() {
+		return getJdbcTemplate().query(
+				"select id, contact_name, email from contacts order by id",
+				new RowMapper<Contact>() {
+					public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
+						return mapContact(rs);
+					}
+				});
+	}
 
-    public List<String> findAllPrincipals() {
-        return getJdbcTemplate().queryForList("select username from users order by username", String.class);
-    }
+	public List<String> findAllPrincipals() {
+		return getJdbcTemplate().queryForList(
+				"select username from users order by username", String.class);
+	}
 
-    public List<String> findAllRoles() {
-        return getJdbcTemplate().queryForList("select distinct authority from authorities order by authority", String.class);
-    }
+	public List<String> findAllRoles() {
+		return getJdbcTemplate().queryForList(
+				"select distinct authority from authorities order by authority",
+				String.class);
+	}
 
-    public Contact getById(Long id) {
-        List<Contact> list = getJdbcTemplate().query("select id, contact_name, email from contacts where id = ? order by id", new RowMapper<Contact>() {
-            public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
-                return mapContact(rs);
-            }
-        }, id);
+	public Contact getById(Long id) {
+		List<Contact> list = getJdbcTemplate().query(
+				"select id, contact_name, email from contacts where id = ? order by id",
+				new RowMapper<Contact>() {
+					public Contact mapRow(ResultSet rs, int rowNum) throws SQLException {
+						return mapContact(rs);
+					}
+				}, id);
 
-        if (list.size() == 0) {
-            return null;
-        } else {
-            return (Contact) list.get(0);
-        }
-    }
+		if (list.size() == 0) {
+			return null;
+		}
+		else {
+			return (Contact) list.get(0);
+		}
+	}
 
-    private Contact mapContact(ResultSet rs) throws SQLException {
-        Contact contact = new Contact();
-        contact.setId(new Long(rs.getLong("id")));
-        contact.setName(rs.getString("contact_name"));
-        contact.setEmail(rs.getString("email"));
+	private Contact mapContact(ResultSet rs) throws SQLException {
+		Contact contact = new Contact();
+		contact.setId(new Long(rs.getLong("id")));
+		contact.setName(rs.getString("contact_name"));
+		contact.setEmail(rs.getString("email"));
 
-        return contact;
-    }
+		return contact;
+	}
 }
-
diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactManager.java b/samples/contacts-xml/src/main/java/sample/contact/ContactManager.java
index 15ac69f6b6..93b63f64fe 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/ContactManager.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/ContactManager.java
@@ -21,37 +21,36 @@ import org.springframework.security.acls.model.Sid;
 
 import java.util.List;
 
-
 /**
  * Interface for the application's services layer.
  *
  * @author Ben Alex
  */
 public interface ContactManager {
-    //~ Methods ========================================================================================================
-    @PreAuthorize("hasPermission(#contact, admin)")
-    public void addPermission(Contact contact, Sid recipient, Permission permission);
+	// ~ Methods
+	// ========================================================================================================
+	@PreAuthorize("hasPermission(#contact, admin)")
+	public void addPermission(Contact contact, Sid recipient, Permission permission);
 
-    @PreAuthorize("hasPermission(#contact, admin)")
-    public void deletePermission(Contact contact, Sid recipient, Permission permission);
+	@PreAuthorize("hasPermission(#contact, admin)")
+	public void deletePermission(Contact contact, Sid recipient, Permission permission);
 
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public void create(Contact contact);
+	@PreAuthorize("hasRole('ROLE_USER')")
+	public void create(Contact contact);
 
-    @PreAuthorize("hasPermission(#contact, 'delete') or hasPermission(#contact, admin)")
-    public void delete(Contact contact);
+	@PreAuthorize("hasPermission(#contact, 'delete') or hasPermission(#contact, admin)")
+	public void delete(Contact contact);
 
-    @PreAuthorize("hasRole('ROLE_USER')")
-    @PostFilter("hasPermission(filterObject, 'read') or hasPermission(filterObject, admin)")
-    public List<Contact> getAll();
+	@PreAuthorize("hasRole('ROLE_USER')")
+	@PostFilter("hasPermission(filterObject, 'read') or hasPermission(filterObject, admin)")
+	public List<Contact> getAll();
 
-    @PreAuthorize("hasRole('ROLE_USER')")
-    public List<String> getAllRecipients();
+	@PreAuthorize("hasRole('ROLE_USER')")
+	public List<String> getAllRecipients();
 
-    @PreAuthorize(
-            "hasPermission(#id, 'sample.contact.Contact', read) or " +
-            "hasPermission(#id, 'sample.contact.Contact', admin)")
-    public Contact getById(Long id);
+	@PreAuthorize("hasPermission(#id, 'sample.contact.Contact', read) or "
+			+ "hasPermission(#id, 'sample.contact.Contact', admin)")
+	public Contact getById(Long id);
 
-    public Contact getRandomContact();
+	public Contact getRandomContact();
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java b/samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java
index f5a5cbb7e4..f075f6e2a3 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/ContactManagerBackend.java
@@ -14,7 +14,6 @@
  */
 package sample.contact;
 
-
 import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.domain.ObjectIdentityImpl;
 import org.springframework.security.acls.domain.PrincipalSid;
@@ -41,146 +40,156 @@ import org.springframework.util.Assert;
 import java.util.List;
 import java.util.Random;
 
-
 /**
  * Concrete implementation of {@link ContactManager}.
  *
  * @author Ben Alex
  */
 @Transactional
-public class ContactManagerBackend extends ApplicationObjectSupport implements ContactManager, InitializingBean {
-    //~ Instance fields ================================================================================================
+public class ContactManagerBackend extends ApplicationObjectSupport implements
+		ContactManager, InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ContactDao contactDao;
-    private MutableAclService mutableAclService;
-    private int counter = 1000;
+	private ContactDao contactDao;
+	private MutableAclService mutableAclService;
+	private int counter = 1000;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(contactDao, "contactDao required");
-        Assert.notNull(mutableAclService, "mutableAclService required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(contactDao, "contactDao required");
+		Assert.notNull(mutableAclService, "mutableAclService required");
+	}
 
-    public void addPermission(Contact contact, Sid recipient, Permission permission) {
-        MutableAcl acl;
-        ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
+	public void addPermission(Contact contact, Sid recipient, Permission permission) {
+		MutableAcl acl;
+		ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
 
-        try {
-            acl = (MutableAcl) mutableAclService.readAclById(oid);
-        } catch (NotFoundException nfe) {
-            acl = mutableAclService.createAcl(oid);
-        }
+		try {
+			acl = (MutableAcl) mutableAclService.readAclById(oid);
+		}
+		catch (NotFoundException nfe) {
+			acl = mutableAclService.createAcl(oid);
+		}
 
-        acl.insertAce(acl.getEntries().size(), permission, recipient, true);
-        mutableAclService.updateAcl(acl);
+		acl.insertAce(acl.getEntries().size(), permission, recipient, true);
+		mutableAclService.updateAcl(acl);
 
-        logger.debug("Added permission " + permission + " for Sid " + recipient + " contact " + contact);
-    }
+		logger.debug("Added permission " + permission + " for Sid " + recipient
+				+ " contact " + contact);
+	}
 
-    public void create(Contact contact) {
-        // Create the Contact itself
-        contact.setId(new Long(counter++));
-        contactDao.create(contact);
+	public void create(Contact contact) {
+		// Create the Contact itself
+		contact.setId(new Long(counter++));
+		contactDao.create(contact);
 
-        // Grant the current principal administrative permission to the contact
-        addPermission(contact, new PrincipalSid(getUsername()), BasePermission.ADMINISTRATION);
+		// Grant the current principal administrative permission to the contact
+		addPermission(contact, new PrincipalSid(getUsername()),
+				BasePermission.ADMINISTRATION);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Created contact " + contact + " and granted admin permission to recipient " + getUsername());
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Created contact " + contact
+					+ " and granted admin permission to recipient " + getUsername());
+		}
+	}
 
-    public void delete(Contact contact) {
-        contactDao.delete(contact.getId());
+	public void delete(Contact contact) {
+		contactDao.delete(contact.getId());
 
-        // Delete the ACL information as well
-        ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
-        mutableAclService.deleteAcl(oid, false);
+		// Delete the ACL information as well
+		ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
+		mutableAclService.deleteAcl(oid, false);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Deleted contact " + contact + " including ACL permissions");
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Deleted contact " + contact + " including ACL permissions");
+		}
+	}
 
-    public void deletePermission(Contact contact, Sid recipient, Permission permission) {
-        ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
-        MutableAcl acl = (MutableAcl) mutableAclService.readAclById(oid);
+	public void deletePermission(Contact contact, Sid recipient, Permission permission) {
+		ObjectIdentity oid = new ObjectIdentityImpl(Contact.class, contact.getId());
+		MutableAcl acl = (MutableAcl) mutableAclService.readAclById(oid);
 
-        // Remove all permissions associated with this particular recipient (string equality to KISS)
-        List<AccessControlEntry> entries = acl.getEntries();
+		// Remove all permissions associated with this particular recipient (string
+		// equality to KISS)
+		List<AccessControlEntry> entries = acl.getEntries();
 
-        for (int i = 0; i < entries.size(); i++) {
-            if (entries.get(i).getSid().equals(recipient) && entries.get(i).getPermission().equals(permission)) {
-                acl.deleteAce(i);
-            }
-        }
+		for (int i = 0; i < entries.size(); i++) {
+			if (entries.get(i).getSid().equals(recipient)
+					&& entries.get(i).getPermission().equals(permission)) {
+				acl.deleteAce(i);
+			}
+		}
 
-        mutableAclService.updateAcl(acl);
+		mutableAclService.updateAcl(acl);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Deleted contact " + contact + " ACL permissions for recipient " + recipient);
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Deleted contact " + contact + " ACL permissions for recipient "
+					+ recipient);
+		}
+	}
 
-    @Transactional(readOnly=true)
-    public List<Contact> getAll() {
-        logger.debug("Returning all contacts");
+	@Transactional(readOnly = true)
+	public List<Contact> getAll() {
+		logger.debug("Returning all contacts");
 
-        return contactDao.findAll();
-    }
+		return contactDao.findAll();
+	}
 
-    @Transactional(readOnly=true)
-    public List<String> getAllRecipients() {
-        logger.debug("Returning all recipients");
+	@Transactional(readOnly = true)
+	public List<String> getAllRecipients() {
+		logger.debug("Returning all recipients");
 
-        return contactDao.findAllPrincipals();
-    }
+		return contactDao.findAllPrincipals();
+	}
 
-    @Transactional(readOnly=true)
-    public Contact getById(Long id) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Returning contact with id: " + id);
-        }
+	@Transactional(readOnly = true)
+	public Contact getById(Long id) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Returning contact with id: " + id);
+		}
 
-        return contactDao.getById(id);
-    }
+		return contactDao.getById(id);
+	}
 
-    /**
-     * This is a public method.
-     */
-    @Transactional(readOnly=true)
-    public Contact getRandomContact() {
-        logger.debug("Returning random contact");
+	/**
+	 * This is a public method.
+	 */
+	@Transactional(readOnly = true)
+	public Contact getRandomContact() {
+		logger.debug("Returning random contact");
 
-        Random rnd = new Random();
-        List<Contact> contacts = contactDao.findAll();
-        int getNumber = rnd.nextInt(contacts.size());
+		Random rnd = new Random();
+		List<Contact> contacts = contactDao.findAll();
+		int getNumber = rnd.nextInt(contacts.size());
 
-        return contacts.get(getNumber);
-    }
+		return contacts.get(getNumber);
+	}
 
-    protected String getUsername() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+	protected String getUsername() {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        if (auth.getPrincipal() instanceof UserDetails) {
-            return ((UserDetails) auth.getPrincipal()).getUsername();
-        } else {
-            return auth.getPrincipal().toString();
-        }
-    }
+		if (auth.getPrincipal() instanceof UserDetails) {
+			return ((UserDetails) auth.getPrincipal()).getUsername();
+		}
+		else {
+			return auth.getPrincipal().toString();
+		}
+	}
 
-    public void setContactDao(ContactDao contactDao) {
-        this.contactDao = contactDao;
-    }
+	public void setContactDao(ContactDao contactDao) {
+		this.contactDao = contactDao;
+	}
 
-    public void setMutableAclService(MutableAclService mutableAclService) {
-        this.mutableAclService = mutableAclService;
-    }
+	public void setMutableAclService(MutableAclService mutableAclService) {
+		this.mutableAclService = mutableAclService;
+	}
 
-    public void update(Contact contact) {
-        contactDao.update(contact);
+	public void update(Contact contact) {
+		contactDao.update(contact);
 
-        logger.debug("Updated contact " + contact);
-    }
+		logger.debug("Updated contact " + contact);
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java b/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
index 05cbc34cf2..fa0877b57a 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
@@ -38,248 +38,245 @@ import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.util.Assert;
 
-
 /**
  * Populates the Contacts in-memory database with contact and ACL information.
  *
  * @author Ben Alex
  */
 public class DataSourcePopulator implements InitializingBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    JdbcTemplate template;
-    private MutableAclService mutableAclService;
-    final Random rnd = new Random();
-    TransactionTemplate tt;
-    final String[] firstNames = {
-            "Bob", "Mary", "James", "Jane", "Kristy", "Kirsty", "Kate", "Jeni", "Angela", "Melanie", "Kent", "William",
-            "Geoff", "Jeff", "Adrian", "Amanda", "Lisa", "Elizabeth", "Prue", "Richard", "Darin", "Phillip", "Michael",
-            "Belinda", "Samantha", "Brian", "Greg", "Matthew"
-        };
-    final String[] lastNames = {
-            "Smith", "Williams", "Jackson", "Rictor", "Nelson", "Fitzgerald", "McAlpine", "Sutherland", "Abbott", "Hall",
-            "Edwards", "Gates", "Black", "Brown", "Gray", "Marwell", "Booch", "Johnson", "McTaggart", "Parklin",
-            "Findlay", "Robinson", "Giugni", "Lang", "Chi", "Carmichael"
-        };
-    private int createEntities = 50;
+	JdbcTemplate template;
+	private MutableAclService mutableAclService;
+	final Random rnd = new Random();
+	TransactionTemplate tt;
+	final String[] firstNames = { "Bob", "Mary", "James", "Jane", "Kristy", "Kirsty",
+			"Kate", "Jeni", "Angela", "Melanie", "Kent", "William", "Geoff", "Jeff",
+			"Adrian", "Amanda", "Lisa", "Elizabeth", "Prue", "Richard", "Darin",
+			"Phillip", "Michael", "Belinda", "Samantha", "Brian", "Greg", "Matthew" };
+	final String[] lastNames = { "Smith", "Williams", "Jackson", "Rictor", "Nelson",
+			"Fitzgerald", "McAlpine", "Sutherland", "Abbott", "Hall", "Edwards", "Gates",
+			"Black", "Brown", "Gray", "Marwell", "Booch", "Johnson", "McTaggart",
+			"Parklin", "Findlay", "Robinson", "Giugni", "Lang", "Chi", "Carmichael" };
+	private int createEntities = 50;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(mutableAclService, "mutableAclService required");
-        Assert.notNull(template, "dataSource required");
-        Assert.notNull(tt, "platformTransactionManager required");
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(mutableAclService, "mutableAclService required");
+		Assert.notNull(template, "dataSource required");
+		Assert.notNull(tt, "platformTransactionManager required");
 
-        // Set a user account that will initially own all the created data
-        Authentication authRequest = new UsernamePasswordAuthenticationToken("rod", "koala",
-                AuthorityUtils.createAuthorityList("ROLE_IGNORED"));
-        SecurityContextHolder.getContext().setAuthentication(authRequest);
+		// Set a user account that will initially own all the created data
+		Authentication authRequest = new UsernamePasswordAuthenticationToken("rod",
+				"koala", AuthorityUtils.createAuthorityList("ROLE_IGNORED"));
+		SecurityContextHolder.getContext().setAuthentication(authRequest);
 
-        try {
-            template.execute("DROP TABLE CONTACTS");
-            template.execute("DROP TABLE AUTHORITIES");
-            template.execute("DROP TABLE USERS");
-            template.execute("DROP TABLE ACL_ENTRY");
-            template.execute("DROP TABLE ACL_OBJECT_IDENTITY");
-            template.execute("DROP TABLE ACL_CLASS");
-            template.execute("DROP TABLE ACL_SID");
-        } catch(Exception e) {
-            System.out.println("Failed to drop tables: " + e.getMessage());
-        }
+		try {
+			template.execute("DROP TABLE CONTACTS");
+			template.execute("DROP TABLE AUTHORITIES");
+			template.execute("DROP TABLE USERS");
+			template.execute("DROP TABLE ACL_ENTRY");
+			template.execute("DROP TABLE ACL_OBJECT_IDENTITY");
+			template.execute("DROP TABLE ACL_CLASS");
+			template.execute("DROP TABLE ACL_SID");
+		}
+		catch (Exception e) {
+			System.out.println("Failed to drop tables: " + e.getMessage());
+		}
 
-        template.execute(
-            "CREATE TABLE ACL_SID(" +
-                    "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," +
-                    "PRINCIPAL BOOLEAN NOT NULL," +
-                    "SID VARCHAR_IGNORECASE(100) NOT NULL," +
-                    "CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));");
-        template.execute(
-            "CREATE TABLE ACL_CLASS(" +
-                    "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," +
-                    "CLASS VARCHAR_IGNORECASE(100) NOT NULL," +
-                    "CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));");
-        template.execute(
-            "CREATE TABLE ACL_OBJECT_IDENTITY(" +
-                    "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," +
-                    "OBJECT_ID_CLASS BIGINT NOT NULL," +
-                    "OBJECT_ID_IDENTITY BIGINT NOT NULL," +
-                    "PARENT_OBJECT BIGINT," +
-                    "OWNER_SID BIGINT," +
-                    "ENTRIES_INHERITING BOOLEAN NOT NULL," +
-                    "CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY)," +
-                    "CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID)," +
-                    "CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID)," +
-                    "CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));");
-        template.execute(
-            "CREATE TABLE ACL_ENTRY(" +
-                    "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY," +
-                    "ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL," +
-                    "MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL," +
-                    "AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER)," +
-                    "CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID)," +
-                    "CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
+		template.execute("CREATE TABLE ACL_SID("
+				+ "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,"
+				+ "PRINCIPAL BOOLEAN NOT NULL," + "SID VARCHAR_IGNORECASE(100) NOT NULL,"
+				+ "CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));");
+		template.execute("CREATE TABLE ACL_CLASS("
+				+ "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,"
+				+ "CLASS VARCHAR_IGNORECASE(100) NOT NULL,"
+				+ "CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));");
+		template.execute("CREATE TABLE ACL_OBJECT_IDENTITY("
+				+ "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,"
+				+ "OBJECT_ID_CLASS BIGINT NOT NULL,"
+				+ "OBJECT_ID_IDENTITY BIGINT NOT NULL,"
+				+ "PARENT_OBJECT BIGINT,"
+				+ "OWNER_SID BIGINT,"
+				+ "ENTRIES_INHERITING BOOLEAN NOT NULL,"
+				+ "CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY),"
+				+ "CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID),"
+				+ "CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID),"
+				+ "CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));");
+		template.execute("CREATE TABLE ACL_ENTRY("
+				+ "ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,"
+				+ "ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL,"
+				+ "MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL,"
+				+ "AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER),"
+				+ "CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID),"
+				+ "CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
 
-        template.execute(
-            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
-        template.execute(
-            "CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
-        template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
+		template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+		template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
+		template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
 
-        template.execute(
-            "CREATE TABLE CONTACTS(ID BIGINT NOT NULL PRIMARY KEY, CONTACT_NAME VARCHAR_IGNORECASE(50) NOT NULL, EMAIL VARCHAR_IGNORECASE(50) NOT NULL)");
+		template.execute("CREATE TABLE CONTACTS(ID BIGINT NOT NULL PRIMARY KEY, CONTACT_NAME VARCHAR_IGNORECASE(50) NOT NULL, EMAIL VARCHAR_IGNORECASE(50) NOT NULL)");
 
-        /*
-           Passwords encoded using MD5, NOT in Base64 format, with null as salt
-           Encoded password for rod is "koala"
-           Encoded password for dianne is "emu"
-           Encoded password for scott is "wombat"
-           Encoded password for peter is "opal" (but user is disabled)
-           Encoded password for bill is "wombat"
-           Encoded password for bob is "wombat"
-           Encoded password for jane is "wombat"
+		/*
+		 * Passwords encoded using MD5, NOT in Base64 format, with null as salt Encoded
+		 * password for rod is "koala" Encoded password for dianne is "emu" Encoded
+		 * password for scott is "wombat" Encoded password for peter is "opal" (but user
+		 * is disabled) Encoded password for bill is "wombat" Encoded password for bob is
+		 * "wombat" Encoded password for jane is "wombat"
+		 */
+		template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);");
+		template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
 
-         */
-        template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);");
-        template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
+		template.execute("INSERT INTO contacts VALUES (1, 'John Smith', 'john@somewhere.com');");
+		template.execute("INSERT INTO contacts VALUES (2, 'Michael Citizen', 'michael@xyz.com');");
+		template.execute("INSERT INTO contacts VALUES (3, 'Joe Bloggs', 'joe@demo.com');");
+		template.execute("INSERT INTO contacts VALUES (4, 'Karen Sutherland', 'karen@sutherland.com');");
+		template.execute("INSERT INTO contacts VALUES (5, 'Mitchell Howard', 'mitchell@abcdef.com');");
+		template.execute("INSERT INTO contacts VALUES (6, 'Rose Costas', 'rose@xyz.com');");
+		template.execute("INSERT INTO contacts VALUES (7, 'Amanda Smith', 'amanda@abcdef.com');");
+		template.execute("INSERT INTO contacts VALUES (8, 'Cindy Smith', 'cindy@smith.com');");
+		template.execute("INSERT INTO contacts VALUES (9, 'Jonathan Citizen', 'jonathan@xyz.com');");
 
-        template.execute("INSERT INTO contacts VALUES (1, 'John Smith', 'john@somewhere.com');");
-        template.execute("INSERT INTO contacts VALUES (2, 'Michael Citizen', 'michael@xyz.com');");
-        template.execute("INSERT INTO contacts VALUES (3, 'Joe Bloggs', 'joe@demo.com');");
-        template.execute("INSERT INTO contacts VALUES (4, 'Karen Sutherland', 'karen@sutherland.com');");
-        template.execute("INSERT INTO contacts VALUES (5, 'Mitchell Howard', 'mitchell@abcdef.com');");
-        template.execute("INSERT INTO contacts VALUES (6, 'Rose Costas', 'rose@xyz.com');");
-        template.execute("INSERT INTO contacts VALUES (7, 'Amanda Smith', 'amanda@abcdef.com');");
-        template.execute("INSERT INTO contacts VALUES (8, 'Cindy Smith', 'cindy@smith.com');");
-        template.execute("INSERT INTO contacts VALUES (9, 'Jonathan Citizen', 'jonathan@xyz.com');");
+		for (int i = 10; i < createEntities; i++) {
+			String[] person = selectPerson();
+			template.execute("INSERT INTO contacts VALUES (" + i + ", '" + person[2]
+					+ "', '" + person[0].toLowerCase() + "@" + person[1].toLowerCase()
+					+ ".com');");
+		}
 
-        for (int i = 10; i < createEntities; i++) {
-            String[] person = selectPerson();
-            template.execute("INSERT INTO contacts VALUES (" + i + ", '" + person[2] + "', '" + person[0].toLowerCase()
-                + "@" + person[1].toLowerCase() + ".com');");
-        }
+		// Create acl_object_identity rows (and also acl_class rows as needed
+		for (int i = 1; i < createEntities; i++) {
+			final ObjectIdentity objectIdentity = new ObjectIdentityImpl(Contact.class,
+					new Long(i));
+			tt.execute(new TransactionCallback<Object>() {
+				public Object doInTransaction(TransactionStatus arg0) {
+					mutableAclService.createAcl(objectIdentity);
 
-        // Create acl_object_identity rows (and also acl_class rows as needed
-        for (int i = 1; i < createEntities; i++) {
-            final ObjectIdentity objectIdentity = new ObjectIdentityImpl(Contact.class, new Long(i));
-            tt.execute(new TransactionCallback<Object>() {
-                    public Object doInTransaction(TransactionStatus arg0) {
-                        mutableAclService.createAcl(objectIdentity);
+					return null;
+				}
+			});
+		}
 
-                        return null;
-                    }
-                });
-        }
+		// Now grant some permissions
+		grantPermissions(1, "rod", BasePermission.ADMINISTRATION);
+		grantPermissions(2, "rod", BasePermission.READ);
+		grantPermissions(3, "rod", BasePermission.READ);
+		grantPermissions(3, "rod", BasePermission.WRITE);
+		grantPermissions(3, "rod", BasePermission.DELETE);
+		grantPermissions(4, "rod", BasePermission.ADMINISTRATION);
+		grantPermissions(4, "dianne", BasePermission.ADMINISTRATION);
+		grantPermissions(4, "scott", BasePermission.READ);
+		grantPermissions(5, "dianne", BasePermission.ADMINISTRATION);
+		grantPermissions(5, "dianne", BasePermission.READ);
+		grantPermissions(6, "dianne", BasePermission.READ);
+		grantPermissions(6, "dianne", BasePermission.WRITE);
+		grantPermissions(6, "dianne", BasePermission.DELETE);
+		grantPermissions(6, "scott", BasePermission.READ);
+		grantPermissions(7, "scott", BasePermission.ADMINISTRATION);
+		grantPermissions(8, "dianne", BasePermission.ADMINISTRATION);
+		grantPermissions(8, "dianne", BasePermission.READ);
+		grantPermissions(8, "scott", BasePermission.READ);
+		grantPermissions(9, "scott", BasePermission.ADMINISTRATION);
+		grantPermissions(9, "scott", BasePermission.READ);
+		grantPermissions(9, "scott", BasePermission.WRITE);
+		grantPermissions(9, "scott", BasePermission.DELETE);
 
-        // Now grant some permissions
-        grantPermissions(1, "rod", BasePermission.ADMINISTRATION);
-        grantPermissions(2, "rod", BasePermission.READ);
-        grantPermissions(3, "rod", BasePermission.READ);
-        grantPermissions(3, "rod", BasePermission.WRITE);
-        grantPermissions(3, "rod", BasePermission.DELETE);
-        grantPermissions(4, "rod", BasePermission.ADMINISTRATION);
-        grantPermissions(4, "dianne", BasePermission.ADMINISTRATION);
-        grantPermissions(4, "scott", BasePermission.READ);
-        grantPermissions(5, "dianne", BasePermission.ADMINISTRATION);
-        grantPermissions(5, "dianne", BasePermission.READ);
-        grantPermissions(6, "dianne", BasePermission.READ);
-        grantPermissions(6, "dianne", BasePermission.WRITE);
-        grantPermissions(6, "dianne", BasePermission.DELETE);
-        grantPermissions(6, "scott", BasePermission.READ);
-        grantPermissions(7, "scott", BasePermission.ADMINISTRATION);
-        grantPermissions(8, "dianne", BasePermission.ADMINISTRATION);
-        grantPermissions(8, "dianne", BasePermission.READ);
-        grantPermissions(8, "scott", BasePermission.READ);
-        grantPermissions(9, "scott", BasePermission.ADMINISTRATION);
-        grantPermissions(9, "scott", BasePermission.READ);
-        grantPermissions(9, "scott", BasePermission.WRITE);
-        grantPermissions(9, "scott", BasePermission.DELETE);
+		// Now expressly change the owner of the first ten contacts
+		// We have to do this last, because "rod" owns all of them (doing it sooner would
+		// prevent ACL updates)
+		// Note that ownership has no impact on permissions - they're separate (ownership
+		// only allows ACl editing)
+		changeOwner(5, "dianne");
+		changeOwner(6, "dianne");
+		changeOwner(7, "scott");
+		changeOwner(8, "dianne");
+		changeOwner(9, "scott");
 
-        // Now expressly change the owner of the first ten contacts
-        // We have to do this last, because "rod" owns all of them (doing it sooner would prevent ACL updates)
-        // Note that ownership has no impact on permissions - they're separate (ownership only allows ACl editing)
-        changeOwner(5, "dianne");
-        changeOwner(6, "dianne");
-        changeOwner(7, "scott");
-        changeOwner(8, "dianne");
-        changeOwner(9, "scott");
+		String[] users = { "bill", "bob", "jane" }; // don't want to mess around with
+													// consistent sample data
+		Permission[] permissions = { BasePermission.ADMINISTRATION, BasePermission.READ,
+				BasePermission.DELETE };
 
-        String[] users = {"bill", "bob", "jane"}; // don't want to mess around with consistent sample data
-        Permission[] permissions = {BasePermission.ADMINISTRATION, BasePermission.READ, BasePermission.DELETE};
+		for (int i = 10; i < createEntities; i++) {
+			String user = users[rnd.nextInt(users.length)];
+			Permission permission = permissions[rnd.nextInt(permissions.length)];
+			grantPermissions(i, user, permission);
 
-        for (int i = 10; i < createEntities; i++) {
-            String user = users[rnd.nextInt(users.length)];
-            Permission permission = permissions[rnd.nextInt(permissions.length)];
-            grantPermissions(i, user, permission);
+			String user2 = users[rnd.nextInt(users.length)];
+			Permission permission2 = permissions[rnd.nextInt(permissions.length)];
+			grantPermissions(i, user2, permission2);
+		}
 
-            String user2 = users[rnd.nextInt(users.length)];
-            Permission permission2 = permissions[rnd.nextInt(permissions.length)];
-            grantPermissions(i, user2, permission2);
-        }
+		SecurityContextHolder.clearContext();
+	}
 
-        SecurityContextHolder.clearContext();
-    }
+	private void changeOwner(int contactNumber, String newOwnerUsername) {
+		AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl(
+				Contact.class, new Long(contactNumber)));
+		acl.setOwner(new PrincipalSid(newOwnerUsername));
+		updateAclInTransaction(acl);
+	}
 
-    private void changeOwner(int contactNumber, String newOwnerUsername) {
-        AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl(Contact.class,
-                    new Long(contactNumber)));
-        acl.setOwner(new PrincipalSid(newOwnerUsername));
-        updateAclInTransaction(acl);
-    }
+	public int getCreateEntities() {
+		return createEntities;
+	}
 
-    public int getCreateEntities() {
-        return createEntities;
-    }
+	private void grantPermissions(int contactNumber, String recipientUsername,
+			Permission permission) {
+		AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl(
+				Contact.class, new Long(contactNumber)));
+		acl.insertAce(acl.getEntries().size(), permission, new PrincipalSid(
+				recipientUsername), true);
+		updateAclInTransaction(acl);
+	}
 
-    private void grantPermissions(int contactNumber, String recipientUsername, Permission permission) {
-        AclImpl acl = (AclImpl) mutableAclService.readAclById(new ObjectIdentityImpl(Contact.class,
-                    new Long(contactNumber)));
-        acl.insertAce(acl.getEntries().size(), permission, new PrincipalSid(recipientUsername), true);
-        updateAclInTransaction(acl);
-    }
+	private String[] selectPerson() {
+		String firstName = firstNames[rnd.nextInt(firstNames.length)];
+		String lastName = lastNames[rnd.nextInt(lastNames.length)];
 
-    private String[] selectPerson() {
-        String firstName = firstNames[rnd.nextInt(firstNames.length)];
-        String lastName = lastNames[rnd.nextInt(lastNames.length)];
+		return new String[] { firstName, lastName, firstName + " " + lastName };
+	}
 
-        return new String[] {firstName, lastName, firstName + " " + lastName};
-    }
+	public void setCreateEntities(int createEntities) {
+		this.createEntities = createEntities;
+	}
 
-    public void setCreateEntities(int createEntities) {
-        this.createEntities = createEntities;
-    }
+	public void setDataSource(DataSource dataSource) {
+		this.template = new JdbcTemplate(dataSource);
+	}
 
-    public void setDataSource(DataSource dataSource) {
-        this.template = new JdbcTemplate(dataSource);
-    }
+	public void setMutableAclService(MutableAclService mutableAclService) {
+		this.mutableAclService = mutableAclService;
+	}
 
-    public void setMutableAclService(MutableAclService mutableAclService) {
-        this.mutableAclService = mutableAclService;
-    }
+	public void setPlatformTransactionManager(
+			PlatformTransactionManager platformTransactionManager) {
+		this.tt = new TransactionTemplate(platformTransactionManager);
+	}
 
-    public void setPlatformTransactionManager(PlatformTransactionManager platformTransactionManager) {
-        this.tt = new TransactionTemplate(platformTransactionManager);
-    }
+	private void updateAclInTransaction(final MutableAcl acl) {
+		tt.execute(new TransactionCallback<Object>() {
+			public Object doInTransaction(TransactionStatus arg0) {
+				mutableAclService.updateAcl(acl);
 
-    private void updateAclInTransaction(final MutableAcl acl) {
-        tt.execute(new TransactionCallback<Object>() {
-                public Object doInTransaction(TransactionStatus arg0) {
-                    mutableAclService.updateAcl(acl);
-
-                    return null;
-                }
-            });
-    }
+				return null;
+			}
+		});
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/IndexController.java b/samples/contacts-xml/src/main/java/sample/contact/IndexController.java
index 72cf8bb3d7..cd93e66ca8 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/IndexController.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/IndexController.java
@@ -17,66 +17,77 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
 /**
- * Controller which handles simple, single request use cases such as index pages and contact deletion.
+ * Controller which handles simple, single request use cases such as index pages and
+ * contact deletion.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 @Controller
 public class IndexController {
-    private final static Permission[] HAS_DELETE = new Permission[] {BasePermission.DELETE, BasePermission.ADMINISTRATION};
-    private final static Permission[] HAS_ADMIN = new Permission[] {BasePermission.ADMINISTRATION};
+	private final static Permission[] HAS_DELETE = new Permission[] {
+			BasePermission.DELETE, BasePermission.ADMINISTRATION };
+	private final static Permission[] HAS_ADMIN = new Permission[] { BasePermission.ADMINISTRATION };
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    @Autowired
-    private ContactManager contactManager;
-    @Autowired
-    private PermissionEvaluator permissionEvaluator;
+	@Autowired
+	private ContactManager contactManager;
+	@Autowired
+	private PermissionEvaluator permissionEvaluator;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * The public index page, used for unauthenticated users.
-     */
-    @RequestMapping(value="/hello.htm", method=RequestMethod.GET)
-    public ModelAndView displayPublicIndex() {
-        Contact rnd = contactManager.getRandomContact();
+	/**
+	 * The public index page, used for unauthenticated users.
+	 */
+	@RequestMapping(value = "/hello.htm", method = RequestMethod.GET)
+	public ModelAndView displayPublicIndex() {
+		Contact rnd = contactManager.getRandomContact();
 
-        return new ModelAndView("hello", "contact", rnd);
-    }
+		return new ModelAndView("hello", "contact", rnd);
+	}
 
-    /**
-     * The index page for an authenticated user.
-     * <p>
-     * This controller displays a list of all the contacts for which the current user has read or admin permissions.
-     * It makes a call to {@link ContactManager#getAll()} which automatically filters the returned list using Spring
-     * Security's ACL mechanism (see the expression annotations on this interface for the details).
-     * <p>
-     * In addition to rendering the list of contacts, the view will also include a "Del" or "Admin" link beside the
-     * contact, depending on whether the user has the corresponding permissions (admin permission is assumed to imply
-     * delete here). This information is stored in the model using the injected {@link PermissionEvaluator} instance.
-     * The implementation should be an instance of {@link AclPermissionEvaluator} or one which is compatible with Spring
-     * Security's ACL module.
-     */
-    @RequestMapping(value="/secure/index.htm", method=RequestMethod.GET)
-    public ModelAndView displayUserContacts() {
-        List<Contact> myContactsList = contactManager.getAll();
-        Map<Contact, Boolean> hasDelete = new HashMap<Contact, Boolean>(myContactsList.size());
-        Map<Contact, Boolean> hasAdmin = new HashMap<Contact, Boolean>(myContactsList.size());
+	/**
+	 * The index page for an authenticated user.
+	 * <p>
+	 * This controller displays a list of all the contacts for which the current user has
+	 * read or admin permissions. It makes a call to {@link ContactManager#getAll()} which
+	 * automatically filters the returned list using Spring Security's ACL mechanism (see
+	 * the expression annotations on this interface for the details).
+	 * <p>
+	 * In addition to rendering the list of contacts, the view will also include a "Del"
+	 * or "Admin" link beside the contact, depending on whether the user has the
+	 * corresponding permissions (admin permission is assumed to imply delete here). This
+	 * information is stored in the model using the injected {@link PermissionEvaluator}
+	 * instance. The implementation should be an instance of
+	 * {@link AclPermissionEvaluator} or one which is compatible with Spring Security's
+	 * ACL module.
+	 */
+	@RequestMapping(value = "/secure/index.htm", method = RequestMethod.GET)
+	public ModelAndView displayUserContacts() {
+		List<Contact> myContactsList = contactManager.getAll();
+		Map<Contact, Boolean> hasDelete = new HashMap<Contact, Boolean>(
+				myContactsList.size());
+		Map<Contact, Boolean> hasAdmin = new HashMap<Contact, Boolean>(
+				myContactsList.size());
 
-        Authentication user = SecurityContextHolder.getContext().getAuthentication();
+		Authentication user = SecurityContextHolder.getContext().getAuthentication();
 
-        for (Contact contact : myContactsList) {
-            hasDelete.put(contact, Boolean.valueOf(permissionEvaluator.hasPermission(user, contact, HAS_DELETE)));
-            hasAdmin.put(contact, Boolean.valueOf(permissionEvaluator.hasPermission(user, contact, HAS_ADMIN)));
-        }
+		for (Contact contact : myContactsList) {
+			hasDelete.put(contact, Boolean.valueOf(permissionEvaluator.hasPermission(
+					user, contact, HAS_DELETE)));
+			hasAdmin.put(contact, Boolean.valueOf(permissionEvaluator.hasPermission(user,
+					contact, HAS_ADMIN)));
+		}
 
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("contacts", myContactsList);
-        model.put("hasDeletePermission", hasDelete);
-        model.put("hasAdminPermission", hasAdmin);
+		Map<String, Object> model = new HashMap<String, Object>();
+		model.put("contacts", myContactsList);
+		model.put("hasDeletePermission", hasDelete);
+		model.put("hasAdminPermission", hasAdmin);
 
-        return new ModelAndView("index", "model", model);
-    }
+		return new ModelAndView("index", "model", model);
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/WebContact.java b/samples/contacts-xml/src/main/java/sample/contact/WebContact.java
index ad3dd32f0e..b1e593a010 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/WebContact.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/WebContact.java
@@ -21,26 +21,28 @@ package sample.contact;
  * @author Ben Alex
  */
 public class WebContact {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String email;
-    private String name;
+	private String email;
+	private String name;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }
diff --git a/samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java b/samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java
index c161a981d0..81a7e71660 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/WebContactValidator.java
@@ -18,29 +18,32 @@ package sample.contact;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-
 /**
  * Validates {@link WebContact}.
  *
  * @author Ben Alex
  */
 public class WebContactValidator implements Validator {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @SuppressWarnings("unchecked")
-    public boolean supports(Class clazz) {
-        return clazz.equals(WebContact.class);
-    }
+	@SuppressWarnings("unchecked")
+	public boolean supports(Class clazz) {
+		return clazz.equals(WebContact.class);
+	}
 
-    public void validate(Object obj, Errors errors) {
-        WebContact wc = (WebContact) obj;
+	public void validate(Object obj, Errors errors) {
+		WebContact wc = (WebContact) obj;
 
-        if ((wc.getName() == null) || (wc.getName().length() < 3) || (wc.getName().length() > 50)) {
-            errors.rejectValue("name", "err.name", "Name 3-50 characters is required. *");
-        }
+		if ((wc.getName() == null) || (wc.getName().length() < 3)
+				|| (wc.getName().length() > 50)) {
+			errors.rejectValue("name", "err.name", "Name 3-50 characters is required. *");
+		}
 
-        if ((wc.getEmail() == null) || (wc.getEmail().length() < 3) || (wc.getEmail().length() > 50)) {
-            errors.rejectValue("email", "err.email", "Email 3-50 characters is required. *");
-        }
-    }
+		if ((wc.getEmail() == null) || (wc.getEmail().length() < 3)
+				|| (wc.getEmail().length() > 50)) {
+			errors.rejectValue("email", "err.email",
+					"Email 3-50 characters is required. *");
+		}
+	}
 }
diff --git a/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java b/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java
index 7db62b024c..7f618e7e10 100644
--- a/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java
+++ b/samples/contacts-xml/src/test/java/sample/contact/ContactManagerTests.java
@@ -31,7 +31,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-
 /**
  * Tests {@link ContactManager}.
  *
@@ -39,130 +38,137 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Ben Alex
  * @author Luke Taylor
  */
-@ContextConfiguration(locations={
-                "/applicationContext-security.xml",
-                "/applicationContext-common-authorization.xml",
-                "/applicationContext-common-business.xml"})
+@ContextConfiguration(locations = { "/applicationContext-security.xml",
+		"/applicationContext-common-authorization.xml",
+		"/applicationContext-common-business.xml" })
 @RunWith(SpringJUnit4ClassRunner.class)
 public class ContactManagerTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    @Autowired
-    protected ContactManager contactManager;
+	@Autowired
+	protected ContactManager contactManager;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    void assertContainsContact(long id, List<Contact> contacts) {
-        for(Contact contact : contacts) {
-            if (contact.getId().equals(Long.valueOf(id))) {
-                return;
-            }
-        }
+	void assertContainsContact(long id, List<Contact> contacts) {
+		for (Contact contact : contacts) {
+			if (contact.getId().equals(Long.valueOf(id))) {
+				return;
+			}
+		}
 
-        fail("List of contacts should have contained: " + id);
-    }
+		fail("List of contacts should have contained: " + id);
+	}
 
-    void assertDoestNotContainContact(long id, List<Contact> contacts) {
-        for(Contact contact : contacts) {
-            if (contact.getId().equals(Long.valueOf(id))) {
-                fail("List of contact should NOT (but did) contain: " + id);
-            }
-        }
-    }
+	void assertDoestNotContainContact(long id, List<Contact> contacts) {
+		for (Contact contact : contacts) {
+			if (contact.getId().equals(Long.valueOf(id))) {
+				fail("List of contact should NOT (but did) contain: " + id);
+			}
+		}
+	}
 
-    /**
-     * Locates the first <code>Contact</code> of the exact name specified.
-     * <p>
-     * Uses the {@link ContactManager#getAll()} method.
-     *
-     * @param id Identify of the contact to locate (must be an exact match)
-     *
-     * @return the domain or <code>null</code> if not found
-     */
-    Contact getContact(String id) {
-        for(Contact contact : contactManager.getAll()) {
-            if (contact.getId().equals(id)) {
-                return contact;
-            }
-        }
+	/**
+	 * Locates the first <code>Contact</code> of the exact name specified.
+	 * <p>
+	 * Uses the {@link ContactManager#getAll()} method.
+	 *
+	 * @param id Identify of the contact to locate (must be an exact match)
+	 *
+	 * @return the domain or <code>null</code> if not found
+	 */
+	Contact getContact(String id) {
+		for (Contact contact : contactManager.getAll()) {
+			if (contact.getId().equals(id)) {
+				return contact;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    private void makeActiveUser(String username) {
-        String password = "";
+	private void makeActiveUser(String username) {
+		String password = "";
 
-        if ("rod".equals(username)) {
-            password = "koala";
-        } else if ("dianne".equals(username)) {
-            password = "emu";
-        } else if ("scott".equals(username)) {
-            password = "wombat";
-        } else if ("peter".equals(username)) {
-            password = "opal";
-        }
+		if ("rod".equals(username)) {
+			password = "koala";
+		}
+		else if ("dianne".equals(username)) {
+			password = "emu";
+		}
+		else if ("scott".equals(username)) {
+			password = "wombat";
+		}
+		else if ("peter".equals(username)) {
+			password = "opal";
+		}
 
-        Authentication authRequest = new UsernamePasswordAuthenticationToken(username, password);
-        SecurityContextHolder.getContext().setAuthentication(authRequest);
-    }
+		Authentication authRequest = new UsernamePasswordAuthenticationToken(username,
+				password);
+		SecurityContextHolder.getContext().setAuthentication(authRequest);
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testDianne() {
-        makeActiveUser("dianne"); // has ROLE_USER
+	@Test
+	public void testDianne() {
+		makeActiveUser("dianne"); // has ROLE_USER
 
-        List<Contact> contacts = contactManager.getAll();
-        assertEquals(4, contacts.size());
+		List<Contact> contacts = contactManager.getAll();
+		assertEquals(4, contacts.size());
 
-        assertContainsContact(4, contacts);
-        assertContainsContact(5, contacts);
-        assertContainsContact(6, contacts);
-        assertContainsContact(8, contacts);
+		assertContainsContact(4, contacts);
+		assertContainsContact(5, contacts);
+		assertContainsContact(6, contacts);
+		assertContainsContact(8, contacts);
 
-        assertDoestNotContainContact(1, contacts);
-        assertDoestNotContainContact(2, contacts);
-        assertDoestNotContainContact(3, contacts);
-    }
+		assertDoestNotContainContact(1, contacts);
+		assertDoestNotContainContact(2, contacts);
+		assertDoestNotContainContact(3, contacts);
+	}
 
-    @Test
-    public void testrod() {
-        makeActiveUser("rod"); // has ROLE_SUPERVISOR
+	@Test
+	public void testrod() {
+		makeActiveUser("rod"); // has ROLE_SUPERVISOR
 
-        List<Contact> contacts = contactManager.getAll();
+		List<Contact> contacts = contactManager.getAll();
 
-        assertEquals(4, contacts.size());
+		assertEquals(4, contacts.size());
 
-        assertContainsContact(1, contacts);
-        assertContainsContact(2, contacts);
-        assertContainsContact(3, contacts);
-        assertContainsContact(4, contacts);
+		assertContainsContact(1, contacts);
+		assertContainsContact(2, contacts);
+		assertContainsContact(3, contacts);
+		assertContainsContact(4, contacts);
 
-        assertDoestNotContainContact(5, contacts);
+		assertDoestNotContainContact(5, contacts);
 
-        Contact c1 = contactManager.getById(new Long(4));
+		Contact c1 = contactManager.getById(new Long(4));
 
-        contactManager.deletePermission(c1, new PrincipalSid("bob"), BasePermission.ADMINISTRATION);
-        contactManager.addPermission(c1, new PrincipalSid("bob"), BasePermission.ADMINISTRATION);
-    }
+		contactManager.deletePermission(c1, new PrincipalSid("bob"),
+				BasePermission.ADMINISTRATION);
+		contactManager.addPermission(c1, new PrincipalSid("bob"),
+				BasePermission.ADMINISTRATION);
+	}
 
-    @Test
-    public void testScott() {
-        makeActiveUser("scott"); // has ROLE_USER
+	@Test
+	public void testScott() {
+		makeActiveUser("scott"); // has ROLE_USER
 
-        List<Contact> contacts = contactManager.getAll();
+		List<Contact> contacts = contactManager.getAll();
 
-        assertEquals(5, contacts.size());
+		assertEquals(5, contacts.size());
 
-        assertContainsContact(4, contacts);
-        assertContainsContact(6, contacts);
-        assertContainsContact(7, contacts);
-        assertContainsContact(8, contacts);
-        assertContainsContact(9, contacts);
+		assertContainsContact(4, contacts);
+		assertContainsContact(6, contacts);
+		assertContainsContact(7, contacts);
+		assertContainsContact(8, contacts);
+		assertContainsContact(9, contacts);
 
-        assertDoestNotContainContact(1, contacts);
-    }
+		assertDoestNotContainContact(1, contacts);
+	}
 }
diff --git a/samples/data-jc/src/main/java/samples/DataConfig.java b/samples/data-jc/src/main/java/samples/DataConfig.java
index 23c488ad61..3210c6a30f 100644
--- a/samples/data-jc/src/main/java/samples/DataConfig.java
+++ b/samples/data-jc/src/main/java/samples/DataConfig.java
@@ -42,44 +42,44 @@ import javax.sql.DataSource;
 @EnableJpaRepositories
 public class DataConfig {
 
-    @Bean
-    public SecurityEvaluationContextExtension expressionEvaluationContextProvider() {
-        return new SecurityEvaluationContextExtension();
-    }
+	@Bean
+	public SecurityEvaluationContextExtension expressionEvaluationContextProvider() {
+		return new SecurityEvaluationContextExtension();
+	}
 
-    @Bean
-    public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.HSQL).build();
-    }
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+	}
 
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        vendorAdapter.setDatabase(Database.HSQL);
-        vendorAdapter.setGenerateDdl(true);
+	@Bean
+	public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setDatabase(Database.HSQL);
+		vendorAdapter.setGenerateDdl(true);
 
-        LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-        factory.setJpaVendorAdapter(vendorAdapter);
-        factory.setPackagesToScan(Message.class.getPackage().getName());
-        factory.setDataSource(dataSource());
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setJpaVendorAdapter(vendorAdapter);
+		factory.setPackagesToScan(Message.class.getPackage().getName());
+		factory.setDataSource(dataSource());
 
-        return factory;
-    }
+		return factory;
+	}
 
-    @Bean
-    @DependsOn("entityManagerFactory")
-    public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
-        ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-        populator.addScript(new ClassPathResource("data.sql"));
-        populator.populate(dataSource.getConnection());
-        return populator;
-    }
+	@Bean
+	@DependsOn("entityManagerFactory")
+	public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
+		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
+		populator.addScript(new ClassPathResource("data.sql"));
+		populator.populate(dataSource.getConnection());
+		return populator;
+	}
 
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        JpaTransactionManager txManager = new JpaTransactionManager();
-        txManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return txManager;
-    }
+	@Bean
+	public PlatformTransactionManager transactionManager() {
+		JpaTransactionManager txManager = new JpaTransactionManager();
+		txManager.setEntityManagerFactory(entityManagerFactory().getObject());
+		return txManager;
+	}
 }
diff --git a/samples/data-jc/src/main/java/samples/data/Message.java b/samples/data-jc/src/main/java/samples/data/Message.java
index 307efd0bd6..5e65055ff8 100644
--- a/samples/data-jc/src/main/java/samples/data/Message.java
+++ b/samples/data-jc/src/main/java/samples/data/Message.java
@@ -15,7 +15,6 @@
  */
 package samples.data;
 
-
 import java.util.Calendar;
 
 import javax.persistence.*;
@@ -24,58 +23,58 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
 public class Message {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
 
-    @NotEmpty(message = "Message is required.")
-    private String text;
+	@NotEmpty(message = "Message is required.")
+	private String text;
 
-    @NotEmpty(message = "Summary is required.")
-    private String summary;
+	@NotEmpty(message = "Summary is required.")
+	private String summary;
 
-    private Calendar created = Calendar.getInstance();
+	private Calendar created = Calendar.getInstance();
 
-    @OneToOne
-    private User to;
+	@OneToOne
+	private User to;
 
-    public User getTo() {
-        return to;
-    }
+	public User getTo() {
+		return to;
+	}
 
-    public void setTo(User to) {
-        this.to = to;
-    }
+	public void setTo(User to) {
+		this.to = to;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Calendar getCreated() {
-        return created;
-    }
+	public Calendar getCreated() {
+		return created;
+	}
 
-    public void setCreated(Calendar created) {
-        this.created = created;
-    }
+	public void setCreated(Calendar created) {
+		this.created = created;
+	}
 
-    public String getText() {
-        return text;
-    }
+	public String getText() {
+		return text;
+	}
 
-    public void setText(String text) {
-        this.text = text;
-    }
+	public void setText(String text) {
+		this.text = text;
+	}
 
-    public String getSummary() {
-        return summary;
-    }
+	public String getSummary() {
+		return summary;
+	}
 
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
 }
diff --git a/samples/data-jc/src/main/java/samples/data/MessageRepository.java b/samples/data-jc/src/main/java/samples/data/MessageRepository.java
index 878279cda0..9dfd282d12 100644
--- a/samples/data-jc/src/main/java/samples/data/MessageRepository.java
+++ b/samples/data-jc/src/main/java/samples/data/MessageRepository.java
@@ -22,5 +22,5 @@ import org.springframework.stereotype.Repository;
  * @author Rob Winch
  */
 @Repository
-public interface MessageRepository extends JpaRepository<Message,Long> {
+public interface MessageRepository extends JpaRepository<Message, Long> {
 }
diff --git a/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java b/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java
index 478ab25cbc..a3da15d8eb 100644
--- a/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java
+++ b/samples/data-jc/src/main/java/samples/data/SecurityMessageRepository.java
@@ -15,7 +15,6 @@
  */
 package samples.data;
 
-
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -26,6 +25,6 @@ import java.util.List;
  */
 @Repository
 public interface SecurityMessageRepository extends MessageRepository {
-    @Query("select m from Message m where m.to.id = ?#{ principal?.id }")
-    List<Message> findAll();
+	@Query("select m from Message m where m.to.id = ?#{ principal?.id }")
+	List<Message> findAll();
 }
\ No newline at end of file
diff --git a/samples/data-jc/src/main/java/samples/data/User.java b/samples/data-jc/src/main/java/samples/data/User.java
index 57b70d3f93..35a3604241 100644
--- a/samples/data-jc/src/main/java/samples/data/User.java
+++ b/samples/data-jc/src/main/java/samples/data/User.java
@@ -25,55 +25,55 @@ import javax.persistence.Id;
  */
 @Entity
 public class User {
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Id
-    private Long id;
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	@Id
+	private Long id;
 
-    private String firstName;
+	private String firstName;
 
-    private String lastName;
+	private String lastName;
 
-    private String email;
+	private String email;
 
-    private String password;
+	private String password;
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public String getFirstName() {
-        return firstName;
-    }
+	public String getFirstName() {
+		return firstName;
+	}
 
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
 
-    public String getLastName() {
-        return lastName;
-    }
+	public String getLastName() {
+		return lastName;
+	}
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    public String getPassword() {
-        return password;
-    }
+	public String getPassword() {
+		return password;
+	}
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public void setPassword(String password) {
+		this.password = password;
+	}
 }
\ No newline at end of file
diff --git a/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java b/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java
index 567baeb214..4d0b878fd8 100644
--- a/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java
+++ b/samples/data-jc/src/test/java/samples/data/SecurityMessageRepositoryTests.java
@@ -38,36 +38,34 @@ import static org.fest.assertions.Assertions.assertThat;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = DataConfig.class)
 public class SecurityMessageRepositoryTests {
-    @Autowired
-    SecurityMessageRepository repository;
+	@Autowired
+	SecurityMessageRepository repository;
 
-    User user;
+	User user;
 
-    @Before
-    public void setup() {
-        user = new User();
-        user.setId(0L);
-        List<GrantedAuthority> authorities =
-                AuthorityUtils.createAuthorityList("ROLE_USER");
-        UsernamePasswordAuthenticationToken authentication =
-                new UsernamePasswordAuthenticationToken(user, "notused", authorities);
-        SecurityContextHolder
-                .getContext()
-                .setAuthentication(authentication);
-    }
+	@Before
+	public void setup() {
+		user = new User();
+		user.setId(0L);
+		List<GrantedAuthority> authorities = AuthorityUtils
+				.createAuthorityList("ROLE_USER");
+		UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+				user, "notused", authorities);
+		SecurityContextHolder.getContext().setAuthentication(authentication);
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void findAllOnlyToCurrentUser() {
-        Long expectedId = user.getId();
-        List<Message> messages = repository.findAll();
-        assertThat(messages.size()).isEqualTo(3);
-        for(Message m : messages) {
-            assertThat(m.getTo().getId()).isEqualTo(expectedId);
-        }
-    }
+	@Test
+	public void findAllOnlyToCurrentUser() {
+		Long expectedId = user.getId();
+		List<Message> messages = repository.findAll();
+		assertThat(messages.size()).isEqualTo(3);
+		for (Message m : messages) {
+			assertThat(m.getTo().getId()).isEqualTo(expectedId);
+		}
+	}
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/AbstractElement.java b/samples/dms-xml/src/main/java/sample/dms/AbstractElement.java
index 0448c95292..f261ac80d1 100755
--- a/samples/dms-xml/src/main/java/sample/dms/AbstractElement.java
+++ b/samples/dms-xml/src/main/java/sample/dms/AbstractElement.java
@@ -11,74 +11,76 @@ import org.springframework.util.Assert;
  *
  */
 public abstract class AbstractElement {
-    /** The name of this token (a filename or directory segment name */
-    private String name;
+	/** The name of this token (a filename or directory segment name */
+	private String name;
 
-    /** The parent of this token (a directory, or null if referring to root) */
-    private AbstractElement parent;
+	/** The parent of this token (a directory, or null if referring to root) */
+	private AbstractElement parent;
 
-    /** The database identifier for this object (null if not persisted) */
-    private Long id;
+	/** The database identifier for this object (null if not persisted) */
+	private Long id;
 
-    /**
-     * Constructor to use to represent a root element. A root element has an id of -1.
-     */
-    protected AbstractElement() {
-        this.name = "/";
-        this.parent = null;
-        this.id = new Long(-1);
-    }
+	/**
+	 * Constructor to use to represent a root element. A root element has an id of -1.
+	 */
+	protected AbstractElement() {
+		this.name = "/";
+		this.parent = null;
+		this.id = new Long(-1);
+	}
 
-    /**
-     * Constructor to use to represent a non-root element.
-     *
-     * @param name name for this element (required, cannot be "/")
-     * @param parent for this element (required, cannot be null)
-     */
-    protected AbstractElement(String name, AbstractElement parent) {
-        Assert.hasText(name, "Name required");
-        Assert.notNull(parent, "Parent required");
-        Assert.notNull(parent.getId(), "The parent must have been saved in order to create a child");
-        this.name = name;
-        this.parent = parent;
-    }
+	/**
+	 * Constructor to use to represent a non-root element.
+	 *
+	 * @param name name for this element (required, cannot be "/")
+	 * @param parent for this element (required, cannot be null)
+	 */
+	protected AbstractElement(String name, AbstractElement parent) {
+		Assert.hasText(name, "Name required");
+		Assert.notNull(parent, "Parent required");
+		Assert.notNull(parent.getId(),
+				"The parent must have been saved in order to create a child");
+		this.name = name;
+		this.parent = parent;
+	}
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    /**
-     * @return the name of this token (never null, although will be "/" if root, otherwise it won't include separators)
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * @return the name of this token (never null, although will be "/" if root, otherwise
+	 * it won't include separators)
+	 */
+	public String getName() {
+		return name;
+	}
 
-    public AbstractElement getParent() {
-        return parent;
-    }
+	public AbstractElement getParent() {
+		return parent;
+	}
 
-    /**
-     * @return the fully-qualified name of this element, including any parents
-     */
-    public String getFullName() {
-        List<String> strings = new ArrayList<String>();
-        AbstractElement currentElement = this;
-        while (currentElement != null) {
-            strings.add(0, currentElement.getName());
-            currentElement = currentElement.getParent();
-        }
+	/**
+	 * @return the fully-qualified name of this element, including any parents
+	 */
+	public String getFullName() {
+		List<String> strings = new ArrayList<String>();
+		AbstractElement currentElement = this;
+		while (currentElement != null) {
+			strings.add(0, currentElement.getName());
+			currentElement = currentElement.getParent();
+		}
 
-        StringBuilder sb = new StringBuilder();
-        String lastCharacter = null;
-        for (Iterator<String> i = strings.iterator(); i.hasNext();) {
-            String token = i.next();
-            if (!"/".equals(lastCharacter) && lastCharacter != null) {
-                sb.append("/");
-            }
-            sb.append(token);
-            lastCharacter = token.substring(token.length()-1);
-        }
-        return sb.toString();
-    }
+		StringBuilder sb = new StringBuilder();
+		String lastCharacter = null;
+		for (Iterator<String> i = strings.iterator(); i.hasNext();) {
+			String token = i.next();
+			if (!"/".equals(lastCharacter) && lastCharacter != null) {
+				sb.append("/");
+			}
+			sb.append(token);
+			lastCharacter = token.substring(token.length() - 1);
+		}
+		return sb.toString();
+	}
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java b/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
index 1407fe5015..3cf92ca6cd 100755
--- a/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
+++ b/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
@@ -10,141 +10,141 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
-
 /**
-* Populates the DMS in-memory database with document and ACL information.
-*
-* @author Ben Alex
-*/
+ * Populates the DMS in-memory database with document and ACL information.
+ *
+ * @author Ben Alex
+ */
 public class DataSourcePopulator implements InitializingBean {
-    protected static final int LEVEL_NEGATE_READ = 0;
-    protected static final int LEVEL_GRANT_READ = 1;
-    protected static final int LEVEL_GRANT_WRITE = 2;
-    protected static final int LEVEL_GRANT_ADMIN = 3;
-    protected JdbcTemplate template;
-    protected DocumentDao documentDao;
+	protected static final int LEVEL_NEGATE_READ = 0;
+	protected static final int LEVEL_GRANT_READ = 1;
+	protected static final int LEVEL_GRANT_WRITE = 2;
+	protected static final int LEVEL_GRANT_ADMIN = 3;
+	protected JdbcTemplate template;
+	protected DocumentDao documentDao;
 
-    public DataSourcePopulator(DataSource dataSource, DocumentDao documentDao) {
-       Assert.notNull(dataSource, "DataSource required");
-       Assert.notNull(documentDao, "DocumentDao required");
-       this.template = new JdbcTemplate(dataSource);
-       this.documentDao = documentDao;
-    }
+	public DataSourcePopulator(DataSource dataSource, DocumentDao documentDao) {
+		Assert.notNull(dataSource, "DataSource required");
+		Assert.notNull(documentDao, "DocumentDao required");
+		this.template = new JdbcTemplate(dataSource);
+		this.documentDao = documentDao;
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        // ACL tables
-        template.execute("CREATE TABLE ACL_SID(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,PRINCIPAL BOOLEAN NOT NULL,SID VARCHAR_IGNORECASE(100) NOT NULL,CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));");
-        template.execute("CREATE TABLE ACL_CLASS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,CLASS VARCHAR_IGNORECASE(100) NOT NULL,CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));");
-        template.execute("CREATE TABLE ACL_OBJECT_IDENTITY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,OBJECT_ID_CLASS BIGINT NOT NULL,OBJECT_ID_IDENTITY BIGINT NOT NULL,PARENT_OBJECT BIGINT,OWNER_SID BIGINT,ENTRIES_INHERITING BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY),CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID),CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));");
-        template.execute("CREATE TABLE ACL_ENTRY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL,MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL,AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER),CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
+	public void afterPropertiesSet() throws Exception {
+		// ACL tables
+		template.execute("CREATE TABLE ACL_SID(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,PRINCIPAL BOOLEAN NOT NULL,SID VARCHAR_IGNORECASE(100) NOT NULL,CONSTRAINT UNIQUE_UK_1 UNIQUE(SID,PRINCIPAL));");
+		template.execute("CREATE TABLE ACL_CLASS(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,CLASS VARCHAR_IGNORECASE(100) NOT NULL,CONSTRAINT UNIQUE_UK_2 UNIQUE(CLASS));");
+		template.execute("CREATE TABLE ACL_OBJECT_IDENTITY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,OBJECT_ID_CLASS BIGINT NOT NULL,OBJECT_ID_IDENTITY BIGINT NOT NULL,PARENT_OBJECT BIGINT,OWNER_SID BIGINT,ENTRIES_INHERITING BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_3 UNIQUE(OBJECT_ID_CLASS,OBJECT_ID_IDENTITY),CONSTRAINT FOREIGN_FK_1 FOREIGN KEY(PARENT_OBJECT)REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_2 FOREIGN KEY(OBJECT_ID_CLASS)REFERENCES ACL_CLASS(ID),CONSTRAINT FOREIGN_FK_3 FOREIGN KEY(OWNER_SID)REFERENCES ACL_SID(ID));");
+		template.execute("CREATE TABLE ACL_ENTRY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL,MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL,AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER),CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
 
-        // Normal authentication tables
-        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
-        template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
-        template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
+		// Normal authentication tables
+		template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+		template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
+		template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
 
-        // Document management system business tables
-        template.execute("CREATE TABLE DIRECTORY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, DIRECTORY_NAME VARCHAR_IGNORECASE(50) NOT NULL, PARENT_DIRECTORY_ID BIGINT)");
-        template.execute("CREATE TABLE FILE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, FILE_NAME VARCHAR_IGNORECASE(50) NOT NULL, CONTENT VARCHAR_IGNORECASE(1024), PARENT_DIRECTORY_ID BIGINT)");
+		// Document management system business tables
+		template.execute("CREATE TABLE DIRECTORY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, DIRECTORY_NAME VARCHAR_IGNORECASE(50) NOT NULL, PARENT_DIRECTORY_ID BIGINT)");
+		template.execute("CREATE TABLE FILE(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY, FILE_NAME VARCHAR_IGNORECASE(50) NOT NULL, CONTENT VARCHAR_IGNORECASE(1024), PARENT_DIRECTORY_ID BIGINT)");
 
-        // Populate the authentication and role tables
-        template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);");
-        template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);");
-        template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
-        template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
+		// Populate the authentication and role tables
+		template.execute("INSERT INTO USERS VALUES('rod','$2a$10$75pBjapg4Nl8Pzd.3JRnUe7PDJmk9qBGwNEJDAlA3V.dEJxcDKn5O',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('dianne','$2a$04$bCMEyxrdF/7sgfUiUJ6Ose2vh9DAMaVBldS1Bw2fhi1jgutZrr9zm',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('scott','$2a$06$eChwvzAu3TSexnC3ynw4LOSw1qiEbtNItNeYv5uI40w1i3paoSfLu',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('peter','$2a$04$8.H8bCMROLF4CIgd7IpeQ.tcBXLP5w8iplO0n.kCIkISwrIgX28Ii',FALSE);");
+		template.execute("INSERT INTO USERS VALUES('bill','$2a$04$8.H8bCMROLF4CIgd7IpeQ.3khQlPVNWbp8kzSQqidQHGFurim7P8O',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('bob','$2a$06$zMgxlMf01SfYNcdx7n4NpeFlAGU8apCETz/i2C7VlYWu6IcNyn4Ay',TRUE);");
+		template.execute("INSERT INTO USERS VALUES('jane','$2a$05$ZrdS7yMhCZ1J.AAidXZhCOxdjD8LO/dhlv4FJzkXA6xh9gdEbBT/u',TRUE);");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('rod','ROLE_SUPERVISOR');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('dianne','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('scott','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('peter','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bill','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('bob','ROLE_USER');");
+		template.execute("INSERT INTO AUTHORITIES VALUES('jane','ROLE_USER');");
 
-        // Now create an ACL entry for the root directory
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("rod", "ignored", AuthorityUtils.createAuthorityList(("ROLE_IGNORED"))));
+		// Now create an ACL entry for the root directory
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken("rod", "ignored", AuthorityUtils
+						.createAuthorityList(("ROLE_IGNORED"))));
 
-        addPermission(documentDao, Directory.ROOT_DIRECTORY, "ROLE_USER", LEVEL_GRANT_WRITE);
+		addPermission(documentDao, Directory.ROOT_DIRECTORY, "ROLE_USER",
+				LEVEL_GRANT_WRITE);
 
-        // Now go off and create some directories and files for our users
-        createSampleData("rod", "koala");
-        createSampleData("dianne", "emu");
-        createSampleData("scott", "wombat");
+		// Now go off and create some directories and files for our users
+		createSampleData("rod", "koala");
+		createSampleData("dianne", "emu");
+		createSampleData("scott", "wombat");
 
-    }
+	}
 
-    /**
-     * Creates a directory for the user, and a series of sub-directories. The
-     * root directory is the parent for the user directory. The sub-directories
-     * are "confidential" and "shared". The ROLE_USER will be given read and
-     * write access to "shared".
-     */
-    private void createSampleData(String username, String password) {
-        Assert.notNull(documentDao, "DocumentDao required");
-        Assert.hasText(username, "Username required");
+	/**
+	 * Creates a directory for the user, and a series of sub-directories. The root
+	 * directory is the parent for the user directory. The sub-directories are
+	 * "confidential" and "shared". The ROLE_USER will be given read and write access to
+	 * "shared".
+	 */
+	private void createSampleData(String username, String password) {
+		Assert.notNull(documentDao, "DocumentDao required");
+		Assert.hasText(username, "Username required");
 
-        Authentication auth = new UsernamePasswordAuthenticationToken(username, password);
+		Authentication auth = new UsernamePasswordAuthenticationToken(username, password);
 
-        try {
-            // Set the SecurityContextHolder ThreadLocal so any subclasses
-            // automatically know which user is operating
-            SecurityContextHolder.getContext().setAuthentication(auth);
+		try {
+			// Set the SecurityContextHolder ThreadLocal so any subclasses
+			// automatically know which user is operating
+			SecurityContextHolder.getContext().setAuthentication(auth);
 
-            // Create the home directory first
-            Directory home = new Directory(username, Directory.ROOT_DIRECTORY);
-            documentDao.create(home);
-            addPermission(documentDao, home, username, LEVEL_GRANT_ADMIN);
-            addPermission(documentDao, home, "ROLE_USER", LEVEL_GRANT_READ);
-            createFiles(documentDao, home);
+			// Create the home directory first
+			Directory home = new Directory(username, Directory.ROOT_DIRECTORY);
+			documentDao.create(home);
+			addPermission(documentDao, home, username, LEVEL_GRANT_ADMIN);
+			addPermission(documentDao, home, "ROLE_USER", LEVEL_GRANT_READ);
+			createFiles(documentDao, home);
 
-            // Now create the confidential directory
-            Directory confid = new Directory("confidential", home);
-            documentDao.create(confid);
-            addPermission(documentDao, confid, "ROLE_USER", LEVEL_NEGATE_READ);
-            createFiles(documentDao, confid);
+			// Now create the confidential directory
+			Directory confid = new Directory("confidential", home);
+			documentDao.create(confid);
+			addPermission(documentDao, confid, "ROLE_USER", LEVEL_NEGATE_READ);
+			createFiles(documentDao, confid);
 
-            // Now create the shared directory
-            Directory shared = new Directory("shared", home);
-            documentDao.create(shared);
-            addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_READ);
-            addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_WRITE);
-            createFiles(documentDao, shared);
-        } finally {
-            // Clear the SecurityContextHolder ThreadLocal so future calls are
-            // guaranteed to be clean
-            SecurityContextHolder.clearContext();
-        }
-    }
+			// Now create the shared directory
+			Directory shared = new Directory("shared", home);
+			documentDao.create(shared);
+			addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_READ);
+			addPermission(documentDao, shared, "ROLE_USER", LEVEL_GRANT_WRITE);
+			createFiles(documentDao, shared);
+		}
+		finally {
+			// Clear the SecurityContextHolder ThreadLocal so future calls are
+			// guaranteed to be clean
+			SecurityContextHolder.clearContext();
+		}
+	}
 
-    private void createFiles(DocumentDao documentDao, Directory parent) {
-        Assert.notNull(documentDao, "DocumentDao required");
-        Assert.notNull(parent, "Parent required");
-        int countBeforeInsert = documentDao.findElements(parent).length;
-        for (int i = 0; i < 10; i++) {
-            File file = new File("file_" + i + ".txt", parent);
-            documentDao.create(file);
-        }
-        Assert.isTrue(countBeforeInsert + 10 == documentDao.findElements(parent).length,
-                "Failed to increase count by 10");
-    }
+	private void createFiles(DocumentDao documentDao, Directory parent) {
+		Assert.notNull(documentDao, "DocumentDao required");
+		Assert.notNull(parent, "Parent required");
+		int countBeforeInsert = documentDao.findElements(parent).length;
+		for (int i = 0; i < 10; i++) {
+			File file = new File("file_" + i + ".txt", parent);
+			documentDao.create(file);
+		}
+		Assert.isTrue(countBeforeInsert + 10 == documentDao.findElements(parent).length,
+				"Failed to increase count by 10");
+	}
 
-    /**
-     * Allows subclass to add permissions.
-     *
-     * @param documentDao
-     *            that will presumably offer methods to enable the operation to
-     *            be completed
-     * @param element
-     *            to the subject of the new permissions
-     * @param recipient
-     *            to receive permission (if it starts with ROLE_ it is assumed
-     *            to be a GrantedAuthority, else it is a username)
-     * @param level
-     *            based on the static final integer fields on this class
-     */
-    protected void addPermission(DocumentDao documentDao, AbstractElement element, String recipient, int level) {
-    }
+	/**
+	 * Allows subclass to add permissions.
+	 *
+	 * @param documentDao that will presumably offer methods to enable the operation to be
+	 * completed
+	 * @param element to the subject of the new permissions
+	 * @param recipient to receive permission (if it starts with ROLE_ it is assumed to be
+	 * a GrantedAuthority, else it is a username)
+	 * @param level based on the static final integer fields on this class
+	 */
+	protected void addPermission(DocumentDao documentDao, AbstractElement element,
+			String recipient, int level) {
+	}
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/Directory.java b/samples/dms-xml/src/main/java/sample/dms/Directory.java
index 8a3ea5cbf5..440484555f 100755
--- a/samples/dms-xml/src/main/java/sample/dms/Directory.java
+++ b/samples/dms-xml/src/main/java/sample/dms/Directory.java
@@ -6,18 +6,19 @@ package sample.dms;
  *
  */
 public class Directory extends AbstractElement {
-    public static final Directory ROOT_DIRECTORY = new Directory();
+	public static final Directory ROOT_DIRECTORY = new Directory();
 
-    private Directory() {
-        super();
-    }
+	private Directory() {
+		super();
+	}
 
-    public Directory(String name, Directory parent) {
-        super(name, parent);
-    }
+	public Directory(String name, Directory parent) {
+		super(name, parent);
+	}
 
-    public String toString() {
-        return "Directory[fullName='" + getFullName() + "'; name='" + getName() + "'; id='" + getId() + "'; parent='" + getParent() + "']";
-    }
+	public String toString() {
+		return "Directory[fullName='" + getFullName() + "'; name='" + getName()
+				+ "'; id='" + getId() + "'; parent='" + getParent() + "']";
+	}
 
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/DocumentDao.java b/samples/dms-xml/src/main/java/sample/dms/DocumentDao.java
index 7a2e98eda9..89b9acb3b7 100755
--- a/samples/dms-xml/src/main/java/sample/dms/DocumentDao.java
+++ b/samples/dms-xml/src/main/java/sample/dms/DocumentDao.java
@@ -1,38 +1,40 @@
 package sample.dms;
 
-
 /**
  *
  * @author Ben Alex
  *
  */
 public interface DocumentDao {
-    /**
-     * Creates an entry in the database for the element.
-     *
-     * @param element an unsaved element (the "id" will be updated after method is invoked)
-     */
-    public void create(AbstractElement element);
+	/**
+	 * Creates an entry in the database for the element.
+	 *
+	 * @param element an unsaved element (the "id" will be updated after method is
+	 * invoked)
+	 */
+	public void create(AbstractElement element);
 
-    /**
-     * Removes a file from the database for the specified element.
-     *
-     * @param file the file to remove (cannot be null)
-     */
-    public void delete(File file);
+	/**
+	 * Removes a file from the database for the specified element.
+	 *
+	 * @param file the file to remove (cannot be null)
+	 */
+	public void delete(File file);
 
-    /**
-     * Modifies a file in the database.
-     *
-     * @param file the file to update (cannot be null)
-     */
-    public void update(File file);
+	/**
+	 * Modifies a file in the database.
+	 *
+	 * @param file the file to update (cannot be null)
+	 */
+	public void update(File file);
 
-    /**
-     * Locates elements in the database which appear under the presented directory
-     *
-     * @param directory the directory (cannot be null - use {@link Directory#ROOT_DIRECTORY} for root)
-     * @return zero or more elements in the directory (an empty array may be returned - never null)
-     */
-    public AbstractElement[] findElements(Directory directory);
+	/**
+	 * Locates elements in the database which appear under the presented directory
+	 *
+	 * @param directory the directory (cannot be null - use
+	 * {@link Directory#ROOT_DIRECTORY} for root)
+	 * @return zero or more elements in the directory (an empty array may be returned -
+	 * never null)
+	 */
+	public AbstractElement[] findElements(Directory directory);
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java b/samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java
index d706e0647c..603acc6dee 100755
--- a/samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java
+++ b/samples/dms-xml/src/main/java/sample/dms/DocumentDaoImpl.java
@@ -17,98 +17,122 @@ import org.springframework.util.Assert;
  */
 public class DocumentDaoImpl extends JdbcDaoSupport implements DocumentDao {
 
-    private static final String INSERT_INTO_DIRECTORY = "insert into directory(directory_name, parent_directory_id) values (?,?)";
-    private static final String INSERT_INTO_FILE = "insert into file(file_name, content, parent_directory_id) values (?,?,?)";
-    private static final String SELECT_FROM_DIRECTORY = "select id from directory where parent_directory_id = ?";
-    private static final String SELECT_FROM_DIRECTORY_NULL = "select id from directory where parent_directory_id is null";
-    private static final String SELECT_FROM_FILE = "select id, file_name, content, parent_directory_id from file where parent_directory_id = ?";
-    private static final String SELECT_FROM_DIRECTORY_SINGLE = "select id, directory_name, parent_directory_id from directory where id = ?";
-    private static final String DELETE_FROM_FILE = "delete from file where id = ?";
-    private static final String UPDATE_FILE = "update file set content = ? where id = ?";
-    private static final String SELECT_IDENTITY = "call identity()";
+	private static final String INSERT_INTO_DIRECTORY = "insert into directory(directory_name, parent_directory_id) values (?,?)";
+	private static final String INSERT_INTO_FILE = "insert into file(file_name, content, parent_directory_id) values (?,?,?)";
+	private static final String SELECT_FROM_DIRECTORY = "select id from directory where parent_directory_id = ?";
+	private static final String SELECT_FROM_DIRECTORY_NULL = "select id from directory where parent_directory_id is null";
+	private static final String SELECT_FROM_FILE = "select id, file_name, content, parent_directory_id from file where parent_directory_id = ?";
+	private static final String SELECT_FROM_DIRECTORY_SINGLE = "select id, directory_name, parent_directory_id from directory where id = ?";
+	private static final String DELETE_FROM_FILE = "delete from file where id = ?";
+	private static final String UPDATE_FILE = "update file set content = ? where id = ?";
+	private static final String SELECT_IDENTITY = "call identity()";
 
-    private Long obtainPrimaryKey() {
-        Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(), "Transaction must be running");
-        return new Long(getJdbcTemplate().queryForLong(SELECT_IDENTITY));
-    }
+	private Long obtainPrimaryKey() {
+		Assert.isTrue(TransactionSynchronizationManager.isSynchronizationActive(),
+				"Transaction must be running");
+		return new Long(getJdbcTemplate().queryForLong(SELECT_IDENTITY));
+	}
 
-    public void create(AbstractElement element) {
-        Assert.notNull(element, "Element required");
-        Assert.isNull(element.getId(), "Element has previously been saved");
-        if (element instanceof Directory) {
-            Directory directory = (Directory) element;
-            Long parentId = directory.getParent() == null ? null : directory.getParent().getId();
-            getJdbcTemplate().update(INSERT_INTO_DIRECTORY, new Object[] {directory.getName(), parentId});
-            FieldUtils.setProtectedFieldValue("id", directory, obtainPrimaryKey());
-        } else if (element instanceof File) {
-            File file = (File) element;
-            Long parentId = file.getParent() == null ? null : file.getParent().getId();
-            getJdbcTemplate().update(INSERT_INTO_FILE, new Object[] {file.getName(), file.getContent(), parentId});
-            FieldUtils.setProtectedFieldValue("id", file, obtainPrimaryKey());
-        } else {
-            throw new IllegalArgumentException("Unsupported AbstractElement");
-        }
-    }
+	public void create(AbstractElement element) {
+		Assert.notNull(element, "Element required");
+		Assert.isNull(element.getId(), "Element has previously been saved");
+		if (element instanceof Directory) {
+			Directory directory = (Directory) element;
+			Long parentId = directory.getParent() == null ? null : directory.getParent()
+					.getId();
+			getJdbcTemplate().update(INSERT_INTO_DIRECTORY,
+					new Object[] { directory.getName(), parentId });
+			FieldUtils.setProtectedFieldValue("id", directory, obtainPrimaryKey());
+		}
+		else if (element instanceof File) {
+			File file = (File) element;
+			Long parentId = file.getParent() == null ? null : file.getParent().getId();
+			getJdbcTemplate().update(INSERT_INTO_FILE,
+					new Object[] { file.getName(), file.getContent(), parentId });
+			FieldUtils.setProtectedFieldValue("id", file, obtainPrimaryKey());
+		}
+		else {
+			throw new IllegalArgumentException("Unsupported AbstractElement");
+		}
+	}
 
-    public void delete(File file) {
-        Assert.notNull(file, "File required");
-        Assert.notNull(file.getId(), "File ID required");
-        getJdbcTemplate().update(DELETE_FROM_FILE, new Object[] {file.getId()});
-    }
+	public void delete(File file) {
+		Assert.notNull(file, "File required");
+		Assert.notNull(file.getId(), "File ID required");
+		getJdbcTemplate().update(DELETE_FROM_FILE, new Object[] { file.getId() });
+	}
 
-    /** Executes recursive SQL as needed to build a full Directory hierarchy of objects */
-    private Directory getDirectoryWithImmediateParentPopulated(final Long id) {
-        return getJdbcTemplate().queryForObject(SELECT_FROM_DIRECTORY_SINGLE, new Object[] {id}, new RowMapper<Directory>() {
-            public Directory mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                Long parentDirectoryId = new Long(rs.getLong("parent_directory_id"));
-                Directory parentDirectory = Directory.ROOT_DIRECTORY;
-                if (parentDirectoryId != null && !parentDirectoryId.equals(new Long(-1))) {
-                    // Need to go and lookup the parent, so do that first
-                    parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId);
-                }
-                Directory directory = new Directory(rs.getString("directory_name"), parentDirectory);
-                FieldUtils.setProtectedFieldValue("id", directory, new Long(rs.getLong("id")));
-                return directory;
-            }
-        });
-    }
+	/** Executes recursive SQL as needed to build a full Directory hierarchy of objects */
+	private Directory getDirectoryWithImmediateParentPopulated(final Long id) {
+		return getJdbcTemplate().queryForObject(SELECT_FROM_DIRECTORY_SINGLE,
+				new Object[] { id }, new RowMapper<Directory>() {
+					public Directory mapRow(ResultSet rs, int rowNumber)
+							throws SQLException {
+						Long parentDirectoryId = new Long(rs
+								.getLong("parent_directory_id"));
+						Directory parentDirectory = Directory.ROOT_DIRECTORY;
+						if (parentDirectoryId != null
+								&& !parentDirectoryId.equals(new Long(-1))) {
+							// Need to go and lookup the parent, so do that first
+							parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId);
+						}
+						Directory directory = new Directory(rs
+								.getString("directory_name"), parentDirectory);
+						FieldUtils.setProtectedFieldValue("id", directory,
+								new Long(rs.getLong("id")));
+						return directory;
+					}
+				});
+	}
 
-    public AbstractElement[] findElements(Directory directory) {
-        Assert.notNull(directory, "Directory required (the ID can be null to refer to root)");
-        if (directory.getId() == null) {
-            List<Directory> directories = getJdbcTemplate().query(SELECT_FROM_DIRECTORY_NULL, new RowMapper<Directory>() {
-                public Directory mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                    return getDirectoryWithImmediateParentPopulated(new Long(rs.getLong("id")));
-                }
-            });
-            return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
-        }
-        List<AbstractElement> directories = getJdbcTemplate().query(SELECT_FROM_DIRECTORY, new Object[] {directory.getId()}, new RowMapper<AbstractElement>() {
-            public Directory mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                return getDirectoryWithImmediateParentPopulated(new Long(rs.getLong("id")));
-            }
-        });
-        List<File> files = getJdbcTemplate().query(SELECT_FROM_FILE, new Object[] {directory.getId()}, new RowMapper<File>() {
-            public File mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                Long parentDirectoryId = new Long(rs.getLong("parent_directory_id"));
-                Directory parentDirectory = null;
-                if (parentDirectoryId != null) {
-                    parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId);
-                }
-                File file = new File(rs.getString("file_name"), parentDirectory);
-                FieldUtils.setProtectedFieldValue("id", file, new Long(rs.getLong("id")));
-                return file;
-            }
-        });
-        // Add the File elements after the Directory elements
-        directories.addAll(files);
-        return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
-    }
+	public AbstractElement[] findElements(Directory directory) {
+		Assert.notNull(directory,
+				"Directory required (the ID can be null to refer to root)");
+		if (directory.getId() == null) {
+			List<Directory> directories = getJdbcTemplate().query(
+					SELECT_FROM_DIRECTORY_NULL, new RowMapper<Directory>() {
+						public Directory mapRow(ResultSet rs, int rowNumber)
+								throws SQLException {
+							return getDirectoryWithImmediateParentPopulated(new Long(rs
+									.getLong("id")));
+						}
+					});
+			return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
+		}
+		List<AbstractElement> directories = getJdbcTemplate().query(
+				SELECT_FROM_DIRECTORY, new Object[] { directory.getId() },
+				new RowMapper<AbstractElement>() {
+					public Directory mapRow(ResultSet rs, int rowNumber)
+							throws SQLException {
+						return getDirectoryWithImmediateParentPopulated(new Long(rs
+								.getLong("id")));
+					}
+				});
+		List<File> files = getJdbcTemplate().query(SELECT_FROM_FILE,
+				new Object[] { directory.getId() }, new RowMapper<File>() {
+					public File mapRow(ResultSet rs, int rowNumber) throws SQLException {
+						Long parentDirectoryId = new Long(rs
+								.getLong("parent_directory_id"));
+						Directory parentDirectory = null;
+						if (parentDirectoryId != null) {
+							parentDirectory = getDirectoryWithImmediateParentPopulated(parentDirectoryId);
+						}
+						File file = new File(rs.getString("file_name"), parentDirectory);
+						FieldUtils.setProtectedFieldValue("id", file,
+								new Long(rs.getLong("id")));
+						return file;
+					}
+				});
+		// Add the File elements after the Directory elements
+		directories.addAll(files);
+		return (AbstractElement[]) directories.toArray(new AbstractElement[] {});
+	}
 
-    public void update(File file) {
-        Assert.notNull(file, "File required");
-        Assert.notNull(file.getId(), "File ID required");
-        getJdbcTemplate().update(UPDATE_FILE, new Object[] {file.getContent(), file.getId()});
-    }
+	public void update(File file) {
+		Assert.notNull(file, "File required");
+		Assert.notNull(file.getId(), "File ID required");
+		getJdbcTemplate().update(UPDATE_FILE,
+				new Object[] { file.getContent(), file.getId() });
+	}
 
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/File.java b/samples/dms-xml/src/main/java/sample/dms/File.java
index 3ebcf86124..dfd70eb102 100755
--- a/samples/dms-xml/src/main/java/sample/dms/File.java
+++ b/samples/dms-xml/src/main/java/sample/dms/File.java
@@ -2,30 +2,32 @@ package sample.dms;
 
 import org.springframework.util.Assert;
 
-
 /**
  *
  * @author Ben Alex
  */
 public class File extends AbstractElement {
-    /** Content of the file, which can be null */
-    private String content;
+	/** Content of the file, which can be null */
+	private String content;
 
-    public File(String name, Directory parent) {
-        super(name, parent);
-        Assert.isTrue(!parent.equals(Directory.ROOT_DIRECTORY), "Cannot insert File into root directory");
-    }
+	public File(String name, Directory parent) {
+		super(name, parent);
+		Assert.isTrue(!parent.equals(Directory.ROOT_DIRECTORY),
+				"Cannot insert File into root directory");
+	}
 
-    public String getContent() {
-        return content;
-    }
+	public String getContent() {
+		return content;
+	}
 
-    public void setContent(String content) {
-        this.content = content;
-    }
+	public void setContent(String content) {
+		this.content = content;
+	}
 
-    public String toString() {
-        return "File[fullName='" + getFullName() + "'; name='" + getName() + "'; id='" + getId() + "'; content=" + getContent() + "'; parent='" + getParent() + "']";
-    }
+	public String toString() {
+		return "File[fullName='" + getFullName() + "'; name='" + getName() + "'; id='"
+				+ getId() + "'; content=" + getContent() + "'; parent='" + getParent()
+				+ "']";
+	}
 
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java
index d21e301a59..b864ce3c72 100755
--- a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java
+++ b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDataSourcePopulator.java
@@ -21,67 +21,82 @@ import sample.dms.DocumentDao;
 
 public class SecureDataSourcePopulator extends DataSourcePopulator {
 
-    private MutableAclService aclService;
+	private MutableAclService aclService;
 
-    public SecureDataSourcePopulator(DataSource dataSource, SecureDocumentDao documentDao, MutableAclService aclService) {
-        super(dataSource, documentDao);
-        Assert.notNull(aclService, "MutableAclService required");
-        this.aclService = aclService;
-    }
+	public SecureDataSourcePopulator(DataSource dataSource,
+			SecureDocumentDao documentDao, MutableAclService aclService) {
+		super(dataSource, documentDao);
+		Assert.notNull(aclService, "MutableAclService required");
+		this.aclService = aclService;
+	}
 
-    protected void addPermission(DocumentDao documentDao, AbstractElement element, String recipient, int level) {
-        Assert.notNull(documentDao, "DocumentDao required");
-        Assert.isInstanceOf(SecureDocumentDao.class, documentDao, "DocumentDao should have been a SecureDocumentDao");
-        Assert.notNull(element, "Element required");
-        Assert.hasText(recipient, "Recipient required");
-        Assert.notNull(SecurityContextHolder.getContext().getAuthentication(), "SecurityContextHolder must contain an Authentication");
+	protected void addPermission(DocumentDao documentDao, AbstractElement element,
+			String recipient, int level) {
+		Assert.notNull(documentDao, "DocumentDao required");
+		Assert.isInstanceOf(SecureDocumentDao.class, documentDao,
+				"DocumentDao should have been a SecureDocumentDao");
+		Assert.notNull(element, "Element required");
+		Assert.hasText(recipient, "Recipient required");
+		Assert.notNull(SecurityContextHolder.getContext().getAuthentication(),
+				"SecurityContextHolder must contain an Authentication");
 
-        // We need SecureDocumentDao to assign different permissions
-        //SecureDocumentDao dao = (SecureDocumentDao) documentDao;
+		// We need SecureDocumentDao to assign different permissions
+		// SecureDocumentDao dao = (SecureDocumentDao) documentDao;
 
-        // We need to construct an ACL-specific Sid. Note the prefix contract is defined on the superclass method's JavaDocs
-        Sid sid = null;
-        if (recipient.startsWith("ROLE_")) {
-            sid = new GrantedAuthoritySid(recipient);
-        } else {
-            sid = new PrincipalSid(recipient);
-        }
+		// We need to construct an ACL-specific Sid. Note the prefix contract is defined
+		// on the superclass method's JavaDocs
+		Sid sid = null;
+		if (recipient.startsWith("ROLE_")) {
+			sid = new GrantedAuthoritySid(recipient);
+		}
+		else {
+			sid = new PrincipalSid(recipient);
+		}
 
-        // We need to identify the target domain object and create an ObjectIdentity for it
-        // This works because AbstractElement has a "getId()" method
-        ObjectIdentity identity = new ObjectIdentityImpl(element);
-        // ObjectIdentity identity = new ObjectIdentityImpl(element.getClass(), element.getId()); // equivalent
+		// We need to identify the target domain object and create an ObjectIdentity for
+		// it
+		// This works because AbstractElement has a "getId()" method
+		ObjectIdentity identity = new ObjectIdentityImpl(element);
+		// ObjectIdentity identity = new ObjectIdentityImpl(element.getClass(),
+		// element.getId()); // equivalent
 
-        // Next we need to create a Permission
-        Permission permission = null;
-        if (level == LEVEL_NEGATE_READ || level == LEVEL_GRANT_READ) {
-            permission = BasePermission.READ;
-        } else if (level == LEVEL_GRANT_WRITE) {
-            permission = BasePermission.WRITE;
-        } else if (level == LEVEL_GRANT_ADMIN) {
-            permission = BasePermission.ADMINISTRATION;
-        } else {
-            throw new IllegalArgumentException("Unsupported LEVEL_");
-        }
+		// Next we need to create a Permission
+		Permission permission = null;
+		if (level == LEVEL_NEGATE_READ || level == LEVEL_GRANT_READ) {
+			permission = BasePermission.READ;
+		}
+		else if (level == LEVEL_GRANT_WRITE) {
+			permission = BasePermission.WRITE;
+		}
+		else if (level == LEVEL_GRANT_ADMIN) {
+			permission = BasePermission.ADMINISTRATION;
+		}
+		else {
+			throw new IllegalArgumentException("Unsupported LEVEL_");
+		}
 
-        // Attempt to retrieve the existing ACL, creating an ACL if it doesn't already exist for this ObjectIdentity
-        MutableAcl acl = null;
-        try {
-            acl = (MutableAcl) aclService.readAclById(identity);
-        } catch (NotFoundException nfe) {
-            acl = aclService.createAcl(identity);
-            Assert.notNull(acl, "Acl could not be retrieved or created");
-        }
+		// Attempt to retrieve the existing ACL, creating an ACL if it doesn't already
+		// exist for this ObjectIdentity
+		MutableAcl acl = null;
+		try {
+			acl = (MutableAcl) aclService.readAclById(identity);
+		}
+		catch (NotFoundException nfe) {
+			acl = aclService.createAcl(identity);
+			Assert.notNull(acl, "Acl could not be retrieved or created");
+		}
 
-        // Now we have an ACL, add another ACE to it
-        if (level == LEVEL_NEGATE_READ) {
-            acl.insertAce(acl.getEntries().size(), permission, sid, false); // not granting
-        } else {
-            acl.insertAce(acl.getEntries().size(), permission, sid, true); // granting
-        }
+		// Now we have an ACL, add another ACE to it
+		if (level == LEVEL_NEGATE_READ) {
+			acl.insertAce(acl.getEntries().size(), permission, sid, false); // not
+																			// granting
+		}
+		else {
+			acl.insertAce(acl.getEntries().size(), permission, sid, true); // granting
+		}
 
-        // Finally, persist the modified ACL
-        aclService.updateAcl(acl);
-    }
+		// Finally, persist the modified ACL
+		aclService.updateAcl(acl);
+	}
 
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java
index af0e3f16aa..b9767546d0 100755
--- a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java
+++ b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDao.java
@@ -9,8 +9,8 @@ import sample.dms.DocumentDao;
  *
  */
 public interface SecureDocumentDao extends DocumentDao {
-    /**
-     * @return all the usernames existing in the system.
-     */
-    public String[] getUsers();
+	/**
+	 * @return all the usernames existing in the system.
+	 */
+	public String[] getUsers();
 }
diff --git a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java
index f1d78bdf98..3b44cda834 100755
--- a/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java
+++ b/samples/dms-xml/src/main/java/sample/dms/secured/SecureDocumentDaoImpl.java
@@ -24,37 +24,42 @@ import sample.dms.DocumentDaoImpl;
  */
 public class SecureDocumentDaoImpl extends DocumentDaoImpl implements SecureDocumentDao {
 
-    private static final String SELECT_FROM_USERS = "SELECT USERNAME FROM USERS ORDER BY USERNAME";
-    private MutableAclService mutableAclService;
+	private static final String SELECT_FROM_USERS = "SELECT USERNAME FROM USERS ORDER BY USERNAME";
+	private MutableAclService mutableAclService;
 
-    public SecureDocumentDaoImpl(MutableAclService mutableAclService) {
-        Assert.notNull(mutableAclService, "MutableAclService required");
-        this.mutableAclService = mutableAclService;
-    }
+	public SecureDocumentDaoImpl(MutableAclService mutableAclService) {
+		Assert.notNull(mutableAclService, "MutableAclService required");
+		this.mutableAclService = mutableAclService;
+	}
 
-    public String[] getUsers() {
-        return (String[]) getJdbcTemplate().query(SELECT_FROM_USERS, new RowMapper<String>() {
-            public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
-                return rs.getString("USERNAME");
-            }
-        }).toArray(new String[] {});
-    }
+	public String[] getUsers() {
+		return (String[]) getJdbcTemplate().query(SELECT_FROM_USERS,
+				new RowMapper<String>() {
+					public String mapRow(ResultSet rs, int rowNumber) throws SQLException {
+						return rs.getString("USERNAME");
+					}
+				}).toArray(new String[] {});
+	}
 
-    public void create(AbstractElement element) {
-        super.create(element);
+	public void create(AbstractElement element) {
+		super.create(element);
 
-        // Create an ACL identity for this element
-        ObjectIdentity identity = new ObjectIdentityImpl(element);
-        MutableAcl acl = mutableAclService.createAcl(identity);
+		// Create an ACL identity for this element
+		ObjectIdentity identity = new ObjectIdentityImpl(element);
+		MutableAcl acl = mutableAclService.createAcl(identity);
 
-        // If the AbstractElement has a parent, go and retrieve its identity (it should already exist)
-        if (element.getParent() != null) {
-            ObjectIdentity parentIdentity = new ObjectIdentityImpl(element.getParent());
-            MutableAcl aclParent = (MutableAcl) mutableAclService.readAclById(parentIdentity);
-            acl.setParent(aclParent);
-        }
-        acl.insertAce(acl.getEntries().size(), BasePermission.ADMINISTRATION, new PrincipalSid(SecurityContextHolder.getContext().getAuthentication()), true);
+		// If the AbstractElement has a parent, go and retrieve its identity (it should
+		// already exist)
+		if (element.getParent() != null) {
+			ObjectIdentity parentIdentity = new ObjectIdentityImpl(element.getParent());
+			MutableAcl aclParent = (MutableAcl) mutableAclService
+					.readAclById(parentIdentity);
+			acl.setParent(aclParent);
+		}
+		acl.insertAce(acl.getEntries().size(), BasePermission.ADMINISTRATION,
+				new PrincipalSid(SecurityContextHolder.getContext().getAuthentication()),
+				true);
 
-        mutableAclService.updateAcl(acl);
-    }
+		mutableAclService.updateAcl(acl);
+	}
 }
diff --git a/samples/dms-xml/src/test/java/DmsIntegrationTests.java b/samples/dms-xml/src/test/java/DmsIntegrationTests.java
index 5dc90ac67b..d355f19bf1 100755
--- a/samples/dms-xml/src/test/java/DmsIntegrationTests.java
+++ b/samples/dms-xml/src/test/java/DmsIntegrationTests.java
@@ -19,86 +19,104 @@ import sample.dms.DocumentDao;
  * @author Ben Alex
  *
  */
-@ContextConfiguration(locations={"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-insecure.xml"})
-public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContextTests{
+@ContextConfiguration(locations = { "classpath:applicationContext-dms-shared.xml",
+		"classpath:applicationContext-dms-insecure.xml" })
+public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContextTests {
 
-    @Autowired
-    protected JdbcTemplate jdbcTemplate;
+	@Autowired
+	protected JdbcTemplate jdbcTemplate;
 
-    @Autowired
-    protected DocumentDao documentDao;
+	@Autowired
+	protected DocumentDao documentDao;
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    public void setDocumentDao(DocumentDao documentDao) {
-        this.documentDao = documentDao;
-    }
+	public void setDocumentDao(DocumentDao documentDao) {
+		this.documentDao = documentDao;
+	}
 
-    @Test
-    public void testBasePopulation() {
-        assertEquals(9, jdbcTemplate.queryForInt("select count(id) from DIRECTORY"));
-        assertEquals(90, jdbcTemplate.queryForInt("select count(id) from FILE"));
-        assertEquals(3, documentDao.findElements(Directory.ROOT_DIRECTORY).length);
-    }
+	@Test
+	public void testBasePopulation() {
+		assertEquals(9, jdbcTemplate.queryForInt("select count(id) from DIRECTORY"));
+		assertEquals(90, jdbcTemplate.queryForInt("select count(id) from FILE"));
+		assertEquals(3, documentDao.findElements(Directory.ROOT_DIRECTORY).length);
+	}
 
-    @Test
-    public void testMarissaRetrieval() {
-        process("rod", "koala", false);
-    }
+	@Test
+	public void testMarissaRetrieval() {
+		process("rod", "koala", false);
+	}
 
-    @Test
-    public void testScottRetrieval() {
-        process("scott", "wombat", false);
-    }
+	@Test
+	public void testScottRetrieval() {
+		process("scott", "wombat", false);
+	}
 
-    @Test
-    public void testDianneRetrieval() {
-        process("dianne", "emu", false);
-    }
+	@Test
+	public void testDianneRetrieval() {
+		process("dianne", "emu", false);
+	}
 
-    protected void process(String username, String password, boolean shouldBeFiltered) {
-        SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(username, password));
-        System.out.println("------ Test for username: " + username + " ------");
-        AbstractElement[] rootElements = documentDao.findElements(Directory.ROOT_DIRECTORY);
-        assertEquals(3, rootElements.length);
-        Directory homeDir = null;
-        Directory nonHomeDir = null;
-        for (int i = 0; i < rootElements.length; i++) {
-            if (rootElements[i].getName().equals(username)) {
-                homeDir = (Directory) rootElements[i];
-            } else {
-                nonHomeDir = (Directory) rootElements[i];
-            }
-        }
-        System.out.println("Home directory......: " + homeDir.getFullName());
-        System.out.println("Non-home directory..: " + nonHomeDir.getFullName());
+	protected void process(String username, String password, boolean shouldBeFiltered) {
+		SecurityContextHolder.getContext().setAuthentication(
+				new UsernamePasswordAuthenticationToken(username, password));
+		System.out.println("------ Test for username: " + username + " ------");
+		AbstractElement[] rootElements = documentDao
+				.findElements(Directory.ROOT_DIRECTORY);
+		assertEquals(3, rootElements.length);
+		Directory homeDir = null;
+		Directory nonHomeDir = null;
+		for (int i = 0; i < rootElements.length; i++) {
+			if (rootElements[i].getName().equals(username)) {
+				homeDir = (Directory) rootElements[i];
+			}
+			else {
+				nonHomeDir = (Directory) rootElements[i];
+			}
+		}
+		System.out.println("Home directory......: " + homeDir.getFullName());
+		System.out.println("Non-home directory..: " + nonHomeDir.getFullName());
 
-        AbstractElement[] homeElements = documentDao.findElements(homeDir);
-        assertEquals(12, homeElements.length); // confidential and shared directories, plus 10 files
+		AbstractElement[] homeElements = documentDao.findElements(homeDir);
+		assertEquals(12, homeElements.length); // confidential and shared directories,
+												// plus 10 files
 
-        AbstractElement[] nonHomeElements = documentDao.findElements(nonHomeDir);
-        assertEquals(shouldBeFiltered ? 11 : 12, nonHomeElements.length); // cannot see the user's "confidential" sub-directory when filtering
+		AbstractElement[] nonHomeElements = documentDao.findElements(nonHomeDir);
+		assertEquals(shouldBeFiltered ? 11 : 12, nonHomeElements.length); // cannot see
+																			// the user's
+																			// "confidential"
+																			// sub-directory
+																			// when
+																			// filtering
 
-        // Attempt to read the other user's confidential directory from the returned results
-        // Of course, we shouldn't find a "confidential" directory in the results if we're filtering
-        Directory nonHomeConfidentialDir = null;
-        for (int i = 0; i < nonHomeElements.length; i++) {
-            if (nonHomeElements[i].getName().equals("confidential")) {
-                nonHomeConfidentialDir = (Directory) nonHomeElements[i];
-            }
-        }
+		// Attempt to read the other user's confidential directory from the returned
+		// results
+		// Of course, we shouldn't find a "confidential" directory in the results if we're
+		// filtering
+		Directory nonHomeConfidentialDir = null;
+		for (int i = 0; i < nonHomeElements.length; i++) {
+			if (nonHomeElements[i].getName().equals("confidential")) {
+				nonHomeConfidentialDir = (Directory) nonHomeElements[i];
+			}
+		}
 
-        if (shouldBeFiltered) {
-            assertNull("Found confidential directory when we should not have", nonHomeConfidentialDir);
-        } else {
-            System.out.println("Inaccessible dir....: " + nonHomeConfidentialDir.getFullName());
-            assertEquals(10, documentDao.findElements(nonHomeConfidentialDir).length); // 10 files (no sub-directories)
-        }
+		if (shouldBeFiltered) {
+			assertNull("Found confidential directory when we should not have",
+					nonHomeConfidentialDir);
+		}
+		else {
+			System.out.println("Inaccessible dir....: "
+					+ nonHomeConfidentialDir.getFullName());
+			assertEquals(10, documentDao.findElements(nonHomeConfidentialDir).length); // 10
+																						// files
+																						// (no
+																						// sub-directories)
+		}
 
-        SecurityContextHolder.clearContext();
-    }
+		SecurityContextHolder.clearContext();
+	}
 
 }
diff --git a/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java b/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java
index cf6c549685..5c6976cda9 100755
--- a/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java
+++ b/samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java
@@ -3,37 +3,41 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 
-
-
 /**
  * Basic integration test for DMS sample when security has been added.
  *
  * @author Ben Alex
  *
  */
-@ContextConfiguration(locations={"classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-secure.xml"})
+@ContextConfiguration(locations = { "classpath:applicationContext-dms-shared.xml",
+		"classpath:applicationContext-dms-secure.xml" })
 public class SecureDmsIntegrationTests extends DmsIntegrationTests {
 
-    @Test
-    public void testBasePopulation() {
-        assertEquals(9, jdbcTemplate.queryForInt("select count(id) from DIRECTORY"));
-        assertEquals(90, jdbcTemplate.queryForInt("select count(id) from FILE"));
-        assertEquals(4, jdbcTemplate.queryForInt("select count(id) from ACL_SID")); // 3 users + 1 role
-        assertEquals(2, jdbcTemplate.queryForInt("select count(id) from ACL_CLASS")); // Directory and File
-        assertEquals(100, jdbcTemplate.queryForInt("select count(id) from ACL_OBJECT_IDENTITY"));
-        assertEquals(115, jdbcTemplate.queryForInt("select count(id) from ACL_ENTRY"));
-    }
+	@Test
+	public void testBasePopulation() {
+		assertEquals(9, jdbcTemplate.queryForInt("select count(id) from DIRECTORY"));
+		assertEquals(90, jdbcTemplate.queryForInt("select count(id) from FILE"));
+		assertEquals(4, jdbcTemplate.queryForInt("select count(id) from ACL_SID")); // 3
+																					// users
+																					// + 1
+																					// role
+		assertEquals(2, jdbcTemplate.queryForInt("select count(id) from ACL_CLASS")); // Directory
+																						// and
+																						// File
+		assertEquals(100,
+				jdbcTemplate.queryForInt("select count(id) from ACL_OBJECT_IDENTITY"));
+		assertEquals(115, jdbcTemplate.queryForInt("select count(id) from ACL_ENTRY"));
+	}
 
-    public void testMarissaRetrieval() {
-        process("rod", "koala", true);
-    }
+	public void testMarissaRetrieval() {
+		process("rod", "koala", true);
+	}
 
+	public void testScottRetrieval() {
+		process("scott", "wombat", true);
+	}
 
-    public void testScottRetrieval() {
-        process("scott", "wombat", true);
-    }
-
-    public void testDianneRetrieval() {
-        process("dianne", "emu", true);
-    }
+	public void testDianneRetrieval() {
+		process("dianne", "emu", true);
+	}
 }
diff --git a/samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/form-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index dbd1c82db7..573ab40e77 100644
--- a/samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/form-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,7 +1,6 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -10,26 +9,30 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .antMatchers("/resources/**").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin()
-                .loginPage("/login")
-                .permitAll()
-                .and()
-            .logout()
-                .permitAll();
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.antMatchers("/resources/**").permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin()
+				.loginPage("/login")
+				.permitAll()
+				.and()
+			.logout()
+				.permitAll();
+	}
+	// @formatter:on
 
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 }
diff --git a/samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/form-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/security/AppRole.java b/samples/gae-xml/src/main/java/samples/gae/security/AppRole.java
index c7ebffa7ba..801083505b 100644
--- a/samples/gae-xml/src/main/java/samples/gae/security/AppRole.java
+++ b/samples/gae-xml/src/main/java/samples/gae/security/AppRole.java
@@ -6,28 +6,27 @@ import org.springframework.security.core.GrantedAuthority;
  * @author Luke Taylor
  */
 public enum AppRole implements GrantedAuthority {
-    ADMIN (0),
-    NEW_USER (1),
-    USER (2);
+	ADMIN(0), NEW_USER(1), USER(2);
 
-    private final int bit;
+	private final int bit;
 
-    /**
-     * Creates an authority with a specific bit representation. It's important that this doesn't
-     * change as it will be used in the database. The enum ordinal is less reliable as the enum may be
-     * reordered or have new roles inserted which would change the ordinal values.
-     *
-     * @param bit the permission bit which will represent this authority in the datastore.
-     */
-    AppRole(int bit) {
-        this.bit = bit;
-    }
+	/**
+	 * Creates an authority with a specific bit representation. It's important that this
+	 * doesn't change as it will be used in the database. The enum ordinal is less
+	 * reliable as the enum may be reordered or have new roles inserted which would change
+	 * the ordinal values.
+	 *
+	 * @param bit the permission bit which will represent this authority in the datastore.
+	 */
+	AppRole(int bit) {
+		this.bit = bit;
+	}
 
-    public int getBit() {
-        return bit;
-    }
+	public int getBit() {
+		return bit;
+	}
 
-    public String getAuthority() {
-        return toString();
-    }
+	public String getAuthority() {
+		return toString();
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java b/samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java
index 48d35fa3b4..5d04871512 100644
--- a/samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java
+++ b/samples/gae-xml/src/main/java/samples/gae/security/GaeAuthenticationFilter.java
@@ -30,82 +30,90 @@ import samples.gae.users.GaeUser;
  * @author Luke Taylor
  */
 public class GaeAuthenticationFilter extends GenericFilterBean {
-    private static final String REGISTRATION_URL = "/register.htm";
+	private static final String REGISTRATION_URL = "/register.htm";
 
-    private final Logger logger = LoggerFactory.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final AuthenticationDetailsSource<HttpServletRequest, WebAuthenticationDetails> ads = new WebAuthenticationDetailsSource();
-    private AuthenticationManager authenticationManager;
-    private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
+	private final AuthenticationDetailsSource<HttpServletRequest, WebAuthenticationDetails> ads = new WebAuthenticationDetailsSource();
+	private AuthenticationManager authenticationManager;
+	private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
 
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        User googleUser = UserServiceFactory.getUserService().getCurrentUser();
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		User googleUser = UserServiceFactory.getUserService().getCurrentUser();
 
-        if (authentication != null && !loggedInUserMatchesGaeUser(authentication, googleUser)) {
-            SecurityContextHolder.clearContext();
-            authentication = null;
-            ((HttpServletRequest)request).getSession().invalidate();
-        }
+		if (authentication != null
+				&& !loggedInUserMatchesGaeUser(authentication, googleUser)) {
+			SecurityContextHolder.clearContext();
+			authentication = null;
+			((HttpServletRequest) request).getSession().invalidate();
+		}
 
-        if (authentication == null) {
-            if (googleUser != null) {
-                logger.debug("Currently logged on to GAE as user " + googleUser);
-                logger.debug("Authenticating to Spring Security");
-                // User has returned after authenticating via GAE. Need to authenticate through Spring Security.
-                PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(googleUser, null);
-                token.setDetails(ads.buildDetails((HttpServletRequest) request));
+		if (authentication == null) {
+			if (googleUser != null) {
+				logger.debug("Currently logged on to GAE as user " + googleUser);
+				logger.debug("Authenticating to Spring Security");
+				// User has returned after authenticating via GAE. Need to authenticate
+				// through Spring Security.
+				PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+						googleUser, null);
+				token.setDetails(ads.buildDetails((HttpServletRequest) request));
 
-                try {
-                    authentication = authenticationManager.authenticate(token);
-                    SecurityContextHolder.getContext().setAuthentication(authentication);
+				try {
+					authentication = authenticationManager.authenticate(token);
+					SecurityContextHolder.getContext().setAuthentication(authentication);
 
-                    if (authentication.getAuthorities().contains(AppRole.NEW_USER)) {
-                        logger.debug("New user authenticated. Redirecting to registration page");
-                        ((HttpServletResponse) response).sendRedirect(REGISTRATION_URL);
+					if (authentication.getAuthorities().contains(AppRole.NEW_USER)) {
+						logger.debug("New user authenticated. Redirecting to registration page");
+						((HttpServletResponse) response).sendRedirect(REGISTRATION_URL);
 
-                        return;
-                    }
+						return;
+					}
 
-                } catch (AuthenticationException e) {
-                    failureHandler.onAuthenticationFailure((HttpServletRequest)request, (HttpServletResponse)response, e);
+				}
+				catch (AuthenticationException e) {
+					failureHandler.onAuthenticationFailure((HttpServletRequest) request,
+							(HttpServletResponse) response, e);
 
-                    return;
-                }
-            }
-        }
+					return;
+				}
+			}
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    private boolean loggedInUserMatchesGaeUser(Authentication authentication, User googleUser) {
-        assert authentication != null;
+	private boolean loggedInUserMatchesGaeUser(Authentication authentication,
+			User googleUser) {
+		assert authentication != null;
 
-        if (googleUser == null) {
-            // User has logged out of GAE but is still logged into application
-            return false;
-        }
+		if (googleUser == null) {
+			// User has logged out of GAE but is still logged into application
+			return false;
+		}
 
-        GaeUser gaeUser = (GaeUser)authentication.getPrincipal();
+		GaeUser gaeUser = (GaeUser) authentication.getPrincipal();
 
-        if (!gaeUser.getEmail().equals(googleUser.getEmail())) {
-            return false;
-        }
+		if (!gaeUser.getEmail().equals(googleUser.getEmail())) {
+			return false;
+		}
 
-        return true;
+		return true;
 
-    }
+	}
 
-    @Override
-    public void afterPropertiesSet() throws ServletException {
-        Assert.notNull(authenticationManager, "AuthenticationManager must be set");
-    }
+	@Override
+	public void afterPropertiesSet() throws ServletException {
+		Assert.notNull(authenticationManager, "AuthenticationManager must be set");
+	}
 
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 
-    public void setFailureHandler(AuthenticationFailureHandler failureHandler) {
-        this.failureHandler = failureHandler;
-    }
+	public void setFailureHandler(AuthenticationFailureHandler failureHandler) {
+		this.failureHandler = failureHandler;
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java b/samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java
index 619ef6a6dd..621ec19cbb 100644
--- a/samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java
+++ b/samples/gae-xml/src/main/java/samples/gae/security/GaeUserAuthentication.java
@@ -13,50 +13,47 @@ import samples.gae.users.GaeUser;
  * @author Luke Taylor
  */
 public class GaeUserAuthentication implements Authentication {
-    private final GaeUser principal;
-    private final Object details;
-    private boolean authenticated;
+	private final GaeUser principal;
+	private final Object details;
+	private boolean authenticated;
 
-    public GaeUserAuthentication(GaeUser principal, Object details) {
-        this.principal = principal;
-        this.details = details;
-        authenticated = true;
-    }
+	public GaeUserAuthentication(GaeUser principal, Object details) {
+		this.principal = principal;
+		this.details = details;
+		authenticated = true;
+	}
 
-    public Collection<GrantedAuthority> getAuthorities() {
-        return new HashSet<GrantedAuthority>(principal.getAuthorities());
-    }
+	public Collection<GrantedAuthority> getAuthorities() {
+		return new HashSet<GrantedAuthority>(principal.getAuthorities());
+	}
 
-    public Object getCredentials() {
-        throw new UnsupportedOperationException();
-    }
+	public Object getCredentials() {
+		throw new UnsupportedOperationException();
+	}
 
-    public Object getDetails() {
-        return null;
-    }
+	public Object getDetails() {
+		return null;
+	}
 
-    public Object getPrincipal() {
-        return principal;
-    }
+	public Object getPrincipal() {
+		return principal;
+	}
 
-    public boolean isAuthenticated() {
-        return authenticated;
-    }
+	public boolean isAuthenticated() {
+		return authenticated;
+	}
 
-    public void setAuthenticated(boolean isAuthenticated) {
-        authenticated = isAuthenticated;
-    }
+	public void setAuthenticated(boolean isAuthenticated) {
+		authenticated = isAuthenticated;
+	}
 
-    public String getName() {
-        return principal.getUserId();
-    }
+	public String getName() {
+		return principal.getUserId();
+	}
 
-    @Override
-    public String toString() {
-        return "GaeUserAuthentication{" +
-                "principal=" + principal +
-                ", details=" + details +
-                ", authenticated=" + authenticated +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "GaeUserAuthentication{" + "principal=" + principal + ", details="
+				+ details + ", authenticated=" + authenticated + '}';
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java b/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java
index 3bce1c376d..6de8af845d 100644
--- a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java
+++ b/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationEntryPoint.java
@@ -14,10 +14,10 @@ import com.google.appengine.api.users.UserServiceFactory;
 
 public class GoogleAccountsAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
-            throws IOException, ServletException {
-        UserService userService = UserServiceFactory.getUserService();
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
+		UserService userService = UserServiceFactory.getUserService();
 
-        response.sendRedirect(userService.createLoginURL(request.getRequestURI()));
-    }
+		response.sendRedirect(userService.createLoginURL(request.getRequestURI()));
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java b/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java
index e286f66694..5f2c49fe8f 100644
--- a/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java
+++ b/samples/gae-xml/src/main/java/samples/gae/security/GoogleAccountsAuthenticationProvider.java
@@ -14,51 +14,56 @@ import samples.gae.users.GaeUser;
 import samples.gae.users.UserRegistry;
 
 /**
- * A simple authentication provider which interacts with {@code User} returned by the GAE {@code UserService},
- * and also the local persistent {@code UserRegistry} to build an application user principal.
+ * A simple authentication provider which interacts with {@code User} returned by the GAE
+ * {@code UserService}, and also the local persistent {@code UserRegistry} to build an
+ * application user principal.
  * <p>
- * If the user has been authenticated through google accounts, it will check if they are already registered
- * and either load the existing user information or assign them a temporary identity with limited access until they
- * have registered.
+ * If the user has been authenticated through google accounts, it will check if they are
+ * already registered and either load the existing user information or assign them a
+ * temporary identity with limited access until they have registered.
  * <p>
  * If the account has been disabled, a {@code DisabledException} will be raised.
  *
  * @author Luke Taylor
  */
-public class GoogleAccountsAuthenticationProvider implements AuthenticationProvider, MessageSourceAware {
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+public class GoogleAccountsAuthenticationProvider implements AuthenticationProvider,
+		MessageSourceAware {
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-    private UserRegistry userRegistry;
+	private UserRegistry userRegistry;
 
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        User googleUser = (User) authentication.getPrincipal();
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		User googleUser = (User) authentication.getPrincipal();
 
-        GaeUser user = userRegistry.findUser(googleUser.getUserId());
+		GaeUser user = userRegistry.findUser(googleUser.getUserId());
 
-        if (user == null) {
-            // User not in registry. Needs to register
-            user = new GaeUser(googleUser.getUserId(), googleUser.getNickname(), googleUser.getEmail());
-        }
+		if (user == null) {
+			// User not in registry. Needs to register
+			user = new GaeUser(googleUser.getUserId(), googleUser.getNickname(),
+					googleUser.getEmail());
+		}
 
-        if (!user.isEnabled()) {
-            throw new DisabledException("Account is disabled");
-        }
+		if (!user.isEnabled()) {
+			throw new DisabledException("Account is disabled");
+		}
 
-        return new GaeUserAuthentication(user, authentication.getDetails());
-    }
+		return new GaeUserAuthentication(user, authentication.getDetails());
+	}
 
-    /**
-     * Indicate that this provider only supports PreAuthenticatedAuthenticationToken (sub)classes.
-     */
-    public final boolean supports(Class<?> authentication) {
-        return PreAuthenticatedAuthenticationToken.class.isAssignableFrom(authentication);
-    }
+	/**
+	 * Indicate that this provider only supports PreAuthenticatedAuthenticationToken
+	 * (sub)classes.
+	 */
+	public final boolean supports(Class<?> authentication) {
+		return PreAuthenticatedAuthenticationToken.class.isAssignableFrom(authentication);
+	}
 
-    public void setUserRegistry(UserRegistry userRegistry) {
-        this.userRegistry = userRegistry;
-    }
+	public void setUserRegistry(UserRegistry userRegistry) {
+		this.userRegistry = userRegistry;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java b/samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
index 21fd54ad83..5fe1d002cf 100644
--- a/samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
+++ b/samples/gae-xml/src/main/java/samples/gae/users/GaeDatastoreUserRegistry.java
@@ -18,78 +18,77 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class GaeDatastoreUserRegistry implements UserRegistry {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private static final String USER_TYPE = "GaeUser";
-    private static final String USER_FORENAME = "forename";
-    private static final String USER_SURNAME = "surname";
-    private static final String USER_NICKNAME = "nickname";
-    private static final String USER_EMAIL = "email";
-    private static final String USER_ENABLED = "enabled";
-    private static final String USER_AUTHORITIES = "authorities";
+	private static final String USER_TYPE = "GaeUser";
+	private static final String USER_FORENAME = "forename";
+	private static final String USER_SURNAME = "surname";
+	private static final String USER_NICKNAME = "nickname";
+	private static final String USER_EMAIL = "email";
+	private static final String USER_ENABLED = "enabled";
+	private static final String USER_AUTHORITIES = "authorities";
 
-    public GaeUser findUser(String userId) {
-        Key key = KeyFactory.createKey(USER_TYPE, userId);
-        DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+	public GaeUser findUser(String userId) {
+		Key key = KeyFactory.createKey(USER_TYPE, userId);
+		DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
 
-        try {
-            Entity user = datastore.get(key);
+		try {
+			Entity user = datastore.get(key);
 
-            long binaryAuthorities = (Long)user.getProperty(USER_AUTHORITIES);
-            Set<AppRole> roles = EnumSet.noneOf(AppRole.class);
+			long binaryAuthorities = (Long) user.getProperty(USER_AUTHORITIES);
+			Set<AppRole> roles = EnumSet.noneOf(AppRole.class);
 
-            for (AppRole r : AppRole.values()) {
-                if ((binaryAuthorities & (1 << r.getBit())) != 0) {
-                    roles.add(r);
-                }
-            }
+			for (AppRole r : AppRole.values()) {
+				if ((binaryAuthorities & (1 << r.getBit())) != 0) {
+					roles.add(r);
+				}
+			}
 
-            GaeUser gaeUser = new GaeUser(
-                    user.getKey().getName(),
-                    (String)user.getProperty(USER_NICKNAME),
-                    (String)user.getProperty(USER_EMAIL),
-                    (String)user.getProperty(USER_FORENAME),
-                    (String)user.getProperty(USER_SURNAME),
-                    roles,
-                    (Boolean)user.getProperty(USER_ENABLED));
+			GaeUser gaeUser = new GaeUser(user.getKey().getName(),
+					(String) user.getProperty(USER_NICKNAME),
+					(String) user.getProperty(USER_EMAIL),
+					(String) user.getProperty(USER_FORENAME),
+					(String) user.getProperty(USER_SURNAME), roles,
+					(Boolean) user.getProperty(USER_ENABLED));
 
-            return gaeUser;
+			return gaeUser;
 
-        } catch (EntityNotFoundException e) {
-            logger.debug(userId + " not found in datastore");
-            return null;
-        }
-    }
+		}
+		catch (EntityNotFoundException e) {
+			logger.debug(userId + " not found in datastore");
+			return null;
+		}
+	}
 
-    public void registerUser(GaeUser newUser) {
-        logger.debug("Attempting to create new user " + newUser);
+	public void registerUser(GaeUser newUser) {
+		logger.debug("Attempting to create new user " + newUser);
 
-        Key key = KeyFactory.createKey(USER_TYPE, newUser.getUserId());
-        Entity user = new Entity(key);
-        user.setProperty(USER_EMAIL, newUser.getEmail());
-        user.setProperty(USER_NICKNAME, newUser.getNickname());
-        user.setProperty(USER_FORENAME, newUser.getForename());
-        user.setProperty(USER_SURNAME, newUser.getSurname());
-        user.setUnindexedProperty(USER_ENABLED, newUser.isEnabled());
+		Key key = KeyFactory.createKey(USER_TYPE, newUser.getUserId());
+		Entity user = new Entity(key);
+		user.setProperty(USER_EMAIL, newUser.getEmail());
+		user.setProperty(USER_NICKNAME, newUser.getNickname());
+		user.setProperty(USER_FORENAME, newUser.getForename());
+		user.setProperty(USER_SURNAME, newUser.getSurname());
+		user.setUnindexedProperty(USER_ENABLED, newUser.isEnabled());
 
-        Collection<AppRole> roles = newUser.getAuthorities();
+		Collection<AppRole> roles = newUser.getAuthorities();
 
-        long binaryAuthorities = 0;
+		long binaryAuthorities = 0;
 
-        for (AppRole r : roles) {
-            binaryAuthorities |= 1 << r.getBit();
-        }
+		for (AppRole r : roles) {
+			binaryAuthorities |= 1 << r.getBit();
+		}
 
-        user.setUnindexedProperty(USER_AUTHORITIES, binaryAuthorities);
+		user.setUnindexedProperty(USER_AUTHORITIES, binaryAuthorities);
 
-        DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-        datastore.put(user);
-    }
+		DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+		datastore.put(user);
+	}
 
-    public void removeUser(String userId) {
-        DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-        Key key = KeyFactory.createKey(USER_TYPE, userId);
+	public void removeUser(String userId) {
+		DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+		Key key = KeyFactory.createKey(USER_TYPE, userId);
 
-        datastore.delete(key);
-    }
+		datastore.delete(key);
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java b/samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java
index d50da00542..a6ffa18b47 100644
--- a/samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java
+++ b/samples/gae-xml/src/main/java/samples/gae/users/GaeUser.java
@@ -15,78 +15,75 @@ import samples.gae.security.AppRole;
  * @author Luke Taylor
  */
 public class GaeUser implements Serializable {
-    private final String userId;
-    private final String email;
-    private final String nickname;
-    private final String forename;
-    private final String surname;
-    private final Set<AppRole> authorities;
-    private final boolean enabled;
+	private final String userId;
+	private final String email;
+	private final String nickname;
+	private final String forename;
+	private final String surname;
+	private final Set<AppRole> authorities;
+	private final boolean enabled;
 
-    /**
-     * Pre-registration constructor.
-     *
-     * Assigns the user the "NEW_USER" role only.
-     */
-    public GaeUser(String userId, String nickname, String email) {
-        this.userId = userId;
-        this.nickname = nickname;
-        this.authorities = EnumSet.of(AppRole.NEW_USER);
-        this.forename = null;
-        this.surname = null;
-        this.email = email;
-        this.enabled = true;
-    }
+	/**
+	 * Pre-registration constructor.
+	 *
+	 * Assigns the user the "NEW_USER" role only.
+	 */
+	public GaeUser(String userId, String nickname, String email) {
+		this.userId = userId;
+		this.nickname = nickname;
+		this.authorities = EnumSet.of(AppRole.NEW_USER);
+		this.forename = null;
+		this.surname = null;
+		this.email = email;
+		this.enabled = true;
+	}
 
-    /**
-     * Post-registration constructor
-     */
-    public GaeUser(String userId, String nickname, String email, String forename, String surname, Set<AppRole> authorities, boolean enabled) {
-        this.userId = userId;
-        this.nickname = nickname;
-        this.email = email;
-        this.authorities = authorities;
-        this.forename = forename;
-        this.surname = surname;
-        this.enabled= enabled;
-    }
+	/**
+	 * Post-registration constructor
+	 */
+	public GaeUser(String userId, String nickname, String email, String forename,
+			String surname, Set<AppRole> authorities, boolean enabled) {
+		this.userId = userId;
+		this.nickname = nickname;
+		this.email = email;
+		this.authorities = authorities;
+		this.forename = forename;
+		this.surname = surname;
+		this.enabled = enabled;
+	}
 
-    public String getUserId() {
-        return userId;
-    }
+	public String getUserId() {
+		return userId;
+	}
 
-    public String getNickname() {
-        return nickname;
-    }
+	public String getNickname() {
+		return nickname;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public String getForename() {
-        return forename;
-    }
+	public String getForename() {
+		return forename;
+	}
 
-    public String getSurname() {
-        return surname;
-    }
+	public String getSurname() {
+		return surname;
+	}
 
-    public boolean isEnabled() {
-        return enabled;
-    }
+	public boolean isEnabled() {
+		return enabled;
+	}
 
-    public Collection<AppRole> getAuthorities() {
-        return authorities;
-    }
+	public Collection<AppRole> getAuthorities() {
+		return authorities;
+	}
 
-    @Override
-    public String toString() {
-        return "GaeUser{" +
-                "userId='" + userId + '\'' +
-                ", nickname='" + nickname + '\'' +
-                ", forename='" + forename + '\'' +
-                ", surname='" + surname + '\'' +
-                ", authorities=" + authorities +
-                '}';
-    }
+	@Override
+	public String toString() {
+		return "GaeUser{" + "userId='" + userId + '\'' + ", nickname='" + nickname + '\''
+				+ ", forename='" + forename + '\'' + ", surname='" + surname + '\''
+				+ ", authorities=" + authorities + '}';
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java b/samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java
index 613700c31d..d6d62ecca5 100644
--- a/samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java
+++ b/samples/gae-xml/src/main/java/samples/gae/users/InMemoryUserRegistry.java
@@ -12,23 +12,24 @@ import org.springframework.util.Assert;
  * @author Luke Taylor
  */
 public class InMemoryUserRegistry implements UserRegistry {
-    private final Logger logger = LoggerFactory.getLogger(getClass());
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final Map<String, GaeUser> users = Collections.synchronizedMap(new HashMap<String, GaeUser>());
+	private final Map<String, GaeUser> users = Collections
+			.synchronizedMap(new HashMap<String, GaeUser>());
 
-    public GaeUser findUser(String userId) {
-        return users.get(userId);
-    }
+	public GaeUser findUser(String userId) {
+		return users.get(userId);
+	}
 
-    public void registerUser(GaeUser newUser) {
-        logger.debug("Attempting to create new user " + newUser);
+	public void registerUser(GaeUser newUser) {
+		logger.debug("Attempting to create new user " + newUser);
 
-        Assert.state(!users.containsKey(newUser.getUserId()));
+		Assert.state(!users.containsKey(newUser.getUserId()));
 
-        users.put(newUser.getUserId(), newUser);
-    }
+		users.put(newUser.getUserId(), newUser);
+	}
 
-    public void removeUser(String userId) {
-        users.remove(userId);
-    }
+	public void removeUser(String userId) {
+		users.remove(userId);
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java b/samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java
index 9b3820f54f..080eee036b 100644
--- a/samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java
+++ b/samples/gae-xml/src/main/java/samples/gae/users/UserRegistry.java
@@ -8,9 +8,9 @@ package samples.gae.users;
  */
 public interface UserRegistry {
 
-    GaeUser findUser(String userId);
+	GaeUser findUser(String userId);
 
-    void registerUser(GaeUser newUser);
+	void registerUser(GaeUser newUser);
 
-    void removeUser(String userId);
+	void removeUser(String userId);
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/Forename.java b/samples/gae-xml/src/main/java/samples/gae/validation/Forename.java
index 1f0c52eebf..7d11d678b3 100644
--- a/samples/gae-xml/src/main/java/samples/gae/validation/Forename.java
+++ b/samples/gae-xml/src/main/java/samples/gae/validation/Forename.java
@@ -13,13 +13,13 @@ import org.hibernate.validator.constraints.NotBlank;
 /**
  * @author Luke Taylor
  */
-@Target( { METHOD, FIELD, ANNOTATION_TYPE })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = ForenameValidator.class)
 public @interface Forename {
-    String message() default "{samples.gae.forename}";
+	String message() default "{samples.gae.forename}";
 
-    Class<?>[] groups() default {};
+	Class<?>[] groups() default {};
 
-    Class<? extends Payload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java b/samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java
index bbe9e39ed2..caeccf37c4 100644
--- a/samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java
+++ b/samples/gae-xml/src/main/java/samples/gae/validation/ForenameValidator.java
@@ -8,11 +8,12 @@ import javax.validation.ConstraintValidatorContext;
  * @author Luke Taylor
  */
 public class ForenameValidator implements ConstraintValidator<Forename, String> {
-    private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+") ;
+	private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+");
 
-    public void initialize(Forename constraintAnnotation) {}
+	public void initialize(Forename constraintAnnotation) {
+	}
 
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-        return VALID.matcher(value).matches();
-    }
+	public boolean isValid(String value, ConstraintValidatorContext context) {
+		return VALID.matcher(value).matches();
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/Surname.java b/samples/gae-xml/src/main/java/samples/gae/validation/Surname.java
index c480630dcf..7eb91bf530 100644
--- a/samples/gae-xml/src/main/java/samples/gae/validation/Surname.java
+++ b/samples/gae-xml/src/main/java/samples/gae/validation/Surname.java
@@ -13,13 +13,13 @@ import org.hibernate.validator.constraints.NotBlank;
 /**
  * @author Luke Taylor
  */
-@Target( { METHOD, FIELD, ANNOTATION_TYPE })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint(validatedBy = SurnameValidator.class)
 public @interface Surname {
-    String message() default "{samples.gae.surname}";
+	String message() default "{samples.gae.surname}";
 
-    Class<?>[] groups() default {};
+	Class<?>[] groups() default {};
 
-    Class<? extends Payload>[] payload() default {};
+	Class<? extends Payload>[] payload() default {};
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java b/samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java
index a6e2bdaa5b..17e42a99d8 100644
--- a/samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java
+++ b/samples/gae-xml/src/main/java/samples/gae/validation/SurnameValidator.java
@@ -8,11 +8,12 @@ import javax.validation.ConstraintValidatorContext;
  * @author Luke Taylor
  */
 public class SurnameValidator implements ConstraintValidator<Surname, String> {
-    private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+") ;
+	private static final Pattern VALID = Pattern.compile("[\\p{L}'\\-,.]+");
 
-    public void initialize(Surname constraintAnnotation) {}
+	public void initialize(Surname constraintAnnotation) {
+	}
 
-    public boolean isValid(String value, ConstraintValidatorContext context) {
-        return VALID.matcher(value).matches();
-    }
+	public boolean isValid(String value, ConstraintValidatorContext context) {
+		return VALID.matcher(value).matches();
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java b/samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java
index 8bb841159e..a5ee079573 100644
--- a/samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java
+++ b/samples/gae-xml/src/main/java/samples/gae/web/GaeAppController.java
@@ -17,32 +17,34 @@ import org.springframework.web.bind.annotation.RequestMethod;
 @Controller
 public class GaeAppController {
 
-    @RequestMapping(value = "/", method= RequestMethod.GET)
-    public String landing() {
-        return "landing";
-    }
+	@RequestMapping(value = "/", method = RequestMethod.GET)
+	public String landing() {
+		return "landing";
+	}
 
-    @RequestMapping(value = "/home.htm", method= RequestMethod.GET)
-    public String home() {
-        return "home";
-    }
+	@RequestMapping(value = "/home.htm", method = RequestMethod.GET)
+	public String home() {
+		return "home";
+	}
 
-    @RequestMapping(value = "/disabled.htm", method= RequestMethod.GET)
-    public String disabled() {
-        return "disabled";
-    }
+	@RequestMapping(value = "/disabled.htm", method = RequestMethod.GET)
+	public String disabled() {
+		return "disabled";
+	}
 
-    @RequestMapping(value = "/logout.htm", method= RequestMethod.GET)
-    public void logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        request.getSession().invalidate();
+	@RequestMapping(value = "/logout.htm", method = RequestMethod.GET)
+	public void logout(HttpServletRequest request, HttpServletResponse response)
+			throws IOException {
+		request.getSession().invalidate();
 
-        String logoutUrl = UserServiceFactory.getUserService().createLogoutURL("/loggedout.htm");
+		String logoutUrl = UserServiceFactory.getUserService().createLogoutURL(
+				"/loggedout.htm");
 
-        response.sendRedirect(logoutUrl);
-    }
+		response.sendRedirect(logoutUrl);
+	}
 
-    @RequestMapping(value = "/loggedout.htm", method= RequestMethod.GET)
-    public String loggedOut() {
-        return "loggedout";
-    }
+	@RequestMapping(value = "/loggedout.htm", method = RequestMethod.GET)
+	public String loggedOut() {
+		return "loggedout";
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java b/samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java
index 8d8a2916cd..183dc4e783 100644
--- a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java
+++ b/samples/gae-xml/src/main/java/samples/gae/web/RegistrationController.java
@@ -23,39 +23,42 @@ import samples.gae.users.UserRegistry;
  * @author Luke Taylor
  */
 @Controller
-@RequestMapping(value="/register.htm")
+@RequestMapping(value = "/register.htm")
 public class RegistrationController {
 
-    @Autowired
-    private UserRegistry registry;
+	@Autowired
+	private UserRegistry registry;
 
-    @RequestMapping(method= RequestMethod.GET)
-    public RegistrationForm registrationForm() {
-        return new RegistrationForm();
-    }
+	@RequestMapping(method = RequestMethod.GET)
+	public RegistrationForm registrationForm() {
+		return new RegistrationForm();
+	}
 
-    @RequestMapping(method = RequestMethod.POST)
-    public String register(@Valid RegistrationForm form, BindingResult result) {
-        if (result.hasErrors()) {
-            return null;
-        }
+	@RequestMapping(method = RequestMethod.POST)
+	public String register(@Valid RegistrationForm form, BindingResult result) {
+		if (result.hasErrors()) {
+			return null;
+		}
 
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        GaeUser currentUser = (GaeUser)authentication.getPrincipal();
-        Set<AppRole> roles = EnumSet.of(AppRole.USER);
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		GaeUser currentUser = (GaeUser) authentication.getPrincipal();
+		Set<AppRole> roles = EnumSet.of(AppRole.USER);
 
-        if (UserServiceFactory.getUserService().isUserAdmin()) {
-            roles.add(AppRole.ADMIN);
-        }
+		if (UserServiceFactory.getUserService().isUserAdmin()) {
+			roles.add(AppRole.ADMIN);
+		}
 
-        GaeUser user = new GaeUser(currentUser.getUserId(), currentUser.getNickname(), currentUser.getEmail(),
-                form.getForename(), form.getSurname(), roles, true);
+		GaeUser user = new GaeUser(currentUser.getUserId(), currentUser.getNickname(),
+				currentUser.getEmail(), form.getForename(), form.getSurname(), roles,
+				true);
 
-        registry.registerUser(user);
+		registry.registerUser(user);
 
-        // Update the context with the full authentication
-        SecurityContextHolder.getContext().setAuthentication(new GaeUserAuthentication(user, authentication.getDetails()));
+		// Update the context with the full authentication
+		SecurityContextHolder.getContext().setAuthentication(
+				new GaeUserAuthentication(user, authentication.getDetails()));
 
-        return "redirect:/home.htm";
-    }
+		return "redirect:/home.htm";
+	}
 }
diff --git a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java b/samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java
index f9be66d716..ca98346aa2 100644
--- a/samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java
+++ b/samples/gae-xml/src/main/java/samples/gae/web/RegistrationForm.java
@@ -8,24 +8,24 @@ import samples.gae.validation.Surname;
  * @author Luke Taylor
  */
 public class RegistrationForm {
-    @Forename
-    private String forename;
-    @Surname
-    private String surname;
+	@Forename
+	private String forename;
+	@Surname
+	private String surname;
 
-    public String getForename() {
-        return forename;
-    }
+	public String getForename() {
+		return forename;
+	}
 
-    public void setForename(String forename) {
-        this.forename = forename;
-    }
+	public void setForename(String forename) {
+		this.forename = forename;
+	}
 
-    public String getSurname() {
-        return surname;
-    }
+	public String getSurname() {
+		return surname;
+	}
 
-    public void setSurname(String surname) {
-        this.surname = surname;
-    }
+	public void setSurname(String surname) {
+		this.surname = surname;
+	}
 }
diff --git a/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java b/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java
index 0e4d37fa00..fdb3d2bcfe 100644
--- a/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java
+++ b/samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java
@@ -11,18 +11,19 @@ import org.springframework.security.core.GrantedAuthority;
  */
 public class AppRoleTests {
 
-    @Test
-    public void getAuthorityReturnsRoleName() {
-        GrantedAuthority admin = ADMIN;
+	@Test
+	public void getAuthorityReturnsRoleName() {
+		GrantedAuthority admin = ADMIN;
 
-        assertEquals("ADMIN", admin.getAuthority());
-    }
+		assertEquals("ADMIN", admin.getAuthority());
+	}
 
-    @Test
-    public void bitsAreCorrect() throws Exception {
-        // If this fails, someone has modified the Enum and the Datastore is probably corrupt!
-        assertEquals(0, ADMIN.getBit());
-        assertEquals(1, NEW_USER.getBit());
-        assertEquals(2, USER.getBit());
-    }
+	@Test
+	public void bitsAreCorrect() throws Exception {
+		// If this fails, someone has modified the Enum and the Datastore is probably
+		// corrupt!
+		assertEquals(0, ADMIN.getBit());
+		assertEquals(1, NEW_USER.getBit());
+		assertEquals(2, USER.getBit());
+	}
 }
diff --git a/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java b/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java
index 708206153b..bed032bb9a 100644
--- a/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java
+++ b/samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java
@@ -16,38 +16,39 @@ import samples.gae.security.AppRole;
  * @author Luke Taylor
  */
 public class GaeDataStoreUserRegistryTests {
-    private final LocalServiceTestHelper helper =
-        new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
+	private final LocalServiceTestHelper helper = new LocalServiceTestHelper(
+			new LocalDatastoreServiceTestConfig());
 
-    @Before
-    public void setUp() throws Exception {
-        helper.setUp();
-    }
+	@Before
+	public void setUp() throws Exception {
+		helper.setUp();
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        helper.tearDown();
-    }
+	@After
+	public void tearDown() throws Exception {
+		helper.tearDown();
+	}
 
-    @Test
-    public void correctDataIsRetrievedAfterInsert() {
-        GaeDatastoreUserRegistry registry = new GaeDatastoreUserRegistry();
+	@Test
+	public void correctDataIsRetrievedAfterInsert() {
+		GaeDatastoreUserRegistry registry = new GaeDatastoreUserRegistry();
 
-        Set<AppRole> roles = EnumSet.of(AppRole.ADMIN, AppRole.USER);
-        String userId = "someUserId";
+		Set<AppRole> roles = EnumSet.of(AppRole.ADMIN, AppRole.USER);
+		String userId = "someUserId";
 
-        GaeUser origUser = new GaeUser(userId, "nick", "nick@blah.com", "Forename", "Surname", roles, true);
+		GaeUser origUser = new GaeUser(userId, "nick", "nick@blah.com", "Forename",
+				"Surname", roles, true);
 
-        registry.registerUser(origUser);
+		registry.registerUser(origUser);
 
-        GaeUser loadedUser = registry.findUser(userId);
+		GaeUser loadedUser = registry.findUser(userId);
 
-        assertEquals(loadedUser.getUserId(), origUser.getUserId());
-        assertEquals(true, loadedUser.isEnabled());
-        assertEquals(roles, loadedUser.getAuthorities());
-        assertEquals("nick", loadedUser.getNickname());
-        assertEquals("nick@blah.com", loadedUser.getEmail());
-        assertEquals("Forename", loadedUser.getForename());
-        assertEquals("Surname", loadedUser.getSurname());
-    }
+		assertEquals(loadedUser.getUserId(), origUser.getUserId());
+		assertEquals(true, loadedUser.isEnabled());
+		assertEquals(roles, loadedUser.getAuthorities());
+		assertEquals("nick", loadedUser.getNickname());
+		assertEquals("nick@blah.com", loadedUser.getEmail());
+		assertEquals("Forename", loadedUser.getForename());
+		assertEquals("Surname", loadedUser.getSurname());
+	}
 }
diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 30e6d63bcb..48a3b54475 100644
--- a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,19 +1,19 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @EnableWebSecurity
 public class SecurityConfig {
 
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+		// @formatter:on
 }
diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java
index 105f7fdfd7..4d21b6ca0d 100644
--- a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java
+++ b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java
@@ -20,37 +20,38 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 @Controller
-@RequestMapping(value = "/", produces="application/json")
+@RequestMapping(value = "/", produces = "application/json")
 public class MessageJsonController {
-    private MessageRepository messageRepository;
+	private MessageRepository messageRepository;
 
-    @Autowired
-    public MessageJsonController(MessageRepository messageRepository) {
-        this.messageRepository = messageRepository;
-    }
+	@Autowired
+	public MessageJsonController(MessageRepository messageRepository) {
+		this.messageRepository = messageRepository;
+	}
 
-    @RequestMapping
-    public ResponseEntity<Iterable<Message>> list() {
-        Iterable<Message> messages = messageRepository.findAll();
-        return new ResponseEntity<Iterable<Message>>(messages, HttpStatus.OK);
-    }
+	@RequestMapping
+	public ResponseEntity<Iterable<Message>> list() {
+		Iterable<Message> messages = messageRepository.findAll();
+		return new ResponseEntity<Iterable<Message>>(messages, HttpStatus.OK);
+	}
 
-    @RequestMapping("{id}")
-    public ResponseEntity<Message> view(@PathVariable Long id) {
-        Message message = messageRepository.findOne(id);
-        return new ResponseEntity<Message>(message, HttpStatus.OK);
-    }
+	@RequestMapping("{id}")
+	public ResponseEntity<Message> view(@PathVariable Long id) {
+		Message message = messageRepository.findOne(id);
+		return new ResponseEntity<Message>(message, HttpStatus.OK);
+	}
 
-    @RequestMapping(method=RequestMethod.POST, consumes="application/json")
-    public ResponseEntity<?> create(@Valid @RequestBody Message message, BindingResult result, RedirectAttributes redirect) {
-        if(result.hasErrors()) {
-            List<String> errors = new ArrayList<String>(result.getErrorCount());
-            for(ObjectError r : result.getAllErrors()) {
-                errors.add(r.getDefaultMessage());
-            }
-            return new ResponseEntity<List<String>>(errors, HttpStatus.BAD_REQUEST);
-        }
-        message = messageRepository.save(message);
-        return new ResponseEntity<Message>(message,HttpStatus.OK);
-    }
+	@RequestMapping(method = RequestMethod.POST, consumes = "application/json")
+	public ResponseEntity<?> create(@Valid @RequestBody Message message,
+			BindingResult result, RedirectAttributes redirect) {
+		if (result.hasErrors()) {
+			List<String> errors = new ArrayList<String>(result.getErrorCount());
+			for (ObjectError r : result.getAllErrors()) {
+				errors.add(r.getDefaultMessage());
+			}
+			return new ResponseEntity<List<String>>(errors, HttpStatus.BAD_REQUEST);
+		}
+		message = messageRepository.save(message);
+		return new ResponseEntity<Message>(message, HttpStatus.OK);
+	}
 }
diff --git a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java
index 626668a313..0cf6de49d6 100644
--- a/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java
+++ b/samples/hellojs-jc/src/main/java/org/springframework/security/samples/mvc/config/CustomMvcConfig.java
@@ -30,12 +30,12 @@ import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 @Configuration
 public class CustomMvcConfig {
 
-    @Bean
-    public ThymeleafViewResolver thymeleafViewResolver(SpringTemplateEngine templateEngine) {
-        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
-        viewResolver.setOrder(Ordered.HIGHEST_PRECEDENCE - 10);
-        viewResolver.setTemplateEngine(templateEngine);
-        return viewResolver;
-    }
+	@Bean
+	public ThymeleafViewResolver thymeleafViewResolver(SpringTemplateEngine templateEngine) {
+		ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+		viewResolver.setOrder(Ordered.HIGHEST_PRECEDENCE - 10);
+		viewResolver.setTemplateEngine(templateEngine);
+		return viewResolver;
+	}
 
 }
diff --git a/samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/hellojs-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index 17d1f43002..a55447386c 100644
--- a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -24,5 +24,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  * @author Rob Winch
  */
 @Order(2)
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 06be0cfc73..7c337cbe9e 100644
--- a/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/hellomvc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,18 +1,19 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @EnableWebSecurity
 public class SecurityConfig {
 
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 }
diff --git a/samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 3ece66ee39..b5c3773404 100644
--- a/samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/hellomvc-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -48,93 +48,80 @@ import org.springframework.web.context.WebApplicationContext;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes={RootConfiguration.class, WebMvcConfiguration.class})
+@ContextConfiguration(classes = { RootConfiguration.class, WebMvcConfiguration.class })
 @WebAppConfiguration
-@TestExecutionListeners(listeners={ServletTestExecutionListener.class,
-        DependencyInjectionTestExecutionListener.class,
-        DirtiesContextTestExecutionListener.class,
-        TransactionalTestExecutionListener.class,
-        WithSecurityContextTestExecutionListener.class})
+@TestExecutionListeners(listeners = { ServletTestExecutionListener.class,
+		DependencyInjectionTestExecutionListener.class,
+		DirtiesContextTestExecutionListener.class,
+		TransactionalTestExecutionListener.class,
+		WithSecurityContextTestExecutionListener.class })
 public class SecurityConfigTests {
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private Filter springSecurityFilterChain;
+	@Autowired
+	private Filter springSecurityFilterChain;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .addFilters(springSecurityFilterChain)
-                .defaultRequest(get("/").with(testSecurityContext()))
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.addFilters(springSecurityFilterChain)
+				.defaultRequest(get("/").with(testSecurityContext())).build();
+	}
 
-    @Test
-    public void requestProtectedResourceRequiresAuthentication() throws Exception {
-        mvc.perform(get("/"))
-            .andExpect(redirectedUrl("http://localhost/login"));
-    }
+	@Test
+	public void requestProtectedResourceRequiresAuthentication() throws Exception {
+		mvc.perform(get("/")).andExpect(redirectedUrl("http://localhost/login"));
+	}
 
-    @Test
-    public void loginSuccess() throws Exception {
-        mvc.perform(formLogin())
-            .andExpect(redirectedUrl("/"));
-    }
+	@Test
+	public void loginSuccess() throws Exception {
+		mvc.perform(formLogin()).andExpect(redirectedUrl("/"));
+	}
 
-    @Test
-    public void loginFailure() throws Exception {
-        mvc.perform(formLogin().password("invalid"))
-            .andExpect(redirectedUrl("/login?error"));
-    }
+	@Test
+	public void loginFailure() throws Exception {
+		mvc.perform(formLogin().password("invalid")).andExpect(
+				redirectedUrl("/login?error"));
+	}
 
-    @Test
-    @WithMockUser
-    public void requestProtectedResourceWithUser() throws Exception {
-        mvc.perform(get("/"))
-            .andExpect(status().isOk());
-    }
+	@Test
+	@WithMockUser
+	public void requestProtectedResourceWithUser() throws Exception {
+		mvc.perform(get("/")).andExpect(status().isOk());
+	}
 
-    @Test
-    @WithMockUser
-    public void composeMessageRequiresCsrfToken() throws Exception {
-        MockHttpServletRequestBuilder composeMessage =
-            post("/")
-                .param("summary", "New Message")
-                .param("text", "This is a new message");
+	@Test
+	@WithMockUser
+	public void composeMessageRequiresCsrfToken() throws Exception {
+		MockHttpServletRequestBuilder composeMessage = post("/").param("summary",
+				"New Message").param("text", "This is a new message");
 
-        mvc.perform(composeMessage)
-            .andExpect(status().isForbidden());
-    }
+		mvc.perform(composeMessage).andExpect(status().isForbidden());
+	}
 
-    @Test
-    @WithMockUser
-    public void composeMessage() throws Exception {
-        MockHttpServletRequestBuilder composeMessage =
-            post("/")
-                .param("summary", "New Message")
-                .param("text", "This is a new message")
-                .with(csrf());
+	@Test
+	@WithMockUser
+	public void composeMessage() throws Exception {
+		MockHttpServletRequestBuilder composeMessage = post("/")
+				.param("summary", "New Message").param("text", "This is a new message")
+				.with(csrf());
 
-        mvc.perform(composeMessage)
-            .andExpect(redirectedUrlPattern("/*"));
-    }
+		mvc.perform(composeMessage).andExpect(redirectedUrlPattern("/*"));
+	}
 
-    @Test
-    @WithMockUser
-    public void logoutRequiresCsrfToken() throws Exception {
-        mvc.perform(post("/logout"))
-            .andExpect(status().isForbidden());
-    }
+	@Test
+	@WithMockUser
+	public void logoutRequiresCsrfToken() throws Exception {
+		mvc.perform(post("/logout")).andExpect(status().isForbidden());
+	}
 
-    @Test
-    @WithMockUser
-    public void logoutSuccess() throws Exception {
-        mvc.perform(logout())
-            .andExpect(redirectedUrl("/login?logout"))
-            .andExpect(unauthenticated());
-    }
+	@Test
+	@WithMockUser
+	public void logoutSuccess() throws Exception {
+		mvc.perform(logout()).andExpect(redirectedUrl("/login?logout"))
+				.andExpect(unauthenticated());
+	}
 }
diff --git a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 096493c4c0..32ba54d74d 100644
--- a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,16 +1,18 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.*	;
+import org.springframework.security.config.annotation.authentication.builders.*;
 import org.springframework.security.config.annotation.web.configuration.*;
 
 @EnableWebSecurity
 public class SecurityConfig {
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 }
diff --git a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java b/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java
index 6683f9909f..478d905de7 100644
--- a/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java
+++ b/samples/helloworld-jc/src/main/java/org/springframework/security/samples/config/SecurityWebApplicationInitializer.java
@@ -22,9 +22,10 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class SecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 
-    public SecurityWebApplicationInitializer() {
-        super(SecurityConfig.class);
-    }
+	public SecurityWebApplicationInitializer() {
+		super(SecurityConfig.class);
+	}
 }
diff --git a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index b35a394996..8ebbc42b08 100644
--- a/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/inmemory-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,20 +1,20 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @EnableWebSecurity
 public class SecurityConfig {
 
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER").and()
-                .withUser("admin").password("password").roles("USER","ADMIN");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER").and()
+				.withUser("admin").password("password").roles("USER","ADMIN");
+	}
+		// @formatter:on
 }
\ No newline at end of file
diff --git a/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 59804fd74e..535a7cb06b 100644
--- a/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/inmemory-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -41,56 +41,50 @@ import org.springframework.web.context.WebApplicationContext;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes={RootConfiguration.class, WebMvcConfiguration.class})
+@ContextConfiguration(classes = { RootConfiguration.class, WebMvcConfiguration.class })
 @WebAppConfiguration
 public class SecurityConfigTests {
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private Filter springSecurityFilterChain;
+	@Autowired
+	private Filter springSecurityFilterChain;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .addFilters(springSecurityFilterChain)
-                .defaultRequest(get("/").with(testSecurityContext()))
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.addFilters(springSecurityFilterChain)
+				.defaultRequest(get("/").with(testSecurityContext())).build();
+	}
 
-    @Test
-    public void requestProtectedResourceRequiresAuthentication() throws Exception {
-        mvc.perform(get("/"))
-                .andExpect(redirectedUrl("http://localhost/login"));
-    }
+	@Test
+	public void requestProtectedResourceRequiresAuthentication() throws Exception {
+		mvc.perform(get("/")).andExpect(redirectedUrl("http://localhost/login"));
+	}
 
-    @Test
-    public void loginSuccess() throws Exception {
-        mvc.perform(formLogin())
-                .andExpect(redirectedUrl("/"));
-    }
+	@Test
+	public void loginSuccess() throws Exception {
+		mvc.perform(formLogin()).andExpect(redirectedUrl("/"));
+	}
 
-    @Test
-    public void loginFailure() throws Exception {
-        mvc.perform(formLogin().password("invalid"))
-                .andExpect(redirectedUrl("/login?error"));
-    }
+	@Test
+	public void loginFailure() throws Exception {
+		mvc.perform(formLogin().password("invalid")).andExpect(
+				redirectedUrl("/login?error"));
+	}
 
-    @Test
-    @WithMockUser
-    public void requestProtectedResourceWithUser() throws Exception {
-        mvc.perform(get("/"))
-                .andExpect(status().isOk());
-    }
+	@Test
+	@WithMockUser
+	public void requestProtectedResourceWithUser() throws Exception {
+		mvc.perform(get("/")).andExpect(status().isOk());
+	}
 
-    @Test
-    @WithMockUser
-    public void logoutSuccess() throws Exception {
-        mvc.perform(logout())
-                .andExpect(redirectedUrl("/login?logout"))
-                .andExpect(unauthenticated());
-    }
+	@Test
+	@WithMockUser
+	public void logoutSuccess() throws Exception {
+		mvc.perform(logout()).andExpect(redirectedUrl("/login?logout"))
+				.andExpect(unauthenticated());
+	}
 }
\ No newline at end of file
diff --git a/samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index c8b6bf24e4..47c99a64c8 100644
--- a/samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/insecuremvc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -38,29 +38,24 @@ import org.springframework.web.context.WebApplicationContext;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes={RootConfiguration.class, WebMvcConfiguration.class})
+@ContextConfiguration(classes = { RootConfiguration.class, WebMvcConfiguration.class })
 @WebAppConfiguration
 public class SecurityConfigTests {
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).build();
+	}
 
-    @Test
-    public void composeMessage() throws Exception {
-        MockHttpServletRequestBuilder composeMessage =
-            post("/")
-                .param("summary", "New Message")
-                .param("text", "This is a new message");
+	@Test
+	public void composeMessage() throws Exception {
+		MockHttpServletRequestBuilder composeMessage = post("/").param("summary",
+				"New Message").param("text", "This is a new message");
 
-        mvc.perform(composeMessage)
-            .andExpect(redirectedUrlPattern("/*"));
-    }
+		mvc.perform(composeMessage).andExpect(redirectedUrlPattern("/*"));
+	}
 }
diff --git a/samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java b/samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java
index 29563ea464..541e343866 100644
--- a/samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java
+++ b/samples/jaas-xml/src/main/java/samples/jaas/RoleUserAuthorityGranter.java
@@ -28,7 +28,7 @@ import org.springframework.security.authentication.jaas.AuthorityGranter;
  */
 public class RoleUserAuthorityGranter implements AuthorityGranter {
 
-    public Set<String> grant(Principal principal) {
-        return Collections.singleton("ROLE_USER");
-    }
+	public Set<String> grant(Principal principal) {
+		return Collections.singleton("ROLE_USER");
+	}
 }
diff --git a/samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java b/samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java
index 369278e13c..0847717416 100644
--- a/samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java
+++ b/samples/jaas-xml/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java
@@ -34,66 +34,73 @@ import javax.security.auth.spi.LoginModule;
  * @author Rob Winch
  */
 public class UsernameEqualsPasswordLoginModule implements LoginModule {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String password;
-    private String username;
-    private Subject subject;
+	private String password;
+	private String username;
+	private Subject subject;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean abort() throws LoginException {
-        return true;
-    }
+	public boolean abort() throws LoginException {
+		return true;
+	}
 
-    public boolean commit() throws LoginException {
-        return true;
-    }
+	public boolean commit() throws LoginException {
+		return true;
+	}
 
-    public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState,
-            Map<String, ?> options) {
-        this.subject = subject;
+	public void initialize(Subject subject, CallbackHandler callbackHandler,
+			Map<String, ?> sharedState, Map<String, ?> options) {
+		this.subject = subject;
 
-        try {
-            NameCallback nameCallback = new NameCallback("prompt");
-            PasswordCallback passwordCallback = new PasswordCallback("prompt", false);
+		try {
+			NameCallback nameCallback = new NameCallback("prompt");
+			PasswordCallback passwordCallback = new PasswordCallback("prompt", false);
 
-            callbackHandler.handle(new Callback[] { nameCallback, passwordCallback });
+			callbackHandler.handle(new Callback[] { nameCallback, passwordCallback });
 
-            password = new String(passwordCallback.getPassword());
-            username = nameCallback.getName();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
+			password = new String(passwordCallback.getPassword());
+			username = nameCallback.getName();
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
 
-    public boolean login() throws LoginException {
-        if (username == null || !username.equals(password)) {
-            throw new LoginException("username is not equal to password");
-        }
-        if("".equals(username)) {
-            throw new LoginException("username cannot be empty string");
-        }
+	public boolean login() throws LoginException {
+		if (username == null || !username.equals(password)) {
+			throw new LoginException("username is not equal to password");
+		}
+		if ("".equals(username)) {
+			throw new LoginException("username cannot be empty string");
+		}
 
-        subject.getPrincipals().add(new UsernamePrincipal(username));
-        return true;
-    }
+		subject.getPrincipals().add(new UsernamePrincipal(username));
+		return true;
+	}
 
-    public boolean logout() throws LoginException {
-        return true;
-    }
+	public boolean logout() throws LoginException {
+		return true;
+	}
 
-    private static class UsernamePrincipal implements Principal, Serializable {
-        private final String username;
-        public UsernamePrincipal(String username) {
-            this.username = username;
-        }
-        public String getName() {
-            return username;
-        }
-        public String toString() {
-            return "Principal [name="+getName()+"]";
-        }
-        private static final long serialVersionUID = 8049681145355488137L;
-    }
+	private static class UsernamePrincipal implements Principal, Serializable {
+		private final String username;
+
+		public UsernamePrincipal(String username) {
+			this.username = username;
+		}
+
+		public String getName() {
+			return username;
+		}
+
+		public String toString() {
+			return "Principal [name=" + getName() + "]";
+		}
+
+		private static final long serialVersionUID = 8049681145355488137L;
+	}
 }
diff --git a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 3802d25ea8..ec7bc11e48 100644
--- a/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/jdbc-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,25 +1,24 @@
 package org.springframework.security.samples.config;
 
-
 import javax.sql.DataSource;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @EnableWebSecurity
 public class SecurityConfig {
-    @Autowired
-    private DataSource dataSource;
+	@Autowired
+	private DataSource dataSource;
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .jdbcAuthentication()
-                .dataSource(dataSource)
-                .withDefaultSchema()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.jdbcAuthentication()
+				.dataSource(dataSource)
+				.withDefaultSchema()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 }
\ No newline at end of file
diff --git a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 5305afa8bf..21a861f46a 100644
--- a/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/ldap-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,19 +1,19 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
 @EnableWebSecurity
 public class SecurityConfig {
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .ldapAuthentication()
-                .userDnPatterns("uid={0},ou=people")
-                .groupSearchBase("ou=groups");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.ldapAuthentication()
+				.userDnPatterns("uid={0},ou=people")
+				.groupSearchBase("ou=groups");
+	}
+	// @formatter:on
 }
\ No newline at end of file
diff --git a/samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 23fb47981c..f83a5e6148 100644
--- a/samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/ldap-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -33,13 +33,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ContextConfiguration
 @WebAppConfiguration
 public class SecurityConfigTests {
-    @Configuration
-    @ComponentScan(basePackages = "org.springframework.security.samples.config")
-    public static class Config {}
+	@Configuration
+	@ComponentScan(basePackages = "org.springframework.security.samples.config")
+	public static class Config {
+	}
 
-    @Autowired
-    private FilterChainProxy springSecurityFilterChain;
+	@Autowired
+	private FilterChainProxy springSecurityFilterChain;
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java
index b0a281ab5a..51f82cfd8b 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/config/DataConfiguration.java
@@ -17,44 +17,43 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.security.samples.data.Message;
 import org.springframework.transaction.PlatformTransactionManager;
 
-
 @Configuration
 @EnableJpaRepositories("org.springframework.security.samples.data")
 public class DataConfiguration {
 
-    @Bean
-    public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.HSQL).build();
-    }
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+	}
 
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        vendorAdapter.setDatabase(Database.HSQL);
-        vendorAdapter.setGenerateDdl(true);
+	@Bean
+	public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setDatabase(Database.HSQL);
+		vendorAdapter.setGenerateDdl(true);
 
-        LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-        factory.setJpaVendorAdapter(vendorAdapter);
-        factory.setPackagesToScan(Message.class.getPackage().getName());
-        factory.setDataSource(dataSource());
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setJpaVendorAdapter(vendorAdapter);
+		factory.setPackagesToScan(Message.class.getPackage().getName());
+		factory.setDataSource(dataSource());
 
-        return factory;
-    }
+		return factory;
+	}
 
-    @Bean
-    @DependsOn("entityManagerFactory")
-    public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
-        ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
-        populator.addScript(new ClassPathResource("data.sql"));
-        populator.populate(dataSource.getConnection());
-        return populator;
-    }
+	@Bean
+	@DependsOn("entityManagerFactory")
+	public ResourceDatabasePopulator initDatabase(DataSource dataSource) throws Exception {
+		ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
+		populator.addScript(new ClassPathResource("data.sql"));
+		populator.populate(dataSource.getConnection());
+		return populator;
+	}
 
-    @Bean
-    public PlatformTransactionManager transactionManager() {
-        JpaTransactionManager txManager = new JpaTransactionManager();
-        txManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return txManager;
-    }
+	@Bean
+	public PlatformTransactionManager transactionManager() {
+		JpaTransactionManager txManager = new JpaTransactionManager();
+		txManager.setEntityManagerFactory(entityManagerFactory().getObject());
+		return txManager;
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java
index bb900a5c96..53343cc3a2 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/config/MessageWebApplicationInitializer.java
@@ -7,25 +7,25 @@ import org.springframework.web.filter.HiddenHttpMethodFilter;
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 public class MessageWebApplicationInitializer extends
-        AbstractAnnotationConfigDispatcherServletInitializer {
+		AbstractAnnotationConfigDispatcherServletInitializer {
 
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        return new Class[] { RootConfiguration.class };
-    }
+	@Override
+	protected Class<?>[] getRootConfigClasses() {
+		return new Class[] { RootConfiguration.class };
+	}
 
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return new Class[] { WebMvcConfiguration.class };
-    }
+	@Override
+	protected Class<?>[] getServletConfigClasses() {
+		return new Class[] { WebMvcConfiguration.class };
+	}
 
-    @Override
-    protected String[] getServletMappings() {
-        return new String[] { "/" };
-    }
+	@Override
+	protected String[] getServletMappings() {
+		return new String[] { "/" };
+	}
 
-    @Override
-    protected Filter[] getServletFilters() {
-        return new Filter[] { new HiddenHttpMethodFilter() };
-    }
+	@Override
+	protected Filter[] getServletFilters() {
+		return new Filter[] { new HiddenHttpMethodFilter() };
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java
index 2e31d2841c..f9bf59279c 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/data/Message.java
@@ -12,47 +12,47 @@ import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
 public class Message {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
 
-    @NotEmpty(message = "Message is required.")
-    private String text;
+	@NotEmpty(message = "Message is required.")
+	private String text;
 
-    @NotEmpty(message = "Summary is required.")
-    private String summary;
+	@NotEmpty(message = "Summary is required.")
+	private String summary;
 
-    private Calendar created = Calendar.getInstance();
+	private Calendar created = Calendar.getInstance();
 
-    public Long getId() {
-        return id;
-    }
+	public Long getId() {
+		return id;
+	}
 
-    public void setId(Long id) {
-        this.id = id;
-    }
+	public void setId(Long id) {
+		this.id = id;
+	}
 
-    public Calendar getCreated() {
-        return created;
-    }
+	public Calendar getCreated() {
+		return created;
+	}
 
-    public void setCreated(Calendar created) {
-        this.created = created;
-    }
+	public void setCreated(Calendar created) {
+		this.created = created;
+	}
 
-    public String getText() {
-        return text;
-    }
+	public String getText() {
+		return text;
+	}
 
-    public void setText(String text) {
-        this.text = text;
-    }
+	public void setText(String text) {
+		this.text = text;
+	}
 
-    public String getSummary() {
-        return summary;
-    }
+	public String getSummary() {
+		return summary;
+	}
 
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java
index c409e772b5..71774651d0 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/data/MessageRepository.java
@@ -6,7 +6,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 public interface MessageRepository extends CrudRepository<Message, Long> {
 
-    @Transactional
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
-    <S extends Message> S save(S entity);
+	@Transactional
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	<S extends Message> S save(S entity);
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java
index 0ceb105646..5193d3b740 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/DefaultController.java
@@ -6,8 +6,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Controller
 public class DefaultController {
 
-    @RequestMapping("/**")
-    public String notFound() {
-        return "errors/404";
-    }
+	@RequestMapping("/**")
+	public String notFound() {
+		return "errors/404";
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java
index 7cbd2f1f6f..9477c10000 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/MessageController.java
@@ -17,43 +17,44 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 @Controller
 @RequestMapping("/")
 public class MessageController {
-    private MessageRepository messageRepository;
+	private MessageRepository messageRepository;
 
-    @Autowired
-    public MessageController(MessageRepository messageRepository) {
-        this.messageRepository = messageRepository;
-    }
+	@Autowired
+	public MessageController(MessageRepository messageRepository) {
+		this.messageRepository = messageRepository;
+	}
 
-    @RequestMapping
-    public ModelAndView list() {
-        Iterable<Message> messages = messageRepository.findAll();
-        return new ModelAndView("messages/inbox", "messages", messages);
-    }
+	@RequestMapping
+	public ModelAndView list() {
+		Iterable<Message> messages = messageRepository.findAll();
+		return new ModelAndView("messages/inbox", "messages", messages);
+	}
 
-    @RequestMapping("{id}")
-    public ModelAndView view(@PathVariable("id") Message message) {
-        return new ModelAndView("messages/show", "message", message);
-    }
+	@RequestMapping("{id}")
+	public ModelAndView view(@PathVariable("id") Message message) {
+		return new ModelAndView("messages/show", "message", message);
+	}
 
-    @RequestMapping(value = "{id}", method=RequestMethod.DELETE)
-    public String delete(@PathVariable("id") Message message, RedirectAttributes redirect) {
-        messageRepository.delete(message);
-        redirect.addFlashAttribute("globalMessage", "Message removed successfully");
-        return "redirect:/";
-    }
+	@RequestMapping(value = "{id}", method = RequestMethod.DELETE)
+	public String delete(@PathVariable("id") Message message, RedirectAttributes redirect) {
+		messageRepository.delete(message);
+		redirect.addFlashAttribute("globalMessage", "Message removed successfully");
+		return "redirect:/";
+	}
 
-    @RequestMapping(params="form", method=RequestMethod.GET)
-    public String createForm(@ModelAttribute Message message) {
-        return "messages/compose";
-    }
+	@RequestMapping(params = "form", method = RequestMethod.GET)
+	public String createForm(@ModelAttribute Message message) {
+		return "messages/compose";
+	}
 
-    @RequestMapping(method=RequestMethod.POST)
-    public ModelAndView create(@Valid Message message, BindingResult result, RedirectAttributes redirect) {
-        if(result.hasErrors()) {
-            return new ModelAndView("messages/compose");
-        }
-        message = messageRepository.save(message);
-        redirect.addFlashAttribute("globalMessage", "Successfully created a new message");
-        return new ModelAndView("redirect:/{message.id}", "message.id", message.getId());
-    }
+	@RequestMapping(method = RequestMethod.POST)
+	public ModelAndView create(@Valid Message message, BindingResult result,
+			RedirectAttributes redirect) {
+		if (result.hasErrors()) {
+			return new ModelAndView("messages/compose");
+		}
+		message = messageRepository.save(message);
+		redirect.addFlashAttribute("globalMessage", "Successfully created a new message");
+		return new ModelAndView("redirect:/{message.id}", "message.id", message.getId());
+	}
 }
diff --git a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
index 166009ef4a..536fad8f6e 100644
--- a/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
+++ b/samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
@@ -21,55 +21,57 @@ import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 @ComponentScan("org.springframework.security.samples.mvc")
 public class WebMvcConfiguration extends WebMvcConfigurerAdapter {
 
-    @Autowired
-    private FormattingConversionService mvcConversionService;
+	@Autowired
+	private FormattingConversionService mvcConversionService;
 
-    @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/login").setViewName("login");
-        registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
-    }
+	@Override
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/login").setViewName("login");
+		registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
+	}
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/resources/**").addResourceLocations("classpath:/resources/").setCachePeriod(31556926);
-        registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
-    }
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/resources/**")
+				.addResourceLocations("classpath:/resources/").setCachePeriod(31556926);
+		registry.setOrder(Ordered.HIGHEST_PRECEDENCE);
+	}
 
-    @Bean
-    public ClassLoaderTemplateResolver templateResolver() {
-        ClassLoaderTemplateResolver result = new ClassLoaderTemplateResolver();
-        result.setPrefix("views/");
-        result.setSuffix(".html");
-        result.setTemplateMode("HTML5");
-        return result;
-    }
+	@Bean
+	public ClassLoaderTemplateResolver templateResolver() {
+		ClassLoaderTemplateResolver result = new ClassLoaderTemplateResolver();
+		result.setPrefix("views/");
+		result.setSuffix(".html");
+		result.setTemplateMode("HTML5");
+		return result;
+	}
 
-    @Bean
-    public ThymeleafTilesConfigurer tilesConfigurer() {
-        ThymeleafTilesConfigurer tilesConfigurer = new ThymeleafTilesConfigurer();
-        tilesConfigurer.setDefinitions(new String[] { "classpath:tiles/tiles-def.xml"});
-        return tilesConfigurer;
-    }
+	@Bean
+	public ThymeleafTilesConfigurer tilesConfigurer() {
+		ThymeleafTilesConfigurer tilesConfigurer = new ThymeleafTilesConfigurer();
+		tilesConfigurer.setDefinitions(new String[] { "classpath:tiles/tiles-def.xml" });
+		return tilesConfigurer;
+	}
 
-    @Bean
-    public SpringTemplateEngine templateEngine(ClassLoaderTemplateResolver templateResolver) {
-        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-        templateEngine.setTemplateResolver(templateResolver);
-        templateEngine.addDialect(new TilesDialect());
-        return templateEngine;
-    }
+	@Bean
+	public SpringTemplateEngine templateEngine(
+			ClassLoaderTemplateResolver templateResolver) {
+		SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+		templateEngine.setTemplateResolver(templateResolver);
+		templateEngine.addDialect(new TilesDialect());
+		return templateEngine;
+	}
 
-    @Bean
-    public ThymeleafViewResolver viewResolver(SpringTemplateEngine templateEngine) {
-        ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
-        viewResolver.setTemplateEngine(templateEngine);
-        viewResolver.setViewClass(ThymeleafTilesView.class);
-        return viewResolver;
-    }
+	@Bean
+	public ThymeleafViewResolver viewResolver(SpringTemplateEngine templateEngine) {
+		ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
+		viewResolver.setTemplateEngine(templateEngine);
+		viewResolver.setViewClass(ThymeleafTilesView.class);
+		return viewResolver;
+	}
 
-    @Bean
-    public DomainClassConverter<?> domainClassConverter() {
-        return new DomainClassConverter<FormattingConversionService>(mvcConversionService);
-    }
+	@Bean
+	public DomainClassConverter<?> domainClassConverter() {
+		return new DomainClassConverter<FormattingConversionService>(mvcConversionService);
+	}
 }
diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/openid-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index c764dd689c..ae09b2258c 100644
--- a/samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/openid-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,55 +1,56 @@
 package org.springframework.security.samples.config;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.samples.security.CustomUserDetailsService;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .antMatchers("/resources/**").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .openidLogin()
-                .loginPage("/login")
-                .permitAll()
-                .authenticationUserDetailsService(new CustomUserDetailsService())
-                .attributeExchange("https://www.google.com/.*")
-                    .attribute("email")
-                        .type("http://axschema.org/contact/email")
-                        .required(true)
-                        .and()
-                    .attribute("firstname")
-                        .type("http://axschema.org/namePerson/first")
-                        .required(true)
-                        .and()
-                    .attribute("lastname")
-                        .type("http://axschema.org/namePerson/last")
-                        .required(true)
-                        .and()
-                    .and()
-                .attributeExchange(".*yahoo.com.*")
-                    .attribute("email")
-                        .type("http://axschema.org/contact/email")
-                        .required(true)
-                        .and()
-                    .attribute("fullname")
-                        .type("http://axschema.org/namePerson")
-                        .required(true)
-                        .and()
-                    .and()
-                .attributeExchange(".*myopenid.com.*")
-                    .attribute("email")
-                        .type("http://schema.openid.net/contact/email")
-                        .required(true)
-                        .and()
-                    .attribute("fullname")
-                        .type("http://schema.openid.net/namePerson")
-                        .required(true);
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.antMatchers("/resources/**").permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.openidLogin()
+				.loginPage("/login")
+				.permitAll()
+				.authenticationUserDetailsService(new CustomUserDetailsService())
+				.attributeExchange("https://www.google.com/.*")
+					.attribute("email")
+						.type("http://axschema.org/contact/email")
+						.required(true)
+						.and()
+					.attribute("firstname")
+						.type("http://axschema.org/namePerson/first")
+						.required(true)
+						.and()
+					.attribute("lastname")
+						.type("http://axschema.org/namePerson/last")
+						.required(true)
+						.and()
+					.and()
+				.attributeExchange(".*yahoo.com.*")
+					.attribute("email")
+						.type("http://axschema.org/contact/email")
+						.required(true)
+						.and()
+					.attribute("fullname")
+						.type("http://axschema.org/namePerson")
+						.required(true)
+						.and()
+					.and()
+				.attributeExchange(".*myopenid.com.*")
+					.attribute("email")
+						.type("http://schema.openid.net/contact/email")
+						.required(true)
+						.and()
+					.attribute("fullname")
+						.type("http://schema.openid.net/namePerson")
+						.required(true);
+	}
+	// @formatter:on
 }
diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java b/samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java
index 179c3ab0e6..c7162e6fea 100644
--- a/samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java
+++ b/samples/openid-jc/src/main/java/org/springframework/security/samples/mvc/UserController.java
@@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 @RequestMapping("/user/")
 public class UserController {
 
-    @RequestMapping(method=RequestMethod.GET)
-    public String show(Model model, OpenIDAuthenticationToken authentication) {
-        model.addAttribute("authentication", authentication);
-        return "user/show";
-    }
+	@RequestMapping(method = RequestMethod.GET)
+	public String show(Model model, OpenIDAuthenticationToken authentication) {
+		model.addAttribute("authentication", authentication);
+		return "user/show";
+	}
 }
diff --git a/samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java b/samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java
index dd6d347e2f..c3c0b530e8 100644
--- a/samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java
+++ b/samples/openid-jc/src/main/java/org/springframework/security/samples/security/CustomUserDetailsService.java
@@ -22,9 +22,11 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.openid.OpenIDAuthenticationToken;
 
-public class CustomUserDetailsService implements AuthenticationUserDetailsService<OpenIDAuthenticationToken> {
-    public UserDetails loadUserDetails(OpenIDAuthenticationToken token)
-            throws UsernameNotFoundException {
-        return new User(token.getName(), "", AuthorityUtils.createAuthorityList("ROLE_USER"));
-    }
+public class CustomUserDetailsService implements
+		AuthenticationUserDetailsService<OpenIDAuthenticationToken> {
+	public UserDetails loadUserDetails(OpenIDAuthenticationToken token)
+			throws UsernameNotFoundException {
+		return new User(token.getName(), "",
+				AuthorityUtils.createAuthorityList("ROLE_USER"));
+	}
 }
\ No newline at end of file
diff --git a/samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 23fb47981c..f83a5e6148 100644
--- a/samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/openid-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -33,13 +33,15 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @ContextConfiguration
 @WebAppConfiguration
 public class SecurityConfigTests {
-    @Configuration
-    @ComponentScan(basePackages = "org.springframework.security.samples.config")
-    public static class Config {}
+	@Configuration
+	@ComponentScan(basePackages = "org.springframework.security.samples.config")
+	public static class Config {
+	}
 
-    @Autowired
-    private FilterChainProxy springSecurityFilterChain;
+	@Autowired
+	private FilterChainProxy springSecurityFilterChain;
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java b/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java
index 4175d2893d..6522aaa816 100644
--- a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java
+++ b/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetails.java
@@ -12,36 +12,35 @@ import org.springframework.security.core.userdetails.User;
  * @since 3.1
  */
 public class CustomUserDetails extends User {
-    private String email;
-    private String name;
-    private boolean newUser;
+	private String email;
+	private String name;
+	private boolean newUser;
 
-    public CustomUserDetails(String username, Collection<GrantedAuthority> authorities) {
-        super(username, "unused", authorities);
-    }
+	public CustomUserDetails(String username, Collection<GrantedAuthority> authorities) {
+		super(username, "unused", authorities);
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getEmail() {
+		return email;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email) {
+		this.email = email;
+	}
 
-    public boolean isNewUser() {
-        return newUser;
-    }
+	public boolean isNewUser() {
+		return newUser;
+	}
 
-    public void setNewUser(boolean newUser) {
-        this.newUser = newUser;
-    }
+	public void setNewUser(boolean newUser) {
+		this.newUser = newUser;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }
-
diff --git a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java b/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java
index b889a78daa..751b798b62 100644
--- a/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java
+++ b/samples/openid-xml/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java
@@ -14,94 +14,97 @@ import org.springframework.security.openid.OpenIDAttribute;
 import org.springframework.security.openid.OpenIDAuthenticationToken;
 
 /**
- * Custom UserDetailsService which accepts any OpenID user, "registering" new users in a map so they can be welcomed
- * back to the site on subsequent logins.
+ * Custom UserDetailsService which accepts any OpenID user, "registering" new users in a
+ * map so they can be welcomed back to the site on subsequent logins.
  *
  * @author Luke Taylor
  * @since 3.1
  */
-public class CustomUserDetailsService implements UserDetailsService, AuthenticationUserDetailsService<OpenIDAuthenticationToken> {
+public class CustomUserDetailsService implements UserDetailsService,
+		AuthenticationUserDetailsService<OpenIDAuthenticationToken> {
 
-    private final Map<String, CustomUserDetails> registeredUsers = new HashMap<String, CustomUserDetails>();
+	private final Map<String, CustomUserDetails> registeredUsers = new HashMap<String, CustomUserDetails>();
 
-    private static final List<GrantedAuthority> DEFAULT_AUTHORITIES = AuthorityUtils.createAuthorityList("ROLE_USER");
+	private static final List<GrantedAuthority> DEFAULT_AUTHORITIES = AuthorityUtils
+			.createAuthorityList("ROLE_USER");
 
-    /**
-     * Implementation of {@code UserDetailsService}. We only need this to satisfy the {@code RememberMeServices}
-     * requirements.
-     */
-    public UserDetails loadUserByUsername(String id) throws UsernameNotFoundException {
-        UserDetails user = registeredUsers.get(id);
+	/**
+	 * Implementation of {@code UserDetailsService}. We only need this to satisfy the
+	 * {@code RememberMeServices} requirements.
+	 */
+	public UserDetails loadUserByUsername(String id) throws UsernameNotFoundException {
+		UserDetails user = registeredUsers.get(id);
 
-        if (user == null) {
-            throw new UsernameNotFoundException(id);
-        }
+		if (user == null) {
+			throw new UsernameNotFoundException(id);
+		}
 
-        return user;
-    }
+		return user;
+	}
 
-    /**
-     * Implementation of {@code AuthenticationUserDetailsService} which allows full access to the submitted
-     * {@code Authentication} object. Used by the OpenIDAuthenticationProvider.
-     */
-    public UserDetails loadUserDetails(OpenIDAuthenticationToken token) {
-        String id = token.getIdentityUrl();
+	/**
+	 * Implementation of {@code AuthenticationUserDetailsService} which allows full access
+	 * to the submitted {@code Authentication} object. Used by the
+	 * OpenIDAuthenticationProvider.
+	 */
+	public UserDetails loadUserDetails(OpenIDAuthenticationToken token) {
+		String id = token.getIdentityUrl();
 
-        CustomUserDetails user = registeredUsers.get(id);
+		CustomUserDetails user = registeredUsers.get(id);
 
-        if (user != null) {
-            return user;
-        }
+		if (user != null) {
+			return user;
+		}
 
-        String email = null;
-        String firstName = null;
-        String lastName = null;
-        String fullName = null;
+		String email = null;
+		String firstName = null;
+		String lastName = null;
+		String fullName = null;
 
-        List<OpenIDAttribute> attributes = token.getAttributes();
+		List<OpenIDAttribute> attributes = token.getAttributes();
 
-        for (OpenIDAttribute attribute : attributes) {
-            if (attribute.getName().equals("email")) {
-                email = attribute.getValues().get(0);
-            }
+		for (OpenIDAttribute attribute : attributes) {
+			if (attribute.getName().equals("email")) {
+				email = attribute.getValues().get(0);
+			}
 
-            if (attribute.getName().equals("firstname")) {
-                firstName = attribute.getValues().get(0);
-            }
+			if (attribute.getName().equals("firstname")) {
+				firstName = attribute.getValues().get(0);
+			}
 
-            if (attribute.getName().equals("lastname")) {
-                lastName = attribute.getValues().get(0);
-            }
+			if (attribute.getName().equals("lastname")) {
+				lastName = attribute.getValues().get(0);
+			}
 
-            if (attribute.getName().equals("fullname")) {
-                fullName = attribute.getValues().get(0);
-            }
-        }
+			if (attribute.getName().equals("fullname")) {
+				fullName = attribute.getValues().get(0);
+			}
+		}
 
-        if (fullName == null) {
-            StringBuilder fullNameBldr = new StringBuilder();
+		if (fullName == null) {
+			StringBuilder fullNameBldr = new StringBuilder();
 
-            if (firstName != null) {
-                fullNameBldr.append(firstName);
-            }
+			if (firstName != null) {
+				fullNameBldr.append(firstName);
+			}
 
-            if (lastName != null) {
-                fullNameBldr.append(" ").append(lastName);
-            }
-            fullName = fullNameBldr.toString();
-        }
+			if (lastName != null) {
+				fullNameBldr.append(" ").append(lastName);
+			}
+			fullName = fullNameBldr.toString();
+		}
 
-        user = new CustomUserDetails(id, DEFAULT_AUTHORITIES);
-        user.setEmail(email);
-        user.setName(fullName);
+		user = new CustomUserDetails(id, DEFAULT_AUTHORITIES);
+		user.setEmail(email);
+		user.setName(fullName);
 
-        registeredUsers.put(id, user);
+		registeredUsers.put(id, user);
 
-        user = new CustomUserDetails(id, DEFAULT_AUTHORITIES);
-        user.setEmail(email);
-        user.setName(fullName);
-        user.setNewUser(true);
+		user = new CustomUserDetails(id, DEFAULT_AUTHORITIES);
+		user.setEmail(email);
+		user.setName(fullName);
+		user.setNewUser(true);
 
-        return user;
-    }
+		return user;
+	}
 }
diff --git a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index c40cf6580e..1b0023f1dd 100644
--- a/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/preauth-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,21 +1,22 @@
 package org.springframework.security.samples.config;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .antMatchers("/login","/resources/**").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .jee()
-                .mappableRoles("USER","ADMIN");
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.antMatchers("/login","/resources/**").permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.jee()
+				.mappableRoles("USER","ADMIN");
+	}
+	// @formatter:on
 }
diff --git a/samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/preauth-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index fa3528f15c..b07beac774 100644
--- a/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/rememberme-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,35 +1,38 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Autowired
-    public void configureGlobal(
-            AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER").and()
-                .withUser("admin").password("password").roles("USER", "ADMIN");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(
+			AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER").and()
+				.withUser("admin").password("password").roles("USER", "ADMIN");
+	}
+	// @formatter:on
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .antMatchers("/resources/**").permitAll()
-                .anyRequest().authenticated()
-                .and()
-            .formLogin()
-                .loginPage("/login")
-                .permitAll()
-                .and()
-            .rememberMe();
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.antMatchers("/resources/**").permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin()
+				.loginPage("/login")
+				.permitAll()
+				.and()
+			.rememberMe();
+	}
+	// @formatter:on
 }
diff --git a/samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/rememberme-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java
index fc5a0eb117..49b9ef8302 100644
--- a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java
+++ b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/LoginForm.java
@@ -18,19 +18,22 @@ package org.springframework.security.samples.servletapi.mvc;
  *
  */
 public class LoginForm {
-    private String username;
-    private String password;
+	private String username;
+	private String password;
 
-    public String getUsername() {
-        return username;
-    }
-    public void setUsername(String username) {
-        this.username = username;
-    }
-    public String getPassword() {
-        return password;
-    }
-    public void setPassword(String password) {
-        this.password = password;
-    }
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
 }
\ No newline at end of file
diff --git a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
index 9e3a584d1a..17c113f253 100644
--- a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
+++ b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
@@ -34,18 +34,22 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 /**
- * A Spring MVC Controller that demonstrates Spring Security's integration with the standard Servlet API's. Specifically
- * it demonstrates the following:
+ * A Spring MVC Controller that demonstrates Spring Security's integration with the
+ * standard Servlet API's. Specifically it demonstrates the following:
  * <ul>
  * <li>{@link #authenticate(HttpServletRequest, HttpServletResponse)} - Integration with
  * {@link HttpServletRequest#authenticate(HttpServletResponse)}</li>
- * <li>{@link #login(HttpServletRequest, HttpServletResponse, LoginForm, BindingResult)} - Integration with
- * {@link HttpServletRequest#login(String, String)}</li>
- * <li>{@link #logout(HttpServletRequest, HttpServletResponse)} - Integration with {@link HttpServletRequest#logout()}</li>
- * <li>{@link #remoteUser(HttpServletRequest)} - Integration with {@link HttpServletRequest#getRemoteUser()}</li>
- * <li>{@link #userPrincipal(HttpServletRequest)} - Integration with {@link HttpServletRequest#getUserPrincipal()}</li>
- * <li>{@link #authentication(Authentication)} - Spring MVC's ability to resolve the {@link Authentication} since it is
- * found on {@link HttpServletRequest#getUserPrincipal()}</li>
+ * <li>{@link #login(HttpServletRequest, HttpServletResponse, LoginForm, BindingResult)} -
+ * Integration with {@link HttpServletRequest#login(String, String)}</li>
+ * <li>{@link #logout(HttpServletRequest, HttpServletResponse)} - Integration with
+ * {@link HttpServletRequest#logout()}</li>
+ * <li>{@link #remoteUser(HttpServletRequest)} - Integration with
+ * {@link HttpServletRequest#getRemoteUser()}</li>
+ * <li>{@link #userPrincipal(HttpServletRequest)} - Integration with
+ * {@link HttpServletRequest#getUserPrincipal()}</li>
+ * <li>{@link #authentication(Authentication)} - Spring MVC's ability to resolve the
+ * {@link Authentication} since it is found on
+ * {@link HttpServletRequest#getUserPrincipal()}</li>
  * </ul>
  *
  * @author Rob Winch
@@ -53,140 +57,155 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  */
 @Controller
 public class ServletApiController {
-    /**
-     * Demonstrates that {@link HttpServletRequest#authenticate(HttpServletResponse)} will send the user to the log in
-     * page configured within Spring Security if the user is not already authenticated.
-     *
-     * @param request
-     * @param response
-     * @return
-     * @throws ServletException
-     * @throws IOException
-     */
-    @RequestMapping("/authenticate")
-    public String authenticate(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        boolean authenticate = request.authenticate(response);
-        return authenticate ? "index" : null;
-    }
+	/**
+	 * Demonstrates that {@link HttpServletRequest#authenticate(HttpServletResponse)} will
+	 * send the user to the log in page configured within Spring Security if the user is
+	 * not already authenticated.
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws ServletException
+	 * @throws IOException
+	 */
+	@RequestMapping("/authenticate")
+	public String authenticate(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+		boolean authenticate = request.authenticate(response);
+		return authenticate ? "index" : null;
+	}
 
-    /**
-     * Demonstrates that you can authenticate with Spring Security using
-     * {@link HttpServletRequest#login(String, String)}.
-     *
-     * <p>
-     * If we fail to authenticate, a {@link ServletException} is thrown that wraps the original
-     * {@link AuthenticationException} from Spring Security. This means we can catch the {@link ServletException} to
-     * display the error message. Alternatively, we could allow the {@link ServletException} to propegate and Spring
-     * Security's {@link ExceptionTranslationFilter} would catch it and process it appropriately.
-     * </p>
-     * <p>
-     * In this method we choose to use Spring MVC's {@link ModelAttribute} to make things easier for our form. However,
-     * this is not necessary. We could have just as easily obtained the request parameters from the
-     * {@link HttpServletRequest} object. Remember all of these examples would work in a standard {@link Servlet} or
-     * anything with access to the {@link HttpServletRequest} and {@link HttpServletResponse}.
-     * </p>
-     *
-     * @param request
-     * @param response
-     * @param loginForm
-     * @param result
-     * @return
-     * @throws ServletException
-     */
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    public String login(HttpServletRequest request, HttpServletResponse response,
-            @ModelAttribute LoginForm loginForm, BindingResult result) throws ServletException {
-        try {
-            request.login(loginForm.getUsername(), loginForm.getPassword());
-        } catch(ServletException authenticationFailed) {
-            result.rejectValue(null, "authentication.failed", authenticationFailed.getMessage());
-            return "login";
-        }
-        return "redirect:/";
-    }
+	/**
+	 * Demonstrates that you can authenticate with Spring Security using
+	 * {@link HttpServletRequest#login(String, String)}.
+	 *
+	 * <p>
+	 * If we fail to authenticate, a {@link ServletException} is thrown that wraps the
+	 * original {@link AuthenticationException} from Spring Security. This means we can
+	 * catch the {@link ServletException} to display the error message. Alternatively, we
+	 * could allow the {@link ServletException} to propegate and Spring Security's
+	 * {@link ExceptionTranslationFilter} would catch it and process it appropriately.
+	 * </p>
+	 * <p>
+	 * In this method we choose to use Spring MVC's {@link ModelAttribute} to make things
+	 * easier for our form. However, this is not necessary. We could have just as easily
+	 * obtained the request parameters from the {@link HttpServletRequest} object.
+	 * Remember all of these examples would work in a standard {@link Servlet} or anything
+	 * with access to the {@link HttpServletRequest} and {@link HttpServletResponse}.
+	 * </p>
+	 *
+	 * @param request
+	 * @param response
+	 * @param loginForm
+	 * @param result
+	 * @return
+	 * @throws ServletException
+	 */
+	@RequestMapping(value = "/login", method = RequestMethod.POST)
+	public String login(HttpServletRequest request, HttpServletResponse response,
+			@ModelAttribute LoginForm loginForm, BindingResult result)
+			throws ServletException {
+		try {
+			request.login(loginForm.getUsername(), loginForm.getPassword());
+		}
+		catch (ServletException authenticationFailed) {
+			result.rejectValue(null, "authentication.failed",
+					authenticationFailed.getMessage());
+			return "login";
+		}
+		return "redirect:/";
+	}
 
-    /**
-     * Demonstrates that invoking {@link HttpServletRequest#logout()} will log the user out. Note that the response does
-     * not get processed, so you need to write something to the response.
-     * @param request
-     * @param response
-     * @param redirect
-     * @return
-     * @throws ServletException
-     */
-    @RequestMapping("/logout")
-    public String logout(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirect) throws ServletException {
-        request.logout();
-        return "redirect:/";
-    }
+	/**
+	 * Demonstrates that invoking {@link HttpServletRequest#logout()} will log the user
+	 * out. Note that the response does not get processed, so you need to write something
+	 * to the response.
+	 * @param request
+	 * @param response
+	 * @param redirect
+	 * @return
+	 * @throws ServletException
+	 */
+	@RequestMapping("/logout")
+	public String logout(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirect) throws ServletException {
+		request.logout();
+		return "redirect:/";
+	}
 
-    /**
-     * Demonstrates Spring Security with {@link AsyncContext#start(Runnable)}. Spring Security will automatically
-     * transfer the {@link SecurityContext} from the thread that {@link AsyncContext#start(Runnable)} is invoked to the
-     * new Thread that invokes the {@link Runnable}.
-     * @param request
-     * @param response
-     */
-    @RequestMapping("/async")
-    public void asynch(HttpServletRequest request, HttpServletResponse response) {
-        final AsyncContext async = request.startAsync();
-        async.start(new Runnable() {
-            public void run() {
-                Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-                try {
-                    final HttpServletResponse asyncResponse = (HttpServletResponse) async.getResponse();
-                    asyncResponse.setStatus(HttpServletResponse.SC_OK);
-                    asyncResponse.getWriter().write(String.valueOf(authentication));
-                    async.complete();
-                } catch(Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        });
-    }
+	/**
+	 * Demonstrates Spring Security with {@link AsyncContext#start(Runnable)}. Spring
+	 * Security will automatically transfer the {@link SecurityContext} from the thread
+	 * that {@link AsyncContext#start(Runnable)} is invoked to the new Thread that invokes
+	 * the {@link Runnable}.
+	 * @param request
+	 * @param response
+	 */
+	@RequestMapping("/async")
+	public void asynch(HttpServletRequest request, HttpServletResponse response) {
+		final AsyncContext async = request.startAsync();
+		async.start(new Runnable() {
+			public void run() {
+				Authentication authentication = SecurityContextHolder.getContext()
+						.getAuthentication();
+				try {
+					final HttpServletResponse asyncResponse = (HttpServletResponse) async
+							.getResponse();
+					asyncResponse.setStatus(HttpServletResponse.SC_OK);
+					asyncResponse.getWriter().write(String.valueOf(authentication));
+					async.complete();
+				}
+				catch (Exception e) {
+					throw new RuntimeException(e);
+				}
+			}
+		});
+	}
 
-    /**
-     * Demonstrates that Spring Security automatically populates {@link HttpServletRequest#getRemoteUser()} with the
-     * current username.
-     * @param request
-     * @return
-     */
-    @ModelAttribute("remoteUser")
-    public String remoteUser(HttpServletRequest request) {
-        return request.getRemoteUser();
-    }
+	/**
+	 * Demonstrates that Spring Security automatically populates
+	 * {@link HttpServletRequest#getRemoteUser()} with the current username.
+	 * @param request
+	 * @return
+	 */
+	@ModelAttribute("remoteUser")
+	public String remoteUser(HttpServletRequest request) {
+		return request.getRemoteUser();
+	}
 
-    /**
-     * Demonstrates that Spring Security automatically populates {@link HttpServletRequest#getUserPrincipal()} with the
-     * {@link Authentication} that is present on {@link SecurityContextHolder#getContext()}
-     * @param request
-     * @return
-     */
-    @ModelAttribute("userPrincipal")
-    public Principal userPrincipal(HttpServletRequest request) {
-        return request.getUserPrincipal();
-    }
+	/**
+	 * Demonstrates that Spring Security automatically populates
+	 * {@link HttpServletRequest#getUserPrincipal()} with the {@link Authentication} that
+	 * is present on {@link SecurityContextHolder#getContext()}
+	 * @param request
+	 * @return
+	 */
+	@ModelAttribute("userPrincipal")
+	public Principal userPrincipal(HttpServletRequest request) {
+		return request.getUserPrincipal();
+	}
 
-    /**
-     * Spring MVC will automatically resolve any object that implements {@link Principal} using
-     * {@link HttpServletRequest#getUserPrincipal()}. This means you can easily resolve the {@link Authentication} just
-     * by adding it as an argument to your MVC controller. Alternatively, you could also have an argument of type
-     * {@link Principal} which would not couple your controller to Spring Security.
-     * @param authentication
-     * @return
-     */
-    @ModelAttribute
-    public Authentication authentication(Authentication authentication) {
-        return authentication;
-    }
+	/**
+	 * Spring MVC will automatically resolve any object that implements {@link Principal}
+	 * using {@link HttpServletRequest#getUserPrincipal()}. This means you can easily
+	 * resolve the {@link Authentication} just by adding it as an argument to your MVC
+	 * controller. Alternatively, you could also have an argument of type
+	 * {@link Principal} which would not couple your controller to Spring Security.
+	 * @param authentication
+	 * @return
+	 */
+	@ModelAttribute
+	public Authentication authentication(Authentication authentication) {
+		return authentication;
+	}
 
-    @RequestMapping("/")
-    public String welcome() {
-        return "index";
-    }
+	@RequestMapping("/")
+	public String welcome() {
+		return "index";
+	}
 
-    @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public String login(@ModelAttribute LoginForm loginForm) {
-        return "login";
-    }
+	@RequestMapping(value = "/login", method = RequestMethod.GET)
+	public String login(@ModelAttribute LoginForm loginForm) {
+		return "login";
+	}
 }
\ No newline at end of file
diff --git a/samples/tutorial-xml/src/main/java/bigbank/Account.java b/samples/tutorial-xml/src/main/java/bigbank/Account.java
index 5d3fbee0d5..b18413fbf7 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/Account.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/Account.java
@@ -1,56 +1,57 @@
 package bigbank;
 
 /**
- * Note this class does not represent best practice, as we are failing to
- * encapsulate business logic (methods) and state in the domain object.
- * Nevertheless, this demo is intended to reflect what people usually do,
- * as opposed to what they ideally would be doing.
+ * Note this class does not represent best practice, as we are failing to encapsulate
+ * business logic (methods) and state in the domain object. Nevertheless, this demo is
+ * intended to reflect what people usually do, as opposed to what they ideally would be
+ * doing.
  *
  * @author Ben Alex
  */
 public class Account {
-    private long id = -1;
-    private String holder;
-    private double balance;
-    private double overdraft = 100.00;
+	private long id = -1;
+	private String holder;
+	private double balance;
+	private double overdraft = 100.00;
 
-    public Account(String holder) {
-        this.holder = holder;
-    }
+	public Account(String holder) {
+		this.holder = holder;
+	}
 
-    public long getId() {
-        return id;
-    }
+	public long getId() {
+		return id;
+	}
 
-    public void setId(long id) {
-        this.id = id;
-    }
+	public void setId(long id) {
+		this.id = id;
+	}
 
-    public String getHolder() {
-        return holder;
-    }
+	public String getHolder() {
+		return holder;
+	}
 
-    public void setHolder(String holder) {
-        this.holder = holder;
-    }
+	public void setHolder(String holder) {
+		this.holder = holder;
+	}
 
-    public double getBalance() {
-        return balance;
-    }
+	public double getBalance() {
+		return balance;
+	}
 
-    public void setBalance(double balance) {
-        this.balance = balance;
-    }
+	public void setBalance(double balance) {
+		this.balance = balance;
+	}
 
-    public double getOverdraft() {
-        return overdraft;
-    }
+	public double getOverdraft() {
+		return overdraft;
+	}
 
-    public void setOverdraft(double overdraft) {
-        this.overdraft = overdraft;
-    }
+	public void setOverdraft(double overdraft) {
+		this.overdraft = overdraft;
+	}
 
-    public String toString() {
-        return "Account[id=" + id + ",balance=" + balance +",holder=" + holder + ", overdraft=" + overdraft + "]";
-    }
+	public String toString() {
+		return "Account[id=" + id + ",balance=" + balance + ",holder=" + holder
+				+ ", overdraft=" + overdraft + "]";
+	}
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankDao.java b/samples/tutorial-xml/src/main/java/bigbank/BankDao.java
index 6c22619305..ad72142f5d 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/BankDao.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/BankDao.java
@@ -1,7 +1,9 @@
 package bigbank;
 
 public interface BankDao {
-    public Account readAccount(Long id);
-    public void createOrUpdateAccount(Account account);
-    public Account[] findAccounts();
+	public Account readAccount(Long id);
+
+	public void createOrUpdateAccount(Account account);
+
+	public Account[] findAccounts();
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java b/samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java
index d322d78836..a6533a2042 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/BankDaoStub.java
@@ -4,29 +4,29 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class BankDaoStub implements BankDao {
-    private long id = 0;
-    private final Map<Long, Account> accounts = new HashMap<Long, Account>();
+	private long id = 0;
+	private final Map<Long, Account> accounts = new HashMap<Long, Account>();
 
-    public void createOrUpdateAccount(Account account) {
-        if (account.getId() == -1) {
-            id++;
-            account.setId(id);
-        }
-        accounts.put(new Long(account.getId()), account);
-        System.out.println("SAVE: " + account);
-    }
+	public void createOrUpdateAccount(Account account) {
+		if (account.getId() == -1) {
+			id++;
+			account.setId(id);
+		}
+		accounts.put(new Long(account.getId()), account);
+		System.out.println("SAVE: " + account);
+	}
 
-    public Account[] findAccounts() {
-        Account[] accounts = this.accounts.values().toArray(new Account[] {});
-        System.out.println("Returning " + accounts.length + " account(s):");
-        for (Account account : accounts) {
-            System.out.println(" > " + account);
-        }
-        return accounts;
-    }
+	public Account[] findAccounts() {
+		Account[] accounts = this.accounts.values().toArray(new Account[] {});
+		System.out.println("Returning " + accounts.length + " account(s):");
+		for (Account account : accounts) {
+			System.out.println(" > " + account);
+		}
+		return accounts;
+	}
 
-    public Account readAccount(Long id) {
-        return accounts.get(id);
-    }
+	public Account readAccount(Long id) {
+		return accounts.get(id);
+	}
 
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankService.java b/samples/tutorial-xml/src/main/java/bigbank/BankService.java
index 8fa0d6ac92..a69e0f73fb 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/BankService.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/BankService.java
@@ -2,15 +2,13 @@ package bigbank;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 
-
 public interface BankService {
 
-    public Account readAccount(Long id);
+	public Account readAccount(Long id);
 
-    public Account[] findAccounts();
+	public Account[] findAccounts();
 
-    @PreAuthorize(
-            "hasRole('supervisor') or " +
-            "hasRole('teller') and (#account.balance + #amount >= -#account.overdraft)" )
-    public Account post(Account account, double amount);
+	@PreAuthorize("hasRole('supervisor') or "
+			+ "hasRole('teller') and (#account.balance + #amount >= -#account.overdraft)")
+	public Account post(Account account, double amount);
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java b/samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java
index a6309564c8..859e2afdd2 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/BankServiceImpl.java
@@ -3,32 +3,32 @@ package bigbank;
 import org.springframework.util.Assert;
 
 public class BankServiceImpl implements BankService {
-    private final BankDao bankDao;
+	private final BankDao bankDao;
 
-    public BankServiceImpl(BankDao bankDao) {
-        Assert.notNull(bankDao);
-        this.bankDao = bankDao;
-    }
+	public BankServiceImpl(BankDao bankDao) {
+		Assert.notNull(bankDao);
+		this.bankDao = bankDao;
+	}
 
-    public Account[] findAccounts() {
-        return this.bankDao.findAccounts();
-    }
+	public Account[] findAccounts() {
+		return this.bankDao.findAccounts();
+	}
 
-    public Account post(Account account, double amount) {
-        Assert.notNull(account);
+	public Account post(Account account, double amount) {
+		Assert.notNull(account);
 
-        // We read account back from DAO so it reflects the latest balance
-        Account a = bankDao.readAccount(account.getId());
-        if (a == null) {
-            throw new IllegalArgumentException("Couldn't find requested account");
-        }
+		// We read account back from DAO so it reflects the latest balance
+		Account a = bankDao.readAccount(account.getId());
+		if (a == null) {
+			throw new IllegalArgumentException("Couldn't find requested account");
+		}
 
-        a.setBalance(a.getBalance() + amount);
-        bankDao.createOrUpdateAccount(a);
-        return a;
-    }
+		a.setBalance(a.getBalance() + amount);
+		bankDao.createOrUpdateAccount(a);
+		return a;
+	}
 
-    public Account readAccount(Long id) {
-        return bankDao.readAccount(id);
-    }
+	public Account readAccount(Long id) {
+		return bankDao.readAccount(id);
+	}
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/SeedData.java b/samples/tutorial-xml/src/main/java/bigbank/SeedData.java
index 6eaf6ec16c..e5f6b552a4 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/SeedData.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/SeedData.java
@@ -3,19 +3,19 @@ package bigbank;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-public class SeedData implements InitializingBean{
-    private BankDao bankDao;
+public class SeedData implements InitializingBean {
+	private BankDao bankDao;
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(bankDao);
-        bankDao.createOrUpdateAccount(new Account("rod"));
-        bankDao.createOrUpdateAccount(new Account("dianne"));
-        bankDao.createOrUpdateAccount(new Account("scott"));
-        bankDao.createOrUpdateAccount(new Account("peter"));
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(bankDao);
+		bankDao.createOrUpdateAccount(new Account("rod"));
+		bankDao.createOrUpdateAccount(new Account("dianne"));
+		bankDao.createOrUpdateAccount(new Account("scott"));
+		bankDao.createOrUpdateAccount(new Account("peter"));
+	}
 
-    public void setBankDao(BankDao bankDao) {
-        this.bankDao = bankDao;
-    }
+	public void setBankDao(BankDao bankDao) {
+		this.bankDao = bankDao;
+	}
 
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java b/samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java
index 2428c82746..f4b762765e 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/web/ListAccounts.java
@@ -11,23 +11,27 @@ import bigbank.BankService;
 
 public class ListAccounts implements Controller {
 
-    private final BankService bankService;
+	private final BankService bankService;
 
-    public ListAccounts(BankService bankService) {
-        Assert.notNull(bankService);
-        this.bankService = bankService;
-    }
+	public ListAccounts(BankService bankService) {
+		Assert.notNull(bankService);
+		this.bankService = bankService;
+	}
 
-    public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        // Security check (this is unnecessary if Spring Security is performing the authorization)
-//        if (request.getUserPrincipal() == null) {
-//            throw new AuthenticationCredentialsNotFoundException("You must login to view the account list (Spring Security message)"); // only for Spring Security managed authentication
-//        }
+	public ModelAndView handleRequest(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+		// Security check (this is unnecessary if Spring Security is performing the
+		// authorization)
+		// if (request.getUserPrincipal() == null) {
+		// throw new
+		// AuthenticationCredentialsNotFoundException("You must login to view the account list (Spring Security message)");
+		// // only for Spring Security managed authentication
+		// }
 
-        // Actual business logic
-        ModelAndView mav = new ModelAndView("listAccounts");
-        mav.addObject("accounts", bankService.findAccounts());
-        return mav;
-    }
+		// Actual business logic
+		ModelAndView mav = new ModelAndView("listAccounts");
+		mav.addObject("accounts", bankService.findAccounts());
+		return mav;
+	}
 
 }
diff --git a/samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java b/samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java
index 53ffe5c20c..a93285a3fa 100644
--- a/samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java
+++ b/samples/tutorial-xml/src/main/java/bigbank/web/PostAccounts.java
@@ -13,26 +13,29 @@ import bigbank.BankService;
 
 public class PostAccounts implements Controller {
 
-    private final BankService bankService;
+	private final BankService bankService;
 
-    public PostAccounts(BankService bankService) {
-        Assert.notNull(bankService);
-        this.bankService = bankService;
-    }
+	public PostAccounts(BankService bankService) {
+		Assert.notNull(bankService);
+		this.bankService = bankService;
+	}
 
-    public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        // Security check (this is unnecessary if Spring Security is performing the authorization)
-//        if (!request.isUserInRole("ROLE_TELLER")) {
-//            throw new AccessDeniedException("You must be a teller to post transactions (Spring Security message)");
-//        }
+	public ModelAndView handleRequest(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+		// Security check (this is unnecessary if Spring Security is performing the
+		// authorization)
+		// if (!request.isUserInRole("ROLE_TELLER")) {
+		// throw new
+		// AccessDeniedException("You must be a teller to post transactions (Spring Security message)");
+		// }
 
-        // Actual business logic
-        Long id = ServletRequestUtils.getRequiredLongParameter(request, "id");
-        Double amount = ServletRequestUtils.getRequiredDoubleParameter(request, "amount");
-        Account a = bankService.readAccount(id);
-        bankService.post(a, amount);
+		// Actual business logic
+		Long id = ServletRequestUtils.getRequiredLongParameter(request, "id");
+		Double amount = ServletRequestUtils.getRequiredDoubleParameter(request, "amount");
+		Account a = bankService.readAccount(id);
+		bankService.post(a, amount);
 
-        return new ModelAndView("redirect:listAccounts.html");
-    }
+		return new ModelAndView("redirect:listAccounts.html");
+	}
 
 }
diff --git a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java b/samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
index efaf2f99cd..68ac5d78a9 100644
--- a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
+++ b/samples/x509-jc/src/main/java/org/springframework/security/samples/config/MessageSecurityWebApplicationInitializer.java
@@ -22,5 +22,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  *
  * @author Rob Winch
  */
-public class MessageSecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer {
+public class MessageSecurityWebApplicationInitializer extends
+		AbstractSecurityWebApplicationInitializer {
 }
diff --git a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java b/samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
index 69b91c6355..e212ba0870 100644
--- a/samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
+++ b/samples/x509-jc/src/main/java/org/springframework/security/samples/config/SecurityConfig.java
@@ -1,31 +1,34 @@
 package org.springframework.security.samples.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth)
-            throws Exception {
-        auth.
-            inMemoryAuthentication()
-                .withUser("dianne").password("password").roles("USER").and()
-                .withUser("rod").password("password").roles("USER","ADMIN").and()
-                .withUser("scott").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth)
+			throws Exception {
+		auth.
+			inMemoryAuthentication()
+				.withUser("dianne").password("password").roles("USER").and()
+				.withUser("rod").password("password").roles("USER","ADMIN").and()
+				.withUser("scott").password("password").roles("USER");
+	}
+	// @formatter:on
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
-            .x509();
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.anyRequest().authenticated()
+				.and()
+			.x509();
+	}
+	// @formatter:on
 }
diff --git a/samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java b/samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
index 53e0c04696..945766d2f2 100644
--- a/samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
+++ b/samples/x509-jc/src/test/java/org/springframework/security/samples/config/SecurityConfigTests.java
@@ -25,9 +25,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  *
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityConfig.class)
+@ContextConfiguration(classes = SecurityConfig.class)
 public class SecurityConfigTests {
 
-    @Test
-    public void securityConfigurationLoads() {}
+	@Test
+	public void securityConfigurationLoads() {
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/TagLibConfig.java b/taglibs/src/main/java/org/springframework/security/taglibs/TagLibConfig.java
index 232dfbcd25..234798c2e1 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/TagLibConfig.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/TagLibConfig.java
@@ -29,50 +29,50 @@ import javax.servlet.jsp.tagext.Tag;
  * @author Luke Taylor
  */
 public final class TagLibConfig {
-    static Log logger = LogFactory.getLog("spring-security-taglibs");
+	static Log logger = LogFactory.getLog("spring-security-taglibs");
 
-    static final boolean DISABLE_UI_SECURITY;
-    static final String SECURED_UI_PREFIX;
-    static final String SECURED_UI_SUFFIX;
+	static final boolean DISABLE_UI_SECURITY;
+	static final String SECURED_UI_PREFIX;
+	static final String SECURED_UI_SUFFIX;
 
-    static {
-        String db = System.getProperty("spring.security.disableUISecurity");
-        String prefix = System.getProperty("spring.security.securedUIPrefix");
-        String suffix = System.getProperty("spring.security.securedUISuffix");
+	static {
+		String db = System.getProperty("spring.security.disableUISecurity");
+		String prefix = System.getProperty("spring.security.securedUIPrefix");
+		String suffix = System.getProperty("spring.security.securedUISuffix");
 
-        SECURED_UI_PREFIX = prefix == null ? "<span class=\"securityHiddenUI\">" : prefix;
-        SECURED_UI_SUFFIX = suffix == null ? "</span>" : suffix;
+		SECURED_UI_PREFIX = prefix == null ? "<span class=\"securityHiddenUI\">" : prefix;
+		SECURED_UI_SUFFIX = suffix == null ? "</span>" : suffix;
 
-        DISABLE_UI_SECURITY = "true".equals(db);
+		DISABLE_UI_SECURITY = "true".equals(db);
 
-        if (DISABLE_UI_SECURITY) {
-            logger.warn("***** UI security is disabled. All unauthorized content will be displayed *****");
-        }
-    }
+		if (DISABLE_UI_SECURITY) {
+			logger.warn("***** UI security is disabled. All unauthorized content will be displayed *****");
+		}
+	}
 
-    /**
-     * Returns EVAL_BODY_INCLUDE if the authorized flag is true or UI security has been disabled.
-     * Otherwise returns SKIP_BODY.
-     *
-     * @param authorized whether the user is authorized to see the content or not
-     */
-    public static int evalOrSkip(boolean authorized) {
-        if (authorized || DISABLE_UI_SECURITY) {
-            return Tag.EVAL_BODY_INCLUDE;
-        }
+	/**
+	 * Returns EVAL_BODY_INCLUDE if the authorized flag is true or UI security has been
+	 * disabled. Otherwise returns SKIP_BODY.
+	 *
+	 * @param authorized whether the user is authorized to see the content or not
+	 */
+	public static int evalOrSkip(boolean authorized) {
+		if (authorized || DISABLE_UI_SECURITY) {
+			return Tag.EVAL_BODY_INCLUDE;
+		}
 
-        return Tag.SKIP_BODY;
-    }
+		return Tag.SKIP_BODY;
+	}
 
-    public static boolean isUiSecurityDisabled() {
-        return DISABLE_UI_SECURITY;
-    }
+	public static boolean isUiSecurityDisabled() {
+		return DISABLE_UI_SECURITY;
+	}
 
-    public static String getSecuredUiPrefix() {
-        return SECURED_UI_PREFIX;
-    }
+	public static String getSecuredUiPrefix() {
+		return SECURED_UI_PREFIX;
+	}
 
-    public static String getSecuredUiSuffix() {
-        return SECURED_UI_SUFFIX;
-    }
+	public static String getSecuredUiSuffix() {
+		return SECURED_UI_SUFFIX;
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
index d2376b698b..1ccaeb601f 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
@@ -41,12 +41,14 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * A base class for an &lt;authorize&gt; tag that is independent of the tag rendering technology (JSP, Facelets).
- * It treats tag attributes as simple strings rather than strings that may contain expressions with the
- * exception of the "access" attribute, which is always expected to contain a Spring EL expression.
+ * A base class for an &lt;authorize&gt; tag that is independent of the tag rendering
+ * technology (JSP, Facelets). It treats tag attributes as simple strings rather than
+ * strings that may contain expressions with the exception of the "access" attribute,
+ * which is always expected to contain a Spring EL expression.
  * <p/>
- * Subclasses are expected to extract tag attribute values from the specific rendering technology, evaluate
- * them as expressions if necessary, and set the String-based attributes of this class.
+ * Subclasses are expected to extract tag attribute values from the specific rendering
+ * technology, evaluate them as expressions if necessary, and set the String-based
+ * attributes of this class.
  *
  * @author Francois Beausoleil
  * @author Luke Taylor
@@ -55,169 +57,185 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  * @since 3.1.0
  */
 public abstract class AbstractAuthorizeTag {
-    private String access;
-    private String url;
-    private String method = "GET";
-    /**
-     * This method allows subclasses to provide a way to access the ServletRequest according to the rendering
-     * technology.
-     */
-    protected abstract ServletRequest getRequest();
+	private String access;
+	private String url;
+	private String method = "GET";
 
-    /**
-     * This method allows subclasses to provide a way to access the ServletResponse according to the rendering
-     * technology.
-     */
-    protected abstract ServletResponse getResponse();
+	/**
+	 * This method allows subclasses to provide a way to access the ServletRequest
+	 * according to the rendering technology.
+	 */
+	protected abstract ServletRequest getRequest();
 
-    /**
-     * This method allows subclasses to provide a way to access the ServletContext according to the rendering
-     * technology.
-     */
-    protected abstract ServletContext getServletContext();
+	/**
+	 * This method allows subclasses to provide a way to access the ServletResponse
+	 * according to the rendering technology.
+	 */
+	protected abstract ServletResponse getResponse();
 
-    /**
-     * Make an authorization decision by considering all &lt;authorize&gt; tag attributes. The following are valid
-     * combinations of attributes:
-     * <ul>
-     * <li>access</li>
-     * <li>url, method</li>
-     * </ul>
-     * The above combinations are mutually exclusive and evaluated in the given order.
-     *
-     * @return the result of the authorization decision
-     * @throws IOException
-     */
-    public boolean authorize() throws IOException {
-        boolean isAuthorized;
+	/**
+	 * This method allows subclasses to provide a way to access the ServletContext
+	 * according to the rendering technology.
+	 */
+	protected abstract ServletContext getServletContext();
 
-        if (StringUtils.hasText(getAccess())) {
-            isAuthorized = authorizeUsingAccessExpression();
+	/**
+	 * Make an authorization decision by considering all &lt;authorize&gt; tag attributes.
+	 * The following are valid combinations of attributes:
+	 * <ul>
+	 * <li>access</li>
+	 * <li>url, method</li>
+	 * </ul>
+	 * The above combinations are mutually exclusive and evaluated in the given order.
+	 *
+	 * @return the result of the authorization decision
+	 * @throws IOException
+	 */
+	public boolean authorize() throws IOException {
+		boolean isAuthorized;
 
-        } else if (StringUtils.hasText(getUrl())) {
-            isAuthorized = authorizeUsingUrlCheck();
+		if (StringUtils.hasText(getAccess())) {
+			isAuthorized = authorizeUsingAccessExpression();
 
-        } else {
-            isAuthorized = false;
+		}
+		else if (StringUtils.hasText(getUrl())) {
+			isAuthorized = authorizeUsingUrlCheck();
 
-        }
+		}
+		else {
+			isAuthorized = false;
 
-        return isAuthorized;
-    }
+		}
 
-    /**
-     * Make an authorization decision based on a Spring EL expression. See the "Expression-Based Access Control" chapter
-     * in Spring Security for details on what expressions can be used.
-     *
-     * @return the result of the authorization decision
-     * @throws IOException
-     */
-    public boolean authorizeUsingAccessExpression() throws IOException {
-        if (SecurityContextHolder.getContext().getAuthentication() == null) {
-            return false;
-        }
+		return isAuthorized;
+	}
 
-        SecurityExpressionHandler<FilterInvocation> handler = getExpressionHandler();
+	/**
+	 * Make an authorization decision based on a Spring EL expression. See the
+	 * "Expression-Based Access Control" chapter in Spring Security for details on what
+	 * expressions can be used.
+	 *
+	 * @return the result of the authorization decision
+	 * @throws IOException
+	 */
+	public boolean authorizeUsingAccessExpression() throws IOException {
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			return false;
+		}
 
-        Expression accessExpression;
-        try {
-            accessExpression = handler.getExpressionParser().parseExpression(getAccess());
+		SecurityExpressionHandler<FilterInvocation> handler = getExpressionHandler();
 
-        } catch (ParseException e) {
-            IOException ioException = new IOException();
-            ioException.initCause(e);
-            throw ioException;
-        }
+		Expression accessExpression;
+		try {
+			accessExpression = handler.getExpressionParser().parseExpression(getAccess());
 
-        return ExpressionUtils.evaluateAsBoolean(accessExpression, createExpressionEvaluationContext(handler));
-    }
+		}
+		catch (ParseException e) {
+			IOException ioException = new IOException();
+			ioException.initCause(e);
+			throw ioException;
+		}
 
-    /**
-     * Allows the {@code EvaluationContext} to be customized for variable lookup etc.
-     */
-    protected EvaluationContext createExpressionEvaluationContext(SecurityExpressionHandler<FilterInvocation> handler) {
-        FilterInvocation f = new FilterInvocation(getRequest(), getResponse(), new FilterChain() {
-            public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-                throw new UnsupportedOperationException();
-            }
-        });
+		return ExpressionUtils.evaluateAsBoolean(accessExpression,
+				createExpressionEvaluationContext(handler));
+	}
 
-        return handler.createEvaluationContext(SecurityContextHolder.getContext().getAuthentication(), f);
-    }
+	/**
+	 * Allows the {@code EvaluationContext} to be customized for variable lookup etc.
+	 */
+	protected EvaluationContext createExpressionEvaluationContext(
+			SecurityExpressionHandler<FilterInvocation> handler) {
+		FilterInvocation f = new FilterInvocation(getRequest(), getResponse(),
+				new FilterChain() {
+					public void doFilter(ServletRequest request, ServletResponse response)
+							throws IOException, ServletException {
+						throw new UnsupportedOperationException();
+					}
+				});
 
-    /**
-     * Make an authorization decision based on the URL and HTTP method attributes. True is returned if the user is
-     * allowed to access the given URL as defined.
-     *
-     * @return the result of the authorization decision
-     * @throws IOException
-     */
-    public boolean authorizeUsingUrlCheck() throws IOException {
-        String contextPath = ((HttpServletRequest) getRequest()).getContextPath();
-        Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
-        return getPrivilegeEvaluator().isAllowed(contextPath, getUrl(), getMethod(), currentUser);
-    }
+		return handler.createEvaluationContext(SecurityContextHolder.getContext()
+				.getAuthentication(), f);
+	}
 
-    public String getAccess() {
-        return access;
-    }
+	/**
+	 * Make an authorization decision based on the URL and HTTP method attributes. True is
+	 * returned if the user is allowed to access the given URL as defined.
+	 *
+	 * @return the result of the authorization decision
+	 * @throws IOException
+	 */
+	public boolean authorizeUsingUrlCheck() throws IOException {
+		String contextPath = ((HttpServletRequest) getRequest()).getContextPath();
+		Authentication currentUser = SecurityContextHolder.getContext()
+				.getAuthentication();
+		return getPrivilegeEvaluator().isAllowed(contextPath, getUrl(), getMethod(),
+				currentUser);
+	}
 
-    public void setAccess(String access) {
-        this.access = access;
-    }
+	public String getAccess() {
+		return access;
+	}
 
-    public String getUrl() {
-        return url;
-    }
+	public void setAccess(String access) {
+		this.access = access;
+	}
 
-    public void setUrl(String url) {
-        this.url = url;
-    }
+	public String getUrl() {
+		return url;
+	}
 
-    public String getMethod() {
-        return method;
-    }
+	public void setUrl(String url) {
+		this.url = url;
+	}
 
-    public void setMethod(String method) {
-        this.method = (method != null) ? method.toUpperCase() : null;
-    }
+	public String getMethod() {
+		return method;
+	}
 
-    /*------------- Private helper methods  -----------------*/
+	public void setMethod(String method) {
+		this.method = (method != null) ? method.toUpperCase() : null;
+	}
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    private SecurityExpressionHandler<FilterInvocation> getExpressionHandler() throws IOException {
-        ApplicationContext appContext = WebApplicationContextUtils
-                .getRequiredWebApplicationContext(getServletContext());
-        Map<String, SecurityExpressionHandler> handlers = appContext
-                .getBeansOfType(SecurityExpressionHandler.class);
+	/*------------- Private helper methods  -----------------*/
 
-        for (SecurityExpressionHandler h : handlers.values()) {
-            if (FilterInvocation.class.equals(GenericTypeResolver.resolveTypeArgument(h.getClass(),
-                    SecurityExpressionHandler.class))) {
-                return h;
-            }
-        }
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private SecurityExpressionHandler<FilterInvocation> getExpressionHandler()
+			throws IOException {
+		ApplicationContext appContext = WebApplicationContextUtils
+				.getRequiredWebApplicationContext(getServletContext());
+		Map<String, SecurityExpressionHandler> handlers = appContext
+				.getBeansOfType(SecurityExpressionHandler.class);
 
-        throw new IOException("No visible WebSecurityExpressionHandler instance could be found in the application "
-                + "context. There must be at least one in order to support expressions in JSP 'authorize' tags.");
-    }
+		for (SecurityExpressionHandler h : handlers.values()) {
+			if (FilterInvocation.class.equals(GenericTypeResolver.resolveTypeArgument(
+					h.getClass(), SecurityExpressionHandler.class))) {
+				return h;
+			}
+		}
 
-    private WebInvocationPrivilegeEvaluator getPrivilegeEvaluator() throws IOException {
-        WebInvocationPrivilegeEvaluator privEvaluatorFromRequest = (WebInvocationPrivilegeEvaluator) getRequest()
-                .getAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE);
-        if(privEvaluatorFromRequest != null) {
-            return privEvaluatorFromRequest;
-        }
+		throw new IOException(
+				"No visible WebSecurityExpressionHandler instance could be found in the application "
+						+ "context. There must be at least one in order to support expressions in JSP 'authorize' tags.");
+	}
 
-        ApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
-        Map<String, WebInvocationPrivilegeEvaluator> wipes = ctx.getBeansOfType(WebInvocationPrivilegeEvaluator.class);
+	private WebInvocationPrivilegeEvaluator getPrivilegeEvaluator() throws IOException {
+		WebInvocationPrivilegeEvaluator privEvaluatorFromRequest = (WebInvocationPrivilegeEvaluator) getRequest()
+				.getAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE);
+		if (privEvaluatorFromRequest != null) {
+			return privEvaluatorFromRequest;
+		}
 
-        if (wipes.size() == 0) {
-            throw new IOException(
-                    "No visible WebInvocationPrivilegeEvaluator instance could be found in the application "
-                            + "context. There must be at least one in order to support the use of URL access checks in 'authorize' tags.");
-        }
+		ApplicationContext ctx = WebApplicationContextUtils
+				.getRequiredWebApplicationContext(getServletContext());
+		Map<String, WebInvocationPrivilegeEvaluator> wipes = ctx
+				.getBeansOfType(WebInvocationPrivilegeEvaluator.class);
 
-        return (WebInvocationPrivilegeEvaluator) wipes.values().toArray()[0];
-    }
+		if (wipes.size() == 0) {
+			throw new IOException(
+					"No visible WebInvocationPrivilegeEvaluator instance could be found in the application "
+							+ "context. There must be at least one in order to support the use of URL access checks in 'authorize' tags.");
+		}
+
+		return (WebInvocationPrivilegeEvaluator) wipes.values().toArray()[0];
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
index b515f5451b..9a101a069e 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
@@ -30,160 +30,168 @@ import javax.servlet.jsp.tagext.Tag;
 import javax.servlet.jsp.tagext.TagSupport;
 import java.util.*;
 
-
 /**
- * An implementation of {@link Tag} that allows its body through if all authorizations are granted to the request's
- * principal.
+ * An implementation of {@link Tag} that allows its body through if all authorizations are
+ * granted to the request's principal.
  * <p>
- * One or more comma separate numeric are specified via the {@code hasPermission} attribute. The tag delegates
- * to the configured {@link PermissionEvaluator} which it obtains from the {@code ApplicationContext}.
+ * One or more comma separate numeric are specified via the {@code hasPermission}
+ * attribute. The tag delegates to the configured {@link PermissionEvaluator} which it
+ * obtains from the {@code ApplicationContext}.
  * <p>
  * For this class to operate it must be able to access the application context via the
- * {@code WebApplicationContextUtils} and attempt to locate the {@code PermissionEvaluator} instance.
- * There cannot be more than one of these present for the tag to function.
+ * {@code WebApplicationContextUtils} and attempt to locate the
+ * {@code PermissionEvaluator} instance. There cannot be more than one of these present
+ * for the tag to function.
  *
  * @author Ben Alex
  * @author Luke Taylor
  * @author Rob Winch
  */
 public class AccessControlListTag extends TagSupport {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(AccessControlListTag.class);
+	protected static final Log logger = LogFactory.getLog(AccessControlListTag.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ApplicationContext applicationContext;
-    private Object domainObject;
-    private PermissionEvaluator permissionEvaluator;
-    private String hasPermission = "";
-    private String var;
+	private ApplicationContext applicationContext;
+	private Object domainObject;
+	private PermissionEvaluator permissionEvaluator;
+	private String hasPermission = "";
+	private String var;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public int doStartTag() throws JspException {
-        if ((null == hasPermission) || "".equals(hasPermission)) {
-            return skipBody();
-        }
+	public int doStartTag() throws JspException {
+		if ((null == hasPermission) || "".equals(hasPermission)) {
+			return skipBody();
+		}
 
-        initializeIfRequired();
+		initializeIfRequired();
 
-        if (domainObject == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("domainObject resolved to null, so including tag body");
-            }
+		if (domainObject == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("domainObject resolved to null, so including tag body");
+			}
 
-            // Of course they have access to a null object!
-            return evalBody();
-        }
+			// Of course they have access to a null object!
+			return evalBody();
+		}
 
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(
-                    "SecurityContextHolder did not return a non-null Authentication object, so skipping tag body");
-            }
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (authentication == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("SecurityContextHolder did not return a non-null Authentication object, so skipping tag body");
+			}
 
-            return skipBody();
-        }
+			return skipBody();
+		}
 
-        List<Object> requiredPermissions = parseHasPermission(hasPermission);
-        for(Object requiredPermission : requiredPermissions) {
-            if (!permissionEvaluator.hasPermission(authentication, domainObject, requiredPermission)) {
-                return skipBody();
-            }
-        }
+		List<Object> requiredPermissions = parseHasPermission(hasPermission);
+		for (Object requiredPermission : requiredPermissions) {
+			if (!permissionEvaluator.hasPermission(authentication, domainObject,
+					requiredPermission)) {
+				return skipBody();
+			}
+		}
 
-        return evalBody();
-    }
+		return evalBody();
+	}
 
-    private List<Object> parseHasPermission(String hasPermission) {
-        String[] requiredPermissions = hasPermission.split(",");
-        List<Object> parsedPermissions = new ArrayList<Object>(requiredPermissions.length);
-        for(String permissionToParse : requiredPermissions) {
-            Object parsedPermission = permissionToParse;
-            try {
-                parsedPermission = Integer.parseInt(permissionToParse);
-            }catch(NumberFormatException notBitMask) {}
-            parsedPermissions.add(parsedPermission);
-        }
-        return parsedPermissions;
-    }
+	private List<Object> parseHasPermission(String hasPermission) {
+		String[] requiredPermissions = hasPermission.split(",");
+		List<Object> parsedPermissions = new ArrayList<Object>(requiredPermissions.length);
+		for (String permissionToParse : requiredPermissions) {
+			Object parsedPermission = permissionToParse;
+			try {
+				parsedPermission = Integer.parseInt(permissionToParse);
+			}
+			catch (NumberFormatException notBitMask) {
+			}
+			parsedPermissions.add(parsedPermission);
+		}
+		return parsedPermissions;
+	}
 
-    private int skipBody() {
-        if (var != null) {
-            pageContext.setAttribute(var, Boolean.FALSE, PageContext.PAGE_SCOPE);
-        }
-        return TagLibConfig.evalOrSkip(false);
-    }
+	private int skipBody() {
+		if (var != null) {
+			pageContext.setAttribute(var, Boolean.FALSE, PageContext.PAGE_SCOPE);
+		}
+		return TagLibConfig.evalOrSkip(false);
+	}
 
-    private int evalBody() {
-        if (var != null) {
-            pageContext.setAttribute(var, Boolean.TRUE, PageContext.PAGE_SCOPE);
-        }
-        return TagLibConfig.evalOrSkip(true);
-    }
+	private int evalBody() {
+		if (var != null) {
+			pageContext.setAttribute(var, Boolean.TRUE, PageContext.PAGE_SCOPE);
+		}
+		return TagLibConfig.evalOrSkip(true);
+	}
 
+	/**
+	 * Allows test cases to override where application context obtained from.
+	 *
+	 * @param pageContext so the <code>ServletContext</code> can be accessed as required
+	 * by Spring's <code>WebApplicationContextUtils</code>
+	 *
+	 * @return the Spring application context (never <code>null</code>)
+	 */
+	protected ApplicationContext getContext(PageContext pageContext) {
+		ServletContext servletContext = pageContext.getServletContext();
 
-    /**
-     * Allows test cases to override where application context obtained from.
-     *
-     * @param pageContext so the <code>ServletContext</code> can be accessed as required by Spring's
-     *        <code>WebApplicationContextUtils</code>
-     *
-     * @return the Spring application context (never <code>null</code>)
-     */
-    protected ApplicationContext getContext(PageContext pageContext) {
-        ServletContext servletContext = pageContext.getServletContext();
+		return WebApplicationContextUtils
+				.getRequiredWebApplicationContext(servletContext);
+	}
 
-        return WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-    }
+	public Object getDomainObject() {
+		return domainObject;
+	}
 
-    public Object getDomainObject() {
-        return domainObject;
-    }
+	public String getHasPermission() {
+		return hasPermission;
+	}
 
-    public String getHasPermission() {
-        return hasPermission;
-    }
+	private void initializeIfRequired() throws JspException {
+		if (applicationContext != null) {
+			return;
+		}
 
-    private void initializeIfRequired() throws JspException {
-        if (applicationContext != null) {
-            return;
-        }
+		this.applicationContext = getContext(pageContext);
 
-        this.applicationContext = getContext(pageContext);
+		permissionEvaluator = getBeanOfType(PermissionEvaluator.class);
+	}
 
-        permissionEvaluator = getBeanOfType(PermissionEvaluator.class);
-    }
+	private <T> T getBeanOfType(Class<T> type) throws JspException {
+		Map<String, T> map = applicationContext.getBeansOfType(type);
 
-    private <T> T getBeanOfType(Class<T> type) throws JspException {
-        Map<String, T> map = applicationContext.getBeansOfType(type);
+		for (ApplicationContext context = applicationContext.getParent(); context != null; context = context
+				.getParent()) {
+			map.putAll(context.getBeansOfType(type));
+		}
 
-        for (ApplicationContext context = applicationContext.getParent();
-            context != null; context = context.getParent()) {
-            map.putAll(context.getBeansOfType(type));
-        }
+		if (map.size() == 0) {
+			return null;
+		}
+		else if (map.size() == 1) {
+			return map.values().iterator().next();
+		}
 
-        if (map.size() == 0) {
-            return null;
-        } else if (map.size() == 1) {
-            return map.values().iterator().next();
-        }
+		throw new JspException("Found incorrect number of " + type.getSimpleName()
+				+ " instances in " + "application context - you must have only have one!");
+	}
 
-        throw new JspException("Found incorrect number of " + type.getSimpleName() +" instances in "
-                    + "application context - you must have only have one!");
-    }
+	public void setDomainObject(Object domainObject) {
+		this.domainObject = domainObject;
+	}
 
-    public void setDomainObject(Object domainObject) {
-        this.domainObject = domainObject;
-    }
+	public void setHasPermission(String hasPermission) {
+		this.hasPermission = hasPermission;
+	}
 
-    public void setHasPermission(String hasPermission) {
-        this.hasPermission = hasPermission;
-    }
-
-    public void setVar(String var) {
-        this.var = var;
-    }
+	public void setVar(String var) {
+		this.var = var;
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java
index f79cfe0cd6..e82d575c8f 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.taglibs.authz;
 
-
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -33,124 +32,131 @@ import javax.servlet.jsp.tagext.Tag;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * An {@link javax.servlet.jsp.tagext.Tag} implementation that allows convenient access to the current
- * <code>Authentication</code> object.
+ * An {@link javax.servlet.jsp.tagext.Tag} implementation that allows convenient access to
+ * the current <code>Authentication</code> object.
  * <p>
- * Whilst JSPs can access the <code>SecurityContext</code> directly, this tag avoids handling <code>null</code> conditions.
+ * Whilst JSPs can access the <code>SecurityContext</code> directly, this tag avoids
+ * handling <code>null</code> conditions.
  *
  * @author Thomas Champagne
  */
 public class AuthenticationTag extends TagSupport {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String var;
-    private String property;
-    private int scope;
-    private boolean scopeSpecified;
-    private boolean htmlEscape = true;
+	private String var;
+	private String property;
+	private int scope;
+	private boolean scopeSpecified;
+	private boolean htmlEscape = true;
 
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	public AuthenticationTag() {
+		init();
+	}
 
-    public AuthenticationTag() {
-        init();
-    }
+	// resets local state
+	private void init() {
+		var = null;
+		scopeSpecified = false;
+		scope = PageContext.PAGE_SCOPE;
+	}
 
-    // resets local state
-    private void init() {
-        var = null;
-        scopeSpecified = false;
-        scope = PageContext.PAGE_SCOPE;
-    }
-    public void setVar(String var) {
-        this.var = var;
-    }
+	public void setVar(String var) {
+		this.var = var;
+	}
 
-    public void setProperty(String operation) {
-        this.property = operation;
-    }
+	public void setProperty(String operation) {
+		this.property = operation;
+	}
 
-    public void setScope(String scope) {
-        this.scope = TagUtils.getScope(scope);
-        this.scopeSpecified = true;
-    }
+	public void setScope(String scope) {
+		this.scope = TagUtils.getScope(scope);
+		this.scopeSpecified = true;
+	}
 
-    public int doStartTag() throws JspException {
-        return super.doStartTag();
-    }
+	public int doStartTag() throws JspException {
+		return super.doStartTag();
+	}
 
-    public int doEndTag() throws JspException {
-        Object result = null;
-        // determine the value by...
-        if (property != null) {
-            if ((SecurityContextHolder.getContext() == null)
-                    || !(SecurityContextHolder.getContext() instanceof SecurityContext)
-                    || (SecurityContextHolder.getContext().getAuthentication() == null)) {
-                return Tag.EVAL_PAGE;
-            }
+	public int doEndTag() throws JspException {
+		Object result = null;
+		// determine the value by...
+		if (property != null) {
+			if ((SecurityContextHolder.getContext() == null)
+					|| !(SecurityContextHolder.getContext() instanceof SecurityContext)
+					|| (SecurityContextHolder.getContext().getAuthentication() == null)) {
+				return Tag.EVAL_PAGE;
+			}
 
-            Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+			Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-            if (auth.getPrincipal() == null) {
-                return Tag.EVAL_PAGE;
-            }
+			if (auth.getPrincipal() == null) {
+				return Tag.EVAL_PAGE;
+			}
 
-            try {
-                BeanWrapperImpl wrapper = new BeanWrapperImpl(auth);
-                result = wrapper.getPropertyValue(property);
-            } catch (BeansException e) {
-                throw new JspException(e);
-            }
-        }
+			try {
+				BeanWrapperImpl wrapper = new BeanWrapperImpl(auth);
+				result = wrapper.getPropertyValue(property);
+			}
+			catch (BeansException e) {
+				throw new JspException(e);
+			}
+		}
 
-        if (var != null) {
-            /*
-             * Store the result, letting an IllegalArgumentException
-             * propagate back if the scope is invalid (e.g., if an attempt
-             * is made to store something in the session without any
-             * HttpSession existing).
-             */
-            if (result != null) {
-                pageContext.setAttribute(var, result, scope);
-            } else {
-                if (scopeSpecified) {
-                    pageContext.removeAttribute(var, scope);
-                } else {
-                    pageContext.removeAttribute(var);
-                }
-            }
-        } else {
-            if (htmlEscape) {
-                writeMessage(TextEscapeUtils.escapeEntities(String.valueOf(result)));
-            } else {
-                writeMessage(String.valueOf(result));
-            }
-        }
-        return EVAL_PAGE;
-    }
+		if (var != null) {
+			/*
+			 * Store the result, letting an IllegalArgumentException propagate back if the
+			 * scope is invalid (e.g., if an attempt is made to store something in the
+			 * session without any HttpSession existing).
+			 */
+			if (result != null) {
+				pageContext.setAttribute(var, result, scope);
+			}
+			else {
+				if (scopeSpecified) {
+					pageContext.removeAttribute(var, scope);
+				}
+				else {
+					pageContext.removeAttribute(var);
+				}
+			}
+		}
+		else {
+			if (htmlEscape) {
+				writeMessage(TextEscapeUtils.escapeEntities(String.valueOf(result)));
+			}
+			else {
+				writeMessage(String.valueOf(result));
+			}
+		}
+		return EVAL_PAGE;
+	}
 
-    protected void writeMessage(String msg) throws JspException {
-        try {
-            pageContext.getOut().write(String.valueOf(msg));
-        } catch (IOException ioe) {
-            throw new JspException(ioe);
-        }
-    }
+	protected void writeMessage(String msg) throws JspException {
+		try {
+			pageContext.getOut().write(String.valueOf(msg));
+		}
+		catch (IOException ioe) {
+			throw new JspException(ioe);
+		}
+	}
 
+	/**
+	 * Set HTML escaping for this tag, as boolean value.
+	 */
+	public void setHtmlEscape(String htmlEscape) throws JspException {
+		this.htmlEscape = Boolean.valueOf(htmlEscape);
+	}
 
-    /**
-     * Set HTML escaping for this tag, as boolean value.
-     */
-    public void setHtmlEscape(String htmlEscape) throws JspException {
-        this.htmlEscape = Boolean.valueOf(htmlEscape);
-    }
-
-    /**
-     * Return the HTML escaping setting for this tag,
-     * or the default setting if not overridden.
-     */
-    protected boolean isHtmlEscape() {
-        return htmlEscape;
-    }
+	/**
+	 * Return the HTML escaping setting for this tag, or the default setting if not
+	 * overridden.
+	 */
+	protected boolean isHtmlEscape() {
+		return htmlEscape;
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java
index 906f052908..3a00140e0b 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/JspAuthorizeTag.java
@@ -33,168 +33,173 @@ import org.springframework.security.web.FilterInvocation;
  */
 public class JspAuthorizeTag extends AbstractAuthorizeTag implements Tag {
 
-    private Tag parent;
+	private Tag parent;
 
-    protected PageContext pageContext;
+	protected PageContext pageContext;
 
-    protected String id;
+	protected String id;
 
-    private String var;
+	private String var;
 
-    private boolean authorized;
+	private boolean authorized;
 
-    /**
-     * Invokes the base class {@link AbstractAuthorizeTag#authorize()} method to
-     * decide if the body of the tag should be skipped or not.
-     *
-     * @return {@link Tag#SKIP_BODY} or {@link Tag#EVAL_BODY_INCLUDE}
-     */
-    public int doStartTag() throws JspException {
-        try {
-            authorized = super.authorize();
+	/**
+	 * Invokes the base class {@link AbstractAuthorizeTag#authorize()} method to decide if
+	 * the body of the tag should be skipped or not.
+	 *
+	 * @return {@link Tag#SKIP_BODY} or {@link Tag#EVAL_BODY_INCLUDE}
+	 */
+	public int doStartTag() throws JspException {
+		try {
+			authorized = super.authorize();
 
-            if (!authorized && TagLibConfig.isUiSecurityDisabled()) {
-                pageContext.getOut().write(TagLibConfig.getSecuredUiPrefix());
-            }
+			if (!authorized && TagLibConfig.isUiSecurityDisabled()) {
+				pageContext.getOut().write(TagLibConfig.getSecuredUiPrefix());
+			}
 
-            if (var != null) {
-                pageContext.setAttribute(var, authorized, PageContext.PAGE_SCOPE);
-            }
+			if (var != null) {
+				pageContext.setAttribute(var, authorized, PageContext.PAGE_SCOPE);
+			}
 
-            return TagLibConfig.evalOrSkip(authorized);
+			return TagLibConfig.evalOrSkip(authorized);
 
-        } catch (IOException e) {
-            throw new JspException(e);
-        }
-    }
+		}
+		catch (IOException e) {
+			throw new JspException(e);
+		}
+	}
 
-    @Override
-    protected EvaluationContext createExpressionEvaluationContext(SecurityExpressionHandler<FilterInvocation> handler) {
-        return new PageContextVariableLookupEvaluationContext(super.createExpressionEvaluationContext(handler));
-    }
+	@Override
+	protected EvaluationContext createExpressionEvaluationContext(
+			SecurityExpressionHandler<FilterInvocation> handler) {
+		return new PageContextVariableLookupEvaluationContext(
+				super.createExpressionEvaluationContext(handler));
+	}
 
-    /**
-     * Default processing of the end tag returning EVAL_PAGE.
-     *
-     * @return EVAL_PAGE
-     * @see Tag#doEndTag()
-     */
-    public int doEndTag() throws JspException {
-        try {
-            if (!authorized && TagLibConfig.isUiSecurityDisabled()) {
-                pageContext.getOut().write(TagLibConfig.getSecuredUiSuffix());
-            }
-        } catch (IOException e) {
-            throw new JspException(e);
-        }
+	/**
+	 * Default processing of the end tag returning EVAL_PAGE.
+	 *
+	 * @return EVAL_PAGE
+	 * @see Tag#doEndTag()
+	 */
+	public int doEndTag() throws JspException {
+		try {
+			if (!authorized && TagLibConfig.isUiSecurityDisabled()) {
+				pageContext.getOut().write(TagLibConfig.getSecuredUiSuffix());
+			}
+		}
+		catch (IOException e) {
+			throw new JspException(e);
+		}
 
-        return EVAL_PAGE;
-    }
+		return EVAL_PAGE;
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(String id) {
-        this.id = id;
-    }
+	public void setId(String id) {
+		this.id = id;
+	}
 
-    public Tag getParent() {
-        return parent;
-    }
+	public Tag getParent() {
+		return parent;
+	}
 
-    public void setParent(Tag parent) {
-        this.parent = parent;
-    }
+	public void setParent(Tag parent) {
+		this.parent = parent;
+	}
 
-    public String getVar() {
-        return var;
-    }
+	public String getVar() {
+		return var;
+	}
 
-    public void setVar(String var) {
-        this.var = var;
-    }
+	public void setVar(String var) {
+		this.var = var;
+	}
 
-    public void release() {
-        parent = null;
-        id = null;
-    }
+	public void release() {
+		parent = null;
+		id = null;
+	}
 
-    public void setPageContext(PageContext pageContext) {
-        this.pageContext = pageContext;
-    }
+	public void setPageContext(PageContext pageContext) {
+		this.pageContext = pageContext;
+	}
 
-    @Override
-    protected ServletRequest getRequest() {
-        return pageContext.getRequest();
-    }
+	@Override
+	protected ServletRequest getRequest() {
+		return pageContext.getRequest();
+	}
 
-    @Override
-    protected ServletResponse getResponse() {
-        return pageContext.getResponse();
-    }
+	@Override
+	protected ServletResponse getResponse() {
+		return pageContext.getResponse();
+	}
 
-    @Override
-    protected ServletContext getServletContext() {
-        return pageContext.getServletContext();
-    }
+	@Override
+	protected ServletContext getServletContext() {
+		return pageContext.getServletContext();
+	}
 
-    private final class PageContextVariableLookupEvaluationContext implements EvaluationContext {
+	private final class PageContextVariableLookupEvaluationContext implements
+			EvaluationContext {
 
-        private EvaluationContext delegate;
+		private EvaluationContext delegate;
 
-        private PageContextVariableLookupEvaluationContext(EvaluationContext delegate) {
-            this.delegate = delegate;
-        }
+		private PageContextVariableLookupEvaluationContext(EvaluationContext delegate) {
+			this.delegate = delegate;
+		}
 
-        public TypedValue getRootObject() {
-            return delegate.getRootObject();
-        }
+		public TypedValue getRootObject() {
+			return delegate.getRootObject();
+		}
 
-        public List<ConstructorResolver> getConstructorResolvers() {
-            return delegate.getConstructorResolvers();
-        }
+		public List<ConstructorResolver> getConstructorResolvers() {
+			return delegate.getConstructorResolvers();
+		}
 
-        public List<MethodResolver> getMethodResolvers() {
-            return delegate.getMethodResolvers();
-        }
+		public List<MethodResolver> getMethodResolvers() {
+			return delegate.getMethodResolvers();
+		}
 
-        public List<PropertyAccessor> getPropertyAccessors() {
-            return delegate.getPropertyAccessors();
-        }
+		public List<PropertyAccessor> getPropertyAccessors() {
+			return delegate.getPropertyAccessors();
+		}
 
-        public TypeLocator getTypeLocator() {
-            return delegate.getTypeLocator();
-        }
+		public TypeLocator getTypeLocator() {
+			return delegate.getTypeLocator();
+		}
 
-        public TypeConverter getTypeConverter() {
-            return delegate.getTypeConverter();
-        }
+		public TypeConverter getTypeConverter() {
+			return delegate.getTypeConverter();
+		}
 
-        public TypeComparator getTypeComparator() {
-            return delegate.getTypeComparator();
-        }
+		public TypeComparator getTypeComparator() {
+			return delegate.getTypeComparator();
+		}
 
-        public OperatorOverloader getOperatorOverloader() {
-            return delegate.getOperatorOverloader();
-        }
+		public OperatorOverloader getOperatorOverloader() {
+			return delegate.getOperatorOverloader();
+		}
 
-        public BeanResolver getBeanResolver() {
-            return delegate.getBeanResolver();
-        }
+		public BeanResolver getBeanResolver() {
+			return delegate.getBeanResolver();
+		}
 
-        public void setVariable(String name, Object value) {
-            delegate.setVariable(name, value);
-        }
+		public void setVariable(String name, Object value) {
+			delegate.setVariable(name, value);
+		}
 
-        public Object lookupVariable(String name) {
-            Object result = delegate.lookupVariable(name);
+		public Object lookupVariable(String name) {
+			Object result = delegate.lookupVariable(name);
 
-            if (result == null) {
-                result = pageContext.findAttribute(name);
-            }
-            return result;
-        }
-    }
+			if (result == null) {
+				result = pageContext.findAttribute(name);
+			}
+			return result;
+		}
+	}
 
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/AbstractCsrfTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/AbstractCsrfTag.java
index 3207da069e..39c23819ef 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/AbstractCsrfTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/AbstractCsrfTag.java
@@ -30,20 +30,22 @@ import java.io.IOException;
  */
 abstract class AbstractCsrfTag extends TagSupport {
 
-    @Override
-    public int doEndTag() throws JspException {
+	@Override
+	public int doEndTag() throws JspException {
 
-        CsrfToken token = (CsrfToken)this.pageContext.getRequest().getAttribute(CsrfToken.class.getName());
-        if (token != null) {
-            try {
-                this.pageContext.getOut().write(this.handleToken(token));
-            } catch (IOException e) {
-                throw new JspException(e);
-            }
-        }
+		CsrfToken token = (CsrfToken) this.pageContext.getRequest().getAttribute(
+				CsrfToken.class.getName());
+		if (token != null) {
+			try {
+				this.pageContext.getOut().write(this.handleToken(token));
+			}
+			catch (IOException e) {
+				throw new JspException(e);
+			}
+		}
 
-        return EVAL_PAGE;
-    }
+		return EVAL_PAGE;
+	}
 
-    protected abstract String handleToken(CsrfToken token);
+	protected abstract String handleToken(CsrfToken token);
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfInputTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfInputTag.java
index ece93703df..2a2793eaa8 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfInputTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfInputTag.java
@@ -19,17 +19,17 @@ package org.springframework.security.taglibs.csrf;
 import org.springframework.security.web.csrf.CsrfToken;
 
 /**
- * A JSP tag that prints out a hidden form field for the CSRF token. See the JSP Tab Library documentation for more
- * information.
+ * A JSP tag that prints out a hidden form field for the CSRF token. See the JSP Tab
+ * Library documentation for more information.
  *
  * @since 3.2.2
  * @author Nick Williams
  */
 public class CsrfInputTag extends AbstractCsrfTag {
 
-    @Override
-    public String handleToken(CsrfToken token) {
-        return "<input type=\"hidden\" name=\"" + token.getParameterName() + "\" value=\"" + token.getToken() +
-                "\" />";
-    }
+	@Override
+	public String handleToken(CsrfToken token) {
+		return "<input type=\"hidden\" name=\"" + token.getParameterName()
+				+ "\" value=\"" + token.getToken() + "\" />";
+	}
 }
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTag.java
index 6ee553f52e..291bb6a74d 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTag.java
@@ -19,18 +19,19 @@ package org.springframework.security.taglibs.csrf;
 import org.springframework.security.web.csrf.CsrfToken;
 
 /**
- * A JSP tag that prints out a meta tags holding the CSRF form field name and token value for use in JavaScrip code.
- * See the JSP Tab Library documentation for more information.
+ * A JSP tag that prints out a meta tags holding the CSRF form field name and token value
+ * for use in JavaScrip code. See the JSP Tab Library documentation for more information.
  *
  * @since 3.2.2
  * @author Nick Williams
  */
 public class CsrfMetaTagsTag extends AbstractCsrfTag {
 
-    @Override
-    public String handleToken(CsrfToken token) {
-        return "<meta name=\"_csrf_parameter\" content=\"" + token.getParameterName() + "\" />" +
-               "<meta name=\"_csrf_header\" content=\"" + token.getHeaderName() + "\" />" +
-               "<meta name=\"_csrf\" content=\"" + token.getToken() + "\" />";
-    }
+	@Override
+	public String handleToken(CsrfToken token) {
+		return "<meta name=\"_csrf_parameter\" content=\"" + token.getParameterName()
+				+ "\" />" + "<meta name=\"_csrf_header\" content=\""
+				+ token.getHeaderName() + "\" />" + "<meta name=\"_csrf\" content=\""
+				+ token.getToken() + "\" />";
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java
index 83770533ff..eff760bf05 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTagTests.java
@@ -40,51 +40,52 @@ import org.springframework.security.web.access.WebInvocationPrivilegeEvaluator;
  *
  */
 public class AbstractAuthorizeTagTests {
-    private AbstractAuthorizeTag tag;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private MockServletContext servletContext;
+	private AbstractAuthorizeTag tag;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private MockServletContext servletContext;
 
-    @Before
-    public void setup() {
-        tag = new AuthzTag();
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        servletContext = new MockServletContext();
-    }
+	@Before
+	public void setup() {
+		tag = new AuthzTag();
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		servletContext = new MockServletContext();
+	}
 
-    @After
-    public void teardown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void teardown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void privilegeEvaluatorFromRequest() throws IOException {
-        String uri = "/something";
-        WebInvocationPrivilegeEvaluator expected = mock(WebInvocationPrivilegeEvaluator.class);
-        tag.setUrl(uri);
-        request.setAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE, expected);
+	@Test
+	public void privilegeEvaluatorFromRequest() throws IOException {
+		String uri = "/something";
+		WebInvocationPrivilegeEvaluator expected = mock(WebInvocationPrivilegeEvaluator.class);
+		tag.setUrl(uri);
+		request.setAttribute(WebAttributes.WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE,
+				expected);
 
-        tag.authorizeUsingUrlCheck();
+		tag.authorizeUsingUrlCheck();
 
-        verify(expected).isAllowed(eq(""), eq(uri), eq("GET"), any(Authentication.class));
-    }
+		verify(expected).isAllowed(eq(""), eq(uri), eq("GET"), any(Authentication.class));
+	}
 
-    private class AuthzTag extends AbstractAuthorizeTag {
+	private class AuthzTag extends AbstractAuthorizeTag {
 
-        @Override
-        protected ServletRequest getRequest() {
-            return request;
-        }
+		@Override
+		protected ServletRequest getRequest() {
+			return request;
+		}
 
-        @Override
-        protected ServletResponse getResponse() {
-            return response;
-        }
+		@Override
+		protected ServletResponse getResponse() {
+			return response;
+		}
 
-        @Override
-        protected ServletContext getServletContext() {
-            return servletContext;
-        }
-    }
+		@Override
+		protected ServletContext getServletContext() {
+			return servletContext;
+		}
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java
index a0168780d8..4b9674b19a 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AccessControlListTagTests.java
@@ -37,119 +37,121 @@ import java.util.*;
  */
 @SuppressWarnings("unchecked")
 public class AccessControlListTagTests {
-    AccessControlListTag tag;
-    PermissionEvaluator pe;
-    MockPageContext pageContext;
-    Authentication bob = new TestingAuthenticationToken("bob","bobspass","A");
+	AccessControlListTag tag;
+	PermissionEvaluator pe;
+	MockPageContext pageContext;
+	Authentication bob = new TestingAuthenticationToken("bob", "bobspass", "A");
 
-    @Before
-    @SuppressWarnings("rawtypes")
-    public void setup() {
-        SecurityContextHolder.getContext().setAuthentication(bob);
-        tag = new AccessControlListTag();
-        WebApplicationContext ctx = mock(WebApplicationContext.class);
+	@Before
+	@SuppressWarnings("rawtypes")
+	public void setup() {
+		SecurityContextHolder.getContext().setAuthentication(bob);
+		tag = new AccessControlListTag();
+		WebApplicationContext ctx = mock(WebApplicationContext.class);
 
-        pe = mock(PermissionEvaluator.class);
+		pe = mock(PermissionEvaluator.class);
 
-        Map beanMap = new HashMap();
-        beanMap.put("pe", pe);
-        when(ctx.getBeansOfType(PermissionEvaluator.class)).thenReturn(beanMap);
+		Map beanMap = new HashMap();
+		beanMap.put("pe", pe);
+		when(ctx.getBeansOfType(PermissionEvaluator.class)).thenReturn(beanMap);
 
-        MockServletContext servletCtx = new MockServletContext();
-        servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx);
-        pageContext = new MockPageContext(servletCtx, new MockHttpServletRequest(), new MockHttpServletResponse());
-        tag.setPageContext(pageContext);
-    }
+		MockServletContext servletCtx = new MockServletContext();
+		servletCtx.setAttribute(
+				WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx);
+		pageContext = new MockPageContext(servletCtx, new MockHttpServletRequest(),
+				new MockHttpServletResponse());
+		tag.setPageContext(pageContext);
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void bodyIsEvaluatedIfAclGrantsAccess() throws Exception {
-        Object domainObject = new Object();
-        when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true);
+	@Test
+	public void bodyIsEvaluatedIfAclGrantsAccess() throws Exception {
+		Object domainObject = new Object();
+		when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true);
 
-        tag.setDomainObject(domainObject);
-        tag.setHasPermission("READ");
-        tag.setVar("allowed");
-        assertSame(domainObject, tag.getDomainObject());
-        assertEquals("READ", tag.getHasPermission());
+		tag.setDomainObject(domainObject);
+		tag.setHasPermission("READ");
+		tag.setVar("allowed");
+		assertSame(domainObject, tag.getDomainObject());
+		assertEquals("READ", tag.getHasPermission());
 
-        assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
-        assertTrue((Boolean)pageContext.getAttribute("allowed"));
-    }
+		assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
+		assertTrue((Boolean) pageContext.getAttribute("allowed"));
+	}
 
-    // SEC-2022
-    @Test
-    public void multiHasPermissionsAreSplit() throws Exception {
-        Object domainObject = new Object();
-        when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true);
-        when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true);
+	// SEC-2022
+	@Test
+	public void multiHasPermissionsAreSplit() throws Exception {
+		Object domainObject = new Object();
+		when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(true);
+		when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true);
 
-        tag.setDomainObject(domainObject);
-        tag.setHasPermission("READ,WRITE");
-        tag.setVar("allowed");
-        assertSame(domainObject, tag.getDomainObject());
-        assertEquals("READ,WRITE", tag.getHasPermission());
+		tag.setDomainObject(domainObject);
+		tag.setHasPermission("READ,WRITE");
+		tag.setVar("allowed");
+		assertSame(domainObject, tag.getDomainObject());
+		assertEquals("READ,WRITE", tag.getHasPermission());
 
-        assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
-        assertTrue((Boolean)pageContext.getAttribute("allowed"));
-        verify(pe).hasPermission(bob, domainObject, "READ");
-        verify(pe).hasPermission(bob, domainObject, "WRITE");
-        verifyNoMoreInteractions(pe);
-    }
+		assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
+		assertTrue((Boolean) pageContext.getAttribute("allowed"));
+		verify(pe).hasPermission(bob, domainObject, "READ");
+		verify(pe).hasPermission(bob, domainObject, "WRITE");
+		verifyNoMoreInteractions(pe);
+	}
 
-    // SEC-2023
-    @Test
-    public void hasPermissionsBitMaskSupported() throws Exception {
-        Object domainObject = new Object();
-        when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true);
-        when(pe.hasPermission(bob, domainObject, 2)).thenReturn(true);
+	// SEC-2023
+	@Test
+	public void hasPermissionsBitMaskSupported() throws Exception {
+		Object domainObject = new Object();
+		when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true);
+		when(pe.hasPermission(bob, domainObject, 2)).thenReturn(true);
 
-        tag.setDomainObject(domainObject);
-        tag.setHasPermission("1,2");
-        tag.setVar("allowed");
-        assertSame(domainObject, tag.getDomainObject());
-        assertEquals("1,2", tag.getHasPermission());
+		tag.setDomainObject(domainObject);
+		tag.setHasPermission("1,2");
+		tag.setVar("allowed");
+		assertSame(domainObject, tag.getDomainObject());
+		assertEquals("1,2", tag.getHasPermission());
 
-        assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
-        assertTrue((Boolean)pageContext.getAttribute("allowed"));
-        verify(pe).hasPermission(bob, domainObject, 1);
-        verify(pe).hasPermission(bob, domainObject, 2);
-        verifyNoMoreInteractions(pe);
-    }
+		assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
+		assertTrue((Boolean) pageContext.getAttribute("allowed"));
+		verify(pe).hasPermission(bob, domainObject, 1);
+		verify(pe).hasPermission(bob, domainObject, 2);
+		verifyNoMoreInteractions(pe);
+	}
 
-    @Test
-    public void hasPermissionsMixedBitMaskSupported() throws Exception {
-        Object domainObject = new Object();
-        when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true);
-        when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true);
+	@Test
+	public void hasPermissionsMixedBitMaskSupported() throws Exception {
+		Object domainObject = new Object();
+		when(pe.hasPermission(bob, domainObject, 1)).thenReturn(true);
+		when(pe.hasPermission(bob, domainObject, "WRITE")).thenReturn(true);
 
-        tag.setDomainObject(domainObject);
-        tag.setHasPermission("1,WRITE");
-        tag.setVar("allowed");
-        assertSame(domainObject, tag.getDomainObject());
-        assertEquals("1,WRITE", tag.getHasPermission());
+		tag.setDomainObject(domainObject);
+		tag.setHasPermission("1,WRITE");
+		tag.setVar("allowed");
+		assertSame(domainObject, tag.getDomainObject());
+		assertEquals("1,WRITE", tag.getHasPermission());
 
-        assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
-        assertTrue((Boolean)pageContext.getAttribute("allowed"));
-        verify(pe).hasPermission(bob, domainObject, 1);
-        verify(pe).hasPermission(bob, domainObject, "WRITE");
-        verifyNoMoreInteractions(pe);
-    }
+		assertEquals(Tag.EVAL_BODY_INCLUDE, tag.doStartTag());
+		assertTrue((Boolean) pageContext.getAttribute("allowed"));
+		verify(pe).hasPermission(bob, domainObject, 1);
+		verify(pe).hasPermission(bob, domainObject, "WRITE");
+		verifyNoMoreInteractions(pe);
+	}
 
-    @Test
-    public void bodyIsSkippedIfAclDeniesAccess() throws Exception {
-        Object domainObject = new Object();
-        when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(false);
+	@Test
+	public void bodyIsSkippedIfAclDeniesAccess() throws Exception {
+		Object domainObject = new Object();
+		when(pe.hasPermission(bob, domainObject, "READ")).thenReturn(false);
 
-        tag.setDomainObject(domainObject);
-        tag.setHasPermission("READ");
-        tag.setVar("allowed");
+		tag.setDomainObject(domainObject);
+		tag.setHasPermission("READ");
+		tag.setVar("allowed");
 
-        assertEquals(Tag.SKIP_BODY, tag.doStartTag());
-        assertFalse((Boolean)pageContext.getAttribute("allowed"));
-    }
+		assertEquals(Tag.SKIP_BODY, tag.doStartTag());
+		assertFalse((Boolean) pageContext.getAttribute("allowed"));
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
index 518a4ba188..d19bc9fc8a 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java
@@ -28,127 +28,135 @@ import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
 
-
 /**
  * Tests {@link AuthenticationTag}.
  *
  * @author Ben Alex
  */
 public class AuthenticationTagTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final MyAuthenticationTag authenticationTag = new MyAuthenticationTag();
-    private final Authentication auth = new TestingAuthenticationToken(new User("rodUserDetails", "koala", true, true, true,
-                    true, AuthorityUtils.NO_AUTHORITIES), "koala", AuthorityUtils.NO_AUTHORITIES);
+	private final MyAuthenticationTag authenticationTag = new MyAuthenticationTag();
+	private final Authentication auth = new TestingAuthenticationToken(new User(
+			"rodUserDetails", "koala", true, true, true, true,
+			AuthorityUtils.NO_AUTHORITIES), "koala", AuthorityUtils.NO_AUTHORITIES);
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testOperationWhenPrincipalIsAUserDetailsInstance()throws JspException {
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testOperationWhenPrincipalIsAUserDetailsInstance() throws JspException {
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        authenticationTag.setProperty("name");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-        assertEquals("rodUserDetails", authenticationTag.getLastMessage());
-    }
+		authenticationTag.setProperty("name");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+		assertEquals("rodUserDetails", authenticationTag.getLastMessage());
+	}
 
-    @Test
-    public void testOperationWhenPrincipalIsAString() throws JspException {
-        SecurityContextHolder.getContext().setAuthentication(
-                new TestingAuthenticationToken("rodAsString", "koala", AuthorityUtils.NO_AUTHORITIES ));
+	@Test
+	public void testOperationWhenPrincipalIsAString() throws JspException {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("rodAsString", "koala",
+						AuthorityUtils.NO_AUTHORITIES));
 
-        authenticationTag.setProperty("principal");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-        assertEquals("rodAsString", authenticationTag.getLastMessage());
-    }
+		authenticationTag.setProperty("principal");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+		assertEquals("rodAsString", authenticationTag.getLastMessage());
+	}
 
-    @Test
-    public void testNestedPropertyIsReadCorrectly() throws JspException {
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	@Test
+	public void testNestedPropertyIsReadCorrectly() throws JspException {
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        authenticationTag.setProperty("principal.username");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-        assertEquals("rodUserDetails", authenticationTag.getLastMessage());
-    }
+		authenticationTag.setProperty("principal.username");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+		assertEquals("rodUserDetails", authenticationTag.getLastMessage());
+	}
 
-    @Test
-    public void testOperationWhenPrincipalIsNull() throws JspException {
-        SecurityContextHolder.getContext().setAuthentication(
-                new TestingAuthenticationToken(null, "koala", AuthorityUtils.NO_AUTHORITIES ));
+	@Test
+	public void testOperationWhenPrincipalIsNull() throws JspException {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(null, "koala",
+						AuthorityUtils.NO_AUTHORITIES));
 
-        authenticationTag.setProperty("principal");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-    }
+		authenticationTag.setProperty("principal");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+	}
 
-    @Test
-    public void testOperationWhenSecurityContextIsNull() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(null);
+	@Test
+	public void testOperationWhenSecurityContextIsNull() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(null);
 
-        authenticationTag.setProperty("principal");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-        assertEquals(null, authenticationTag.getLastMessage());
-    }
+		authenticationTag.setProperty("principal");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+		assertEquals(null, authenticationTag.getLastMessage());
+	}
 
-    @Test
-    public void testSkipsBodyIfNullOrEmptyOperation() throws Exception {
-        authenticationTag.setProperty("");
-        assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
-        assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
-    }
+	@Test
+	public void testSkipsBodyIfNullOrEmptyOperation() throws Exception {
+		authenticationTag.setProperty("");
+		assertEquals(Tag.SKIP_BODY, authenticationTag.doStartTag());
+		assertEquals(Tag.EVAL_PAGE, authenticationTag.doEndTag());
+	}
 
-    @Test
-    public void testThrowsExceptionForUnrecognisedProperty() {
-        SecurityContextHolder.getContext().setAuthentication(auth);
-        authenticationTag.setProperty("qsq");
+	@Test
+	public void testThrowsExceptionForUnrecognisedProperty() {
+		SecurityContextHolder.getContext().setAuthentication(auth);
+		authenticationTag.setProperty("qsq");
 
-        try {
-            authenticationTag.doStartTag();
-            authenticationTag.doEndTag();
-            fail("Should have throwns JspException");
-        } catch (JspException expected) {
-        }
-    }
+		try {
+			authenticationTag.doStartTag();
+			authenticationTag.doEndTag();
+			fail("Should have throwns JspException");
+		}
+		catch (JspException expected) {
+		}
+	}
 
-    @Test
-    public void htmlEscapingIsUsedByDefault() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("<>& ", ""));
-        authenticationTag.setProperty("name");
-        authenticationTag.doStartTag();
-        authenticationTag.doEndTag();
-        assertEquals("&lt;&gt;&amp;&#32;", authenticationTag.getLastMessage());
-    }
+	@Test
+	public void htmlEscapingIsUsedByDefault() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("<>& ", ""));
+		authenticationTag.setProperty("name");
+		authenticationTag.doStartTag();
+		authenticationTag.doEndTag();
+		assertEquals("&lt;&gt;&amp;&#32;", authenticationTag.getLastMessage());
+	}
 
-    @Test
-    public void settingHtmlEscapeToFalsePreventsEscaping() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("<>& ", ""));
-        authenticationTag.setProperty("name");
-        authenticationTag.setHtmlEscape("false");
-        authenticationTag.doStartTag();
-        authenticationTag.doEndTag();
-        assertEquals("<>& ", authenticationTag.getLastMessage());
-    }
+	@Test
+	public void settingHtmlEscapeToFalsePreventsEscaping() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("<>& ", ""));
+		authenticationTag.setProperty("name");
+		authenticationTag.setHtmlEscape("false");
+		authenticationTag.doStartTag();
+		authenticationTag.doEndTag();
+		assertEquals("<>& ", authenticationTag.getLastMessage());
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MyAuthenticationTag extends AuthenticationTag {
-        String lastMessage = null;
+	private class MyAuthenticationTag extends AuthenticationTag {
+		String lastMessage = null;
 
-        public String getLastMessage() {
-            return lastMessage;
-        }
+		public String getLastMessage() {
+			return lastMessage;
+		}
 
-        protected void writeMessage(String msg) throws JspException {
-            lastMessage = msg;
-        }
-    }
+		protected void writeMessage(String msg) throws JspException {
+			lastMessage = msg;
+		}
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
index b1fd055ea3..da79150ebe 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthorizeTagTests.java
@@ -41,118 +41,128 @@ import org.springframework.security.web.access.expression.DefaultWebSecurityExpr
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 
-
 /**
  * @author Francois Beausoleil
  * @author Luke Taylor
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AuthorizeTagTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    @Mock
-    private PermissionEvaluator permissionEvaluator;
-    private JspAuthorizeTag authorizeTag;
-    private MockHttpServletRequest request = new MockHttpServletRequest();
-    private final TestingAuthenticationToken currentUser = new TestingAuthenticationToken("abc", "123", "ROLE SUPERVISOR", "ROLE_TELLER");
+	@Mock
+	private PermissionEvaluator permissionEvaluator;
+	private JspAuthorizeTag authorizeTag;
+	private MockHttpServletRequest request = new MockHttpServletRequest();
+	private final TestingAuthenticationToken currentUser = new TestingAuthenticationToken(
+			"abc", "123", "ROLE SUPERVISOR", "ROLE_TELLER");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(currentUser);
-        StaticWebApplicationContext ctx = new StaticWebApplicationContext();
+	@Before
+	public void setUp() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(currentUser);
+		StaticWebApplicationContext ctx = new StaticWebApplicationContext();
 
-        BeanDefinitionBuilder webExpressionHandler = BeanDefinitionBuilder.rootBeanDefinition(DefaultWebSecurityExpressionHandler.class);
-        webExpressionHandler.addPropertyValue("permissionEvaluator", permissionEvaluator);
+		BeanDefinitionBuilder webExpressionHandler = BeanDefinitionBuilder
+				.rootBeanDefinition(DefaultWebSecurityExpressionHandler.class);
+		webExpressionHandler.addPropertyValue("permissionEvaluator", permissionEvaluator);
 
-        ctx.registerBeanDefinition("expressionHandler", webExpressionHandler.getBeanDefinition());
-        ctx.registerSingleton("wipe", MockWebInvocationPrivilegeEvaluator.class);
-        MockServletContext servletCtx = new MockServletContext();
-        servletCtx.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx);
-        authorizeTag = new JspAuthorizeTag();
-        authorizeTag.setPageContext(new MockPageContext(servletCtx, request, new MockHttpServletResponse()));
-    }
+		ctx.registerBeanDefinition("expressionHandler",
+				webExpressionHandler.getBeanDefinition());
+		ctx.registerSingleton("wipe", MockWebInvocationPrivilegeEvaluator.class);
+		MockServletContext servletCtx = new MockServletContext();
+		servletCtx.setAttribute(
+				WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ctx);
+		authorizeTag = new JspAuthorizeTag();
+		authorizeTag.setPageContext(new MockPageContext(servletCtx, request,
+				new MockHttpServletResponse()));
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    // access attribute tests
+	// access attribute tests
 
-    @Test
-    public void taglibsDocumentationHasPermissionOr() throws Exception {
-        Object domain = new Object();
-        request.setAttribute("domain", domain);
-        authorizeTag.setAccess("hasPermission(#domain,'read') or hasPermission(#domain,'write')");
-        when(permissionEvaluator.hasPermission(eq(currentUser), eq(domain), anyString())).thenReturn(true);
+	@Test
+	public void taglibsDocumentationHasPermissionOr() throws Exception {
+		Object domain = new Object();
+		request.setAttribute("domain", domain);
+		authorizeTag
+				.setAccess("hasPermission(#domain,'read') or hasPermission(#domain,'write')");
+		when(permissionEvaluator.hasPermission(eq(currentUser), eq(domain), anyString()))
+				.thenReturn(true);
 
-        assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
-    }
+		assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void skipsBodyIfNoAuthenticationPresent() throws Exception {
-        SecurityContextHolder.clearContext();
-        authorizeTag.setAccess("permitAll");
-        assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
-    }
+	@Test
+	public void skipsBodyIfNoAuthenticationPresent() throws Exception {
+		SecurityContextHolder.clearContext();
+		authorizeTag.setAccess("permitAll");
+		assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void skipsBodyIfAccessExpressionDeniesAccess() throws Exception {
-        authorizeTag.setAccess("denyAll");
-        assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
-    }
+	@Test
+	public void skipsBodyIfAccessExpressionDeniesAccess() throws Exception {
+		authorizeTag.setAccess("denyAll");
+		assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void showsBodyIfAccessExpressionAllowsAccess() throws Exception {
-        authorizeTag.setAccess("permitAll");
-        assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
-    }
+	@Test
+	public void showsBodyIfAccessExpressionAllowsAccess() throws Exception {
+		authorizeTag.setAccess("permitAll");
+		assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void requestAttributeIsResolvedAsElVariable() throws JspException {
-        request.setAttribute("blah", "blah");
-        authorizeTag.setAccess("#blah == 'blah'");
-        assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
-    }
+	@Test
+	public void requestAttributeIsResolvedAsElVariable() throws JspException {
+		request.setAttribute("blah", "blah");
+		authorizeTag.setAccess("#blah == 'blah'");
+		assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
+	}
 
-    // url attribute tests
-    @Test
-    public void skipsBodyWithUrlSetIfNoAuthenticationPresent() throws Exception {
-        SecurityContextHolder.clearContext();
-        authorizeTag.setUrl("/something");
-        assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
-    }
+	// url attribute tests
+	@Test
+	public void skipsBodyWithUrlSetIfNoAuthenticationPresent() throws Exception {
+		SecurityContextHolder.clearContext();
+		authorizeTag.setUrl("/something");
+		assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void skipsBodyIfUrlIsNotAllowed() throws Exception {
-        authorizeTag.setUrl("/notallowed");
-        assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
-    }
+	@Test
+	public void skipsBodyIfUrlIsNotAllowed() throws Exception {
+		authorizeTag.setUrl("/notallowed");
+		assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void evaluatesBodyIfUrlIsAllowed() throws Exception {
-        authorizeTag.setUrl("/allowed");
-        authorizeTag.setMethod("GET");
-        assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
-    }
+	@Test
+	public void evaluatesBodyIfUrlIsAllowed() throws Exception {
+		authorizeTag.setUrl("/allowed");
+		authorizeTag.setMethod("GET");
+		assertEquals(Tag.EVAL_BODY_INCLUDE, authorizeTag.doStartTag());
+	}
 
-    @Test
-    public void skipsBodyIfMethodIsNotAllowed() throws Exception {
-        authorizeTag.setUrl("/allowed");
-        authorizeTag.setMethod("POST");
-        assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
-    }
+	@Test
+	public void skipsBodyIfMethodIsNotAllowed() throws Exception {
+		authorizeTag.setUrl("/allowed");
+		authorizeTag.setMethod("POST");
+		assertEquals(Tag.SKIP_BODY, authorizeTag.doStartTag());
+	}
 
-    public static class MockWebInvocationPrivilegeEvaluator implements WebInvocationPrivilegeEvaluator {
+	public static class MockWebInvocationPrivilegeEvaluator implements
+			WebInvocationPrivilegeEvaluator {
 
-        public boolean isAllowed(String uri, Authentication authentication) {
-            return "/allowed".equals(uri);
-        }
+		public boolean isAllowed(String uri, Authentication authentication) {
+			return "/allowed".equals(uri);
+		}
 
-        public boolean isAllowed(String contextPath, String uri, String method, Authentication authentication) {
-            return "/allowed".equals(uri) && (method == null || "GET".equals(method));
-        }
-    }
+		public boolean isAllowed(String contextPath, String uri, String method,
+				Authentication authentication) {
+			return "/allowed".equals(uri) && (method == null || "GET".equals(method));
+		}
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java
index 06a51bd5ec..d2862bb5fe 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/AbstractCsrfTagTests.java
@@ -21,71 +21,78 @@ import static org.junit.Assert.*;
  */
 public class AbstractCsrfTagTests {
 
-    public MockTag tag;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
+	public MockTag tag;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
 
-    @Before
-    public void setUp() {
-        MockServletContext servletContext = new MockServletContext();
-        this.request = new MockHttpServletRequest(servletContext);
-        this.response = new MockHttpServletResponse();
-        MockPageContext pageContext = new MockPageContext(servletContext, this.request, this.response);
-        this.tag = new MockTag();
-        this.tag.setPageContext(pageContext);
-    }
+	@Before
+	public void setUp() {
+		MockServletContext servletContext = new MockServletContext();
+		this.request = new MockHttpServletRequest(servletContext);
+		this.response = new MockHttpServletResponse();
+		MockPageContext pageContext = new MockPageContext(servletContext, this.request,
+				this.response);
+		this.tag = new MockTag();
+		this.tag.setPageContext(pageContext);
+	}
 
-    @Test
-    public void noCsrfDoesNotRender() throws JspException, UnsupportedEncodingException {
+	@Test
+	public void noCsrfDoesNotRender() throws JspException, UnsupportedEncodingException {
 
-        this.tag.handleReturn = "shouldNotBeRendered";
+		this.tag.handleReturn = "shouldNotBeRendered";
 
-        int returned = this.tag.doEndTag();
+		int returned = this.tag.doEndTag();
 
-        assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
-        assertEquals("The output value is not correct.", "", this.response.getContentAsString());
-    }
+		assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
+		assertEquals("The output value is not correct.", "",
+				this.response.getContentAsString());
+	}
 
-    @Test
-    public void hasCsrfRendersReturnedValue() throws JspException, UnsupportedEncodingException {
+	@Test
+	public void hasCsrfRendersReturnedValue() throws JspException,
+			UnsupportedEncodingException {
 
-        CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf", "abc123def456ghi789");
-        this.request.setAttribute(CsrfToken.class.getName(), token);
+		CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf",
+				"abc123def456ghi789");
+		this.request.setAttribute(CsrfToken.class.getName(), token);
 
-        this.tag.handleReturn = "fooBarBazQux";
+		this.tag.handleReturn = "fooBarBazQux";
 
-        int returned = this.tag.doEndTag();
+		int returned = this.tag.doEndTag();
 
-        assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
-        assertEquals("The output value is not correct.", "fooBarBazQux", this.response.getContentAsString());
-        assertSame("The token is not correct.", token, this.tag.token);
-    }
+		assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
+		assertEquals("The output value is not correct.", "fooBarBazQux",
+				this.response.getContentAsString());
+		assertSame("The token is not correct.", token, this.tag.token);
+	}
 
-    @Test
-    public void hasCsrfRendersDifferentValue() throws JspException, UnsupportedEncodingException {
+	@Test
+	public void hasCsrfRendersDifferentValue() throws JspException,
+			UnsupportedEncodingException {
 
-        CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf", "abc123def456ghi789");
-        this.request.setAttribute(CsrfToken.class.getName(), token);
+		CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf",
+				"abc123def456ghi789");
+		this.request.setAttribute(CsrfToken.class.getName(), token);
 
-        this.tag.handleReturn = "<input type=\"hidden\" />";
+		this.tag.handleReturn = "<input type=\"hidden\" />";
 
-        int returned = this.tag.doEndTag();
+		int returned = this.tag.doEndTag();
 
-        assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
-        assertEquals("The output value is not correct.", "<input type=\"hidden\" />",
-                this.response.getContentAsString());
-        assertSame("The token is not correct.", token, this.tag.token);
-    }
+		assertEquals("The returned value is not correct.", TagSupport.EVAL_PAGE, returned);
+		assertEquals("The output value is not correct.", "<input type=\"hidden\" />",
+				this.response.getContentAsString());
+		assertSame("The token is not correct.", token, this.tag.token);
+	}
 
-    private static class MockTag extends AbstractCsrfTag {
+	private static class MockTag extends AbstractCsrfTag {
 
-        private CsrfToken token;
-        private String handleReturn;
+		private CsrfToken token;
+		private String handleReturn;
 
-        @Override
-        protected String handleToken(CsrfToken token) {
-            this.token = token;
-            return this.handleReturn;
-        }
-    }
+		@Override
+		protected String handleToken(CsrfToken token) {
+			this.token = token;
+			return this.handleReturn;
+		}
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java
index 24efd68c51..fcc5dd6fa0 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfInputTagTests.java
@@ -12,34 +12,37 @@ import static org.junit.Assert.*;
  */
 public class CsrfInputTagTests {
 
-    public CsrfInputTag tag;
+	public CsrfInputTag tag;
 
-    @Before
-    public void setUp() {
-        this.tag = new CsrfInputTag();
-    }
+	@Before
+	public void setUp() {
+		this.tag = new CsrfInputTag();
+	}
 
-    @Test
-    public void handleTokenReturnsHiddenInput() {
-        CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf", "abc123def456ghi789");
+	@Test
+	public void handleTokenReturnsHiddenInput() {
+		CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf",
+				"abc123def456ghi789");
 
-        String value = this.tag.handleToken(token);
+		String value = this.tag.handleToken(token);
 
-        assertNotNull("The returned value should not be null.", value);
-        assertEquals("The output is not correct.",
-                "<input type=\"hidden\" name=\"_csrf\" value=\"abc123def456ghi789\" />",
-                value);
-    }
+		assertNotNull("The returned value should not be null.", value);
+		assertEquals("The output is not correct.",
+				"<input type=\"hidden\" name=\"_csrf\" value=\"abc123def456ghi789\" />",
+				value);
+	}
 
-    @Test
-    public void handleTokenReturnsHiddenInputDifferentTokenValue() {
-        CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "csrfParameter", "fooBarBazQux");
+	@Test
+	public void handleTokenReturnsHiddenInputDifferentTokenValue() {
+		CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "csrfParameter",
+				"fooBarBazQux");
 
-        String value = this.tag.handleToken(token);
+		String value = this.tag.handleToken(token);
 
-        assertNotNull("The returned value should not be null.", value);
-        assertEquals("The output is not correct.",
-                "<input type=\"hidden\" name=\"csrfParameter\" value=\"fooBarBazQux\" />",
-                value);
-    }
+		assertNotNull("The returned value should not be null.", value);
+		assertEquals(
+				"The output is not correct.",
+				"<input type=\"hidden\" name=\"csrfParameter\" value=\"fooBarBazQux\" />",
+				value);
+	}
 }
diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java
index 798b960af1..5880799039 100644
--- a/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java
+++ b/taglibs/src/test/java/org/springframework/security/taglibs/csrf/CsrfMetaTagsTagTests.java
@@ -12,38 +12,38 @@ import static org.junit.Assert.*;
  */
 public class CsrfMetaTagsTagTests {
 
-    public CsrfMetaTagsTag tag;
+	public CsrfMetaTagsTag tag;
 
-    @Before
-    public void setUp() {
-        this.tag = new CsrfMetaTagsTag();
-    }
+	@Before
+	public void setUp() {
+		this.tag = new CsrfMetaTagsTag();
+	}
 
-    @Test
-    public void handleTokenRendersTags() {
-        CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf", "abc123def456ghi789");
+	@Test
+	public void handleTokenRendersTags() {
+		CsrfToken token = new DefaultCsrfToken("X-Csrf-Token", "_csrf",
+				"abc123def456ghi789");
 
-        String value = this.tag.handleToken(token);
+		String value = this.tag.handleToken(token);
 
-        assertNotNull("The returned value should not be null.", value);
-        assertEquals("The output is not correct.",
-                "<meta name=\"_csrf_parameter\" content=\"_csrf\" />" +
-                        "<meta name=\"_csrf_header\" content=\"X-Csrf-Token\" />" +
-                        "<meta name=\"_csrf\" content=\"abc123def456ghi789\" />",
-                value);
-    }
+		assertNotNull("The returned value should not be null.", value);
+		assertEquals("The output is not correct.",
+				"<meta name=\"_csrf_parameter\" content=\"_csrf\" />"
+						+ "<meta name=\"_csrf_header\" content=\"X-Csrf-Token\" />"
+						+ "<meta name=\"_csrf\" content=\"abc123def456ghi789\" />", value);
+	}
 
-    @Test
-    public void handleTokenRendersTagsDifferentToken() {
-        CsrfToken token = new DefaultCsrfToken("csrfHeader", "csrfParameter", "fooBarBazQux");
+	@Test
+	public void handleTokenRendersTagsDifferentToken() {
+		CsrfToken token = new DefaultCsrfToken("csrfHeader", "csrfParameter",
+				"fooBarBazQux");
 
-        String value = this.tag.handleToken(token);
+		String value = this.tag.handleToken(token);
 
-        assertNotNull("The returned value should not be null.", value);
-        assertEquals("The output is not correct.",
-                "<meta name=\"_csrf_parameter\" content=\"csrfParameter\" />" +
-                        "<meta name=\"_csrf_header\" content=\"csrfHeader\" />" +
-                        "<meta name=\"_csrf\" content=\"fooBarBazQux\" />",
-                value);
-    }
+		assertNotNull("The returned value should not be null.", value);
+		assertEquals("The output is not correct.",
+				"<meta name=\"_csrf_parameter\" content=\"csrfParameter\" />"
+						+ "<meta name=\"_csrf_header\" content=\"csrfHeader\" />"
+						+ "<meta name=\"_csrf\" content=\"fooBarBazQux\" />", value);
+	}
 }
diff --git a/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java b/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java
index 69533dc3e5..df4ab00306 100644
--- a/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java
+++ b/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java
@@ -26,27 +26,26 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.util.Assert;
 
 /**
- * The {@link TestSecurityContextHolder} is very similar to
- * {@link SecurityContextHolder}, but is necessary for testing. For example, we
- * cannot populate the desired {@link SecurityContext} in
- * {@link SecurityContextHolder} for web based testing. In a web request, the
- * {@link SecurityContextPersistenceFilter} will override the
+ * The {@link TestSecurityContextHolder} is very similar to {@link SecurityContextHolder},
+ * but is necessary for testing. For example, we cannot populate the desired
+ * {@link SecurityContext} in {@link SecurityContextHolder} for web based testing. In a
+ * web request, the {@link SecurityContextPersistenceFilter} will override the
  * {@link SecurityContextHolder} with the value returned by the
  * {@link SecurityContextRepository}. At the end of the {@link FilterChain} the
  * {@link SecurityContextPersistenceFilter} will clear out the
- * {@link SecurityContextHolder}. This means if we make multiple web requests,
- * we will not know which {@link SecurityContext} to use on subsequent requests.
+ * {@link SecurityContextHolder}. This means if we make multiple web requests, we will not
+ * know which {@link SecurityContext} to use on subsequent requests.
  *
  * Typical usage is as follows:
  *
  * <ul>
- * <li>Before a test is executed, the {@link TestSecurityContextHolder} is
- * populated. Typically this is done using the
- * {@link org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener}</li>
+ * <li>Before a test is executed, the {@link TestSecurityContextHolder} is populated.
+ * Typically this is done using the
+ * {@link org.springframework.security.test.context.support.WithSecurityContextTestExecutionListener}
+ * </li>
  * <li>The test is ran. When used with {@link MockMvc} it is typically used with
- * {@link SecurityMockMvcRequestPostProcessors#testSecurityContext()}. Which ensures
- * the {@link SecurityContext} from {@link TestSecurityContextHolder} is
- * properly populated.</li>
+ * {@link SecurityMockMvcRequestPostProcessors#testSecurityContext()}. Which ensures the
+ * {@link SecurityContext} from {@link TestSecurityContextHolder} is properly populated.</li>
  * <li>After the test is executed, the {@link TestSecurityContextHolder} and the
  * {@link SecurityContextHolder} are cleared out</li>
  * </ul>
@@ -57,53 +56,54 @@ import org.springframework.util.Assert;
  */
 public final class TestSecurityContextHolder {
 
-    private static final ThreadLocal<SecurityContext> contextHolder = new ThreadLocal<SecurityContext>();
+	private static final ThreadLocal<SecurityContext> contextHolder = new ThreadLocal<SecurityContext>();
 
-    /**
-     * Clears the {@link SecurityContext} from {@link TestSecurityContextHolder}
-     * and {@link SecurityContextHolder}.
-     */
-    public static void clearContext() {
-        contextHolder.remove();
-        SecurityContextHolder.clearContext();
-    }
+	/**
+	 * Clears the {@link SecurityContext} from {@link TestSecurityContextHolder} and
+	 * {@link SecurityContextHolder}.
+	 */
+	public static void clearContext() {
+		contextHolder.remove();
+		SecurityContextHolder.clearContext();
+	}
 
-    /**
-     * Gets the {@link SecurityContext} from {@link TestSecurityContextHolder}.
-     *
-     * @return the {@link SecurityContext} from {@link TestSecurityContextHolder}.
-     */
-    public static SecurityContext getContext() {
-        SecurityContext ctx = contextHolder.get();
+	/**
+	 * Gets the {@link SecurityContext} from {@link TestSecurityContextHolder}.
+	 *
+	 * @return the {@link SecurityContext} from {@link TestSecurityContextHolder}.
+	 */
+	public static SecurityContext getContext() {
+		SecurityContext ctx = contextHolder.get();
 
-        if (ctx == null) {
-            ctx = getDefaultContext();
-            contextHolder.set(ctx);
-        }
+		if (ctx == null) {
+			ctx = getDefaultContext();
+			contextHolder.set(ctx);
+		}
 
-        return ctx;
-    }
+		return ctx;
+	}
 
-    /**
-     * Sets the {@link SecurityContext} on {@link TestSecurityContextHolder} and {@link SecurityContextHolder}.
-     * @param context the {@link SecurityContext} to use
-     */
-    public static void setContext(SecurityContext context) {
-        Assert.notNull(context,
-                "Only non-null SecurityContext instances are permitted");
-        contextHolder.set(context);
-        SecurityContextHolder.setContext(context);
-    }
+	/**
+	 * Sets the {@link SecurityContext} on {@link TestSecurityContextHolder} and
+	 * {@link SecurityContextHolder}.
+	 * @param context the {@link SecurityContext} to use
+	 */
+	public static void setContext(SecurityContext context) {
+		Assert.notNull(context, "Only non-null SecurityContext instances are permitted");
+		contextHolder.set(context);
+		SecurityContextHolder.setContext(context);
+	}
 
-    /**
-     * Gets the default {@link SecurityContext} by delegating to the {@link SecurityContextHolder}
-     *
-     * @return the default {@link SecurityContext}
-     */
-    private static SecurityContext getDefaultContext() {
-        return SecurityContextHolder.getContext();
-    }
+	/**
+	 * Gets the default {@link SecurityContext} by delegating to the
+	 * {@link SecurityContextHolder}
+	 *
+	 * @return the default {@link SecurityContext}
+	 */
+	private static SecurityContext getDefaultContext() {
+		return SecurityContextHolder.getContext();
+	}
 
-    private TestSecurityContextHolder() {
-    }
+	private TestSecurityContextHolder() {
+	}
 }
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithMockUser.java b/test/src/main/java/org/springframework/security/test/context/support/WithMockUser.java
index 3bf42726fb..818d9f0e7c 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithMockUser.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithMockUser.java
@@ -30,16 +30,17 @@ import org.springframework.test.web.servlet.MockMvc;
 
 /**
  * When used with {@link WithSecurityContextTestExecutionListener} this annotation can be
- * added to a test method to emulate running with a mocked user. In order to work with {@link MockMvc}  The
- * {@link SecurityContext} that is used will have the following properties:
+ * added to a test method to emulate running with a mocked user. In order to work with
+ * {@link MockMvc} The {@link SecurityContext} that is used will have the following
+ * properties:
  *
  * <ul>
  * <li>The {@link SecurityContext} created with be that of
  * {@link SecurityContextHolder#createEmptyContext()}</li>
- * <li>It will be populated with an {@link UsernamePasswordAuthenticationToken}
- * that uses the username of either {@link #value()} or {@link #username()},
- * {@link GrantedAuthority} that are specified by {@link #roles()}, and a
- * password specified by {@link #password()}.
+ * <li>It will be populated with an {@link UsernamePasswordAuthenticationToken} that uses
+ * the username of either {@link #value()} or {@link #username()},
+ * {@link GrantedAuthority} that are specified by {@link #roles()}, and a password
+ * specified by {@link #password()}.
  * </ul>
  *
  * @see WithUserDetails
@@ -53,31 +54,33 @@ import org.springframework.test.web.servlet.MockMvc;
 @Documented
 @WithSecurityContext(factory = WithMockUserSecurityContextFactory.class)
 public @interface WithMockUser {
-    /**
-     * Convenience mechanism for specifying the username. The default is "user". If {@link #username()} is specified it will be used instead of {@link #value()}
-     * @return
-     */
-    String value() default "user";
+	/**
+	 * Convenience mechanism for specifying the username. The default is "user". If
+	 * {@link #username()} is specified it will be used instead of {@link #value()}
+	 * @return
+	 */
+	String value() default "user";
 
-    /**
-     * The username to be used. Note that {@link #value()} is a synonym for {@link #username()}, but if {@link #username()} is specified it will take precedence.
-     * @return
-     */
-    String username() default "";
+	/**
+	 * The username to be used. Note that {@link #value()} is a synonym for
+	 * {@link #username()}, but if {@link #username()} is specified it will take
+	 * precedence.
+	 * @return
+	 */
+	String username() default "";
 
-    /**
-     * The roles to use. The default is "USER". A {@link GrantedAuthority} will
-     * be created for each value within roles. Each value in roles will
-     * automatically be prefixed with "ROLE_". For example, the default will
-     * result in "ROLE_USER" being used.
-     *
-     * @return
-     */
-    String[] roles() default { "USER" };
+	/**
+	 * The roles to use. The default is "USER". A {@link GrantedAuthority} will be created
+	 * for each value within roles. Each value in roles will automatically be prefixed
+	 * with "ROLE_". For example, the default will result in "ROLE_USER" being used.
+	 *
+	 * @return
+	 */
+	String[] roles() default { "USER" };
 
-    /**
-     * The password to be used. The default is "password".
-     * @return
-     */
-    String password() default "password";
+	/**
+	 * The password to be used. The default is "password".
+	 * @return
+	 */
+	String password() default "password";
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
index 336e7e1132..30a5881a85 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java
@@ -34,24 +34,30 @@ import org.springframework.util.StringUtils;
  * @since 4.0
  * @see WithMockUser
  */
-final class WithMockUserSecurityContextFactory implements WithSecurityContextFactory<WithMockUser> {
+final class WithMockUserSecurityContextFactory implements
+		WithSecurityContextFactory<WithMockUser> {
 
-    public SecurityContext createSecurityContext(WithMockUser withUser) {
-        String username = StringUtils.hasLength(withUser.username()) ? withUser.username() : withUser.value();
-        if(username == null) {
-            throw new IllegalArgumentException(withUser + " cannot have null username on both username and value properites");
-        }
-        List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        for(String role : withUser.roles()) {
-            if(role.startsWith("ROLE_")) {
-                throw new IllegalArgumentException("roles cannot start with ROLE_ Got " + role);
-            }
-            authorities.add(new SimpleGrantedAuthority("ROLE_"+role));
-        }
-        User principal = new User(username, withUser.password(), true, true, true, true, authorities);
-        Authentication authentication = new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), principal.getAuthorities());
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(authentication);
-        return context;
-    }
+	public SecurityContext createSecurityContext(WithMockUser withUser) {
+		String username = StringUtils.hasLength(withUser.username()) ? withUser
+				.username() : withUser.value();
+		if (username == null) {
+			throw new IllegalArgumentException(withUser
+					+ " cannot have null username on both username and value properites");
+		}
+		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
+		for (String role : withUser.roles()) {
+			if (role.startsWith("ROLE_")) {
+				throw new IllegalArgumentException("roles cannot start with ROLE_ Got "
+						+ role);
+			}
+			authorities.add(new SimpleGrantedAuthority("ROLE_" + role));
+		}
+		User principal = new User(username, withUser.password(), true, true, true, true,
+				authorities);
+		Authentication authentication = new UsernamePasswordAuthenticationToken(
+				principal, principal.getPassword(), principal.getAuthorities());
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(authentication);
+		return context;
+	}
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContext.java b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContext.java
index 81e8345e5c..b1e9b54d54 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContext.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContext.java
@@ -28,8 +28,8 @@ import org.springframework.security.core.context.SecurityContext;
 
 /**
  * <p>
- * An annotation to determine what {@link SecurityContext} to use. The
- * {@link #factory()} attribute must be provided with an instance of
+ * An annotation to determine what {@link SecurityContext} to use. The {@link #factory()}
+ * attribute must be provided with an instance of
  * {@link WithUserDetailsSecurityContextFactory}.
  * </p>
  *
@@ -40,23 +40,25 @@ import org.springframework.security.core.context.SecurityContext;
  *
  * <p>
  * If you would like to create your own implementation of
- * {@link WithSecurityContextFactory} you can do so by implementing the
- * interface. You can also use {@link Autowired} and other Spring semantics on
- * the {@link WithSecurityContextFactory} implementation.
+ * {@link WithSecurityContextFactory} you can do so by implementing the interface. You can
+ * also use {@link Autowired} and other Spring semantics on the
+ * {@link WithSecurityContextFactory} implementation.
  * </p>
  *
  * @author Rob Winch
  * @since 4.0
  */
-@Target({ElementType.ANNOTATION_TYPE})
+@Target({ ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
 public @interface WithSecurityContext {
-    /**
-     * The {@link WithUserDetailsSecurityContextFactory} to use to create the {@link SecurityContext}. It can contain {@link Autowired} and other Spring annotations.
-     *
-     * @return
-     */
-    Class<? extends WithSecurityContextFactory<? extends Annotation>> factory();
+	/**
+	 * The {@link WithUserDetailsSecurityContextFactory} to use to create the
+	 * {@link SecurityContext}. It can contain {@link Autowired} and other Spring
+	 * annotations.
+	 *
+	 * @return
+	 */
+	Class<? extends WithSecurityContextFactory<? extends Annotation>> factory();
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextFactory.java
index 5cbd656c6d..5528b39b93 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextFactory.java
@@ -22,8 +22,7 @@ import org.springframework.security.test.context.TestSecurityContextHolder;
 
 /**
  * An API that works with WithUserTestExcecutionListener for creating a
- * {@link SecurityContext} that is populated in the
- * {@link TestSecurityContextHolder}.
+ * {@link SecurityContext} that is populated in the {@link TestSecurityContextHolder}.
  *
  * @author Rob Winch
  *
@@ -35,13 +34,12 @@ import org.springframework.security.test.context.TestSecurityContextHolder;
  */
 public interface WithSecurityContextFactory<A extends Annotation> {
 
-    /**
-     * Create a {@link SecurityContext} given an Annotation.
-     *
-     * @param annotation
-     *            the {@link Annotation} to create the {@link SecurityContext}
-     *            from. Cannot be null.
-     * @return the {@link SecurityContext} to use. Cannot be null.
-     */
-    SecurityContext createSecurityContext(A annotation);
+	/**
+	 * Create a {@link SecurityContext} given an Annotation.
+	 *
+	 * @param annotation the {@link Annotation} to create the {@link SecurityContext}
+	 * from. Cannot be null.
+	 * @return the {@link SecurityContext} to use. Cannot be null.
+	 */
+	SecurityContext createSecurityContext(A annotation);
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
index 45fed80487..4f4ebb44aa 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java
@@ -31,8 +31,8 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution
 import org.springframework.test.web.servlet.MockMvc;
 
 /**
- * A {@link TestExecutionListener} that will find annotations that are annotated
- * with {@link WithSecurityContext} on a test method or at the class level. If found, the
+ * A {@link TestExecutionListener} that will find annotations that are annotated with
+ * {@link WithSecurityContext} on a test method or at the class level. If found, the
  * {@link WithSecurityContext#factory()} is used to create a {@link SecurityContext} that
  * will be used with this test. If using with {@link MockMvc} the
  * {@link SecurityMockMvcRequestPostProcessors#testSecurityContext()} needs to be used
@@ -43,68 +43,68 @@ import org.springframework.test.web.servlet.MockMvc;
  */
 @Order(1000)
 public class WithSecurityContextTestExecutionListener extends
-        AbstractTestExecutionListener {
+		AbstractTestExecutionListener {
 
-    /**
-     * Sets up the {@link SecurityContext} for each test method. First the
-     * specific method is inspected for a {@link WithSecurityContext} or {@link Annotation}
-     * that has {@link WithSecurityContext} on it. If that is not found, the class is
-     * inspected. If still not found, then no {@link SecurityContext} is
-     * populated.
-     */
-    @Override
-    public void beforeTestMethod(TestContext testContext) throws Exception {
-        Annotation[] methodAnnotations = AnnotationUtils
-                .getAnnotations(testContext.getTestMethod());
-        ApplicationContext context = testContext.getApplicationContext();
-        SecurityContext securityContext = createSecurityContext(
-                methodAnnotations, context);
-        if (securityContext == null) {
-            Annotation[] classAnnotations = testContext.getTestClass()
-                    .getAnnotations();
-            securityContext = createSecurityContext(classAnnotations, context);
-        }
-        if (securityContext != null) {
-            TestSecurityContextHolder.setContext(securityContext);
-        }
-    }
+	/**
+	 * Sets up the {@link SecurityContext} for each test method. First the specific method
+	 * is inspected for a {@link WithSecurityContext} or {@link Annotation} that has
+	 * {@link WithSecurityContext} on it. If that is not found, the class is inspected. If
+	 * still not found, then no {@link SecurityContext} is populated.
+	 */
+	@Override
+	public void beforeTestMethod(TestContext testContext) throws Exception {
+		Annotation[] methodAnnotations = AnnotationUtils.getAnnotations(testContext
+				.getTestMethod());
+		ApplicationContext context = testContext.getApplicationContext();
+		SecurityContext securityContext = createSecurityContext(methodAnnotations,
+				context);
+		if (securityContext == null) {
+			Annotation[] classAnnotations = testContext.getTestClass().getAnnotations();
+			securityContext = createSecurityContext(classAnnotations, context);
+		}
+		if (securityContext != null) {
+			TestSecurityContextHolder.setContext(securityContext);
+		}
+	}
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private SecurityContext createSecurityContext(Annotation[] annotations,
-            ApplicationContext context) {
-        for (Annotation a : annotations) {
-            WithSecurityContext withUser = AnnotationUtils.findAnnotation(
-                    a.annotationType(), WithSecurityContext.class);
-            if (withUser != null) {
-                WithSecurityContextFactory factory = createFactory(
-                        withUser, context);
-                try {
-                    return factory.createSecurityContext(a);
-                } catch (RuntimeException e) {
-                    throw new IllegalStateException("Unable to create SecurityContext using "+ a, e);
-                }
-            }
-        }
-        return null;
-    }
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private SecurityContext createSecurityContext(Annotation[] annotations,
+			ApplicationContext context) {
+		for (Annotation a : annotations) {
+			WithSecurityContext withUser = AnnotationUtils.findAnnotation(
+					a.annotationType(), WithSecurityContext.class);
+			if (withUser != null) {
+				WithSecurityContextFactory factory = createFactory(withUser, context);
+				try {
+					return factory.createSecurityContext(a);
+				}
+				catch (RuntimeException e) {
+					throw new IllegalStateException(
+							"Unable to create SecurityContext using " + a, e);
+				}
+			}
+		}
+		return null;
+	}
 
-    private WithSecurityContextFactory<? extends Annotation> createFactory(
-            WithSecurityContext withUser, ApplicationContext context) {
-        Class<? extends WithSecurityContextFactory<? extends Annotation>> clazz = withUser
-                .factory();
-        try {
-            return context.getAutowireCapableBeanFactory().createBean(clazz);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
+	private WithSecurityContextFactory<? extends Annotation> createFactory(
+			WithSecurityContext withUser, ApplicationContext context) {
+		Class<? extends WithSecurityContextFactory<? extends Annotation>> clazz = withUser
+				.factory();
+		try {
+			return context.getAutowireCapableBeanFactory().createBean(clazz);
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
 
-    /**
-     * Clears out the {@link TestSecurityContextHolder} and the
-     * {@link SecurityContextHolder} after each test method.
-     */
-    @Override
-    public void afterTestMethod(TestContext testContext) throws Exception {
-        TestSecurityContextHolder.clearContext();
-    }
+	/**
+	 * Clears out the {@link TestSecurityContextHolder} and the
+	 * {@link SecurityContextHolder} after each test method.
+	 */
+	@Override
+	public void afterTestMethod(TestContext testContext) throws Exception {
+		TestSecurityContextHolder.clearContext();
+	}
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
index a3c7fa7383..cf28e5bd56 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
@@ -32,17 +32,17 @@ import org.springframework.test.web.servlet.MockMvc;
 
 /**
  * When used with {@link WithSecurityContextTestExecutionListener} this annotation can be
- * added to a test method to emulate running with a {@link UserDetails} returned
- * from the {@link UserDetailsService}. In order to work with {@link MockMvc}
- * The {@link SecurityContext} that is used will have the following properties:
+ * added to a test method to emulate running with a {@link UserDetails} returned from the
+ * {@link UserDetailsService}. In order to work with {@link MockMvc} The
+ * {@link SecurityContext} that is used will have the following properties:
  *
  * <ul>
  * <li>The {@link SecurityContext} created with be that of
  * {@link SecurityContextHolder#createEmptyContext()}</li>
- * <li>It will be populated with an {@link UsernamePasswordAuthenticationToken}
- * that uses the username of either {@link #value()} or {@link #username()},
- * {@link GrantedAuthority} that are specified by {@link #roles()}, and a
- * password specified by {@link #password()}.
+ * <li>It will be populated with an {@link UsernamePasswordAuthenticationToken} that uses
+ * the username of either {@link #value()} or {@link #username()},
+ * {@link GrantedAuthority} that are specified by {@link #roles()}, and a password
+ * specified by {@link #password()}.
  * </ul>
  *
  * @see WithMockUser
@@ -50,16 +50,16 @@ import org.springframework.test.web.servlet.MockMvc;
  * @author Rob Winch
  * @since 4.0
  */
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Documented
-@WithSecurityContext(factory=WithUserDetailsSecurityContextFactory.class)
+@WithSecurityContext(factory = WithUserDetailsSecurityContextFactory.class)
 public @interface WithUserDetails {
-    /**
-     * The username to look up in the {@link UserDetailsService}
-     *
-     * @return
-     */
-    String value() default "user";
+	/**
+	 * The username to look up in the {@link UserDetailsService}
+	 *
+	 * @return
+	 */
+	String value() default "user";
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
index b3b05bb5af..59f4e44179 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java
@@ -25,7 +25,8 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.util.Assert;
 
 /**
- * A {@link WithUserDetailsSecurityContextFactory} that works with {@link WithUserDetails}.
+ * A {@link WithUserDetailsSecurityContextFactory} that works with {@link WithUserDetails}
+ * .
  *
  * @see WithUserDetails
  *
@@ -33,22 +34,24 @@ import org.springframework.util.Assert;
  * @since 4.0
  */
 
-final class WithUserDetailsSecurityContextFactory implements WithSecurityContextFactory<WithUserDetails> {
+final class WithUserDetailsSecurityContextFactory implements
+		WithSecurityContextFactory<WithUserDetails> {
 
-    private UserDetailsService userDetailsService;
+	private UserDetailsService userDetailsService;
 
-    @Autowired
-    public WithUserDetailsSecurityContextFactory(UserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
+	@Autowired
+	public WithUserDetailsSecurityContextFactory(UserDetailsService userDetailsService) {
+		this.userDetailsService = userDetailsService;
+	}
 
-    public SecurityContext createSecurityContext(WithUserDetails withUser) {
-        String username = withUser.value();
-        Assert.hasLength(username, "value() must be non empty String");
-        UserDetails principal = userDetailsService.loadUserByUsername(username);
-        Authentication authentication = new UsernamePasswordAuthenticationToken(principal, principal.getPassword(), principal.getAuthorities());
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(authentication);
-        return context;
-    }
+	public SecurityContext createSecurityContext(WithUserDetails withUser) {
+		String username = withUser.value();
+		Assert.hasLength(username, "value() must be non empty String");
+		UserDetails principal = userDetailsService.loadUserByUsername(username);
+		Authentication authentication = new UsernamePasswordAuthenticationToken(
+				principal, principal.getPassword(), principal.getAuthorities());
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(authentication);
+		return context;
+	}
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuilders.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuilders.java
index 92e0979790..5b793a07e9 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuilders.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuilders.java
@@ -35,179 +35,183 @@ import org.springframework.test.web.servlet.request.RequestPostProcessor;
  */
 public final class SecurityMockMvcRequestBuilders {
 
-    /**
-     * Creates a request (including any necessary {@link CsrfToken}) that will
-     * submit a form based login to POST "/login".
-     *
-     * @return the FormLoginRequestBuilder for further customizations
-     */
-    public static FormLoginRequestBuilder formLogin() {
-        return new FormLoginRequestBuilder();
-    }
+	/**
+	 * Creates a request (including any necessary {@link CsrfToken}) that will submit a
+	 * form based login to POST "/login".
+	 *
+	 * @return the FormLoginRequestBuilder for further customizations
+	 */
+	public static FormLoginRequestBuilder formLogin() {
+		return new FormLoginRequestBuilder();
+	}
 
-    /**
-     * Creates a request (including any necessary {@link CsrfToken}) that will
-     * submit a form based login to POST {@code loginProcessingUrl}.
-     *
-     * @param loginProcessingUrl
-     *            the URL to POST to
-     *
-     * @return the FormLoginRequestBuilder for further customizations
-     */
-    public static FormLoginRequestBuilder formLogin(String loginProcessingUrl) {
-        return formLogin().loginProcessingUrl(loginProcessingUrl);
-    }
+	/**
+	 * Creates a request (including any necessary {@link CsrfToken}) that will submit a
+	 * form based login to POST {@code loginProcessingUrl}.
+	 *
+	 * @param loginProcessingUrl the URL to POST to
+	 *
+	 * @return the FormLoginRequestBuilder for further customizations
+	 */
+	public static FormLoginRequestBuilder formLogin(String loginProcessingUrl) {
+		return formLogin().loginProcessingUrl(loginProcessingUrl);
+	}
 
-    /**
-     * Creates a logout request.
-     *
-     * @return the LogoutRequestBuilder for additional customizations
-     */
-    public static LogoutRequestBuilder logout() {
-        return new LogoutRequestBuilder();
-    }
+	/**
+	 * Creates a logout request.
+	 *
+	 * @return the LogoutRequestBuilder for additional customizations
+	 */
+	public static LogoutRequestBuilder logout() {
+		return new LogoutRequestBuilder();
+	}
 
-    /**
-     * Creates a logout request (including any necessary {@link CsrfToken}) to
-     * the specified {@code logoutUrl}
-     *
-     * @return the LogoutRequestBuilder for additional customizations
-     */
-    public static LogoutRequestBuilder logout(String logoutUrl) {
-        return new LogoutRequestBuilder().logoutUrl(logoutUrl);
-    }
+	/**
+	 * Creates a logout request (including any necessary {@link CsrfToken}) to the
+	 * specified {@code logoutUrl}
+	 *
+	 * @return the LogoutRequestBuilder for additional customizations
+	 */
+	public static LogoutRequestBuilder logout(String logoutUrl) {
+		return new LogoutRequestBuilder().logoutUrl(logoutUrl);
+	}
 
-    /**
-     * Creates a logout request (including any necessary {@link CsrfToken})
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    public static final class LogoutRequestBuilder implements RequestBuilder {
-        private String logoutUrl = "/logout";
-        private RequestPostProcessor postProcessor = csrf();
+	/**
+	 * Creates a logout request (including any necessary {@link CsrfToken})
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	public static final class LogoutRequestBuilder implements RequestBuilder {
+		private String logoutUrl = "/logout";
+		private RequestPostProcessor postProcessor = csrf();
 
-        public MockHttpServletRequest buildRequest(ServletContext servletContext) {
-            MockHttpServletRequest request = post(logoutUrl)
-                    .buildRequest(servletContext);
-            return postProcessor.postProcessRequest(request);
-        }
+		public MockHttpServletRequest buildRequest(ServletContext servletContext) {
+			MockHttpServletRequest request = post(logoutUrl).buildRequest(servletContext);
+			return postProcessor.postProcessRequest(request);
+		}
 
-        /**
-         * Specifies the logout URL to POST to. Defaults to "/logout".
-         *
-         * @param logoutUrl the logout URL to POST to. Defaults to "/logout".
-         * @return the {@link LogoutRequestBuilder} for additional customizations
-         */
-        public LogoutRequestBuilder logoutUrl(String logoutUrl) {
-            this.logoutUrl = logoutUrl;
-            return this;
-        }
+		/**
+		 * Specifies the logout URL to POST to. Defaults to "/logout".
+		 *
+		 * @param logoutUrl the logout URL to POST to. Defaults to "/logout".
+		 * @return the {@link LogoutRequestBuilder} for additional customizations
+		 */
+		public LogoutRequestBuilder logoutUrl(String logoutUrl) {
+			this.logoutUrl = logoutUrl;
+			return this;
+		}
 
-        private LogoutRequestBuilder() {}
-    }
+		private LogoutRequestBuilder() {
+		}
+	}
 
-    /**
-     * Creates a form based login request including any necessary {@link CsrfToken}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    public static final class FormLoginRequestBuilder implements RequestBuilder {
-        private String usernameParam = "username";
-        private String passwordParam = "password";
-        private String username = "user";
-        private String password = "password";
-        private String loginProcessingUrl = "/login";
-        private RequestPostProcessor postProcessor = csrf();
+	/**
+	 * Creates a form based login request including any necessary {@link CsrfToken}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	public static final class FormLoginRequestBuilder implements RequestBuilder {
+		private String usernameParam = "username";
+		private String passwordParam = "password";
+		private String username = "user";
+		private String password = "password";
+		private String loginProcessingUrl = "/login";
+		private RequestPostProcessor postProcessor = csrf();
 
-        public MockHttpServletRequest buildRequest(ServletContext servletContext) {
-            MockHttpServletRequest request = post(loginProcessingUrl)
-                    .param(usernameParam,username)
-                    .param(passwordParam, password)
-                    .buildRequest(servletContext);
-            return postProcessor.postProcessRequest(request);
-        }
+		public MockHttpServletRequest buildRequest(ServletContext servletContext) {
+			MockHttpServletRequest request = post(loginProcessingUrl)
+					.param(usernameParam, username).param(passwordParam, password)
+					.buildRequest(servletContext);
+			return postProcessor.postProcessRequest(request);
+		}
 
-        /**
-         * Specifies the URL to POST to. Default is "/login"
-         *
-         * @param loginProcessingUrl the URL to POST to. Default is "/login"
-         * @return
-         */
-        public FormLoginRequestBuilder loginProcessingUrl(String loginProcessingUrl) {
-            this.loginProcessingUrl = loginProcessingUrl;
-            return this;
-        }
+		/**
+		 * Specifies the URL to POST to. Default is "/login"
+		 *
+		 * @param loginProcessingUrl the URL to POST to. Default is "/login"
+		 * @return
+		 */
+		public FormLoginRequestBuilder loginProcessingUrl(String loginProcessingUrl) {
+			this.loginProcessingUrl = loginProcessingUrl;
+			return this;
+		}
 
-        /**
-         * The HTTP parameter to place the username. Default is "username".
-         * @param usernameParameter the HTTP parameter to place the username. Default is "username".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder userParameter(String usernameParameter) {
-            this.usernameParam = usernameParameter;
-            return this;
-        }
+		/**
+		 * The HTTP parameter to place the username. Default is "username".
+		 * @param usernameParameter the HTTP parameter to place the username. Default is
+		 * "username".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder userParameter(String usernameParameter) {
+			this.usernameParam = usernameParameter;
+			return this;
+		}
 
-        /**
-         * The HTTP parameter to place the password. Default is "password".
-         * @param passwordParameter the HTTP parameter to place the password. Default is "password".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder passwordParam(String passwordParameter) {
-            this.passwordParam = passwordParameter;
-            return this;
-        }
+		/**
+		 * The HTTP parameter to place the password. Default is "password".
+		 * @param passwordParameter the HTTP parameter to place the password. Default is
+		 * "password".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder passwordParam(String passwordParameter) {
+			this.passwordParam = passwordParameter;
+			return this;
+		}
 
-        /**
-         * The value of the password parameter. Default is "password".
-         * @param password the value of the password parameter. Default is "password".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder password(String password) {
-            this.password = password;
-            return this;
-        }
+		/**
+		 * The value of the password parameter. Default is "password".
+		 * @param password the value of the password parameter. Default is "password".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder password(String password) {
+			this.password = password;
+			return this;
+		}
 
-        /**
-         * The value of the username parameter. Default is "user".
-         * @param username the value of the username parameter. Default is "user".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder user(String username) {
-            this.username = username;
-            return this;
-        }
+		/**
+		 * The value of the username parameter. Default is "user".
+		 * @param username the value of the username parameter. Default is "user".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder user(String username) {
+			this.username = username;
+			return this;
+		}
 
-        /**
-         * Specify both the password parameter name and the password.
-         *
-         * @param passwordParameter the HTTP parameter to place the password. Default is "password".
-         * @param password the value of the password parameter. Default is "password".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder password(String passwordParameter, String password) {
-            passwordParam(passwordParameter);
-            this.password = password;
-            return this;
-        }
+		/**
+		 * Specify both the password parameter name and the password.
+		 *
+		 * @param passwordParameter the HTTP parameter to place the password. Default is
+		 * "password".
+		 * @param password the value of the password parameter. Default is "password".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder password(String passwordParameter, String password) {
+			passwordParam(passwordParameter);
+			this.password = password;
+			return this;
+		}
 
-        /**
-         * Specify both the password parameter name and the password.
-         *
-         * @param usernameParameter the HTTP parameter to place the username. Default is "username".
-         * @param username the value of the username parameter. Default is "user".
-         * @return the {@link FormLoginRequestBuilder} for additional customizations
-         */
-        public FormLoginRequestBuilder user(String usernameParameter, String username) {
-            userParameter(usernameParameter);
-            this.username = username;
-            return this;
-        }
+		/**
+		 * Specify both the password parameter name and the password.
+		 *
+		 * @param usernameParameter the HTTP parameter to place the username. Default is
+		 * "username".
+		 * @param username the value of the username parameter. Default is "user".
+		 * @return the {@link FormLoginRequestBuilder} for additional customizations
+		 */
+		public FormLoginRequestBuilder user(String usernameParameter, String username) {
+			userParameter(usernameParameter);
+			this.username = username;
+			return this;
+		}
 
-        private FormLoginRequestBuilder() {}
-    }
+		private FormLoginRequestBuilder() {
+		}
+	}
 
-    private SecurityMockMvcRequestBuilders() {}
+	private SecurityMockMvcRequestBuilders() {
+	}
 }
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
index 915c5f3b38..2d65286c4f 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
@@ -56,673 +56,670 @@ import org.springframework.util.Assert;
 import org.springframework.util.DigestUtils;
 
 /**
- * Contains {@link MockMvc} {@link RequestPostProcessor} implementations for
- * Spring Security.
+ * Contains {@link MockMvc} {@link RequestPostProcessor} implementations for Spring
+ * Security.
  *
  * @author Rob Winch
  * @since 4.0
  */
 public final class SecurityMockMvcRequestPostProcessors {
 
-    /**
-     * Creates a DigestRequestPostProcessor that enables easily adding digest based authentication to a request.
-     *
-     * @return the DigestRequestPostProcessor to use
-     */
-    public static DigestRequestPostProcessor digest() {
-        return new DigestRequestPostProcessor();
-    }
-
-    /**
-     * Creates a DigestRequestPostProcessor that enables easily adding digest based authentication to a request.
-     *
-     * @param username the username to use
-     * @return the DigestRequestPostProcessor to use
-     */
-    public static DigestRequestPostProcessor digest(String username) {
-        return digest().username(username);
-    }
-
-    /**
-     * Populates the provided X509Certificate instances on the request.
-     * @param certificates the X509Certificate instances to pouplate
-     * @return the {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
-     */
-    public static RequestPostProcessor x509(X509Certificate... certificates) {
-        return new X509RequestPostProcessor(certificates);
-    }
-
-    /**
-     * Finds an X509Cetificate using a resoureName and populates it on the request.
-     *
-     * @param resourceName the name of the X509Certificate resource
-     * @return the {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
-     * @throws IOException
-     * @throws CertificateException
-     */
-    public static RequestPostProcessor x509(String resourceName) throws IOException, CertificateException {
-        ResourceLoader loader = new DefaultResourceLoader();
-        Resource resource = loader.getResource(resourceName);
-        InputStream inputStream = resource.getInputStream();
-        CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
-        X509Certificate certificate = (X509Certificate) certFactory.generateCertificate(inputStream);
-        return x509(certificate);
-    }
-
-    /**
-     * Creates a {@link RequestPostProcessor} that will automatically populate a
-     * valid {@link CsrfToken} in the request.
-     *
-     * @return the {@link CsrfRequestPostProcessor} for further customizations.
-     */
-    public static CsrfRequestPostProcessor csrf() {
-        return new CsrfRequestPostProcessor();
-    }
-
-    /**
-     * Creates a {@link RequestPostProcessor} that can be used to ensure that
-     * the resulting request is ran with the user in the
-     * {@link TestSecurityContextHolder}.
-     *
-     * @return the {@link RequestPostProcessor} to sue
-     */
-    public static RequestPostProcessor testSecurityContext() {
-        return new TestSecurityContextHolderPostProcessor();
-    }
-
-    /**
-     * Establish a {@link SecurityContext} that has a
-     * {@link UsernamePasswordAuthenticationToken} for the
-     * {@link Authentication#getPrincipal()} and a {@link User} for the
-     * {@link UsernamePasswordAuthenticationToken#getPrincipal()}. All details
-     * are declarative and do not require that the user actually exists.
-     *
-     * @param username
-     *            the username to populate
-     * @return the {@link UserRequestPostProcessor} for additional customization
-     */
-    public static UserRequestPostProcessor user(String username) {
-        return new UserRequestPostProcessor(username);
-    }
-
-    /**
-     * Establish a {@link SecurityContext} that has a
-     * {@link UsernamePasswordAuthenticationToken} for the
-     * {@link Authentication#getPrincipal()} and a custom {@link UserDetails}
-     * for the {@link UsernamePasswordAuthenticationToken#getPrincipal()}. All
-     * details are declarative and do not require that the user actually exists.
-     *
-     * @param user
-     *            the UserDetails to populate
-     * @return the {@link RequestPostProcessor} to use
-     */
-    public static RequestPostProcessor user(UserDetails user) {
-        return new UserDetailsRequestPostProcessor(user);
-    }
-
-    /**
-     * Establish a {@link SecurityContext} that uses the specified {@link Authentication} for the
-     * {@link Authentication#getPrincipal()} and a custom {@link UserDetails}. All
-     * details are declarative and do not require that the user actually exists.
-     *
-     * @param user
-     *            the UserDetails to populate
-     * @return the {@link RequestPostProcessor} to use
-     */
-    public static RequestPostProcessor authentication(
-            Authentication authentication) {
-        return new AuthenticationRequestPostProcessor(authentication);
-    }
-
-    /**
-     * Establish the specified {@link SecurityContext} to be used.
-     */
-    public static RequestPostProcessor securityContext(
-            SecurityContext securityContext) {
-        return new SecurityContextRequestPostProcessor(securityContext);
-    }
-
-    /**
-     * Convenience mechanism for setting the Authorization header to use HTTP
-     * Basic with the given username and password. This method will
-     * automatically perform the necessary Base64 encoding.
-     *
-     * @param username
-     *            the username to include in the Authorization header.
-     * @param password the password to include in the Authorization header.
-     * @return the {@link RequestPostProcessor} to use
-     */
-    public static RequestPostProcessor httpBasic(String username, String password) {
-        return new HttpBasicRequestPostProcessor(username, password);
-    }
-
-    /**
-     * Populates the X509Certificate instances onto the request
-     */
-    private static class X509RequestPostProcessor implements RequestPostProcessor {
-        private final X509Certificate[] certificates;
-
-        private X509RequestPostProcessor(X509Certificate... certificates) {
-            Assert.notNull("X509Certificate cannot be null");
-            this.certificates = certificates;
-        }
-
-        public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
-            request.setAttribute("javax.servlet.request.X509Certificate", certificates);
-            return request;
-        }
-    }
-
-    /**
-     * Populates a valid {@link CsrfToken} into the request.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    public static class CsrfRequestPostProcessor implements
-            RequestPostProcessor {
-
-        private boolean asHeader;
-
-        private boolean useInvalidToken;
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * org.springframework.test.web.servlet.request.RequestPostProcessor
-         * #postProcessRequest
-         * (org.springframework.mock.web.MockHttpServletRequest)
-         */
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-
-            CsrfTokenRepository repository = WebTestUtils
-                    .getCsrfTokenRepository(request);
-            CsrfToken token = repository.generateToken(request);
-            repository.saveToken(token, request, new MockHttpServletResponse());
-            String tokenValue = useInvalidToken ? "invalid" + token.getToken() : token.getToken();
-            if(asHeader) {
-                request.addHeader(token.getHeaderName(), tokenValue);
-            } else {
-                request.setParameter(token.getParameterName(), tokenValue);
-            }
-            return request;
-        }
-
-        /**
-         * Instead of using the {@link CsrfToken} as a request parameter
-         * (default) will populate the {@link CsrfToken} as a header.
-         *
-         * @return the {@link CsrfRequestPostProcessor} for additional customizations
-         */
-        public CsrfRequestPostProcessor asHeader() {
-            this.asHeader = true;
-            return this;
-        }
-
-        /**
-         * Populates an invalid token value on the request.
-         *
-         * @return the {@link CsrfRequestPostProcessor} for additional customizations
-         */
-        public CsrfRequestPostProcessor useInvalidToken() {
-            this.useInvalidToken = true;
-            return this;
-        }
-
-        private CsrfRequestPostProcessor() {}
-    }
-
-    public static class DigestRequestPostProcessor implements RequestPostProcessor {
-        private String username = "user";
-
-        private String password = "password";
-
-        private String realm = "Spring Security";
-
-        private String nonce = generateNonce(60);
-
-        private String qop = "auth";
-
-        private String nc = "00000001";
-
-        private String cnonce = "c822c727a648aba7";
-
-        /**
-         * Configures the username to use
-         * @param username the username to use
-         * @return the DigestRequestPostProcessor for further customization
-         */
-        private DigestRequestPostProcessor username(String username) {
-            Assert.notNull(username, "username cannot be null");
-            this.username = username;
-            return this;
-        }
-
-        /**
-         * Configures the password to use
-         * @param password the password to use
-         * @return the DigestRequestPostProcessor for further customization
-         */
-        public DigestRequestPostProcessor password(String password) {
-            Assert.notNull(password, "password cannot be null");
-            this.password = password;
-            return this;
-        }
-
-        /**
-         * Configures the realm to use
-         * @param realm the realm to use
-         * @return the DigestRequestPostProcessor for further customization
-         */
-        public DigestRequestPostProcessor realm(String realm) {
-            Assert.notNull(realm, "realm cannot be null");
-            this.realm = realm;
-            return this;
-        }
-
-        private static String generateNonce(int validitySeconds) {
-            long expiryTime = System.currentTimeMillis() + (validitySeconds * 1000);
-            String toDigest = expiryTime + ":" + "key";
-            String signatureValue = md5Hex(toDigest);
-            String nonceValue = expiryTime + ":" + signatureValue;
-
-            return new String(Base64.encode(nonceValue.getBytes()));
-        }
-
-        private String createAuthorizationHeader(MockHttpServletRequest request) {
-            String uri = request.getRequestURI();
-            String responseDigest = generateDigest(username, realm, password, request.getMethod(),
-                    uri, qop, nonce, nc, cnonce);
-            return "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\"" + nonce + "\", uri=\"" + uri
-                    + "\", response=\"" + responseDigest + "\", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + cnonce + "\"";
-        }
-
-        public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
-
-            request.addHeader("Authorization",
-                    createAuthorizationHeader(request));
-            return request;
-        }
-
-
-        /**
-         * Computes the <code>response</code> portion of a Digest authentication header. Both the server and user
-         * agent should compute the <code>response</code> independently. Provided as a static method to simplify the
-         * coding of user agents.
-         *
-         * @param username               the user's login name.
-         * @param realm                  the name of the realm.
-         * @param password               the user's password in plaintext or ready-encoded.
-         * @param httpMethod             the HTTP request method (GET, POST etc.)
-         * @param uri                    the request URI.
-         * @param qop                    the qop directive, or null if not set.
-         * @param nonce                  the nonce supplied by the server
-         * @param nc                     the "nonce-count" as defined in RFC 2617.
-         * @param cnonce                 opaque string supplied by the client when qop is set.
-         * @return the MD5 of the digest authentication response, encoded in hex
-         * @throws IllegalArgumentException if the supplied qop value is unsupported.
-         */
-        private static String generateDigest(String username, String realm, String password,
-                                     String httpMethod, String uri, String qop, String nonce, String nc, String cnonce)
-                throws IllegalArgumentException {
-            String a1Md5 = encodePasswordInA1Format(username, realm, password);
-            String a2 = httpMethod + ":" + uri;
-            String a2Md5 = md5Hex(a2);
-
-            String digest;
-
-            if (qop == null) {
-                // as per RFC 2069 compliant clients (also reaffirmed by RFC 2617)
-                digest = a1Md5 + ":" + nonce + ":" + a2Md5;
-            } else if ("auth".equals(qop)) {
-                // As per RFC 2617 compliant clients
-                digest = a1Md5 + ":" + nonce + ":" + nc + ":" + cnonce + ":" + qop + ":" + a2Md5;
-            } else {
-                throw new IllegalArgumentException("This method does not support a qop: '" + qop + "'");
-            }
-
-            return md5Hex(digest);
-        }
-
-        static String encodePasswordInA1Format(String username, String realm, String password) {
-            String a1 = username + ":" + realm + ":" + password;
-
-            return md5Hex(a1);
-        }
-
-        private static String md5Hex(String a2) {
-            try {
-                return DigestUtils.md5DigestAsHex(a2.getBytes("UTF-8"));
-            } catch(UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    /**
-     * Support class for {@link RequestPostProcessor}'s that establish a Spring
-     * Security context
-     */
-    private static abstract class SecurityContextRequestPostProcessorSupport {
-
-        /**
-         * Saves the specified {@link Authentication} into an empty
-         * {@link SecurityContext} using the {@link SecurityContextRepository}.
-         *
-         * @param authentication the {@link Authentication} to save
-         * @param request the {@link HttpServletRequest} to use
-         */
-        final void save(Authentication authentication,
-                HttpServletRequest request) {
-            SecurityContext securityContext = SecurityContextHolder
-                    .createEmptyContext();
-            securityContext.setAuthentication(authentication);
-            save(securityContext, request);
-        }
-
-        /**
-         * Saves the {@link SecurityContext} using the
-         * {@link SecurityContextRepository}
-         *
-         * @param securityContext the {@link SecurityContext} to save
-         * @param request the {@link HttpServletRequest} to use
-         */
-        final void save(SecurityContext securityContext,
-                HttpServletRequest request) {
-            SecurityContextRepository securityContextRepository = WebTestUtils.getSecurityContextRepository(request);
-            boolean isTestRepository = securityContextRepository instanceof TestSecurityContextRepository;
-            if(!isTestRepository) {
-                securityContextRepository = new TestSecurityContextRepository(securityContextRepository);
-                WebTestUtils.setSecurityContextRepository(request, securityContextRepository);
-            }
-
-            HttpServletResponse response = new MockHttpServletResponse();
-
-            HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(
-                    request, response);
-            securityContextRepository.loadContext(requestResponseHolder);
-
-            request = requestResponseHolder.getRequest();
-            response = requestResponseHolder.getResponse();
-
-            securityContextRepository.saveContext(securityContext, request,
-                    response);
-        }
-
-        /**
-         * Used to wrap the SecurityContextRepository to provide support for testing in stateless mode
-         */
-        private static class TestSecurityContextRepository implements SecurityContextRepository {
-            private final String ATTR_NAME = TestSecurityContextRepository.class.getName().concat(".REPO");
-
-            private final SecurityContextRepository delegate;
-
-            private TestSecurityContextRepository(SecurityContextRepository delegate) {
-                this.delegate = delegate;
-            }
-
-            public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
-                SecurityContext result = getContext(requestResponseHolder.getRequest());
-                // always load from the delegate to ensure the request/response in the holder are updated
-                // remember the SecurityContextRepository is used in many different locations
-                SecurityContext delegateResult = delegate.loadContext(requestResponseHolder);
-                return result == null ? delegateResult : result;
-            }
-
-            public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) {
-                request.setAttribute(ATTR_NAME, context);
-                delegate.saveContext(context, request, response);
-            }
-
-            public boolean containsContext(HttpServletRequest request) {
-                return getContext(request) != null || delegate.containsContext(request);
-            }
-
-            private SecurityContext getContext(HttpServletRequest request) {
-                return (SecurityContext) request.getAttribute(ATTR_NAME);
-            }
-        }
-    }
-
-    /**
-     * Associates the {@link SecurityContext} found in
-     * {@link TestSecurityContextHolder#getContext()} with the
-     * {@link MockHttpServletRequest}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    private final static class TestSecurityContextHolderPostProcessor extends
-            SecurityContextRequestPostProcessorSupport implements
-            RequestPostProcessor {
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            save(TestSecurityContextHolder.getContext(), request);
-            return request;
-        }
-    }
-
-    /**
-     * Associates the specified {@link SecurityContext} with the
-     * {@link MockHttpServletRequest}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    private final static class SecurityContextRequestPostProcessor extends
-            SecurityContextRequestPostProcessorSupport implements
-            RequestPostProcessor {
-
-        private final SecurityContext securityContext;
-
-        private SecurityContextRequestPostProcessor(
-                SecurityContext securityContext) {
-            this.securityContext = securityContext;
-        }
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            save(this.securityContext, request);
-            return request;
-        }
-    }
-
-    /**
-     * Sets the specified {@link Authentication} on an empty
-     * {@link SecurityContext} and associates it to the
-     * {@link MockHttpServletRequest}
-     *
-     * @author Rob Winch
-     * @since 4.0
-     *
-     */
-    private final static class AuthenticationRequestPostProcessor extends
-            SecurityContextRequestPostProcessorSupport implements
-            RequestPostProcessor {
-        private final Authentication authentication;
-
-        private AuthenticationRequestPostProcessor(Authentication authentication) {
-            this.authentication = authentication;
-        }
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            SecurityContext context = SecurityContextHolder.getContext();
-            context.setAuthentication(authentication);
-            save(authentication, request);
-            return request;
-        }
-    }
-
-    /**
-     * Creates a {@link UsernamePasswordAuthenticationToken} and sets the
-     * {@link UserDetails} as the principal and associates it to the
-     * {@link MockHttpServletRequest}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    private final static class UserDetailsRequestPostProcessor implements
-            RequestPostProcessor {
-        private final RequestPostProcessor delegate;
-
-        public UserDetailsRequestPostProcessor(UserDetails user) {
-            Authentication token = new UsernamePasswordAuthenticationToken(user, user.getPassword(), user.getAuthorities());
-
-            delegate = new AuthenticationRequestPostProcessor(token);
-        }
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            return delegate.postProcessRequest(request);
-        }
-    }
-
-    /**
-     * Creates a {@link UsernamePasswordAuthenticationToken} and sets the
-     * principal to be a {@link User} and associates it to the
-     * {@link MockHttpServletRequest}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    public final static class UserRequestPostProcessor extends
-            SecurityContextRequestPostProcessorSupport implements
-            RequestPostProcessor {
-
-        private String username;
-
-        private String password = "password";
-
-        private static final String ROLE_PREFIX = "ROLE_";
-
-        private Collection<? extends GrantedAuthority> authorities = AuthorityUtils
-                .createAuthorityList("ROLE_USER");
-
-        private boolean enabled = true;
-
-        private boolean accountNonExpired = true;
-
-        private boolean credentialsNonExpired = true;
-
-        private boolean accountNonLocked = true;
-
-        /**
-         * Creates a new instance with the given username
-         * @param username the username to use
-         */
-        private UserRequestPostProcessor(String username) {
-            Assert.notNull(username, "username cannot be null");
-            this.username = username;
-        }
-
-        /**
-         * Specify the roles of the user to authenticate as. This method is
-         * similar to {@link #authorities(GrantedAuthority...)}, but just not as
-         * flexible.
-         *
-         * @param roles
-         *            The roles to populate. Note that if the role does not
-         *            start with {@link #rolePrefix(String)} it will
-         *            automatically be prepended. This means by default
-         *            {@code roles("ROLE_USER")} and {@code roles("USER")} are
-         *            equivalent.
-         * @see #authorities(GrantedAuthority...)
-         * @see #rolePrefix(String)
-         * @return the UserRequestPostProcessor for further customizations
-         */
-        public UserRequestPostProcessor roles(String... roles) {
-            List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(
-                    roles.length);
-            for (String role : roles) {
-                if (role.startsWith(ROLE_PREFIX)) {
-                    throw new IllegalArgumentException("Role should not start with "+ROLE_PREFIX + " since this method automatically prefixes with this value. Got "+ role);
-                } else {
-                    authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX
-                            + role));
-                }
-            }
-            this.authorities = authorities;
-            return this;
-        }
-
-        /**
-         * Populates the user's {@link GrantedAuthority}'s. The default is
-         * ROLE_USER.
-         *
-         * @param authorities
-         * @see #roles(String...)
-         * @return the UserRequestPostProcessor for further customizations
-         */
-        public UserRequestPostProcessor authorities(
-                GrantedAuthority... authorities) {
-            return authorities(Arrays.asList(authorities));
-        }
-
-        /**
-         * Populates the user's {@link GrantedAuthority}'s. The default is
-         * ROLE_USER.
-         *
-         * @param authorities
-         * @see #roles(String...)
-         * @return the UserRequestPostProcessor for further customizations
-         */
-        public UserRequestPostProcessor authorities(
-                Collection<? extends GrantedAuthority> authorities) {
-            this.authorities = authorities;
-            return this;
-        }
-
-        /**
-         * Populates the user's password. The default is "password"
-         *
-         * @param password
-         *            the user's password
-         * @return the UserRequestPostProcessor for further customizations
-         */
-        public UserRequestPostProcessor password(String password) {
-            this.password = password;
-            return this;
-        }
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            UserDetailsRequestPostProcessor delegate = new UserDetailsRequestPostProcessor(createUser());
-            return delegate.postProcessRequest(request);
-        }
-
-        /**
-         * Creates a new {@link User}
-         * @return the {@link User} for the principal
-         */
-        private User createUser() {
-            return new User(username, password, enabled, accountNonExpired,
-                    credentialsNonExpired, accountNonLocked, authorities);
-        }
-    }
-
-    private static class HttpBasicRequestPostProcessor implements RequestPostProcessor {
-        private String headerValue;
-
-        private HttpBasicRequestPostProcessor(String username, String password) {
-            byte[] toEncode;
-            try {
-                toEncode = (username + ":" + password).getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
-            this.headerValue = "Basic " + new String(Base64.encode(toEncode));
-        }
-
-        public MockHttpServletRequest postProcessRequest(
-                MockHttpServletRequest request) {
-            request.addHeader("Authorization", headerValue);
-            return request;
-        }
-    }
-
-    private SecurityMockMvcRequestPostProcessors() { }
+	/**
+	 * Creates a DigestRequestPostProcessor that enables easily adding digest based
+	 * authentication to a request.
+	 *
+	 * @return the DigestRequestPostProcessor to use
+	 */
+	public static DigestRequestPostProcessor digest() {
+		return new DigestRequestPostProcessor();
+	}
+
+	/**
+	 * Creates a DigestRequestPostProcessor that enables easily adding digest based
+	 * authentication to a request.
+	 *
+	 * @param username the username to use
+	 * @return the DigestRequestPostProcessor to use
+	 */
+	public static DigestRequestPostProcessor digest(String username) {
+		return digest().username(username);
+	}
+
+	/**
+	 * Populates the provided X509Certificate instances on the request.
+	 * @param certificates the X509Certificate instances to pouplate
+	 * @return the
+	 * {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
+	 */
+	public static RequestPostProcessor x509(X509Certificate... certificates) {
+		return new X509RequestPostProcessor(certificates);
+	}
+
+	/**
+	 * Finds an X509Cetificate using a resoureName and populates it on the request.
+	 *
+	 * @param resourceName the name of the X509Certificate resource
+	 * @return the
+	 * {@link org.springframework.test.web.servlet.request.RequestPostProcessor} to use.
+	 * @throws IOException
+	 * @throws CertificateException
+	 */
+	public static RequestPostProcessor x509(String resourceName) throws IOException,
+			CertificateException {
+		ResourceLoader loader = new DefaultResourceLoader();
+		Resource resource = loader.getResource(resourceName);
+		InputStream inputStream = resource.getInputStream();
+		CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+		X509Certificate certificate = (X509Certificate) certFactory
+				.generateCertificate(inputStream);
+		return x509(certificate);
+	}
+
+	/**
+	 * Creates a {@link RequestPostProcessor} that will automatically populate a valid
+	 * {@link CsrfToken} in the request.
+	 *
+	 * @return the {@link CsrfRequestPostProcessor} for further customizations.
+	 */
+	public static CsrfRequestPostProcessor csrf() {
+		return new CsrfRequestPostProcessor();
+	}
+
+	/**
+	 * Creates a {@link RequestPostProcessor} that can be used to ensure that the
+	 * resulting request is ran with the user in the {@link TestSecurityContextHolder}.
+	 *
+	 * @return the {@link RequestPostProcessor} to sue
+	 */
+	public static RequestPostProcessor testSecurityContext() {
+		return new TestSecurityContextHolderPostProcessor();
+	}
+
+	/**
+	 * Establish a {@link SecurityContext} that has a
+	 * {@link UsernamePasswordAuthenticationToken} for the
+	 * {@link Authentication#getPrincipal()} and a {@link User} for the
+	 * {@link UsernamePasswordAuthenticationToken#getPrincipal()}. All details are
+	 * declarative and do not require that the user actually exists.
+	 *
+	 * @param username the username to populate
+	 * @return the {@link UserRequestPostProcessor} for additional customization
+	 */
+	public static UserRequestPostProcessor user(String username) {
+		return new UserRequestPostProcessor(username);
+	}
+
+	/**
+	 * Establish a {@link SecurityContext} that has a
+	 * {@link UsernamePasswordAuthenticationToken} for the
+	 * {@link Authentication#getPrincipal()} and a custom {@link UserDetails} for the
+	 * {@link UsernamePasswordAuthenticationToken#getPrincipal()}. All details are
+	 * declarative and do not require that the user actually exists.
+	 *
+	 * @param user the UserDetails to populate
+	 * @return the {@link RequestPostProcessor} to use
+	 */
+	public static RequestPostProcessor user(UserDetails user) {
+		return new UserDetailsRequestPostProcessor(user);
+	}
+
+	/**
+	 * Establish a {@link SecurityContext} that uses the specified {@link Authentication}
+	 * for the {@link Authentication#getPrincipal()} and a custom {@link UserDetails}. All
+	 * details are declarative and do not require that the user actually exists.
+	 *
+	 * @param user the UserDetails to populate
+	 * @return the {@link RequestPostProcessor} to use
+	 */
+	public static RequestPostProcessor authentication(Authentication authentication) {
+		return new AuthenticationRequestPostProcessor(authentication);
+	}
+
+	/**
+	 * Establish the specified {@link SecurityContext} to be used.
+	 */
+	public static RequestPostProcessor securityContext(SecurityContext securityContext) {
+		return new SecurityContextRequestPostProcessor(securityContext);
+	}
+
+	/**
+	 * Convenience mechanism for setting the Authorization header to use HTTP Basic with
+	 * the given username and password. This method will automatically perform the
+	 * necessary Base64 encoding.
+	 *
+	 * @param username the username to include in the Authorization header.
+	 * @param password the password to include in the Authorization header.
+	 * @return the {@link RequestPostProcessor} to use
+	 */
+	public static RequestPostProcessor httpBasic(String username, String password) {
+		return new HttpBasicRequestPostProcessor(username, password);
+	}
+
+	/**
+	 * Populates the X509Certificate instances onto the request
+	 */
+	private static class X509RequestPostProcessor implements RequestPostProcessor {
+		private final X509Certificate[] certificates;
+
+		private X509RequestPostProcessor(X509Certificate... certificates) {
+			Assert.notNull("X509Certificate cannot be null");
+			this.certificates = certificates;
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			request.setAttribute("javax.servlet.request.X509Certificate", certificates);
+			return request;
+		}
+	}
+
+	/**
+	 * Populates a valid {@link CsrfToken} into the request.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	public static class CsrfRequestPostProcessor implements RequestPostProcessor {
+
+		private boolean asHeader;
+
+		private boolean useInvalidToken;
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see org.springframework.test.web.servlet.request.RequestPostProcessor
+		 * #postProcessRequest (org.springframework.mock.web.MockHttpServletRequest)
+		 */
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+
+			CsrfTokenRepository repository = WebTestUtils.getCsrfTokenRepository(request);
+			CsrfToken token = repository.generateToken(request);
+			repository.saveToken(token, request, new MockHttpServletResponse());
+			String tokenValue = useInvalidToken ? "invalid" + token.getToken() : token
+					.getToken();
+			if (asHeader) {
+				request.addHeader(token.getHeaderName(), tokenValue);
+			}
+			else {
+				request.setParameter(token.getParameterName(), tokenValue);
+			}
+			return request;
+		}
+
+		/**
+		 * Instead of using the {@link CsrfToken} as a request parameter (default) will
+		 * populate the {@link CsrfToken} as a header.
+		 *
+		 * @return the {@link CsrfRequestPostProcessor} for additional customizations
+		 */
+		public CsrfRequestPostProcessor asHeader() {
+			this.asHeader = true;
+			return this;
+		}
+
+		/**
+		 * Populates an invalid token value on the request.
+		 *
+		 * @return the {@link CsrfRequestPostProcessor} for additional customizations
+		 */
+		public CsrfRequestPostProcessor useInvalidToken() {
+			this.useInvalidToken = true;
+			return this;
+		}
+
+		private CsrfRequestPostProcessor() {
+		}
+	}
+
+	public static class DigestRequestPostProcessor implements RequestPostProcessor {
+		private String username = "user";
+
+		private String password = "password";
+
+		private String realm = "Spring Security";
+
+		private String nonce = generateNonce(60);
+
+		private String qop = "auth";
+
+		private String nc = "00000001";
+
+		private String cnonce = "c822c727a648aba7";
+
+		/**
+		 * Configures the username to use
+		 * @param username the username to use
+		 * @return the DigestRequestPostProcessor for further customization
+		 */
+		private DigestRequestPostProcessor username(String username) {
+			Assert.notNull(username, "username cannot be null");
+			this.username = username;
+			return this;
+		}
+
+		/**
+		 * Configures the password to use
+		 * @param password the password to use
+		 * @return the DigestRequestPostProcessor for further customization
+		 */
+		public DigestRequestPostProcessor password(String password) {
+			Assert.notNull(password, "password cannot be null");
+			this.password = password;
+			return this;
+		}
+
+		/**
+		 * Configures the realm to use
+		 * @param realm the realm to use
+		 * @return the DigestRequestPostProcessor for further customization
+		 */
+		public DigestRequestPostProcessor realm(String realm) {
+			Assert.notNull(realm, "realm cannot be null");
+			this.realm = realm;
+			return this;
+		}
+
+		private static String generateNonce(int validitySeconds) {
+			long expiryTime = System.currentTimeMillis() + (validitySeconds * 1000);
+			String toDigest = expiryTime + ":" + "key";
+			String signatureValue = md5Hex(toDigest);
+			String nonceValue = expiryTime + ":" + signatureValue;
+
+			return new String(Base64.encode(nonceValue.getBytes()));
+		}
+
+		private String createAuthorizationHeader(MockHttpServletRequest request) {
+			String uri = request.getRequestURI();
+			String responseDigest = generateDigest(username, realm, password,
+					request.getMethod(), uri, qop, nonce, nc, cnonce);
+			return "Digest username=\"" + username + "\", realm=\"" + realm
+					+ "\", nonce=\"" + nonce + "\", uri=\"" + uri + "\", response=\""
+					+ responseDigest + "\", qop=" + qop + ", nc=" + nc + ", cnonce=\""
+					+ cnonce + "\"";
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+
+			request.addHeader("Authorization", createAuthorizationHeader(request));
+			return request;
+		}
+
+		/**
+		 * Computes the <code>response</code> portion of a Digest authentication header.
+		 * Both the server and user agent should compute the <code>response</code>
+		 * independently. Provided as a static method to simplify the coding of user
+		 * agents.
+		 *
+		 * @param username the user's login name.
+		 * @param realm the name of the realm.
+		 * @param password the user's password in plaintext or ready-encoded.
+		 * @param httpMethod the HTTP request method (GET, POST etc.)
+		 * @param uri the request URI.
+		 * @param qop the qop directive, or null if not set.
+		 * @param nonce the nonce supplied by the server
+		 * @param nc the "nonce-count" as defined in RFC 2617.
+		 * @param cnonce opaque string supplied by the client when qop is set.
+		 * @return the MD5 of the digest authentication response, encoded in hex
+		 * @throws IllegalArgumentException if the supplied qop value is unsupported.
+		 */
+		private static String generateDigest(String username, String realm,
+				String password, String httpMethod, String uri, String qop, String nonce,
+				String nc, String cnonce) throws IllegalArgumentException {
+			String a1Md5 = encodePasswordInA1Format(username, realm, password);
+			String a2 = httpMethod + ":" + uri;
+			String a2Md5 = md5Hex(a2);
+
+			String digest;
+
+			if (qop == null) {
+				// as per RFC 2069 compliant clients (also reaffirmed by RFC 2617)
+				digest = a1Md5 + ":" + nonce + ":" + a2Md5;
+			}
+			else if ("auth".equals(qop)) {
+				// As per RFC 2617 compliant clients
+				digest = a1Md5 + ":" + nonce + ":" + nc + ":" + cnonce + ":" + qop + ":"
+						+ a2Md5;
+			}
+			else {
+				throw new IllegalArgumentException(
+						"This method does not support a qop: '" + qop + "'");
+			}
+
+			return md5Hex(digest);
+		}
+
+		static String encodePasswordInA1Format(String username, String realm,
+				String password) {
+			String a1 = username + ":" + realm + ":" + password;
+
+			return md5Hex(a1);
+		}
+
+		private static String md5Hex(String a2) {
+			try {
+				return DigestUtils.md5DigestAsHex(a2.getBytes("UTF-8"));
+			}
+			catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	/**
+	 * Support class for {@link RequestPostProcessor}'s that establish a Spring Security
+	 * context
+	 */
+	private static abstract class SecurityContextRequestPostProcessorSupport {
+
+		/**
+		 * Saves the specified {@link Authentication} into an empty
+		 * {@link SecurityContext} using the {@link SecurityContextRepository}.
+		 *
+		 * @param authentication the {@link Authentication} to save
+		 * @param request the {@link HttpServletRequest} to use
+		 */
+		final void save(Authentication authentication, HttpServletRequest request) {
+			SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
+			securityContext.setAuthentication(authentication);
+			save(securityContext, request);
+		}
+
+		/**
+		 * Saves the {@link SecurityContext} using the {@link SecurityContextRepository}
+		 *
+		 * @param securityContext the {@link SecurityContext} to save
+		 * @param request the {@link HttpServletRequest} to use
+		 */
+		final void save(SecurityContext securityContext, HttpServletRequest request) {
+			SecurityContextRepository securityContextRepository = WebTestUtils
+					.getSecurityContextRepository(request);
+			boolean isTestRepository = securityContextRepository instanceof TestSecurityContextRepository;
+			if (!isTestRepository) {
+				securityContextRepository = new TestSecurityContextRepository(
+						securityContextRepository);
+				WebTestUtils.setSecurityContextRepository(request,
+						securityContextRepository);
+			}
+
+			HttpServletResponse response = new MockHttpServletResponse();
+
+			HttpRequestResponseHolder requestResponseHolder = new HttpRequestResponseHolder(
+					request, response);
+			securityContextRepository.loadContext(requestResponseHolder);
+
+			request = requestResponseHolder.getRequest();
+			response = requestResponseHolder.getResponse();
+
+			securityContextRepository.saveContext(securityContext, request, response);
+		}
+
+		/**
+		 * Used to wrap the SecurityContextRepository to provide support for testing in
+		 * stateless mode
+		 */
+		private static class TestSecurityContextRepository implements
+				SecurityContextRepository {
+			private final String ATTR_NAME = TestSecurityContextRepository.class
+					.getName().concat(".REPO");
+
+			private final SecurityContextRepository delegate;
+
+			private TestSecurityContextRepository(SecurityContextRepository delegate) {
+				this.delegate = delegate;
+			}
+
+			public SecurityContext loadContext(
+					HttpRequestResponseHolder requestResponseHolder) {
+				SecurityContext result = getContext(requestResponseHolder.getRequest());
+				// always load from the delegate to ensure the request/response in the
+				// holder are updated
+				// remember the SecurityContextRepository is used in many different
+				// locations
+				SecurityContext delegateResult = delegate
+						.loadContext(requestResponseHolder);
+				return result == null ? delegateResult : result;
+			}
+
+			public void saveContext(SecurityContext context, HttpServletRequest request,
+					HttpServletResponse response) {
+				request.setAttribute(ATTR_NAME, context);
+				delegate.saveContext(context, request, response);
+			}
+
+			public boolean containsContext(HttpServletRequest request) {
+				return getContext(request) != null || delegate.containsContext(request);
+			}
+
+			private SecurityContext getContext(HttpServletRequest request) {
+				return (SecurityContext) request.getAttribute(ATTR_NAME);
+			}
+		}
+	}
+
+	/**
+	 * Associates the {@link SecurityContext} found in
+	 * {@link TestSecurityContextHolder#getContext()} with the
+	 * {@link MockHttpServletRequest}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	private final static class TestSecurityContextHolderPostProcessor extends
+			SecurityContextRequestPostProcessorSupport implements RequestPostProcessor {
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			save(TestSecurityContextHolder.getContext(), request);
+			return request;
+		}
+	}
+
+	/**
+	 * Associates the specified {@link SecurityContext} with the
+	 * {@link MockHttpServletRequest}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	private final static class SecurityContextRequestPostProcessor extends
+			SecurityContextRequestPostProcessorSupport implements RequestPostProcessor {
+
+		private final SecurityContext securityContext;
+
+		private SecurityContextRequestPostProcessor(SecurityContext securityContext) {
+			this.securityContext = securityContext;
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			save(this.securityContext, request);
+			return request;
+		}
+	}
+
+	/**
+	 * Sets the specified {@link Authentication} on an empty {@link SecurityContext} and
+	 * associates it to the {@link MockHttpServletRequest}
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 *
+	 */
+	private final static class AuthenticationRequestPostProcessor extends
+			SecurityContextRequestPostProcessorSupport implements RequestPostProcessor {
+		private final Authentication authentication;
+
+		private AuthenticationRequestPostProcessor(Authentication authentication) {
+			this.authentication = authentication;
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			SecurityContext context = SecurityContextHolder.getContext();
+			context.setAuthentication(authentication);
+			save(authentication, request);
+			return request;
+		}
+	}
+
+	/**
+	 * Creates a {@link UsernamePasswordAuthenticationToken} and sets the
+	 * {@link UserDetails} as the principal and associates it to the
+	 * {@link MockHttpServletRequest}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	private final static class UserDetailsRequestPostProcessor implements
+			RequestPostProcessor {
+		private final RequestPostProcessor delegate;
+
+		public UserDetailsRequestPostProcessor(UserDetails user) {
+			Authentication token = new UsernamePasswordAuthenticationToken(user,
+					user.getPassword(), user.getAuthorities());
+
+			delegate = new AuthenticationRequestPostProcessor(token);
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			return delegate.postProcessRequest(request);
+		}
+	}
+
+	/**
+	 * Creates a {@link UsernamePasswordAuthenticationToken} and sets the principal to be
+	 * a {@link User} and associates it to the {@link MockHttpServletRequest}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	public final static class UserRequestPostProcessor extends
+			SecurityContextRequestPostProcessorSupport implements RequestPostProcessor {
+
+		private String username;
+
+		private String password = "password";
+
+		private static final String ROLE_PREFIX = "ROLE_";
+
+		private Collection<? extends GrantedAuthority> authorities = AuthorityUtils
+				.createAuthorityList("ROLE_USER");
+
+		private boolean enabled = true;
+
+		private boolean accountNonExpired = true;
+
+		private boolean credentialsNonExpired = true;
+
+		private boolean accountNonLocked = true;
+
+		/**
+		 * Creates a new instance with the given username
+		 * @param username the username to use
+		 */
+		private UserRequestPostProcessor(String username) {
+			Assert.notNull(username, "username cannot be null");
+			this.username = username;
+		}
+
+		/**
+		 * Specify the roles of the user to authenticate as. This method is similar to
+		 * {@link #authorities(GrantedAuthority...)}, but just not as flexible.
+		 *
+		 * @param roles The roles to populate. Note that if the role does not start with
+		 * {@link #rolePrefix(String)} it will automatically be prepended. This means by
+		 * default {@code roles("ROLE_USER")} and {@code roles("USER")} are equivalent.
+		 * @see #authorities(GrantedAuthority...)
+		 * @see #rolePrefix(String)
+		 * @return the UserRequestPostProcessor for further customizations
+		 */
+		public UserRequestPostProcessor roles(String... roles) {
+			List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(
+					roles.length);
+			for (String role : roles) {
+				if (role.startsWith(ROLE_PREFIX)) {
+					throw new IllegalArgumentException(
+							"Role should not start with "
+									+ ROLE_PREFIX
+									+ " since this method automatically prefixes with this value. Got "
+									+ role);
+				}
+				else {
+					authorities.add(new SimpleGrantedAuthority(ROLE_PREFIX + role));
+				}
+			}
+			this.authorities = authorities;
+			return this;
+		}
+
+		/**
+		 * Populates the user's {@link GrantedAuthority}'s. The default is ROLE_USER.
+		 *
+		 * @param authorities
+		 * @see #roles(String...)
+		 * @return the UserRequestPostProcessor for further customizations
+		 */
+		public UserRequestPostProcessor authorities(GrantedAuthority... authorities) {
+			return authorities(Arrays.asList(authorities));
+		}
+
+		/**
+		 * Populates the user's {@link GrantedAuthority}'s. The default is ROLE_USER.
+		 *
+		 * @param authorities
+		 * @see #roles(String...)
+		 * @return the UserRequestPostProcessor for further customizations
+		 */
+		public UserRequestPostProcessor authorities(
+				Collection<? extends GrantedAuthority> authorities) {
+			this.authorities = authorities;
+			return this;
+		}
+
+		/**
+		 * Populates the user's password. The default is "password"
+		 *
+		 * @param password the user's password
+		 * @return the UserRequestPostProcessor for further customizations
+		 */
+		public UserRequestPostProcessor password(String password) {
+			this.password = password;
+			return this;
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			UserDetailsRequestPostProcessor delegate = new UserDetailsRequestPostProcessor(
+					createUser());
+			return delegate.postProcessRequest(request);
+		}
+
+		/**
+		 * Creates a new {@link User}
+		 * @return the {@link User} for the principal
+		 */
+		private User createUser() {
+			return new User(username, password, enabled, accountNonExpired,
+					credentialsNonExpired, accountNonLocked, authorities);
+		}
+	}
+
+	private static class HttpBasicRequestPostProcessor implements RequestPostProcessor {
+		private String headerValue;
+
+		private HttpBasicRequestPostProcessor(String username, String password) {
+			byte[] toEncode;
+			try {
+				toEncode = (username + ":" + password).getBytes("UTF-8");
+			}
+			catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e);
+			}
+			this.headerValue = "Basic " + new String(Base64.encode(toEncode));
+		}
+
+		public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) {
+			request.addHeader("Authorization", headerValue);
+			return request;
+		}
+	}
+
+	private SecurityMockMvcRequestPostProcessors() {
+	}
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
index 1fc9eb4b3b..c44a930efe 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
@@ -40,188 +40,203 @@ import org.springframework.test.web.servlet.ResultMatcher;
  */
 public final class SecurityMockMvcResultMatchers {
 
-    /**
-     * {@link ResultMatcher} that verifies that a specified user is
-     * authenticated.
-     *
-     * @return the {@link AuthenticatedMatcher} to use
-     */
-    public static AuthenticatedMatcher authenticated() {
-        return new AuthenticatedMatcher();
-    }
+	/**
+	 * {@link ResultMatcher} that verifies that a specified user is authenticated.
+	 *
+	 * @return the {@link AuthenticatedMatcher} to use
+	 */
+	public static AuthenticatedMatcher authenticated() {
+		return new AuthenticatedMatcher();
+	}
 
-    /**
-     * {@link ResultMatcher} that verifies that no user is authenticated.
-     *
-     * @return the {@link AuthenticatedMatcher} to use
-     */
-    public static ResultMatcher unauthenticated() {
-        return new UnAuthenticatedMatcher();
-    }
+	/**
+	 * {@link ResultMatcher} that verifies that no user is authenticated.
+	 *
+	 * @return the {@link AuthenticatedMatcher} to use
+	 */
+	public static ResultMatcher unauthenticated() {
+		return new UnAuthenticatedMatcher();
+	}
 
-    private static abstract class AuthenticationMatcher<T extends AuthenticationMatcher<T>> implements ResultMatcher {
+	private static abstract class AuthenticationMatcher<T extends AuthenticationMatcher<T>>
+			implements ResultMatcher {
 
-        protected SecurityContext load(MvcResult result) {
-            HttpRequestResponseHolder holder = new HttpRequestResponseHolder(result.getRequest(), result.getResponse());
-            SecurityContextRepository repository = WebTestUtils.getSecurityContextRepository(result.getRequest());
-            return repository.loadContext(holder);
-        }
-    }
+		protected SecurityContext load(MvcResult result) {
+			HttpRequestResponseHolder holder = new HttpRequestResponseHolder(
+					result.getRequest(), result.getResponse());
+			SecurityContextRepository repository = WebTestUtils
+					.getSecurityContextRepository(result.getRequest());
+			return repository.loadContext(holder);
+		}
+	}
 
-    /**
-     * A {@link MockMvc} {@link ResultMatcher} that verifies a specific user is
-     * associated to the {@link MvcResult}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    public static final class AuthenticatedMatcher extends AuthenticationMatcher<AuthenticatedMatcher> {
+	/**
+	 * A {@link MockMvc} {@link ResultMatcher} that verifies a specific user is associated
+	 * to the {@link MvcResult}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	public static final class AuthenticatedMatcher extends
+			AuthenticationMatcher<AuthenticatedMatcher> {
 
-        private SecurityContext expectedContext;
-        private Authentication expectedAuthentication;
-        private Object expectedAuthenticationPrincipal;
-        private String expectedAuthenticationName;
-        private Collection<GrantedAuthority> expectedGrantedAuthorities;
+		private SecurityContext expectedContext;
+		private Authentication expectedAuthentication;
+		private Object expectedAuthenticationPrincipal;
+		private String expectedAuthenticationName;
+		private Collection<GrantedAuthority> expectedGrantedAuthorities;
 
+		public void match(MvcResult result) throws Exception {
+			SecurityContext context = load(result);
 
-        public void match(MvcResult result) throws Exception {
-            SecurityContext context = load(result);
+			Authentication auth = context.getAuthentication();
 
-            Authentication auth = context.getAuthentication();
+			assertTrue("Authentication should not be null", auth != null);
 
-            assertTrue("Authentication should not be null", auth != null);
+			if (this.expectedContext != null) {
+				assertEquals(this.expectedContext + " does not equal " + context,
+						this.expectedContext, context);
+			}
 
-            if(this.expectedContext != null) {
-                assertEquals(this.expectedContext + " does not equal " + context, this.expectedContext, context);
-            }
+			if (this.expectedAuthentication != null) {
+				assertEquals(
+						this.expectedAuthentication + " does not equal "
+								+ context.getAuthentication(),
+						this.expectedAuthentication, context.getAuthentication());
+			}
 
-            if(this.expectedAuthentication != null) {
-                assertEquals(this.expectedAuthentication + " does not equal " + context.getAuthentication(), this.expectedAuthentication, context.getAuthentication());
-            }
+			if (this.expectedAuthenticationPrincipal != null) {
+				assertTrue("Authentication cannot be null",
+						context.getAuthentication() != null);
+				assertEquals(this.expectedAuthenticationPrincipal + " does not equal "
+						+ context.getAuthentication().getPrincipal(),
+						this.expectedAuthenticationPrincipal, context.getAuthentication()
+								.getPrincipal());
+			}
 
-            if(this.expectedAuthenticationPrincipal != null) {
-                assertTrue("Authentication cannot be null", context.getAuthentication() != null);
-                assertEquals(this.expectedAuthenticationPrincipal + " does not equal " + context.getAuthentication().getPrincipal(), this.expectedAuthenticationPrincipal, context.getAuthentication().getPrincipal());
-            }
+			if (this.expectedAuthenticationName != null) {
+				assertTrue("Authentication cannot be null", auth != null);
+				String name = auth.getName();
+				assertEquals(this.expectedAuthenticationName + " does not equal " + name,
+						this.expectedAuthenticationName, name);
+			}
 
-            if(this.expectedAuthenticationName != null) {
-                assertTrue("Authentication cannot be null", auth != null);
-                String name = auth.getName();
-                assertEquals(this.expectedAuthenticationName + " does not equal " + name, this.expectedAuthenticationName, name);
-            }
+			if (this.expectedGrantedAuthorities != null) {
+				assertTrue("Authentication cannot be null", auth != null);
+				Collection<? extends GrantedAuthority> authorities = auth
+						.getAuthorities();
+				assertTrue(authorities + " does not contain the same authorities as "
+						+ this.expectedGrantedAuthorities,
+						authorities.containsAll(this.expectedGrantedAuthorities));
+				assertTrue(this.expectedGrantedAuthorities
+						+ " does not contain the same authorities as " + authorities,
+						this.expectedGrantedAuthorities.containsAll(authorities));
+			}
+		}
 
-            if(this.expectedGrantedAuthorities != null) {
-                assertTrue("Authentication cannot be null", auth != null);
-                Collection<? extends GrantedAuthority> authorities = auth.getAuthorities();
-                assertTrue(authorities + " does not contain the same authorities as " + this.expectedGrantedAuthorities, authorities.containsAll(this.expectedGrantedAuthorities));
-                assertTrue(this.expectedGrantedAuthorities + " does not contain the same authorities as " + authorities , this.expectedGrantedAuthorities.containsAll(authorities));
-            }
-        }
+		/**
+		 * Specifies the expected username
+		 *
+		 * @param expected the expected username
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withUsername(String expected) {
+			return withAuthenticationName(expected);
+		}
 
-        /**
-         * Specifies the expected username
-         *
-         * @param expected
-         *            the expected username
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withUsername(String expected) {
-            return withAuthenticationName(expected);
-        }
+		/**
+		 * Specifies the expected {@link SecurityContext}
+		 *
+		 * @param expected the expected {@link SecurityContext}
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withSecurityContext(SecurityContext expected) {
+			this.expectedContext = expected;
+			return this;
+		}
 
-        /**
-         * Specifies the expected {@link SecurityContext}
-         *
-         * @param expected
-         *            the expected {@link SecurityContext}
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withSecurityContext(SecurityContext expected) {
-            this.expectedContext = expected;
-            return this;
-        }
+		/**
+		 * Specifies the expected {@link Authentication}
+		 *
+		 * @param expected the expected {@link Authentication}
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withAuthentication(Authentication expected) {
+			this.expectedAuthentication = expected;
+			return this;
+		}
 
-        /**
-         * Specifies the expected {@link Authentication}
-         *
-         * @param expected
-         *            the expected {@link Authentication}
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withAuthentication(Authentication expected) {
-            this.expectedAuthentication = expected;
-            return this;
-        }
+		/**
+		 * Specifies the expected principal
+		 *
+		 * @param expected the expected principal
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withAuthenticationPrincipal(Object expected) {
+			this.expectedAuthenticationPrincipal = expected;
+			return this;
+		}
 
-        /**
-         * Specifies the expected principal
-         *
-         * @param expected
-         *            the expected principal
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withAuthenticationPrincipal(Object expected) {
-            this.expectedAuthenticationPrincipal = expected;
-            return this;
-        }
+		/**
+		 * Specifies the expected {@link Authentication#getName()}
+		 *
+		 * @param expected the expected {@link Authentication#getName()}
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withAuthenticationName(String expected) {
+			this.expectedAuthenticationName = expected;
+			return this;
+		}
 
-        /**
-         * Specifies the expected {@link Authentication#getName()}
-         *
-         * @param expected
-         *            the expected {@link Authentication#getName()}
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withAuthenticationName(String expected) {
-            this.expectedAuthenticationName = expected;
-            return this;
-        }
+		/**
+		 * Specifies the {@link Authentication#getAuthorities()}
+		 *
+		 * @param expected the {@link Authentication#getAuthorities()}
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withAuthorities(Collection<GrantedAuthority> expected) {
+			this.expectedGrantedAuthorities = expected;
+			return this;
+		}
 
-        /**
-         * Specifies the {@link Authentication#getAuthorities()}
-         *
-         * @param expected the {@link Authentication#getAuthorities()}
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withAuthorities(Collection<GrantedAuthority> expected) {
-            this.expectedGrantedAuthorities = expected;
-            return this;
-        }
+		/**
+		 * Specifies the {@link Authentication#getAuthorities()}
+		 *
+		 * @param expected the roles. Each value is automatically prefixed with "ROLE_"
+		 * @return the {@link AuthenticatedMatcher} for further customization
+		 */
+		public AuthenticatedMatcher withRoles(String... roles) {
+			Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
+			for (String role : roles) {
+				authorities.add(new SimpleGrantedAuthority("ROLE_" + role));
+			}
+			return withAuthorities(authorities);
+		}
 
-        /**
-         * Specifies the {@link Authentication#getAuthorities()}
-         *
-         * @param expected the roles. Each value is automatically prefixed with "ROLE_"
-         * @return the {@link AuthenticatedMatcher} for further customization
-         */
-        public AuthenticatedMatcher withRoles(String... roles) {
-            Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-            for(String role : roles) {
-                authorities.add(new SimpleGrantedAuthority("ROLE_"+role));
-            }
-            return withAuthorities(authorities);
-        }
+		AuthenticatedMatcher() {
+		}
+	}
 
-        AuthenticatedMatcher() {}
-    }
+	/**
+	 * A {@link MockMvc} {@link ResultMatcher} that verifies no {@link Authentication} is
+	 * associated with the {@link MvcResult}.
+	 *
+	 * @author Rob Winch
+	 * @since 4.0
+	 */
+	private static final class UnAuthenticatedMatcher extends
+			AuthenticationMatcher<UnAuthenticatedMatcher> {
 
-    /**
-     * A {@link MockMvc} {@link ResultMatcher} that verifies no
-     * {@link Authentication} is associated with the {@link MvcResult}.
-     *
-     * @author Rob Winch
-     * @since 4.0
-     */
-    private static final class UnAuthenticatedMatcher extends AuthenticationMatcher<UnAuthenticatedMatcher>{
+		public void match(MvcResult result) throws Exception {
+			SecurityContext context = load(result);
 
-        public void match(MvcResult result) throws Exception {
-            SecurityContext context = load(result);
+			assertEquals("", null, context.getAuthentication());
+		}
 
-            assertEquals("",null,context.getAuthentication());
-        }
+		private UnAuthenticatedMatcher() {
+		}
+	}
 
-        private UnAuthenticatedMatcher() {}
-    }
-
-    private SecurityMockMvcResultMatchers() {}
+	private SecurityMockMvcResultMatchers() {
+	}
 }
\ No newline at end of file
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurer.java b/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurer.java
index 6f5ec2908a..417906b062 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurer.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurer.java
@@ -26,40 +26,47 @@ import javax.servlet.Filter;
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.testSecurityContext;
 
 /**
- * Configures Spring Security by adding the springSecurityFilterChain and adding the {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}.
+ * Configures Spring Security by adding the springSecurityFilterChain and adding the
+ * {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}
+ * .
  *
  * @author Rob Winch
  * @since 4.0
  */
 final class SecurityMockMvcConfigurer extends MockMvcConfigurerAdapter {
-    private Filter springSecurityFilterChain;
+	private Filter springSecurityFilterChain;
 
-    /**
-     * Creates a new instance
-     */
-    SecurityMockMvcConfigurer() {}
+	/**
+	 * Creates a new instance
+	 */
+	SecurityMockMvcConfigurer() {
+	}
 
-    /**
-     * Creates a new instance with the provided {@link javax.servlet.Filter}
-     * @param springSecurityFilterChain the {@link javax.servlet.Filter} to use
-     */
-    SecurityMockMvcConfigurer(Filter springSecurityFilterChain) {
-        this.springSecurityFilterChain = springSecurityFilterChain;
-    }
+	/**
+	 * Creates a new instance with the provided {@link javax.servlet.Filter}
+	 * @param springSecurityFilterChain the {@link javax.servlet.Filter} to use
+	 */
+	SecurityMockMvcConfigurer(Filter springSecurityFilterChain) {
+		this.springSecurityFilterChain = springSecurityFilterChain;
+	}
 
-    @Override
-    public RequestPostProcessor beforeMockMvcCreated(ConfigurableMockMvcBuilder<?> builder, WebApplicationContext context) {
-        String securityBeanId = BeanIds.SPRING_SECURITY_FILTER_CHAIN;
-        if(springSecurityFilterChain == null && context.containsBean(securityBeanId)) {
-            springSecurityFilterChain = context.getBean(securityBeanId, Filter.class);
-        }
+	@Override
+	public RequestPostProcessor beforeMockMvcCreated(
+			ConfigurableMockMvcBuilder<?> builder, WebApplicationContext context) {
+		String securityBeanId = BeanIds.SPRING_SECURITY_FILTER_CHAIN;
+		if (springSecurityFilterChain == null && context.containsBean(securityBeanId)) {
+			springSecurityFilterChain = context.getBean(securityBeanId, Filter.class);
+		}
 
-        if(springSecurityFilterChain == null) {
-            throw new IllegalStateException("springSecurityFilterChain cannot be null. Ensure a Bean with the name "+ securityBeanId + " implementing Filter is present or inject the Filter to be used.");
-        }
+		if (springSecurityFilterChain == null) {
+			throw new IllegalStateException(
+					"springSecurityFilterChain cannot be null. Ensure a Bean with the name "
+							+ securityBeanId
+							+ " implementing Filter is present or inject the Filter to be used.");
+		}
 
-        builder.addFilters(springSecurityFilterChain);
+		builder.addFilters(springSecurityFilterChain);
 
-        return testSecurityContext();
-    }
+		return testSecurityContext();
+	}
 }
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurers.java b/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurers.java
index c06909bae9..505cc96933 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurers.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurers.java
@@ -21,34 +21,43 @@ import org.springframework.util.Assert;
 import javax.servlet.Filter;
 
 /**
- * Provides Security related {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} implementations.
+ * Provides Security related
+ * {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} implementations.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public final class SecurityMockMvcConfigurers {
-    /**
-     * Configures the MockMvcBuilder for use with Spring Security. Specifically the configurer adds the Spring Bean
-     * named "springSecurityFilterChain" as a Filter. It will also ensure that the TestSecurityContextHolder is leveraged
-     * for each request by applying {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}.
-     *
-     * @return the {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} to use
-     */
-    public static MockMvcConfigurer springSecurity() {
-        return new SecurityMockMvcConfigurer();
-    }
+	/**
+	 * Configures the MockMvcBuilder for use with Spring Security. Specifically the
+	 * configurer adds the Spring Bean named "springSecurityFilterChain" as a Filter. It
+	 * will also ensure that the TestSecurityContextHolder is leveraged for each request
+	 * by applying
+	 * {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}
+	 * .
+	 *
+	 * @return the {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} to
+	 * use
+	 */
+	public static MockMvcConfigurer springSecurity() {
+		return new SecurityMockMvcConfigurer();
+	}
 
-    /**
-     * Configures the MockMvcBuilder for use with Spring Security. Specifically the configurer adds the provided Filter. It will also ensure that the
-     * TestSecurityContextHolder is leveraged for each request by applying
-     * {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}.
-     *
-     * @param springSecurityFilterChain the Filter to be added
-     *
-     * @return the {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} to use
-     */
-    public static MockMvcConfigurer springSecurity(Filter springSecurityFilterChain) {
-        Assert.notNull(springSecurityFilterChain, "springSecurityFilterChain cannot be null");
-        return new SecurityMockMvcConfigurer(springSecurityFilterChain);
-    }
+	/**
+	 * Configures the MockMvcBuilder for use with Spring Security. Specifically the
+	 * configurer adds the provided Filter. It will also ensure that the
+	 * TestSecurityContextHolder is leveraged for each request by applying
+	 * {@link org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors#testSecurityContext()}
+	 * .
+	 *
+	 * @param springSecurityFilterChain the Filter to be added
+	 *
+	 * @return the {@link org.springframework.test.web.servlet.setup.MockMvcConfigurer} to
+	 * use
+	 */
+	public static MockMvcConfigurer springSecurity(Filter springSecurityFilterChain) {
+		Assert.notNull(springSecurityFilterChain,
+				"springSecurityFilterChain cannot be null");
+		return new SecurityMockMvcConfigurer(springSecurityFilterChain);
+	}
 }
diff --git a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
index 5ce7c90969..96f7c1f830 100644
--- a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
+++ b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
@@ -39,86 +39,92 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  * @since 4.0
  */
 public abstract class WebTestUtils {
-    private static final SecurityContextRepository DEFAULT_CONTEXT_REPO = new HttpSessionSecurityContextRepository();
-    private static final CsrfTokenRepository DEFAULT_TOKEN_REPO = new HttpSessionCsrfTokenRepository();
+	private static final SecurityContextRepository DEFAULT_CONTEXT_REPO = new HttpSessionSecurityContextRepository();
+	private static final CsrfTokenRepository DEFAULT_TOKEN_REPO = new HttpSessionCsrfTokenRepository();
 
-    /**
-     * Gets the {@link SecurityContextRepository} for the specified
-     * {@link HttpServletRequest}. If one is not found, a default
-     * {@link HttpSessionSecurityContextRepository} is used.
-     *
-     * @param request
-     *            the {@link HttpServletRequest} to obtain the
-     *            {@link SecurityContextRepository}
-     * @return the {@link SecurityContextRepository} for the specified
-     *         {@link HttpServletRequest}
-     */
-    public static SecurityContextRepository getSecurityContextRepository(HttpServletRequest request) {
-        SecurityContextPersistenceFilter filter = findFilter(request, SecurityContextPersistenceFilter.class);
-        if(filter == null) {
-            return DEFAULT_CONTEXT_REPO;
-        }
-        return (SecurityContextRepository) ReflectionTestUtils.getField(filter, "repo");
-    }
+	/**
+	 * Gets the {@link SecurityContextRepository} for the specified
+	 * {@link HttpServletRequest}. If one is not found, a default
+	 * {@link HttpSessionSecurityContextRepository} is used.
+	 *
+	 * @param request the {@link HttpServletRequest} to obtain the
+	 * {@link SecurityContextRepository}
+	 * @return the {@link SecurityContextRepository} for the specified
+	 * {@link HttpServletRequest}
+	 */
+	public static SecurityContextRepository getSecurityContextRepository(
+			HttpServletRequest request) {
+		SecurityContextPersistenceFilter filter = findFilter(request,
+				SecurityContextPersistenceFilter.class);
+		if (filter == null) {
+			return DEFAULT_CONTEXT_REPO;
+		}
+		return (SecurityContextRepository) ReflectionTestUtils.getField(filter, "repo");
+	}
 
-    /**
-     * Sets the {@link SecurityContextRepository} for the specified
-     * {@link HttpServletRequest}.
-     *
-     * @param request
-     *            the {@link HttpServletRequest} to obtain the
-     *            {@link SecurityContextRepository}
-     * @param securityContextRepository
-     *            the {@link SecurityContextRepository} to set
-     * @return the {@link SecurityContextRepository} for the specified
-     *         {@link HttpServletRequest}
-     */
-    public static void setSecurityContextRepository(HttpServletRequest request, SecurityContextRepository securityContextRepository) {
-        SecurityContextPersistenceFilter filter = findFilter(request, SecurityContextPersistenceFilter.class);
-        if(filter != null) {
-            ReflectionTestUtils.setField(filter, "repo", securityContextRepository);
-        }
-    }
+	/**
+	 * Sets the {@link SecurityContextRepository} for the specified
+	 * {@link HttpServletRequest}.
+	 *
+	 * @param request the {@link HttpServletRequest} to obtain the
+	 * {@link SecurityContextRepository}
+	 * @param securityContextRepository the {@link SecurityContextRepository} to set
+	 * @return the {@link SecurityContextRepository} for the specified
+	 * {@link HttpServletRequest}
+	 */
+	public static void setSecurityContextRepository(HttpServletRequest request,
+			SecurityContextRepository securityContextRepository) {
+		SecurityContextPersistenceFilter filter = findFilter(request,
+				SecurityContextPersistenceFilter.class);
+		if (filter != null) {
+			ReflectionTestUtils.setField(filter, "repo", securityContextRepository);
+		}
+	}
 
-    /**
-     * Gets the {@link CsrfTokenRepository} for the specified
-     * {@link HttpServletRequest}. If one is not found, the default
-     * {@link HttpSessionCsrfTokenRepository} is used.
-     *
-     * @param request
-     *            the {@link HttpServletRequest} to obtain the
-     *            {@link CsrfTokenRepository}
-     * @return the {@link CsrfTokenRepository} for the specified
-     *         {@link HttpServletRequest}
-     */
-    public static CsrfTokenRepository getCsrfTokenRepository(HttpServletRequest request) {
-        CsrfFilter filter = findFilter(request, CsrfFilter.class);
-        if(filter == null) {
-            return DEFAULT_TOKEN_REPO;
-        }
-        return (CsrfTokenRepository) ReflectionTestUtils.getField(filter, "tokenRepository");
-    }
+	/**
+	 * Gets the {@link CsrfTokenRepository} for the specified {@link HttpServletRequest}.
+	 * If one is not found, the default {@link HttpSessionCsrfTokenRepository} is used.
+	 *
+	 * @param request the {@link HttpServletRequest} to obtain the
+	 * {@link CsrfTokenRepository}
+	 * @return the {@link CsrfTokenRepository} for the specified
+	 * {@link HttpServletRequest}
+	 */
+	public static CsrfTokenRepository getCsrfTokenRepository(HttpServletRequest request) {
+		CsrfFilter filter = findFilter(request, CsrfFilter.class);
+		if (filter == null) {
+			return DEFAULT_TOKEN_REPO;
+		}
+		return (CsrfTokenRepository) ReflectionTestUtils.getField(filter,
+				"tokenRepository");
+	}
 
-    @SuppressWarnings("unchecked")
-    private static <T extends Filter> T findFilter(HttpServletRequest request, Class<T> filterClass) {
-        WebApplicationContext webApplicationContext = WebApplicationContextUtils.getWebApplicationContext(request.getServletContext());
-        if(webApplicationContext == null) {
-            return null;
-        }
-        FilterChainProxy springSecurityFilterChain = null;
-        try {
-            springSecurityFilterChain = webApplicationContext.getBean(FilterChainProxy.class);
-        } catch(NoSuchBeanDefinitionException notFound) {
-            return null;
-        }
-        List<Filter> filters = (List<Filter>) ReflectionTestUtils.invokeMethod(springSecurityFilterChain,"getFilters", request);
-        for(Filter filter : filters) {
-            if(filterClass.isAssignableFrom(filter.getClass())) {
-                return (T) filter;
-            }
-        }
-        return null;
-    }
+	@SuppressWarnings("unchecked")
+	private static <T extends Filter> T findFilter(HttpServletRequest request,
+			Class<T> filterClass) {
+		WebApplicationContext webApplicationContext = WebApplicationContextUtils
+				.getWebApplicationContext(request.getServletContext());
+		if (webApplicationContext == null) {
+			return null;
+		}
+		FilterChainProxy springSecurityFilterChain = null;
+		try {
+			springSecurityFilterChain = webApplicationContext
+					.getBean(FilterChainProxy.class);
+		}
+		catch (NoSuchBeanDefinitionException notFound) {
+			return null;
+		}
+		List<Filter> filters = (List<Filter>) ReflectionTestUtils.invokeMethod(
+				springSecurityFilterChain, "getFilters", request);
+		for (Filter filter : filters) {
+			if (filterClass.isAssignableFrom(filter.getClass())) {
+				return (T) filter;
+			}
+		}
+		return null;
+	}
 
-    private WebTestUtils() {}
+	private WebTestUtils() {
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java
index 663df85542..9f3e81edfb 100644
--- a/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/TestSecurityContextHolderTests.java
@@ -25,40 +25,40 @@ import org.springframework.security.core.context.SecurityContextHolder;
 
 public class TestSecurityContextHolderTests {
 
-    private SecurityContext context;
+	private SecurityContext context;
 
-    @Before
-    public void setup() {
-        context = SecurityContextHolder.createEmptyContext();
-    }
+	@Before
+	public void setup() {
+		context = SecurityContextHolder.createEmptyContext();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void clearContextClearsBoth() {
-        SecurityContextHolder.setContext(context);
-        TestSecurityContextHolder.setContext(context);
+	@Test
+	public void clearContextClearsBoth() {
+		SecurityContextHolder.setContext(context);
+		TestSecurityContextHolder.setContext(context);
 
-        TestSecurityContextHolder.clearContext();
+		TestSecurityContextHolder.clearContext();
 
-        assertThat(SecurityContextHolder.getContext()).isNotSameAs(context);
-        assertThat(TestSecurityContextHolder.getContext()).isNotSameAs(context);
-    }
+		assertThat(SecurityContextHolder.getContext()).isNotSameAs(context);
+		assertThat(TestSecurityContextHolder.getContext()).isNotSameAs(context);
+	}
 
-    @Test
-    public void getContextDefaultsNonNull() {
-        assertThat(TestSecurityContextHolder.getContext()).isNotNull();
-        assertThat(SecurityContextHolder.getContext()).isNotNull();
-    }
+	@Test
+	public void getContextDefaultsNonNull() {
+		assertThat(TestSecurityContextHolder.getContext()).isNotNull();
+		assertThat(SecurityContextHolder.getContext()).isNotNull();
+	}
 
-    @Test
-    public void setContextSetsBoth() {
-        TestSecurityContextHolder.setContext(context);
+	@Test
+	public void setContextSetsBoth() {
+		TestSecurityContextHolder.setContext(context);
 
-        assertThat(TestSecurityContextHolder.getContext()).isSameAs(context);
-        assertThat(SecurityContextHolder.getContext()).isSameAs(context);
-    }
+		assertThat(TestSecurityContextHolder.getContext()).isSameAs(context);
+		assertThat(SecurityContextHolder.getContext()).isSameAs(context);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java
index 076ea95d1e..6ac64a4063 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/CustomUserDetails.java
@@ -65,8 +65,6 @@ public class CustomUserDetails implements UserDetails {
 
 	@Override
 	public String toString() {
-		return "CustomUserDetails{" +
-				"username='" + username + '\'' +
-				'}';
+		return "CustomUserDetails{" + "username='" + username + '\'' + '}';
 	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUser.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUser.java
index 2eb5e0f928..7c8bcdd996 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUser.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUser.java
@@ -29,10 +29,10 @@ public @interface WithMockCustomUser {
 	String username() default "rob";
 
 	/**
-	 * The roles to use. The default is "USER". A {@link org.springframework.security.core.GrantedAuthority} will
-	 * be created for each value within roles. Each value in roles will
-	 * automatically be prefixed with "ROLE_". For example, the default will
-	 * result in "ROLE_USER" being used.
+	 * The roles to use. The default is "USER". A
+	 * {@link org.springframework.security.core.GrantedAuthority} will be created for each
+	 * value within roles. Each value in roles will automatically be prefixed with
+	 * "ROLE_". For example, the default will result in "ROLE_USER" being used.
 	 *
 	 * @return
 	 */
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java
index 22c4e5ed9f..0978bd292e 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockCustomUserSecurityContextFactory.java
@@ -30,13 +30,15 @@ import java.util.List;
 /**
  * @author Rob Winch
  */
-public class WithMockCustomUserSecurityContextFactory implements WithSecurityContextFactory<WithMockCustomUser> {
+public class WithMockCustomUserSecurityContextFactory implements
+		WithSecurityContextFactory<WithMockCustomUser> {
 	public SecurityContext createSecurityContext(WithMockCustomUser customUser) {
 		SecurityContext context = SecurityContextHolder.createEmptyContext();
 
-		CustomUserDetails principal = new CustomUserDetails(customUser.name(), customUser.username());
-		Authentication auth =
-			new UsernamePasswordAuthenticationToken(principal, "password", principal.getAuthorities());
+		CustomUserDetails principal = new CustomUserDetails(customUser.name(),
+				customUser.username());
+		Authentication auth = new UsernamePasswordAuthenticationToken(principal,
+				"password", principal.getAuthorities());
 		context.setAuthentication(auth);
 		return context;
 	}
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
index 81ef46108d..f95137c77a 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java
@@ -15,11 +15,12 @@
  */
 package org.springframework.security.test.context.showcase;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -29,8 +30,6 @@ import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Rob Winch
  */
@@ -61,20 +60,23 @@ public class WithMockUserTests {
 	}
 
 	@Test
-	@WithMockUser(username="admin",roles={"USER","ADMIN"})
+	@WithMockUser(username = "admin", roles = { "USER", "ADMIN" })
 	public void getMessageWithMockUserCustomUser() {
 		String message = messageService.getMessage();
-		assertThat(message).contains("admin").contains("ROLE_USER").contains("ROLE_ADMIN");
+		assertThat(message).contains("admin").contains("ROLE_USER")
+				.contains("ROLE_ADMIN");
 	}
 
 	@EnableGlobalMethodSecurity(prePostEnabled = true)
 	@ComponentScan(basePackageClasses = HelloMessageService.class)
 	static class Config {
+		// @formatter:off
 		@Autowired
 		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
 			auth
 				.inMemoryAuthentication()
 					.withUser("user").password("password").roles("USER");
 		}
+		// @formatter:on
 	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
index 83816a48ea..a1fdfaf610 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java
@@ -15,12 +15,13 @@
  */
 package org.springframework.security.test.context.showcase;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -34,8 +35,6 @@ import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Rob Winch
  */
@@ -70,11 +69,13 @@ public class WithUserDetailsTests {
 	@EnableGlobalMethodSecurity(prePostEnabled = true)
 	@ComponentScan(basePackageClasses = HelloMessageService.class)
 	static class Config {
+		// @formatter:off
 		@Autowired
 		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
 			auth
 					.userDetailsService(userDetailsService());
 		}
+		// @formatter:on
 
 		@Bean
 		public UserDetailsService userDetailsService() {
@@ -88,7 +89,8 @@ public class WithUserDetailsTests {
 
 	static class CustomUserDetailsService implements UserDetailsService {
 
-		public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
+		public UserDetails loadUserByUsername(final String username)
+				throws UsernameNotFoundException {
 			return new CustomUserDetails("name", username);
 		}
 	}
diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/service/HelloMessageService.java b/test/src/test/java/org/springframework/security/test/context/showcase/service/HelloMessageService.java
index 87c2611a7a..3d3f45d29d 100644
--- a/test/src/test/java/org/springframework/security/test/context/showcase/service/HelloMessageService.java
+++ b/test/src/test/java/org/springframework/security/test/context/showcase/service/HelloMessageService.java
@@ -28,7 +28,8 @@ public class HelloMessageService implements MessageService {
 
 	@PreAuthorize("authenticated")
 	public String getMessage() {
-		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
 		return "Hello " + authentication;
 	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java
index a9422c29c1..2cf94b7070 100644
--- a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactoryTests.java
@@ -27,55 +27,60 @@ import org.mockito.runners.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class WithMockUserSecurityContextFactoryTests {
 
-    @Mock
-    private WithMockUser withUser;
+	@Mock
+	private WithMockUser withUser;
 
-    private WithMockUserSecurityContextFactory factory;
+	private WithMockUserSecurityContextFactory factory;
 
-    @Before
-    public void setup() {
-        factory = new WithMockUserSecurityContextFactory();
-    }
+	@Before
+	public void setup() {
+		factory = new WithMockUserSecurityContextFactory();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void usernameNull() {
-        factory.createSecurityContext(withUser);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void usernameNull() {
+		factory.createSecurityContext(withUser);
+	}
 
-    @Test
-    public void valueDefaultsUsername() {
-        when(withUser.value()).thenReturn("valueUser");
-        when(withUser.password()).thenReturn("password");
-        when(withUser.roles()).thenReturn(new String[] { "USER"});
+	@Test
+	public void valueDefaultsUsername() {
+		when(withUser.value()).thenReturn("valueUser");
+		when(withUser.password()).thenReturn("password");
+		when(withUser.roles()).thenReturn(new String[] { "USER" });
 
-        assertThat(factory.createSecurityContext(withUser).getAuthentication().getName()).isEqualTo(withUser.value());
-    }
+		assertThat(factory.createSecurityContext(withUser).getAuthentication().getName())
+				.isEqualTo(withUser.value());
+	}
 
-    @Test
-    public void usernamePrioritizedOverValue() {
-        when(withUser.value()).thenReturn("valueUser");
-        when(withUser.username()).thenReturn("customUser");
-        when(withUser.password()).thenReturn("password");
-        when(withUser.roles()).thenReturn(new String[] { "USER"});
+	@Test
+	public void usernamePrioritizedOverValue() {
+		when(withUser.value()).thenReturn("valueUser");
+		when(withUser.username()).thenReturn("customUser");
+		when(withUser.password()).thenReturn("password");
+		when(withUser.roles()).thenReturn(new String[] { "USER" });
 
-        assertThat(factory.createSecurityContext(withUser).getAuthentication().getName()).isEqualTo(withUser.username());
-    }
+		assertThat(factory.createSecurityContext(withUser).getAuthentication().getName())
+				.isEqualTo(withUser.username());
+	}
 
-    @Test
-    public void rolesWorks() {
-        when(withUser.value()).thenReturn("valueUser");
-        when(withUser.password()).thenReturn("password");
-        when(withUser.roles()).thenReturn(new String[] { "USER", "CUSTOM"});
+	@Test
+	public void rolesWorks() {
+		when(withUser.value()).thenReturn("valueUser");
+		when(withUser.password()).thenReturn("password");
+		when(withUser.roles()).thenReturn(new String[] { "USER", "CUSTOM" });
 
-        assertThat(factory.createSecurityContext(withUser).getAuthentication().getAuthorities()).onProperty("authority").containsOnly("ROLE_USER","ROLE_CUSTOM");
-    }
+		assertThat(
+				factory.createSecurityContext(withUser).getAuthentication()
+						.getAuthorities()).onProperty("authority").containsOnly(
+				"ROLE_USER", "ROLE_CUSTOM");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void rolesWithRolePrefixFails() {
-        when(withUser.value()).thenReturn("valueUser");
-        when(withUser.password()).thenReturn("password");
-        when(withUser.roles()).thenReturn(new String[] { "ROLE_FAIL"});
+	@Test(expected = IllegalArgumentException.class)
+	public void rolesWithRolePrefixFails() {
+		when(withUser.value()).thenReturn("valueUser");
+		when(withUser.password()).thenReturn("password");
+		when(withUser.roles()).thenReturn(new String[] { "ROLE_FAIL" });
 
-        factory.createSecurityContext(withUser);
-    }
+		factory.createSecurityContext(withUser);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java
index 4e8103dfab..0fba1171ff 100644
--- a/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/support/WithMockUserTests.java
@@ -22,15 +22,17 @@ import org.springframework.core.annotation.AnnotationUtils;
 
 public class WithMockUserTests {
 
-    @Test
-    public void defaults() {
-        WithMockUser mockUser = AnnotationUtils.findAnnotation(Annotated.class, WithMockUser.class);
-        assertThat(mockUser.value()).isEqualTo("user");
-        assertThat(mockUser.username()).isEmpty();
-        assertThat(mockUser.password()).isEqualTo("password");
-        assertThat(mockUser.roles()).containsOnly("USER");
-    }
+	@Test
+	public void defaults() {
+		WithMockUser mockUser = AnnotationUtils.findAnnotation(Annotated.class,
+				WithMockUser.class);
+		assertThat(mockUser.value()).isEqualTo("user");
+		assertThat(mockUser.username()).isEmpty();
+		assertThat(mockUser.password()).isEqualTo("password");
+		assertThat(mockUser.roles()).containsOnly("USER");
+	}
 
-    @WithMockUser
-    private class Annotated {}
+	@WithMockUser
+	private class Annotated {
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java
index 429064b5d8..a6590e9110 100644
--- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java
@@ -32,42 +32,45 @@ import org.springframework.util.ReflectionUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class WithSecurityContextTestExcecutionListenerTests {
-    private ConfigurableApplicationContext context;
+	private ConfigurableApplicationContext context;
 
-    @Mock
-    private TestContext testContext;
+	@Mock
+	private TestContext testContext;
 
-    private WithSecurityContextTestExecutionListener listener;
+	private WithSecurityContextTestExecutionListener listener;
 
-    @Before
-    public void setup() {
-        listener = new WithSecurityContextTestExecutionListener();
-        context = new AnnotationConfigApplicationContext(Config.class);
-    }
+	@Before
+	public void setup() {
+		listener = new WithSecurityContextTestExecutionListener();
+		context = new AnnotationConfigApplicationContext(Config.class);
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public void beforeTestMethodNullSecurityContextNoError() throws Exception {
-        Class testClass = FakeTest.class;
-        when(testContext.getApplicationContext()).thenReturn(context);
-        when(testContext.getTestClass()).thenReturn(testClass);
-        when(testContext.getTestMethod()).thenReturn(ReflectionUtils.findMethod(testClass, "testNoAnnotation"));
+	@Test
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public void beforeTestMethodNullSecurityContextNoError() throws Exception {
+		Class testClass = FakeTest.class;
+		when(testContext.getApplicationContext()).thenReturn(context);
+		when(testContext.getTestClass()).thenReturn(testClass);
+		when(testContext.getTestMethod()).thenReturn(
+				ReflectionUtils.findMethod(testClass, "testNoAnnotation"));
 
-        listener.beforeTestMethod(testContext);
-    }
+		listener.beforeTestMethod(testContext);
+	}
 
-    static class FakeTest {
-        public void testNoAnnotation() {}
-    }
+	static class FakeTest {
+		public void testNoAnnotation() {
+		}
+	}
 
-    @Configuration
-    static class Config {}
+	@Configuration
+	static class Config {
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java
index b1b6fb141a..b2df84d4a8 100644
--- a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactoryTests.java
@@ -31,40 +31,41 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 @RunWith(MockitoJUnitRunner.class)
 public class WithUserDetailsSecurityContextFactoryTests {
 
-    @Mock
-    private UserDetailsService userDetailsService;
-    @Mock
-    private UserDetails userDetails;
+	@Mock
+	private UserDetailsService userDetailsService;
+	@Mock
+	private UserDetails userDetails;
 
-    @Mock
-    private WithUserDetails withUserDetails;
+	@Mock
+	private WithUserDetails withUserDetails;
 
-    private WithUserDetailsSecurityContextFactory factory;
+	private WithUserDetailsSecurityContextFactory factory;
 
-    @Before
-    public void setup() {
-        factory = new WithUserDetailsSecurityContextFactory(userDetailsService);
-    }
+	@Before
+	public void setup() {
+		factory = new WithUserDetailsSecurityContextFactory(userDetailsService);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void createSecurityContextNullValue() {
-        factory.createSecurityContext(withUserDetails);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createSecurityContextNullValue() {
+		factory.createSecurityContext(withUserDetails);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void createSecurityContextEmptyValue() {
-        when(withUserDetails.value()).thenReturn("");
-        factory.createSecurityContext(withUserDetails);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void createSecurityContextEmptyValue() {
+		when(withUserDetails.value()).thenReturn("");
+		factory.createSecurityContext(withUserDetails);
+	}
 
-    @Test
-    public void createSecurityContextWithExistingUser() {
-        String username = "user";
-        when(withUserDetails.value()).thenReturn(username);
-        when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails);
+	@Test
+	public void createSecurityContextWithExistingUser() {
+		String username = "user";
+		when(withUserDetails.value()).thenReturn(username);
+		when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails);
 
-        SecurityContext context = factory.createSecurityContext(withUserDetails);
-        assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class);
-        assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails);
-    }
+		SecurityContext context = factory.createSecurityContext(withUserDetails);
+		assertThat(context.getAuthentication()).isInstanceOf(
+				UsernamePasswordAuthenticationToken.class);
+		assertThat(context.getAuthentication().getPrincipal()).isEqualTo(userDetails);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java
index f159bca8a7..a95f57bf34 100644
--- a/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java
+++ b/test/src/test/java/org/springframework/security/test/context/support/WithUserDetailsTests.java
@@ -22,12 +22,14 @@ import org.springframework.core.annotation.AnnotationUtils;
 
 public class WithUserDetailsTests {
 
-    @Test
-    public void defaults() {
-        WithUserDetails userDetails = AnnotationUtils.findAnnotation(Annotated.class, WithUserDetails.class);
-        assertThat(userDetails.value()).isEqualTo("user");
-    }
+	@Test
+	public void defaults() {
+		WithUserDetails userDetails = AnnotationUtils.findAnnotation(Annotated.class,
+				WithUserDetails.class);
+		assertThat(userDetails.value()).isEqualTo("user");
+	}
 
-    @WithUserDetails
-    private static class Annotated {}
+	@WithUserDetails
+	private static class Annotated {
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java
index 59be604127..21b554791d 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLoginTests.java
@@ -39,53 +39,54 @@ import org.springframework.security.test.web.support.WebTestUtils;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.security.web.csrf.DefaultCsrfToken;
 
-
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({WebTestUtils.class,SecurityMockMvcRequestBuildersFormLoginTests.class})
+@PrepareForTest({ WebTestUtils.class, SecurityMockMvcRequestBuildersFormLoginTests.class })
 public class SecurityMockMvcRequestBuildersFormLoginTests {
-    @Mock
-    private CsrfTokenRepository repository;
-    private DefaultCsrfToken token;
-    private MockServletContext servletContext;
+	@Mock
+	private CsrfTokenRepository repository;
+	private DefaultCsrfToken token;
+	private MockServletContext servletContext;
 
-    @Before
-    public void setup() throws Exception {
-        token = new DefaultCsrfToken("header", "param", "token");
-        servletContext = new MockServletContext();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() throws Exception {
+		token = new DefaultCsrfToken("header", "param", "token");
+		servletContext = new MockServletContext();
+		mockWebTestUtils();
+	}
 
-    @Test
-    public void defaults() throws Exception {
-        MockHttpServletRequest request = formLogin().buildRequest(servletContext);
+	@Test
+	public void defaults() throws Exception {
+		MockHttpServletRequest request = formLogin().buildRequest(servletContext);
 
-        assertThat(request.getParameter("username")).isEqualTo("user");
-        assertThat(request.getParameter("password")).isEqualTo("password");
-        assertThat(request.getMethod()).isEqualTo("POST");
-        assertThat(request.getParameter(token.getParameterName())).isEqualTo(token.getToken());
-        assertThat(request.getRequestURI()).isEqualTo("/login");
-        verify(repository).saveToken(eq(token), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		assertThat(request.getParameter("username")).isEqualTo("user");
+		assertThat(request.getParameter("password")).isEqualTo("password");
+		assertThat(request.getMethod()).isEqualTo("POST");
+		assertThat(request.getParameter(token.getParameterName())).isEqualTo(
+				token.getToken());
+		assertThat(request.getRequestURI()).isEqualTo("/login");
+		verify(repository).saveToken(eq(token), any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
+	@Test
+	public void custom() throws Exception {
+		MockHttpServletRequest request = formLogin("/login").user("username", "admin")
+				.password("password", "secret").buildRequest(servletContext);
 
-    @Test
-    public void custom() throws Exception {
-        MockHttpServletRequest request = formLogin("/login")
-                .user("username","admin")
-                .password("password","secret")
-                .buildRequest(servletContext);
+		assertThat(request.getParameter("username")).isEqualTo("admin");
+		assertThat(request.getParameter("password")).isEqualTo("secret");
+		assertThat(request.getMethod()).isEqualTo("POST");
+		assertThat(request.getParameter(token.getParameterName())).isEqualTo(
+				token.getToken());
+		assertThat(request.getRequestURI()).isEqualTo("/login");
+		verify(repository).saveToken(eq(token), any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-        assertThat(request.getParameter("username")).isEqualTo("admin");
-        assertThat(request.getParameter("password")).isEqualTo("secret");
-        assertThat(request.getMethod()).isEqualTo("POST");
-        assertThat(request.getParameter(token.getParameterName())).isEqualTo(token.getToken());
-        assertThat(request.getRequestURI()).isEqualTo("/login");
-        verify(repository).saveToken(eq(token), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
-
-    private void mockWebTestUtils() throws Exception {
-        spy(WebTestUtils.class);
-        doReturn(repository).when(WebTestUtils.class,"getCsrfTokenRepository",any(HttpServletRequest.class));
-        when(repository.generateToken(any(HttpServletRequest.class))).thenReturn(token);
-    }
+	private void mockWebTestUtils() throws Exception {
+		spy(WebTestUtils.class);
+		doReturn(repository).when(WebTestUtils.class, "getCsrfTokenRepository",
+				any(HttpServletRequest.class));
+		when(repository.generateToken(any(HttpServletRequest.class))).thenReturn(token);
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java
index 313e3db8a6..7fc1fe7d49 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestBuildersFormLogoutTests.java
@@ -39,46 +39,51 @@ import org.springframework.security.test.web.support.WebTestUtils;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.security.web.csrf.DefaultCsrfToken;
 
-
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({WebTestUtils.class,SecurityMockMvcRequestBuildersFormLogoutTests.class})
+@PrepareForTest({ WebTestUtils.class, SecurityMockMvcRequestBuildersFormLogoutTests.class })
 public class SecurityMockMvcRequestBuildersFormLogoutTests {
-    @Mock
-    private CsrfTokenRepository repository;
-    private DefaultCsrfToken token;
-    private MockServletContext servletContext;
+	@Mock
+	private CsrfTokenRepository repository;
+	private DefaultCsrfToken token;
+	private MockServletContext servletContext;
 
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("header", "param", "token");
-        servletContext = new MockServletContext();
-    }
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("header", "param", "token");
+		servletContext = new MockServletContext();
+	}
 
-    @Test
-    public void defaults() throws Exception {
-        mockWebTestUtils();
-        MockHttpServletRequest request = logout().buildRequest(servletContext);
+	@Test
+	public void defaults() throws Exception {
+		mockWebTestUtils();
+		MockHttpServletRequest request = logout().buildRequest(servletContext);
 
-        assertThat(request.getMethod()).isEqualTo("POST");
-        assertThat(request.getParameter(token.getParameterName())).isEqualTo(token.getToken());
-        assertThat(request.getRequestURI()).isEqualTo("/logout");
-        verify(repository).saveToken(eq(token), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		assertThat(request.getMethod()).isEqualTo("POST");
+		assertThat(request.getParameter(token.getParameterName())).isEqualTo(
+				token.getToken());
+		assertThat(request.getRequestURI()).isEqualTo("/logout");
+		verify(repository).saveToken(eq(token), any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void custom() throws Exception {
-        mockWebTestUtils();
-        MockHttpServletRequest request = logout("/admin/logout").buildRequest(servletContext);
+	@Test
+	public void custom() throws Exception {
+		mockWebTestUtils();
+		MockHttpServletRequest request = logout("/admin/logout").buildRequest(
+				servletContext);
 
-        assertThat(request.getMethod()).isEqualTo("POST");
-        assertThat(request.getParameter(token.getParameterName())).isEqualTo(token.getToken());
-        assertThat(request.getRequestURI()).isEqualTo("/admin/logout");
-        verify(repository).saveToken(eq(token), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		assertThat(request.getMethod()).isEqualTo("POST");
+		assertThat(request.getParameter(token.getParameterName())).isEqualTo(
+				token.getToken());
+		assertThat(request.getRequestURI()).isEqualTo("/admin/logout");
+		verify(repository).saveToken(eq(token), any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    private void mockWebTestUtils() throws Exception {
-        spy(WebTestUtils.class);
-        doReturn(repository).when(WebTestUtils.class,"getCsrfTokenRepository",any(HttpServletRequest.class));
-        when(repository.generateToken(any(HttpServletRequest.class))).thenReturn(token);
-    }
+	private void mockWebTestUtils() throws Exception {
+		spy(WebTestUtils.class);
+		doReturn(repository).when(WebTestUtils.class, "getCsrfTokenRepository",
+				any(HttpServletRequest.class));
+		when(repository.generateToken(any(HttpServletRequest.class))).thenReturn(token);
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
index 5d34e35c36..bb8765e57d 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
@@ -41,65 +41,62 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.Config.class)
+@ContextConfiguration(classes = SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.Config.class)
 @WebAppConfiguration
 public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    // SEC-2593
-    @Test
-    public void userRequestPostProcessorWorksWithStateless() throws Exception {
-       mvc
-          .perform(get("/").with(user("user")))
-          .andExpect(status().is2xxSuccessful());
-    }
+	// SEC-2593
+	@Test
+	public void userRequestPostProcessorWorksWithStateless() throws Exception {
+		mvc.perform(get("/").with(user("user"))).andExpect(status().is2xxSuccessful());
+	}
 
-    // SEC-2593
-    @WithMockUser
-    @Test
-    public void withMockUserWorksWithStateless() throws Exception {
-       mvc
-          .perform(get("/"))
-          .andExpect(status().is2xxSuccessful());
-    }
+	// SEC-2593
+	@WithMockUser
+	@Test
+	public void withMockUserWorksWithStateless() throws Exception {
+		mvc.perform(get("/")).andExpect(status().is2xxSuccessful());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            super.configure(http);
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			super.configure(http);
 
-            http
-                .sessionManagement()
-                    .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
-        }
+			http
+				.sessionManagement()
+					.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication();
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication();
+		}
+		// @formatter:on
 
-        @RestController
-        static class Controller {
-            @RequestMapping
-            public String hello() {
-                return "Hello";
-            }
-        }
-    }
+		@RestController
+		static class Controller {
+			@RequestMapping
+			public String hello() {
+				return "Hello";
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java
index 681ffc8c22..a9bcf5fbc6 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationTests.java
@@ -44,38 +44,39 @@ import org.springframework.security.web.context.SecurityContextRepository;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsAuthenticationTests {
-    @Captor
-    private ArgumentCaptor<SecurityContext> contextCaptor;
-    @Mock
-    private SecurityContextRepository repository;
+	@Captor
+	private ArgumentCaptor<SecurityContext> contextCaptor;
+	@Mock
+	private SecurityContextRepository repository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Mock
-    private Authentication authentication;
+	@Mock
+	private Authentication authentication;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void userDetails() {
-        authentication(authentication).postProcessRequest(request);
+	@Test
+	public void userDetails() {
+		authentication(authentication).postProcessRequest(request);
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication()).isSameAs(authentication);
-    }
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication()).isSameAs(authentication);
+	}
 
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java
index 9b51e03aa6..1a93aaaf86 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCertificateTests.java
@@ -29,32 +29,37 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock
 
 @RunWith(MockitoJUnitRunner.class)
 public class SecurityMockMvcRequestPostProcessorsCertificateTests {
-    @Mock
-    private X509Certificate certificate;
+	@Mock
+	private X509Certificate certificate;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+	}
 
-    @Test
-    public void x509SingleCertificate() {
-        MockHttpServletRequest postProcessedRequest = x509(certificate).postProcessRequest(request);
+	@Test
+	public void x509SingleCertificate() {
+		MockHttpServletRequest postProcessedRequest = x509(certificate)
+				.postProcessRequest(request);
 
-        X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest.getAttribute("javax.servlet.request.X509Certificate");
+		X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest
+				.getAttribute("javax.servlet.request.X509Certificate");
 
-        assertThat(certificates).containsOnly(certificate);
-    }
+		assertThat(certificates).containsOnly(certificate);
+	}
 
-    @Test
-    public void x509ResourceName() throws Exception {
-        MockHttpServletRequest postProcessedRequest = x509("rod.cer").postProcessRequest(request);
+	@Test
+	public void x509ResourceName() throws Exception {
+		MockHttpServletRequest postProcessedRequest = x509("rod.cer").postProcessRequest(
+				request);
 
-        X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest.getAttribute("javax.servlet.request.X509Certificate");
+		X509Certificate[] certificates = (X509Certificate[]) postProcessedRequest
+				.getAttribute("javax.servlet.request.X509Certificate");
 
-        assertThat(certificates.length).isEqualTo(1);
-        assertThat(certificates[0].getSubjectDN().getName()).isEqualTo("CN=rod, OU=Spring Security, O=Spring Framework");
-    }
+		assertThat(certificates.length).isEqualTo(1);
+		assertThat(certificates[0].getSubjectDN().getName()).isEqualTo(
+				"CN=rod, OU=Spring Security, O=Spring Framework");
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java
index d09064cdf0..50283689cf 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java
@@ -33,55 +33,62 @@ import org.springframework.security.web.csrf.DefaultCsrfToken;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsCsrfTests {
-    @Mock
-    private CsrfTokenRepository repository;
-    private DefaultCsrfToken token;
+	@Mock
+	private CsrfTokenRepository repository;
+	private DefaultCsrfToken token;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("header", "param", "token");
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("header", "param", "token");
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @Test
-    public void csrfWithParam() {
-        MockHttpServletRequest postProcessedRequest = csrf().postProcessRequest(request);
+	@Test
+	public void csrfWithParam() {
+		MockHttpServletRequest postProcessedRequest = csrf().postProcessRequest(request);
 
-        assertThat(postProcessedRequest.getParameter(token.getParameterName())).isEqualTo(token.getToken());
-        assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNull();
-    }
+		assertThat(postProcessedRequest.getParameter(token.getParameterName()))
+				.isEqualTo(token.getToken());
+		assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNull();
+	}
 
-    @Test
-    public void csrfWithHeader() {
-        MockHttpServletRequest postProcessedRequest = csrf().asHeader().postProcessRequest(request);
+	@Test
+	public void csrfWithHeader() {
+		MockHttpServletRequest postProcessedRequest = csrf().asHeader()
+				.postProcessRequest(request);
 
-        assertThat(postProcessedRequest.getParameter(token.getParameterName())).isNull();
-        assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isEqualTo(token.getToken());
-    }
+		assertThat(postProcessedRequest.getParameter(token.getParameterName())).isNull();
+		assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isEqualTo(
+				token.getToken());
+	}
 
-    @Test
-    public void csrfWithInvalidParam() {
-        MockHttpServletRequest postProcessedRequest = csrf().useInvalidToken().postProcessRequest(request);
+	@Test
+	public void csrfWithInvalidParam() {
+		MockHttpServletRequest postProcessedRequest = csrf().useInvalidToken()
+				.postProcessRequest(request);
 
-        assertThat(postProcessedRequest.getParameter(token.getParameterName())).isNotEmpty().isNotEqualTo(token.getToken());
-        assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNull();
-    }
+		assertThat(postProcessedRequest.getParameter(token.getParameterName()))
+				.isNotEmpty().isNotEqualTo(token.getToken());
+		assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNull();
+	}
 
-    @Test
-    public void csrfWithInvalidHeader() {
-        MockHttpServletRequest postProcessedRequest = csrf().asHeader().useInvalidToken().postProcessRequest(request);
+	@Test
+	public void csrfWithInvalidHeader() {
+		MockHttpServletRequest postProcessedRequest = csrf().asHeader().useInvalidToken()
+				.postProcessRequest(request);
 
-        assertThat(postProcessedRequest.getParameter(token.getParameterName())).isNull();
-        assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNotEmpty().isNotEqualTo(token.getToken());
-    }
+		assertThat(postProcessedRequest.getParameter(token.getParameterName())).isNull();
+		assertThat(postProcessedRequest.getHeader(token.getHeaderName())).isNotEmpty()
+				.isNotEqualTo(token.getToken());
+	}
 
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getCsrfTokenRepository(request)).thenReturn(repository);
-        when(repository.loadToken(request)).thenReturn(token);
-        when(repository.generateToken(request)).thenReturn(token);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getCsrfTokenRepository(request)).thenReturn(repository);
+		when(repository.loadToken(request)).thenReturn(token);
+		when(repository.generateToken(request)).thenReturn(token);
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java
index c8352f826c..f41f4cc043 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsDigestTests.java
@@ -41,87 +41,96 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock
 
 public class SecurityMockMvcRequestPostProcessorsDigestTests {
 
-    private DigestAuthenticationFilter filter;
-    private MockHttpServletRequest request;
+	private DigestAuthenticationFilter filter;
+	private MockHttpServletRequest request;
 
-    private String username;
+	private String username;
 
-    private String password;
+	private String password;
 
-    private DigestAuthenticationEntryPoint entryPoint;
+	private DigestAuthenticationEntryPoint entryPoint;
 
-    @Before
-    public void setup() {
-        this.password = "password";
-        request = new MockHttpServletRequest();
+	@Before
+	public void setup() {
+		this.password = "password";
+		request = new MockHttpServletRequest();
 
-        entryPoint = new DigestAuthenticationEntryPoint();
-        entryPoint.setKey("key");
-        entryPoint.setRealmName("Spring Security");
-        filter = new DigestAuthenticationFilter();
-        filter.setUserDetailsService(new UserDetailsService() {
-            public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-                return new User(username,password, AuthorityUtils.createAuthorityList("ROLE_USER"));
-            }
-        });
-        filter.setAuthenticationEntryPoint(entryPoint);
-        filter.afterPropertiesSet();
-    }
+		entryPoint = new DigestAuthenticationEntryPoint();
+		entryPoint.setKey("key");
+		entryPoint.setRealmName("Spring Security");
+		filter = new DigestAuthenticationFilter();
+		filter.setUserDetailsService(new UserDetailsService() {
+			public UserDetails loadUserByUsername(String username)
+					throws UsernameNotFoundException {
+				return new User(username, password, AuthorityUtils
+						.createAuthorityList("ROLE_USER"));
+			}
+		});
+		filter.setAuthenticationEntryPoint(entryPoint);
+		filter.afterPropertiesSet();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void digestWithFilter() throws Exception  {
-        MockHttpServletRequest postProcessedRequest = digest().postProcessRequest(request);
+	@Test
+	public void digestWithFilter() throws Exception {
+		MockHttpServletRequest postProcessedRequest = digest()
+				.postProcessRequest(request);
 
-        assertThat(extractUser()).isEqualTo("user");
-    }
+		assertThat(extractUser()).isEqualTo("user");
+	}
 
-    @Test
-    public void digestWithFilterCustomUsername() throws Exception  {
-        String username = "admin";
-        MockHttpServletRequest postProcessedRequest = digest(username).postProcessRequest(request);
+	@Test
+	public void digestWithFilterCustomUsername() throws Exception {
+		String username = "admin";
+		MockHttpServletRequest postProcessedRequest = digest(username)
+				.postProcessRequest(request);
 
-        assertThat(extractUser()).isEqualTo(username);
-    }
+		assertThat(extractUser()).isEqualTo(username);
+	}
 
-    @Test
-    public void digestWithFilterCustomPassword() throws Exception  {
-        String username = "custom";
-        password = "secret";
-        MockHttpServletRequest postProcessedRequest = digest(username).password(password).postProcessRequest(request);
+	@Test
+	public void digestWithFilterCustomPassword() throws Exception {
+		String username = "custom";
+		password = "secret";
+		MockHttpServletRequest postProcessedRequest = digest(username).password(password)
+				.postProcessRequest(request);
 
-        assertThat(extractUser()).isEqualTo(username);
-    }
+		assertThat(extractUser()).isEqualTo(username);
+	}
 
-    @Test
-    public void digestWithFilterCustomRealm() throws Exception  {
-        String username = "admin";
-        entryPoint.setRealmName("Custom");
-        MockHttpServletRequest postProcessedRequest = digest(username).realm(entryPoint.getRealmName()).postProcessRequest(request);
+	@Test
+	public void digestWithFilterCustomRealm() throws Exception {
+		String username = "admin";
+		entryPoint.setRealmName("Custom");
+		MockHttpServletRequest postProcessedRequest = digest(username).realm(
+				entryPoint.getRealmName()).postProcessRequest(request);
 
-        assertThat(extractUser()).isEqualTo(username);
-    }
+		assertThat(extractUser()).isEqualTo(username);
+	}
 
-    @Test
-    public void digestWithFilterFails() throws Exception  {
-        String username = "admin";
-        MockHttpServletRequest postProcessedRequest = digest(username).realm("Invalid").postProcessRequest(request);
+	@Test
+	public void digestWithFilterFails() throws Exception {
+		String username = "admin";
+		MockHttpServletRequest postProcessedRequest = digest(username).realm("Invalid")
+				.postProcessRequest(request);
 
-        assertThat(extractUser()).isNull();
-    }
+		assertThat(extractUser()).isNull();
+	}
 
-    private String extractUser() throws IOException, ServletException {
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain() {
-            @Override
-            public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-                Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-                username = authentication == null ? null : authentication.getName();
-            }
-        });
-        return username;
-    }
+	private String extractUser() throws IOException, ServletException {
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain() {
+			@Override
+			public void doFilter(ServletRequest request, ServletResponse response)
+					throws IOException, ServletException {
+				Authentication authentication = SecurityContextHolder.getContext()
+						.getAuthentication();
+				username = authentication == null ? null : authentication.getName();
+			}
+		});
+		return username;
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java
index f6081b2580..d01a5b93db 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsSecurityContextTests.java
@@ -43,38 +43,39 @@ import org.springframework.security.web.context.SecurityContextRepository;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsSecurityContextTests {
-    @Captor
-    private ArgumentCaptor<SecurityContext> contextCaptor;
-    @Mock
-    private SecurityContextRepository repository;
+	@Captor
+	private ArgumentCaptor<SecurityContext> contextCaptor;
+	@Mock
+	private SecurityContextRepository repository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Mock
-    private SecurityContext expectedContext;
+	@Mock
+	private SecurityContext expectedContext;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void userDetails() {
-        securityContext(expectedContext).postProcessRequest(request);
+	@Test
+	public void userDetails() {
+		securityContext(expectedContext).postProcessRequest(request);
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context).isSameAs(this.expectedContext);
-    }
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context).isSameAs(this.expectedContext);
+	}
 
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
index 327a90f4d5..2d7110ce04 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
@@ -48,56 +48,56 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @WebAppConfiguration
 public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private Filter springSecurityFilterChain;
+	@Autowired
+	private Filter springSecurityFilterChain;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .addFilters(springSecurityFilterChain)
-                .defaultRequest(get("/").with(testSecurityContext()))
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.addFilters(springSecurityFilterChain)
+				.defaultRequest(get("/").with(testSecurityContext())).build();
+	}
 
-    @Test
-    @WithMockUser
-    public void testSecurityContextWithMockUserWorksWithStateless() throws Exception {
-       mvc
-          .perform(get("/"))
-          .andExpect(status().is2xxSuccessful());
-    }
+	@Test
+	@WithMockUser
+	public void testSecurityContextWithMockUserWorksWithStateless() throws Exception {
+		mvc.perform(get("/")).andExpect(status().is2xxSuccessful());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            super.configure(http);
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			super.configure(http);
 
-            http
-                .sessionManagement()
-                    .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
-        }
+			http
+				.sessionManagement()
+					.sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication();
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication();
+		}
+		// @formatter:on
 
-        @RestController
-        static class Controller {
-            @RequestMapping
-            public String hello() {
-                return "Hello";
-            }
-        }
-    }
+		@RestController
+		static class Controller {
+			@RequestMapping
+			public String hello() {
+				return "Hello";
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java
index 39b1457f22..821f3539b8 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextTests.java
@@ -39,43 +39,45 @@ import org.springframework.security.web.context.SecurityContextRepository;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsTestSecurityContextTests {
-    @Mock
-    private SecurityContext context;
-    @Mock
-    private SecurityContextRepository repository;
+	@Mock
+	private SecurityContext context;
+	@Mock
+	private SecurityContextRepository repository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testSecurityContextSaves() {
-        TestSecurityContextHolder.setContext(context);
+	@Test
+	public void testSecurityContextSaves() {
+		TestSecurityContextHolder.setContext(context);
 
-        testSecurityContext().postProcessRequest(request);
+		testSecurityContext().postProcessRequest(request);
 
-        verify(repository).saveContext(eq(context), eq(request), any(HttpServletResponse.class));
-    }
+		verify(repository).saveContext(eq(context), eq(request),
+				any(HttpServletResponse.class));
+	}
 
-    // Ensure it does not fail if TestSecurityContextHolder is not initialized
-    @Test
-    public void testSecurityContextNoContext() {
-        testSecurityContext().postProcessRequest(request);
+	// Ensure it does not fail if TestSecurityContextHolder is not initialized
+	@Test
+	public void testSecurityContextNoContext() {
+		testSecurityContext().postProcessRequest(request);
 
-        verify(repository).saveContext(any(SecurityContext.class), eq(request), any(HttpServletResponse.class));
-    }
+		verify(repository).saveContext(any(SecurityContext.class), eq(request),
+				any(HttpServletResponse.class));
+	}
 
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java
index 2576e33d2e..05184ca9b4 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserDetailsTests.java
@@ -45,39 +45,41 @@ import org.springframework.security.web.context.SecurityContextRepository;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsUserDetailsTests {
-    @Captor
-    private ArgumentCaptor<SecurityContext> contextCaptor;
-    @Mock
-    private SecurityContextRepository repository;
+	@Captor
+	private ArgumentCaptor<SecurityContext> contextCaptor;
+	@Mock
+	private SecurityContextRepository repository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Mock
-    private UserDetails userDetails;
+	@Mock
+	private UserDetails userDetails;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void userDetails() {
-        user(userDetails).postProcessRequest(request);
+	@Test
+	public void userDetails() {
+		user(userDetails).postProcessRequest(request);
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class);
-        assertThat(context.getAuthentication().getPrincipal()).isSameAs(userDetails);
-    }
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication()).isInstanceOf(
+				UsernamePasswordAuthenticationToken.class);
+		assertThat(context.getAuthentication().getPrincipal()).isSameAs(userDetails);
+	}
 
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java
index fe5caa6eb5..d62329374d 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsUserTests.java
@@ -47,96 +47,98 @@ import org.springframework.security.web.context.SecurityContextRepository;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(WebTestUtils.class)
 public class SecurityMockMvcRequestPostProcessorsUserTests {
-    @Captor
-    private ArgumentCaptor<SecurityContext> contextCaptor;
-    @Mock
-    private SecurityContextRepository repository;
+	@Captor
+	private ArgumentCaptor<SecurityContext> contextCaptor;
+	@Mock
+	private SecurityContextRepository repository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Mock
-    private GrantedAuthority authority1;
-    @Mock
-    private GrantedAuthority authority2;
+	@Mock
+	private GrantedAuthority authority1;
+	@Mock
+	private GrantedAuthority authority2;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        mockWebTestUtils();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		mockWebTestUtils();
+	}
 
-    @After
-    public void cleanup() {
-        TestSecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		TestSecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void userWithDefaults() {
-        String username = "userabc";
+	@Test
+	public void userWithDefaults() {
+		String username = "userabc";
 
-        user(username).postProcessRequest(request);
+		user(username).postProcessRequest(request);
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class);
-        assertThat(context.getAuthentication().getName()).isEqualTo(username);
-        assertThat(context.getAuthentication().getCredentials()).isEqualTo("password");
-        assertThat(context.getAuthentication().getAuthorities()).onProperty("authority").containsOnly("ROLE_USER");
-    }
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication()).isInstanceOf(
+				UsernamePasswordAuthenticationToken.class);
+		assertThat(context.getAuthentication().getName()).isEqualTo(username);
+		assertThat(context.getAuthentication().getCredentials()).isEqualTo("password");
+		assertThat(context.getAuthentication().getAuthorities()).onProperty("authority")
+				.containsOnly("ROLE_USER");
+	}
 
+	@Test
+	public void userWithCustom() {
+		String username = "customuser";
 
-    @Test
-    public void userWithCustom() {
-        String username = "customuser";
+		user(username).roles("CUSTOM", "ADMIN").password("newpass")
+				.postProcessRequest(request);
 
-        user(username)
-            .roles("CUSTOM","ADMIN")
-            .password("newpass")
-            .postProcessRequest(request);
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication()).isInstanceOf(
+				UsernamePasswordAuthenticationToken.class);
+		assertThat(context.getAuthentication().getName()).isEqualTo(username);
+		assertThat(context.getAuthentication().getCredentials()).isEqualTo("newpass");
+		assertThat(context.getAuthentication().getAuthorities()).onProperty("authority")
+				.containsOnly("ROLE_CUSTOM", "ROLE_ADMIN");
+	}
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication()).isInstanceOf(UsernamePasswordAuthenticationToken.class);
-        assertThat(context.getAuthentication().getName()).isEqualTo(username);
-        assertThat(context.getAuthentication().getCredentials()).isEqualTo("newpass");
-        assertThat(context.getAuthentication().getAuthorities()).onProperty("authority").containsOnly("ROLE_CUSTOM","ROLE_ADMIN");
-    }
+	@Test
+	public void userCustomAuthoritiesVarargs() {
+		String username = "customuser";
 
-    @Test
-    public void userCustomAuthoritiesVarargs() {
-        String username = "customuser";
+		user(username).authorities(authority1, authority2).postProcessRequest(request);
 
-        user(username)
-            .authorities(authority1,authority2)
-            .postProcessRequest(request);
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication().getAuthorities()).containsOnly(authority1,
+				authority2);
+	}
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication().getAuthorities()).containsOnly(authority1,authority2);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void userRolesWithRolePrefixErrors() {
+		user("user").roles("ROLE_INVALID").postProcessRequest(request);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void userRolesWithRolePrefixErrors() {
-        user("user")
-            .roles("ROLE_INVALID")
-            .postProcessRequest(request);
-    }
+	@Test
+	public void userCustomAuthoritiesList() {
+		String username = "customuser";
 
-    @Test
-    public void userCustomAuthoritiesList() {
-        String username = "customuser";
+		user(username).authorities(Arrays.asList(authority1, authority2))
+				.postProcessRequest(request);
 
-        user(username)
-            .authorities(Arrays.asList(authority1,authority2))
-            .postProcessRequest(request);
+		verify(repository).saveContext(contextCaptor.capture(), eq(request),
+				any(HttpServletResponse.class));
+		SecurityContext context = contextCaptor.getValue();
+		assertThat(context.getAuthentication().getAuthorities()).containsOnly(authority1,
+				authority2);
+	}
 
-        verify(repository).saveContext(contextCaptor.capture(), eq(request), any(HttpServletResponse.class));
-        SecurityContext context = contextCaptor.getValue();
-        assertThat(context.getAuthentication().getAuthorities()).containsOnly(authority1,authority2);
-    }
-
-    private void mockWebTestUtils() {
-        spy(WebTestUtils.class);
-        when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
-    }
+	private void mockWebTestUtils() {
+		spy(WebTestUtils.class);
+		when(WebTestUtils.getSecurityContextRepository(request)).thenReturn(repository);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java
index c50e212f97..73f6b143f1 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java
@@ -8,10 +8,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -26,49 +25,49 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 @ContextConfiguration(classes = SecurityMockMvcResultMatchersTests.Config.class)
 @WebAppConfiguration
 public class SecurityMockMvcResultMatchersTests {
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mockMvc;
+	private MockMvc mockMvc;
 
-    @Before
-    public void setup() {
-        mockMvc = MockMvcBuilders.webAppContextSetup(context)
-                    .apply(springSecurity())
-                    .build();
-    }
+	@Before
+	public void setup() {
+		mockMvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity())
+				.build();
+	}
 
-    // SEC-2719
-    @Test
-    public void withRolesNotOrderSensitive() throws Exception {
-        mockMvc.perform(formLogin())
-            .andExpect(authenticated().withRoles("USER","SELLER"))
-            .andExpect(authenticated().withRoles("SELLER","USER"));
-    }
+	// SEC-2719
+	@Test
+	public void withRolesNotOrderSensitive() throws Exception {
+		mockMvc.perform(formLogin())
+				.andExpect(authenticated().withRoles("USER", "SELLER"))
+				.andExpect(authenticated().withRoles("SELLER", "USER"));
+	}
 
-    @Test(expected = AssertionError.class)
-    public void withRolesFailsIfNotAllRoles() throws Exception {
-        mockMvc.perform(formLogin())
-            .andExpect(authenticated().withRoles("USER"));
-    }
+	@Test(expected = AssertionError.class)
+	public void withRolesFailsIfNotAllRoles() throws Exception {
+		mockMvc.perform(formLogin()).andExpect(authenticated().withRoles("USER"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").roles("USER","SELLER").password("password");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").roles("USER","SELLER").password("password");
+		}
+		// @formatter:on
 
-        @RestController
-        static class Controller {
-            @RequestMapping("/")
-            public String ok() {
-                return "ok";
-            }
-        }
-    }
+		@RestController
+		static class Controller {
+			@RequestMapping("/")
+			public String ok() {
+				return "ok";
+			}
+		}
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurerTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurerTests.java
index b6e1843937..efc29e68cf 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurerTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/setup/SecurityMockMvcConfigurerTests.java
@@ -31,54 +31,53 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SecurityMockMvcConfigurerTests {
-    @Mock
-    private Filter filter;
-    @Mock
-    private Filter beanFilter;
-    @Mock
-    private ConfigurableMockMvcBuilder builder;
-    @Mock
-    private WebApplicationContext context;
+	@Mock
+	private Filter filter;
+	@Mock
+	private Filter beanFilter;
+	@Mock
+	private ConfigurableMockMvcBuilder builder;
+	@Mock
+	private WebApplicationContext context;
 
-    @Test
-    public void beforeMockMvcCreatedOverrideBean() throws Exception {
-        returnFilterBean();
-        SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer(filter);
+	@Test
+	public void beforeMockMvcCreatedOverrideBean() throws Exception {
+		returnFilterBean();
+		SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer(filter);
 
-        configurer.beforeMockMvcCreated(builder, context);
+		configurer.beforeMockMvcCreated(builder, context);
 
-        verify(builder).addFilters(filter);
-    }
+		verify(builder).addFilters(filter);
+	}
 
-    @Test
-    public void beforeMockMvcCreatedBean() throws Exception {
-        returnFilterBean();
-        SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer();
+	@Test
+	public void beforeMockMvcCreatedBean() throws Exception {
+		returnFilterBean();
+		SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer();
 
-        configurer.beforeMockMvcCreated(builder, context);
+		configurer.beforeMockMvcCreated(builder, context);
 
-        verify(builder).addFilters(beanFilter);
-    }
+		verify(builder).addFilters(beanFilter);
+	}
 
-    @Test
-    public void beforeMockMvcCreatedNoBean() throws Exception {
-        SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer(filter);
+	@Test
+	public void beforeMockMvcCreatedNoBean() throws Exception {
+		SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer(filter);
 
-        configurer.beforeMockMvcCreated(builder, context);
+		configurer.beforeMockMvcCreated(builder, context);
 
-        verify(builder).addFilters(filter);
-    }
+		verify(builder).addFilters(filter);
+	}
 
+	@Test(expected = IllegalStateException.class)
+	public void beforeMockMvcCreatedNoFilter() throws Exception {
+		SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer();
 
-    @Test(expected = IllegalStateException.class)
-    public void beforeMockMvcCreatedNoFilter() throws Exception {
-        SecurityMockMvcConfigurer configurer = new SecurityMockMvcConfigurer();
+		configurer.beforeMockMvcCreated(builder, context);
+	}
 
-        configurer.beforeMockMvcCreated(builder, context);
-    }
-
-    private void returnFilterBean() {
-        when(context.containsBean(anyString())).thenReturn(true);
-        when(context.getBean(anyString(),eq(Filter.class))).thenReturn(beanFilter);
-    }
+	private void returnFilterBean() {
+		when(context.containsBean(anyString())).thenReturn(true);
+		when(context.getBean(anyString(), eq(Filter.class))).thenReturn(beanFilter);
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
index b47ecda0d3..0a4f73c36d 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java
@@ -15,15 +15,20 @@
  */
 package org.springframework.security.test.web.servlet.showcase.csrf;
 
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -32,64 +37,51 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
-import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=CsrfShowcaseTests.Config.class)
+@ContextConfiguration(classes = CsrfShowcaseTests.Config.class)
 @WebAppConfiguration
 public class CsrfShowcaseTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void postWithCsrfWorks() throws Exception {
-        mvc
-            .perform(post("/").with(csrf()))
-            .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorks() throws Exception {
+		mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound());
+	}
 
-    @Test
-    public void postWithCsrfWorksWithPut() throws Exception {
-        mvc
-        .perform(put("/").with(csrf()))
-        .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorksWithPut() throws Exception {
+		mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound());
+	}
 
-    @Test
-    public void postWithNoCsrfForbidden() throws Exception {
-        mvc
-            .perform(post("/"))
-            .andExpect(status().isForbidden());
-    }
+	@Test
+	public void postWithNoCsrfForbidden() throws Exception {
+		mvc.perform(post("/")).andExpect(status().isForbidden());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-        }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+		}
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
index 49aa9f6453..ad69a7a91c 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java
@@ -14,21 +14,23 @@
  * limitations under the License.
  */
 package org.springframework.security.test.web.servlet.showcase.csrf;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
+
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
 import org.springframework.test.context.ContextConfiguration;
@@ -40,64 +42,61 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=CustomCsrfShowcaseTests.Config.class)
+@ContextConfiguration(classes = CustomCsrfShowcaseTests.Config.class)
 @WebAppConfiguration
 public class CustomCsrfShowcaseTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private CsrfTokenRepository repository;
+	@Autowired
+	private CsrfTokenRepository repository;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .defaultRequest(get("/").with(csrf()))
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.defaultRequest(get("/").with(csrf())).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void postWithCsrfWorks() throws Exception {
-        mvc
-            .perform(post("/").with(csrf()))
-            .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorks() throws Exception {
+		mvc.perform(post("/").with(csrf())).andExpect(status().isNotFound());
+	}
 
-    @Test
-    public void postWithCsrfWorksWithPut() throws Exception {
-        mvc
-        .perform(put("/").with(csrf()))
-        .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorksWithPut() throws Exception {
+		mvc.perform(put("/").with(csrf())).andExpect(status().isNotFound());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .csrf()
-                    .csrfTokenRepository(repo());
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.csrf()
+					.csrfTokenRepository(repo());
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
 
-        @Bean
-        public CsrfTokenRepository repo() {
-            HttpSessionCsrfTokenRepository repo = new HttpSessionCsrfTokenRepository();
-            repo.setParameterName("custom_csrf");
-            return repo;
-        }
-    }
+		@Bean
+		public CsrfTokenRepository repo() {
+			HttpSessionCsrfTokenRepository repo = new HttpSessionCsrfTokenRepository();
+			repo.setParameterName("custom_csrf");
+			return repo;
+		}
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
index e998bb6cbc..0a0046f002 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 package org.springframework.security.test.web.servlet.showcase.csrf;
+
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@@ -37,51 +38,46 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=DefaultCsrfShowcaseTests.Config.class)
+@ContextConfiguration(classes = DefaultCsrfShowcaseTests.Config.class)
 @WebAppConfiguration
 public class DefaultCsrfShowcaseTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .defaultRequest(get("/").with(csrf()))
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.defaultRequest(get("/").with(csrf())).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void postWithCsrfWorks() throws Exception {
-        mvc
-            .perform(post("/"))
-            .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorks() throws Exception {
+		mvc.perform(post("/")).andExpect(status().isNotFound());
+	}
 
-    @Test
-    public void postWithCsrfWorksWithPut() throws Exception {
-        mvc
-            .perform(put("/"))
-            .andExpect(status().isNotFound());
-    }
+	@Test
+	public void postWithCsrfWorksWithPut() throws Exception {
+		mvc.perform(put("/")).andExpect(status().isNotFound());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-        }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+		}
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
index fc4c407ce3..ea893ed949 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/AuthenticationTests.java
@@ -39,64 +39,56 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=AuthenticationTests.Config.class)
+@ContextConfiguration(classes = AuthenticationTests.Config.class)
 @WebAppConfiguration
 public class AuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void requiresAuthentication() throws Exception {
-        mvc
-            .perform(get("/"))
-            .andExpect(status().isMovedTemporarily());
-    }
+	@Test
+	public void requiresAuthentication() throws Exception {
+		mvc.perform(get("/")).andExpect(status().isMovedTemporarily());
+	}
 
-    @Test
-    public void httpBasicAuthenticationSuccess() throws Exception {
-        mvc
-            .perform(get("/secured/butnotfound").with(httpBasic("user","password")))
-            .andExpect(status().isNotFound())
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void httpBasicAuthenticationSuccess() throws Exception {
+		mvc.perform(get("/secured/butnotfound").with(httpBasic("user", "password")))
+				.andExpect(status().isNotFound())
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void authenticationSuccess() throws Exception {
-        mvc
-            .perform(formLogin())
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/"))
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void authenticationSuccess() throws Exception {
+		mvc.perform(formLogin()).andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/"))
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void authenticationFailed() throws Exception {
-        mvc
-            .perform(formLogin().user("user").password("invalid"))
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/login?error"))
-            .andExpect(unauthenticated());
-    }
+	@Test
+	public void authenticationFailed() throws Exception {
+		mvc.perform(formLogin().user("user").password("invalid"))
+				.andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/login?error")).andExpect(unauthenticated());
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
index d92c1f07e1..00de5b9bd5 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java
@@ -43,84 +43,82 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=CustomConfigAuthenticationTests.Config.class)
+@ContextConfiguration(classes = CustomConfigAuthenticationTests.Config.class)
 @WebAppConfiguration
 public class CustomConfigAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private SecurityContextRepository securityContextRepository;
+	@Autowired
+	private SecurityContextRepository securityContextRepository;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void authenticationSuccess() throws Exception {
-        mvc
-            .perform(formLogin("/authenticate").user("user","user").password("pass","password"))
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/"))
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void authenticationSuccess() throws Exception {
+		mvc.perform(
+				formLogin("/authenticate").user("user", "user").password("pass",
+						"password")).andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/"))
+				.andExpect(authenticated().withUsername("user"));
+	}
 
+	@Test
+	public void withUserSuccess() throws Exception {
+		mvc.perform(get("/").with(user("user"))).andExpect(status().isNotFound())
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void withUserSuccess() throws Exception {
-        mvc
-            .perform(get("/").with(user("user")))
-            .andExpect(status().isNotFound())
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void authenticationFailed() throws Exception {
+		mvc.perform(
+				formLogin("/authenticate").user("user", "notfound").password("pass",
+						"invalid")).andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/authenticate?error"))
+				.andExpect(unauthenticated());
+	}
 
-    @Test
-    public void authenticationFailed() throws Exception {
-        mvc
-            .perform(formLogin("/authenticate").user("user","notfound").password("pass","invalid"))
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/authenticate?error"))
-            .andExpect(unauthenticated());
-    }
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.anyRequest().authenticated()
+					.and()
+				.securityContext()
+					.securityContextRepository(securityContextRepository())
+					.and()
+				.formLogin()
+					.usernameParameter("user")
+					.passwordParameter("pass")
+					.loginPage("/authenticate");
+		}
+		// @formatter:on
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .anyRequest().authenticated()
-                    .and()
-                .securityContext()
-                    .securityContextRepository(securityContextRepository())
-                    .and()
-                .formLogin()
-                    .usernameParameter("user")
-                    .passwordParameter("pass")
-                    .loginPage("/authenticate");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-
-        @Bean
-        public SecurityContextRepository securityContextRepository() {
-            HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-            repo.setSpringSecurityContextKey("CUSTOM");
-            return repo;
-        }
-    }
+		@Bean
+		public SecurityContextRepository securityContextRepository() {
+			HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+			repo.setSpringSecurityContextKey("CUSTOM");
+			return repo;
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
index 29ade4710e..47f824d7ba 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomLoginRequestBuilderAuthenticationTests.java
@@ -39,69 +39,65 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=CustomLoginRequestBuilderAuthenticationTests.Config.class)
+@ContextConfiguration(classes = CustomLoginRequestBuilderAuthenticationTests.Config.class)
 @WebAppConfiguration
 public class CustomLoginRequestBuilderAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void authenticationSuccess() throws Exception {
-        mvc
-            .perform(login())
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/"))
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void authenticationSuccess() throws Exception {
+		mvc.perform(login()).andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/"))
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void authenticationFailed() throws Exception {
-        mvc
-            .perform(login().user("notfound").password("invalid"))
-            .andExpect(status().isMovedTemporarily())
-            .andExpect(redirectedUrl("/authenticate?error"))
-            .andExpect(unauthenticated());
-    }
+	@Test
+	public void authenticationFailed() throws Exception {
+		mvc.perform(login().user("notfound").password("invalid"))
+				.andExpect(status().isMovedTemporarily())
+				.andExpect(redirectedUrl("/authenticate?error"))
+				.andExpect(unauthenticated());
+	}
 
-    static FormLoginRequestBuilder login() {
-        return SecurityMockMvcRequestBuilders
-                .formLogin("/authenticate")
-                    .userParameter("user")
-                    .passwordParam("pass");
-    }
+	static FormLoginRequestBuilder login() {
+		return SecurityMockMvcRequestBuilders.formLogin("/authenticate")
+				.userParameter("user").passwordParam("pass");
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin()
-                    .usernameParameter("user")
-                    .passwordParameter("pass")
-                    .loginPage("/authenticate");
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.anyRequest().authenticated()
+					.and()
+				.formLogin()
+					.usernameParameter("user")
+					.passwordParameter("pass")
+					.loginPage("/authenticate");
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
index 87587810d4..64980d4e2f 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java
@@ -41,66 +41,66 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=DefaultfSecurityRequestsTests.Config.class)
+@ContextConfiguration(classes = DefaultfSecurityRequestsTests.Config.class)
 @WebAppConfiguration
 public class DefaultfSecurityRequestsTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private Filter springSecurityFilterChain;
+	@Autowired
+	private Filter springSecurityFilterChain;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .defaultRequest(get("/").with(user("user").roles("ADMIN")))
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.defaultRequest(get("/").with(user("user").roles("ADMIN")))
+				.apply(springSecurity()).build();
+	}
 
-    @Test
-    public void requestProtectedUrlWithUser() throws Exception {
-        mvc
-            .perform(get("/"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void requestProtectedUrlWithUser() throws Exception {
+		mvc.perform(get("/"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
index 06725d62d4..8ec72e24e0 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java
@@ -44,93 +44,91 @@ import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=SecurityRequestsTests.Config.class)
+@ContextConfiguration(classes = SecurityRequestsTests.Config.class)
 @WebAppConfiguration
 public class SecurityRequestsTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    @Autowired
-    private UserDetailsService userDetailsService;
+	@Autowired
+	private UserDetailsService userDetailsService;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void requestProtectedUrlWithUser() throws Exception {
-        mvc
-            .perform(get("/").with(user("user")))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void requestProtectedUrlWithUser() throws Exception {
+		mvc.perform(get("/").with(user("user")))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin").with(user("admin").roles("ADMIN")))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with admin
-            .andExpect(authenticated().withUsername("admin"));
-    }
+	@Test
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin").with(user("admin").roles("ADMIN")))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with admin
+				.andExpect(authenticated().withUsername("admin"));
+	}
 
-    @Test
-    public void requestProtectedUrlWithUserDetails() throws Exception {
-        UserDetails user = userDetailsService.loadUserByUsername("user");
-        mvc
-            .perform(get("/").with(user(user)))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withAuthenticationPrincipal(user));
-    }
+	@Test
+	public void requestProtectedUrlWithUserDetails() throws Exception {
+		UserDetails user = userDetailsService.loadUserByUsername("user");
+		mvc.perform(get("/").with(user(user)))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withAuthenticationPrincipal(user));
+	}
 
-    @Test
-    public void requestProtectedUrlWithAuthentication() throws Exception {
-        Authentication authentication = new TestingAuthenticationToken("test", "notused", "ROLE_USER");
-        mvc
-            .perform(get("/").with(authentication(authentication)))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withAuthentication(authentication));
-    }
+	@Test
+	public void requestProtectedUrlWithAuthentication() throws Exception {
+		Authentication authentication = new TestingAuthenticationToken("test", "notused",
+				"ROLE_USER");
+		mvc.perform(get("/").with(authentication(authentication)))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withAuthentication(authentication));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
 
-        @Override
-        @Bean
-        public UserDetailsService userDetailsServiceBean() throws Exception {
-            return super.userDetailsServiceBean();
-        }
-    }
+		@Override
+		@Bean
+		public UserDetailsService userDetailsServiceBean() throws Exception {
+			return super.userDetailsServiceBean();
+		}
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
index 88803fdd99..6791264d4f 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java
@@ -39,64 +39,64 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=WithUserAuthenticationTests.Config.class)
+@ContextConfiguration(classes = WithUserAuthenticationTests.Config.class)
 @WebAppConfiguration
 public class WithUserAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(SecurityMockMvcConfigurers.springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.apply(SecurityMockMvcConfigurers.springSecurity()).build();
+	}
 
-    @Test
-    @WithMockUser
-    public void requestProtectedUrlWithUser() throws Exception {
-        mvc
-            .perform(get("/"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	@WithMockUser
+	public void requestProtectedUrlWithUser() throws Exception {
+		mvc.perform(get("/"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    @WithMockUser(roles="ADMIN")
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user").withRoles("ADMIN"));
-    }
+	@Test
+	@WithMockUser(roles = "ADMIN")
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user").withRoles("ADMIN"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
index e2c8227731..02bb167bd1 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java
@@ -39,63 +39,62 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=WithUserClassLevelAuthenticationTests.Config.class)
+@ContextConfiguration(classes = WithUserClassLevelAuthenticationTests.Config.class)
 @WebAppConfiguration
-@WithMockUser(roles="ADMIN")
+@WithMockUser(roles = "ADMIN")
 public class WithUserClassLevelAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void requestProtectedUrlWithUser() throws Exception {
-        mvc
-            .perform(get("/"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	public void requestProtectedUrlWithUser() throws Exception {
+		mvc.perform(get("/"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user").withRoles("ADMIN"));
-    }
+	@Test
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user").withRoles("ADMIN"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
index fe769a6ef7..a1a3d39027 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java
@@ -41,71 +41,71 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=WithUserDetailsAuthenticationTests.Config.class)
+@ContextConfiguration(classes = WithUserDetailsAuthenticationTests.Config.class)
 @WebAppConfiguration
 public class WithUserDetailsAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    @WithUserDetails
-    public void requestProtectedUrlWithUser() throws Exception {
-        mvc
-            .perform(get("/"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("user"));
-    }
+	@Test
+	@WithUserDetails
+	public void requestProtectedUrlWithUser() throws Exception {
+		mvc.perform(get("/"))
+		// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(authenticated().withUsername("user"));
+	}
 
-    @Test
-    @WithUserDetails("admin")
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("admin").withRoles("ADMIN","USER"));
-    }
+	@Test
+	@WithUserDetails("admin")
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin"))
+				// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(
+						authenticated().withUsername("admin").withRoles("ADMIN", "USER"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Bean
-        @Override
-        public UserDetailsService userDetailsServiceBean() throws Exception {
-            return super.userDetailsServiceBean();
-        }
+		@Bean
+		@Override
+		public UserDetailsService userDetailsServiceBean() throws Exception {
+			return super.userDetailsServiceBean();
+		}
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER").and()
-                    .withUser("admin").password("password").roles("USER","ADMIN");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER").and()
+					.withUser("admin").password("password").roles("USER","ADMIN");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
index b1bb16ac33..6b0a30337b 100644
--- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java
@@ -41,70 +41,71 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes=WithUserDetailsClassLevelAuthenticationTests.Config.class)
+@ContextConfiguration(classes = WithUserDetailsClassLevelAuthenticationTests.Config.class)
 @WebAppConfiguration
 @WithUserDetails("admin")
 public class WithUserDetailsClassLevelAuthenticationTests {
 
-    @Autowired
-    private WebApplicationContext context;
+	@Autowired
+	private WebApplicationContext context;
 
-    private MockMvc mvc;
+	private MockMvc mvc;
 
-    @Before
-    public void setup() {
-        mvc = MockMvcBuilders
-                .webAppContextSetup(context)
-                .apply(springSecurity())
-                .build();
-    }
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context).apply(springSecurity()).build();
+	}
 
-    @Test
-    public void requestRootUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("admin").withRoles("ADMIN","USER"));
-    }
+	@Test
+	public void requestRootUrlWithAdmin() throws Exception {
+		mvc.perform(get("/"))
+				// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(
+						authenticated().withUsername("admin").withRoles("ADMIN", "USER"));
+	}
 
-    @Test
-    public void requestProtectedUrlWithAdmin() throws Exception {
-        mvc
-            .perform(get("/admin"))
-            // Ensure we got past Security
-            .andExpect(status().isNotFound())
-            // Ensure it appears we are authenticated with user
-            .andExpect(authenticated().withUsername("admin").withRoles("ADMIN","USER"));
-    }
+	@Test
+	public void requestProtectedUrlWithAdmin() throws Exception {
+		mvc.perform(get("/admin"))
+				// Ensure we got past Security
+				.andExpect(status().isNotFound())
+				// Ensure it appears we are authenticated with user
+				.andExpect(
+						authenticated().withUsername("admin").withRoles("ADMIN", "USER"));
+	}
 
-    @EnableWebSecurity
-    @EnableWebMvc
-    static class Config extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	@EnableWebMvc
+	static class Config extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .authorizeRequests()
-                    .antMatchers("/admin/**").hasRole("ADMIN")
-                    .anyRequest().authenticated()
-                    .and()
-                .formLogin();
-        }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.authorizeRequests()
+					.antMatchers("/admin/**").hasRole("ADMIN")
+					.anyRequest().authenticated()
+					.and()
+				.formLogin();
+		}
+		// @formatter:on
 
-        @Bean
-        @Override
-        public UserDetailsService userDetailsServiceBean() throws Exception {
-            return super.userDetailsServiceBean();
-        }
+		@Bean
+		@Override
+		public UserDetailsService userDetailsServiceBean() throws Exception {
+			return super.userDetailsServiceBean();
+		}
 
-        @Autowired
-        public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-            auth
-                .inMemoryAuthentication()
-                    .withUser("user").password("password").roles("USER").and()
-                    .withUser("admin").password("password").roles("USER","ADMIN");
-        }
-    }
+		// @formatter:off
+		@Autowired
+		public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+			auth
+				.inMemoryAuthentication()
+					.withUser("user").password("password").roles("USER").and()
+					.withUser("admin").password("password").roles("USER","ADMIN");
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java b/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java
index d1fb5d1e3f..243423a9aa 100644
--- a/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java
+++ b/test/src/test/java/org/springframework/security/test/web/support/WebTestUtilsTests.java
@@ -40,111 +40,121 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 
 @RunWith(MockitoJUnitRunner.class)
 public class WebTestUtilsTests {
-    @Mock
-    private SecurityContextRepository contextRepo;
-    @Mock
-    private CsrfTokenRepository csrfRepo;
+	@Mock
+	private SecurityContextRepository contextRepo;
+	@Mock
+	private CsrfTokenRepository csrfRepo;
 
-    private MockHttpServletRequest request;
-    private ConfigurableApplicationContext context;
+	private MockHttpServletRequest request;
+	private ConfigurableApplicationContext context;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+	}
 
-    @After
-    public void cleanup() {
-        if(context != null) {
-            context.close();
-        }
-    }
+	@After
+	public void cleanup() {
+		if (context != null) {
+			context.close();
+		}
+	}
 
-    @Test
-    public void getCsrfTokenRepositorytNoWac() {
-        assertThat(getCsrfTokenRepository(request)).isInstanceOf(HttpSessionCsrfTokenRepository.class);
-    }
+	@Test
+	public void getCsrfTokenRepositorytNoWac() {
+		assertThat(getCsrfTokenRepository(request)).isInstanceOf(
+				HttpSessionCsrfTokenRepository.class);
+	}
 
-    @Test
-    public void getCsrfTokenRepositorytNoSecurity() {
-        loadConfig(Config.class);
-        assertThat(getCsrfTokenRepository(request)).isInstanceOf(HttpSessionCsrfTokenRepository.class);
-    }
+	@Test
+	public void getCsrfTokenRepositorytNoSecurity() {
+		loadConfig(Config.class);
+		assertThat(getCsrfTokenRepository(request)).isInstanceOf(
+				HttpSessionCsrfTokenRepository.class);
+	}
 
-    @Test
-    public void getCsrfTokenRepositorytSecurityNoCsrf() {
-        loadConfig(SecurityNoCsrfConfig.class);
-        assertThat(getCsrfTokenRepository(request)).isInstanceOf(HttpSessionCsrfTokenRepository.class);
-    }
+	@Test
+	public void getCsrfTokenRepositorytSecurityNoCsrf() {
+		loadConfig(SecurityNoCsrfConfig.class);
+		assertThat(getCsrfTokenRepository(request)).isInstanceOf(
+				HttpSessionCsrfTokenRepository.class);
+	}
 
-    @Test
-    public void getCsrfTokenRepositorytSecurityCustomRepo() {
-        CustomSecurityConfig.CONTEXT_REPO = contextRepo;
-        CustomSecurityConfig.CSRF_REPO = csrfRepo;
-        loadConfig(CustomSecurityConfig.class);
-        assertThat(getCsrfTokenRepository(request)).isSameAs(csrfRepo);
-    }
+	@Test
+	public void getCsrfTokenRepositorytSecurityCustomRepo() {
+		CustomSecurityConfig.CONTEXT_REPO = contextRepo;
+		CustomSecurityConfig.CSRF_REPO = csrfRepo;
+		loadConfig(CustomSecurityConfig.class);
+		assertThat(getCsrfTokenRepository(request)).isSameAs(csrfRepo);
+	}
 
-    // getSecurityContextRepository
+	// getSecurityContextRepository
 
-    @Test
-    public void getSecurityContextRepositoryNoWac() {
-        assertThat(getSecurityContextRepository(request)).isInstanceOf(HttpSessionSecurityContextRepository.class);
-    }
+	@Test
+	public void getSecurityContextRepositoryNoWac() {
+		assertThat(getSecurityContextRepository(request)).isInstanceOf(
+				HttpSessionSecurityContextRepository.class);
+	}
 
-    @Test
-    public void getSecurityContextRepositoryNoSecurity() {
-        loadConfig(Config.class);
-        assertThat(getSecurityContextRepository(request)).isInstanceOf(HttpSessionSecurityContextRepository.class);
-    }
+	@Test
+	public void getSecurityContextRepositoryNoSecurity() {
+		loadConfig(Config.class);
+		assertThat(getSecurityContextRepository(request)).isInstanceOf(
+				HttpSessionSecurityContextRepository.class);
+	}
 
-    @Test
-    public void getSecurityContextRepositorySecurityNoCsrf() {
-        loadConfig(SecurityNoCsrfConfig.class);
-        assertThat(getSecurityContextRepository(request)).isInstanceOf(HttpSessionSecurityContextRepository.class);
-    }
+	@Test
+	public void getSecurityContextRepositorySecurityNoCsrf() {
+		loadConfig(SecurityNoCsrfConfig.class);
+		assertThat(getSecurityContextRepository(request)).isInstanceOf(
+				HttpSessionSecurityContextRepository.class);
+	}
 
-    @Test
-    public void getSecurityContextRepositorySecurityCustomRepo() {
-        CustomSecurityConfig.CONTEXT_REPO = contextRepo;
-        CustomSecurityConfig.CSRF_REPO = csrfRepo;
-        loadConfig(CustomSecurityConfig.class);
-        assertThat(getSecurityContextRepository(request)).isSameAs(contextRepo);
-    }
+	@Test
+	public void getSecurityContextRepositorySecurityCustomRepo() {
+		CustomSecurityConfig.CONTEXT_REPO = contextRepo;
+		CustomSecurityConfig.CSRF_REPO = csrfRepo;
+		loadConfig(CustomSecurityConfig.class);
+		assertThat(getSecurityContextRepository(request)).isSameAs(contextRepo);
+	}
 
-    private void loadConfig(Class<?> config) {
-        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-        context.register(config);
-        context.refresh();
-        this.context = context;
-        request.getServletContext().setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, context);
-    }
+	private void loadConfig(Class<?> config) {
+		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+		context.register(config);
+		context.refresh();
+		this.context = context;
+		request.getServletContext().setAttribute(
+				WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, context);
+	}
 
-    @Configuration
-    static class Config {}
+	@Configuration
+	static class Config {
+	}
 
-    @EnableWebSecurity
-    static class SecurityNoCsrfConfig extends WebSecurityConfigurerAdapter {
+	@EnableWebSecurity
+	static class SecurityNoCsrfConfig extends WebSecurityConfigurerAdapter {
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http.csrf().disable();
-        }
-    }
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http.csrf().disable();
+		}
+	}
 
-    @EnableWebSecurity
-    static class CustomSecurityConfig extends WebSecurityConfigurerAdapter {
-        static CsrfTokenRepository CSRF_REPO;
-        static SecurityContextRepository CONTEXT_REPO;
+	@EnableWebSecurity
+	static class CustomSecurityConfig extends WebSecurityConfigurerAdapter {
+		static CsrfTokenRepository CSRF_REPO;
+		static SecurityContextRepository CONTEXT_REPO;
 
-        @Override
-        protected void configure(HttpSecurity http) throws Exception {
-            http
-                .csrf()
-                    .csrfTokenRepository(CSRF_REPO)
-                    .and()
-                .securityContext()
-                    .securityContextRepository(CONTEXT_REPO);
-        }
-    }
+		// @formatter:off
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+			http
+				.csrf()
+					.csrfTokenRepository(CSRF_REPO)
+					.and()
+				.securityContext()
+					.securityContextRepository(CONTEXT_REPO);
+		}
+		// @formatter:on
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java
index 711b9fb70a..7d78b6258c 100644
--- a/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/AuthenticationEntryPoint.java
@@ -24,30 +24,31 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Used by {@link ExceptionTranslationFilter} to commence an authentication scheme.
  *
  * @author Ben Alex
  */
 public interface AuthenticationEntryPoint {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Commences an authentication scheme.
-     * <p>
-     * <code>ExceptionTranslationFilter</code> will populate the <code>HttpSession</code> attribute named
-     * <code>AbstractAuthenticationProcessingFilter.SPRING_SECURITY_SAVED_REQUEST_KEY</code> with the requested target URL before
-     * calling this method.
-     * <p>
-     * Implementations should modify the headers on the <code>ServletResponse</code> as necessary to
-     * commence the authentication process.
-     *
-     * @param request that resulted in an <code>AuthenticationException</code>
-     * @param response so that the user agent can begin authentication
-     * @param authException that caused the invocation
-     *
-     */
-    void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
-        throws IOException, ServletException;
+	/**
+	 * Commences an authentication scheme.
+	 * <p>
+	 * <code>ExceptionTranslationFilter</code> will populate the <code>HttpSession</code>
+	 * attribute named
+	 * <code>AbstractAuthenticationProcessingFilter.SPRING_SECURITY_SAVED_REQUEST_KEY</code>
+	 * with the requested target URL before calling this method.
+	 * <p>
+	 * Implementations should modify the headers on the <code>ServletResponse</code> as
+	 * necessary to commence the authentication process.
+	 *
+	 * @param request that resulted in an <code>AuthenticationException</code>
+	 * @param response so that the user agent can begin authentication
+	 * @param authException that caused the invocation
+	 *
+	 */
+	void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException;
 }
diff --git a/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java b/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java
index c9a8f48dde..727c3b5617 100644
--- a/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/DefaultRedirectStrategy.java
@@ -10,68 +10,72 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.web.util.UrlUtils;
 
 /**
- * Simple implementation of <tt>RedirectStrategy</tt> which is the default used throughout the framework.
+ * Simple implementation of <tt>RedirectStrategy</tt> which is the default used throughout
+ * the framework.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class DefaultRedirectStrategy implements RedirectStrategy {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private boolean contextRelative;
+	private boolean contextRelative;
 
-    /**
-     * Redirects the response to the supplied URL.
-     * <p>
-     * If <tt>contextRelative</tt> is set, the redirect value will be the value after the request context path. Note
-     * that this will result in the loss of protocol information (HTTP or HTTPS), so will cause problems if a
-     * redirect is being performed to change to HTTPS, for example.
-     */
-    public void sendRedirect(HttpServletRequest request, HttpServletResponse response, String url) throws IOException {
-        String redirectUrl = calculateRedirectUrl(request.getContextPath(), url);
-        redirectUrl = response.encodeRedirectURL(redirectUrl);
+	/**
+	 * Redirects the response to the supplied URL.
+	 * <p>
+	 * If <tt>contextRelative</tt> is set, the redirect value will be the value after the
+	 * request context path. Note that this will result in the loss of protocol
+	 * information (HTTP or HTTPS), so will cause problems if a redirect is being
+	 * performed to change to HTTPS, for example.
+	 */
+	public void sendRedirect(HttpServletRequest request, HttpServletResponse response,
+			String url) throws IOException {
+		String redirectUrl = calculateRedirectUrl(request.getContextPath(), url);
+		redirectUrl = response.encodeRedirectURL(redirectUrl);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Redirecting to '" + redirectUrl + "'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Redirecting to '" + redirectUrl + "'");
+		}
 
-        response.sendRedirect(redirectUrl);
-    }
+		response.sendRedirect(redirectUrl);
+	}
 
-    private String calculateRedirectUrl(String contextPath, String url) {
-        if (!UrlUtils.isAbsoluteUrl(url)) {
-            if (contextRelative) {
-                return url;
-            } else {
-                return contextPath + url;
-            }
-        }
+	private String calculateRedirectUrl(String contextPath, String url) {
+		if (!UrlUtils.isAbsoluteUrl(url)) {
+			if (contextRelative) {
+				return url;
+			}
+			else {
+				return contextPath + url;
+			}
+		}
 
-        // Full URL, including http(s)://
+		// Full URL, including http(s)://
 
-        if (!contextRelative) {
-            return url;
-        }
+		if (!contextRelative) {
+			return url;
+		}
 
-        // Calculate the relative URL from the fully qualified URL, minus the last
-        // occurrence of the scheme and base context.
-        url = url.substring(url.lastIndexOf("://") + 3); // strip off scheme
-        url = url.substring(url.indexOf(contextPath) + contextPath.length());
+		// Calculate the relative URL from the fully qualified URL, minus the last
+		// occurrence of the scheme and base context.
+		url = url.substring(url.lastIndexOf("://") + 3); // strip off scheme
+		url = url.substring(url.indexOf(contextPath) + contextPath.length());
 
-        if (url.length() > 1 && url.charAt(0) == '/') {
-            url = url.substring(1);
-        }
+		if (url.length() > 1 && url.charAt(0) == '/') {
+			url = url.substring(1);
+		}
 
-        return url;
-    }
+		return url;
+	}
 
-    /**
-     * If <tt>true</tt>, causes any redirection URLs to be calculated minus the protocol
-     * and context path (defaults to <tt>false</tt>).
-     */
-    public void setContextRelative(boolean useRelativeContext) {
-        this.contextRelative = useRelativeContext;
-    }
+	/**
+	 * If <tt>true</tt>, causes any redirection URLs to be calculated minus the protocol
+	 * and context path (defaults to <tt>false</tt>).
+	 */
+	public void setContextRelative(boolean useRelativeContext) {
+		this.contextRelative = useRelativeContext;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java
index 2f1f49849a..632b2d32d3 100644
--- a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java
+++ b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java
@@ -16,34 +16,34 @@ import java.util.*;
  * @since 3.1
  */
 public final class DefaultSecurityFilterChain implements SecurityFilterChain {
-    private static final Log logger = LogFactory.getLog(DefaultSecurityFilterChain.class);
-    private final RequestMatcher requestMatcher;
-    private final List<Filter> filters;
+	private static final Log logger = LogFactory.getLog(DefaultSecurityFilterChain.class);
+	private final RequestMatcher requestMatcher;
+	private final List<Filter> filters;
 
-    public DefaultSecurityFilterChain(RequestMatcher requestMatcher, Filter... filters) {
-        this(requestMatcher, Arrays.asList(filters));
-    }
+	public DefaultSecurityFilterChain(RequestMatcher requestMatcher, Filter... filters) {
+		this(requestMatcher, Arrays.asList(filters));
+	}
 
-    public DefaultSecurityFilterChain(RequestMatcher requestMatcher, List<Filter> filters) {
-        logger.info("Creating filter chain: " + requestMatcher + ", " + filters);
-        this.requestMatcher = requestMatcher;
-        this.filters = new ArrayList<Filter>(filters);
-    }
+	public DefaultSecurityFilterChain(RequestMatcher requestMatcher, List<Filter> filters) {
+		logger.info("Creating filter chain: " + requestMatcher + ", " + filters);
+		this.requestMatcher = requestMatcher;
+		this.filters = new ArrayList<Filter>(filters);
+	}
 
-    public RequestMatcher getRequestMatcher() {
-        return requestMatcher;
-    }
+	public RequestMatcher getRequestMatcher() {
+		return requestMatcher;
+	}
 
-    public List<Filter> getFilters() {
-        return filters;
-    }
+	public List<Filter> getFilters() {
+		return filters;
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        return requestMatcher.matches(request);
-    }
+	public boolean matches(HttpServletRequest request) {
+		return requestMatcher.matches(request);
+	}
 
-    @Override
-    public String toString() {
-        return "[ " + requestMatcher + ", " + filters + "]";
-    }
+	@Override
+	public String toString() {
+		return "[ " + requestMatcher + ", " + filters + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
index 60c68bbf7c..19ffa9941f 100644
--- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
+++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
@@ -36,82 +36,94 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
 
-
 /**
- * Delegates {@code Filter} requests to a list of Spring-managed filter beans.
- * As of version 2.0, you shouldn't need to explicitly configure a {@code FilterChainProxy} bean in your application
- * context unless you need very fine control over the filter chain contents. Most cases should be adequately covered
- * by the default {@code &lt;security:http /&gt;} namespace configuration options.
+ * Delegates {@code Filter} requests to a list of Spring-managed filter beans. As of
+ * version 2.0, you shouldn't need to explicitly configure a {@code FilterChainProxy} bean
+ * in your application context unless you need very fine control over the filter chain
+ * contents. Most cases should be adequately covered by the default
+ * {@code &lt;security:http /&gt;} namespace configuration options.
  * <p>
- * The {@code FilterChainProxy} is linked into the servlet container filter chain by adding a standard
- * Spring {@link DelegatingFilterProxy} declaration in the application {@code web.xml} file.
+ * The {@code FilterChainProxy} is linked into the servlet container filter chain by
+ * adding a standard Spring {@link DelegatingFilterProxy} declaration in the application
+ * {@code web.xml} file.
  *
  * <h2>Configuration</h2>
  * <p>
- * As of version 3.1, {@code FilterChainProxy} is configured using a list of {@link SecurityFilterChain} instances,
- * each of which contains a {@link RequestMatcher} and a list of filters which should be applied to matching requests.
- * Most applications will only contain a single filter chain, and if you are using the namespace, you don't have to
- * set the chains explicitly. If you require finer-grained control, you can make use of the {@code &lt;filter-chain&gt;}
- * namespace element. This defines a URI pattern and the list of filters (as comma-separated bean names) which should be
- * applied to requests which match the pattern. An example configuration might look like this:
+ * As of version 3.1, {@code FilterChainProxy} is configured using a list of
+ * {@link SecurityFilterChain} instances, each of which contains a {@link RequestMatcher}
+ * and a list of filters which should be applied to matching requests. Most applications
+ * will only contain a single filter chain, and if you are using the namespace, you don't
+ * have to set the chains explicitly. If you require finer-grained control, you can make
+ * use of the {@code &lt;filter-chain&gt;} namespace element. This defines a URI pattern
+ * and the list of filters (as comma-separated bean names) which should be applied to
+ * requests which match the pattern. An example configuration might look like this:
  *
  * <pre>
- &lt;bean id="myfilterChainProxy" class="org.springframework.security.util.FilterChainProxy">
-     &lt;constructor-arg>
-         &lt;util:list>
-             &lt;security:filter-chain pattern="/do/not/filter*" filters="none"/>
-             &lt;security:filter-chain pattern="/**" filters="filter1,filter2,filter3"/>
-         &lt;/util:list>
-     &lt;/constructor-arg>
- &lt;/bean>
+ *  &lt;bean id="myfilterChainProxy" class="org.springframework.security.util.FilterChainProxy">
+ *      &lt;constructor-arg>
+ *          &lt;util:list>
+ *              &lt;security:filter-chain pattern="/do/not/filter*" filters="none"/>
+ *              &lt;security:filter-chain pattern="/**" filters="filter1,filter2,filter3"/>
+ *          &lt;/util:list>
+ *      &lt;/constructor-arg>
+ *  &lt;/bean>
  * </pre>
  *
- * The names "filter1", "filter2", "filter3" should be the bean names of {@code Filter} instances defined in the
- * application context. The order of the names defines the order in which the filters will be applied. As shown above,
- * use of the value "none" for the "filters" can be used to exclude a request pattern from the security filter chain
- * entirely. Please consult the security namespace schema file for a full list of available configuration options.
+ * The names "filter1", "filter2", "filter3" should be the bean names of {@code Filter}
+ * instances defined in the application context. The order of the names defines the order
+ * in which the filters will be applied. As shown above, use of the value "none" for the
+ * "filters" can be used to exclude a request pattern from the security filter chain
+ * entirely. Please consult the security namespace schema file for a full list of
+ * available configuration options.
  *
  * <h2>Request Handling</h2>
  * <p>
  * Each possible pattern that the {@code FilterChainProxy} should service must be entered.
- * The first match for a given request will be used to define all of the {@code Filter}s that apply to that
- * request. This means you must put most specific matches at the top of the list, and ensure all {@code Filter}s
- * that should apply for a given matcher are entered against the respective entry.
- * The {@code FilterChainProxy} will not iterate through the remainder of the map entries to locate additional
- * {@code Filter}s.
+ * The first match for a given request will be used to define all of the {@code Filter}s
+ * that apply to that request. This means you must put most specific matches at the top of
+ * the list, and ensure all {@code Filter}s that should apply for a given matcher are
+ * entered against the respective entry. The {@code FilterChainProxy} will not iterate
+ * through the remainder of the map entries to locate additional {@code Filter}s.
  * <p>
- * {@code FilterChainProxy} respects normal handling of {@code Filter}s that elect not to call {@link
- * javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse,
- * javax.servlet.FilterChain)}, in that the remainder of the original or {@code FilterChainProxy}-declared filter
+ * {@code FilterChainProxy} respects normal handling of {@code Filter}s that elect not to
+ * call
+ * {@link javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)}
+ * , in that the remainder of the original or {@code FilterChainProxy}-declared filter
  * chain will not be called.
  *
  * <h3>Request Firewalling</h3>
  *
- * An {@link HttpFirewall} instance is used to validate incoming requests and create a wrapped request which provides
- * consistent path values for matching against. See {@link DefaultHttpFirewall}, for more information on the type of
- * attacks which the default implementation protects against. A custom implementation can be injected to provide
- * stricter control over the request contents or if an application needs to support certain types of request which
- * are rejected by default.
+ * An {@link HttpFirewall} instance is used to validate incoming requests and create a
+ * wrapped request which provides consistent path values for matching against. See
+ * {@link DefaultHttpFirewall}, for more information on the type of attacks which the
+ * default implementation protects against. A custom implementation can be injected to
+ * provide stricter control over the request contents or if an application needs to
+ * support certain types of request which are rejected by default.
  * <p>
- * Note that this means that you must use the Spring Security filters in combination with a {@code FilterChainProxy}
- * if you want this protection. Don't define them explicitly in your {@code web.xml} file.
+ * Note that this means that you must use the Spring Security filters in combination with
+ * a {@code FilterChainProxy} if you want this protection. Don't define them explicitly in
+ * your {@code web.xml} file.
  * <p>
- * {@code FilterChainProxy} will use the firewall instance to obtain both request and response objects which will be
- * fed down the filter chain, so it is also possible to use this functionality to control the functionality of the
- * response. When the request has passed through the security filter chain, the {@code reset} method will be called.
- * With the default implementation this means that the original values of {@code servletPath} and {@code pathInfo} will
- * be returned thereafter, instead of the modified ones used for security pattern matching.
+ * {@code FilterChainProxy} will use the firewall instance to obtain both request and
+ * response objects which will be fed down the filter chain, so it is also possible to use
+ * this functionality to control the functionality of the response. When the request has
+ * passed through the security filter chain, the {@code reset} method will be called. With
+ * the default implementation this means that the original values of {@code servletPath}
+ * and {@code pathInfo} will be returned thereafter, instead of the modified ones used for
+ * security pattern matching.
  * <p>
- * Since this additional wrapping functionality is performed by the {@code FilterChainProxy}, we don't recommend that
- * you use multiple instances in the same filter chain. It shouldn't be considered purely as a utility for wrapping
- * filter beans in a single {@code Filter} instance.
+ * Since this additional wrapping functionality is performed by the
+ * {@code FilterChainProxy}, we don't recommend that you use multiple instances in the
+ * same filter chain. It shouldn't be considered purely as a utility for wrapping filter
+ * beans in a single {@code Filter} instance.
  *
  * <h2>Filter Lifecycle</h2>
  * <p>
  * Note the {@code Filter} lifecycle mismatch between the servlet container and IoC
- * container. As described in the {@link DelegatingFilterProxy} Javadocs, we recommend you allow the IoC
- * container to manage the lifecycle instead of the servlet container. {@code FilterChainProxy} does not invoke the
- * standard filter lifecycle methods on any filter beans that you add to the application context.
+ * container. As described in the {@link DelegatingFilterProxy} Javadocs, we recommend you
+ * allow the IoC container to manage the lifecycle instead of the servlet container.
+ * {@code FilterChainProxy} does not invoke the standard filter lifecycle methods on any
+ * filter beans that you add to the application context.
  *
  * @author Carlos Sanchez
  * @author Ben Alex
@@ -119,197 +131,214 @@ import java.util.*;
  * @author Rob Winch
  */
 public class FilterChainProxy extends GenericFilterBean {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(FilterChainProxy.class);
+	private static final Log logger = LogFactory.getLog(FilterChainProxy.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final static String FILTER_APPLIED = FilterChainProxy.class.getName().concat(".APPLIED");
+	private final static String FILTER_APPLIED = FilterChainProxy.class.getName().concat(
+			".APPLIED");
 
-    private List<SecurityFilterChain> filterChains;
+	private List<SecurityFilterChain> filterChains;
 
-    private FilterChainValidator filterChainValidator = new NullFilterChainValidator();
+	private FilterChainValidator filterChainValidator = new NullFilterChainValidator();
 
-    private HttpFirewall firewall = new DefaultHttpFirewall();
+	private HttpFirewall firewall = new DefaultHttpFirewall();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public FilterChainProxy() {
-    }
+	public FilterChainProxy() {
+	}
 
-    public FilterChainProxy(SecurityFilterChain chain) {
-        this(Arrays.asList(chain));
-    }
+	public FilterChainProxy(SecurityFilterChain chain) {
+		this(Arrays.asList(chain));
+	}
 
-    public FilterChainProxy(List<SecurityFilterChain> filterChains) {
-        this.filterChains = filterChains;
-    }
+	public FilterChainProxy(List<SecurityFilterChain> filterChains) {
+		this.filterChains = filterChains;
+	}
 
-    @Override
-    public void afterPropertiesSet() {
-        filterChainValidator.validate(this);
-    }
+	@Override
+	public void afterPropertiesSet() {
+		filterChainValidator.validate(this);
+	}
 
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
-        boolean clearContext = request.getAttribute(FILTER_APPLIED) == null;
-        if(clearContext) {
-            try {
-                request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
-                doFilterInternal(request, response, chain);
-            } finally {
-                SecurityContextHolder.clearContext();
-                request.removeAttribute(FILTER_APPLIED);
-            }
-        } else {
-            doFilterInternal(request, response, chain);
-        }
-    }
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		boolean clearContext = request.getAttribute(FILTER_APPLIED) == null;
+		if (clearContext) {
+			try {
+				request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
+				doFilterInternal(request, response, chain);
+			}
+			finally {
+				SecurityContextHolder.clearContext();
+				request.removeAttribute(FILTER_APPLIED);
+			}
+		}
+		else {
+			doFilterInternal(request, response, chain);
+		}
+	}
 
-    private void doFilterInternal(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+	private void doFilterInternal(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
 
-        FirewalledRequest fwRequest = firewall.getFirewalledRequest((HttpServletRequest) request);
-        HttpServletResponse fwResponse = firewall.getFirewalledResponse((HttpServletResponse) response);
+		FirewalledRequest fwRequest = firewall
+				.getFirewalledRequest((HttpServletRequest) request);
+		HttpServletResponse fwResponse = firewall
+				.getFirewalledResponse((HttpServletResponse) response);
 
-        List<Filter> filters = getFilters(fwRequest);
+		List<Filter> filters = getFilters(fwRequest);
 
-        if (filters == null || filters.size() == 0) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(UrlUtils.buildRequestUrl(fwRequest) +
-                        (filters == null ? " has no matching filters" : " has an empty filter list"));
-            }
+		if (filters == null || filters.size() == 0) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(UrlUtils.buildRequestUrl(fwRequest)
+						+ (filters == null ? " has no matching filters"
+								: " has an empty filter list"));
+			}
 
-            fwRequest.reset();
+			fwRequest.reset();
 
-            chain.doFilter(fwRequest, fwResponse);
+			chain.doFilter(fwRequest, fwResponse);
 
-            return;
-        }
+			return;
+		}
 
-        VirtualFilterChain vfc = new VirtualFilterChain(fwRequest, chain, filters);
-        vfc.doFilter(fwRequest, fwResponse);
-    }
+		VirtualFilterChain vfc = new VirtualFilterChain(fwRequest, chain, filters);
+		vfc.doFilter(fwRequest, fwResponse);
+	}
 
-    /**
-     * Returns the first filter chain matching the supplied URL.
-     *
-     * @param request the request to match
-     * @return an ordered array of Filters defining the filter chain
-     */
-    private List<Filter> getFilters(HttpServletRequest request)  {
-        for (SecurityFilterChain chain : filterChains) {
-            if (chain.matches(request)) {
-                return chain.getFilters();
-            }
-        }
+	/**
+	 * Returns the first filter chain matching the supplied URL.
+	 *
+	 * @param request the request to match
+	 * @return an ordered array of Filters defining the filter chain
+	 */
+	private List<Filter> getFilters(HttpServletRequest request) {
+		for (SecurityFilterChain chain : filterChains) {
+			if (chain.matches(request)) {
+				return chain.getFilters();
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Convenience method, mainly for testing.
-     *
-     * @param url the URL
-     * @return matching filter list
-     */
-    public List<Filter> getFilters(String url) {
-        return getFilters(firewall.getFirewalledRequest((new FilterInvocation(url, null).getRequest())));
-    }
+	/**
+	 * Convenience method, mainly for testing.
+	 *
+	 * @param url the URL
+	 * @return matching filter list
+	 */
+	public List<Filter> getFilters(String url) {
+		return getFilters(firewall.getFirewalledRequest((new FilterInvocation(url, null)
+				.getRequest())));
+	}
 
-    /**
-     * @return the list of {@code SecurityFilterChain}s which will be matched against and
-     *         applied to incoming requests.
-     */
-    public List<SecurityFilterChain> getFilterChains() {
-        return Collections.unmodifiableList(filterChains);
-    }
+	/**
+	 * @return the list of {@code SecurityFilterChain}s which will be matched against and
+	 * applied to incoming requests.
+	 */
+	public List<SecurityFilterChain> getFilterChains() {
+		return Collections.unmodifiableList(filterChains);
+	}
 
-    /**
-     * Used (internally) to specify a validation strategy for the filters in each configured chain.
-     *
-     * @param filterChainValidator the validator instance which will be invoked on during initialization
-     * to check the {@code FilterChainProxy} instance.
-     */
-    public void setFilterChainValidator(FilterChainValidator filterChainValidator) {
-        this.filterChainValidator = filterChainValidator;
-    }
+	/**
+	 * Used (internally) to specify a validation strategy for the filters in each
+	 * configured chain.
+	 *
+	 * @param filterChainValidator the validator instance which will be invoked on during
+	 * initialization to check the {@code FilterChainProxy} instance.
+	 */
+	public void setFilterChainValidator(FilterChainValidator filterChainValidator) {
+		this.filterChainValidator = filterChainValidator;
+	}
 
-    /**
-     * Sets the "firewall" implementation which will be used to validate and wrap (or potentially reject) the
-     * incoming requests. The default implementation should be satisfactory for most requirements.
-     *
-     * @param firewall
-     */
-    public void setFirewall(HttpFirewall firewall) {
-        this.firewall = firewall;
-    }
+	/**
+	 * Sets the "firewall" implementation which will be used to validate and wrap (or
+	 * potentially reject) the incoming requests. The default implementation should be
+	 * satisfactory for most requirements.
+	 *
+	 * @param firewall
+	 */
+	public void setFirewall(HttpFirewall firewall) {
+		this.firewall = firewall;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("FilterChainProxy[");
-        sb.append("Filter Chains: ");
-        sb.append(filterChains);
-        sb.append("]");
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("FilterChainProxy[");
+		sb.append("Filter Chains: ");
+		sb.append(filterChains);
+		sb.append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    /**
-     * Internal {@code FilterChain} implementation that is used to pass a request through the additional
-     * internal list of filters which match the request.
-     */
-    private static class VirtualFilterChain implements FilterChain {
-        private final FilterChain originalChain;
-        private final List<Filter> additionalFilters;
-        private final FirewalledRequest firewalledRequest;
-        private final int size;
-        private int currentPosition = 0;
+	/**
+	 * Internal {@code FilterChain} implementation that is used to pass a request through
+	 * the additional internal list of filters which match the request.
+	 */
+	private static class VirtualFilterChain implements FilterChain {
+		private final FilterChain originalChain;
+		private final List<Filter> additionalFilters;
+		private final FirewalledRequest firewalledRequest;
+		private final int size;
+		private int currentPosition = 0;
 
-        private VirtualFilterChain(FirewalledRequest firewalledRequest, FilterChain chain, List<Filter> additionalFilters) {
-            this.originalChain = chain;
-            this.additionalFilters = additionalFilters;
-            this.size = additionalFilters.size();
-            this.firewalledRequest = firewalledRequest;
-        }
+		private VirtualFilterChain(FirewalledRequest firewalledRequest,
+				FilterChain chain, List<Filter> additionalFilters) {
+			this.originalChain = chain;
+			this.additionalFilters = additionalFilters;
+			this.size = additionalFilters.size();
+			this.firewalledRequest = firewalledRequest;
+		}
 
-        public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-            if (currentPosition == size) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug(UrlUtils.buildRequestUrl(firewalledRequest)
-                            + " reached end of additional filter chain; proceeding with original chain");
-                }
+		public void doFilter(ServletRequest request, ServletResponse response)
+				throws IOException, ServletException {
+			if (currentPosition == size) {
+				if (logger.isDebugEnabled()) {
+					logger.debug(UrlUtils.buildRequestUrl(firewalledRequest)
+							+ " reached end of additional filter chain; proceeding with original chain");
+				}
 
-                // Deactivate path stripping as we exit the security filter chain
-                this.firewalledRequest.reset();
+				// Deactivate path stripping as we exit the security filter chain
+				this.firewalledRequest.reset();
 
-                originalChain.doFilter(request, response);
-            } else {
-                currentPosition++;
+				originalChain.doFilter(request, response);
+			}
+			else {
+				currentPosition++;
 
-                Filter nextFilter = additionalFilters.get(currentPosition - 1);
+				Filter nextFilter = additionalFilters.get(currentPosition - 1);
 
-                if (logger.isDebugEnabled()) {
-                    logger.debug(UrlUtils.buildRequestUrl(firewalledRequest) + " at position " + currentPosition + " of "
-                        + size + " in additional filter chain; firing Filter: '"
-                        + nextFilter.getClass().getSimpleName() + "'");
-                }
+				if (logger.isDebugEnabled()) {
+					logger.debug(UrlUtils.buildRequestUrl(firewalledRequest)
+							+ " at position " + currentPosition + " of " + size
+							+ " in additional filter chain; firing Filter: '"
+							+ nextFilter.getClass().getSimpleName() + "'");
+				}
 
-                nextFilter.doFilter(request, response, this);
-            }
-        }
-    }
+				nextFilter.doFilter(request, response, this);
+			}
+		}
+	}
 
-    public interface FilterChainValidator {
-        void validate(FilterChainProxy filterChainProxy);
-    }
+	public interface FilterChainValidator {
+		void validate(FilterChainProxy filterChainProxy);
+	}
 
-    private class NullFilterChainValidator implements FilterChainValidator {
-        public void validate(FilterChainProxy filterChainProxy) {
-        }
-    }
+	private class NullFilterChainValidator implements FilterChainValidator {
+		public void validate(FilterChainProxy filterChainProxy) {
+		}
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
index 2499ba7c22..6046b0fabe 100644
--- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java
+++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
@@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.web.util.UrlUtils;
 
-
 /**
- * Holds objects associated with a HTTP filter.<P>Guarantees the request and response are instances of
- * <code>HttpServletRequest</code> and <code>HttpServletResponse</code>, and that there are no <code>null</code>
- * objects.
+ * Holds objects associated with a HTTP filter.
+ * <P>
+ * Guarantees the request and response are instances of <code>HttpServletRequest</code>
+ * and <code>HttpServletResponse</code>, and that there are no <code>null</code> objects.
  * <p>
- * Required so that security system classes can obtain access to the filter environment, as well as the request
- * and response.
+ * Required so that security system classes can obtain access to the filter environment,
+ * as well as the request and response.
  *
  * @author Ben Alex
  * @author colin sampaleanu
@@ -46,167 +46,177 @@ import org.springframework.security.web.util.UrlUtils;
  * @author Rob Winch
  */
 public class FilterInvocation {
-    //~ Static fields ==================================================================================================
-    static final FilterChain DUMMY_CHAIN = new FilterChain() {
-        public void doFilter(ServletRequest req, ServletResponse res) throws IOException, ServletException {
-            throw new UnsupportedOperationException("Dummy filter chain");
-        }
-    };
+	// ~ Static fields
+	// ==================================================================================================
+	static final FilterChain DUMMY_CHAIN = new FilterChain() {
+		public void doFilter(ServletRequest req, ServletResponse res) throws IOException,
+				ServletException {
+			throw new UnsupportedOperationException("Dummy filter chain");
+		}
+	};
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private FilterChain chain;
-    private HttpServletRequest request;
-    private HttpServletResponse response;
+	private FilterChain chain;
+	private HttpServletRequest request;
+	private HttpServletResponse response;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public FilterInvocation(ServletRequest request, ServletResponse response, FilterChain chain) {
-        if ((request == null) || (response == null) || (chain == null)) {
-            throw new IllegalArgumentException("Cannot pass null values to constructor");
-        }
+	public FilterInvocation(ServletRequest request, ServletResponse response,
+			FilterChain chain) {
+		if ((request == null) || (response == null) || (chain == null)) {
+			throw new IllegalArgumentException("Cannot pass null values to constructor");
+		}
 
-        this.request = (HttpServletRequest) request;
-        this.response = (HttpServletResponse) response;
-        this.chain = chain;
-    }
+		this.request = (HttpServletRequest) request;
+		this.response = (HttpServletResponse) response;
+		this.chain = chain;
+	}
 
-    public FilterInvocation(String servletPath, String method) {
-        this(null, servletPath, method);
-    }
+	public FilterInvocation(String servletPath, String method) {
+		this(null, servletPath, method);
+	}
 
-    public FilterInvocation(String contextPath, String servletPath, String method) {
-        this(contextPath, servletPath, null, null, method);
-    }
+	public FilterInvocation(String contextPath, String servletPath, String method) {
+		this(contextPath, servletPath, null, null, method);
+	}
 
-    public FilterInvocation(String contextPath, String servletPath, String pathInfo, String query, String method) {
-        DummyRequest request = new DummyRequest();
-        if (contextPath == null) {
-            contextPath = "/cp";
-        }
-        request.setContextPath(contextPath);
-        request.setServletPath(servletPath);
-        request.setRequestURI(contextPath + servletPath + (pathInfo == null ? "" : pathInfo));
-        request.setPathInfo(pathInfo);
-        request.setQueryString(query);
-        request.setMethod(method);
-        this.request = request;
-    }
+	public FilterInvocation(String contextPath, String servletPath, String pathInfo,
+			String query, String method) {
+		DummyRequest request = new DummyRequest();
+		if (contextPath == null) {
+			contextPath = "/cp";
+		}
+		request.setContextPath(contextPath);
+		request.setServletPath(servletPath);
+		request.setRequestURI(contextPath + servletPath
+				+ (pathInfo == null ? "" : pathInfo));
+		request.setPathInfo(pathInfo);
+		request.setQueryString(query);
+		request.setMethod(method);
+		this.request = request;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public FilterChain getChain() {
-        return chain;
-    }
+	public FilterChain getChain() {
+		return chain;
+	}
 
-    /**
-     * Indicates the URL that the user agent used for this request.
-     * <p>
-     * The returned URL does <b>not</b> reflect the port number determined from a
-     * {@link org.springframework.security.web.PortResolver}.
-     *
-     * @return the full URL of this request
-     */
-    public String getFullRequestUrl() {
-        return UrlUtils.buildFullRequestUrl(request);
-    }
+	/**
+	 * Indicates the URL that the user agent used for this request.
+	 * <p>
+	 * The returned URL does <b>not</b> reflect the port number determined from a
+	 * {@link org.springframework.security.web.PortResolver}.
+	 *
+	 * @return the full URL of this request
+	 */
+	public String getFullRequestUrl() {
+		return UrlUtils.buildFullRequestUrl(request);
+	}
 
-    public HttpServletRequest getHttpRequest() {
-        return request;
-    }
+	public HttpServletRequest getHttpRequest() {
+		return request;
+	}
 
-    public HttpServletResponse getHttpResponse() {
-        return response;
-    }
+	public HttpServletResponse getHttpResponse() {
+		return response;
+	}
 
-    /**
-     * Obtains the web application-specific fragment of the URL.
-     *
-     * @return the URL, excluding any server name, context path or servlet path
-     */
-    public String getRequestUrl() {
-        return UrlUtils.buildRequestUrl(request);
-    }
+	/**
+	 * Obtains the web application-specific fragment of the URL.
+	 *
+	 * @return the URL, excluding any server name, context path or servlet path
+	 */
+	public String getRequestUrl() {
+		return UrlUtils.buildRequestUrl(request);
+	}
 
-    public HttpServletRequest getRequest() {
-        return getHttpRequest();
-    }
+	public HttpServletRequest getRequest() {
+		return getHttpRequest();
+	}
 
-    public HttpServletResponse getResponse() {
-        return getHttpResponse();
-    }
+	public HttpServletResponse getResponse() {
+		return getHttpResponse();
+	}
 
-    public String toString() {
-        return "FilterInvocation: URL: " + getRequestUrl();
-    }
+	public String toString() {
+		return "FilterInvocation: URL: " + getRequestUrl();
+	}
 }
 
 class DummyRequest extends HttpServletRequestWrapper {
-    private static final HttpServletRequest UNSUPPORTED_REQUEST = (HttpServletRequest) Proxy.newProxyInstance(
-            DummyRequest.class.getClassLoader(), new Class[] { HttpServletRequest.class }, new UnsupportedOperationExceptionInvocationHandler());
+	private static final HttpServletRequest UNSUPPORTED_REQUEST = (HttpServletRequest) Proxy
+			.newProxyInstance(DummyRequest.class.getClassLoader(),
+					new Class[] { HttpServletRequest.class },
+					new UnsupportedOperationExceptionInvocationHandler());
 
-    private String requestURI;
-    private String contextPath = "";
-    private String servletPath;
-    private String pathInfo;
-    private String queryString;
-    private String method;
+	private String requestURI;
+	private String contextPath = "";
+	private String servletPath;
+	private String pathInfo;
+	private String queryString;
+	private String method;
 
-    public DummyRequest() {
-        super(UNSUPPORTED_REQUEST);
-    }
+	public DummyRequest() {
+		super(UNSUPPORTED_REQUEST);
+	}
 
-    public void setRequestURI(String requestURI) {
-        this.requestURI = requestURI;
-    }
+	public void setRequestURI(String requestURI) {
+		this.requestURI = requestURI;
+	}
 
-    public void setPathInfo(String pathInfo) {
-        this.pathInfo = pathInfo;
-    }
+	public void setPathInfo(String pathInfo) {
+		this.pathInfo = pathInfo;
+	}
 
-    public String getRequestURI() {
-        return requestURI;
-    }
+	public String getRequestURI() {
+		return requestURI;
+	}
 
-    public void setContextPath(String contextPath) {
-        this.contextPath = contextPath;
-    }
+	public void setContextPath(String contextPath) {
+		this.contextPath = contextPath;
+	}
 
-    public String getContextPath() {
-        return contextPath;
-    }
+	public String getContextPath() {
+		return contextPath;
+	}
 
-    public void setServletPath(String servletPath) {
-        this.servletPath = servletPath;
-    }
+	public void setServletPath(String servletPath) {
+		this.servletPath = servletPath;
+	}
 
-    public String getServletPath() {
-        return servletPath;
-    }
+	public String getServletPath() {
+		return servletPath;
+	}
 
-    public void setMethod(String method) {
-        this.method = method;
-    }
+	public void setMethod(String method) {
+		this.method = method;
+	}
 
-    public String getMethod() {
-        return method;
-    }
+	public String getMethod() {
+		return method;
+	}
 
-    public String getPathInfo() {
-        return pathInfo;
-    }
+	public String getPathInfo() {
+		return pathInfo;
+	}
 
-    public String getQueryString() {
-        return queryString;
-    }
+	public String getQueryString() {
+		return queryString;
+	}
 
-    public void setQueryString(String queryString) {
-        this.queryString = queryString;
-    }
+	public void setQueryString(String queryString) {
+		this.queryString = queryString;
+	}
 }
 
 final class UnsupportedOperationExceptionInvocationHandler implements InvocationHandler {
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        throw new UnsupportedOperationException(method + " is not supported");
-    }
+	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+		throw new UnsupportedOperationException(method + " is not supported");
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/PortMapper.java b/web/src/main/java/org/springframework/security/web/PortMapper.java
index e67c6c59cf..b943aad6aa 100644
--- a/web/src/main/java/org/springframework/security/web/PortMapper.java
+++ b/web/src/main/java/org/springframework/security/web/PortMapper.java
@@ -16,30 +16,36 @@
 package org.springframework.security.web;
 
 /**
- * <code>PortMapper</code> implementations provide callers with information
- * about which HTTP ports are associated with which HTTPS ports on the system,
- * and vice versa.
+ * <code>PortMapper</code> implementations provide callers with information about which
+ * HTTP ports are associated with which HTTPS ports on the system, and vice versa.
  *
  * @author Ben Alex
  */
 public interface PortMapper {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Locates the HTTP port associated with the specified HTTPS port.<P>Returns <code>null</code> if unknown.</p>
-     *
-     * @param httpsPort
-     *
-     * @return the HTTP port or <code>null</code> if unknown
-     */
-    Integer lookupHttpPort(Integer httpsPort);
+	/**
+	 * Locates the HTTP port associated with the specified HTTPS port.
+	 * <P>
+	 * Returns <code>null</code> if unknown.
+	 * </p>
+	 *
+	 * @param httpsPort
+	 *
+	 * @return the HTTP port or <code>null</code> if unknown
+	 */
+	Integer lookupHttpPort(Integer httpsPort);
 
-    /**
-     * Locates the HTTPS port associated with the specified HTTP port.<P>Returns <code>null</code> if unknown.</p>
-     *
-     * @param httpPort
-     *
-     * @return the HTTPS port or <code>null</code> if unknown
-     */
-    Integer lookupHttpsPort(Integer httpPort);
+	/**
+	 * Locates the HTTPS port associated with the specified HTTP port.
+	 * <P>
+	 * Returns <code>null</code> if unknown.
+	 * </p>
+	 *
+	 * @param httpPort
+	 *
+	 * @return the HTTPS port or <code>null</code> if unknown
+	 */
+	Integer lookupHttpsPort(Integer httpPort);
 }
diff --git a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
index 31f79e0e69..74f20ee371 100644
--- a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
+++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
@@ -21,91 +21,101 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-
 /**
- * Concrete implementation of {@link PortMapper} that obtains HTTP:HTTPS pairs from the application context.
+ * Concrete implementation of {@link PortMapper} that obtains HTTP:HTTPS pairs from the
+ * application context.
  * <p>
- * By default the implementation will assume 80:443 and 8080:8443 are HTTP:HTTPS pairs respectively. If different pairs
- * are required, use {@link #setPortMappings(Map)}.
+ * By default the implementation will assume 80:443 and 8080:8443 are HTTP:HTTPS pairs
+ * respectively. If different pairs are required, use {@link #setPortMappings(Map)}.
  *
  * @author Ben Alex
  * @author colin sampaleanu
  */
 public class PortMapperImpl implements PortMapper {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final Map<Integer, Integer> httpsPortMappings;
+	private final Map<Integer, Integer> httpsPortMappings;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public PortMapperImpl() {
-        httpsPortMappings = new HashMap<Integer, Integer>();
-        httpsPortMappings.put(Integer.valueOf(80), Integer.valueOf(443));
-        httpsPortMappings.put(Integer.valueOf(8080), Integer.valueOf(8443));
-    }
+	public PortMapperImpl() {
+		httpsPortMappings = new HashMap<Integer, Integer>();
+		httpsPortMappings.put(Integer.valueOf(80), Integer.valueOf(443));
+		httpsPortMappings.put(Integer.valueOf(8080), Integer.valueOf(8443));
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the translated (Integer -> Integer) version of the original port mapping specified via
-     * setHttpsPortMapping()
-     */
-    public Map<Integer, Integer> getTranslatedPortMappings() {
-        return httpsPortMappings;
-    }
+	/**
+	 * Returns the translated (Integer -> Integer) version of the original port mapping
+	 * specified via setHttpsPortMapping()
+	 */
+	public Map<Integer, Integer> getTranslatedPortMappings() {
+		return httpsPortMappings;
+	}
 
-    public Integer lookupHttpPort(Integer httpsPort) {
-        for (Integer httpPort : httpsPortMappings.keySet()) {
-            if (httpsPortMappings.get(httpPort).equals(httpsPort)) {
-                return httpPort;
-            }
-        }
+	public Integer lookupHttpPort(Integer httpsPort) {
+		for (Integer httpPort : httpsPortMappings.keySet()) {
+			if (httpsPortMappings.get(httpPort).equals(httpsPort)) {
+				return httpPort;
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public Integer lookupHttpsPort(Integer httpPort) {
-        return httpsPortMappings.get(httpPort);
-    }
+	public Integer lookupHttpsPort(Integer httpPort) {
+		return httpsPortMappings.get(httpPort);
+	}
 
-    /**
-     * Set to override the default HTTP port to HTTPS port mappings of 80:443, and  8080:8443.
-     * In a Spring XML ApplicationContext, a definition would look something like this:
-     * <pre>
-     *  &lt;property name="portMappings">
-     *      &lt;map>
-     *          &lt;entry key="80">&lt;value>443&lt;/value>&lt;/entry>
-     *          &lt;entry key="8080">&lt;value>8443&lt;/value>&lt;/entry>
-     *      &lt;/map>
-     * &lt;/property></pre>
-     *
-     * @param newMappings A Map consisting of String keys and String values, where for each entry the key is the string
-     *        representation of an integer HTTP port number, and the value is the string representation of the
-     *        corresponding integer HTTPS port number.
-     *
-     * @throws IllegalArgumentException if input map does not consist of String keys and values, each representing an
-     *         integer port number in the range 1-65535 for that mapping.
-     */
-    public void setPortMappings(Map<String,String> newMappings) {
-        Assert.notNull(newMappings, "A valid list of HTTPS port mappings must be provided");
+	/**
+	 * Set to override the default HTTP port to HTTPS port mappings of 80:443, and
+	 * 8080:8443. In a Spring XML ApplicationContext, a definition would look something
+	 * like this:
+	 * 
+	 * <pre>
+	 *  &lt;property name="portMappings">
+	 *      &lt;map>
+	 *          &lt;entry key="80">&lt;value>443&lt;/value>&lt;/entry>
+	 *          &lt;entry key="8080">&lt;value>8443&lt;/value>&lt;/entry>
+	 *      &lt;/map>
+	 * &lt;/property>
+	 * </pre>
+	 *
+	 * @param newMappings A Map consisting of String keys and String values, where for
+	 * each entry the key is the string representation of an integer HTTP port number, and
+	 * the value is the string representation of the corresponding integer HTTPS port
+	 * number.
+	 *
+	 * @throws IllegalArgumentException if input map does not consist of String keys and
+	 * values, each representing an integer port number in the range 1-65535 for that
+	 * mapping.
+	 */
+	public void setPortMappings(Map<String, String> newMappings) {
+		Assert.notNull(newMappings,
+				"A valid list of HTTPS port mappings must be provided");
 
-        httpsPortMappings.clear();
+		httpsPortMappings.clear();
 
-        for (Map.Entry<String,String> entry : newMappings.entrySet()) {
-            Integer httpPort = Integer.valueOf(entry.getKey());
-            Integer httpsPort = Integer.valueOf(entry.getValue());
+		for (Map.Entry<String, String> entry : newMappings.entrySet()) {
+			Integer httpPort = Integer.valueOf(entry.getKey());
+			Integer httpsPort = Integer.valueOf(entry.getValue());
 
-            if ((httpPort.intValue() < 1) || (httpPort.intValue() > 65535) || (httpsPort.intValue() < 1)
-                || (httpsPort.intValue() > 65535)) {
-                throw new IllegalArgumentException("one or both ports out of legal range: " + httpPort + ", "
-                    + httpsPort);
-            }
+			if ((httpPort.intValue() < 1) || (httpPort.intValue() > 65535)
+					|| (httpsPort.intValue() < 1) || (httpsPort.intValue() > 65535)) {
+				throw new IllegalArgumentException(
+						"one or both ports out of legal range: " + httpPort + ", "
+								+ httpsPort);
+			}
 
-            httpsPortMappings.put(httpPort, httpsPort);
-        }
+			httpsPortMappings.put(httpPort, httpsPort);
+		}
 
-        if (httpsPortMappings.size() < 1) {
-            throw new IllegalArgumentException("must map at least one port");
-        }
-    }
+		if (httpsPortMappings.size() < 1) {
+			throw new IllegalArgumentException("must map at least one port");
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/PortResolver.java b/web/src/main/java/org/springframework/security/web/PortResolver.java
index 1fe42ae2e8..f91090c06c 100644
--- a/web/src/main/java/org/springframework/security/web/PortResolver.java
+++ b/web/src/main/java/org/springframework/security/web/PortResolver.java
@@ -17,29 +17,27 @@ package org.springframework.security.web;
 
 import javax.servlet.ServletRequest;
 
-
 /**
- * A <code>PortResolver</code> determines the port a web request was received
- * on.
+ * A <code>PortResolver</code> determines the port a web request was received on.
  *
  * <P>
- * This interface is necessary because
- * <code>ServletRequest.getServerPort()</code> may not return the correct port
- * in certain circumstances. For example, if the browser does not construct
- * the URL correctly after a redirect.
+ * This interface is necessary because <code>ServletRequest.getServerPort()</code> may not
+ * return the correct port in certain circumstances. For example, if the browser does not
+ * construct the URL correctly after a redirect.
  * </p>
  *
  * @author Ben Alex
  */
 public interface PortResolver {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Indicates the port the <code>ServletRequest</code> was received on.
-     *
-     * @param request that the method should lookup the port for
-     *
-     * @return the port the request was received on
-     */
-    int getServerPort(ServletRequest request);
+	/**
+	 * Indicates the port the <code>ServletRequest</code> was received on.
+	 *
+	 * @param request that the method should lookup the port for
+	 *
+	 * @return the port the request was received on
+	 */
+	int getServerPort(ServletRequest request);
 }
diff --git a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java
index 5ab5a31b8d..c68c3d7193 100644
--- a/web/src/main/java/org/springframework/security/web/PortResolverImpl.java
+++ b/web/src/main/java/org/springframework/security/web/PortResolverImpl.java
@@ -19,53 +19,57 @@ import org.springframework.util.Assert;
 
 import javax.servlet.ServletRequest;
 
-
 /**
- * Concrete implementation of {@link PortResolver} that obtains the port from <tt>ServletRequest.getServerPort()</tt>.
+ * Concrete implementation of {@link PortResolver} that obtains the port from
+ * <tt>ServletRequest.getServerPort()</tt>.
  * <p>
- * This class is capable of handling the IE bug which results in an
- * incorrect URL being presented in the header subsequent to a redirect to a different scheme and port where the port
- * is not a well-known number (ie 80 or 443). Handling involves detecting an incorrect response from
- * <code>ServletRequest.getServerPort()</code> for the scheme (eg a HTTP request on 8443) and then determining the
- * real server port (eg HTTP request is really on 8080). The map of valid ports is obtained from the configured
+ * This class is capable of handling the IE bug which results in an incorrect URL being
+ * presented in the header subsequent to a redirect to a different scheme and port where
+ * the port is not a well-known number (ie 80 or 443). Handling involves detecting an
+ * incorrect response from <code>ServletRequest.getServerPort()</code> for the scheme (eg
+ * a HTTP request on 8443) and then determining the real server port (eg HTTP request is
+ * really on 8080). The map of valid ports is obtained from the configured
  * {@link PortMapper}.
  *
  * @author Ben Alex
  */
 public class PortResolverImpl implements PortResolver {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PortMapper portMapper = new PortMapperImpl();
+	private PortMapper portMapper = new PortMapperImpl();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public PortMapper getPortMapper() {
-        return portMapper;
-    }
+	public PortMapper getPortMapper() {
+		return portMapper;
+	}
 
-    public int getServerPort(ServletRequest request) {
-        int serverPort = request.getServerPort();
-        Integer portLookup = null;
+	public int getServerPort(ServletRequest request) {
+		int serverPort = request.getServerPort();
+		Integer portLookup = null;
 
-        String scheme = request.getScheme().toLowerCase();
+		String scheme = request.getScheme().toLowerCase();
 
-        if ("http".equals(scheme)) {
-            portLookup = portMapper.lookupHttpPort(Integer.valueOf(serverPort));
+		if ("http".equals(scheme)) {
+			portLookup = portMapper.lookupHttpPort(Integer.valueOf(serverPort));
 
-        } else if ("https".equals(scheme)) {
-            portLookup = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
-        }
+		}
+		else if ("https".equals(scheme)) {
+			portLookup = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
+		}
 
-        if (portLookup != null) {
-            // IE 6 bug
-            serverPort = portLookup.intValue();
-        }
+		if (portLookup != null) {
+			// IE 6 bug
+			serverPort = portLookup.intValue();
+		}
 
-        return serverPort;
-    }
+		return serverPort;
+	}
 
-    public void setPortMapper(PortMapper portMapper) {
-        Assert.notNull(portMapper, "portMapper cannot be null");
-        this.portMapper = portMapper;
-    }
+	public void setPortMapper(PortMapper portMapper) {
+		Assert.notNull(portMapper, "portMapper cannot be null");
+		this.portMapper = portMapper;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/RedirectStrategy.java b/web/src/main/java/org/springframework/security/web/RedirectStrategy.java
index 060eef786e..4cf9eb8802 100644
--- a/web/src/main/java/org/springframework/security/web/RedirectStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/RedirectStrategy.java
@@ -6,18 +6,20 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Encapsulates the redirection logic for all classes in the framework which perform redirects.
+ * Encapsulates the redirection logic for all classes in the framework which perform
+ * redirects.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface RedirectStrategy {
 
-    /**
-     * Performs a redirect to the supplied URL
-     * @param request the current request
-     * @param response the response to redirect
-     * @param url the target URL to redirect to, for example "/login"
-     */
-    void sendRedirect(HttpServletRequest request, HttpServletResponse response, String url) throws IOException;
+	/**
+	 * Performs a redirect to the supplied URL
+	 * @param request the current request
+	 * @param response the response to redirect
+	 * @param url the target URL to redirect to, for example "/login"
+	 */
+	void sendRedirect(HttpServletRequest request, HttpServletResponse response, String url)
+			throws IOException;
 }
diff --git a/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java b/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java
index 9a850fd358..da37b4fdc3 100644
--- a/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java
+++ b/web/src/main/java/org/springframework/security/web/SecurityFilterChain.java
@@ -5,8 +5,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
- * Defines a filter chain which is capable of being matched against an {@code HttpServletRequest}.
- * in order to decide whether it applies to that request.
+ * Defines a filter chain which is capable of being matched against an
+ * {@code HttpServletRequest}. in order to decide whether it applies to that request.
  * <p>
  * Used to configure a {@code FilterChainProxy}.
  *
@@ -17,7 +17,7 @@ import java.util.*;
  */
 public interface SecurityFilterChain {
 
-    boolean matches(HttpServletRequest request);
+	boolean matches(HttpServletRequest request);
 
-    List<Filter> getFilters();
+	List<Filter> getFilters();
 }
diff --git a/web/src/main/java/org/springframework/security/web/WebAttributes.java b/web/src/main/java/org/springframework/security/web/WebAttributes.java
index dda1c3a96f..b34de456cf 100644
--- a/web/src/main/java/org/springframework/security/web/WebAttributes.java
+++ b/web/src/main/java/org/springframework/security/web/WebAttributes.java
@@ -3,32 +3,35 @@ package org.springframework.security.web;
 import org.springframework.security.web.access.WebInvocationPrivilegeEvaluator;
 
 /**
- * Well-known keys which are used to store Spring Security information in request or session scope.
+ * Well-known keys which are used to store Spring Security information in request or
+ * session scope.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.0.3
  */
 public final class WebAttributes {
-   /**
-    * Used to cache an {@code AccessDeniedException} in the request for rendering.
-    *
-    * @see org.springframework.security.web.access.AccessDeniedHandlerImpl
-    */
-    public static final String ACCESS_DENIED_403 = "SPRING_SECURITY_403_EXCEPTION";
+	/**
+	 * Used to cache an {@code AccessDeniedException} in the request for rendering.
+	 *
+	 * @see org.springframework.security.web.access.AccessDeniedHandlerImpl
+	 */
+	public static final String ACCESS_DENIED_403 = "SPRING_SECURITY_403_EXCEPTION";
 
-   /**
-    * Used to cache an authentication-failure exception in the session.
-    *
-    * @see org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler
-    */
-    public static final String AUTHENTICATION_EXCEPTION = "SPRING_SECURITY_LAST_EXCEPTION";
+	/**
+	 * Used to cache an authentication-failure exception in the session.
+	 *
+	 * @see org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler
+	 */
+	public static final String AUTHENTICATION_EXCEPTION = "SPRING_SECURITY_LAST_EXCEPTION";
 
-    /**
-     * Set as a request attribute to override the default {@link WebInvocationPrivilegeEvaluator}
-     *
-     * @see WebInvocationPrivilegeEvaluator
-     * @since 3.1.3
-     */
-    public static final String WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE = WebAttributes.class.getName() + ".WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE";
+	/**
+	 * Set as a request attribute to override the default
+	 * {@link WebInvocationPrivilegeEvaluator}
+	 *
+	 * @see WebInvocationPrivilegeEvaluator
+	 * @since 3.1.3
+	 */
+	public static final String WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE = WebAttributes.class
+			.getName() + ".WEB_INVOCATION_PRIVILEGE_EVALUATOR_ATTRIBUTE";
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java
index ef9db9f356..e558194b5b 100644
--- a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java
+++ b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandler.java
@@ -23,7 +23,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Used by {@link ExceptionTranslationFilter} to handle an
  * <code>AccessDeniedException</code>.
@@ -31,18 +30,20 @@ import javax.servlet.http.HttpServletResponse;
  * @author Ben Alex
  */
 public interface AccessDeniedHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Handles an access denied failure.
-     *
-     * @param request that resulted in an <code>AccessDeniedException</code>
-     * @param response so that the user agent can be advised of the failure
-     * @param accessDeniedException that caused the invocation
-     *
-     * @throws IOException in the event of an IOException
-     * @throws ServletException in the event of a ServletException
-     */
-    void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException)
-        throws IOException, ServletException;
+	/**
+	 * Handles an access denied failure.
+	 *
+	 * @param request that resulted in an <code>AccessDeniedException</code>
+	 * @param response so that the user agent can be advised of the failure
+	 * @param accessDeniedException that caused the invocation
+	 *
+	 * @throws IOException in the event of an IOException
+	 * @throws ServletException in the event of a ServletException
+	 */
+	void handle(HttpServletRequest request, HttpServletResponse response,
+			AccessDeniedException accessDeniedException) throws IOException,
+			ServletException;
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java
index 7395a68a0c..cfea76355f 100644
--- a/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java
+++ b/web/src/main/java/org/springframework/security/web/access/AccessDeniedHandlerImpl.java
@@ -27,61 +27,70 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.WebAttributes;
 
-
 /**
  * Base implementation of {@link AccessDeniedHandler}.
  * <p>
- * This implementation sends a 403 (SC_FORBIDDEN) HTTP error code. In addition, if an {@link #errorPage} is defined,
- * the implementation will perform a request dispatcher "forward" to the specified error page view.
- * Being a "forward", the <code>SecurityContextHolder</code> will remain
- * populated. This is of benefit if the view (or a tag library or macro) wishes to access the
- * <code>SecurityContextHolder</code>. The request scope will also be populated with the exception itself, available
- * from the key {@link WebAttributes#ACCESS_DENIED_403}.
+ * This implementation sends a 403 (SC_FORBIDDEN) HTTP error code. In addition, if an
+ * {@link #errorPage} is defined, the implementation will perform a request dispatcher
+ * "forward" to the specified error page view. Being a "forward", the
+ * <code>SecurityContextHolder</code> will remain populated. This is of benefit if the
+ * view (or a tag library or macro) wishes to access the
+ * <code>SecurityContextHolder</code>. The request scope will also be populated with the
+ * exception itself, available from the key {@link WebAttributes#ACCESS_DENIED_403}.
  *
  * @author Ben Alex
  */
 public class AccessDeniedHandlerImpl implements AccessDeniedHandler {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(AccessDeniedHandlerImpl.class);
+	protected static final Log logger = LogFactory.getLog(AccessDeniedHandlerImpl.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String errorPage;
+	private String errorPage;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException)
-            throws IOException, ServletException {
-        if (!response.isCommitted()) {
-            if (errorPage != null) {
-                // Put exception into request scope (perhaps of use to a view)
-                request.setAttribute(WebAttributes.ACCESS_DENIED_403, accessDeniedException);
+	public void handle(HttpServletRequest request, HttpServletResponse response,
+			AccessDeniedException accessDeniedException) throws IOException,
+			ServletException {
+		if (!response.isCommitted()) {
+			if (errorPage != null) {
+				// Put exception into request scope (perhaps of use to a view)
+				request.setAttribute(WebAttributes.ACCESS_DENIED_403,
+						accessDeniedException);
 
-                // Set the 403 status code.
-                response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+				// Set the 403 status code.
+				response.setStatus(HttpServletResponse.SC_FORBIDDEN);
 
-                // forward to error page.
-                RequestDispatcher dispatcher = request.getRequestDispatcher(errorPage);
-                dispatcher.forward(request, response);
-            } else {
-                response.sendError(HttpServletResponse.SC_FORBIDDEN, accessDeniedException.getMessage());
-            }
-        }
-    }
+				// forward to error page.
+				RequestDispatcher dispatcher = request.getRequestDispatcher(errorPage);
+				dispatcher.forward(request, response);
+			}
+			else {
+				response.sendError(HttpServletResponse.SC_FORBIDDEN,
+						accessDeniedException.getMessage());
+			}
+		}
+	}
 
-    /**
-     * The error page to use. Must begin with a "/" and is interpreted relative to the current context root.
-     *
-     * @param errorPage the dispatcher path to display
-     *
-     * @throws IllegalArgumentException if the argument doesn't comply with the above limitations
-     */
-    public void setErrorPage(String errorPage) {
-        if ((errorPage != null) && !errorPage.startsWith("/")) {
-            throw new IllegalArgumentException("errorPage must begin with '/'");
-        }
+	/**
+	 * The error page to use. Must begin with a "/" and is interpreted relative to the
+	 * current context root.
+	 *
+	 * @param errorPage the dispatcher path to display
+	 *
+	 * @throws IllegalArgumentException if the argument doesn't comply with the above
+	 * limitations
+	 */
+	public void setErrorPage(String errorPage) {
+		if ((errorPage != null) && !errorPage.startsWith("/")) {
+			throw new IllegalArgumentException("errorPage must begin with '/'");
+		}
 
-        this.errorPage = errorPage;
-    }
+		this.errorPage = errorPage;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java
index 1700ed213b..b0cfddb8bd 100644
--- a/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java
+++ b/web/src/main/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluator.java
@@ -26,7 +26,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
-
 /**
  * Allows users to determine whether they have privileges for a given web URI.
  *
@@ -34,85 +33,99 @@ import org.springframework.util.Assert;
  * @author Luke Taylor
  * @since 3.0
  */
-public class DefaultWebInvocationPrivilegeEvaluator implements WebInvocationPrivilegeEvaluator {
-    //~ Static fields/initializers =====================================================================================
+public class DefaultWebInvocationPrivilegeEvaluator implements
+		WebInvocationPrivilegeEvaluator {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(DefaultWebInvocationPrivilegeEvaluator.class);
+	protected static final Log logger = LogFactory
+			.getLog(DefaultWebInvocationPrivilegeEvaluator.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final AbstractSecurityInterceptor securityInterceptor;
+	private final AbstractSecurityInterceptor securityInterceptor;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public DefaultWebInvocationPrivilegeEvaluator(AbstractSecurityInterceptor securityInterceptor) {
-        Assert.notNull(securityInterceptor, "SecurityInterceptor cannot be null");
-        Assert.isTrue(FilterInvocation.class.equals(securityInterceptor.getSecureObjectClass()),
-            "AbstractSecurityInterceptor does not support FilterInvocations");
-        Assert.notNull(securityInterceptor.getAccessDecisionManager(),
-            "AbstractSecurityInterceptor must provide a non-null AccessDecisionManager");
+	public DefaultWebInvocationPrivilegeEvaluator(
+			AbstractSecurityInterceptor securityInterceptor) {
+		Assert.notNull(securityInterceptor, "SecurityInterceptor cannot be null");
+		Assert.isTrue(
+				FilterInvocation.class.equals(securityInterceptor.getSecureObjectClass()),
+				"AbstractSecurityInterceptor does not support FilterInvocations");
+		Assert.notNull(securityInterceptor.getAccessDecisionManager(),
+				"AbstractSecurityInterceptor must provide a non-null AccessDecisionManager");
 
-        this.securityInterceptor = securityInterceptor;
-    }
+		this.securityInterceptor = securityInterceptor;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Determines whether the user represented by the supplied <tt>Authentication</tt> object is
-     * allowed to invoke the supplied URI.
-     *
-     * @param uri the URI excluding the context path (a default context path setting will be used)
-     */
-    public boolean isAllowed(String uri, Authentication authentication) {
-        return isAllowed(null, uri, null, authentication);
-    }
+	/**
+	 * Determines whether the user represented by the supplied <tt>Authentication</tt>
+	 * object is allowed to invoke the supplied URI.
+	 *
+	 * @param uri the URI excluding the context path (a default context path setting will
+	 * be used)
+	 */
+	public boolean isAllowed(String uri, Authentication authentication) {
+		return isAllowed(null, uri, null, authentication);
+	}
 
-    /**
-     * Determines whether the user represented by the supplied <tt>Authentication</tt> object is
-     * allowed to invoke the supplied URI, with the given .
-     * <p>
-     * Note the default implementation of <tt>FilterInvocationSecurityMetadataSource</tt> disregards the
-     * <code>contextPath</code> when evaluating which secure object metadata applies to a given
-     * request URI, so generally the <code>contextPath</code> is unimportant unless you
-     * are using a custom <code>FilterInvocationSecurityMetadataSource</code>.
-     *
-     * @param uri the URI excluding the context path
-     * @param contextPath the context path (may be null, in which case a default value will be used).
-     * @param method the HTTP method (or null, for any method)
-     * @param authentication the <tt>Authentication</tt> instance whose authorities should be used in evaluation
-     *          whether access should be granted.
-     * @return true if access is allowed, false if denied
-     */
-    public boolean isAllowed(String contextPath, String uri, String method, Authentication authentication) {
-        Assert.notNull(uri, "uri parameter is required");
+	/**
+	 * Determines whether the user represented by the supplied <tt>Authentication</tt>
+	 * object is allowed to invoke the supplied URI, with the given .
+	 * <p>
+	 * Note the default implementation of <tt>FilterInvocationSecurityMetadataSource</tt>
+	 * disregards the <code>contextPath</code> when evaluating which secure object
+	 * metadata applies to a given request URI, so generally the <code>contextPath</code>
+	 * is unimportant unless you are using a custom
+	 * <code>FilterInvocationSecurityMetadataSource</code>.
+	 *
+	 * @param uri the URI excluding the context path
+	 * @param contextPath the context path (may be null, in which case a default value
+	 * will be used).
+	 * @param method the HTTP method (or null, for any method)
+	 * @param authentication the <tt>Authentication</tt> instance whose authorities should
+	 * be used in evaluation whether access should be granted.
+	 * @return true if access is allowed, false if denied
+	 */
+	public boolean isAllowed(String contextPath, String uri, String method,
+			Authentication authentication) {
+		Assert.notNull(uri, "uri parameter is required");
 
-        FilterInvocation fi = new FilterInvocation(contextPath, uri, method);
-        Collection<ConfigAttribute> attrs = securityInterceptor.obtainSecurityMetadataSource().getAttributes(fi);
+		FilterInvocation fi = new FilterInvocation(contextPath, uri, method);
+		Collection<ConfigAttribute> attrs = securityInterceptor
+				.obtainSecurityMetadataSource().getAttributes(fi);
 
-        if (attrs == null) {
-            if (securityInterceptor.isRejectPublicInvocations()) {
-                return false;
-            }
+		if (attrs == null) {
+			if (securityInterceptor.isRejectPublicInvocations()) {
+				return false;
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        if (authentication == null) {
-            return false;
-        }
+		if (authentication == null) {
+			return false;
+		}
 
-        try {
-            securityInterceptor.getAccessDecisionManager().decide(authentication, fi, attrs);
-        } catch (AccessDeniedException unauthorized) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(fi.toString() + " denied for " + authentication.toString(), unauthorized);
-            }
+		try {
+			securityInterceptor.getAccessDecisionManager().decide(authentication, fi,
+					attrs);
+		}
+		catch (AccessDeniedException unauthorized) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(fi.toString() + " denied for " + authentication.toString(),
+						unauthorized);
+			}
 
-            return false;
-        }
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
-
-
diff --git a/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java
index 9cb1c6cd35..cfc578acfa 100644
--- a/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java
+++ b/web/src/main/java/org/springframework/security/web/access/DelegatingAccessDeniedHandler.java
@@ -27,9 +27,8 @@ import org.springframework.security.access.AccessDeniedException;
 import org.springframework.util.Assert;
 
 /**
- * An {@link AccessDeniedHandler} that delegates to other
- * {@link AccessDeniedHandler} instances based upon the type of
- * {@link AccessDeniedException} passed into
+ * An {@link AccessDeniedHandler} that delegates to other {@link AccessDeniedHandler}
+ * instances based upon the type of {@link AccessDeniedException} passed into
  * {@link #handle(HttpServletRequest, HttpServletResponse, AccessDeniedException)}.
  *
  * @author Rob Winch
@@ -37,45 +36,41 @@ import org.springframework.util.Assert;
  *
  */
 public final class DelegatingAccessDeniedHandler implements AccessDeniedHandler {
-    private final LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers;
+	private final LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers;
 
-    private final AccessDeniedHandler defaultHandler;
+	private final AccessDeniedHandler defaultHandler;
 
-    /**
-     * Creates a new instance
-     *
-     * @param handlers
-     *            a map of the {@link AccessDeniedException} class to the
-     *            {@link AccessDeniedHandler} that should be used. Each is
-     *            considered in the order they are specified and only the first
-     *            {@link AccessDeniedHandler} is ued.
-     * @param defaultHandler
-     *            the default {@link AccessDeniedHandler} that should be used if
-     *            none of the handlers matches.
-     */
-    public DelegatingAccessDeniedHandler(
-            LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers,
-            AccessDeniedHandler defaultHandler) {
-        Assert.notEmpty(handlers, "handlers cannot be null or empty");
-        Assert.notNull(defaultHandler, "defaultHandler cannot be null");
-        this.handlers = handlers;
-        this.defaultHandler = defaultHandler;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param handlers a map of the {@link AccessDeniedException} class to the
+	 * {@link AccessDeniedHandler} that should be used. Each is considered in the order
+	 * they are specified and only the first {@link AccessDeniedHandler} is ued.
+	 * @param defaultHandler the default {@link AccessDeniedHandler} that should be used
+	 * if none of the handlers matches.
+	 */
+	public DelegatingAccessDeniedHandler(
+			LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers,
+			AccessDeniedHandler defaultHandler) {
+		Assert.notEmpty(handlers, "handlers cannot be null or empty");
+		Assert.notNull(defaultHandler, "defaultHandler cannot be null");
+		this.handlers = handlers;
+		this.defaultHandler = defaultHandler;
+	}
 
-
-    public void handle(HttpServletRequest request,
-            HttpServletResponse response,
-            AccessDeniedException accessDeniedException) throws IOException,
-            ServletException {
-        for(Entry<Class<? extends AccessDeniedException>, AccessDeniedHandler>  entry : handlers.entrySet()) {
-            Class<? extends AccessDeniedException> handlerClass = entry.getKey();
-            if(handlerClass.isAssignableFrom(accessDeniedException.getClass())) {
-                AccessDeniedHandler handler = entry.getValue();
-                handler.handle(request, response, accessDeniedException);
-                return;
-            }
-        }
-        defaultHandler.handle(request, response, accessDeniedException);
-    }
+	public void handle(HttpServletRequest request, HttpServletResponse response,
+			AccessDeniedException accessDeniedException) throws IOException,
+			ServletException {
+		for (Entry<Class<? extends AccessDeniedException>, AccessDeniedHandler> entry : handlers
+				.entrySet()) {
+			Class<? extends AccessDeniedException> handlerClass = entry.getKey();
+			if (handlerClass.isAssignableFrom(accessDeniedException.getClass())) {
+				AccessDeniedHandler handler = entry.getValue();
+				handler.handle(request, response, accessDeniedException);
+				return;
+			}
+		}
+		defaultHandler.handle(request, response, accessDeniedException);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java
index bc921fdc1c..6f7a7e0d6a 100644
--- a/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/access/ExceptionTranslationFilter.java
@@ -39,30 +39,33 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * Handles any <code>AccessDeniedException</code> and <code>AuthenticationException</code> thrown within the
- * filter chain.
+ * Handles any <code>AccessDeniedException</code> and <code>AuthenticationException</code>
+ * thrown within the filter chain.
  * <p>
- * This filter is necessary because it provides the bridge between Java exceptions and HTTP responses.
- * It is solely concerned with maintaining the user interface. This filter does not do any actual security enforcement.
+ * This filter is necessary because it provides the bridge between Java exceptions and
+ * HTTP responses. It is solely concerned with maintaining the user interface. This filter
+ * does not do any actual security enforcement.
  * <p>
- * If an {@link AuthenticationException} is detected, the filter will launch the <code>authenticationEntryPoint</code>.
- * This allows common handling of authentication failures originating from any subclass of
+ * If an {@link AuthenticationException} is detected, the filter will launch the
+ * <code>authenticationEntryPoint</code>. This allows common handling of authentication
+ * failures originating from any subclass of
  * {@link org.springframework.security.access.intercept.AbstractSecurityInterceptor}.
  * <p>
- * If an {@link AccessDeniedException} is detected, the filter will determine whether or not the user is an anonymous
- * user. If they are an anonymous user, the <code>authenticationEntryPoint</code> will be launched. If they are not
- * an anonymous user, the filter will delegate to the {@link org.springframework.security.web.access.AccessDeniedHandler}.
- * By default the filter will use {@link org.springframework.security.web.access.AccessDeniedHandlerImpl}.
+ * If an {@link AccessDeniedException} is detected, the filter will determine whether or
+ * not the user is an anonymous user. If they are an anonymous user, the
+ * <code>authenticationEntryPoint</code> will be launched. If they are not an anonymous
+ * user, the filter will delegate to the
+ * {@link org.springframework.security.web.access.AccessDeniedHandler}. By default the
+ * filter will use {@link org.springframework.security.web.access.AccessDeniedHandlerImpl}.
  * <p>
  * To use this filter, it is necessary to specify the following properties:
  * <ul>
- * <li><code>authenticationEntryPoint</code> indicates the handler that
- * should commence the authentication process if an
- * <code>AuthenticationException</code> is detected. Note that this may also
- * switch the current protocol from http to https for an SSL login.</li>
- * <li><tt>requestCache</tt> determines the strategy used to save a request during the authentication process in order
- * that it may be retrieved and reused once the user has authenticated. The default implementation is
- * {@link HttpSessionRequestCache}.</li>
+ * <li><code>authenticationEntryPoint</code> indicates the handler that should commence
+ * the authentication process if an <code>AuthenticationException</code> is detected. Note
+ * that this may also switch the current protocol from http to https for an SSL login.</li>
+ * <li><tt>requestCache</tt> determines the strategy used to save a request during the
+ * authentication process in order that it may be retrieved and reused once the user has
+ * authenticated. The default implementation is {@link HttpSessionRequestCache}.</li>
  * </ul>
  *
  * @author Ben Alex
@@ -70,149 +73,173 @@ import org.springframework.web.filter.GenericFilterBean;
  */
 public class ExceptionTranslationFilter extends GenericFilterBean {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AccessDeniedHandler accessDeniedHandler = new AccessDeniedHandlerImpl();
-    private AuthenticationEntryPoint authenticationEntryPoint;
-    private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
-    private ThrowableAnalyzer throwableAnalyzer = new DefaultThrowableAnalyzer();
+	private AccessDeniedHandler accessDeniedHandler = new AccessDeniedHandlerImpl();
+	private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationTrustResolver authenticationTrustResolver = new AuthenticationTrustResolverImpl();
+	private ThrowableAnalyzer throwableAnalyzer = new DefaultThrowableAnalyzer();
 
-    private RequestCache requestCache = new HttpSessionRequestCache();
+	private RequestCache requestCache = new HttpSessionRequestCache();
 
-    public ExceptionTranslationFilter(AuthenticationEntryPoint authenticationEntryPoint) {
-        this(authenticationEntryPoint, new HttpSessionRequestCache());
-    }
+	public ExceptionTranslationFilter(AuthenticationEntryPoint authenticationEntryPoint) {
+		this(authenticationEntryPoint, new HttpSessionRequestCache());
+	}
 
-    public ExceptionTranslationFilter(AuthenticationEntryPoint authenticationEntryPoint, RequestCache requestCache) {
-        Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint cannot be null");
-        Assert.notNull(requestCache, "requestCache cannot be null");
-        this.authenticationEntryPoint = authenticationEntryPoint;
-        this.requestCache = requestCache;
-    }
+	public ExceptionTranslationFilter(AuthenticationEntryPoint authenticationEntryPoint,
+			RequestCache requestCache) {
+		Assert.notNull(authenticationEntryPoint,
+				"authenticationEntryPoint cannot be null");
+		Assert.notNull(requestCache, "requestCache cannot be null");
+		this.authenticationEntryPoint = authenticationEntryPoint;
+		this.requestCache = requestCache;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint must be specified");
-    }
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(authenticationEntryPoint,
+				"authenticationEntryPoint must be specified");
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        try {
-            chain.doFilter(request, response);
+		try {
+			chain.doFilter(request, response);
 
-            logger.debug("Chain processed normally");
-        }
-        catch (IOException ex) {
-            throw ex;
-        }
-        catch (Exception ex) {
-            // Try to extract a SpringSecurityException from the stacktrace
-            Throwable[] causeChain = throwableAnalyzer.determineCauseChain(ex);
-            RuntimeException ase = (AuthenticationException)
-                    throwableAnalyzer.getFirstThrowableOfType(AuthenticationException.class, causeChain);
+			logger.debug("Chain processed normally");
+		}
+		catch (IOException ex) {
+			throw ex;
+		}
+		catch (Exception ex) {
+			// Try to extract a SpringSecurityException from the stacktrace
+			Throwable[] causeChain = throwableAnalyzer.determineCauseChain(ex);
+			RuntimeException ase = (AuthenticationException) throwableAnalyzer
+					.getFirstThrowableOfType(AuthenticationException.class, causeChain);
 
-            if (ase == null) {
-                ase = (AccessDeniedException)throwableAnalyzer.getFirstThrowableOfType(AccessDeniedException.class, causeChain);
-            }
+			if (ase == null) {
+				ase = (AccessDeniedException) throwableAnalyzer.getFirstThrowableOfType(
+						AccessDeniedException.class, causeChain);
+			}
 
-            if (ase != null) {
-                handleSpringSecurityException(request, response, chain, ase);
-            } else {
-                // Rethrow ServletExceptions and RuntimeExceptions as-is
-                if (ex instanceof ServletException) {
-                    throw (ServletException) ex;
-                }
-                else if (ex instanceof RuntimeException) {
-                    throw (RuntimeException) ex;
-                }
+			if (ase != null) {
+				handleSpringSecurityException(request, response, chain, ase);
+			}
+			else {
+				// Rethrow ServletExceptions and RuntimeExceptions as-is
+				if (ex instanceof ServletException) {
+					throw (ServletException) ex;
+				}
+				else if (ex instanceof RuntimeException) {
+					throw (RuntimeException) ex;
+				}
 
-                // Wrap other Exceptions. This shouldn't actually happen
-                // as we've already covered all the possibilities for doFilter
-                throw new RuntimeException(ex);
-            }
-        }
-    }
+				// Wrap other Exceptions. This shouldn't actually happen
+				// as we've already covered all the possibilities for doFilter
+				throw new RuntimeException(ex);
+			}
+		}
+	}
 
-    public AuthenticationEntryPoint getAuthenticationEntryPoint() {
-        return authenticationEntryPoint;
-    }
+	public AuthenticationEntryPoint getAuthenticationEntryPoint() {
+		return authenticationEntryPoint;
+	}
 
-    protected AuthenticationTrustResolver getAuthenticationTrustResolver() {
-        return authenticationTrustResolver;
-    }
+	protected AuthenticationTrustResolver getAuthenticationTrustResolver() {
+		return authenticationTrustResolver;
+	}
 
-    private void handleSpringSecurityException(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
-            RuntimeException exception) throws IOException, ServletException {
-        if (exception instanceof AuthenticationException) {
-            logger.debug("Authentication exception occurred; redirecting to authentication entry point", exception);
+	private void handleSpringSecurityException(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain, RuntimeException exception)
+			throws IOException, ServletException {
+		if (exception instanceof AuthenticationException) {
+			logger.debug(
+					"Authentication exception occurred; redirecting to authentication entry point",
+					exception);
 
-            sendStartAuthentication(request, response, chain, (AuthenticationException) exception);
-        }
-        else if (exception instanceof AccessDeniedException) {
-            if (authenticationTrustResolver.isAnonymous(SecurityContextHolder.getContext().getAuthentication())) {
-                logger.debug("Access is denied (user is anonymous); redirecting to authentication entry point",
-                            exception);
+			sendStartAuthentication(request, response, chain,
+					(AuthenticationException) exception);
+		}
+		else if (exception instanceof AccessDeniedException) {
+			if (authenticationTrustResolver.isAnonymous(SecurityContextHolder
+					.getContext().getAuthentication())) {
+				logger.debug(
+						"Access is denied (user is anonymous); redirecting to authentication entry point",
+						exception);
 
-                sendStartAuthentication(request, response, chain, new InsufficientAuthenticationException(
-                        "Full authentication is required to access this resource"));
-            }
-            else {
-                logger.debug("Access is denied (user is not anonymous); delegating to AccessDeniedHandler", exception);
+				sendStartAuthentication(
+						request,
+						response,
+						chain,
+						new InsufficientAuthenticationException(
+								"Full authentication is required to access this resource"));
+			}
+			else {
+				logger.debug(
+						"Access is denied (user is not anonymous); delegating to AccessDeniedHandler",
+						exception);
 
-                accessDeniedHandler.handle(request, response, (AccessDeniedException) exception);
-            }
-        }
-    }
+				accessDeniedHandler.handle(request, response,
+						(AccessDeniedException) exception);
+			}
+		}
+	}
 
-    protected void sendStartAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
-            AuthenticationException reason) throws ServletException, IOException {
-        // SEC-112: Clear the SecurityContextHolder's Authentication, as the
-        // existing Authentication is no longer considered valid
-        SecurityContextHolder.getContext().setAuthentication(null);
-        requestCache.saveRequest(request, response);
-        logger.debug("Calling Authentication entry point.");
-        authenticationEntryPoint.commence(request, response, reason);
-    }
+	protected void sendStartAuthentication(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain,
+			AuthenticationException reason) throws ServletException, IOException {
+		// SEC-112: Clear the SecurityContextHolder's Authentication, as the
+		// existing Authentication is no longer considered valid
+		SecurityContextHolder.getContext().setAuthentication(null);
+		requestCache.saveRequest(request, response);
+		logger.debug("Calling Authentication entry point.");
+		authenticationEntryPoint.commence(request, response, reason);
+	}
 
-    public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
-        Assert.notNull(accessDeniedHandler, "AccessDeniedHandler required");
-        this.accessDeniedHandler = accessDeniedHandler;
-    }
+	public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
+		Assert.notNull(accessDeniedHandler, "AccessDeniedHandler required");
+		this.accessDeniedHandler = accessDeniedHandler;
+	}
 
-    public void setAuthenticationTrustResolver(AuthenticationTrustResolver authenticationTrustResolver) {
-        Assert.notNull(authenticationTrustResolver, "authenticationTrustResolver must not be null");
-        this.authenticationTrustResolver = authenticationTrustResolver;
-    }
+	public void setAuthenticationTrustResolver(
+			AuthenticationTrustResolver authenticationTrustResolver) {
+		Assert.notNull(authenticationTrustResolver,
+				"authenticationTrustResolver must not be null");
+		this.authenticationTrustResolver = authenticationTrustResolver;
+	}
 
-    public void setThrowableAnalyzer(ThrowableAnalyzer throwableAnalyzer) {
-        Assert.notNull(throwableAnalyzer, "throwableAnalyzer must not be null");
-        this.throwableAnalyzer = throwableAnalyzer;
-    }
+	public void setThrowableAnalyzer(ThrowableAnalyzer throwableAnalyzer) {
+		Assert.notNull(throwableAnalyzer, "throwableAnalyzer must not be null");
+		this.throwableAnalyzer = throwableAnalyzer;
+	}
 
-    /**
-     * Default implementation of <code>ThrowableAnalyzer</code> which is capable of also unwrapping
-     * <code>ServletException</code>s.
-     */
-    private static final class DefaultThrowableAnalyzer extends ThrowableAnalyzer {
-        /**
-         * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
-         */
-        protected void initExtractorMap() {
-            super.initExtractorMap();
+	/**
+	 * Default implementation of <code>ThrowableAnalyzer</code> which is capable of also
+	 * unwrapping <code>ServletException</code>s.
+	 */
+	private static final class DefaultThrowableAnalyzer extends ThrowableAnalyzer {
+		/**
+		 * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
+		 */
+		protected void initExtractorMap() {
+			super.initExtractorMap();
 
-            registerExtractor(ServletException.class, new ThrowableCauseExtractor() {
-                public Throwable extractCause(Throwable throwable) {
-                    ThrowableAnalyzer.verifyThrowableHierarchy(throwable, ServletException.class);
-                    return ((ServletException) throwable).getRootCause();
-                }
-            });
-        }
+			registerExtractor(ServletException.class, new ThrowableCauseExtractor() {
+				public Throwable extractCause(Throwable throwable) {
+					ThrowableAnalyzer.verifyThrowableHierarchy(throwable,
+							ServletException.class);
+					return ((ServletException) throwable).getRootCause();
+				}
+			});
+		}
 
-    }
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java
index 6d3c57bf0b..8ae7d28221 100644
--- a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java
+++ b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java
@@ -17,7 +17,6 @@ package org.springframework.security.web.access;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Allows users to determine whether they have privileges for a given web URI.
  *
@@ -26,29 +25,32 @@ import org.springframework.security.core.Authentication;
  */
 public interface WebInvocationPrivilegeEvaluator {
 
-    /**
-     * Determines whether the user represented by the supplied <tt>Authentication</tt> object is
-     * allowed to invoke the supplied URI.
-     *
-     * @param uri the URI excluding the context path (a default context path setting will be used)
-     */
-    public boolean isAllowed(String uri, Authentication authentication);
+	/**
+	 * Determines whether the user represented by the supplied <tt>Authentication</tt>
+	 * object is allowed to invoke the supplied URI.
+	 *
+	 * @param uri the URI excluding the context path (a default context path setting will
+	 * be used)
+	 */
+	public boolean isAllowed(String uri, Authentication authentication);
 
-    /**
-     * Determines whether the user represented by the supplied <tt>Authentication</tt> object is
-     * allowed to invoke the supplied URI, with the given .
-     * <p>
-     * Note the default implementation of <tt>FilterInvocationSecurityMetadataSource</tt> disregards the
-     * <code>contextPath</code> when evaluating which secure object metadata applies to a given
-     * request URI, so generally the <code>contextPath</code> is unimportant unless you
-     * are using a custom <code>FilterInvocationSecurityMetadataSource</code>.
-     *
-     * @param uri the URI excluding the context path
-     * @param contextPath the context path (may be null).
-     * @param method the HTTP method (or null, for any method)
-     * @param authentication the <tt>Authentication</tt> instance whose authorities should be used in evaluation
-     *          whether access should be granted.
-     * @return true if access is allowed, false if denied
-     */
-    public boolean isAllowed(String contextPath, String uri, String method, Authentication authentication);
+	/**
+	 * Determines whether the user represented by the supplied <tt>Authentication</tt>
+	 * object is allowed to invoke the supplied URI, with the given .
+	 * <p>
+	 * Note the default implementation of <tt>FilterInvocationSecurityMetadataSource</tt>
+	 * disregards the <code>contextPath</code> when evaluating which secure object
+	 * metadata applies to a given request URI, so generally the <code>contextPath</code>
+	 * is unimportant unless you are using a custom
+	 * <code>FilterInvocationSecurityMetadataSource</code>.
+	 *
+	 * @param uri the URI excluding the context path
+	 * @param contextPath the context path (may be null).
+	 * @param method the HTTP method (or null, for any method)
+	 * @param authentication the <tt>Authentication</tt> instance whose authorities should
+	 * be used in evaluation whether access should be granted.
+	 * @return true if access is allowed, false if denied
+	 */
+	public boolean isAllowed(String contextPath, String uri, String method,
+			Authentication authentication);
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java
index e38bc2b8db..f0e9f73332 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/AbstractRetryEntryPoint.java
@@ -15,81 +15,88 @@ import java.io.IOException;
  * @author Luke Taylor
  */
 public abstract class AbstractRetryEntryPoint implements ChannelEntryPoint {
-    //~ Static fields/initializers =====================================================================================
-    protected final Log logger = LogFactory.getLog(getClass());
+	// ~ Static fields/initializers
+	// =====================================================================================
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PortMapper portMapper = new PortMapperImpl();
-    private PortResolver portResolver = new PortResolverImpl();
-    /** The scheme ("http://" or "https://") */
-    private final String scheme;
-    /** The standard port for the scheme (80 for http, 443 for https) */
-    private final int standardPort;
+	private PortMapper portMapper = new PortMapperImpl();
+	private PortResolver portResolver = new PortResolverImpl();
+	/** The scheme ("http://" or "https://") */
+	private final String scheme;
+	/** The standard port for the scheme (80 for http, 443 for https) */
+	private final int standardPort;
 
-    private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public AbstractRetryEntryPoint(String scheme, int standardPort) {
-        this.scheme = scheme;
-        this.standardPort = standardPort;
-    }
+	public AbstractRetryEntryPoint(String scheme, int standardPort) {
+		this.scheme = scheme;
+		this.standardPort = standardPort;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void commence(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        String queryString = request.getQueryString();
-        String redirectUrl = request.getRequestURI() + ((queryString == null) ? "" : ("?" + queryString));
+	public void commence(HttpServletRequest request, HttpServletResponse response)
+			throws IOException, ServletException {
+		String queryString = request.getQueryString();
+		String redirectUrl = request.getRequestURI()
+				+ ((queryString == null) ? "" : ("?" + queryString));
 
-        Integer currentPort = Integer.valueOf(portResolver.getServerPort(request));
-        Integer redirectPort = getMappedPort(currentPort);
+		Integer currentPort = Integer.valueOf(portResolver.getServerPort(request));
+		Integer redirectPort = getMappedPort(currentPort);
 
-        if (redirectPort != null) {
-            boolean includePort = redirectPort.intValue() != standardPort;
+		if (redirectPort != null) {
+			boolean includePort = redirectPort.intValue() != standardPort;
 
-            redirectUrl = scheme + request.getServerName() + ((includePort) ? (":" + redirectPort) : "") + redirectUrl;
-        }
+			redirectUrl = scheme + request.getServerName()
+					+ ((includePort) ? (":" + redirectPort) : "") + redirectUrl;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Redirecting to: " + redirectUrl);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Redirecting to: " + redirectUrl);
+		}
 
-        redirectStrategy.sendRedirect(request, response, redirectUrl);
-    }
+		redirectStrategy.sendRedirect(request, response, redirectUrl);
+	}
 
-    protected abstract Integer getMappedPort(Integer mapFromPort);
+	protected abstract Integer getMappedPort(Integer mapFromPort);
 
-    protected final PortMapper getPortMapper() {
-        return portMapper;
-    }
+	protected final PortMapper getPortMapper() {
+		return portMapper;
+	}
 
-    public void setPortMapper(PortMapper portMapper) {
-        Assert.notNull(portMapper, "portMapper cannot be null");
-        this.portMapper = portMapper;
-    }
+	public void setPortMapper(PortMapper portMapper) {
+		Assert.notNull(portMapper, "portMapper cannot be null");
+		this.portMapper = portMapper;
+	}
 
-    public void setPortResolver(PortResolver portResolver) {
-        Assert.notNull(portResolver, "portResolver cannot be null");
-        this.portResolver = portResolver;
-    }
+	public void setPortResolver(PortResolver portResolver) {
+		Assert.notNull(portResolver, "portResolver cannot be null");
+		this.portResolver = portResolver;
+	}
 
-    protected final PortResolver getPortResolver() {
-        return portResolver;
-    }
+	protected final PortResolver getPortResolver() {
+		return portResolver;
+	}
 
-    /**
-     * Sets the strategy to be used for redirecting to the required channel URL. A {@code DefaultRedirectStrategy}
-     * instance will be used if not set.
-     *
-     * @param redirectStrategy the strategy instance to which the URL will be passed.
-     */
-    public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
-        Assert.notNull(redirectStrategy, "redirectStrategy cannot be null");
-        this.redirectStrategy = redirectStrategy;
-    }
+	/**
+	 * Sets the strategy to be used for redirecting to the required channel URL. A
+	 * {@code DefaultRedirectStrategy} instance will be used if not set.
+	 *
+	 * @param redirectStrategy the strategy instance to which the URL will be passed.
+	 */
+	public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
+		Assert.notNull(redirectStrategy, "redirectStrategy cannot be null");
+		this.redirectStrategy = redirectStrategy;
+	}
 
-    protected final RedirectStrategy getRedirectStrategy() {
-        return redirectStrategy;
-    }
+	protected final RedirectStrategy getRedirectStrategy() {
+		return redirectStrategy;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java
index e6d74ee484..2806aaad76 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManager.java
@@ -23,31 +23,36 @@ import java.util.Collection;
 
 import javax.servlet.ServletException;
 
-
 /**
  * Decides whether a web channel provides sufficient security.
  *
  * @author Ben Alex
  */
 public interface ChannelDecisionManager {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Decided whether the presented {@link FilterInvocation} provides the appropriate level of channel
-     * security based on the requested list of <tt>ConfigAttribute</tt>s.
-     *
-     */
-    void decide(FilterInvocation invocation, Collection<ConfigAttribute> config) throws IOException, ServletException;
+	/**
+	 * Decided whether the presented {@link FilterInvocation} provides the appropriate
+	 * level of channel security based on the requested list of <tt>ConfigAttribute</tt>s.
+	 *
+	 */
+	void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+			throws IOException, ServletException;
 
-    /**
-     * Indicates whether this <code>ChannelDecisionManager</code> is able to process the passed
-     * <code>ConfigAttribute</code>.<p>This allows the <code>ChannelProcessingFilter</code> to check every
-     * configuration attribute can be consumed by the configured <code>ChannelDecisionManager</code>.</p>
-     *
-     * @param attribute a configuration attribute that has been configured against the
-     *        <code>ChannelProcessingFilter</code>
-     *
-     * @return true if this <code>ChannelDecisionManager</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>ChannelDecisionManager</code> is able to process the
+	 * passed <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>ChannelProcessingFilter</code> to check every configuration
+	 * attribute can be consumed by the configured <code>ChannelDecisionManager</code>.
+	 * </p>
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <code>ChannelProcessingFilter</code>
+	 *
+	 * @return true if this <code>ChannelDecisionManager</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java
index 91705d49d0..59e636ed12 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.access.channel;
 
-
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.web.FilterInvocation;
 
@@ -31,79 +30,85 @@ import java.util.List;
 
 import javax.servlet.ServletException;
 
-
 /**
  * Implementation of {@link ChannelDecisionManager}.
  * <p>
- * Iterates through each configured {@link ChannelProcessor}. If a <code>ChannelProcessor</code> has any issue with the
- * security of the request, it should cause a redirect, exception or whatever other action is appropriate for the
+ * Iterates through each configured {@link ChannelProcessor}. If a
+ * <code>ChannelProcessor</code> has any issue with the security of the request, it should
+ * cause a redirect, exception or whatever other action is appropriate for the
  * <code>ChannelProcessor</code> implementation.
  * <p>
  * Once any response is committed (ie a redirect is written to the response object), the
- * <code>ChannelDecisionManagerImpl</code> will not iterate through any further <code>ChannelProcessor</code>s.
+ * <code>ChannelDecisionManagerImpl</code> will not iterate through any further
+ * <code>ChannelProcessor</code>s.
  * <p>
- * The attribute "ANY_CHANNEL" if applied to a particular URL, the iteration through the channel processors will be
- * skipped (see SEC-494, SEC-335).
+ * The attribute "ANY_CHANNEL" if applied to a particular URL, the iteration through the
+ * channel processors will be skipped (see SEC-494, SEC-335).
  *
  * @author Ben Alex
  */
-public class ChannelDecisionManagerImpl implements ChannelDecisionManager, InitializingBean {
+public class ChannelDecisionManagerImpl implements ChannelDecisionManager,
+		InitializingBean {
 
-    public static final String ANY_CHANNEL = "ANY_CHANNEL";
+	public static final String ANY_CHANNEL = "ANY_CHANNEL";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private List<ChannelProcessor> channelProcessors;
+	private List<ChannelProcessor> channelProcessors;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notEmpty(channelProcessors, "A list of ChannelProcessors is required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notEmpty(channelProcessors, "A list of ChannelProcessors is required");
+	}
 
-    public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config) throws IOException, ServletException {
-        for (ConfigAttribute attribute : config) {
-            if (ANY_CHANNEL.equals(attribute.getAttribute())) {
-                return;
-            }
-        }
+	public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+			throws IOException, ServletException {
+		for (ConfigAttribute attribute : config) {
+			if (ANY_CHANNEL.equals(attribute.getAttribute())) {
+				return;
+			}
+		}
 
-        for (ChannelProcessor processor : channelProcessors) {
-            processor.decide(invocation, config);
+		for (ChannelProcessor processor : channelProcessors) {
+			processor.decide(invocation, config);
 
-            if (invocation.getResponse().isCommitted()) {
-                break;
-            }
-        }
-    }
+			if (invocation.getResponse().isCommitted()) {
+				break;
+			}
+		}
+	}
 
-    protected List<ChannelProcessor> getChannelProcessors() {
-        return this.channelProcessors;
-    }
+	protected List<ChannelProcessor> getChannelProcessors() {
+		return this.channelProcessors;
+	}
 
-    @SuppressWarnings("cast")
-    public void setChannelProcessors(List<?> newList) {
-        Assert.notEmpty(newList, "A list of ChannelProcessors is required");
-        channelProcessors = new ArrayList<ChannelProcessor>(newList.size());
+	@SuppressWarnings("cast")
+	public void setChannelProcessors(List<?> newList) {
+		Assert.notEmpty(newList, "A list of ChannelProcessors is required");
+		channelProcessors = new ArrayList<ChannelProcessor>(newList.size());
 
-        for (Object currentObject : newList) {
-            Assert.isInstanceOf(ChannelProcessor.class, currentObject, "ChannelProcessor " +
-                    currentObject.getClass().getName() + " must implement ChannelProcessor");
-            channelProcessors.add((ChannelProcessor)currentObject);
-        }
-    }
+		for (Object currentObject : newList) {
+			Assert.isInstanceOf(ChannelProcessor.class, currentObject,
+					"ChannelProcessor " + currentObject.getClass().getName()
+							+ " must implement ChannelProcessor");
+			channelProcessors.add((ChannelProcessor) currentObject);
+		}
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        if (ANY_CHANNEL.equals(attribute.getAttribute())) {
-            return true;
-        }
+	public boolean supports(ConfigAttribute attribute) {
+		if (ANY_CHANNEL.equals(attribute.getAttribute())) {
+			return true;
+		}
 
-        for (ChannelProcessor processor : channelProcessors) {
-            if (processor.supports(attribute)) {
-                return true;
-            }
-        }
+		for (ChannelProcessor processor : channelProcessors) {
+			if (processor.supports(attribute)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java
index 5a93e28d13..2738bc8878 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelEntryPoint.java
@@ -21,29 +21,31 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * May be used by a {@link ChannelProcessor} to launch a web channel.
  *
  * <p>
- * <code>ChannelProcessor</code>s can elect to launch a new web channel directly, or they can delegate to another class.
- * The <code>ChannelEntryPoint</code> is a pluggable interface to assist <code>ChannelProcessor</code>s in performing
- * this delegation.
+ * <code>ChannelProcessor</code>s can elect to launch a new web channel directly, or they
+ * can delegate to another class. The <code>ChannelEntryPoint</code> is a pluggable
+ * interface to assist <code>ChannelProcessor</code>s in performing this delegation.
  *
  * @author Ben Alex
  */
 public interface ChannelEntryPoint {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Commences a secure channel.
-     * <p>
-     * Implementations should modify the headers on the <code>ServletResponse</code> as necessary to commence the user
-     * agent using the implementation's supported channel type.
-     *
-     * @param request that a <code>ChannelProcessor</code> has rejected
-     * @param response so that the user agent can begin using a new channel
-     *
-     */
-    void commence(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
+	/**
+	 * Commences a secure channel.
+	 * <p>
+	 * Implementations should modify the headers on the <code>ServletResponse</code> as
+	 * necessary to commence the user agent using the implementation's supported channel
+	 * type.
+	 *
+	 * @param request that a <code>ChannelProcessor</code> has rejected
+	 * @param response so that the user agent can begin using a new channel
+	 *
+	 */
+	void commence(HttpServletRequest request, HttpServletResponse response)
+			throws IOException, ServletException;
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
index 2d22245401..e3d8312166 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
@@ -33,130 +33,139 @@ import org.springframework.security.web.access.intercept.FilterInvocationSecurit
 import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
  * Ensures a web request is delivered over the required channel.
  * <p>
  * Internally uses a {@link FilterInvocation} to represent the request, allowing a
- * {@code FilterInvocationSecurityMetadataSource} to be used to lookup the attributes which apply.
+ * {@code FilterInvocationSecurityMetadataSource} to be used to lookup the attributes
+ * which apply.
  * <p>
  * Delegates the actual channel security decisions and necessary actions to the configured
- * {@link ChannelDecisionManager}. If a response is committed by the {@code ChannelDecisionManager},
- * the filter chain will not proceed.
+ * {@link ChannelDecisionManager}. If a response is committed by the
+ * {@code ChannelDecisionManager}, the filter chain will not proceed.
  * <p>
  * The most common usage is to ensure that a request takes place over HTTPS, where the
- * {@link ChannelDecisionManagerImpl} is configured with a {@link SecureChannelProcessor} and an
- * {@link InsecureChannelProcessor}. A typical configuration would be
+ * {@link ChannelDecisionManagerImpl} is configured with a {@link SecureChannelProcessor}
+ * and an {@link InsecureChannelProcessor}. A typical configuration would be
+ * 
  * <pre>
  *
-&lt;bean id="channelProcessingFilter" class="org.springframework.security.web.access.channel.ChannelProcessingFilter">
-  &lt;property name="channelDecisionManager" ref="channelDecisionManager"/>
-  &lt;property name="securityMetadataSource">
-    &lt;security:filter-security-metadata-source request-matcher="regex">
-      &lt;security:intercept-url pattern="\A/secure/.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
-      &lt;security:intercept-url pattern="\A/login.jsp.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
-      &lt;security:intercept-url pattern="\A/.*\Z" access="ANY_CHANNEL"/>
-    &lt;/security:filter-security-metadata-source>
-  &lt;/property>
-&lt;/bean>
-
-&lt;bean id="channelDecisionManager" class="org.springframework.security.web.access.channel.ChannelDecisionManagerImpl">
-  &lt;property name="channelProcessors">
-    &lt;list>
-    &lt;ref bean="secureChannelProcessor"/>
-    &lt;ref bean="insecureChannelProcessor"/>
-    &lt;/list>
-  &lt;/property>
-&lt;/bean>
-
-&lt;bean id="secureChannelProcessor"
-  class="org.springframework.security.web.access.channel.SecureChannelProcessor"/>
-&lt;bean id="insecureChannelProcessor"
-  class="org.springframework.security.web.access.channel.InsecureChannelProcessor"/>
-
+ * &lt;bean id="channelProcessingFilter" class="org.springframework.security.web.access.channel.ChannelProcessingFilter">
+ *   &lt;property name="channelDecisionManager" ref="channelDecisionManager"/>
+ *   &lt;property name="securityMetadataSource">
+ *     &lt;security:filter-security-metadata-source request-matcher="regex">
+ *       &lt;security:intercept-url pattern="\A/secure/.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
+ *       &lt;security:intercept-url pattern="\A/login.jsp.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
+ *       &lt;security:intercept-url pattern="\A/.*\Z" access="ANY_CHANNEL"/>
+ *     &lt;/security:filter-security-metadata-source>
+ *   &lt;/property>
+ * &lt;/bean>
+ * 
+ * &lt;bean id="channelDecisionManager" class="org.springframework.security.web.access.channel.ChannelDecisionManagerImpl">
+ *   &lt;property name="channelProcessors">
+ *     &lt;list>
+ *     &lt;ref bean="secureChannelProcessor"/>
+ *     &lt;ref bean="insecureChannelProcessor"/>
+ *     &lt;/list>
+ *   &lt;/property>
+ * &lt;/bean>
+ * 
+ * &lt;bean id="secureChannelProcessor"
+ *   class="org.springframework.security.web.access.channel.SecureChannelProcessor"/>
+ * &lt;bean id="insecureChannelProcessor"
+ *   class="org.springframework.security.web.access.channel.InsecureChannelProcessor"/>
+ * 
  * </pre>
- * which would force the login form and any access to the {@code /secure} path to be made over HTTPS.
+ * 
+ * which would force the login form and any access to the {@code /secure} path to be made
+ * over HTTPS.
  *
  * @author Ben Alex
  */
 public class ChannelProcessingFilter extends GenericFilterBean {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ChannelDecisionManager channelDecisionManager;
-    private FilterInvocationSecurityMetadataSource securityMetadataSource;
+	private ChannelDecisionManager channelDecisionManager;
+	private FilterInvocationSecurityMetadataSource securityMetadataSource;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(securityMetadataSource, "securityMetadataSource must be specified");
-        Assert.notNull(channelDecisionManager, "channelDecisionManager must be specified");
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(securityMetadataSource, "securityMetadataSource must be specified");
+		Assert.notNull(channelDecisionManager, "channelDecisionManager must be specified");
 
-        Collection<ConfigAttribute> attrDefs = this.securityMetadataSource.getAllConfigAttributes();
+		Collection<ConfigAttribute> attrDefs = this.securityMetadataSource
+				.getAllConfigAttributes();
 
-        if (attrDefs == null) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("Could not validate configuration attributes as the FilterInvocationSecurityMetadataSource did "
-                        + "not return any attributes");
-            }
+		if (attrDefs == null) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("Could not validate configuration attributes as the FilterInvocationSecurityMetadataSource did "
+						+ "not return any attributes");
+			}
 
-            return;
-        }
+			return;
+		}
 
-        Set<ConfigAttribute> unsupportedAttributes = new HashSet<ConfigAttribute>();
+		Set<ConfigAttribute> unsupportedAttributes = new HashSet<ConfigAttribute>();
 
-        for (ConfigAttribute attr : attrDefs) {
-            if (!this.channelDecisionManager.supports(attr)) {
-                unsupportedAttributes.add(attr);
-            }
-        }
+		for (ConfigAttribute attr : attrDefs) {
+			if (!this.channelDecisionManager.supports(attr)) {
+				unsupportedAttributes.add(attr);
+			}
+		}
 
-        if (unsupportedAttributes.size() == 0) {
-            if (logger.isInfoEnabled()) {
-                logger.info("Validated configuration attributes");
-            }
-        } else {
-            throw new IllegalArgumentException("Unsupported configuration attributes: " + unsupportedAttributes);
-        }
-    }
+		if (unsupportedAttributes.size() == 0) {
+			if (logger.isInfoEnabled()) {
+				logger.info("Validated configuration attributes");
+			}
+		}
+		else {
+			throw new IllegalArgumentException("Unsupported configuration attributes: "
+					+ unsupportedAttributes);
+		}
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        FilterInvocation fi = new FilterInvocation(request, response, chain);
-        Collection<ConfigAttribute> attr = this.securityMetadataSource.getAttributes(fi);
+		FilterInvocation fi = new FilterInvocation(request, response, chain);
+		Collection<ConfigAttribute> attr = this.securityMetadataSource.getAttributes(fi);
 
-        if (attr != null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Request: " + fi.toString() + "; ConfigAttributes: " + attr);
-            }
+		if (attr != null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Request: " + fi.toString() + "; ConfigAttributes: " + attr);
+			}
 
-            channelDecisionManager.decide(fi, attr);
+			channelDecisionManager.decide(fi, attr);
 
-            if (fi.getResponse().isCommitted()) {
-                return;
-            }
-        }
+			if (fi.getResponse().isCommitted()) {
+				return;
+			}
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    protected ChannelDecisionManager getChannelDecisionManager() {
-        return channelDecisionManager;
-    }
+	protected ChannelDecisionManager getChannelDecisionManager() {
+		return channelDecisionManager;
+	}
 
-    protected FilterInvocationSecurityMetadataSource getSecurityMetadataSource() {
-        return securityMetadataSource;
-    }
+	protected FilterInvocationSecurityMetadataSource getSecurityMetadataSource() {
+		return securityMetadataSource;
+	}
 
-    public void setChannelDecisionManager(ChannelDecisionManager channelDecisionManager) {
-        this.channelDecisionManager = channelDecisionManager;
-    }
+	public void setChannelDecisionManager(ChannelDecisionManager channelDecisionManager) {
+		this.channelDecisionManager = channelDecisionManager;
+	}
 
-    public void setSecurityMetadataSource(FilterInvocationSecurityMetadataSource filterInvocationSecurityMetadataSource) {
-        this.securityMetadataSource = filterInvocationSecurityMetadataSource;
-    }
+	public void setSecurityMetadataSource(
+			FilterInvocationSecurityMetadataSource filterInvocationSecurityMetadataSource) {
+		this.securityMetadataSource = filterInvocationSecurityMetadataSource;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java
index 2038ff4058..0c28f7c1e5 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessor.java
@@ -23,38 +23,41 @@ import java.util.Collection;
 
 import javax.servlet.ServletException;
 
-
 /**
  * Decides whether a web channel meets a specific security condition.
  * <p>
- * <code>ChannelProcessor</code> implementations are iterated by the {@link ChannelDecisionManagerImpl}.
+ * <code>ChannelProcessor</code> implementations are iterated by the
+ * {@link ChannelDecisionManagerImpl}.
  * <p>
- * If an implementation has an issue with the channel security, they should
- * take action themselves. The callers of the implementation do not take any
- * action.
+ * If an implementation has an issue with the channel security, they should take action
+ * themselves. The callers of the implementation do not take any action.
  *
  * @author Ben Alex
  */
 public interface ChannelProcessor {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Decided whether the presented {@link FilterInvocation} provides the appropriate level of channel
-     * security based on the requested list of <tt>ConfigAttribute</tt>s.
-     *
-     */
-    void decide(FilterInvocation invocation, Collection<ConfigAttribute> config) throws IOException, ServletException;
+	/**
+	 * Decided whether the presented {@link FilterInvocation} provides the appropriate
+	 * level of channel security based on the requested list of <tt>ConfigAttribute</tt>s.
+	 *
+	 */
+	void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+			throws IOException, ServletException;
 
-    /**
-     * Indicates whether this <code>ChannelProcessor</code> is able to process the passed
-     * <code>ConfigAttribute</code>.
-     * <p>
-     * This allows the <code>ChannelProcessingFilter</code> to check every configuration attribute can be consumed
-     * by the configured <code>ChannelDecisionManager</code>.
-     *
-     * @param attribute a configuration attribute that has been configured against the <tt>ChannelProcessingFilter</tt>.
-     *
-     * @return true if this <code>ChannelProcessor</code> can support the passed configuration attribute
-     */
-    boolean supports(ConfigAttribute attribute);
+	/**
+	 * Indicates whether this <code>ChannelProcessor</code> is able to process the passed
+	 * <code>ConfigAttribute</code>.
+	 * <p>
+	 * This allows the <code>ChannelProcessingFilter</code> to check every configuration
+	 * attribute can be consumed by the configured <code>ChannelDecisionManager</code>.
+	 *
+	 * @param attribute a configuration attribute that has been configured against the
+	 * <tt>ChannelProcessingFilter</tt>.
+	 *
+	 * @return true if this <code>ChannelProcessor</code> can support the passed
+	 * configuration attribute
+	 */
+	boolean supports(ConfigAttribute attribute);
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java
index 1128e078f5..80a4114255 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/InsecureChannelProcessor.java
@@ -25,64 +25,69 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
-
 /**
- * Ensures channel security is inactive by review of <code>HttpServletRequest.isSecure()</code> responses.
+ * Ensures channel security is inactive by review of
+ * <code>HttpServletRequest.isSecure()</code> responses.
  * <p>
- * The class responds to one case-sensitive keyword, {@link #getInsecureKeyword}. If this keyword is detected,
- * <code>HttpServletRequest.isSecure()</code> is used to determine the channel security offered. If channel security
- * is present, the configured <code>ChannelEntryPoint</code> is called. By default the entry point is {@link
- * RetryWithHttpEntryPoint}.
+ * The class responds to one case-sensitive keyword, {@link #getInsecureKeyword}. If this
+ * keyword is detected, <code>HttpServletRequest.isSecure()</code> is used to determine
+ * the channel security offered. If channel security is present, the configured
+ * <code>ChannelEntryPoint</code> is called. By default the entry point is
+ * {@link RetryWithHttpEntryPoint}.
  * <p>
  * The default <code>insecureKeyword</code> is <code>REQUIRES_INSECURE_CHANNEL</code>.
  *
  * @author Ben Alex
  */
 public class InsecureChannelProcessor implements InitializingBean, ChannelProcessor {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ChannelEntryPoint entryPoint = new RetryWithHttpEntryPoint();
-    private String insecureKeyword = "REQUIRES_INSECURE_CHANNEL";
+	private ChannelEntryPoint entryPoint = new RetryWithHttpEntryPoint();
+	private String insecureKeyword = "REQUIRES_INSECURE_CHANNEL";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(insecureKeyword, "insecureKeyword required");
-        Assert.notNull(entryPoint, "entryPoint required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(insecureKeyword, "insecureKeyword required");
+		Assert.notNull(entryPoint, "entryPoint required");
+	}
 
-    public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config) throws IOException, ServletException {
-        if ((invocation == null) || (config == null)) {
-            throw new IllegalArgumentException("Nulls cannot be provided");
-        }
+	public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+			throws IOException, ServletException {
+		if ((invocation == null) || (config == null)) {
+			throw new IllegalArgumentException("Nulls cannot be provided");
+		}
 
-        for (ConfigAttribute attribute : config) {
-            if (supports(attribute)) {
-                if (invocation.getHttpRequest().isSecure()) {
-                    entryPoint.commence(invocation.getRequest(), invocation.getResponse());
-                }
-            }
-        }
-    }
+		for (ConfigAttribute attribute : config) {
+			if (supports(attribute)) {
+				if (invocation.getHttpRequest().isSecure()) {
+					entryPoint
+							.commence(invocation.getRequest(), invocation.getResponse());
+				}
+			}
+		}
+	}
 
-    public ChannelEntryPoint getEntryPoint() {
-        return entryPoint;
-    }
+	public ChannelEntryPoint getEntryPoint() {
+		return entryPoint;
+	}
 
-    public String getInsecureKeyword() {
-        return insecureKeyword;
-    }
+	public String getInsecureKeyword() {
+		return insecureKeyword;
+	}
 
-    public void setEntryPoint(ChannelEntryPoint entryPoint) {
-        this.entryPoint = entryPoint;
-    }
+	public void setEntryPoint(ChannelEntryPoint entryPoint) {
+		this.entryPoint = entryPoint;
+	}
 
-    public void setInsecureKeyword(String secureKeyword) {
-        this.insecureKeyword = secureKeyword;
-    }
+	public void setInsecureKeyword(String secureKeyword) {
+		this.insecureKeyword = secureKeyword;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return (attribute != null) && (attribute.getAttribute() != null)
-                && attribute.getAttribute().equals(getInsecureKeyword());
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return (attribute != null) && (attribute.getAttribute() != null)
+				&& attribute.getAttribute().equals(getInsecureKeyword());
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPoint.java
index 3375d94ded..880261f34d 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPoint.java
@@ -15,22 +15,22 @@
 
 package org.springframework.security.web.access.channel;
 
-
 /**
  * Commences an insecure channel by retrying the original request using HTTP.
  * <p>
- * This entry point should suffice in most circumstances. However, it is not intended to properly handle HTTP POSTs or
- * other usage where a standard redirect would cause an issue.
+ * This entry point should suffice in most circumstances. However, it is not intended to
+ * properly handle HTTP POSTs or other usage where a standard redirect would cause an
+ * issue.
  *
  * @author Ben Alex
  */
 public class RetryWithHttpEntryPoint extends AbstractRetryEntryPoint {
 
-    public RetryWithHttpEntryPoint() {
-        super("http://", 80);
-    }
+	public RetryWithHttpEntryPoint() {
+		super("http://", 80);
+	}
 
-    protected Integer getMappedPort(Integer mapFromPort) {
-        return getPortMapper().lookupHttpPort(mapFromPort);
-    }
+	protected Integer getMappedPort(Integer mapFromPort) {
+		return getPortMapper().lookupHttpPort(mapFromPort);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPoint.java b/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPoint.java
index 11b11f6883..210849111d 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPoint.java
@@ -18,18 +18,20 @@ package org.springframework.security.web.access.channel;
 /**
  * Commences a secure channel by retrying the original request using HTTPS.
  * <p>
- * This entry point should suffice in most circumstances. However, it is not intended to properly handle HTTP POSTs
- * or other usage where a standard redirect would cause an issue.</p>
+ * This entry point should suffice in most circumstances. However, it is not intended to
+ * properly handle HTTP POSTs or other usage where a standard redirect would cause an
+ * issue.
+ * </p>
  *
  * @author Ben Alex
  */
 public class RetryWithHttpsEntryPoint extends AbstractRetryEntryPoint {
 
-    public RetryWithHttpsEntryPoint() {
-        super("https://", 443);
-    }
+	public RetryWithHttpsEntryPoint() {
+		super("https://", 443);
+	}
 
-    protected Integer getMappedPort(Integer mapFromPort) {
-        return getPortMapper().lookupHttpsPort(mapFromPort);
-    }
+	protected Integer getMappedPort(Integer mapFromPort) {
+		return getPortMapper().lookupHttpsPort(mapFromPort);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java
index 62a7b60815..5d776740e7 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/SecureChannelProcessor.java
@@ -25,62 +25,68 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.util.Assert;
 
-
 /**
- * Ensures channel security is active by review of <code>HttpServletRequest.isSecure()</code> responses.
+ * Ensures channel security is active by review of
+ * <code>HttpServletRequest.isSecure()</code> responses.
  * <p>
- * The class responds to one case-sensitive keyword, {@link #getSecureKeyword}. If this keyword is detected,
- * <code>HttpServletRequest.isSecure()</code> is used to determine the channel security offered. If channel security
- * is not present, the configured <code>ChannelEntryPoint</code> is called. By default the entry point is {@link
- * RetryWithHttpsEntryPoint}.
+ * The class responds to one case-sensitive keyword, {@link #getSecureKeyword}. If this
+ * keyword is detected, <code>HttpServletRequest.isSecure()</code> is used to determine
+ * the channel security offered. If channel security is not present, the configured
+ * <code>ChannelEntryPoint</code> is called. By default the entry point is
+ * {@link RetryWithHttpsEntryPoint}.
  * <p>
  * The default <code>secureKeyword</code> is <code>REQUIRES_SECURE_CHANNEL</code>.
  *
  * @author Ben Alex
  */
 public class SecureChannelProcessor implements InitializingBean, ChannelProcessor {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ChannelEntryPoint entryPoint = new RetryWithHttpsEntryPoint();
-    private String secureKeyword = "REQUIRES_SECURE_CHANNEL";
+	private ChannelEntryPoint entryPoint = new RetryWithHttpsEntryPoint();
+	private String secureKeyword = "REQUIRES_SECURE_CHANNEL";
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(secureKeyword, "secureKeyword required");
-        Assert.notNull(entryPoint, "entryPoint required");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(secureKeyword, "secureKeyword required");
+		Assert.notNull(entryPoint, "entryPoint required");
+	}
 
-    public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config) throws IOException, ServletException {
-        Assert.isTrue((invocation != null) && (config != null), "Nulls cannot be provided");
+	public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+			throws IOException, ServletException {
+		Assert.isTrue((invocation != null) && (config != null),
+				"Nulls cannot be provided");
 
-        for (ConfigAttribute attribute : config) {
-            if (supports(attribute)) {
-                if (!invocation.getHttpRequest().isSecure()) {
-                    entryPoint.commence(invocation.getRequest(), invocation.getResponse());
-                }
-            }
-        }
-    }
+		for (ConfigAttribute attribute : config) {
+			if (supports(attribute)) {
+				if (!invocation.getHttpRequest().isSecure()) {
+					entryPoint
+							.commence(invocation.getRequest(), invocation.getResponse());
+				}
+			}
+		}
+	}
 
-    public ChannelEntryPoint getEntryPoint() {
-        return entryPoint;
-    }
+	public ChannelEntryPoint getEntryPoint() {
+		return entryPoint;
+	}
 
-    public String getSecureKeyword() {
-        return secureKeyword;
-    }
+	public String getSecureKeyword() {
+		return secureKeyword;
+	}
 
-    public void setEntryPoint(ChannelEntryPoint entryPoint) {
-        this.entryPoint = entryPoint;
-    }
+	public void setEntryPoint(ChannelEntryPoint entryPoint) {
+		this.entryPoint = entryPoint;
+	}
 
-    public void setSecureKeyword(String secureKeyword) {
-        this.secureKeyword = secureKeyword;
-    }
+	public void setSecureKeyword(String secureKeyword) {
+		this.secureKeyword = secureKeyword;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return (attribute != null) && (attribute.getAttribute() != null)
-                && attribute.getAttribute().equals(getSecureKeyword());
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return (attribute != null) && (attribute.getAttribute() != null)
+				&& attribute.getAttribute().equals(getSecureKeyword());
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
index ade0c51a74..55d9e1c494 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
@@ -14,48 +14,51 @@ import org.springframework.util.Assert;
  * @author Luke Taylor
  * @since 3.0
  */
-public class DefaultWebSecurityExpressionHandler extends AbstractSecurityExpressionHandler<FilterInvocation> implements SecurityExpressionHandler<FilterInvocation> {
+public class DefaultWebSecurityExpressionHandler extends
+		AbstractSecurityExpressionHandler<FilterInvocation> implements
+		SecurityExpressionHandler<FilterInvocation> {
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
-    private String defaultRolePrefix = "ROLE_";
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private String defaultRolePrefix = "ROLE_";
 
-    @Override
-    protected SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, FilterInvocation fi) {
-        WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(authentication, fi);
-        root.setPermissionEvaluator(getPermissionEvaluator());
-        root.setTrustResolver(trustResolver);
-        root.setRoleHierarchy(getRoleHierarchy());
-        root.setDefaultRolePrefix(defaultRolePrefix);
-        return root;
-    }
+	@Override
+	protected SecurityExpressionOperations createSecurityExpressionRoot(
+			Authentication authentication, FilterInvocation fi) {
+		WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(authentication, fi);
+		root.setPermissionEvaluator(getPermissionEvaluator());
+		root.setTrustResolver(trustResolver);
+		root.setRoleHierarchy(getRoleHierarchy());
+		root.setDefaultRolePrefix(defaultRolePrefix);
+		return root;
+	}
 
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 
-    /**
-     * <p>
-     * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
-     * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN") is passed in,
-     * then the role ROLE_ADMIN will be used when the defaultRolePrefix is "ROLE_" (default).
-     * </p>
-     *
-     * <p>
-     * If null or empty, then no default role prefix is used.
-     * </p>
-     *
-     * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
-     */
-    public void setDefaultRolePrefix(String defaultRolePrefix) {
-        this.defaultRolePrefix = defaultRolePrefix;
-    }
+	/**
+	 * <p>
+	 * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
+	 * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
+	 * is passed in, then the role ROLE_ADMIN will be used when the defaultRolePrefix is
+	 * "ROLE_" (default).
+	 * </p>
+	 *
+	 * <p>
+	 * If null or empty, then no default role prefix is used.
+	 * </p>
+	 *
+	 * @param defaultRolePrefix the default prefix to add to roles. Default "ROLE_".
+	 */
+	public void setDefaultRolePrefix(String defaultRolePrefix) {
+		this.defaultRolePrefix = defaultRolePrefix;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
index e3b683752e..5c6bd4b484 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java
@@ -22,39 +22,50 @@ import org.springframework.util.Assert;
  * @author Luke Taylor
  * @since 3.0
  */
-public final class ExpressionBasedFilterInvocationSecurityMetadataSource extends DefaultFilterInvocationSecurityMetadataSource {
-    private final static Log logger = LogFactory.getLog(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
+public final class ExpressionBasedFilterInvocationSecurityMetadataSource extends
+		DefaultFilterInvocationSecurityMetadataSource {
+	private final static Log logger = LogFactory
+			.getLog(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
 
-    public ExpressionBasedFilterInvocationSecurityMetadataSource(
-            LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap,
-            SecurityExpressionHandler<FilterInvocation> expressionHandler) {
-        super(processMap(requestMap, expressionHandler.getExpressionParser()));
-        Assert.notNull(expressionHandler, "A non-null SecurityExpressionHandler is required");
-    }
+	public ExpressionBasedFilterInvocationSecurityMetadataSource(
+			LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap,
+			SecurityExpressionHandler<FilterInvocation> expressionHandler) {
+		super(processMap(requestMap, expressionHandler.getExpressionParser()));
+		Assert.notNull(expressionHandler,
+				"A non-null SecurityExpressionHandler is required");
+	}
 
-    private static LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> processMap(
-            LinkedHashMap<RequestMatcher,Collection<ConfigAttribute>> requestMap, ExpressionParser parser) {
-        Assert.notNull(parser, "SecurityExpressionHandler returned a null parser object");
+	private static LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> processMap(
+			LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap,
+			ExpressionParser parser) {
+		Assert.notNull(parser, "SecurityExpressionHandler returned a null parser object");
 
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestToExpressionAttributesMap =
-            new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>(requestMap);
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestToExpressionAttributesMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>(
+				requestMap);
 
-        for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap.entrySet()) {
-            RequestMatcher request = entry.getKey();
-            Assert.isTrue(entry.getValue().size() == 1, "Expected a single expression attribute for " + request);
-            ArrayList<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(1);
-            String expression = entry.getValue().toArray(new ConfigAttribute[1])[0].getAttribute();
-            logger.debug("Adding web access control expression '" + expression + "', for " + request);
-            try {
-                attributes.add(new WebExpressionConfigAttribute(parser.parseExpression(expression)));
-            } catch (ParseException e) {
-                throw new IllegalArgumentException("Failed to parse expression '" + expression + "'");
-            }
+		for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap
+				.entrySet()) {
+			RequestMatcher request = entry.getKey();
+			Assert.isTrue(entry.getValue().size() == 1,
+					"Expected a single expression attribute for " + request);
+			ArrayList<ConfigAttribute> attributes = new ArrayList<ConfigAttribute>(1);
+			String expression = entry.getValue().toArray(new ConfigAttribute[1])[0]
+					.getAttribute();
+			logger.debug("Adding web access control expression '" + expression
+					+ "', for " + request);
+			try {
+				attributes.add(new WebExpressionConfigAttribute(parser
+						.parseExpression(expression)));
+			}
+			catch (ParseException e) {
+				throw new IllegalArgumentException("Failed to parse expression '"
+						+ expression + "'");
+			}
 
-            requestToExpressionAttributesMap.put(request, attributes);
-        }
+			requestToExpressionAttributesMap.put(request, attributes);
+		}
 
-        return requestToExpressionAttributesMap;
-    }
+		return requestToExpressionAttributesMap;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java
index 6834a56479..95aa71452a 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java
@@ -10,22 +10,22 @@ import org.springframework.security.access.ConfigAttribute;
  * @since 3.0
  */
 class WebExpressionConfigAttribute implements ConfigAttribute {
-    private final Expression authorizeExpression;
+	private final Expression authorizeExpression;
 
-    public WebExpressionConfigAttribute(Expression authorizeExpression) {
-        this.authorizeExpression = authorizeExpression;
-    }
+	public WebExpressionConfigAttribute(Expression authorizeExpression) {
+		this.authorizeExpression = authorizeExpression;
+	}
 
-    Expression getAuthorizeExpression() {
-        return authorizeExpression;
-    }
+	Expression getAuthorizeExpression() {
+		return authorizeExpression;
+	}
 
-    public String getAttribute() {
-        return null;
-    }
+	public String getAttribute() {
+		return null;
+	}
 
-    @Override
-    public String toString() {
-        return authorizeExpression.getExpressionString();
-    }
+	@Override
+	public String toString() {
+		return authorizeExpression.getExpressionString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java
index 6779f8077b..209a28e004 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionVoter.java
@@ -16,43 +16,47 @@ import org.springframework.security.web.FilterInvocation;
  * @since 3.0
  */
 public class WebExpressionVoter implements AccessDecisionVoter<FilterInvocation> {
-    private SecurityExpressionHandler<FilterInvocation> expressionHandler = new DefaultWebSecurityExpressionHandler();
+	private SecurityExpressionHandler<FilterInvocation> expressionHandler = new DefaultWebSecurityExpressionHandler();
 
-    public int vote(Authentication authentication, FilterInvocation fi, Collection<ConfigAttribute> attributes) {
-        assert authentication != null;
-        assert fi != null;
-        assert attributes != null;
+	public int vote(Authentication authentication, FilterInvocation fi,
+			Collection<ConfigAttribute> attributes) {
+		assert authentication != null;
+		assert fi != null;
+		assert attributes != null;
 
-        WebExpressionConfigAttribute weca = findConfigAttribute(attributes);
+		WebExpressionConfigAttribute weca = findConfigAttribute(attributes);
 
-        if (weca == null) {
-            return ACCESS_ABSTAIN;
-        }
+		if (weca == null) {
+			return ACCESS_ABSTAIN;
+		}
 
-        EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication, fi);
+		EvaluationContext ctx = expressionHandler.createEvaluationContext(authentication,
+				fi);
 
-        return ExpressionUtils.evaluateAsBoolean(weca.getAuthorizeExpression(), ctx) ?
-                ACCESS_GRANTED : ACCESS_DENIED;
-    }
+		return ExpressionUtils.evaluateAsBoolean(weca.getAuthorizeExpression(), ctx) ? ACCESS_GRANTED
+				: ACCESS_DENIED;
+	}
 
-    private WebExpressionConfigAttribute findConfigAttribute(Collection<ConfigAttribute> attributes) {
-        for (ConfigAttribute attribute : attributes) {
-            if (attribute instanceof WebExpressionConfigAttribute) {
-                return (WebExpressionConfigAttribute)attribute;
-            }
-        }
-        return null;
-    }
+	private WebExpressionConfigAttribute findConfigAttribute(
+			Collection<ConfigAttribute> attributes) {
+		for (ConfigAttribute attribute : attributes) {
+			if (attribute instanceof WebExpressionConfigAttribute) {
+				return (WebExpressionConfigAttribute) attribute;
+			}
+		}
+		return null;
+	}
 
-    public boolean supports(ConfigAttribute attribute) {
-        return attribute instanceof WebExpressionConfigAttribute;
-    }
+	public boolean supports(ConfigAttribute attribute) {
+		return attribute instanceof WebExpressionConfigAttribute;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return FilterInvocation.class.isAssignableFrom(clazz);
-    }
+	public boolean supports(Class<?> clazz) {
+		return FilterInvocation.class.isAssignableFrom(clazz);
+	}
 
-    public void setExpressionHandler(SecurityExpressionHandler<FilterInvocation> expressionHandler) {
-        this.expressionHandler = expressionHandler;
-    }
+	public void setExpressionHandler(
+			SecurityExpressionHandler<FilterInvocation> expressionHandler) {
+		this.expressionHandler = expressionHandler;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java b/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java
index 19b0abd7d7..580c8a736c 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/WebSecurityExpressionRoot.java
@@ -13,24 +13,26 @@ import org.springframework.security.web.util.matcher.IpAddressMatcher;
  * @since 3.0
  */
 public class WebSecurityExpressionRoot extends SecurityExpressionRoot {
-    //private FilterInvocation filterInvocation;
-    /** Allows direct access to the request object */
-    public final HttpServletRequest request;
+	// private FilterInvocation filterInvocation;
+	/** Allows direct access to the request object */
+	public final HttpServletRequest request;
 
-    public WebSecurityExpressionRoot(Authentication a, FilterInvocation fi) {
-        super(a);
-        //this.filterInvocation = fi;
-        this.request = fi.getRequest();
-    }
+	public WebSecurityExpressionRoot(Authentication a, FilterInvocation fi) {
+		super(a);
+		// this.filterInvocation = fi;
+		this.request = fi.getRequest();
+	}
 
-    /**
-     * Takes a specific IP address or a range using the IP/Netmask (e.g. 192.168.1.0/24 or 202.24.0.0/14).
-     *
-     * @param ipAddress the address or range of addresses from which the request must come.
-     * @return true if the IP address of the current request is in the required range.
-     */
-    public boolean hasIpAddress(String ipAddress) {
-        return (new IpAddressMatcher(ipAddress).matches(request));
-    }
+	/**
+	 * Takes a specific IP address or a range using the IP/Netmask (e.g. 192.168.1.0/24 or
+	 * 202.24.0.0/14).
+	 *
+	 * @param ipAddress the address or range of addresses from which the request must
+	 * come.
+	 * @return true if the IP address of the current request is in the required range.
+	 */
+	public boolean hasIpAddress(String ipAddress) {
+		return (new IpAddressMatcher(ipAddress).matches(request));
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java
index 3d0ae034a7..30ab8015d5 100644
--- a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java
@@ -29,68 +29,76 @@ import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
-
 /**
  * Default implementation of <tt>FilterInvocationDefinitionSource</tt>.
  * <p>
- * Stores an ordered map of {@link RequestMatcher}s to <tt>ConfigAttribute</tt> collections and provides matching
- * of {@code FilterInvocation}s against the items stored in the map.
+ * Stores an ordered map of {@link RequestMatcher}s to <tt>ConfigAttribute</tt>
+ * collections and provides matching of {@code FilterInvocation}s against the items stored
+ * in the map.
  * <p>
- * The order of the {@link RequestMatcher}s in the map is very important. The <b>first</b> one which matches the
- * request will be used. Later matchers in the map will not be invoked if a match has already been found.
- * Accordingly, the most specific matchers should be registered first, with the most general matches registered last.
+ * The order of the {@link RequestMatcher}s in the map is very important. The <b>first</b>
+ * one which matches the request will be used. Later matchers in the map will not be
+ * invoked if a match has already been found. Accordingly, the most specific matchers
+ * should be registered first, with the most general matches registered last.
  * <p>
- * The most common method creating an instance is using the Spring Security namespace. For example, the {@code pattern}
- * and {@code access} attributes of the {@code &lt;intercept-url&gt;} elements defined as children of the
- * {@code &lt;http&gt;} element are combined to build the instance used by the {@code FilterSecurityInterceptor}.
+ * The most common method creating an instance is using the Spring Security namespace. For
+ * example, the {@code pattern} and {@code access} attributes of the
+ * {@code &lt;intercept-url&gt;} elements defined as children of the {@code &lt;http&gt;}
+ * element are combined to build the instance used by the
+ * {@code FilterSecurityInterceptor}.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public class DefaultFilterInvocationSecurityMetadataSource implements FilterInvocationSecurityMetadataSource {
+public class DefaultFilterInvocationSecurityMetadataSource implements
+		FilterInvocationSecurityMetadataSource {
 
-    protected final Log logger = LogFactory.getLog(getClass());
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private final Map<RequestMatcher, Collection<ConfigAttribute>> requestMap;
+	private final Map<RequestMatcher, Collection<ConfigAttribute>> requestMap;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Sets the internal request map from the supplied map. The key elements should be of type {@link RequestMatcher},
-     * which. The path stored in the key will depend on
-     * the type of the supplied UrlMatcher.
-     *
-     * @param requestMap order-preserving map of request definitions to attribute lists
-     */
-    public DefaultFilterInvocationSecurityMetadataSource(
-            LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap) {
+	/**
+	 * Sets the internal request map from the supplied map. The key elements should be of
+	 * type {@link RequestMatcher}, which. The path stored in the key will depend on the
+	 * type of the supplied UrlMatcher.
+	 *
+	 * @param requestMap order-preserving map of request definitions to attribute lists
+	 */
+	public DefaultFilterInvocationSecurityMetadataSource(
+			LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap) {
 
-        this.requestMap = requestMap;
-    }
+		this.requestMap = requestMap;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Collection<ConfigAttribute> getAllConfigAttributes() {
-        Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
+	public Collection<ConfigAttribute> getAllConfigAttributes() {
+		Set<ConfigAttribute> allAttributes = new HashSet<ConfigAttribute>();
 
-        for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap.entrySet()) {
-            allAttributes.addAll(entry.getValue());
-        }
+		for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap
+				.entrySet()) {
+			allAttributes.addAll(entry.getValue());
+		}
 
-        return allAttributes;
-    }
+		return allAttributes;
+	}
 
-    public Collection<ConfigAttribute> getAttributes(Object object) {
-        final HttpServletRequest request = ((FilterInvocation) object).getRequest();
-        for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap.entrySet()) {
-            if (entry.getKey().matches(request)) {
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
+	public Collection<ConfigAttribute> getAttributes(Object object) {
+		final HttpServletRequest request = ((FilterInvocation) object).getRequest();
+		for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap
+				.entrySet()) {
+			if (entry.getKey().matches(request)) {
+				return entry.getValue();
+			}
+		}
+		return null;
+	}
 
-    public boolean supports(Class<?> clazz) {
-        return FilterInvocation.class.isAssignableFrom(clazz);
-    }
+	public boolean supports(Class<?> clazz) {
+		return FilterInvocation.class.isAssignableFrom(clazz);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/FilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/intercept/FilterInvocationSecurityMetadataSource.java
index b6f4145812..35edf379d6 100644
--- a/web/src/main/java/org/springframework/security/web/access/intercept/FilterInvocationSecurityMetadataSource.java
+++ b/web/src/main/java/org/springframework/security/web/access/intercept/FilterInvocationSecurityMetadataSource.java
@@ -18,11 +18,11 @@ package org.springframework.security.web.access.intercept;
 import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.web.FilterInvocation;
 
-
 /**
- * Marker interface for <code>SecurityMetadataSource</code> implementations
- * that are designed to perform lookups keyed on  {@link FilterInvocation}s.
+ * Marker interface for <code>SecurityMetadataSource</code> implementations that are
+ * designed to perform lookups keyed on {@link FilterInvocation}s.
  *
  * @author Ben Alex
  */
-public interface FilterInvocationSecurityMetadataSource extends SecurityMetadataSource {}
+public interface FilterInvocationSecurityMetadataSource extends SecurityMetadataSource {
+}
diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java
index 445796749f..4c1c6f8a2d 100644
--- a/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java
+++ b/web/src/main/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptor.java
@@ -29,116 +29,126 @@ import org.springframework.security.access.intercept.AbstractSecurityInterceptor
 import org.springframework.security.access.intercept.InterceptorStatusToken;
 import org.springframework.security.web.FilterInvocation;
 
-
 /**
  * Performs security handling of HTTP resources via a filter implementation.
  * <p>
- * The <code>SecurityMetadataSource</code> required by this security interceptor is of type {@link
- * FilterInvocationSecurityMetadataSource}.
+ * The <code>SecurityMetadataSource</code> required by this security interceptor is of
+ * type {@link FilterInvocationSecurityMetadataSource}.
  * <p>
- * Refer to {@link AbstractSecurityInterceptor} for details on the workflow.</p>
+ * Refer to {@link AbstractSecurityInterceptor} for details on the workflow.
+ * </p>
  *
  * @author Ben Alex
  * @author Rob Winch
  */
-public class FilterSecurityInterceptor extends AbstractSecurityInterceptor implements Filter {
-    //~ Static fields/initializers =====================================================================================
+public class FilterSecurityInterceptor extends AbstractSecurityInterceptor implements
+		Filter {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final String FILTER_APPLIED = "__spring_security_filterSecurityInterceptor_filterApplied";
+	private static final String FILTER_APPLIED = "__spring_security_filterSecurityInterceptor_filterApplied";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private FilterInvocationSecurityMetadataSource securityMetadataSource;
-    private boolean observeOncePerRequest = true;
+	private FilterInvocationSecurityMetadataSource securityMetadataSource;
+	private boolean observeOncePerRequest = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Not used (we rely on IoC container lifecycle services instead)
-     *
-     * @param arg0 ignored
-     *
-     * @throws ServletException never thrown
-     */
-    public void init(FilterConfig arg0) throws ServletException {}
+	/**
+	 * Not used (we rely on IoC container lifecycle services instead)
+	 *
+	 * @param arg0 ignored
+	 *
+	 * @throws ServletException never thrown
+	 */
+	public void init(FilterConfig arg0) throws ServletException {
+	}
 
-    /**
-     * Not used (we rely on IoC container lifecycle services instead)
-     */
-    public void destroy() {}
+	/**
+	 * Not used (we rely on IoC container lifecycle services instead)
+	 */
+	public void destroy() {
+	}
 
-    /**
-     * Method that is actually called by the filter chain. Simply delegates to the {@link
-     * #invoke(FilterInvocation)} method.
-     *
-     * @param request the servlet request
-     * @param response the servlet response
-     * @param chain the filter chain
-     *
-     * @throws IOException if the filter chain fails
-     * @throws ServletException if the filter chain fails
-     */
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
-        FilterInvocation fi = new FilterInvocation(request, response, chain);
-        invoke(fi);
-    }
+	/**
+	 * Method that is actually called by the filter chain. Simply delegates to the
+	 * {@link #invoke(FilterInvocation)} method.
+	 *
+	 * @param request the servlet request
+	 * @param response the servlet response
+	 * @param chain the filter chain
+	 *
+	 * @throws IOException if the filter chain fails
+	 * @throws ServletException if the filter chain fails
+	 */
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		FilterInvocation fi = new FilterInvocation(request, response, chain);
+		invoke(fi);
+	}
 
-    public FilterInvocationSecurityMetadataSource getSecurityMetadataSource() {
-        return this.securityMetadataSource;
-    }
+	public FilterInvocationSecurityMetadataSource getSecurityMetadataSource() {
+		return this.securityMetadataSource;
+	}
 
-    public SecurityMetadataSource obtainSecurityMetadataSource() {
-        return this.securityMetadataSource;
-    }
+	public SecurityMetadataSource obtainSecurityMetadataSource() {
+		return this.securityMetadataSource;
+	}
 
-    public void setSecurityMetadataSource(FilterInvocationSecurityMetadataSource newSource) {
-        this.securityMetadataSource = newSource;
-    }
+	public void setSecurityMetadataSource(FilterInvocationSecurityMetadataSource newSource) {
+		this.securityMetadataSource = newSource;
+	}
 
-    public Class<?> getSecureObjectClass() {
-        return FilterInvocation.class;
-    }
+	public Class<?> getSecureObjectClass() {
+		return FilterInvocation.class;
+	}
 
-    public void invoke(FilterInvocation fi) throws IOException, ServletException {
-        if ((fi.getRequest() != null) && (fi.getRequest().getAttribute(FILTER_APPLIED) != null)
-                && observeOncePerRequest) {
-            // filter already applied to this request and user wants us to observe
-            // once-per-request handling, so don't re-do security checking
-            fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
-        } else {
-            // first time this request being called, so perform security checking
-            if (fi.getRequest() != null) {
-                fi.getRequest().setAttribute(FILTER_APPLIED, Boolean.TRUE);
-            }
+	public void invoke(FilterInvocation fi) throws IOException, ServletException {
+		if ((fi.getRequest() != null)
+				&& (fi.getRequest().getAttribute(FILTER_APPLIED) != null)
+				&& observeOncePerRequest) {
+			// filter already applied to this request and user wants us to observe
+			// once-per-request handling, so don't re-do security checking
+			fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+		}
+		else {
+			// first time this request being called, so perform security checking
+			if (fi.getRequest() != null) {
+				fi.getRequest().setAttribute(FILTER_APPLIED, Boolean.TRUE);
+			}
 
-            InterceptorStatusToken token = super.beforeInvocation(fi);
+			InterceptorStatusToken token = super.beforeInvocation(fi);
 
-            try {
-                fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
-            } finally {
-                super.finallyInvocation(token);
-            }
+			try {
+				fi.getChain().doFilter(fi.getRequest(), fi.getResponse());
+			}
+			finally {
+				super.finallyInvocation(token);
+			}
 
-            super.afterInvocation(token, null);
-        }
-    }
+			super.afterInvocation(token, null);
+		}
+	}
 
-    /**
-     * Indicates whether once-per-request handling will be observed. By default this is <code>true</code>,
-     * meaning the <code>FilterSecurityInterceptor</code> will only execute once-per-request. Sometimes users may wish
-     * it to execute more than once per request, such as when JSP forwards are being used and filter security is
-     * desired on each included fragment of the HTTP request.
-     *
-     * @return <code>true</code> (the default) if once-per-request is honoured, otherwise <code>false</code> if
-     *         <code>FilterSecurityInterceptor</code> will enforce authorizations for each and every fragment of the
-     *         HTTP request.
-     */
-    public boolean isObserveOncePerRequest() {
-        return observeOncePerRequest;
-    }
+	/**
+	 * Indicates whether once-per-request handling will be observed. By default this is
+	 * <code>true</code>, meaning the <code>FilterSecurityInterceptor</code> will only
+	 * execute once-per-request. Sometimes users may wish it to execute more than once per
+	 * request, such as when JSP forwards are being used and filter security is desired on
+	 * each included fragment of the HTTP request.
+	 *
+	 * @return <code>true</code> (the default) if once-per-request is honoured, otherwise
+	 * <code>false</code> if <code>FilterSecurityInterceptor</code> will enforce
+	 * authorizations for each and every fragment of the HTTP request.
+	 */
+	public boolean isObserveOncePerRequest() {
+		return observeOncePerRequest;
+	}
 
-    public void setObserveOncePerRequest(boolean observeOncePerRequest) {
-        this.observeOncePerRequest = observeOncePerRequest;
-    }
+	public void setObserveOncePerRequest(boolean observeOncePerRequest) {
+		this.observeOncePerRequest = observeOncePerRequest;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java b/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java
index 21b13a7806..9099e30345 100644
--- a/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java
+++ b/web/src/main/java/org/springframework/security/web/access/intercept/RequestKey.java
@@ -5,64 +5,64 @@ package org.springframework.security.web.access.intercept;
  * @since 2.0
  */
 public class RequestKey {
-    private final String url;
-    private final String method;
+	private final String url;
+	private final String method;
 
-    public RequestKey(String url) {
-        this(url, null);
-    }
+	public RequestKey(String url) {
+		this(url, null);
+	}
 
-    public RequestKey(String url, String method) {
-        this.url = url;
-        this.method = method;
-    }
+	public RequestKey(String url, String method) {
+		this.url = url;
+		this.method = method;
+	}
 
-    String getUrl() {
-        return url;
-    }
+	String getUrl() {
+		return url;
+	}
 
-    String getMethod() {
-        return method;
-    }
+	String getMethod() {
+		return method;
+	}
 
-    public int hashCode() {
-        int code = 31;
-        code ^= url.hashCode();
+	public int hashCode() {
+		int code = 31;
+		code ^= url.hashCode();
 
-        if (method != null) {
-            code ^= method.hashCode();
-        }
+		if (method != null) {
+			code ^= method.hashCode();
+		}
 
-        return code;
-    }
+		return code;
+	}
 
-    public boolean equals(Object obj) {
-        if (!(obj instanceof RequestKey)) {
-            return false;
-        }
+	public boolean equals(Object obj) {
+		if (!(obj instanceof RequestKey)) {
+			return false;
+		}
 
-        RequestKey key = (RequestKey) obj;
+		RequestKey key = (RequestKey) obj;
 
-        if (!url.equals(key.url)) {
-            return false;
-        }
+		if (!url.equals(key.url)) {
+			return false;
+		}
 
-        if (method == null) {
-            return key.method == null;
-        }
+		if (method == null) {
+			return key.method == null;
+		}
 
-        return method.equals(key.method);
-    }
+		return method.equals(key.method);
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder(url.length() + 7);
-        sb.append("[");
-        if (method != null) {
-            sb.append(method).append(",");
-        }
-        sb.append(url);
-        sb.append("]");
+	public String toString() {
+		StringBuilder sb = new StringBuilder(url.length() + 7);
+		sb.append("[");
+		if (method != null) {
+			sb.append(method).append(",");
+		}
+		sb.append(url);
+		sb.append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
index fb62fb05ab..969238236d 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java
@@ -51,367 +51,414 @@ import org.springframework.web.filter.GenericFilterBean;
  *
  * <h3>Authentication Process</h3>
  *
- * The filter requires that you set the <tt>authenticationManager</tt> property. An <tt>AuthenticationManager</tt> is
- * required to process the authentication request tokens created by implementing classes.
+ * The filter requires that you set the <tt>authenticationManager</tt> property. An
+ * <tt>AuthenticationManager</tt> is required to process the authentication request tokens
+ * created by implementing classes.
  * <p>
- * This filter will intercept a request and attempt to perform authentication from that request if
- * the request matches the {@link #setRequiresAuthenticationRequestMatcher(RequestMatcher)}.
+ * This filter will intercept a request and attempt to perform authentication from that
+ * request if the request matches the
+ * {@link #setRequiresAuthenticationRequestMatcher(RequestMatcher)}.
  * <p>
- * Authentication is performed by the {@link #attemptAuthentication(HttpServletRequest, HttpServletResponse)
+ * Authentication is performed by the
+ * {@link #attemptAuthentication(HttpServletRequest, HttpServletResponse)
  * attemptAuthentication} method, which must be implemented by subclasses.
  *
  * <h4>Authentication Success</h4>
  *
- * If authentication is successful, the resulting {@link Authentication} object will be placed into the
- * <code>SecurityContext</code> for the current thread, which is guaranteed to have already been created by an earlier
- * filter.
+ * If authentication is successful, the resulting {@link Authentication} object will be
+ * placed into the <code>SecurityContext</code> for the current thread, which is
+ * guaranteed to have already been created by an earlier filter.
  * <p>
- * The configured {@link #setAuthenticationSuccessHandler(AuthenticationSuccessHandler) AuthenticationSuccessHandler} will
- * then be called to take the redirect to the appropriate destination after a successful login. The default behaviour
- * is implemented in a {@link SavedRequestAwareAuthenticationSuccessHandler} which will make use of any
- * <tt>DefaultSavedRequest</tt> set by the <tt>ExceptionTranslationFilter</tt> and redirect the user to the URL contained
- * therein. Otherwise it will redirect to the webapp root "/". You can customize this behaviour by injecting a
- * differently configured instance of this class, or by using a different implementation.
+ * The configured {@link #setAuthenticationSuccessHandler(AuthenticationSuccessHandler)
+ * AuthenticationSuccessHandler} will then be called to take the redirect to the
+ * appropriate destination after a successful login. The default behaviour is implemented
+ * in a {@link SavedRequestAwareAuthenticationSuccessHandler} which will make use of any
+ * <tt>DefaultSavedRequest</tt> set by the <tt>ExceptionTranslationFilter</tt> and
+ * redirect the user to the URL contained therein. Otherwise it will redirect to the
+ * webapp root "/". You can customize this behaviour by injecting a differently configured
+ * instance of this class, or by using a different implementation.
  * <p>
- * See the {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)}
+ * See the
+ * {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)}
  * method for more information.
  *
  * <h4>Authentication Failure</h4>
  *
- * If authentication fails, it will delegate to the configured {@link AuthenticationFailureHandler} to allow the
- * failure information to be conveyed to the client. The default implementation is
- * {@link SimpleUrlAuthenticationFailureHandler}, which sends a 401 error code to the client. It may also be configured
- * with a failure URL as an alternative. Again you can inject whatever behaviour you require here.
+ * If authentication fails, it will delegate to the configured
+ * {@link AuthenticationFailureHandler} to allow the failure information to be conveyed to
+ * the client. The default implementation is {@link SimpleUrlAuthenticationFailureHandler}
+ * , which sends a 401 error code to the client. It may also be configured with a failure
+ * URL as an alternative. Again you can inject whatever behaviour you require here.
  *
  * <h4>Event Publication</h4>
  *
- * If authentication is successful, an {@link InteractiveAuthenticationSuccessEvent} will be published via the
- * application context. No events will be published if authentication was unsuccessful, because this would generally be
- * recorded via an {@code AuthenticationManager}-specific application event.
+ * If authentication is successful, an {@link InteractiveAuthenticationSuccessEvent} will
+ * be published via the application context. No events will be published if authentication
+ * was unsuccessful, because this would generally be recorded via an
+ * {@code AuthenticationManager}-specific application event.
  *
  * <h4>Session Authentication</h4>
  *
- * The class has an optional {@link SessionAuthenticationStrategy} which will be invoked immediately after a
- * successful call to {@code attemptAuthentication()}. Different implementations
- * {@link #setSessionAuthenticationStrategy(SessionAuthenticationStrategy) can be injected} to enable things like
- * session-fixation attack prevention or to control the number of simultaneous sessions a principal may have.
+ * The class has an optional {@link SessionAuthenticationStrategy} which will be invoked
+ * immediately after a successful call to {@code attemptAuthentication()}. Different
+ * implementations
+ * {@link #setSessionAuthenticationStrategy(SessionAuthenticationStrategy) can be
+ * injected} to enable things like session-fixation attack prevention or to control the
+ * number of simultaneous sessions a principal may have.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public abstract class AbstractAuthenticationProcessingFilter extends GenericFilterBean implements
-        ApplicationEventPublisherAware, MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
+public abstract class AbstractAuthenticationProcessingFilter extends GenericFilterBean
+		implements ApplicationEventPublisherAware, MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected ApplicationEventPublisher eventPublisher;
-    protected AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
-    private AuthenticationManager authenticationManager;
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private RememberMeServices rememberMeServices = new NullRememberMeServices();
+	protected ApplicationEventPublisher eventPublisher;
+	protected AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	private AuthenticationManager authenticationManager;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private RememberMeServices rememberMeServices = new NullRememberMeServices();
 
-    private RequestMatcher requiresAuthenticationRequestMatcher;
+	private RequestMatcher requiresAuthenticationRequestMatcher;
 
-    private boolean continueChainBeforeSuccessfulAuthentication = false;
+	private boolean continueChainBeforeSuccessfulAuthentication = false;
 
-    private SessionAuthenticationStrategy sessionStrategy = new NullAuthenticatedSessionStrategy();
+	private SessionAuthenticationStrategy sessionStrategy = new NullAuthenticatedSessionStrategy();
 
-    private boolean allowSessionCreation = true;
+	private boolean allowSessionCreation = true;
 
-    private AuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
-    private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
+	private AuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+	private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * @param defaultFilterProcessesUrl the default value for <tt>filterProcessesUrl</tt>.
-     */
-    protected AbstractAuthenticationProcessingFilter(String defaultFilterProcessesUrl) {
-        setFilterProcessesUrl(defaultFilterProcessesUrl);
-    }
+	/**
+	 * @param defaultFilterProcessesUrl the default value for <tt>filterProcessesUrl</tt>.
+	 */
+	protected AbstractAuthenticationProcessingFilter(String defaultFilterProcessesUrl) {
+		setFilterProcessesUrl(defaultFilterProcessesUrl);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param requiresAuthenticationRequestMatcher
-     *            the {@link RequestMatcher} used to determine if authentication
-     *            is required. Cannot be null.
-     */
-    protected AbstractAuthenticationProcessingFilter(RequestMatcher requiresAuthenticationRequestMatcher) {
-        Assert.notNull(requiresAuthenticationRequestMatcher, "requiresAuthenticationRequestMatcher cannot be null");
-        this.requiresAuthenticationRequestMatcher = requiresAuthenticationRequestMatcher;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requiresAuthenticationRequestMatcher the {@link RequestMatcher} used to
+	 * determine if authentication is required. Cannot be null.
+	 */
+	protected AbstractAuthenticationProcessingFilter(
+			RequestMatcher requiresAuthenticationRequestMatcher) {
+		Assert.notNull(requiresAuthenticationRequestMatcher,
+				"requiresAuthenticationRequestMatcher cannot be null");
+		this.requiresAuthenticationRequestMatcher = requiresAuthenticationRequestMatcher;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(authenticationManager, "authenticationManager must be specified");
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(authenticationManager, "authenticationManager must be specified");
 
-        if (rememberMeServices == null) {
-            rememberMeServices = new NullRememberMeServices();
-        }
-    }
+		if (rememberMeServices == null) {
+			rememberMeServices = new NullRememberMeServices();
+		}
+	}
 
-    /**
-     * Invokes the {@link #requiresAuthentication(HttpServletRequest, HttpServletResponse) requiresAuthentication}
-     * method to determine whether the request is for authentication and should be handled by this filter.
-     * If it is an authentication request, the
-     * {@link #attemptAuthentication(HttpServletRequest, HttpServletResponse) attemptAuthentication} will be invoked
-     * to perform the authentication. There are then three possible outcomes:
-     * <ol>
-     * <li>An <tt>Authentication</tt> object is returned.
-     * The configured {@link SessionAuthenticationStrategy} will be invoked (to handle any session-related behaviour
-     * such as creating a new session to protect against session-fixation attacks) followed by the invocation of
-     * {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)} method</li>
-     * <li>An <tt>AuthenticationException</tt> occurs during authentication.
-     * The {@link #unsuccessfulAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationException)
-     * unsuccessfulAuthentication} method will be invoked</li>
-     * <li>Null is returned, indicating that the authentication process is incomplete.
-     * The method will then return immediately, assuming that the subclass has done any necessary work (such as
-     * redirects) to continue the authentication process. The assumption is that a later request will be received
-     * by this method where the returned <tt>Authentication</tt> object is not null.
-     * </ol>
-     */
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
+	/**
+	 * Invokes the
+	 * {@link #requiresAuthentication(HttpServletRequest, HttpServletResponse)
+	 * requiresAuthentication} method to determine whether the request is for
+	 * authentication and should be handled by this filter. If it is an authentication
+	 * request, the
+	 * {@link #attemptAuthentication(HttpServletRequest, HttpServletResponse)
+	 * attemptAuthentication} will be invoked to perform the authentication. There are
+	 * then three possible outcomes:
+	 * <ol>
+	 * <li>An <tt>Authentication</tt> object is returned. The configured
+	 * {@link SessionAuthenticationStrategy} will be invoked (to handle any
+	 * session-related behaviour such as creating a new session to protect against
+	 * session-fixation attacks) followed by the invocation of
+	 * {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)}
+	 * method</li>
+	 * <li>An <tt>AuthenticationException</tt> occurs during authentication. The
+	 * {@link #unsuccessfulAuthentication(HttpServletRequest, HttpServletResponse, AuthenticationException)
+	 * unsuccessfulAuthentication} method will be invoked</li>
+	 * <li>Null is returned, indicating that the authentication process is incomplete. The
+	 * method will then return immediately, assuming that the subclass has done any
+	 * necessary work (such as redirects) to continue the authentication process. The
+	 * assumption is that a later request will be received by this method where the
+	 * returned <tt>Authentication</tt> object is not null.
+	 * </ol>
+	 */
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
 
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        if (!requiresAuthentication(request, response)) {
-            chain.doFilter(request, response);
+		if (!requiresAuthentication(request, response)) {
+			chain.doFilter(request, response);
 
-            return;
-        }
+			return;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Request is to process authentication");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Request is to process authentication");
+		}
 
-        Authentication authResult;
+		Authentication authResult;
 
-        try {
-            authResult = attemptAuthentication(request, response);
-            if (authResult == null) {
-                // return immediately as subclass has indicated that it hasn't completed authentication
-                return;
-            }
-            sessionStrategy.onAuthentication(authResult, request, response);
-        } catch(InternalAuthenticationServiceException failed) {
-            logger.error("An internal error occurred while trying to authenticate the user.", failed);
-            unsuccessfulAuthentication(request, response, failed);
+		try {
+			authResult = attemptAuthentication(request, response);
+			if (authResult == null) {
+				// return immediately as subclass has indicated that it hasn't completed
+				// authentication
+				return;
+			}
+			sessionStrategy.onAuthentication(authResult, request, response);
+		}
+		catch (InternalAuthenticationServiceException failed) {
+			logger.error(
+					"An internal error occurred while trying to authenticate the user.",
+					failed);
+			unsuccessfulAuthentication(request, response, failed);
 
-            return;
-        }
-        catch (AuthenticationException failed) {
-            // Authentication failed
-            unsuccessfulAuthentication(request, response, failed);
+			return;
+		}
+		catch (AuthenticationException failed) {
+			// Authentication failed
+			unsuccessfulAuthentication(request, response, failed);
 
-            return;
-        }
+			return;
+		}
 
-        // Authentication success
-        if (continueChainBeforeSuccessfulAuthentication) {
-            chain.doFilter(request, response);
-        }
+		// Authentication success
+		if (continueChainBeforeSuccessfulAuthentication) {
+			chain.doFilter(request, response);
+		}
 
-        successfulAuthentication(request, response, chain, authResult);
-    }
+		successfulAuthentication(request, response, chain, authResult);
+	}
 
-    /**
-     * Indicates whether this filter should attempt to process a login request for the current invocation.
-     * <p>
-     * It strips any parameters from the "path" section of the request URL (such
-     * as the jsessionid parameter in
-     * <em>http://host/myapp/index.html;jsessionid=blah</em>) before matching
-     * against the <code>filterProcessesUrl</code> property.
-     * <p>
-     * Subclasses may override for special requirements, such as Tapestry integration.
-     *
-     * @return <code>true</code> if the filter should attempt authentication, <code>false</code> otherwise.
-     */
-    protected boolean requiresAuthentication(HttpServletRequest request, HttpServletResponse response) {
-        return requiresAuthenticationRequestMatcher.matches(request);
-    }
+	/**
+	 * Indicates whether this filter should attempt to process a login request for the
+	 * current invocation.
+	 * <p>
+	 * It strips any parameters from the "path" section of the request URL (such as the
+	 * jsessionid parameter in <em>http://host/myapp/index.html;jsessionid=blah</em>)
+	 * before matching against the <code>filterProcessesUrl</code> property.
+	 * <p>
+	 * Subclasses may override for special requirements, such as Tapestry integration.
+	 *
+	 * @return <code>true</code> if the filter should attempt authentication,
+	 * <code>false</code> otherwise.
+	 */
+	protected boolean requiresAuthentication(HttpServletRequest request,
+			HttpServletResponse response) {
+		return requiresAuthenticationRequestMatcher.matches(request);
+	}
 
-    /**
-     * Performs actual authentication.
-     * <p>
-     * The implementation should do one of the following:
-     * <ol>
-     * <li>Return a populated authentication token for the authenticated user, indicating successful authentication</li>
-     * <li>Return null, indicating that the authentication process is still in progress. Before returning, the
-     * implementation should perform any additional work required to complete the process.</li>
-     * <li>Throw an <tt>AuthenticationException</tt> if the authentication process fails</li>
-     * </ol>
-     *
-     * @param request   from which to extract parameters and perform the authentication
-     * @param response  the response, which may be needed if the implementation has to do a redirect as part of a
-     *                  multi-stage authentication process (such as OpenID).
-     *
-     * @return the authenticated user token, or null if authentication is incomplete.
-     *
-     * @throws AuthenticationException if authentication fails.
-     */
-    public abstract Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
-            throws AuthenticationException, IOException, ServletException;
+	/**
+	 * Performs actual authentication.
+	 * <p>
+	 * The implementation should do one of the following:
+	 * <ol>
+	 * <li>Return a populated authentication token for the authenticated user, indicating
+	 * successful authentication</li>
+	 * <li>Return null, indicating that the authentication process is still in progress.
+	 * Before returning, the implementation should perform any additional work required to
+	 * complete the process.</li>
+	 * <li>Throw an <tt>AuthenticationException</tt> if the authentication process fails</li>
+	 * </ol>
+	 *
+	 * @param request from which to extract parameters and perform the authentication
+	 * @param response the response, which may be needed if the implementation has to do a
+	 * redirect as part of a multi-stage authentication process (such as OpenID).
+	 *
+	 * @return the authenticated user token, or null if authentication is incomplete.
+	 *
+	 * @throws AuthenticationException if authentication fails.
+	 */
+	public abstract Authentication attemptAuthentication(HttpServletRequest request,
+			HttpServletResponse response) throws AuthenticationException, IOException,
+			ServletException;
 
-    /**
-     * Default behaviour for successful authentication.
-     * <ol>
-     * <li>Sets the successful <tt>Authentication</tt> object on the {@link SecurityContextHolder}</li>
-     * <li>Informs the configured <tt>RememberMeServices</tt> of the successful login</li>
-     * <li>Fires an {@link InteractiveAuthenticationSuccessEvent} via the configured
-     * <tt>ApplicationEventPublisher</tt></li>
-     * <li>Delegates additional behaviour to the {@link AuthenticationSuccessHandler}.</li>
-     * </ol>
-     *
-     * Subclasses can override this method to continue the {@link FilterChain} after successful authentication.
-     * @param request
-     * @param response
-     * @param chain
-     * @param authResult the object returned from the <tt>attemptAuthentication</tt> method.
-     * @throws IOException
-     * @throws ServletException
-     */
-    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
-            Authentication authResult) throws IOException, ServletException {
+	/**
+	 * Default behaviour for successful authentication.
+	 * <ol>
+	 * <li>Sets the successful <tt>Authentication</tt> object on the
+	 * {@link SecurityContextHolder}</li>
+	 * <li>Informs the configured <tt>RememberMeServices</tt> of the successful login</li>
+	 * <li>Fires an {@link InteractiveAuthenticationSuccessEvent} via the configured
+	 * <tt>ApplicationEventPublisher</tt></li>
+	 * <li>Delegates additional behaviour to the {@link AuthenticationSuccessHandler}.</li>
+	 * </ol>
+	 *
+	 * Subclasses can override this method to continue the {@link FilterChain} after
+	 * successful authentication.
+	 * @param request
+	 * @param response
+	 * @param chain
+	 * @param authResult the object returned from the <tt>attemptAuthentication</tt>
+	 * method.
+	 * @throws IOException
+	 * @throws ServletException
+	 */
+	protected void successfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain, Authentication authResult)
+			throws IOException, ServletException {
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication success. Updating SecurityContextHolder to contain: " + authResult);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication success. Updating SecurityContextHolder to contain: "
+					+ authResult);
+		}
 
-        SecurityContextHolder.getContext().setAuthentication(authResult);
+		SecurityContextHolder.getContext().setAuthentication(authResult);
 
-        rememberMeServices.loginSuccess(request, response, authResult);
+		rememberMeServices.loginSuccess(request, response, authResult);
 
-        // Fire event
-        if (this.eventPublisher != null) {
-            eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass()));
-        }
+		// Fire event
+		if (this.eventPublisher != null) {
+			eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(
+					authResult, this.getClass()));
+		}
 
-        successHandler.onAuthenticationSuccess(request, response, authResult);
-    }
+		successHandler.onAuthenticationSuccess(request, response, authResult);
+	}
 
-    /**
-     * Default behaviour for unsuccessful authentication.
-     * <ol>
-     * <li>Clears the {@link SecurityContextHolder}</li>
-     * <li>Stores the exception in the session (if it exists or <tt>allowSesssionCreation</tt> is set to <tt>true</tt>)</li>
-     * <li>Informs the configured <tt>RememberMeServices</tt> of the failed login</li>
-     * <li>Delegates additional behaviour to the {@link AuthenticationFailureHandler}.</li>
-     * </ol>
-     */
-    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException failed) throws IOException, ServletException {
-        SecurityContextHolder.clearContext();
+	/**
+	 * Default behaviour for unsuccessful authentication.
+	 * <ol>
+	 * <li>Clears the {@link SecurityContextHolder}</li>
+	 * <li>Stores the exception in the session (if it exists or
+	 * <tt>allowSesssionCreation</tt> is set to <tt>true</tt>)</li>
+	 * <li>Informs the configured <tt>RememberMeServices</tt> of the failed login</li>
+	 * <li>Delegates additional behaviour to the {@link AuthenticationFailureHandler}.</li>
+	 * </ol>
+	 */
+	protected void unsuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException failed)
+			throws IOException, ServletException {
+		SecurityContextHolder.clearContext();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication request failed: " + failed.toString());
-            logger.debug("Updated SecurityContextHolder to contain null Authentication");
-            logger.debug("Delegating to authentication failure handler " + failureHandler);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication request failed: " + failed.toString());
+			logger.debug("Updated SecurityContextHolder to contain null Authentication");
+			logger.debug("Delegating to authentication failure handler " + failureHandler);
+		}
 
-        rememberMeServices.loginFail(request, response);
+		rememberMeServices.loginFail(request, response);
 
-        failureHandler.onAuthenticationFailure(request, response, failed);
-    }
+		failureHandler.onAuthenticationFailure(request, response, failed);
+	}
 
-    protected AuthenticationManager getAuthenticationManager() {
-        return authenticationManager;
-    }
+	protected AuthenticationManager getAuthenticationManager() {
+		return authenticationManager;
+	}
 
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 
-    /**
-     * Sets the URL that determines if authentication is required
-     *
-     * @param filterProcessesUrl
-     */
-    public void setFilterProcessesUrl(String filterProcessesUrl) {
-        setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(filterProcessesUrl));
-    }
+	/**
+	 * Sets the URL that determines if authentication is required
+	 *
+	 * @param filterProcessesUrl
+	 */
+	public void setFilterProcessesUrl(String filterProcessesUrl) {
+		setRequiresAuthenticationRequestMatcher(new AntPathRequestMatcher(
+				filterProcessesUrl));
+	}
 
-    public final void setRequiresAuthenticationRequestMatcher(RequestMatcher requestMatcher) {
-        Assert.notNull(requestMatcher, "requestMatcher cannot be null");
-        this.requiresAuthenticationRequestMatcher = requestMatcher;
-    }
+	public final void setRequiresAuthenticationRequestMatcher(
+			RequestMatcher requestMatcher) {
+		Assert.notNull(requestMatcher, "requestMatcher cannot be null");
+		this.requiresAuthenticationRequestMatcher = requestMatcher;
+	}
 
-    public RememberMeServices getRememberMeServices() {
-        return rememberMeServices;
-    }
+	public RememberMeServices getRememberMeServices() {
+		return rememberMeServices;
+	}
 
-    public void setRememberMeServices(RememberMeServices rememberMeServices) {
-        Assert.notNull("rememberMeServices cannot be null");
-        this.rememberMeServices = rememberMeServices;
-    }
+	public void setRememberMeServices(RememberMeServices rememberMeServices) {
+		Assert.notNull("rememberMeServices cannot be null");
+		this.rememberMeServices = rememberMeServices;
+	}
 
-    /**
-     * Indicates if the filter chain should be continued prior to delegation to
-     * {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)}, which
-     * may be useful in certain environment (such as
-     * Tapestry applications). Defaults to <code>false</code>.
-     */
-    public void setContinueChainBeforeSuccessfulAuthentication(boolean continueChainBeforeSuccessfulAuthentication) {
-        this.continueChainBeforeSuccessfulAuthentication = continueChainBeforeSuccessfulAuthentication;
-    }
+	/**
+	 * Indicates if the filter chain should be continued prior to delegation to
+	 * {@link #successfulAuthentication(HttpServletRequest, HttpServletResponse, FilterChain, Authentication)}
+	 * , which may be useful in certain environment (such as Tapestry applications).
+	 * Defaults to <code>false</code>.
+	 */
+	public void setContinueChainBeforeSuccessfulAuthentication(
+			boolean continueChainBeforeSuccessfulAuthentication) {
+		this.continueChainBeforeSuccessfulAuthentication = continueChainBeforeSuccessfulAuthentication;
+	}
 
-    public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) {
-        this.eventPublisher = eventPublisher;
-    }
+	public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) {
+		this.eventPublisher = eventPublisher;
+	}
 
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 
-    protected boolean getAllowSessionCreation() {
-        return allowSessionCreation;
-    }
+	protected boolean getAllowSessionCreation() {
+		return allowSessionCreation;
+	}
 
-    public void setAllowSessionCreation(boolean allowSessionCreation) {
-        this.allowSessionCreation = allowSessionCreation;
-    }
+	public void setAllowSessionCreation(boolean allowSessionCreation) {
+		this.allowSessionCreation = allowSessionCreation;
+	}
 
-    /**
-     * The session handling strategy which will be invoked immediately after an authentication request is
-     * successfully processed by the <tt>AuthenticationManager</tt>. Used, for example, to handle changing of the
-     * session identifier to prevent session fixation attacks.
-     *
-     * @param sessionStrategy the implementation to use. If not set a null implementation is
-     * used.
-     */
-    public void setSessionAuthenticationStrategy(SessionAuthenticationStrategy sessionStrategy) {
-        this.sessionStrategy = sessionStrategy;
-    }
+	/**
+	 * The session handling strategy which will be invoked immediately after an
+	 * authentication request is successfully processed by the
+	 * <tt>AuthenticationManager</tt>. Used, for example, to handle changing of the
+	 * session identifier to prevent session fixation attacks.
+	 *
+	 * @param sessionStrategy the implementation to use. If not set a null implementation
+	 * is used.
+	 */
+	public void setSessionAuthenticationStrategy(
+			SessionAuthenticationStrategy sessionStrategy) {
+		this.sessionStrategy = sessionStrategy;
+	}
 
-    /**
-     * Sets the strategy used to handle a successful authentication.
-     * By default a {@link SavedRequestAwareAuthenticationSuccessHandler} is used.
-     */
-    public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler successHandler) {
-        Assert.notNull(successHandler, "successHandler cannot be null");
-        this.successHandler = successHandler;
-    }
+	/**
+	 * Sets the strategy used to handle a successful authentication. By default a
+	 * {@link SavedRequestAwareAuthenticationSuccessHandler} is used.
+	 */
+	public void setAuthenticationSuccessHandler(
+			AuthenticationSuccessHandler successHandler) {
+		Assert.notNull(successHandler, "successHandler cannot be null");
+		this.successHandler = successHandler;
+	}
 
-    public void setAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
-        Assert.notNull(failureHandler, "failureHandler cannot be null");
-        this.failureHandler = failureHandler;
-    }
+	public void setAuthenticationFailureHandler(
+			AuthenticationFailureHandler failureHandler) {
+		Assert.notNull(failureHandler, "failureHandler cannot be null");
+		this.failureHandler = failureHandler;
+	}
 
-    protected AuthenticationSuccessHandler getSuccessHandler() {
-        return successHandler;
-    }
+	protected AuthenticationSuccessHandler getSuccessHandler() {
+		return successHandler;
+	}
 
-    protected AuthenticationFailureHandler getFailureHandler() {
-        return failureHandler;
-    }
+	protected AuthenticationFailureHandler getFailureHandler() {
+		return failureHandler;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java
index a5e5c4e8b7..f300874da8 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AbstractAuthenticationTargetUrlRequestHandler.java
@@ -18,30 +18,30 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Base class containing the logic used by strategies which handle redirection to a URL and
- * are passed an {@code Authentication} object as part of the contract.
- * See {@link AuthenticationSuccessHandler} and
- * {@link org.springframework.security.web.authentication.logout.LogoutSuccessHandler LogoutSuccessHandler}, for example.
+ * Base class containing the logic used by strategies which handle redirection to a URL
+ * and are passed an {@code Authentication} object as part of the contract. See
+ * {@link AuthenticationSuccessHandler} and
+ * {@link org.springframework.security.web.authentication.logout.LogoutSuccessHandler
+ * LogoutSuccessHandler}, for example.
  * <p>
- * Uses the following logic sequence to determine how it should handle the forward/redirect
+ * Uses the following logic sequence to determine how it should handle the
+ * forward/redirect
  * <ul>
  * <li>
- * If the {@code alwaysUseDefaultTargetUrl} property is set to true, the {@code defaultTargetUrl} property
- * will be used for the destination.
- * </li>
+ * If the {@code alwaysUseDefaultTargetUrl} property is set to true, the
+ * {@code defaultTargetUrl} property will be used for the destination.</li>
  * <li>
- * If a parameter matching the value of {@code targetUrlParameter} has been set on the request, the value will be used
- * as the destination. If you are enabling this functionality, then you should ensure that the parameter
- * cannot be used by an attacker to redirect the user to a malicious site (by clicking on a URL with the parameter
- * included, for example). Typically it would be used when the parameter is included in the login form and submitted with
- * the username and password.
- * </li>
+ * If a parameter matching the value of {@code targetUrlParameter} has been set on the
+ * request, the value will be used as the destination. If you are enabling this
+ * functionality, then you should ensure that the parameter cannot be used by an attacker
+ * to redirect the user to a malicious site (by clicking on a URL with the parameter
+ * included, for example). Typically it would be used when the parameter is included in
+ * the login form and submitted with the username and password.</li>
  * <li>
- * If the {@code useReferer} property is set, the "Referer" HTTP header value will be used, if present.
- * </li>
+ * If the {@code useReferer} property is set, the "Referer" HTTP header value will be
+ * used, if present.</li>
  * <li>
- * As a fallback option, the {@code defaultTargetUrl} value will be used.
- * </li>
+ * As a fallback option, the {@code defaultTargetUrl} value will be used.</li>
  * </ul>
  *
  * @author Luke Taylor
@@ -49,138 +49,144 @@ import org.springframework.util.StringUtils;
  */
 public abstract class AbstractAuthenticationTargetUrlRequestHandler {
 
-    protected final Log logger = LogFactory.getLog(this.getClass());
-    private String targetUrlParameter = null;
-    private String defaultTargetUrl = "/";
-    private boolean alwaysUseDefaultTargetUrl = false;
-    private boolean useReferer = false;
-    private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	protected final Log logger = LogFactory.getLog(this.getClass());
+	private String targetUrlParameter = null;
+	private String defaultTargetUrl = "/";
+	private boolean alwaysUseDefaultTargetUrl = false;
+	private boolean useReferer = false;
+	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
-    protected AbstractAuthenticationTargetUrlRequestHandler() {
-    }
+	protected AbstractAuthenticationTargetUrlRequestHandler() {
+	}
 
-    /**
-     * Invokes the configured {@code RedirectStrategy} with the URL returned by the {@code determineTargetUrl} method.
-     * <p>
-     * The redirect will not be performed if the response has already been committed.
-     */
-    protected void handle(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException {
-        String targetUrl = determineTargetUrl(request, response);
+	/**
+	 * Invokes the configured {@code RedirectStrategy} with the URL returned by the
+	 * {@code determineTargetUrl} method.
+	 * <p>
+	 * The redirect will not be performed if the response has already been committed.
+	 */
+	protected void handle(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) throws IOException, ServletException {
+		String targetUrl = determineTargetUrl(request, response);
 
-        if (response.isCommitted()) {
-            logger.debug("Response has already been committed. Unable to redirect to " + targetUrl);
-            return;
-        }
+		if (response.isCommitted()) {
+			logger.debug("Response has already been committed. Unable to redirect to "
+					+ targetUrl);
+			return;
+		}
 
-        redirectStrategy.sendRedirect(request, response, targetUrl);
-    }
+		redirectStrategy.sendRedirect(request, response, targetUrl);
+	}
 
-    /**
-     * Builds the target URL according to the logic defined in the main class Javadoc.
-     */
-    protected String determineTargetUrl(HttpServletRequest request, HttpServletResponse response) {
-        if (isAlwaysUseDefaultTargetUrl()) {
-            return defaultTargetUrl;
-        }
+	/**
+	 * Builds the target URL according to the logic defined in the main class Javadoc.
+	 */
+	protected String determineTargetUrl(HttpServletRequest request,
+			HttpServletResponse response) {
+		if (isAlwaysUseDefaultTargetUrl()) {
+			return defaultTargetUrl;
+		}
 
-        // Check for the parameter and use that if available
-        String targetUrl = null;
+		// Check for the parameter and use that if available
+		String targetUrl = null;
 
-        if (targetUrlParameter != null  ) {
-            targetUrl = request.getParameter(targetUrlParameter);
+		if (targetUrlParameter != null) {
+			targetUrl = request.getParameter(targetUrlParameter);
 
-            if (StringUtils.hasText(targetUrl)) {
-                logger.debug("Found targetUrlParameter in request: " + targetUrl);
+			if (StringUtils.hasText(targetUrl)) {
+				logger.debug("Found targetUrlParameter in request: " + targetUrl);
 
-                return targetUrl;
-            }
-        }
+				return targetUrl;
+			}
+		}
 
-        if (useReferer && !StringUtils.hasLength(targetUrl)) {
-            targetUrl = request.getHeader("Referer");
-            logger.debug("Using Referer header: " + targetUrl);
-        }
+		if (useReferer && !StringUtils.hasLength(targetUrl)) {
+			targetUrl = request.getHeader("Referer");
+			logger.debug("Using Referer header: " + targetUrl);
+		}
 
-        if (!StringUtils.hasText(targetUrl)) {
-            targetUrl = defaultTargetUrl;
-            logger.debug("Using default Url: " + targetUrl);
-        }
+		if (!StringUtils.hasText(targetUrl)) {
+			targetUrl = defaultTargetUrl;
+			logger.debug("Using default Url: " + targetUrl);
+		}
 
-        return targetUrl;
-    }
+		return targetUrl;
+	}
 
-    /**
-     * Supplies the default target Url that will be used if no saved request is found or the
-     * {@code alwaysUseDefaultTargetUrl} property is set to true. If not set, defaults to {@code /}.
-     *
-     * @return the defaultTargetUrl property
-     */
-    protected final String getDefaultTargetUrl() {
-        return defaultTargetUrl;
-    }
+	/**
+	 * Supplies the default target Url that will be used if no saved request is found or
+	 * the {@code alwaysUseDefaultTargetUrl} property is set to true. If not set, defaults
+	 * to {@code /}.
+	 *
+	 * @return the defaultTargetUrl property
+	 */
+	protected final String getDefaultTargetUrl() {
+		return defaultTargetUrl;
+	}
 
-    /**
-     * Supplies the default target Url that will be used if no saved request is found in the session, or the
-     * {@code alwaysUseDefaultTargetUrl} property is set to true. If not set, defaults to {@code /}. It
-     * will be treated as relative to the web-app's context path, and should include the leading <code>/</code>.
-     * Alternatively, inclusion of a scheme name (such as "http://" or "https://") as the prefix will denote a
-     * fully-qualified URL and this is also supported.
-     *
-     * @param defaultTargetUrl
-     */
-    public void setDefaultTargetUrl(String defaultTargetUrl) {
-        Assert.isTrue(UrlUtils.isValidRedirectUrl(defaultTargetUrl),
-                "defaultTarget must start with '/' or with 'http(s)'");
-        this.defaultTargetUrl = defaultTargetUrl;
-    }
+	/**
+	 * Supplies the default target Url that will be used if no saved request is found in
+	 * the session, or the {@code alwaysUseDefaultTargetUrl} property is set to true. If
+	 * not set, defaults to {@code /}. It will be treated as relative to the web-app's
+	 * context path, and should include the leading <code>/</code>. Alternatively,
+	 * inclusion of a scheme name (such as "http://" or "https://") as the prefix will
+	 * denote a fully-qualified URL and this is also supported.
+	 *
+	 * @param defaultTargetUrl
+	 */
+	public void setDefaultTargetUrl(String defaultTargetUrl) {
+		Assert.isTrue(UrlUtils.isValidRedirectUrl(defaultTargetUrl),
+				"defaultTarget must start with '/' or with 'http(s)'");
+		this.defaultTargetUrl = defaultTargetUrl;
+	}
 
-    /**
-     * If <code>true</code>, will always redirect to the value of {@code defaultTargetUrl}
-     * (defaults to <code>false</code>).
-     */
-    public void setAlwaysUseDefaultTargetUrl(boolean alwaysUseDefaultTargetUrl) {
-        this.alwaysUseDefaultTargetUrl = alwaysUseDefaultTargetUrl;
-    }
+	/**
+	 * If <code>true</code>, will always redirect to the value of {@code defaultTargetUrl}
+	 * (defaults to <code>false</code>).
+	 */
+	public void setAlwaysUseDefaultTargetUrl(boolean alwaysUseDefaultTargetUrl) {
+		this.alwaysUseDefaultTargetUrl = alwaysUseDefaultTargetUrl;
+	}
 
-    protected boolean isAlwaysUseDefaultTargetUrl() {
-        return alwaysUseDefaultTargetUrl;
-    }
+	protected boolean isAlwaysUseDefaultTargetUrl() {
+		return alwaysUseDefaultTargetUrl;
+	}
 
-    /**
-     * If this property is set, the current request will be checked for this a parameter with this name
-     * and the value used as the target URL if present.
-     *
-     * @param targetUrlParameter the name of the parameter containing the encoded target URL. Defaults
-     * to null.
-     */
-    public void setTargetUrlParameter(String targetUrlParameter) {
-        if(targetUrlParameter != null) {
-            Assert.hasText(targetUrlParameter,"targetUrlParameter cannot be empty");
-        }
-        this.targetUrlParameter = targetUrlParameter;
-    }
+	/**
+	 * If this property is set, the current request will be checked for this a parameter
+	 * with this name and the value used as the target URL if present.
+	 *
+	 * @param targetUrlParameter the name of the parameter containing the encoded target
+	 * URL. Defaults to null.
+	 */
+	public void setTargetUrlParameter(String targetUrlParameter) {
+		if (targetUrlParameter != null) {
+			Assert.hasText(targetUrlParameter, "targetUrlParameter cannot be empty");
+		}
+		this.targetUrlParameter = targetUrlParameter;
+	}
 
-    protected String getTargetUrlParameter() {
-        return targetUrlParameter;
-    }
+	protected String getTargetUrlParameter() {
+		return targetUrlParameter;
+	}
 
-    /**
-     * Allows overriding of the behaviour when redirecting to a target URL.
-     */
-    public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
-        this.redirectStrategy = redirectStrategy;
-    }
+	/**
+	 * Allows overriding of the behaviour when redirecting to a target URL.
+	 */
+	public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
+		this.redirectStrategy = redirectStrategy;
+	}
 
-    protected RedirectStrategy getRedirectStrategy() {
-        return redirectStrategy;
-    }
+	protected RedirectStrategy getRedirectStrategy() {
+		return redirectStrategy;
+	}
 
-    /**
-     * If set to {@code true} the {@code Referer} header will be used (if available). Defaults to {@code false}.
-     */
-    public void setUseReferer(boolean useReferer) {
-        this.useReferer = useReferer;
-    }
+	/**
+	 * If set to {@code true} the {@code Referer} header will be used (if available).
+	 * Defaults to {@code false}.
+	 */
+	public void setUseReferer(boolean useReferer) {
+		this.useReferer = useReferer;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java
index 09e708e680..68caed36c8 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.authentication;
 
-
 import java.io.IOException;
 import java.util.*;
 
@@ -36,94 +35,102 @@ import org.springframework.security.core.userdetails.memory.UserAttribute;
 import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
- * Detects if there is no {@code Authentication} object in the {@code SecurityContextHolder}, and
- * populates it with one if needed.
+ * Detects if there is no {@code Authentication} object in the
+ * {@code SecurityContextHolder}, and populates it with one if needed.
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public class AnonymousAuthenticationFilter extends GenericFilterBean  implements InitializingBean {
+public class AnonymousAuthenticationFilter extends GenericFilterBean implements
+		InitializingBean {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource
-            = new WebAuthenticationDetailsSource();
-    private String key;
-    private Object principal;
-    private List<GrantedAuthority> authorities;
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	private String key;
+	private Object principal;
+	private List<GrantedAuthority> authorities;
 
-    /**
-     * Creates a filter with a principal named "anonymousUser" and the single authority "ROLE_ANONYMOUS".
-     *
-     * @param key the key to identify tokens created by this filter
-     */
-    public AnonymousAuthenticationFilter(String key) {
-        this(key, "anonymousUser", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
-    }
+	/**
+	 * Creates a filter with a principal named "anonymousUser" and the single authority
+	 * "ROLE_ANONYMOUS".
+	 *
+	 * @param key the key to identify tokens created by this filter
+	 */
+	public AnonymousAuthenticationFilter(String key) {
+		this(key, "anonymousUser", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+	}
 
-    /**
-     *
-     * @param key key the key to identify tokens created by this filter
-     * @param principal the principal which will be used to represent anonymous users
-     * @param authorities the authority list for anonymous users
-     */
-    public AnonymousAuthenticationFilter(String key, Object principal, List<GrantedAuthority> authorities) {
-        Assert.hasLength(key, "key cannot be null or empty");
-        Assert.notNull(principal, "Anonymous authentication principal must be set");
-        Assert.notNull(authorities, "Anonymous authorities must be set");
-        this.key = key;
-        this.principal = principal;
-        this.authorities = authorities;
-    }
+	/**
+	 *
+	 * @param key key the key to identify tokens created by this filter
+	 * @param principal the principal which will be used to represent anonymous users
+	 * @param authorities the authority list for anonymous users
+	 */
+	public AnonymousAuthenticationFilter(String key, Object principal,
+			List<GrantedAuthority> authorities) {
+		Assert.hasLength(key, "key cannot be null or empty");
+		Assert.notNull(principal, "Anonymous authentication principal must be set");
+		Assert.notNull(authorities, "Anonymous authorities must be set");
+		this.key = key;
+		this.principal = principal;
+		this.authorities = authorities;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.hasLength(key);
-        Assert.notNull(principal, "Anonymous authentication principal must be set");
-        Assert.notNull(authorities, "Anonymous authorities must be set");
-    }
+	@Override
+	public void afterPropertiesSet() {
+		Assert.hasLength(key);
+		Assert.notNull(principal, "Anonymous authentication principal must be set");
+		Assert.notNull(authorities, "Anonymous authorities must be set");
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
 
-        if (SecurityContextHolder.getContext().getAuthentication() == null) {
-            SecurityContextHolder.getContext().setAuthentication(createAuthentication((HttpServletRequest) req));
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			SecurityContextHolder.getContext().setAuthentication(
+					createAuthentication((HttpServletRequest) req));
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Populated SecurityContextHolder with anonymous token: '"
-                    + SecurityContextHolder.getContext().getAuthentication() + "'");
-            }
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug("SecurityContextHolder not populated with anonymous token, as it already contained: '"
-                    + SecurityContextHolder.getContext().getAuthentication() + "'");
-            }
-        }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Populated SecurityContextHolder with anonymous token: '"
+						+ SecurityContextHolder.getContext().getAuthentication() + "'");
+			}
+		}
+		else {
+			if (logger.isDebugEnabled()) {
+				logger.debug("SecurityContextHolder not populated with anonymous token, as it already contained: '"
+						+ SecurityContextHolder.getContext().getAuthentication() + "'");
+			}
+		}
 
-        chain.doFilter(req, res);
-    }
+		chain.doFilter(req, res);
+	}
 
-    protected Authentication createAuthentication(HttpServletRequest request) {
-        AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(key, principal, authorities);
-        auth.setDetails(authenticationDetailsSource.buildDetails(request));
+	protected Authentication createAuthentication(HttpServletRequest request) {
+		AnonymousAuthenticationToken auth = new AnonymousAuthenticationToken(key,
+				principal, authorities);
+		auth.setDetails(authenticationDetailsSource.buildDetails(request));
 
-        return auth;
-    }
+		return auth;
+	}
 
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
 
-    public Object getPrincipal() {
-        return principal;
-    }
+	public Object getPrincipal() {
+		return principal;
+	}
 
-    public List<GrantedAuthority> getAuthorities() {
-        return authorities;
-    }
+	public List<GrantedAuthority> getAuthorities() {
+		return authorities;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java
index 72a84d4a81..8b156a3c47 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationFailureHandler.java
@@ -12,22 +12,25 @@ import org.springframework.security.core.AuthenticationException;
 /**
  * Strategy used to handle a failed authentication attempt.
  * <p>
- * Typical behaviour might be to redirect the user to the authentication page (in the case of a form login) to
- * allow them to try again. More sophisticated logic might be implemented depending on the type of the exception.
- * For example, a {@link CredentialsExpiredException} might cause a redirect to a web controller which allowed the
- * user to change their password.
+ * Typical behaviour might be to redirect the user to the authentication page (in the case
+ * of a form login) to allow them to try again. More sophisticated logic might be
+ * implemented depending on the type of the exception. For example, a
+ * {@link CredentialsExpiredException} might cause a redirect to a web controller which
+ * allowed the user to change their password.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface AuthenticationFailureHandler {
 
-    /**
-     * Called when an authentication attempt fails.
-     * @param request the request during which the authentication attempt occurred.
-     * @param response the response.
-     * @param exception the exception which was thrown to reject the authentication request.
-     */
-    void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException exception) throws IOException, ServletException;
+	/**
+	 * Called when an authentication attempt fails.
+	 * @param request the request during which the authentication attempt occurred.
+	 * @param response the response.
+	 * @param exception the exception which was thrown to reject the authentication
+	 * request.
+	 */
+	void onAuthenticationFailure(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException exception)
+			throws IOException, ServletException;
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java
index 4d761c541a..288dbf4f54 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/AuthenticationSuccessHandler.java
@@ -11,24 +11,28 @@ import org.springframework.security.core.Authentication;
 /**
  * Strategy used to handle a successful user authentication.
  * <p>
- * Implementations can do whatever they want but typical behaviour would be to control the navigation to the
- * subsequent destination (using a redirect or a forward). For example, after a user has logged in by submitting a
- * login form, the application needs to decide where they should be redirected to afterwards
- * (see {@link AbstractAuthenticationProcessingFilter} and subclasses). Other logic may also be included if required.
+ * Implementations can do whatever they want but typical behaviour would be to control the
+ * navigation to the subsequent destination (using a redirect or a forward). For example,
+ * after a user has logged in by submitting a login form, the application needs to decide
+ * where they should be redirected to afterwards (see
+ * {@link AbstractAuthenticationProcessingFilter} and subclasses). Other logic may also be
+ * included if required.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface AuthenticationSuccessHandler {
 
-    /**
-     * Called when a user has been successfully authenticated.
-     *
-     * @param request the request which caused the successful authentication
-     * @param response the response
-     * @param authentication the <tt>Authentication</tt> object which was created during the authentication process.
-     */
-    void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication authentication) throws IOException, ServletException;
+	/**
+	 * Called when a user has been successfully authenticated.
+	 *
+	 * @param request the request which caused the successful authentication
+	 * @param response the response
+	 * @param authentication the <tt>Authentication</tt> object which was created during
+	 * the authentication process.
+	 */
+	void onAuthenticationSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication authentication)
+			throws IOException, ServletException;
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java
index 39a7a633d1..ce51626ed1 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPoint.java
@@ -33,10 +33,12 @@ import org.springframework.security.web.util.matcher.RequestMatcherEditor;
 import org.springframework.util.Assert;
 
 /**
- * An {@code AuthenticationEntryPoint} which selects a concrete {@code AuthenticationEntryPoint} based on a
- * {@link RequestMatcher} evaluation.
+ * An {@code AuthenticationEntryPoint} which selects a concrete
+ * {@code AuthenticationEntryPoint} based on a {@link RequestMatcher} evaluation.
  *
- * <p>A configuration might look like this:</p>
+ * <p>
+ * A configuration might look like this:
+ * </p>
  *
  * <pre>
  * &lt;bean id=&quot;daep&quot; class=&quot;org.springframework.security.web.authentication.DelegatingAuthenticationEntryPoint&quot;&gt;
@@ -50,58 +52,58 @@ import org.springframework.util.Assert;
  * &lt;/bean&gt;
  * </pre>
  *
- * This example uses the {@link RequestMatcherEditor} which creates a {@link ELRequestMatcher} instances for the map
- * keys.
+ * This example uses the {@link RequestMatcherEditor} which creates a
+ * {@link ELRequestMatcher} instances for the map keys.
  *
  * @author Mike Wiesner
  * @since 3.0.2
  */
-public class DelegatingAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean {
-    private final Log logger = LogFactory.getLog(getClass());
+public class DelegatingAuthenticationEntryPoint implements AuthenticationEntryPoint,
+		InitializingBean {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints;
-    private AuthenticationEntryPoint defaultEntryPoint;
+	private final LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints;
+	private AuthenticationEntryPoint defaultEntryPoint;
 
-    public DelegatingAuthenticationEntryPoint(LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints) {
-        this.entryPoints = entryPoints;
-    }
+	public DelegatingAuthenticationEntryPoint(
+			LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints) {
+		this.entryPoints = entryPoints;
+	}
 
-    public void commence(HttpServletRequest request,
-            HttpServletResponse response, AuthenticationException authException)
-            throws IOException, ServletException {
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
 
-        for (RequestMatcher requestMatcher : entryPoints.keySet()) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Trying to match using " + requestMatcher);
-            }
-            if (requestMatcher.matches(request)) {
-               AuthenticationEntryPoint entryPoint = entryPoints.get(requestMatcher);
-               if(logger.isDebugEnabled()) {
-                   logger.debug("Match found! Executing " + entryPoint);
-               }
-               entryPoint.commence(request, response, authException);
-               return;
-            }
-        }
+		for (RequestMatcher requestMatcher : entryPoints.keySet()) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Trying to match using " + requestMatcher);
+			}
+			if (requestMatcher.matches(request)) {
+				AuthenticationEntryPoint entryPoint = entryPoints.get(requestMatcher);
+				if (logger.isDebugEnabled()) {
+					logger.debug("Match found! Executing " + entryPoint);
+				}
+				entryPoint.commence(request, response, authException);
+				return;
+			}
+		}
 
-        if(logger.isDebugEnabled()) {
-            logger.debug("No match found. Using default entry point " + defaultEntryPoint);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("No match found. Using default entry point " + defaultEntryPoint);
+		}
 
-        // No EntryPoint matched, use defaultEntryPoint
-        defaultEntryPoint.commence(request, response, authException);
-    }
+		// No EntryPoint matched, use defaultEntryPoint
+		defaultEntryPoint.commence(request, response, authException);
+	}
 
-    /**
-     * EntryPoint which is used when no RequestMatcher returned true
-     */
-    public void setDefaultEntryPoint(AuthenticationEntryPoint defaultEntryPoint) {
-        this.defaultEntryPoint = defaultEntryPoint;
-    }
+	/**
+	 * EntryPoint which is used when no RequestMatcher returned true
+	 */
+	public void setDefaultEntryPoint(AuthenticationEntryPoint defaultEntryPoint) {
+		this.defaultEntryPoint = defaultEntryPoint;
+	}
 
-    public void afterPropertiesSet() throws Exception {
-       Assert.notEmpty(entryPoints, "entryPoints must be specified");
-       Assert.notNull(defaultEntryPoint, "defaultEntryPoint must be specified");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.notEmpty(entryPoints, "entryPoints must be specified");
+		Assert.notNull(defaultEntryPoint, "defaultEntryPoint must be specified");
+	}
 }
-
diff --git a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java
index 46175f7622..f6adb8b4ae 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandler.java
@@ -29,56 +29,56 @@ import java.util.Map;
  * An {@link AuthenticationFailureHandler} that delegates to other
  * {@link AuthenticationFailureHandler} instances based upon the type of
  * {@link AuthenticationException} passed into
- * {@link #onAuthenticationFailure(HttpServletRequest, HttpServletResponse, AuthenticationException)}.
+ * {@link #onAuthenticationFailure(HttpServletRequest, HttpServletResponse, AuthenticationException)}
+ * .
  *
  * @author Kazuki Shimizu
  * @since 4.0
  */
-public class DelegatingAuthenticationFailureHandler implements AuthenticationFailureHandler {
+public class DelegatingAuthenticationFailureHandler implements
+		AuthenticationFailureHandler {
 
-    private final LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers;
+	private final LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers;
 
-    private final AuthenticationFailureHandler defaultHandler;
+	private final AuthenticationFailureHandler defaultHandler;
 
-    /**
-     * Creates a new instance
-     *
-     * @param handlers
-     *            a map of the {@link AuthenticationException} class to the
-     *            {@link AuthenticationFailureHandler} that should be used.
-     *            Each is considered in the order they are specified and only
-     *            the first {@link AuthenticationFailureHandler} is ued.
-     *            This parameter cannot specify null or empty.
-     * @param defaultHandler
-     *            the default {@link AuthenticationFailureHandler}
-     *            that should be used if none of the handlers matches.
-     *            This parameter cannot specify null.
-     * @throws IllegalArgumentException if invalid argument is specified
-     */
-    public DelegatingAuthenticationFailureHandler(
-            LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers,
-            AuthenticationFailureHandler defaultHandler) {
-        Assert.notEmpty(handlers, "handlers cannot be null or empty");
-        Assert.notNull(defaultHandler, "defaultHandler cannot be null");
-        this.handlers = handlers;
-        this.defaultHandler = defaultHandler;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param handlers a map of the {@link AuthenticationException} class to the
+	 * {@link AuthenticationFailureHandler} that should be used. Each is considered in the
+	 * order they are specified and only the first {@link AuthenticationFailureHandler} is
+	 * ued. This parameter cannot specify null or empty.
+	 * @param defaultHandler the default {@link AuthenticationFailureHandler} that should
+	 * be used if none of the handlers matches. This parameter cannot specify null.
+	 * @throws IllegalArgumentException if invalid argument is specified
+	 */
+	public DelegatingAuthenticationFailureHandler(
+			LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers,
+			AuthenticationFailureHandler defaultHandler) {
+		Assert.notEmpty(handlers, "handlers cannot be null or empty");
+		Assert.notNull(defaultHandler, "defaultHandler cannot be null");
+		this.handlers = handlers;
+		this.defaultHandler = defaultHandler;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public void onAuthenticationFailure(HttpServletRequest request,
-            HttpServletResponse response, AuthenticationException exception)
-            throws IOException, ServletException {
-        for (Map.Entry<Class<? extends AuthenticationException>, AuthenticationFailureHandler> entry : handlers.entrySet()) {
-            Class<? extends AuthenticationException> handlerMappedExceptionClass = entry.getKey();
-            if (handlerMappedExceptionClass.isAssignableFrom(exception.getClass())) {
-                AuthenticationFailureHandler handler = entry.getValue();
-                handler.onAuthenticationFailure(request, response, exception);
-                return;
-            }
-        }
-        defaultHandler.onAuthenticationFailure(request, response, exception);
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public void onAuthenticationFailure(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException exception)
+			throws IOException, ServletException {
+		for (Map.Entry<Class<? extends AuthenticationException>, AuthenticationFailureHandler> entry : handlers
+				.entrySet()) {
+			Class<? extends AuthenticationException> handlerMappedExceptionClass = entry
+					.getKey();
+			if (handlerMappedExceptionClass.isAssignableFrom(exception.getClass())) {
+				AuthenticationFailureHandler handler = entry.getValue();
+				handler.onAuthenticationFailure(request, response, exception);
+				return;
+			}
+		}
+		defaultHandler.onAuthenticationFailure(request, response, exception);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java
index 778ca0e944..719c7b119e 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java
@@ -13,49 +13,56 @@ import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 
 /**
- * Uses the internal map of exceptions types to URLs to determine the destination on authentication failure. The keys
- * are the full exception class names.
+ * Uses the internal map of exceptions types to URLs to determine the destination on
+ * authentication failure. The keys are the full exception class names.
  * <p>
  * If a match isn't found, falls back to the behaviour of the parent class,
  * {@link SimpleUrlAuthenticationFailureHandler}.
  * <p>
- * The map of exception names to URLs should be injected by setting the <tt>exceptionMappings</tt> property.
+ * The map of exception names to URLs should be injected by setting the
+ * <tt>exceptionMappings</tt> property.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class ExceptionMappingAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
-    private final Map<String, String> failureUrlMap = new HashMap<String, String>();
+public class ExceptionMappingAuthenticationFailureHandler extends
+		SimpleUrlAuthenticationFailureHandler {
+	private final Map<String, String> failureUrlMap = new HashMap<String, String>();
 
-    @Override
-    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException exception) throws IOException, ServletException {
-        String url = failureUrlMap.get(exception.getClass().getName());
+	@Override
+	public void onAuthenticationFailure(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException exception)
+			throws IOException, ServletException {
+		String url = failureUrlMap.get(exception.getClass().getName());
 
-        if (url != null) {
-            getRedirectStrategy().sendRedirect(request, response, url);
-        } else {
-            super.onAuthenticationFailure(request, response, exception);
-        }
-    }
+		if (url != null) {
+			getRedirectStrategy().sendRedirect(request, response, url);
+		}
+		else {
+			super.onAuthenticationFailure(request, response, exception);
+		}
+	}
 
-    /**
-     * Sets the map of exception types (by name) to URLs.
-     *
-     * @param failureUrlMap the map keyed by the fully-qualified name of the exception class, with the corresponding
-     * failure URL as the value.
-     *
-     * @throws IllegalArgumentException if the entries are not Strings or the URL is not valid.
-     */
-    public void setExceptionMappings(Map<?,?> failureUrlMap) {
-        this.failureUrlMap.clear();
-        for (Map.Entry<?,?> entry : failureUrlMap.entrySet()) {
-            Object exception = entry.getKey();
-            Object url = entry.getValue();
-            Assert.isInstanceOf(String.class, exception, "Exception key must be a String (the exception classname).");
-            Assert.isInstanceOf(String.class, url, "URL must be a String");
-            Assert.isTrue(UrlUtils.isValidRedirectUrl((String)url), "Not a valid redirect URL: " + url);
-            this.failureUrlMap.put((String)exception, (String)url);
-        }
-    }
+	/**
+	 * Sets the map of exception types (by name) to URLs.
+	 *
+	 * @param failureUrlMap the map keyed by the fully-qualified name of the exception
+	 * class, with the corresponding failure URL as the value.
+	 *
+	 * @throws IllegalArgumentException if the entries are not Strings or the URL is not
+	 * valid.
+	 */
+	public void setExceptionMappings(Map<?, ?> failureUrlMap) {
+		this.failureUrlMap.clear();
+		for (Map.Entry<?, ?> entry : failureUrlMap.entrySet()) {
+			Object exception = entry.getKey();
+			Object url = entry.getValue();
+			Assert.isInstanceOf(String.class, exception,
+					"Exception key must be a String (the exception classname).");
+			Assert.isInstanceOf(String.class, url, "URL must be a String");
+			Assert.isTrue(UrlUtils.isValidRedirectUrl((String) url),
+					"Not a valid redirect URL: " + url);
+			this.failureUrlMap.put((String) exception, (String) url);
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/Http403ForbiddenEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/Http403ForbiddenEntryPoint.java
index 92da47edbf..9d3a2161bd 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/Http403ForbiddenEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/Http403ForbiddenEntryPoint.java
@@ -13,15 +13,13 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 
 /**
  * <p>
- * In the pre-authenticated authentication case (unlike CAS, for example) the
- * user will already have been identified through some external mechanism and a
- * secure context established by the time the security-enforcement filter is
- * invoked.
+ * In the pre-authenticated authentication case (unlike CAS, for example) the user will
+ * already have been identified through some external mechanism and a secure context
+ * established by the time the security-enforcement filter is invoked.
  * <p>
- * Therefore this class isn't actually responsible for the commencement of
- * authentication, as it is in the case of other providers. It will be called if
- * the user is rejected by the AbstractPreAuthenticatedProcessingFilter,
- * resulting in a null authentication.
+ * Therefore this class isn't actually responsible for the commencement of authentication,
+ * as it is in the case of other providers. It will be called if the user is rejected by
+ * the AbstractPreAuthenticatedProcessingFilter, resulting in a null authentication.
  * <p>
  * The <code>commence</code> method will always return an
  * <code>HttpServletResponse.SC_FORBIDDEN</code> (403 error).
@@ -33,16 +31,16 @@ import org.springframework.security.web.AuthenticationEntryPoint;
  * @since 2.0
  */
 public class Http403ForbiddenEntryPoint implements AuthenticationEntryPoint {
-    private static final Log logger = LogFactory.getLog(Http403ForbiddenEntryPoint.class);
+	private static final Log logger = LogFactory.getLog(Http403ForbiddenEntryPoint.class);
 
-    /**
-     * Always returns a 403 error code to the client.
-     */
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException arg2) throws IOException,
-            ServletException {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Pre-authenticated entry point called. Rejecting access");
-        }
-        response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access Denied");
-    }
+	/**
+	 * Always returns a 403 error code to the client.
+	 */
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException arg2) throws IOException, ServletException {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Pre-authenticated entry point called. Rejecting access");
+		}
+		response.sendError(HttpServletResponse.SC_FORBIDDEN, "Access Denied");
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java
index 2201d16ce0..f88d76972f 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/HttpStatusEntryPoint.java
@@ -27,30 +27,28 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.util.Assert;
 
 /**
- * An {@link AuthenticationEntryPoint} that sends a generic {@link HttpStatus}
- * as a response. Useful for JavaScript clients which cannot use Basic
- * authentication since the browser intercepts the response.
+ * An {@link AuthenticationEntryPoint} that sends a generic {@link HttpStatus} as a
+ * response. Useful for JavaScript clients which cannot use Basic authentication since the
+ * browser intercepts the response.
  *
  * @author Rob Winch
  * @since 4.0
  */
 public final class HttpStatusEntryPoint implements AuthenticationEntryPoint {
-    private final HttpStatus httpStatus;
+	private final HttpStatus httpStatus;
 
-    /**
-     * Creates a new instance.
-     *
-     * @param httpStatus the HttpSatus to set
-     */
-    public HttpStatusEntryPoint(HttpStatus httpStatus) {
-        Assert.notNull(httpStatus, "httpStatus cannot be null");
-        this.httpStatus = httpStatus;
-    }
+	/**
+	 * Creates a new instance.
+	 *
+	 * @param httpStatus the HttpSatus to set
+	 */
+	public HttpStatusEntryPoint(HttpStatus httpStatus) {
+		Assert.notNull(httpStatus, "httpStatus cannot be null");
+		this.httpStatus = httpStatus;
+	}
 
-    public void commence(HttpServletRequest request,
-            HttpServletResponse response,
-            AuthenticationException authException) throws IOException,
-            ServletException {
-        response.setStatus(httpStatus.value());
-    }
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
+		response.setStatus(httpStatus.value());
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java
index e716618aae..3c5af042a7 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java
@@ -40,20 +40,19 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Used by the {@link ExceptionTranslationFilter} to commence a form login
- * authentication via the {@link UsernamePasswordAuthenticationFilter}.
+ * Used by the {@link ExceptionTranslationFilter} to commence a form login authentication
+ * via the {@link UsernamePasswordAuthenticationFilter}.
  * <p>
- * Holds the location of the login form in the {@code loginFormUrl} property, and
- * uses that to build a redirect URL to the login page. Alternatively, an absolute URL
- * can be set in this property and that will be used exclusively.
+ * Holds the location of the login form in the {@code loginFormUrl} property, and uses
+ * that to build a redirect URL to the login page. Alternatively, an absolute URL can be
+ * set in this property and that will be used exclusively.
  * <p>
- * When using a relative URL, you can set the {@code forceHttps} property to true,
- * to force the protocol used for the login form to be {@code HTTPS},
- * even if the original intercepted request for a resource used the
- * {@code HTTP} protocol. When this happens, after a successful login
- * (via HTTPS), the original resource will still be accessed as HTTP, via the
- * original request URL. For the forced HTTPS feature to work, the {@link
- * PortMapper} is consulted to determine the HTTP:HTTPS pairs. The value of
+ * When using a relative URL, you can set the {@code forceHttps} property to true, to
+ * force the protocol used for the login form to be {@code HTTPS}, even if the original
+ * intercepted request for a resource used the {@code HTTP} protocol. When this happens,
+ * after a successful login (via HTTPS), the original resource will still be accessed as
+ * HTTP, via the original request URL. For the forced HTTPS feature to work, the
+ * {@link PortMapper} is consulted to determine the HTTP:HTTPS pairs. The value of
  * {@code forceHttps} will have no effect if an absolute URL is used.
  *
  * @author Ben Alex
@@ -62,212 +61,230 @@ import org.springframework.util.StringUtils;
  * @author Luke Taylor
  * @since 3.0
  */
-public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean {
-    //~ Static fields/initializers =====================================================================================
+public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoint,
+		InitializingBean {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(LoginUrlAuthenticationEntryPoint.class);
+	private static final Log logger = LogFactory
+			.getLog(LoginUrlAuthenticationEntryPoint.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private PortMapper portMapper = new PortMapperImpl();
+	private PortMapper portMapper = new PortMapperImpl();
 
-    private PortResolver portResolver = new PortResolverImpl();
+	private PortResolver portResolver = new PortResolverImpl();
 
-    private String loginFormUrl;
+	private String loginFormUrl;
 
-    private boolean forceHttps = false;
+	private boolean forceHttps = false;
 
-    private boolean useForward = false;
+	private boolean useForward = false;
 
-    private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
-    /**
-     *
-     * @param loginFormUrl URL where the login page can be found. Should either be relative to the web-app context path
-     * (include a leading {@code /}) or an absolute URL.
-     */
-    public LoginUrlAuthenticationEntryPoint(String loginFormUrl) {
-        Assert.notNull(loginFormUrl,"loginFormUrl cannot be null");
-        this.loginFormUrl = loginFormUrl;
-    }
+	/**
+	 *
+	 * @param loginFormUrl URL where the login page can be found. Should either be
+	 * relative to the web-app context path (include a leading {@code /}) or an absolute
+	 * URL.
+	 */
+	public LoginUrlAuthenticationEntryPoint(String loginFormUrl) {
+		Assert.notNull(loginFormUrl, "loginFormUrl cannot be null");
+		this.loginFormUrl = loginFormUrl;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.isTrue(StringUtils.hasText(loginFormUrl) && UrlUtils.isValidRedirectUrl(loginFormUrl),
-                "loginFormUrl must be specified and must be a valid redirect URL");
-        if (useForward && UrlUtils.isAbsoluteUrl(loginFormUrl)) {
-            throw new IllegalArgumentException("useForward must be false if using an absolute loginFormURL");
-        }
-        Assert.notNull(portMapper, "portMapper must be specified");
-        Assert.notNull(portResolver, "portResolver must be specified");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.isTrue(
+				StringUtils.hasText(loginFormUrl)
+						&& UrlUtils.isValidRedirectUrl(loginFormUrl),
+				"loginFormUrl must be specified and must be a valid redirect URL");
+		if (useForward && UrlUtils.isAbsoluteUrl(loginFormUrl)) {
+			throw new IllegalArgumentException(
+					"useForward must be false if using an absolute loginFormURL");
+		}
+		Assert.notNull(portMapper, "portMapper must be specified");
+		Assert.notNull(portResolver, "portResolver must be specified");
+	}
 
-    /**
-     * Allows subclasses to modify the login form URL that should be applicable for a given request.
-     *
-     * @param request   the request
-     * @param response  the response
-     * @param exception the exception
-     * @return the URL (cannot be null or empty; defaults to {@link #getLoginFormUrl()})
-     */
-    protected String determineUrlToUseForThisRequest(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException exception) {
+	/**
+	 * Allows subclasses to modify the login form URL that should be applicable for a
+	 * given request.
+	 *
+	 * @param request the request
+	 * @param response the response
+	 * @param exception the exception
+	 * @return the URL (cannot be null or empty; defaults to {@link #getLoginFormUrl()})
+	 */
+	protected String determineUrlToUseForThisRequest(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException exception) {
 
-        return getLoginFormUrl();
-    }
+		return getLoginFormUrl();
+	}
 
-    /**
-     * Performs the redirect (or forward) to the login form URL.
-     */
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
-            throws IOException, ServletException {
+	/**
+	 * Performs the redirect (or forward) to the login form URL.
+	 */
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
 
-        String redirectUrl = null;
+		String redirectUrl = null;
 
-        if (useForward) {
+		if (useForward) {
 
-            if (forceHttps && "http".equals(request.getScheme())) {
-                // First redirect the current request to HTTPS.
-                // When that request is received, the forward to the login page will be used.
-                redirectUrl = buildHttpsRedirectUrlForRequest(request);
-            }
+			if (forceHttps && "http".equals(request.getScheme())) {
+				// First redirect the current request to HTTPS.
+				// When that request is received, the forward to the login page will be
+				// used.
+				redirectUrl = buildHttpsRedirectUrlForRequest(request);
+			}
 
-            if (redirectUrl == null) {
-                String loginForm = determineUrlToUseForThisRequest(request, response, authException);
+			if (redirectUrl == null) {
+				String loginForm = determineUrlToUseForThisRequest(request, response,
+						authException);
 
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Server side forward to: " + loginForm);
-                }
+				if (logger.isDebugEnabled()) {
+					logger.debug("Server side forward to: " + loginForm);
+				}
 
-                RequestDispatcher dispatcher = request.getRequestDispatcher(loginForm);
+				RequestDispatcher dispatcher = request.getRequestDispatcher(loginForm);
 
-                dispatcher.forward(request, response);
+				dispatcher.forward(request, response);
 
-                return;
-            }
-        } else {
-            // redirect to login page. Use https if forceHttps true
+				return;
+			}
+		}
+		else {
+			// redirect to login page. Use https if forceHttps true
 
-            redirectUrl = buildRedirectUrlToLoginPage(request, response, authException);
+			redirectUrl = buildRedirectUrlToLoginPage(request, response, authException);
 
-        }
+		}
 
-        redirectStrategy.sendRedirect(request, response, redirectUrl);
-    }
+		redirectStrategy.sendRedirect(request, response, redirectUrl);
+	}
 
-    protected String buildRedirectUrlToLoginPage(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException authException) {
+	protected String buildRedirectUrlToLoginPage(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException authException) {
 
-        String loginForm = determineUrlToUseForThisRequest(request, response, authException);
+		String loginForm = determineUrlToUseForThisRequest(request, response,
+				authException);
 
-        if (UrlUtils.isAbsoluteUrl(loginForm)) {
-            return loginForm;
-        }
+		if (UrlUtils.isAbsoluteUrl(loginForm)) {
+			return loginForm;
+		}
 
-        int serverPort = portResolver.getServerPort(request);
-        String scheme = request.getScheme();
+		int serverPort = portResolver.getServerPort(request);
+		String scheme = request.getScheme();
 
-        RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder();
+		RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder();
 
-        urlBuilder.setScheme(scheme);
-        urlBuilder.setServerName(request.getServerName());
-        urlBuilder.setPort(serverPort);
-        urlBuilder.setContextPath(request.getContextPath());
-        urlBuilder.setPathInfo(loginForm);
+		urlBuilder.setScheme(scheme);
+		urlBuilder.setServerName(request.getServerName());
+		urlBuilder.setPort(serverPort);
+		urlBuilder.setContextPath(request.getContextPath());
+		urlBuilder.setPathInfo(loginForm);
 
-        if (forceHttps && "http".equals(scheme)) {
-            Integer httpsPort = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
+		if (forceHttps && "http".equals(scheme)) {
+			Integer httpsPort = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
 
-            if (httpsPort != null) {
-                // Overwrite scheme and port in the redirect URL
-                urlBuilder.setScheme("https");
-                urlBuilder.setPort(httpsPort.intValue());
-            } else {
-                logger.warn("Unable to redirect to HTTPS as no port mapping found for HTTP port " + serverPort);
-            }
-        }
+			if (httpsPort != null) {
+				// Overwrite scheme and port in the redirect URL
+				urlBuilder.setScheme("https");
+				urlBuilder.setPort(httpsPort.intValue());
+			}
+			else {
+				logger.warn("Unable to redirect to HTTPS as no port mapping found for HTTP port "
+						+ serverPort);
+			}
+		}
 
-        return urlBuilder.getUrl();
-    }
+		return urlBuilder.getUrl();
+	}
 
-    /**
-     * Builds a URL to redirect the supplied request to HTTPS. Used to redirect the current request
-     * to HTTPS, before doing a forward to the login page.
-     */
-    protected String buildHttpsRedirectUrlForRequest(HttpServletRequest request)
-            throws IOException, ServletException {
+	/**
+	 * Builds a URL to redirect the supplied request to HTTPS. Used to redirect the
+	 * current request to HTTPS, before doing a forward to the login page.
+	 */
+	protected String buildHttpsRedirectUrlForRequest(HttpServletRequest request)
+			throws IOException, ServletException {
 
-        int serverPort = portResolver.getServerPort(request);
-        Integer httpsPort = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
+		int serverPort = portResolver.getServerPort(request);
+		Integer httpsPort = portMapper.lookupHttpsPort(Integer.valueOf(serverPort));
 
-        if (httpsPort != null) {
-            RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder();
-            urlBuilder.setScheme("https");
-            urlBuilder.setServerName(request.getServerName());
-            urlBuilder.setPort(httpsPort.intValue());
-            urlBuilder.setContextPath(request.getContextPath());
-            urlBuilder.setServletPath(request.getServletPath());
-            urlBuilder.setPathInfo(request.getPathInfo());
-            urlBuilder.setQuery(request.getQueryString());
+		if (httpsPort != null) {
+			RedirectUrlBuilder urlBuilder = new RedirectUrlBuilder();
+			urlBuilder.setScheme("https");
+			urlBuilder.setServerName(request.getServerName());
+			urlBuilder.setPort(httpsPort.intValue());
+			urlBuilder.setContextPath(request.getContextPath());
+			urlBuilder.setServletPath(request.getServletPath());
+			urlBuilder.setPathInfo(request.getPathInfo());
+			urlBuilder.setQuery(request.getQueryString());
 
-            return urlBuilder.getUrl();
-        }
+			return urlBuilder.getUrl();
+		}
 
-        // Fall through to server-side forward with warning message
-        logger.warn("Unable to redirect to HTTPS as no port mapping found for HTTP port " + serverPort);
+		// Fall through to server-side forward with warning message
+		logger.warn("Unable to redirect to HTTPS as no port mapping found for HTTP port "
+				+ serverPort);
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Set to true to force login form access to be via https. If this value is true (the default is false),
-     * and the incoming request for the protected resource which triggered the interceptor was not already
-     * <code>https</code>, then the client will first be redirected to an https URL, even if <tt>serverSideRedirect</tt>
-     * is set to <tt>true</tt>.
-     */
-    public void setForceHttps(boolean forceHttps) {
-        this.forceHttps = forceHttps;
-    }
+	/**
+	 * Set to true to force login form access to be via https. If this value is true (the
+	 * default is false), and the incoming request for the protected resource which
+	 * triggered the interceptor was not already <code>https</code>, then the client will
+	 * first be redirected to an https URL, even if <tt>serverSideRedirect</tt> is set to
+	 * <tt>true</tt>.
+	 */
+	public void setForceHttps(boolean forceHttps) {
+		this.forceHttps = forceHttps;
+	}
 
-    protected boolean isForceHttps() {
-        return forceHttps;
-    }
+	protected boolean isForceHttps() {
+		return forceHttps;
+	}
 
-    public String getLoginFormUrl() {
-        return loginFormUrl;
-    }
+	public String getLoginFormUrl() {
+		return loginFormUrl;
+	}
 
-    public void setPortMapper(PortMapper portMapper) {
-        Assert.notNull(portMapper, "portMapper cannot be null");
-        this.portMapper = portMapper;
-    }
+	public void setPortMapper(PortMapper portMapper) {
+		Assert.notNull(portMapper, "portMapper cannot be null");
+		this.portMapper = portMapper;
+	}
 
-    protected PortMapper getPortMapper() {
-        return portMapper;
-    }
+	protected PortMapper getPortMapper() {
+		return portMapper;
+	}
 
-    public void setPortResolver(PortResolver portResolver) {
-        Assert.notNull(portResolver, "portResolver cannot be null");
-        this.portResolver = portResolver;
-    }
+	public void setPortResolver(PortResolver portResolver) {
+		Assert.notNull(portResolver, "portResolver cannot be null");
+		this.portResolver = portResolver;
+	}
 
-    protected PortResolver getPortResolver() {
-        return portResolver;
-    }
+	protected PortResolver getPortResolver() {
+		return portResolver;
+	}
 
-    /**
-     * Tells if we are to do a forward to the {@code loginFormUrl} using the {@code RequestDispatcher},
-     * instead of a 302 redirect.
-     *
-     * @param useForward true if a forward to the login page should be used. Must be false (the default) if
-     * {@code loginFormUrl} is set to an absolute value.
-     */
-    public void setUseForward(boolean useForward) {
-        this.useForward = useForward;
-    }
+	/**
+	 * Tells if we are to do a forward to the {@code loginFormUrl} using the
+	 * {@code RequestDispatcher}, instead of a 302 redirect.
+	 *
+	 * @param useForward true if a forward to the login page should be used. Must be false
+	 * (the default) if {@code loginFormUrl} is set to an absolute value.
+	 */
+	public void setUseForward(boolean useForward) {
+		this.useForward = useForward;
+	}
 
-    protected boolean isUseForward() {
-        return useForward;
-    }
+	protected boolean isUseForward() {
+		return useForward;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java
index bf48e6e25c..bcce33a7d9 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/NullRememberMeServices.java
@@ -20,22 +20,27 @@ import org.springframework.security.core.Authentication;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
- * Implementation of {@link NullRememberMeServices} that does nothing.<p>Used as a default by several framework
- * classes.</p>
+ * Implementation of {@link NullRememberMeServices} that does nothing.
+ * <p>
+ * Used as a default by several framework classes.
+ * </p>
  *
  * @author Ben Alex
  */
 public class NullRememberMeServices implements RememberMeServices {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication autoLogin(HttpServletRequest request, HttpServletResponse response) {
-        return null;
-    }
+	public Authentication autoLogin(HttpServletRequest request,
+			HttpServletResponse response) {
+		return null;
+	}
 
-    public void loginFail(HttpServletRequest request, HttpServletResponse response) {}
+	public void loginFail(HttpServletRequest request, HttpServletResponse response) {
+	}
 
-    public void loginSuccess(HttpServletRequest request, HttpServletResponse response,
-        Authentication successfulAuthentication) {}
+	public void loginSuccess(HttpServletRequest request, HttpServletResponse response,
+			Authentication successfulAuthentication) {
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java
index ed6d97db30..d2820bcecf 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/RememberMeServices.java
@@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.security.core.Authentication;
 
-
 /**
  * Implement by a class that is capable of providing a remember-me service.
  *
@@ -29,65 +28,76 @@ import org.springframework.security.core.Authentication;
  * {@link org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter
  * AbstractAuthenticationProcessingFilter} and
  * {@link org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter
- * RememberMeAuthenticationFilter} will call the methods provided by an implementation of this interface.
+ * RememberMeAuthenticationFilter} will call the methods provided by an implementation of
+ * this interface.
  * <p>
- * Implementations may implement any type of remember-me capability they wish.
- * Rolling cookies (as per <a href="http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice">
- * http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice</a>)
- * can be used, as can simple implementations that don't require a persistent store. Implementations also determine
- * the validity period of a remember-me cookie. This interface has been designed to accommodate any of these
- * remember-me models.
+ * Implementations may implement any type of remember-me capability they wish. Rolling
+ * cookies (as per <a
+ * href="http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice">
+ * http://fishbowl.pastiche.org/2004/01/19/persistent_login_cookie_best_practice</a>) can
+ * be used, as can simple implementations that don't require a persistent store.
+ * Implementations also determine the validity period of a remember-me cookie. This
+ * interface has been designed to accommodate any of these remember-me models.
  * <p>
- * This interface does not define how remember-me services should offer a "cancel all remember-me tokens" type
- * capability, as this will be implementation specific and requires no hooks into Spring Security.
+ * This interface does not define how remember-me services should offer a
+ * "cancel all remember-me tokens" type capability, as this will be implementation
+ * specific and requires no hooks into Spring Security.
  *
  * @author Ben Alex
  */
 public interface RememberMeServices {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * This method will be called whenever the <code>SecurityContextHolder</code> does not contain an
-     * <code>Authentication</code> object and Spring Security wishes to provide an implementation with an
-     * opportunity to authenticate the request using remember-me capabilities. Spring Security makes no attempt
-     * whatsoever to determine whether the browser has requested remember-me services or presented a valid cookie.
-     * Such determinations are left to the implementation. If a browser has presented an unauthorised cookie for
-     * whatever reason, it should be silently ignored and invalidated using the <code>HttpServletResponse</code>
-     * object.
-     * <p>
-     * The returned <code>Authentication</code> must be acceptable to
-     * {@link org.springframework.security.authentication.AuthenticationManager} or
-     * {@link org.springframework.security.authentication.AuthenticationProvider} defined by the web application.
-     * It is recommended {@link org.springframework.security.authentication.RememberMeAuthenticationToken} be
-     * used in most cases, as it has a corresponding authentication provider.
-     *
-     * @param request to look for a remember-me token within
-     * @param response to change, cancel or modify the remember-me token
-     *
-     * @return a valid authentication object, or <code>null</code> if the request should not be authenticated
-     */
-    Authentication autoLogin(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * This method will be called whenever the <code>SecurityContextHolder</code> does not
+	 * contain an <code>Authentication</code> object and Spring Security wishes to provide
+	 * an implementation with an opportunity to authenticate the request using remember-me
+	 * capabilities. Spring Security makes no attempt whatsoever to determine whether the
+	 * browser has requested remember-me services or presented a valid cookie. Such
+	 * determinations are left to the implementation. If a browser has presented an
+	 * unauthorised cookie for whatever reason, it should be silently ignored and
+	 * invalidated using the <code>HttpServletResponse</code> object.
+	 * <p>
+	 * The returned <code>Authentication</code> must be acceptable to
+	 * {@link org.springframework.security.authentication.AuthenticationManager} or
+	 * {@link org.springframework.security.authentication.AuthenticationProvider} defined
+	 * by the web application. It is recommended
+	 * {@link org.springframework.security.authentication.RememberMeAuthenticationToken}
+	 * be used in most cases, as it has a corresponding authentication provider.
+	 *
+	 * @param request to look for a remember-me token within
+	 * @param response to change, cancel or modify the remember-me token
+	 *
+	 * @return a valid authentication object, or <code>null</code> if the request should
+	 * not be authenticated
+	 */
+	Authentication autoLogin(HttpServletRequest request, HttpServletResponse response);
 
-    /**
-     * Called whenever an interactive authentication attempt was made, but the credentials supplied by the user
-     * were missing or otherwise invalid. Implementations should invalidate any and all remember-me tokens indicated
-     * in the <code>HttpServletRequest</code>.
-     *
-     * @param request that contained an invalid authentication request
-     * @param response to change, cancel or modify the remember-me token
-     */
-    void loginFail(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Called whenever an interactive authentication attempt was made, but the credentials
+	 * supplied by the user were missing or otherwise invalid. Implementations should
+	 * invalidate any and all remember-me tokens indicated in the
+	 * <code>HttpServletRequest</code>.
+	 *
+	 * @param request that contained an invalid authentication request
+	 * @param response to change, cancel or modify the remember-me token
+	 */
+	void loginFail(HttpServletRequest request, HttpServletResponse response);
 
-    /**
-     * Called whenever an interactive authentication attempt is successful. An implementation may automatically
-     * set a remember-me token in the <code>HttpServletResponse</code>, although this is not recommended. Instead,
-     * implementations should typically look for a request parameter that indicates the browser has presented an
-     * explicit request for authentication to be remembered, such as the presence of a HTTP POST parameter.
-     *
-     * @param request that contained the valid authentication request
-     * @param response to change, cancel or modify the remember-me token
-     * @param successfulAuthentication representing the successfully authenticated principal
-     */
-    void loginSuccess(HttpServletRequest request, HttpServletResponse response,
-        Authentication successfulAuthentication);
+	/**
+	 * Called whenever an interactive authentication attempt is successful. An
+	 * implementation may automatically set a remember-me token in the
+	 * <code>HttpServletResponse</code>, although this is not recommended. Instead,
+	 * implementations should typically look for a request parameter that indicates the
+	 * browser has presented an explicit request for authentication to be remembered, such
+	 * as the presence of a HTTP POST parameter.
+	 *
+	 * @param request that contained the valid authentication request
+	 * @param response to change, cancel or modify the remember-me token
+	 * @param successfulAuthentication representing the successfully authenticated
+	 * principal
+	 */
+	void loginSuccess(HttpServletRequest request, HttpServletResponse response,
+			Authentication successfulAuthentication);
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
index 14af5362d9..f971e83cdb 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
@@ -17,70 +17,75 @@ import org.springframework.security.web.savedrequest.DefaultSavedRequest;
 import org.springframework.util.StringUtils;
 
 /**
- * An authentication success strategy which can make use of the {@link DefaultSavedRequest} which may have been stored in
- * the session by the {@link ExceptionTranslationFilter}. When such a request is intercepted and requires authentication,
- * the request data is stored to record the original destination before the authentication process commenced, and to
- * allow the request to be reconstructed when a redirect to the same URL occurs. This class is responsible for
- * performing the redirect to the original URL if appropriate.
+ * An authentication success strategy which can make use of the
+ * {@link DefaultSavedRequest} which may have been stored in the session by the
+ * {@link ExceptionTranslationFilter}. When such a request is intercepted and requires
+ * authentication, the request data is stored to record the original destination before
+ * the authentication process commenced, and to allow the request to be reconstructed when
+ * a redirect to the same URL occurs. This class is responsible for performing the
+ * redirect to the original URL if appropriate.
  * <p>
- * Following a successful authentication, it decides on the redirect destination, based on the following scenarios:
+ * Following a successful authentication, it decides on the redirect destination, based on
+ * the following scenarios:
  * <ul>
  * <li>
- * If the {@code alwaysUseDefaultTargetUrl} property is set to true, the {@code defaultTargetUrl}
- * will be used for the destination. Any {@code DefaultSavedRequest} stored in the session will be
- * removed.
- * </li>
+ * If the {@code alwaysUseDefaultTargetUrl} property is set to true, the
+ * {@code defaultTargetUrl} will be used for the destination. Any
+ * {@code DefaultSavedRequest} stored in the session will be removed.</li>
  * <li>
- * If the {@code targetUrlParameter} has been set on the request, the value will be used as the destination.
- * Any {@code DefaultSavedRequest} will again be removed.
- * </li>
+ * If the {@code targetUrlParameter} has been set on the request, the value will be used
+ * as the destination. Any {@code DefaultSavedRequest} will again be removed.</li>
  * <li>
- * If a {@link SavedRequest} is found in the {@code RequestCache} (as set by the {@link ExceptionTranslationFilter} to
- * record the original destination before the authentication process commenced), a redirect will be performed to the
- * Url of that original destination. The {@code SavedRequest} object will remain cached and be picked up
- * when the redirected request is received
- * (See {@link org.springframework.security.web.savedrequest.SavedRequestAwareWrapper SavedRequestAwareWrapper}).
- * </li>
+ * If a {@link SavedRequest} is found in the {@code RequestCache} (as set by the
+ * {@link ExceptionTranslationFilter} to record the original destination before the
+ * authentication process commenced), a redirect will be performed to the Url of that
+ * original destination. The {@code SavedRequest} object will remain cached and be picked
+ * up when the redirected request is received (See
+ * {@link org.springframework.security.web.savedrequest.SavedRequestAwareWrapper
+ * SavedRequestAwareWrapper}).</li>
  * <li>
- * If no {@code SavedRequest} is found, it will delegate to the base class.
- * </li>
+ * If no {@code SavedRequest} is found, it will delegate to the base class.</li>
  * </ul>
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class SavedRequestAwareAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
-    protected final Log logger = LogFactory.getLog(this.getClass());
+public class SavedRequestAwareAuthenticationSuccessHandler extends
+		SimpleUrlAuthenticationSuccessHandler {
+	protected final Log logger = LogFactory.getLog(this.getClass());
 
-    private RequestCache requestCache = new HttpSessionRequestCache();
+	private RequestCache requestCache = new HttpSessionRequestCache();
 
-    @Override
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication authentication) throws ServletException, IOException {
-        SavedRequest savedRequest = requestCache.getRequest(request, response);
+	@Override
+	public void onAuthenticationSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication authentication)
+			throws ServletException, IOException {
+		SavedRequest savedRequest = requestCache.getRequest(request, response);
 
-        if (savedRequest == null) {
-            super.onAuthenticationSuccess(request, response, authentication);
+		if (savedRequest == null) {
+			super.onAuthenticationSuccess(request, response, authentication);
 
-            return;
-        }
-        String targetUrlParameter = getTargetUrlParameter();
-        if (isAlwaysUseDefaultTargetUrl() || (targetUrlParameter != null && StringUtils.hasText(request.getParameter(targetUrlParameter)))) {
-            requestCache.removeRequest(request, response);
-            super.onAuthenticationSuccess(request, response, authentication);
+			return;
+		}
+		String targetUrlParameter = getTargetUrlParameter();
+		if (isAlwaysUseDefaultTargetUrl()
+				|| (targetUrlParameter != null && StringUtils.hasText(request
+						.getParameter(targetUrlParameter)))) {
+			requestCache.removeRequest(request, response);
+			super.onAuthenticationSuccess(request, response, authentication);
 
-            return;
-        }
+			return;
+		}
 
-        clearAuthenticationAttributes(request);
+		clearAuthenticationAttributes(request);
 
-        // Use the DefaultSavedRequest URL
-        String targetUrl = savedRequest.getRedirectUrl();
-        logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
-        getRedirectStrategy().sendRedirect(request, response, targetUrl);
-    }
+		// Use the DefaultSavedRequest URL
+		String targetUrl = savedRequest.getRedirectUrl();
+		logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
+		getRedirectStrategy().sendRedirect(request, response, targetUrl);
+	}
 
-    public void setRequestCache(RequestCache requestCache) {
-        this.requestCache = requestCache;
-    }
+	public void setRequestCache(RequestCache requestCache) {
+		this.requestCache = requestCache;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java
index e6c7a6b46d..530ec18f96 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandler.java
@@ -17,117 +17,129 @@ import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 
 /**
- * <tt>AuthenticationFailureHandler</tt> which performs a redirect to the value of the {@link #setDefaultFailureUrl
- * defaultFailureUrl} property when the <tt>onAuthenticationFailure</tt> method is called.
- * If the property has not been set it will send a 401 response to the client, with the error message from the
+ * <tt>AuthenticationFailureHandler</tt> which performs a redirect to the value of the
+ * {@link #setDefaultFailureUrl defaultFailureUrl} property when the
+ * <tt>onAuthenticationFailure</tt> method is called. If the property has not been set it
+ * will send a 401 response to the client, with the error message from the
  * <tt>AuthenticationException</tt> which caused the failure.
  * <p>
- * If the {@code useForward} property is set, a {@code RequestDispatcher.forward} call will be made to
- * the destination instead of a redirect.
+ * If the {@code useForward} property is set, a {@code RequestDispatcher.forward} call
+ * will be made to the destination instead of a redirect.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class SimpleUrlAuthenticationFailureHandler implements AuthenticationFailureHandler {
-    protected final Log logger = LogFactory.getLog(getClass());
+public class SimpleUrlAuthenticationFailureHandler implements
+		AuthenticationFailureHandler {
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private String defaultFailureUrl;
-    private boolean forwardToDestination = false;
-    private boolean allowSessionCreation = true;
-    private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private String defaultFailureUrl;
+	private boolean forwardToDestination = false;
+	private boolean allowSessionCreation = true;
+	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
-    public SimpleUrlAuthenticationFailureHandler() {
-    }
+	public SimpleUrlAuthenticationFailureHandler() {
+	}
 
-    public SimpleUrlAuthenticationFailureHandler(String defaultFailureUrl) {
-        setDefaultFailureUrl(defaultFailureUrl);
-    }
+	public SimpleUrlAuthenticationFailureHandler(String defaultFailureUrl) {
+		setDefaultFailureUrl(defaultFailureUrl);
+	}
 
-    /**
-     * Performs the redirect or forward to the {@code defaultFailureUrl} if set, otherwise returns a 401 error code.
-     * <p>
-     * If redirecting or forwarding, {@code saveException} will be called to cache the exception for use in
-     * the target view.
-     */
-    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException exception) throws IOException, ServletException {
+	/**
+	 * Performs the redirect or forward to the {@code defaultFailureUrl} if set, otherwise
+	 * returns a 401 error code.
+	 * <p>
+	 * If redirecting or forwarding, {@code saveException} will be called to cache the
+	 * exception for use in the target view.
+	 */
+	public void onAuthenticationFailure(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException exception)
+			throws IOException, ServletException {
 
-        if (defaultFailureUrl == null) {
-            logger.debug("No failure URL set, sending 401 Unauthorized error");
+		if (defaultFailureUrl == null) {
+			logger.debug("No failure URL set, sending 401 Unauthorized error");
 
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Authentication Failed: " + exception.getMessage());
-        } else {
-            saveException(request, exception);
+			response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+					"Authentication Failed: " + exception.getMessage());
+		}
+		else {
+			saveException(request, exception);
 
-            if (forwardToDestination) {
-                logger.debug("Forwarding to " + defaultFailureUrl);
+			if (forwardToDestination) {
+				logger.debug("Forwarding to " + defaultFailureUrl);
 
-                request.getRequestDispatcher(defaultFailureUrl).forward(request, response);
-            } else {
-                logger.debug("Redirecting to " + defaultFailureUrl);
-                redirectStrategy.sendRedirect(request, response, defaultFailureUrl);
-            }
-        }
-    }
+				request.getRequestDispatcher(defaultFailureUrl)
+						.forward(request, response);
+			}
+			else {
+				logger.debug("Redirecting to " + defaultFailureUrl);
+				redirectStrategy.sendRedirect(request, response, defaultFailureUrl);
+			}
+		}
+	}
 
-    /**
-     * Caches the {@code AuthenticationException} for use in view rendering.
-     * <p>
-     * If {@code forwardToDestination} is set to true, request scope will be used, otherwise it will attempt to store
-     * the exception in the session. If there is no session and {@code allowSessionCreation} is {@code true} a session
-     * will be created. Otherwise the exception will not be stored.
-     */
-    protected final void saveException(HttpServletRequest request, AuthenticationException exception) {
-        if (forwardToDestination) {
-            request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception);
-        } else {
-            HttpSession session = request.getSession(false);
+	/**
+	 * Caches the {@code AuthenticationException} for use in view rendering.
+	 * <p>
+	 * If {@code forwardToDestination} is set to true, request scope will be used,
+	 * otherwise it will attempt to store the exception in the session. If there is no
+	 * session and {@code allowSessionCreation} is {@code true} a session will be created.
+	 * Otherwise the exception will not be stored.
+	 */
+	protected final void saveException(HttpServletRequest request,
+			AuthenticationException exception) {
+		if (forwardToDestination) {
+			request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception);
+		}
+		else {
+			HttpSession session = request.getSession(false);
 
-            if (session != null || allowSessionCreation) {
-                request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, exception);
-            }
-        }
-    }
+			if (session != null || allowSessionCreation) {
+				request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION,
+						exception);
+			}
+		}
+	}
 
-    /**
-     * The URL which will be used as the failure destination.
-     *
-     * @param defaultFailureUrl the failure URL, for example "/loginFailed.jsp".
-     */
-    public void setDefaultFailureUrl(String defaultFailureUrl) {
-        Assert.isTrue(UrlUtils.isValidRedirectUrl(defaultFailureUrl),
-                "'" + defaultFailureUrl + "' is not a valid redirect URL");
-        this.defaultFailureUrl = defaultFailureUrl;
-    }
+	/**
+	 * The URL which will be used as the failure destination.
+	 *
+	 * @param defaultFailureUrl the failure URL, for example "/loginFailed.jsp".
+	 */
+	public void setDefaultFailureUrl(String defaultFailureUrl) {
+		Assert.isTrue(UrlUtils.isValidRedirectUrl(defaultFailureUrl), "'"
+				+ defaultFailureUrl + "' is not a valid redirect URL");
+		this.defaultFailureUrl = defaultFailureUrl;
+	}
 
-    protected boolean isUseForward() {
-        return forwardToDestination;
-    }
+	protected boolean isUseForward() {
+		return forwardToDestination;
+	}
 
-    /**
-     * If set to <tt>true</tt>, performs a forward to the failure destination URL instead of a redirect. Defaults to
-     * <tt>false</tt>.
-     */
-    public void setUseForward(boolean forwardToDestination) {
-        this.forwardToDestination = forwardToDestination;
-    }
+	/**
+	 * If set to <tt>true</tt>, performs a forward to the failure destination URL instead
+	 * of a redirect. Defaults to <tt>false</tt>.
+	 */
+	public void setUseForward(boolean forwardToDestination) {
+		this.forwardToDestination = forwardToDestination;
+	}
 
-    /**
-     * Allows overriding of the behaviour when redirecting to a target URL.
-     */
-    public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
-        this.redirectStrategy = redirectStrategy;
-    }
+	/**
+	 * Allows overriding of the behaviour when redirecting to a target URL.
+	 */
+	public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
+		this.redirectStrategy = redirectStrategy;
+	}
 
-    protected RedirectStrategy getRedirectStrategy() {
-        return redirectStrategy;
-    }
+	protected RedirectStrategy getRedirectStrategy() {
+		return redirectStrategy;
+	}
 
-    protected boolean isAllowSessionCreation() {
-        return allowSessionCreation;
-    }
+	protected boolean isAllowSessionCreation() {
+		return allowSessionCreation;
+	}
 
-    public void setAllowSessionCreation(boolean allowSessionCreation) {
-        this.allowSessionCreation = allowSessionCreation;
-    }
+	public void setAllowSessionCreation(boolean allowSessionCreation) {
+		this.allowSessionCreation = allowSessionCreation;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java
index 7de2430d23..3118a98409 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandler.java
@@ -11,49 +11,55 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.WebAttributes;
 
 /**
- * <tt>AuthenticationSuccessHandler</tt> which can be configured with a default URL which users should be
- * sent to upon successful authentication.
+ * <tt>AuthenticationSuccessHandler</tt> which can be configured with a default URL which
+ * users should be sent to upon successful authentication.
  * <p>
- * The logic used is that of the {@link AbstractAuthenticationTargetUrlRequestHandler parent class}.
+ * The logic used is that of the {@link AbstractAuthenticationTargetUrlRequestHandler
+ * parent class}.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class SimpleUrlAuthenticationSuccessHandler extends AbstractAuthenticationTargetUrlRequestHandler implements AuthenticationSuccessHandler {
+public class SimpleUrlAuthenticationSuccessHandler extends
+		AbstractAuthenticationTargetUrlRequestHandler implements
+		AuthenticationSuccessHandler {
 
-    public SimpleUrlAuthenticationSuccessHandler() {
-    }
+	public SimpleUrlAuthenticationSuccessHandler() {
+	}
 
-    /**
-     * Constructor which sets the <tt>defaultTargetUrl</tt> property of the base class.
-     * @param defaultTargetUrl the URL to which the user should be redirected on successful authentication.
-     */
-    public SimpleUrlAuthenticationSuccessHandler(String defaultTargetUrl) {
-        setDefaultTargetUrl(defaultTargetUrl);
-    }
+	/**
+	 * Constructor which sets the <tt>defaultTargetUrl</tt> property of the base class.
+	 * @param defaultTargetUrl the URL to which the user should be redirected on
+	 * successful authentication.
+	 */
+	public SimpleUrlAuthenticationSuccessHandler(String defaultTargetUrl) {
+		setDefaultTargetUrl(defaultTargetUrl);
+	}
 
-    /**
-     * Calls the parent class {@code handle()} method to forward or redirect to the target URL, and
-     * then calls {@code clearAuthenticationAttributes()} to remove any leftover session data.
-     */
-    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication authentication) throws IOException, ServletException {
+	/**
+	 * Calls the parent class {@code handle()} method to forward or redirect to the target
+	 * URL, and then calls {@code clearAuthenticationAttributes()} to remove any leftover
+	 * session data.
+	 */
+	public void onAuthenticationSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication authentication)
+			throws IOException, ServletException {
 
-        handle(request, response, authentication);
-        clearAuthenticationAttributes(request);
-    }
+		handle(request, response, authentication);
+		clearAuthenticationAttributes(request);
+	}
 
-    /**
-     * Removes temporary authentication-related data which may have been stored in the session
-     * during the authentication process.
-     */
-    protected final void clearAuthenticationAttributes(HttpServletRequest request) {
-        HttpSession session = request.getSession(false);
+	/**
+	 * Removes temporary authentication-related data which may have been stored in the
+	 * session during the authentication process.
+	 */
+	protected final void clearAuthenticationAttributes(HttpServletRequest request) {
+		HttpSession session = request.getSession(false);
 
-        if (session == null) {
-            return;
-        }
+		if (session == null) {
+			return;
+		}
 
-        session.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
-    }
+		session.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java
index 20362c6045..30648f46bd 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilter.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.authentication;
 
-
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -26,16 +25,15 @@ import org.springframework.util.Assert;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
- * Processes an authentication form submission. Called {@code AuthenticationProcessingFilter} prior to Spring Security
- * 3.0.
+ * Processes an authentication form submission. Called
+ * {@code AuthenticationProcessingFilter} prior to Spring Security 3.0.
  * <p>
- * Login forms must present two parameters to this filter: a username and
- * password. The default parameter names to use are contained in the
- * static fields {@link #SPRING_SECURITY_FORM_USERNAME_KEY} and {@link #SPRING_SECURITY_FORM_PASSWORD_KEY}.
- * The parameter names can also be changed by setting the {@code usernameParameter} and {@code passwordParameter}
- * properties.
+ * Login forms must present two parameters to this filter: a username and password. The
+ * default parameter names to use are contained in the static fields
+ * {@link #SPRING_SECURITY_FORM_USERNAME_KEY} and
+ * {@link #SPRING_SECURITY_FORM_PASSWORD_KEY}. The parameter names can also be changed by
+ * setting the {@code usernameParameter} and {@code passwordParameter} properties.
  * <p>
  * This filter by default responds to the URL {@code /login}.
  *
@@ -44,126 +42,142 @@ import javax.servlet.http.HttpServletResponse;
  * @author Luke Taylor
  * @since 3.0
  */
-public class UsernamePasswordAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
-    //~ Static fields/initializers =====================================================================================
+public class UsernamePasswordAuthenticationFilter extends
+		AbstractAuthenticationProcessingFilter {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    public static final String SPRING_SECURITY_FORM_USERNAME_KEY = "username";
-    public static final String SPRING_SECURITY_FORM_PASSWORD_KEY = "password";
+	public static final String SPRING_SECURITY_FORM_USERNAME_KEY = "username";
+	public static final String SPRING_SECURITY_FORM_PASSWORD_KEY = "password";
 
-    private String usernameParameter = SPRING_SECURITY_FORM_USERNAME_KEY;
-    private String passwordParameter = SPRING_SECURITY_FORM_PASSWORD_KEY;
-    private boolean postOnly = true;
+	private String usernameParameter = SPRING_SECURITY_FORM_USERNAME_KEY;
+	private String passwordParameter = SPRING_SECURITY_FORM_PASSWORD_KEY;
+	private boolean postOnly = true;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public UsernamePasswordAuthenticationFilter() {
-        super(new AntPathRequestMatcher("/login","POST"));
-    }
+	public UsernamePasswordAuthenticationFilter() {
+		super(new AntPathRequestMatcher("/login", "POST"));
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-        if (postOnly && !request.getMethod().equals("POST")) {
-            throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
-        }
+	public Authentication attemptAuthentication(HttpServletRequest request,
+			HttpServletResponse response) throws AuthenticationException {
+		if (postOnly && !request.getMethod().equals("POST")) {
+			throw new AuthenticationServiceException(
+					"Authentication method not supported: " + request.getMethod());
+		}
 
-        String username = obtainUsername(request);
-        String password = obtainPassword(request);
+		String username = obtainUsername(request);
+		String password = obtainPassword(request);
 
-        if (username == null) {
-            username = "";
-        }
+		if (username == null) {
+			username = "";
+		}
 
-        if (password == null) {
-            password = "";
-        }
+		if (password == null) {
+			password = "";
+		}
 
-        username = username.trim();
+		username = username.trim();
 
-        UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(username, password);
+		UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+				username, password);
 
-        // Allow subclasses to set the "details" property
-        setDetails(request, authRequest);
+		// Allow subclasses to set the "details" property
+		setDetails(request, authRequest);
 
-        return this.getAuthenticationManager().authenticate(authRequest);
-    }
+		return this.getAuthenticationManager().authenticate(authRequest);
+	}
 
-    /**
-     * Enables subclasses to override the composition of the password, such as by including additional values
-     * and a separator.<p>This might be used for example if a postcode/zipcode was required in addition to the
-     * password. A delimiter such as a pipe (|) should be used to separate the password and extended value(s). The
-     * <code>AuthenticationDao</code> will need to generate the expected password in a corresponding manner.</p>
-     *
-     * @param request so that request attributes can be retrieved
-     *
-     * @return the password that will be presented in the <code>Authentication</code> request token to the
-     *         <code>AuthenticationManager</code>
-     */
-    protected String obtainPassword(HttpServletRequest request) {
-        return request.getParameter(passwordParameter);
-    }
+	/**
+	 * Enables subclasses to override the composition of the password, such as by
+	 * including additional values and a separator.
+	 * <p>
+	 * This might be used for example if a postcode/zipcode was required in addition to
+	 * the password. A delimiter such as a pipe (|) should be used to separate the
+	 * password and extended value(s). The <code>AuthenticationDao</code> will need to
+	 * generate the expected password in a corresponding manner.
+	 * </p>
+	 *
+	 * @param request so that request attributes can be retrieved
+	 *
+	 * @return the password that will be presented in the <code>Authentication</code>
+	 * request token to the <code>AuthenticationManager</code>
+	 */
+	protected String obtainPassword(HttpServletRequest request) {
+		return request.getParameter(passwordParameter);
+	}
 
-    /**
-     * Enables subclasses to override the composition of the username, such as by including additional values
-     * and a separator.
-     *
-     * @param request so that request attributes can be retrieved
-     *
-     * @return the username that will be presented in the <code>Authentication</code> request token to the
-     *         <code>AuthenticationManager</code>
-     */
-    protected String obtainUsername(HttpServletRequest request) {
-        return request.getParameter(usernameParameter);
-    }
+	/**
+	 * Enables subclasses to override the composition of the username, such as by
+	 * including additional values and a separator.
+	 *
+	 * @param request so that request attributes can be retrieved
+	 *
+	 * @return the username that will be presented in the <code>Authentication</code>
+	 * request token to the <code>AuthenticationManager</code>
+	 */
+	protected String obtainUsername(HttpServletRequest request) {
+		return request.getParameter(usernameParameter);
+	}
 
-    /**
-     * Provided so that subclasses may configure what is put into the authentication request's details
-     * property.
-     *
-     * @param request that an authentication request is being created for
-     * @param authRequest the authentication request object that should have its details set
-     */
-    protected void setDetails(HttpServletRequest request, UsernamePasswordAuthenticationToken authRequest) {
-        authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
-    }
+	/**
+	 * Provided so that subclasses may configure what is put into the authentication
+	 * request's details property.
+	 *
+	 * @param request that an authentication request is being created for
+	 * @param authRequest the authentication request object that should have its details
+	 * set
+	 */
+	protected void setDetails(HttpServletRequest request,
+			UsernamePasswordAuthenticationToken authRequest) {
+		authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
+	}
 
-    /**
-     * Sets the parameter name which will be used to obtain the username from the login request.
-     *
-     * @param usernameParameter the parameter name. Defaults to "username".
-     */
-    public void setUsernameParameter(String usernameParameter) {
-        Assert.hasText(usernameParameter, "Username parameter must not be empty or null");
-        this.usernameParameter = usernameParameter;
-    }
+	/**
+	 * Sets the parameter name which will be used to obtain the username from the login
+	 * request.
+	 *
+	 * @param usernameParameter the parameter name. Defaults to "username".
+	 */
+	public void setUsernameParameter(String usernameParameter) {
+		Assert.hasText(usernameParameter, "Username parameter must not be empty or null");
+		this.usernameParameter = usernameParameter;
+	}
 
-    /**
-     * Sets the parameter name which will be used to obtain the password from the login request..
-     *
-     * @param passwordParameter the parameter name. Defaults to "password".
-     */
-    public void setPasswordParameter(String passwordParameter) {
-        Assert.hasText(passwordParameter, "Password parameter must not be empty or null");
-        this.passwordParameter = passwordParameter;
-    }
+	/**
+	 * Sets the parameter name which will be used to obtain the password from the login
+	 * request..
+	 *
+	 * @param passwordParameter the parameter name. Defaults to "password".
+	 */
+	public void setPasswordParameter(String passwordParameter) {
+		Assert.hasText(passwordParameter, "Password parameter must not be empty or null");
+		this.passwordParameter = passwordParameter;
+	}
 
-    /**
-     * Defines whether only HTTP POST requests will be allowed by this filter.
-     * If set to true, and an authentication request is received which is not a POST request, an exception will
-     * be raised immediately and authentication will not be attempted. The <tt>unsuccessfulAuthentication()</tt> method
-     * will be called as if handling a failed authentication.
-     * <p>
-     * Defaults to <tt>true</tt> but may be overridden by subclasses.
-     */
-    public void setPostOnly(boolean postOnly) {
-        this.postOnly = postOnly;
-    }
+	/**
+	 * Defines whether only HTTP POST requests will be allowed by this filter. If set to
+	 * true, and an authentication request is received which is not a POST request, an
+	 * exception will be raised immediately and authentication will not be attempted. The
+	 * <tt>unsuccessfulAuthentication()</tt> method will be called as if handling a failed
+	 * authentication.
+	 * <p>
+	 * Defaults to <tt>true</tt> but may be overridden by subclasses.
+	 */
+	public void setPostOnly(boolean postOnly) {
+		this.postOnly = postOnly;
+	}
 
-    public final String getUsernameParameter() {
-        return usernameParameter;
-    }
+	public final String getUsernameParameter() {
+		return usernameParameter;
+	}
 
-    public final String getPasswordParameter() {
-        return passwordParameter;
-    }
+	public final String getPasswordParameter() {
+		return passwordParameter;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java
index 7c39533127..9e61091ae6 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetails.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-
 /**
  * A holder of selected HTTP details related to a web authentication request.
  *
@@ -30,106 +29,110 @@ import javax.servlet.http.HttpSession;
  */
 public class WebAuthenticationDetails implements Serializable {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String remoteAddress;
-    private final String sessionId;
+	private final String remoteAddress;
+	private final String sessionId;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Records the remote address and will also set the session Id if a session
-     * already exists (it won't create one).
-     *
-     * @param request that the authentication request was received from
-     */
-    public WebAuthenticationDetails(HttpServletRequest request) {
-        this.remoteAddress = request.getRemoteAddr();
+	/**
+	 * Records the remote address and will also set the session Id if a session already
+	 * exists (it won't create one).
+	 *
+	 * @param request that the authentication request was received from
+	 */
+	public WebAuthenticationDetails(HttpServletRequest request) {
+		this.remoteAddress = request.getRemoteAddr();
 
-        HttpSession session = request.getSession(false);
-        this.sessionId = (session != null) ? session.getId() : null;
-    }
+		HttpSession session = request.getSession(false);
+		this.sessionId = (session != null) ? session.getId() : null;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public boolean equals(Object obj) {
-        if (obj instanceof WebAuthenticationDetails) {
-            WebAuthenticationDetails rhs = (WebAuthenticationDetails) obj;
+	public boolean equals(Object obj) {
+		if (obj instanceof WebAuthenticationDetails) {
+			WebAuthenticationDetails rhs = (WebAuthenticationDetails) obj;
 
-            if ((remoteAddress == null) && (rhs.getRemoteAddress() != null)) {
-                return false;
-            }
+			if ((remoteAddress == null) && (rhs.getRemoteAddress() != null)) {
+				return false;
+			}
 
-            if ((remoteAddress != null) && (rhs.getRemoteAddress() == null)) {
-                return false;
-            }
+			if ((remoteAddress != null) && (rhs.getRemoteAddress() == null)) {
+				return false;
+			}
 
-            if (remoteAddress != null) {
-                if (!remoteAddress.equals(rhs.getRemoteAddress())) {
-                    return false;
-                }
-            }
+			if (remoteAddress != null) {
+				if (!remoteAddress.equals(rhs.getRemoteAddress())) {
+					return false;
+				}
+			}
 
-            if ((sessionId == null) && (rhs.getSessionId() != null)) {
-                return false;
-            }
+			if ((sessionId == null) && (rhs.getSessionId() != null)) {
+				return false;
+			}
 
-            if ((sessionId != null) && (rhs.getSessionId() == null)) {
-                return false;
-            }
+			if ((sessionId != null) && (rhs.getSessionId() == null)) {
+				return false;
+			}
 
-            if (sessionId != null) {
-                if (!sessionId.equals(rhs.getSessionId())) {
-                    return false;
-                }
-            }
+			if (sessionId != null) {
+				if (!sessionId.equals(rhs.getSessionId())) {
+					return false;
+				}
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Indicates the TCP/IP address the authentication request was received from.
-     *
-     * @return the address
-     */
-    public String getRemoteAddress() {
-        return remoteAddress;
-    }
+	/**
+	 * Indicates the TCP/IP address the authentication request was received from.
+	 *
+	 * @return the address
+	 */
+	public String getRemoteAddress() {
+		return remoteAddress;
+	}
 
-    /**
-     * Indicates the <code>HttpSession</code> id the authentication request was received from.
-     *
-     * @return the session ID
-     */
-    public String getSessionId() {
-        return sessionId;
-    }
+	/**
+	 * Indicates the <code>HttpSession</code> id the authentication request was received
+	 * from.
+	 *
+	 * @return the session ID
+	 */
+	public String getSessionId() {
+		return sessionId;
+	}
 
-    public int hashCode() {
-        int code = 7654;
+	public int hashCode() {
+		int code = 7654;
 
-        if (this.remoteAddress != null) {
-            code = code * (this.remoteAddress.hashCode() % 7);
-        }
+		if (this.remoteAddress != null) {
+			code = code * (this.remoteAddress.hashCode() % 7);
+		}
 
-        if (this.sessionId != null) {
-            code = code * (this.sessionId.hashCode() % 7);
-        }
+		if (this.sessionId != null) {
+			code = code * (this.sessionId.hashCode() % 7);
+		}
 
-        return code;
-    }
+		return code;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append(": ");
-        sb.append("RemoteIpAddress: ").append(this.getRemoteAddress()).append("; ");
-        sb.append("SessionId: ").append(this.getSessionId());
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append(": ");
+		sb.append("RemoteIpAddress: ").append(this.getRemoteAddress()).append("; ");
+		sb.append("SessionId: ").append(this.getSessionId());
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java
index 7c3b1ade91..3a70b77170 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/WebAuthenticationDetailsSource.java
@@ -24,22 +24,25 @@ import java.lang.reflect.InvocationTargetException;
 
 import javax.servlet.http.HttpServletRequest;
 
-
 /**
- * Implementation of {@link AuthenticationDetailsSource} which builds the details object from
- * an <tt>HttpServletRequest</tt> object, creating a {@code WebAuthenticationDetails}.
+ * Implementation of {@link AuthenticationDetailsSource} which builds the details object
+ * from an <tt>HttpServletRequest</tt> object, creating a {@code WebAuthenticationDetails}
+ * .
  *
  * @author Ben Alex
  */
-public class WebAuthenticationDetailsSource implements AuthenticationDetailsSource<HttpServletRequest, WebAuthenticationDetails> {
+public class WebAuthenticationDetailsSource implements
+		AuthenticationDetailsSource<HttpServletRequest, WebAuthenticationDetails> {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * @param context the {@code HttpServletRequest} object.
-     * @return the {@code WebAuthenticationDetails} containing information about the current request
-     */
-    public WebAuthenticationDetails buildDetails(HttpServletRequest context) {
-        return new WebAuthenticationDetails(context);
-    }
+	/**
+	 * @param context the {@code HttpServletRequest} object.
+	 * @return the {@code WebAuthenticationDetails} containing information about the
+	 * current request
+	 */
+	public WebAuthenticationDetails buildDetails(HttpServletRequest context) {
+		return new WebAuthenticationDetails(context);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java
index a19d3d7711..ae3fdb6a58 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandler.java
@@ -17,23 +17,24 @@ import org.springframework.util.StringUtils;
  * @since 3.1
  */
 public final class CookieClearingLogoutHandler implements LogoutHandler {
-    private final List<String> cookiesToClear;
+	private final List<String> cookiesToClear;
 
-    public CookieClearingLogoutHandler(String... cookiesToClear) {
-        Assert.notNull(cookiesToClear, "List of cookies cannot be null");
-        this.cookiesToClear = Arrays.asList(cookiesToClear);
-    }
+	public CookieClearingLogoutHandler(String... cookiesToClear) {
+		Assert.notNull(cookiesToClear, "List of cookies cannot be null");
+		this.cookiesToClear = Arrays.asList(cookiesToClear);
+	}
 
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        for (String cookieName : cookiesToClear) {
-            Cookie cookie = new Cookie(cookieName, null);
-            String cookiePath = request.getContextPath();
-            if(!StringUtils.hasLength(cookiePath)) {
-                cookiePath = "/";
-            }
-            cookie.setPath(cookiePath);
-            cookie.setMaxAge(0);
-            response.addCookie(cookie);
-        }
-    }
+	public void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) {
+		for (String cookieName : cookiesToClear) {
+			Cookie cookie = new Cookie(cookieName, null);
+			String cookiePath = request.getContextPath();
+			if (!StringUtils.hasLength(cookiePath)) {
+				cookiePath = "/";
+			}
+			cookie.setPath(cookiePath);
+			cookie.setMaxAge(0);
+			response.addCookie(cookie);
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java
index d9c167e85c..120fd75d42 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutFilter.java
@@ -38,96 +38,107 @@ import org.springframework.web.filter.GenericFilterBean;
 /**
  * Logs a principal out.
  * <p>
- * Polls a series of {@link LogoutHandler}s. The handlers should be specified in the order they are required.
- * Generally you will want to call logout handlers <code>TokenBasedRememberMeServices</code> and
- * <code>SecurityContextLogoutHandler</code> (in that order).
+ * Polls a series of {@link LogoutHandler}s. The handlers should be specified in the order
+ * they are required. Generally you will want to call logout handlers
+ * <code>TokenBasedRememberMeServices</code> and <code>SecurityContextLogoutHandler</code>
+ * (in that order).
  * <p>
- * After logout, a redirect will be performed to the URL determined by either the configured
- * <tt>LogoutSuccessHandler</tt> or the <tt>logoutSuccessUrl</tt>, depending on which constructor was used.
+ * After logout, a redirect will be performed to the URL determined by either the
+ * configured <tt>LogoutSuccessHandler</tt> or the <tt>logoutSuccessUrl</tt>, depending on
+ * which constructor was used.
  *
  * @author Ben Alex
  */
 public class LogoutFilter extends GenericFilterBean {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private RequestMatcher logoutRequestMatcher;
+	private RequestMatcher logoutRequestMatcher;
 
-    private final List<LogoutHandler> handlers;
-    private final LogoutSuccessHandler logoutSuccessHandler;
+	private final List<LogoutHandler> handlers;
+	private final LogoutSuccessHandler logoutSuccessHandler;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructor which takes a <tt>LogoutSuccessHandler</tt> instance to determine the target destination
-     * after logging out. The list of <tt>LogoutHandler</tt>s are intended to perform the actual logout functionality
-     * (such as clearing the security context, invalidating the session, etc.).
-     */
-    public LogoutFilter(LogoutSuccessHandler logoutSuccessHandler, LogoutHandler... handlers) {
-        Assert.notEmpty(handlers, "LogoutHandlers are required");
-        this.handlers = Arrays.asList(handlers);
-        Assert.notNull(logoutSuccessHandler, "logoutSuccessHandler cannot be null");
-        this.logoutSuccessHandler = logoutSuccessHandler;
-        setFilterProcessesUrl("/logout");
-    }
+	/**
+	 * Constructor which takes a <tt>LogoutSuccessHandler</tt> instance to determine the
+	 * target destination after logging out. The list of <tt>LogoutHandler</tt>s are
+	 * intended to perform the actual logout functionality (such as clearing the security
+	 * context, invalidating the session, etc.).
+	 */
+	public LogoutFilter(LogoutSuccessHandler logoutSuccessHandler,
+			LogoutHandler... handlers) {
+		Assert.notEmpty(handlers, "LogoutHandlers are required");
+		this.handlers = Arrays.asList(handlers);
+		Assert.notNull(logoutSuccessHandler, "logoutSuccessHandler cannot be null");
+		this.logoutSuccessHandler = logoutSuccessHandler;
+		setFilterProcessesUrl("/logout");
+	}
 
-    public LogoutFilter(String logoutSuccessUrl, LogoutHandler... handlers) {
-        Assert.notEmpty(handlers, "LogoutHandlers are required");
-        this.handlers = Arrays.asList(handlers);
-        Assert.isTrue(!StringUtils.hasLength(logoutSuccessUrl) ||
-                UrlUtils.isValidRedirectUrl(logoutSuccessUrl), logoutSuccessUrl + " isn't a valid redirect URL");
-        SimpleUrlLogoutSuccessHandler urlLogoutSuccessHandler = new SimpleUrlLogoutSuccessHandler();
-        if (StringUtils.hasText(logoutSuccessUrl)) {
-            urlLogoutSuccessHandler.setDefaultTargetUrl(logoutSuccessUrl);
-        }
-        logoutSuccessHandler = urlLogoutSuccessHandler;
-        setFilterProcessesUrl("/logout");
-    }
+	public LogoutFilter(String logoutSuccessUrl, LogoutHandler... handlers) {
+		Assert.notEmpty(handlers, "LogoutHandlers are required");
+		this.handlers = Arrays.asList(handlers);
+		Assert.isTrue(
+				!StringUtils.hasLength(logoutSuccessUrl)
+						|| UrlUtils.isValidRedirectUrl(logoutSuccessUrl),
+				logoutSuccessUrl + " isn't a valid redirect URL");
+		SimpleUrlLogoutSuccessHandler urlLogoutSuccessHandler = new SimpleUrlLogoutSuccessHandler();
+		if (StringUtils.hasText(logoutSuccessUrl)) {
+			urlLogoutSuccessHandler.setDefaultTargetUrl(logoutSuccessUrl);
+		}
+		logoutSuccessHandler = urlLogoutSuccessHandler;
+		setFilterProcessesUrl("/logout");
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        if (requiresLogout(request, response)) {
-            Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		if (requiresLogout(request, response)) {
+			Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("Logging out user '" + auth + "' and transferring to logout destination");
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("Logging out user '" + auth
+						+ "' and transferring to logout destination");
+			}
 
-            for (LogoutHandler handler : handlers) {
-                handler.logout(request, response, auth);
-            }
+			for (LogoutHandler handler : handlers) {
+				handler.logout(request, response, auth);
+			}
 
-            logoutSuccessHandler.onLogoutSuccess(request, response, auth);
+			logoutSuccessHandler.onLogoutSuccess(request, response, auth);
 
-            return;
-        }
+			return;
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    /**
-     * Allow subclasses to modify when a logout should take place.
-     *
-     * @param request the request
-     * @param response the response
-     *
-     * @return <code>true</code> if logout should occur, <code>false</code> otherwise
-     */
-    protected boolean requiresLogout(HttpServletRequest request, HttpServletResponse response) {
-        return logoutRequestMatcher.matches(request);
-    }
+	/**
+	 * Allow subclasses to modify when a logout should take place.
+	 *
+	 * @param request the request
+	 * @param response the response
+	 *
+	 * @return <code>true</code> if logout should occur, <code>false</code> otherwise
+	 */
+	protected boolean requiresLogout(HttpServletRequest request,
+			HttpServletResponse response) {
+		return logoutRequestMatcher.matches(request);
+	}
 
-    public void setLogoutRequestMatcher(RequestMatcher logoutRequestMatcher) {
-        Assert.notNull(logoutRequestMatcher, "logoutRequestMatcher cannot be null");
-        this.logoutRequestMatcher = logoutRequestMatcher;
-    }
+	public void setLogoutRequestMatcher(RequestMatcher logoutRequestMatcher) {
+		Assert.notNull(logoutRequestMatcher, "logoutRequestMatcher cannot be null");
+		this.logoutRequestMatcher = logoutRequestMatcher;
+	}
 
-    public void setFilterProcessesUrl(String filterProcessesUrl) {
-        this.logoutRequestMatcher = new AntPathRequestMatcher(filterProcessesUrl);
-    }
+	public void setFilterProcessesUrl(String filterProcessesUrl) {
+		this.logoutRequestMatcher = new AntPathRequestMatcher(filterProcessesUrl);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java
index ae84d5e0dc..3dc49d6c59 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutHandler.java
@@ -20,7 +20,6 @@ import org.springframework.security.core.Authentication;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Indicates a class that is able to participate in logout handling.
  *
@@ -30,14 +29,16 @@ import javax.servlet.http.HttpServletResponse;
  * @author Ben Alex
  */
 public interface LogoutHandler {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Causes a logout to be completed. The method must complete successfully.
-     *
-     * @param request the HTTP request
-     * @param response the HTTP response
-     * @param authentication the current principal details
-     */
-    void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication);
+	/**
+	 * Causes a logout to be completed. The method must complete successfully.
+	 *
+	 * @param request the HTTP request
+	 * @param response the HTTP response
+	 * @param authentication the current principal details
+	 */
+	void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication);
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessHandler.java
index 1e4b1cbe0b..2e05ad360d 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/LogoutSuccessHandler.java
@@ -9,19 +9,19 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.Authentication;
 
 /**
- * Strategy that is called after a successful logout by the {@link LogoutFilter}, to handle redirection or
- * forwarding to the appropriate destination.
+ * Strategy that is called after a successful logout by the {@link LogoutFilter}, to
+ * handle redirection or forwarding to the appropriate destination.
  * <p>
- * Note that the interface is almost the same as {@link LogoutHandler} but may raise an exception.
- * <tt>LogoutHandler</tt> implementations expect to be invoked to perform necessary cleanup, so should not throw
- * exceptions.
+ * Note that the interface is almost the same as {@link LogoutHandler} but may raise an
+ * exception. <tt>LogoutHandler</tt> implementations expect to be invoked to perform
+ * necessary cleanup, so should not throw exceptions.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface LogoutSuccessHandler {
 
-    void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException;
+	void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) throws IOException, ServletException;
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java
index 4affa55e64..a54a05d5ee 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandler.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.authentication.logout;
 
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -28,72 +27,77 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
 /**
- * Performs a logout by modifying the {@link org.springframework.security.core.context.SecurityContextHolder}.
+ * Performs a logout by modifying the
+ * {@link org.springframework.security.core.context.SecurityContextHolder}.
  * <p>
- * Will also invalidate the {@link HttpSession} if {@link #isInvalidateHttpSession()} is {@code true} and the
- * session is not {@code null}.
+ * Will also invalidate the {@link HttpSession} if {@link #isInvalidateHttpSession()} is
+ * {@code true} and the session is not {@code null}.
  * <p>
- * Will also remove the {@link Authentication} from the current {@link SecurityContext} if {@link #clearAuthentication}
- * is set to true (default).
+ * Will also remove the {@link Authentication} from the current {@link SecurityContext} if
+ * {@link #clearAuthentication} is set to true (default).
  *
  * @author Ben Alex
  * @author Rob Winch
  */
 public class SecurityContextLogoutHandler implements LogoutHandler {
-    protected final Log logger = LogFactory.getLog(this.getClass());
+	protected final Log logger = LogFactory.getLog(this.getClass());
 
-    private boolean invalidateHttpSession = true;
-    private boolean clearAuthentication = true;
+	private boolean invalidateHttpSession = true;
+	private boolean clearAuthentication = true;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Requires the request to be passed in.
-     *
-     * @param request        from which to obtain a HTTP session (cannot be null)
-     * @param response       not used (can be <code>null</code>)
-     * @param authentication not used (can be <code>null</code>)
-     */
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        Assert.notNull(request, "HttpServletRequest required");
-        if (invalidateHttpSession) {
-            HttpSession session = request.getSession(false);
-            if (session != null) {
-                logger.debug("Invalidating session: " + session.getId());
-                session.invalidate();
-            }
-        }
+	/**
+	 * Requires the request to be passed in.
+	 *
+	 * @param request from which to obtain a HTTP session (cannot be null)
+	 * @param response not used (can be <code>null</code>)
+	 * @param authentication not used (can be <code>null</code>)
+	 */
+	public void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) {
+		Assert.notNull(request, "HttpServletRequest required");
+		if (invalidateHttpSession) {
+			HttpSession session = request.getSession(false);
+			if (session != null) {
+				logger.debug("Invalidating session: " + session.getId());
+				session.invalidate();
+			}
+		}
 
-        if(clearAuthentication) {
-            SecurityContext context = SecurityContextHolder.getContext();
-            context.setAuthentication(null);
-        }
+		if (clearAuthentication) {
+			SecurityContext context = SecurityContextHolder.getContext();
+			context.setAuthentication(null);
+		}
 
-        SecurityContextHolder.clearContext();
-    }
+		SecurityContextHolder.clearContext();
+	}
 
-    public boolean isInvalidateHttpSession() {
-        return invalidateHttpSession;
-    }
+	public boolean isInvalidateHttpSession() {
+		return invalidateHttpSession;
+	}
 
-    /**
-     * Causes the {@link HttpSession} to be invalidated when this {@link LogoutHandler} is invoked. Defaults to true.
-     *
-     * @param invalidateHttpSession true if you wish the session to be invalidated (default) or false if it should
-     * not be.
-     */
-    public void setInvalidateHttpSession(boolean invalidateHttpSession) {
-        this.invalidateHttpSession = invalidateHttpSession;
-    }
+	/**
+	 * Causes the {@link HttpSession} to be invalidated when this {@link LogoutHandler} is
+	 * invoked. Defaults to true.
+	 *
+	 * @param invalidateHttpSession true if you wish the session to be invalidated
+	 * (default) or false if it should not be.
+	 */
+	public void setInvalidateHttpSession(boolean invalidateHttpSession) {
+		this.invalidateHttpSession = invalidateHttpSession;
+	}
 
-    /**
-     * If true, removes the {@link Authentication} from the {@link SecurityContext} to prevent issues with concurrent
-     * requests.
-     *
-     * @param clearAuthentication true if you wish to clear the {@link Authentication} from the {@link SecurityContext}
-     * (default) or false if the {@link Authentication} should not be removed.
-     */
-    public void setClearAuthentication(boolean clearAuthentication) {
-        this.clearAuthentication = clearAuthentication;
-    }
+	/**
+	 * If true, removes the {@link Authentication} from the {@link SecurityContext} to
+	 * prevent issues with concurrent requests.
+	 *
+	 * @param clearAuthentication true if you wish to clear the {@link Authentication}
+	 * from the {@link SecurityContext} (default) or false if the {@link Authentication}
+	 * should not be removed.
+	 */
+	public void setClearAuthentication(boolean clearAuthentication) {
+		this.clearAuthentication = clearAuthentication;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandler.java
index 440410f5b2..712cef2949 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandler.java
@@ -10,18 +10,18 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AbstractAuthenticationTargetUrlRequestHandler;
 
 /**
- * Handles the navigation on logout by delegating to the {@link AbstractAuthenticationTargetUrlRequestHandler}
- * base class logic.
+ * Handles the navigation on logout by delegating to the
+ * {@link AbstractAuthenticationTargetUrlRequestHandler} base class logic.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class SimpleUrlLogoutSuccessHandler extends AbstractAuthenticationTargetUrlRequestHandler
-        implements LogoutSuccessHandler {
+public class SimpleUrlLogoutSuccessHandler extends
+		AbstractAuthenticationTargetUrlRequestHandler implements LogoutSuccessHandler {
 
-    public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException {
-        super.handle(request, response, authentication);
-    }
+	public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) throws IOException, ServletException {
+		super.handle(request, response, authentication);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
index deaa90b664..17f0f6d871 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilter.java
@@ -35,249 +35,274 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * Base class for processing filters that handle pre-authenticated authentication requests, where it is assumed
- * that the principal has already been authenticated by an external system.
+ * Base class for processing filters that handle pre-authenticated authentication
+ * requests, where it is assumed that the principal has already been authenticated by an
+ * external system.
  * <p>
- * The purpose is then only to extract the necessary information on the principal from the incoming request, rather
- * than to authenticate them. External authentication systems may provide this information via request data such as
- * headers or cookies which the pre-authentication system can extract. It is assumed that the external system is
- * responsible for the accuracy of the data and preventing the submission of forged values.
+ * The purpose is then only to extract the necessary information on the principal from the
+ * incoming request, rather than to authenticate them. External authentication systems may
+ * provide this information via request data such as headers or cookies which the
+ * pre-authentication system can extract. It is assumed that the external system is
+ * responsible for the accuracy of the data and preventing the submission of forged
+ * values.
  *
- * Subclasses must implement the {@code getPreAuthenticatedPrincipal()} and {@code getPreAuthenticatedCredentials()}
- * methods. Subclasses of this filter are typically used in combination with a
- * {@code PreAuthenticatedAuthenticationProvider}, which is used to load additional data for the user.
- * This provider will reject null credentials, so the {@link #getPreAuthenticatedCredentials} method should not return
+ * Subclasses must implement the {@code getPreAuthenticatedPrincipal()} and
+ * {@code getPreAuthenticatedCredentials()} methods. Subclasses of this filter are
+ * typically used in combination with a {@code PreAuthenticatedAuthenticationProvider},
+ * which is used to load additional data for the user. This provider will reject null
+ * credentials, so the {@link #getPreAuthenticatedCredentials} method should not return
  * null for a valid principal.
  * <p>
- * If the security context already contains an {@code Authentication} object (either from a invocation of the
- * filter or because of some other authentication mechanism), the filter will do nothing by default. You can force
- * it to check for a change in the principal by setting the {@link #setCheckForPrincipalChanges(boolean)
+ * If the security context already contains an {@code Authentication} object (either from
+ * a invocation of the filter or because of some other authentication mechanism), the
+ * filter will do nothing by default. You can force it to check for a change in the
+ * principal by setting the {@link #setCheckForPrincipalChanges(boolean)
  * checkForPrincipalChanges} property.
  * <p>
- * By default, the filter chain will proceed when an authentication attempt fails in order to allow other
- * authentication mechanisms to process the request. To reject the credentials immediately, set the
- * <tt>continueFilterChainOnUnsuccessfulAuthentication</tt> flag to false. The exception raised by the
- * <tt>AuthenticationManager</tt> will the be re-thrown. Note that this will not affect cases where the principal
- * returned by {@link #getPreAuthenticatedPrincipal} is null, when the chain will still proceed as normal.
+ * By default, the filter chain will proceed when an authentication attempt fails in order
+ * to allow other authentication mechanisms to process the request. To reject the
+ * credentials immediately, set the
+ * <tt>continueFilterChainOnUnsuccessfulAuthentication</tt> flag to false. The exception
+ * raised by the <tt>AuthenticationManager</tt> will the be re-thrown. Note that this will
+ * not affect cases where the principal returned by {@link #getPreAuthenticatedPrincipal}
+ * is null, when the chain will still proceed as normal.
  *
  * @author Luke Taylor
  * @author Ruud Senden
  * @author Rob Winch
  * @since 2.0
  */
-public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFilterBean implements
-        ApplicationEventPublisherAware {
+public abstract class AbstractPreAuthenticatedProcessingFilter extends GenericFilterBean
+		implements ApplicationEventPublisherAware {
 
-    private ApplicationEventPublisher eventPublisher = null;
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource
-            = new WebAuthenticationDetailsSource();
-    private AuthenticationManager authenticationManager = null;
-    private boolean continueFilterChainOnUnsuccessfulAuthentication = true;
-    private boolean checkForPrincipalChanges;
-    private boolean invalidateSessionOnPrincipalChange = true;
+	private ApplicationEventPublisher eventPublisher = null;
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	private AuthenticationManager authenticationManager = null;
+	private boolean continueFilterChainOnUnsuccessfulAuthentication = true;
+	private boolean checkForPrincipalChanges;
+	private boolean invalidateSessionOnPrincipalChange = true;
 
-    /**
-     * Check whether all required properties have been set.
-     */
-    @Override
-    public void afterPropertiesSet() {
-        try {
-            super.afterPropertiesSet();
-        } catch(ServletException e) {
-            // convert to RuntimeException for passivity on afterPropertiesSet signature
-            throw new RuntimeException(e);
-        }
-        Assert.notNull(authenticationManager, "An AuthenticationManager must be set");
-    }
+	/**
+	 * Check whether all required properties have been set.
+	 */
+	@Override
+	public void afterPropertiesSet() {
+		try {
+			super.afterPropertiesSet();
+		}
+		catch (ServletException e) {
+			// convert to RuntimeException for passivity on afterPropertiesSet signature
+			throw new RuntimeException(e);
+		}
+		Assert.notNull(authenticationManager, "An AuthenticationManager must be set");
+	}
 
-    /**
-     * Try to authenticate a pre-authenticated user with Spring Security if the user has not yet been authenticated.
-     */
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+	/**
+	 * Try to authenticate a pre-authenticated user with Spring Security if the user has
+	 * not yet been authenticated.
+	 */
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Checking secure context token: " + SecurityContextHolder.getContext().getAuthentication());
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Checking secure context token: "
+					+ SecurityContextHolder.getContext().getAuthentication());
+		}
 
-        if (requiresAuthentication((HttpServletRequest) request)) {
-            doAuthenticate((HttpServletRequest) request, (HttpServletResponse) response);
-        }
+		if (requiresAuthentication((HttpServletRequest) request)) {
+			doAuthenticate((HttpServletRequest) request, (HttpServletResponse) response);
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    /**
-     * Do the actual authentication for a pre-authenticated user.
-     */
-    private void doAuthenticate(HttpServletRequest request, HttpServletResponse response) {
-        Authentication authResult;
+	/**
+	 * Do the actual authentication for a pre-authenticated user.
+	 */
+	private void doAuthenticate(HttpServletRequest request, HttpServletResponse response) {
+		Authentication authResult;
 
-        Object principal = getPreAuthenticatedPrincipal(request);
-        Object credentials = getPreAuthenticatedCredentials(request);
+		Object principal = getPreAuthenticatedPrincipal(request);
+		Object credentials = getPreAuthenticatedCredentials(request);
 
-        if (principal == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("No pre-authenticated principal found in request");
-            }
+		if (principal == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("No pre-authenticated principal found in request");
+			}
 
-            return;
-        }
+			return;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("preAuthenticatedPrincipal = " + principal + ", trying to authenticate");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("preAuthenticatedPrincipal = " + principal
+					+ ", trying to authenticate");
+		}
 
-        try {
-            PreAuthenticatedAuthenticationToken authRequest = new PreAuthenticatedAuthenticationToken(principal, credentials);
-            authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
-            authResult = authenticationManager.authenticate(authRequest);
-            successfulAuthentication(request, response, authResult);
-        } catch (AuthenticationException failed) {
-            unsuccessfulAuthentication(request, response, failed);
+		try {
+			PreAuthenticatedAuthenticationToken authRequest = new PreAuthenticatedAuthenticationToken(
+					principal, credentials);
+			authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
+			authResult = authenticationManager.authenticate(authRequest);
+			successfulAuthentication(request, response, authResult);
+		}
+		catch (AuthenticationException failed) {
+			unsuccessfulAuthentication(request, response, failed);
 
-            if (!continueFilterChainOnUnsuccessfulAuthentication) {
-                throw failed;
-            }
-        }
-    }
+			if (!continueFilterChainOnUnsuccessfulAuthentication) {
+				throw failed;
+			}
+		}
+	}
 
-    private boolean requiresAuthentication(HttpServletRequest request) {
-        Authentication currentUser = SecurityContextHolder.getContext().getAuthentication();
+	private boolean requiresAuthentication(HttpServletRequest request) {
+		Authentication currentUser = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (currentUser == null) {
-            return true;
-        }
+		if (currentUser == null) {
+			return true;
+		}
 
-        if (!checkForPrincipalChanges) {
-            return false;
-        }
+		if (!checkForPrincipalChanges) {
+			return false;
+		}
 
-        Object principal = getPreAuthenticatedPrincipal(request);
+		Object principal = getPreAuthenticatedPrincipal(request);
 
-        if ((principal instanceof String) && currentUser.getName().equals(principal)) {
-            return false;
-        }
+		if ((principal instanceof String) && currentUser.getName().equals(principal)) {
+			return false;
+		}
 
-        if(principal != null && principal.equals(currentUser.getPrincipal())) {
-            return false;
-        }
+		if (principal != null && principal.equals(currentUser.getPrincipal())) {
+			return false;
+		}
 
-        logger.debug("Pre-authenticated principal has changed to " + principal + " and will be reauthenticated");
+		logger.debug("Pre-authenticated principal has changed to " + principal
+				+ " and will be reauthenticated");
 
-        if (invalidateSessionOnPrincipalChange) {
-            SecurityContextHolder.clearContext();
+		if (invalidateSessionOnPrincipalChange) {
+			SecurityContextHolder.clearContext();
 
-            HttpSession session = request.getSession(false);
+			HttpSession session = request.getSession(false);
 
-            if (session != null) {
-                logger.debug("Invalidating existing session");
-                session.invalidate();
-                request.getSession();
-            }
-        }
+			if (session != null) {
+				logger.debug("Invalidating existing session");
+				session.invalidate();
+				request.getSession();
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Puts the <code>Authentication</code> instance returned by the
-     * authentication manager into the secure context.
-     */
-    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, Authentication authResult) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication success: " + authResult);
-        }
-        SecurityContextHolder.getContext().setAuthentication(authResult);
-        // Fire event
-        if (this.eventPublisher != null) {
-            eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(authResult, this.getClass()));
-        }
-    }
+	/**
+	 * Puts the <code>Authentication</code> instance returned by the authentication
+	 * manager into the secure context.
+	 */
+	protected void successfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, Authentication authResult) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication success: " + authResult);
+		}
+		SecurityContextHolder.getContext().setAuthentication(authResult);
+		// Fire event
+		if (this.eventPublisher != null) {
+			eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(
+					authResult, this.getClass()));
+		}
+	}
 
-    /**
-     * Ensures the authentication object in the secure context is set to null when authentication fails.
-     * <p>
-     * Caches the failure exception as a request attribute
-     */
-    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) {
-        SecurityContextHolder.clearContext();
+	/**
+	 * Ensures the authentication object in the secure context is set to null when
+	 * authentication fails.
+	 * <p>
+	 * Caches the failure exception as a request attribute
+	 */
+	protected void unsuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException failed) {
+		SecurityContextHolder.clearContext();
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Cleared security context due to exception", failed);
-        }
-        request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, failed);
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Cleared security context due to exception", failed);
+		}
+		request.setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, failed);
+	}
 
-    /**
-     * @param anApplicationEventPublisher
-     *            The ApplicationEventPublisher to use
-     */
-    public void setApplicationEventPublisher(ApplicationEventPublisher anApplicationEventPublisher) {
-        this.eventPublisher = anApplicationEventPublisher;
-    }
+	/**
+	 * @param anApplicationEventPublisher The ApplicationEventPublisher to use
+	 */
+	public void setApplicationEventPublisher(
+			ApplicationEventPublisher anApplicationEventPublisher) {
+		this.eventPublisher = anApplicationEventPublisher;
+	}
 
-    /**
-     * @param authenticationDetailsSource
-     *            The AuthenticationDetailsSource to use
-     */
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
+	/**
+	 * @param authenticationDetailsSource The AuthenticationDetailsSource to use
+	 */
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
 
-    protected AuthenticationDetailsSource<HttpServletRequest, ?> getAuthenticationDetailsSource() {
-        return authenticationDetailsSource;
-    }
+	protected AuthenticationDetailsSource<HttpServletRequest, ?> getAuthenticationDetailsSource() {
+		return authenticationDetailsSource;
+	}
 
-    /**
-     * @param authenticationManager
-     *            The AuthenticationManager to use
-     */
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	/**
+	 * @param authenticationManager The AuthenticationManager to use
+	 */
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 
-    /**
-     * If set to {@code true}, any {@code AuthenticationException} raised by the {@code AuthenticationManager} will be
-     * swallowed, and the request will be allowed to proceed, potentially using alternative authentication mechanisms.
-     * If {@code false} (the default), authentication failure will result in an immediate exception.
-     *
-     * @param shouldContinue set to {@code true} to allow the request to proceed after a failed authentication.
-     */
-    public void setContinueFilterChainOnUnsuccessfulAuthentication(boolean shouldContinue) {
-        continueFilterChainOnUnsuccessfulAuthentication = shouldContinue;
-    }
+	/**
+	 * If set to {@code true}, any {@code AuthenticationException} raised by the
+	 * {@code AuthenticationManager} will be swallowed, and the request will be allowed to
+	 * proceed, potentially using alternative authentication mechanisms. If {@code false}
+	 * (the default), authentication failure will result in an immediate exception.
+	 *
+	 * @param shouldContinue set to {@code true} to allow the request to proceed after a
+	 * failed authentication.
+	 */
+	public void setContinueFilterChainOnUnsuccessfulAuthentication(boolean shouldContinue) {
+		continueFilterChainOnUnsuccessfulAuthentication = shouldContinue;
+	}
 
-    /**
-     * If set, the pre-authenticated principal will be checked on each request and compared against the name of the
-     * current <tt>Authentication</tt> object. A check to determine if {@link Authentication#getPrincipal()} is equal
-     * to the principal will also be performed. If a change is detected, the user will be reauthenticated.
-     *
-     * @param checkForPrincipalChanges
-     */
-    public void setCheckForPrincipalChanges(boolean checkForPrincipalChanges) {
-        this.checkForPrincipalChanges = checkForPrincipalChanges;
-    }
+	/**
+	 * If set, the pre-authenticated principal will be checked on each request and
+	 * compared against the name of the current <tt>Authentication</tt> object. A check to
+	 * determine if {@link Authentication#getPrincipal()} is equal to the principal will
+	 * also be performed. If a change is detected, the user will be reauthenticated.
+	 *
+	 * @param checkForPrincipalChanges
+	 */
+	public void setCheckForPrincipalChanges(boolean checkForPrincipalChanges) {
+		this.checkForPrincipalChanges = checkForPrincipalChanges;
+	}
 
-    /**
-     * If <tt>checkForPrincipalChanges</tt> is set, and a change of principal is detected, determines whether
-     * any existing session should be invalidated before proceeding to authenticate the new principal.
-     *
-     * @param invalidateSessionOnPrincipalChange <tt>false</tt> to retain the existing session. Defaults to <tt>true</tt>.
-     */
-    public void setInvalidateSessionOnPrincipalChange(boolean invalidateSessionOnPrincipalChange) {
-        this.invalidateSessionOnPrincipalChange = invalidateSessionOnPrincipalChange;
-    }
+	/**
+	 * If <tt>checkForPrincipalChanges</tt> is set, and a change of principal is detected,
+	 * determines whether any existing session should be invalidated before proceeding to
+	 * authenticate the new principal.
+	 *
+	 * @param invalidateSessionOnPrincipalChange <tt>false</tt> to retain the existing
+	 * session. Defaults to <tt>true</tt>.
+	 */
+	public void setInvalidateSessionOnPrincipalChange(
+			boolean invalidateSessionOnPrincipalChange) {
+		this.invalidateSessionOnPrincipalChange = invalidateSessionOnPrincipalChange;
+	}
 
-    /**
-     * Override to extract the principal information from the current request
-     */
-    protected abstract Object getPreAuthenticatedPrincipal(HttpServletRequest request);
+	/**
+	 * Override to extract the principal information from the current request
+	 */
+	protected abstract Object getPreAuthenticatedPrincipal(HttpServletRequest request);
 
-    /**
-     * Override to extract the credentials (if applicable) from the current request. Should not return null for a valid
-     * principal, though some implementations may return a dummy value.
-     */
-    protected abstract Object getPreAuthenticatedCredentials(HttpServletRequest request);
+	/**
+	 * Override to extract the credentials (if applicable) from the current request.
+	 * Should not return null for a valid principal, though some implementations may
+	 * return a dummy value.
+	 */
+	protected abstract Object getPreAuthenticatedCredentials(HttpServletRequest request);
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
index 4d0f98a089..dc0d3f55db 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProvider.java
@@ -16,118 +16,129 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * Processes a pre-authenticated authentication request. The request will
- * typically originate from a {@link org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter}
+ * Processes a pre-authenticated authentication request. The request will typically
+ * originate from a
+ * {@link org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter}
  * subclass.
  *
  * <p>
- * This authentication provider will not perform any checks on authentication
- * requests, as they should already be pre-authenticated. However, the
- * AuthenticationUserDetailsService implementation may still throw a UsernameNotFoundException, for example.
+ * This authentication provider will not perform any checks on authentication requests, as
+ * they should already be pre-authenticated. However, the AuthenticationUserDetailsService
+ * implementation may still throw a UsernameNotFoundException, for example.
  *
  * @author Ruud Senden
  * @since 2.0
  */
-public class PreAuthenticatedAuthenticationProvider implements AuthenticationProvider, InitializingBean, Ordered {
-    private static final Log logger = LogFactory.getLog(PreAuthenticatedAuthenticationProvider.class);
+public class PreAuthenticatedAuthenticationProvider implements AuthenticationProvider,
+		InitializingBean, Ordered {
+	private static final Log logger = LogFactory
+			.getLog(PreAuthenticatedAuthenticationProvider.class);
 
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> preAuthenticatedUserDetailsService = null;
-    private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
-    private boolean throwExceptionWhenTokenRejected = false;
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> preAuthenticatedUserDetailsService = null;
+	private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
+	private boolean throwExceptionWhenTokenRejected = false;
 
-    private int order = -1; // default: same as non-ordered
+	private int order = -1; // default: same as non-ordered
 
-    /**
-     * Check whether all required properties have been set.
-     */
-    public void afterPropertiesSet() {
-        Assert.notNull(preAuthenticatedUserDetailsService, "An AuthenticationUserDetailsService must be set");
-    }
+	/**
+	 * Check whether all required properties have been set.
+	 */
+	public void afterPropertiesSet() {
+		Assert.notNull(preAuthenticatedUserDetailsService,
+				"An AuthenticationUserDetailsService must be set");
+	}
 
-    /**
-     * Authenticate the given PreAuthenticatedAuthenticationToken.
-     * <p>
-     * If the principal contained in the authentication object is null, the request will be ignored to allow other
-     * providers to authenticate it.
-     */
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        if (!supports(authentication.getClass())) {
-            return null;
-        }
+	/**
+	 * Authenticate the given PreAuthenticatedAuthenticationToken.
+	 * <p>
+	 * If the principal contained in the authentication object is null, the request will
+	 * be ignored to allow other providers to authenticate it.
+	 */
+	public Authentication authenticate(Authentication authentication)
+			throws AuthenticationException {
+		if (!supports(authentication.getClass())) {
+			return null;
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("PreAuthenticated authentication request: " + authentication);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("PreAuthenticated authentication request: " + authentication);
+		}
 
-        if (authentication.getPrincipal() == null) {
-            logger.debug("No pre-authenticated principal found in request.");
+		if (authentication.getPrincipal() == null) {
+			logger.debug("No pre-authenticated principal found in request.");
 
-            if (throwExceptionWhenTokenRejected) {
-                throw new BadCredentialsException("No pre-authenticated principal found in request.");
-            }
-            return null;
-        }
+			if (throwExceptionWhenTokenRejected) {
+				throw new BadCredentialsException(
+						"No pre-authenticated principal found in request.");
+			}
+			return null;
+		}
 
-        if (authentication.getCredentials() == null) {
-            logger.debug("No pre-authenticated credentials found in request.");
+		if (authentication.getCredentials() == null) {
+			logger.debug("No pre-authenticated credentials found in request.");
 
-            if (throwExceptionWhenTokenRejected) {
-                throw new BadCredentialsException("No pre-authenticated credentials found in request.");
-            }
-            return null;
-        }
+			if (throwExceptionWhenTokenRejected) {
+				throw new BadCredentialsException(
+						"No pre-authenticated credentials found in request.");
+			}
+			return null;
+		}
 
-        UserDetails ud = preAuthenticatedUserDetailsService.loadUserDetails((PreAuthenticatedAuthenticationToken)authentication);
+		UserDetails ud = preAuthenticatedUserDetailsService
+				.loadUserDetails((PreAuthenticatedAuthenticationToken) authentication);
 
-        userDetailsChecker.check(ud);
+		userDetailsChecker.check(ud);
 
-        PreAuthenticatedAuthenticationToken result =
-                new PreAuthenticatedAuthenticationToken(ud, authentication.getCredentials(), ud.getAuthorities());
-        result.setDetails(authentication.getDetails());
+		PreAuthenticatedAuthenticationToken result = new PreAuthenticatedAuthenticationToken(
+				ud, authentication.getCredentials(), ud.getAuthorities());
+		result.setDetails(authentication.getDetails());
 
-        return result;
-    }
+		return result;
+	}
 
-    /**
-     * Indicate that this provider only supports PreAuthenticatedAuthenticationToken (sub)classes.
-     */
-    public final boolean supports(Class<?> authentication) {
-        return PreAuthenticatedAuthenticationToken.class.isAssignableFrom(authentication);
-    }
+	/**
+	 * Indicate that this provider only supports PreAuthenticatedAuthenticationToken
+	 * (sub)classes.
+	 */
+	public final boolean supports(Class<?> authentication) {
+		return PreAuthenticatedAuthenticationToken.class.isAssignableFrom(authentication);
+	}
 
-    /**
-     * Set the AuthenticatedUserDetailsService to be used to load the {@code UserDetails} for the authenticated user.
-     *
-     * @param uds
-     */
-    public void setPreAuthenticatedUserDetailsService(AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> uds) {
-        this.preAuthenticatedUserDetailsService = uds;
-    }
+	/**
+	 * Set the AuthenticatedUserDetailsService to be used to load the {@code UserDetails}
+	 * for the authenticated user.
+	 *
+	 * @param uds
+	 */
+	public void setPreAuthenticatedUserDetailsService(
+			AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> uds) {
+		this.preAuthenticatedUserDetailsService = uds;
+	}
 
-    /**
-     * If true, causes the provider to throw a BadCredentialsException if the presented authentication
-     * request is invalid (contains a null principal or credentials). Otherwise it will just return
-     * null. Defaults to false.
-     */
-    public void setThrowExceptionWhenTokenRejected(boolean throwExceptionWhenTokenRejected) {
-        this.throwExceptionWhenTokenRejected = throwExceptionWhenTokenRejected;
-    }
+	/**
+	 * If true, causes the provider to throw a BadCredentialsException if the presented
+	 * authentication request is invalid (contains a null principal or credentials).
+	 * Otherwise it will just return null. Defaults to false.
+	 */
+	public void setThrowExceptionWhenTokenRejected(boolean throwExceptionWhenTokenRejected) {
+		this.throwExceptionWhenTokenRejected = throwExceptionWhenTokenRejected;
+	}
 
-    /**
-     * Sets the strategy which will be used to validate the loaded <tt>UserDetails</tt> object
-     * for the user. Defaults to an {@link AccountStatusUserDetailsChecker}.
-     * @param userDetailsChecker
-     */
-    public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
-        Assert.notNull(userDetailsChecker, "userDetailsChacker cannot be null");
-        this.userDetailsChecker = userDetailsChecker;
-    }
+	/**
+	 * Sets the strategy which will be used to validate the loaded <tt>UserDetails</tt>
+	 * object for the user. Defaults to an {@link AccountStatusUserDetailsChecker}.
+	 * @param userDetailsChecker
+	 */
+	public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
+		Assert.notNull(userDetailsChecker, "userDetailsChacker cannot be null");
+		this.userDetailsChecker = userDetailsChecker;
+	}
 
-    public int getOrder() {
-        return order;
-    }
+	public int getOrder() {
+		return order;
+	}
 
-    public void setOrder(int i) {
-        order = i;
-    }
+	public void setOrder(int i) {
+		order = i;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java
index 417a38ed84..6bfdb894cb 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationToken.java
@@ -6,67 +6,62 @@ import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
- * {@link org.springframework.security.core.Authentication} implementation for pre-authenticated
- * authentication.
+ * {@link org.springframework.security.core.Authentication} implementation for
+ * pre-authenticated authentication.
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public class PreAuthenticatedAuthenticationToken extends AbstractAuthenticationToken {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private final Object principal;
-    private final Object credentials;
+	private final Object principal;
+	private final Object credentials;
 
-    /**
-     * Constructor used for an authentication request. The {@link
-     * org.springframework.security.core.Authentication#isAuthenticated()} will return
-     * <code>false</code>.
-     *
-     * @param aPrincipal
-     *            The pre-authenticated principal
-     * @param aCredentials
-     *            The pre-authenticated credentials
-     */
-    public PreAuthenticatedAuthenticationToken(Object aPrincipal, Object aCredentials) {
-        super(null);
-        this.principal = aPrincipal;
-        this.credentials = aCredentials;
-    }
+	/**
+	 * Constructor used for an authentication request. The
+	 * {@link org.springframework.security.core.Authentication#isAuthenticated()} will
+	 * return <code>false</code>.
+	 *
+	 * @param aPrincipal The pre-authenticated principal
+	 * @param aCredentials The pre-authenticated credentials
+	 */
+	public PreAuthenticatedAuthenticationToken(Object aPrincipal, Object aCredentials) {
+		super(null);
+		this.principal = aPrincipal;
+		this.credentials = aCredentials;
+	}
 
+	/**
+	 * Constructor used for an authentication response. The
+	 * {@link org.springframework.security.core.Authentication#isAuthenticated()} will
+	 * return <code>true</code>.
+	 *
+	 * @param aPrincipal The authenticated principal
+	 * @param anAuthorities The granted authorities
+	 */
+	public PreAuthenticatedAuthenticationToken(Object aPrincipal, Object aCredentials,
+			Collection<? extends GrantedAuthority> anAuthorities) {
+		super(anAuthorities);
+		this.principal = aPrincipal;
+		this.credentials = aCredentials;
+		setAuthenticated(true);
+	}
 
-    /**
-     * Constructor used for an authentication response. The {@link
-     * org.springframework.security.core.Authentication#isAuthenticated()} will return
-     * <code>true</code>.
-     *
-     * @param aPrincipal
-     *            The authenticated principal
-     * @param anAuthorities
-     *            The granted authorities
-     */
-    public PreAuthenticatedAuthenticationToken(Object aPrincipal, Object aCredentials, Collection<? extends GrantedAuthority> anAuthorities) {
-        super(anAuthorities);
-        this.principal = aPrincipal;
-        this.credentials = aCredentials;
-        setAuthenticated(true);
-    }
+	/**
+	 * Get the credentials
+	 */
+	public Object getCredentials() {
+		return this.credentials;
+	}
 
-    /**
-     * Get the credentials
-     */
-    public Object getCredentials() {
-        return this.credentials;
-    }
-
-    /**
-     * Get the principal
-     */
-    public Object getPrincipal() {
-        return this.principal;
-    }
+	/**
+	 * Get the principal
+	 */
+	public Object getPrincipal() {
+		return this.principal;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java
index 547bb04c01..c9acd0036c 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedCredentialsNotFoundException.java
@@ -4,16 +4,16 @@ import org.springframework.security.core.AuthenticationException;
 
 public class PreAuthenticatedCredentialsNotFoundException extends AuthenticationException {
 
-    public PreAuthenticatedCredentialsNotFoundException(String msg) {
-        super(msg);
-    }
+	public PreAuthenticatedCredentialsNotFoundException(String msg) {
+		super(msg);
+	}
 
-    /**
-     *
-     * @param message The message for the Exception
-     * @param cause The Exception that caused this Exception.
-     */
-    public PreAuthenticatedCredentialsNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
+	/**
+	 *
+	 * @param message The message for the Exception
+	 * @param cause The Exception that caused this Exception.
+	 */
+	public PreAuthenticatedCredentialsNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
index d46ed8c37e..c11e3cda66 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java
@@ -14,44 +14,47 @@ import org.springframework.util.Assert;
 
 /**
  * <p>
- * This AuthenticationUserDetailsService implementation creates a UserDetails
- * object based solely on the information contained in the given
- * PreAuthenticatedAuthenticationToken. The user name is set to the name as
- * returned by PreAuthenticatedAuthenticationToken.getName(), the password is
- * set to a fixed dummy value (it will not be used by the
- * PreAuthenticatedAuthenticationProvider anyway), and the Granted Authorities
- * are retrieved from the details object as returned by
+ * This AuthenticationUserDetailsService implementation creates a UserDetails object based
+ * solely on the information contained in the given PreAuthenticatedAuthenticationToken.
+ * The user name is set to the name as returned by
+ * PreAuthenticatedAuthenticationToken.getName(), the password is set to a fixed dummy
+ * value (it will not be used by the PreAuthenticatedAuthenticationProvider anyway), and
+ * the Granted Authorities are retrieved from the details object as returned by
  * PreAuthenticatedAuthenticationToken.getDetails().
  *
  * <p>
- * The details object as returned by PreAuthenticatedAuthenticationToken.getDetails() must implement the
- * {@link GrantedAuthoritiesContainer} interface for this implementation to work.
+ * The details object as returned by PreAuthenticatedAuthenticationToken.getDetails() must
+ * implement the {@link GrantedAuthoritiesContainer} interface for this implementation to
+ * work.
  *
  * @author Ruud Senden
  * @since 2.0
  */
-public class PreAuthenticatedGrantedAuthoritiesUserDetailsService
-        implements AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> {
-    /**
-     * Get a UserDetails object based on the user name contained in the given
-     * token, and the GrantedAuthorities as returned by the
-     * GrantedAuthoritiesContainer implementation as returned by
-     * the token.getDetails() method.
-     */
-    public final UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token) throws AuthenticationException {
-        Assert.notNull(token.getDetails());
-        Assert.isInstanceOf(GrantedAuthoritiesContainer.class, token.getDetails());
-        Collection<? extends GrantedAuthority> authorities = ((GrantedAuthoritiesContainer) token.getDetails()).getGrantedAuthorities();
-        return createUserDetails(token, authorities);
-    }
+public class PreAuthenticatedGrantedAuthoritiesUserDetailsService implements
+		AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> {
+	/**
+	 * Get a UserDetails object based on the user name contained in the given token, and
+	 * the GrantedAuthorities as returned by the GrantedAuthoritiesContainer
+	 * implementation as returned by the token.getDetails() method.
+	 */
+	public final UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token)
+			throws AuthenticationException {
+		Assert.notNull(token.getDetails());
+		Assert.isInstanceOf(GrantedAuthoritiesContainer.class, token.getDetails());
+		Collection<? extends GrantedAuthority> authorities = ((GrantedAuthoritiesContainer) token
+				.getDetails()).getGrantedAuthorities();
+		return createUserDetails(token, authorities);
+	}
 
-    /**
-     * Creates the final <tt>UserDetails</tt> object. Can be overridden to customize the contents.
-     *
-     * @param token the authentication request token
-     * @param authorities the pre-authenticated authorities.
-     */
-    protected UserDetails createUserDetails(Authentication token, Collection<? extends GrantedAuthority> authorities) {
-        return new User(token.getName(), "N/A", true, true, true, true, authorities);
-    }
+	/**
+	 * Creates the final <tt>UserDetails</tt> object. Can be overridden to customize the
+	 * contents.
+	 *
+	 * @param token the authentication request token
+	 * @param authorities the pre-authenticated authorities.
+	 */
+	protected UserDetails createUserDetails(Authentication token,
+			Collection<? extends GrantedAuthority> authorities) {
+		return new User(token.getName(), "N/A", true, true, true, true, authorities);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
index 33f121196a..77ef0d70cd 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java
@@ -16,30 +16,30 @@ import java.util.*;
  * @author Luke Taylor
  * @since 2.0
  */
-public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends WebAuthenticationDetails implements
-        GrantedAuthoritiesContainer {
+public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends
+		WebAuthenticationDetails implements GrantedAuthoritiesContainer {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    private final List<GrantedAuthority> authorities;
+	private final List<GrantedAuthority> authorities;
 
-    public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(HttpServletRequest request,
-            Collection<? extends GrantedAuthority> authorities) {
-        super(request);
+	public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
+			HttpServletRequest request, Collection<? extends GrantedAuthority> authorities) {
+		super(request);
 
-        List<GrantedAuthority> temp = new ArrayList<GrantedAuthority>(authorities.size());
-        temp.addAll(authorities);
-        this.authorities = Collections.unmodifiableList(temp);
-    }
+		List<GrantedAuthority> temp = new ArrayList<GrantedAuthority>(authorities.size());
+		temp.addAll(authorities);
+		this.authorities = Collections.unmodifiableList(temp);
+	}
 
-    public List<GrantedAuthority> getGrantedAuthorities() {
-        return authorities;
-    }
+	public List<GrantedAuthority> getGrantedAuthorities() {
+		return authorities;
+	}
 
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(super.toString()).append("; ");
-        sb.append(authorities);
-        return sb.toString();
-    }
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append(super.toString()).append("; ");
+		sb.append(authorities);
+		return sb.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java
index 1320134508..25309257e6 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/RequestHeaderAuthenticationFilter.java
@@ -5,77 +5,86 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.util.Assert;
 
 /**
- * A simple pre-authenticated filter which obtains the username from a request header, for use with systems such as
- * CA Siteminder.
+ * A simple pre-authenticated filter which obtains the username from a request header, for
+ * use with systems such as CA Siteminder.
  * <p>
- * As with most pre-authenticated scenarios, it is essential that the external authentication system is set up
- * correctly as this filter does no authentication whatsoever. All the protection is assumed to be provided externally
- * and if this filter is included inappropriately in a configuration, it would be possible  to assume the
- * identity of a user merely by setting the correct header name. This also means it should not generally be used
- * in combination with other Spring Security authentication mechanisms such as form login, as this would imply there
- * was a means of bypassing the external system which would be risky.
+ * As with most pre-authenticated scenarios, it is essential that the external
+ * authentication system is set up correctly as this filter does no authentication
+ * whatsoever. All the protection is assumed to be provided externally and if this filter
+ * is included inappropriately in a configuration, it would be possible to assume the
+ * identity of a user merely by setting the correct header name. This also means it should
+ * not generally be used in combination with other Spring Security authentication
+ * mechanisms such as form login, as this would imply there was a means of bypassing the
+ * external system which would be risky.
  * <p>
- * The property {@code principalRequestHeader} is the name of the request header that contains the username. It
- * defaults to "SM_USER" for compatibility with Siteminder.
+ * The property {@code principalRequestHeader} is the name of the request header that
+ * contains the username. It defaults to "SM_USER" for compatibility with Siteminder.
  * <p>
- * If the header is missing from the request, {@code getPreAuthenticatedPrincipal} will throw an exception. You
- * can override this behaviour by setting the {@code exceptionIfHeaderMissing} property.
+ * If the header is missing from the request, {@code getPreAuthenticatedPrincipal} will
+ * throw an exception. You can override this behaviour by setting the
+ * {@code exceptionIfHeaderMissing} property.
  *
  *
  * @author Luke Taylor
  * @since 2.0
  */
-public class RequestHeaderAuthenticationFilter extends AbstractPreAuthenticatedProcessingFilter {
-    private String principalRequestHeader = "SM_USER";
-    private String credentialsRequestHeader;
-    private boolean exceptionIfHeaderMissing = true;
+public class RequestHeaderAuthenticationFilter extends
+		AbstractPreAuthenticatedProcessingFilter {
+	private String principalRequestHeader = "SM_USER";
+	private String credentialsRequestHeader;
+	private boolean exceptionIfHeaderMissing = true;
 
-    /**
-     * Read and returns the header named by {@code principalRequestHeader} from the request.
-     *
-     * @throws PreAuthenticatedCredentialsNotFoundException if the header is missing and {@code exceptionIfHeaderMissing}
-     *          is set to {@code true}.
-     */
-    protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
-        String principal = request.getHeader(principalRequestHeader);
+	/**
+	 * Read and returns the header named by {@code principalRequestHeader} from the
+	 * request.
+	 *
+	 * @throws PreAuthenticatedCredentialsNotFoundException if the header is missing and
+	 * {@code exceptionIfHeaderMissing} is set to {@code true}.
+	 */
+	protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
+		String principal = request.getHeader(principalRequestHeader);
 
-        if (principal == null && exceptionIfHeaderMissing) {
-            throw new PreAuthenticatedCredentialsNotFoundException(principalRequestHeader
-                    + " header not found in request.");
-        }
+		if (principal == null && exceptionIfHeaderMissing) {
+			throw new PreAuthenticatedCredentialsNotFoundException(principalRequestHeader
+					+ " header not found in request.");
+		}
 
-        return principal;
-    }
+		return principal;
+	}
 
-    /**
-     * Credentials aren't usually applicable, but if a {@code credentialsRequestHeader} is set, this
-     * will be read and used as the credentials value. Otherwise a dummy value will be used.
-     */
-    protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
-        if (credentialsRequestHeader != null) {
-            return request.getHeader(credentialsRequestHeader);
-        }
+	/**
+	 * Credentials aren't usually applicable, but if a {@code credentialsRequestHeader} is
+	 * set, this will be read and used as the credentials value. Otherwise a dummy value
+	 * will be used.
+	 */
+	protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
+		if (credentialsRequestHeader != null) {
+			return request.getHeader(credentialsRequestHeader);
+		}
 
-        return "N/A";
-    }
+		return "N/A";
+	}
 
-    public void setPrincipalRequestHeader(String principalRequestHeader) {
-        Assert.hasText(principalRequestHeader, "principalRequestHeader must not be empty or null");
-        this.principalRequestHeader = principalRequestHeader;
-    }
+	public void setPrincipalRequestHeader(String principalRequestHeader) {
+		Assert.hasText(principalRequestHeader,
+				"principalRequestHeader must not be empty or null");
+		this.principalRequestHeader = principalRequestHeader;
+	}
 
-    public void setCredentialsRequestHeader(String credentialsRequestHeader) {
-        Assert.hasText(credentialsRequestHeader, "credentialsRequestHeader must not be empty or null");
-        this.credentialsRequestHeader = credentialsRequestHeader;
-    }
+	public void setCredentialsRequestHeader(String credentialsRequestHeader) {
+		Assert.hasText(credentialsRequestHeader,
+				"credentialsRequestHeader must not be empty or null");
+		this.credentialsRequestHeader = credentialsRequestHeader;
+	}
 
-    /**
-     * Defines whether an exception should be raised if the principal header is missing. Defaults to {@code true}.
-     *
-     * @param exceptionIfHeaderMissing set to {@code false} to override the default behaviour and allow
-     *          the request to proceed if no header is found.
-     */
-    public void setExceptionIfHeaderMissing(boolean exceptionIfHeaderMissing) {
-        this.exceptionIfHeaderMissing = exceptionIfHeaderMissing;
-    }
+	/**
+	 * Defines whether an exception should be raised if the principal header is missing.
+	 * Defaults to {@code true}.
+	 *
+	 * @param exceptionIfHeaderMissing set to {@code false} to override the default
+	 * behaviour and allow the request to proceed if no header is found.
+	 */
+	public void setExceptionIfHeaderMissing(boolean exceptionIfHeaderMissing) {
+		this.exceptionIfHeaderMissing = exceptionIfHeaderMissing;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
index 3358bd785b..a93e9ca398 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java
@@ -15,84 +15,91 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
- * Implementation of AuthenticationDetailsSource which converts the user's J2EE roles (as obtained by calling
- * {@link HttpServletRequest#isUserInRole(String)}) into {@code GrantedAuthority}s and stores these in the authentication
- * details object.
+ * Implementation of AuthenticationDetailsSource which converts the user's J2EE roles (as
+ * obtained by calling {@link HttpServletRequest#isUserInRole(String)}) into
+ * {@code GrantedAuthority}s and stores these in the authentication details object.
  *
  * @author Ruud Senden
  * @since 2.0
  */
 public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource
-        implements AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails>,
-        InitializingBean {
+		implements
+		AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails>,
+		InitializingBean {
 
-    protected final Log logger = LogFactory.getLog(getClass());
-    /** The role attributes returned by the configured {@code MappableAttributesRetriever} */
-    protected Set<String> j2eeMappableRoles;
-    protected Attributes2GrantedAuthoritiesMapper j2eeUserRoles2GrantedAuthoritiesMapper =
-        new SimpleAttributes2GrantedAuthoritiesMapper();
+	protected final Log logger = LogFactory.getLog(getClass());
+	/** The role attributes returned by the configured {@code MappableAttributesRetriever} */
+	protected Set<String> j2eeMappableRoles;
+	protected Attributes2GrantedAuthoritiesMapper j2eeUserRoles2GrantedAuthoritiesMapper = new SimpleAttributes2GrantedAuthoritiesMapper();
 
-    /**
-     * Check that all required properties have been set.
-     */
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(j2eeMappableRoles, "No mappable roles available");
-        Assert.notNull(j2eeUserRoles2GrantedAuthoritiesMapper, "Roles to granted authorities mapper not set");
-    }
+	/**
+	 * Check that all required properties have been set.
+	 */
+	public void afterPropertiesSet() throws Exception {
+		Assert.notNull(j2eeMappableRoles, "No mappable roles available");
+		Assert.notNull(j2eeUserRoles2GrantedAuthoritiesMapper,
+				"Roles to granted authorities mapper not set");
+	}
 
-    /**
-     * Obtains the list of user roles based on the current user's JEE roles. The
-     * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)} method is called for each of the values
-     * in the {@code j2eeMappableRoles} set to determine if that role should be assigned to the user.
-     *
-     * @param request the request which should be used to extract the user's roles.
-     * @return The subset of {@code j2eeMappableRoles} which applies to the current user making the request.
-     */
-    protected Collection<String> getUserRoles(HttpServletRequest request) {
-        ArrayList<String> j2eeUserRolesList = new ArrayList<String>();
+	/**
+	 * Obtains the list of user roles based on the current user's JEE roles. The
+	 * {@link javax.servlet.http.HttpServletRequest#isUserInRole(String)} method is called
+	 * for each of the values in the {@code j2eeMappableRoles} set to determine if that
+	 * role should be assigned to the user.
+	 *
+	 * @param request the request which should be used to extract the user's roles.
+	 * @return The subset of {@code j2eeMappableRoles} which applies to the current user
+	 * making the request.
+	 */
+	protected Collection<String> getUserRoles(HttpServletRequest request) {
+		ArrayList<String> j2eeUserRolesList = new ArrayList<String>();
 
-        for (String role : j2eeMappableRoles) {
-            if (request.isUserInRole(role)) {
-                j2eeUserRolesList.add(role);
-            }
-        }
+		for (String role : j2eeMappableRoles) {
+			if (request.isUserInRole(role)) {
+				j2eeUserRolesList.add(role);
+			}
+		}
 
-        return j2eeUserRolesList;
-    }
+		return j2eeUserRolesList;
+	}
 
-    /**
-     * Builds the authentication details object.
-     *
-     * @see org.springframework.security.authentication.AuthenticationDetailsSource#buildDetails(Object)
-     */
-    public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails buildDetails(HttpServletRequest context) {
+	/**
+	 * Builds the authentication details object.
+	 *
+	 * @see org.springframework.security.authentication.AuthenticationDetailsSource#buildDetails(Object)
+	 */
+	public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails buildDetails(
+			HttpServletRequest context) {
 
-        Collection<String> j2eeUserRoles = getUserRoles(context);
-        Collection<? extends GrantedAuthority> userGas = j2eeUserRoles2GrantedAuthoritiesMapper.getGrantedAuthorities(j2eeUserRoles);
+		Collection<String> j2eeUserRoles = getUserRoles(context);
+		Collection<? extends GrantedAuthority> userGas = j2eeUserRoles2GrantedAuthoritiesMapper
+				.getGrantedAuthorities(j2eeUserRoles);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("J2EE roles [" + j2eeUserRoles + "] mapped to Granted Authorities: [" + userGas + "]");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("J2EE roles [" + j2eeUserRoles
+					+ "] mapped to Granted Authorities: [" + userGas + "]");
+		}
 
-        PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails result =
-                new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(context, userGas);
+		PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails result = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
+				context, userGas);
 
-        return result;
-    }
+		return result;
+	}
 
-    /**
-     * @param aJ2eeMappableRolesRetriever
-     *            The MappableAttributesRetriever to use
-     */
-    public void setMappableRolesRetriever(MappableAttributesRetriever aJ2eeMappableRolesRetriever) {
-        this.j2eeMappableRoles = Collections.unmodifiableSet(aJ2eeMappableRolesRetriever.getMappableAttributes());
-    }
+	/**
+	 * @param aJ2eeMappableRolesRetriever The MappableAttributesRetriever to use
+	 */
+	public void setMappableRolesRetriever(
+			MappableAttributesRetriever aJ2eeMappableRolesRetriever) {
+		this.j2eeMappableRoles = Collections.unmodifiableSet(aJ2eeMappableRolesRetriever
+				.getMappableAttributes());
+	}
 
-    /**
-     * @param mapper
-     *            The Attributes2GrantedAuthoritiesMapper to use
-     */
-    public void setUserRoles2GrantedAuthoritiesMapper(Attributes2GrantedAuthoritiesMapper mapper) {
-        j2eeUserRoles2GrantedAuthoritiesMapper = mapper;
-    }
+	/**
+	 * @param mapper The Attributes2GrantedAuthoritiesMapper to use
+	 */
+	public void setUserRoles2GrantedAuthoritiesMapper(
+			Attributes2GrantedAuthoritiesMapper mapper) {
+		j2eeUserRoles2GrantedAuthoritiesMapper = mapper;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java
index a99ea59842..dd1745a4a6 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilter.java
@@ -5,32 +5,33 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 
 /**
- * This AbstractPreAuthenticatedProcessingFilter implementation is based on the
- * J2EE container-based authentication mechanism. It will use the J2EE user
- * principal name as the pre-authenticated principal.
+ * This AbstractPreAuthenticatedProcessingFilter implementation is based on the J2EE
+ * container-based authentication mechanism. It will use the J2EE user principal name as
+ * the pre-authenticated principal.
  *
  * @author Ruud Senden
  * @since 2.0
  */
-public class J2eePreAuthenticatedProcessingFilter extends AbstractPreAuthenticatedProcessingFilter {
+public class J2eePreAuthenticatedProcessingFilter extends
+		AbstractPreAuthenticatedProcessingFilter {
 
-    /**
-     * Return the J2EE user name.
-     */
-    protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
-        Object principal = httpRequest.getUserPrincipal() == null ? null : httpRequest.getUserPrincipal().getName();
-        if (logger.isDebugEnabled()) {
-            logger.debug("PreAuthenticated J2EE principal: " + principal);
-        }
-        return principal;
-    }
+	/**
+	 * Return the J2EE user name.
+	 */
+	protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
+		Object principal = httpRequest.getUserPrincipal() == null ? null : httpRequest
+				.getUserPrincipal().getName();
+		if (logger.isDebugEnabled()) {
+			logger.debug("PreAuthenticated J2EE principal: " + principal);
+		}
+		return principal;
+	}
 
-    /**
-     * For J2EE container-based authentication there is no generic way to
-     * retrieve the credentials, as such this method returns a fixed dummy
-     * value.
-     */
-    protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
-        return "N/A";
-    }
+	/**
+	 * For J2EE container-based authentication there is no generic way to retrieve the
+	 * credentials, as such this method returns a fixed dummy value.
+	 */
+	protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
+		return "N/A";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
index 2aa1edf2ad..f76391ce5a 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java
@@ -29,95 +29,105 @@ import org.xml.sax.SAXException;
 
 /**
  * This <tt>MappableAttributesRetriever</tt> implementation reads the list of defined J2EE
- * roles from a <tt>web.xml</tt> file and returns these from {{@link #getMappableAttributes()}.
+ * roles from a <tt>web.xml</tt> file and returns these from {
+ * {@link #getMappableAttributes()}.
  *
  * @author Ruud Senden
  * @author Luke Taylor
  * @since 2.0
  */
-public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware, MappableAttributesRetriever, InitializingBean {
-    protected final Log logger = LogFactory.getLog(getClass());
+public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware,
+		MappableAttributesRetriever, InitializingBean {
+	protected final Log logger = LogFactory.getLog(getClass());
 
-    private ResourceLoader resourceLoader;
-    private Set<String> mappableAttributes;
+	private ResourceLoader resourceLoader;
+	private Set<String> mappableAttributes;
 
-    public void setResourceLoader(ResourceLoader resourceLoader) {
-        this.resourceLoader = resourceLoader;
-    }
+	public void setResourceLoader(ResourceLoader resourceLoader) {
+		this.resourceLoader = resourceLoader;
+	}
 
+	public Set<String> getMappableAttributes() {
+		return mappableAttributes;
+	}
 
-    public Set<String> getMappableAttributes() {
-        return mappableAttributes;
-    }
+	/**
+	 * Loads the web.xml file using the configured <tt>ResourceLoader</tt> and parses the
+	 * role-name elements from it, using these as the set of <tt>mappableAttributes</tt>.
+	 */
 
-    /**
-     * Loads the web.xml file using the configured <tt>ResourceLoader</tt> and
-     * parses the role-name elements from it, using these as the set of <tt>mappableAttributes</tt>.
-     */
+	public void afterPropertiesSet() throws Exception {
+		Resource webXml = resourceLoader.getResource("/WEB-INF/web.xml");
+		Document doc = getDocument(webXml.getInputStream());
+		NodeList webApp = doc.getElementsByTagName("web-app");
+		if (webApp.getLength() != 1) {
+			throw new IllegalArgumentException(
+					"Failed to find 'web-app' element in resource" + webXml);
+		}
+		NodeList securityRoles = ((Element) webApp.item(0))
+				.getElementsByTagName("security-role");
 
-    public void afterPropertiesSet() throws Exception {
-        Resource webXml = resourceLoader.getResource("/WEB-INF/web.xml");
-        Document doc = getDocument(webXml.getInputStream());
-        NodeList webApp = doc.getElementsByTagName("web-app");
-        if (webApp.getLength() != 1) {
-            throw new IllegalArgumentException("Failed to find 'web-app' element in resource" + webXml);
-        }
-        NodeList securityRoles = ((Element)webApp.item(0)).getElementsByTagName("security-role");
+		ArrayList<String> roleNames = new ArrayList<String>();
 
-        ArrayList<String> roleNames = new ArrayList<String>();
+		for (int i = 0; i < securityRoles.getLength(); i++) {
+			Element secRoleElt = (Element) securityRoles.item(i);
+			NodeList roles = secRoleElt.getElementsByTagName("role-name");
 
-        for (int i=0; i < securityRoles.getLength(); i++) {
-            Element secRoleElt = (Element) securityRoles.item(i);
-            NodeList roles = secRoleElt.getElementsByTagName("role-name");
+			if (roles.getLength() > 0) {
+				String roleName = ((Element) roles.item(0)).getTextContent().trim();
+				roleNames.add(roleName);
+				logger.info("Retrieved role-name '" + roleName + "' from web.xml");
+			}
+			else {
+				logger.info("No security-role elements found in " + webXml);
+			}
+		}
 
-            if (roles.getLength() > 0) {
-                String roleName = ((Element)roles.item(0)).getTextContent().trim();
-                roleNames.add(roleName);
-                logger.info("Retrieved role-name '" + roleName + "' from web.xml");
-            } else {
-                logger.info("No security-role elements found in " + webXml);
-            }
-        }
+		mappableAttributes = Collections.unmodifiableSet(new HashSet<String>(roleNames));
+	}
 
-        mappableAttributes = Collections.unmodifiableSet(new HashSet<String>(roleNames));
-    }
+	/**
+	 * @return Document for the specified InputStream
+	 */
+	private Document getDocument(InputStream aStream) {
+		Document doc;
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			DocumentBuilder db = factory.newDocumentBuilder();
+			db.setEntityResolver(new MyEntityResolver());
+			doc = db.parse(aStream);
+			return doc;
+		}
+		catch (FactoryConfigurationError e) {
+			throw new RuntimeException("Unable to parse document object", e);
+		}
+		catch (ParserConfigurationException e) {
+			throw new RuntimeException("Unable to parse document object", e);
+		}
+		catch (SAXException e) {
+			throw new RuntimeException("Unable to parse document object", e);
+		}
+		catch (IOException e) {
+			throw new RuntimeException("Unable to parse document object", e);
+		}
+		finally {
+			try {
+				aStream.close();
+			}
+			catch (IOException e) {
+				logger.warn("Failed to close input stream for web.xml", e);
+			}
+		}
+	}
 
-    /**
-     * @return Document for the specified InputStream
-     */
-    private Document getDocument(InputStream aStream) {
-        Document doc;
-        try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setValidating(false);
-            DocumentBuilder db = factory.newDocumentBuilder();
-            db.setEntityResolver(new MyEntityResolver());
-            doc = db.parse(aStream);
-            return doc;
-        } catch (FactoryConfigurationError e) {
-            throw new RuntimeException("Unable to parse document object", e);
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException("Unable to parse document object", e);
-        } catch (SAXException e) {
-            throw new RuntimeException("Unable to parse document object", e);
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to parse document object", e);
-        } finally {
-            try {
-                aStream.close();
-            } catch (IOException e) {
-                logger.warn("Failed to close input stream for web.xml", e);
-            }
-        }
-    }
-
-    /**
-     * We do not need to resolve external entities, so just return an empty
-     * String.
-     */
-    private static final class MyEntityResolver implements EntityResolver {
-        public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
-            return new InputSource(new StringReader(""));
-        }
-    }
+	/**
+	 * We do not need to resolve external entities, so just return an empty String.
+	 */
+	private static final class MyEntityResolver implements EntityResolver {
+		public InputSource resolveEntity(String publicId, String systemId)
+				throws SAXException, IOException {
+			return new InputSource(new StringReader(""));
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java
index 1e3c8f4a06..feeb794ebb 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java
@@ -26,182 +26,211 @@ import org.apache.commons.logging.LogFactory;
  * @since 2.0
  */
 final class DefaultWASUsernameAndGroupsExtractor implements WASUsernameAndGroupsExtractor {
-    private static final Log logger = LogFactory.getLog(DefaultWASUsernameAndGroupsExtractor.class);
+	private static final Log logger = LogFactory
+			.getLog(DefaultWASUsernameAndGroupsExtractor.class);
 
-    private static final String USER_REGISTRY = "UserRegistry";
+	private static final String USER_REGISTRY = "UserRegistry";
 
-    private static Method getRunAsSubject = null;
+	private static Method getRunAsSubject = null;
 
-    private static Method getGroupsForUser = null;
+	private static Method getGroupsForUser = null;
 
-    private static Method getSecurityName = null;
+	private static Method getSecurityName = null;
 
-    // SEC-803
-    private static Class<?> wsCredentialClass = null;
+	// SEC-803
+	private static Class<?> wsCredentialClass = null;
 
-    public final List<String> getGroupsForCurrentUser() {
-        return getWebSphereGroups(getRunAsSubject());
-    }
+	public final List<String> getGroupsForCurrentUser() {
+		return getWebSphereGroups(getRunAsSubject());
+	}
 
-    public final String getCurrentUserName() {
-        return getSecurityName(getRunAsSubject());
-    }
+	public final String getCurrentUserName() {
+		return getSecurityName(getRunAsSubject());
+	}
 
-    /**
-     * Get the security name for the given subject.
-     *
-     * @param subject
-     *            The subject for which to retrieve the security name
-     * @return String the security name for the given subject
-     */
-    private static String getSecurityName(final Subject subject) {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Determining Websphere security name for subject " + subject);
-        }
-        String userSecurityName = null;
-        if (subject != null) {
-            // SEC-803
-            Object credential = subject.getPublicCredentials(getWSCredentialClass()).iterator().next();
-            if (credential != null) {
-                userSecurityName = (String)invokeMethod(getSecurityNameMethod(),credential,null);
-            }
-        }
-        if (logger.isDebugEnabled()) {
-            logger.debug("Websphere security name is " + userSecurityName + " for subject " + subject);
-        }
-        return userSecurityName;
-    }
+	/**
+	 * Get the security name for the given subject.
+	 *
+	 * @param subject The subject for which to retrieve the security name
+	 * @return String the security name for the given subject
+	 */
+	private static String getSecurityName(final Subject subject) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Determining Websphere security name for subject " + subject);
+		}
+		String userSecurityName = null;
+		if (subject != null) {
+			// SEC-803
+			Object credential = subject.getPublicCredentials(getWSCredentialClass())
+					.iterator().next();
+			if (credential != null) {
+				userSecurityName = (String) invokeMethod(getSecurityNameMethod(),
+						credential, null);
+			}
+		}
+		if (logger.isDebugEnabled()) {
+			logger.debug("Websphere security name is " + userSecurityName
+					+ " for subject " + subject);
+		}
+		return userSecurityName;
+	}
 
-    /**
-     * Get the current RunAs subject.
-     *
-     * @return Subject the current RunAs subject
-     */
-    private static Subject getRunAsSubject() {
-        logger.debug("Retrieving WebSphere RunAs subject");
-        // get Subject: WSSubject.getCallerSubject ();
-        return (Subject) invokeMethod(getRunAsSubjectMethod(), null, new Object[] {});
-    }
+	/**
+	 * Get the current RunAs subject.
+	 *
+	 * @return Subject the current RunAs subject
+	 */
+	private static Subject getRunAsSubject() {
+		logger.debug("Retrieving WebSphere RunAs subject");
+		// get Subject: WSSubject.getCallerSubject ();
+		return (Subject) invokeMethod(getRunAsSubjectMethod(), null, new Object[] {});
+	}
 
-    /**
-     * Get the WebSphere group names for the given subject.
-     *
-     * @param subject
-     *            The subject for which to retrieve the WebSphere group names
-     * @return the WebSphere group names for the given subject
-     */
-    private static List<String> getWebSphereGroups(final Subject subject) {
-        return getWebSphereGroups(getSecurityName(subject));
-    }
+	/**
+	 * Get the WebSphere group names for the given subject.
+	 *
+	 * @param subject The subject for which to retrieve the WebSphere group names
+	 * @return the WebSphere group names for the given subject
+	 */
+	private static List<String> getWebSphereGroups(final Subject subject) {
+		return getWebSphereGroups(getSecurityName(subject));
+	}
 
-    /**
-     * Get the WebSphere group names for the given security name.
-     *
-     * @param securityName
-     *            The security name for which to retrieve the WebSphere group names
-     * @return the WebSphere group names for the given security name
-     */
-    @SuppressWarnings("unchecked")
-    private static List<String> getWebSphereGroups(final String securityName) {
-        Context ic = null;
-        try {
-            // TODO: Cache UserRegistry object
-            ic = new InitialContext();
-            Object objRef = ic.lookup(USER_REGISTRY);
-            Object userReg = PortableRemoteObject.narrow(objRef, Class.forName ("com.ibm.websphere.security.UserRegistry"));
-            if (logger.isDebugEnabled()) {
-                logger.debug("Determining WebSphere groups for user " + securityName + " using WebSphere UserRegistry " + userReg);
-            }
-            final Collection groups = (Collection) invokeMethod(getGroupsForUserMethod(), userReg, new Object[]{ securityName });
-            if (logger.isDebugEnabled()) {
-                logger.debug("Groups for user " + securityName + ": " + groups.toString());
-            }
+	/**
+	 * Get the WebSphere group names for the given security name.
+	 *
+	 * @param securityName The security name for which to retrieve the WebSphere group
+	 * names
+	 * @return the WebSphere group names for the given security name
+	 */
+	@SuppressWarnings("unchecked")
+	private static List<String> getWebSphereGroups(final String securityName) {
+		Context ic = null;
+		try {
+			// TODO: Cache UserRegistry object
+			ic = new InitialContext();
+			Object objRef = ic.lookup(USER_REGISTRY);
+			Object userReg = PortableRemoteObject.narrow(objRef,
+					Class.forName("com.ibm.websphere.security.UserRegistry"));
+			if (logger.isDebugEnabled()) {
+				logger.debug("Determining WebSphere groups for user " + securityName
+						+ " using WebSphere UserRegistry " + userReg);
+			}
+			final Collection groups = (Collection) invokeMethod(getGroupsForUserMethod(),
+					userReg, new Object[] { securityName });
+			if (logger.isDebugEnabled()) {
+				logger.debug("Groups for user " + securityName + ": " + groups.toString());
+			}
 
-            return new ArrayList(groups);
-        } catch (Exception e) {
-            logger.error("Exception occured while looking up groups for user", e);
-            throw new RuntimeException("Exception occured while looking up groups for user", e);
-        } finally {
-            try {
-                if (ic != null) {
-                    ic.close();
-                }
-            } catch (NamingException e) {
-                logger.debug("Exception occured while closing context", e);
-            }
-        }
-    }
+			return new ArrayList(groups);
+		}
+		catch (Exception e) {
+			logger.error("Exception occured while looking up groups for user", e);
+			throw new RuntimeException(
+					"Exception occured while looking up groups for user", e);
+		}
+		finally {
+			try {
+				if (ic != null) {
+					ic.close();
+				}
+			}
+			catch (NamingException e) {
+				logger.debug("Exception occured while closing context", e);
+			}
+		}
+	}
 
-    private static Object invokeMethod(Method method, Object instance, Object[] args)
-    {
-        try {
-            return method.invoke(instance,args);
-        } catch (IllegalArgumentException e) {
-            logger.error("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+ Arrays.asList(args)+")",e);
-            throw new RuntimeException("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+Arrays.asList(args)+")",e);
-        } catch (IllegalAccessException e) {
-            logger.error("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+Arrays.asList(args)+")",e);
-            throw new RuntimeException("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+Arrays.asList(args)+")",e);
-        } catch (InvocationTargetException e) {
-            logger.error("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+Arrays.asList(args)+")",e);
-            throw new RuntimeException("Error while invoking method "+method.getClass().getName()+"."+method.getName()+"("+Arrays.asList(args)+")",e);
-        }
-    }
+	private static Object invokeMethod(Method method, Object instance, Object[] args) {
+		try {
+			return method.invoke(instance, args);
+		}
+		catch (IllegalArgumentException e) {
+			logger.error("Error while invoking method " + method.getClass().getName()
+					+ "." + method.getName() + "(" + Arrays.asList(args) + ")", e);
+			throw new RuntimeException("Error while invoking method "
+					+ method.getClass().getName() + "." + method.getName() + "("
+					+ Arrays.asList(args) + ")", e);
+		}
+		catch (IllegalAccessException e) {
+			logger.error("Error while invoking method " + method.getClass().getName()
+					+ "." + method.getName() + "(" + Arrays.asList(args) + ")", e);
+			throw new RuntimeException("Error while invoking method "
+					+ method.getClass().getName() + "." + method.getName() + "("
+					+ Arrays.asList(args) + ")", e);
+		}
+		catch (InvocationTargetException e) {
+			logger.error("Error while invoking method " + method.getClass().getName()
+					+ "." + method.getName() + "(" + Arrays.asList(args) + ")", e);
+			throw new RuntimeException("Error while invoking method "
+					+ method.getClass().getName() + "." + method.getName() + "("
+					+ Arrays.asList(args) + ")", e);
+		}
+	}
 
-    private static Method getMethod(String className, String methodName, String[] parameterTypeNames) {
-        try {
-            Class<?> c = Class.forName(className);
-            final int len = parameterTypeNames.length;
-            Class<?>[] parameterTypes = new Class[len];
-            for (int i = 0; i < len; i++) {
-                parameterTypes[i] = Class.forName(parameterTypeNames[i]);
-            }
-            return c.getDeclaredMethod(methodName, parameterTypes);
-        } catch (ClassNotFoundException e) {
-            logger.error("Required class"+className+" not found");
-            throw new RuntimeException("Required class"+className+" not found",e);
-        } catch (NoSuchMethodException e) {
-            logger.error("Required method "+methodName+" with parameter types ("+ Arrays.asList(parameterTypeNames) +") not found on class "+className);
-            throw new RuntimeException("Required class"+className+" not found",e);
-        }
-    }
+	private static Method getMethod(String className, String methodName,
+			String[] parameterTypeNames) {
+		try {
+			Class<?> c = Class.forName(className);
+			final int len = parameterTypeNames.length;
+			Class<?>[] parameterTypes = new Class[len];
+			for (int i = 0; i < len; i++) {
+				parameterTypes[i] = Class.forName(parameterTypeNames[i]);
+			}
+			return c.getDeclaredMethod(methodName, parameterTypes);
+		}
+		catch (ClassNotFoundException e) {
+			logger.error("Required class" + className + " not found");
+			throw new RuntimeException("Required class" + className + " not found", e);
+		}
+		catch (NoSuchMethodException e) {
+			logger.error("Required method " + methodName + " with parameter types ("
+					+ Arrays.asList(parameterTypeNames) + ") not found on class "
+					+ className);
+			throw new RuntimeException("Required class" + className + " not found", e);
+		}
+	}
 
-    private static Method getRunAsSubjectMethod() {
-        if (getRunAsSubject == null) {
-            getRunAsSubject = getMethod("com.ibm.websphere.security.auth.WSSubject", "getRunAsSubject", new String[] {});
-        }
-        return getRunAsSubject;
-    }
+	private static Method getRunAsSubjectMethod() {
+		if (getRunAsSubject == null) {
+			getRunAsSubject = getMethod("com.ibm.websphere.security.auth.WSSubject",
+					"getRunAsSubject", new String[] {});
+		}
+		return getRunAsSubject;
+	}
 
-    private static Method getGroupsForUserMethod() {
-        if (getGroupsForUser == null) {
-            getGroupsForUser = getMethod("com.ibm.websphere.security.UserRegistry", "getGroupsForUser", new String[] { "java.lang.String" });
-        }
-        return getGroupsForUser;
-    }
+	private static Method getGroupsForUserMethod() {
+		if (getGroupsForUser == null) {
+			getGroupsForUser = getMethod("com.ibm.websphere.security.UserRegistry",
+					"getGroupsForUser", new String[] { "java.lang.String" });
+		}
+		return getGroupsForUser;
+	}
 
-    private static Method getSecurityNameMethod() {
-        if (getSecurityName == null) {
-            getSecurityName = getMethod("com.ibm.websphere.security.cred.WSCredential", "getSecurityName", new String[] {});
-        }
-        return getSecurityName;
-    }
+	private static Method getSecurityNameMethod() {
+		if (getSecurityName == null) {
+			getSecurityName = getMethod("com.ibm.websphere.security.cred.WSCredential",
+					"getSecurityName", new String[] {});
+		}
+		return getSecurityName;
+	}
 
-    // SEC-803
-    private static Class<?> getWSCredentialClass() {
-        if (wsCredentialClass == null) {
-            wsCredentialClass = getClass("com.ibm.websphere.security.cred.WSCredential");
-        }
-        return wsCredentialClass;
-    }
+	// SEC-803
+	private static Class<?> getWSCredentialClass() {
+		if (wsCredentialClass == null) {
+			wsCredentialClass = getClass("com.ibm.websphere.security.cred.WSCredential");
+		}
+		return wsCredentialClass;
+	}
 
-    private static Class<?> getClass(String className) {
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            logger.error("Required class " + className + " not found");
-            throw new RuntimeException("Required class " + className + " not found",e);
-        }
-    }
+	private static Class<?> getClass(String className) {
+		try {
+			return Class.forName(className);
+		}
+		catch (ClassNotFoundException e) {
+			logger.error("Required class " + className + " not found");
+			throw new RuntimeException("Required class " + className + " not found", e);
+		}
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASUsernameAndGroupsExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASUsernameAndGroupsExtractor.java
index fc4fad1d77..6f3758585e 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASUsernameAndGroupsExtractor.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WASUsernameAndGroupsExtractor.java
@@ -3,8 +3,8 @@ package org.springframework.security.web.authentication.preauth.websphere;
 import java.util.List;
 
 /**
- * Provides indirection between classes using websphere and the actual container interaction,
- * allowing for easier unit testing.
+ * Provides indirection between classes using websphere and the actual container
+ * interaction, allowing for easier unit testing.
  * <p>
  * Only for internal use.
  *
@@ -13,7 +13,7 @@ import java.util.List;
  */
 interface WASUsernameAndGroupsExtractor {
 
-    List<String> getGroupsForCurrentUser();
+	List<String> getGroupsForCurrentUser();
 
-    String getCurrentUserName();
+	String getCurrentUserName();
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java
index 31da5cc075..95d4196d91 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilter.java
@@ -5,47 +5,46 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 
 /**
- * This AbstractPreAuthenticatedProcessingFilter implementation is based on
- * WebSphere authentication. It will use the WebSphere RunAs user principal name
- * as the pre-authenticated principal.
+ * This AbstractPreAuthenticatedProcessingFilter implementation is based on WebSphere
+ * authentication. It will use the WebSphere RunAs user principal name as the
+ * pre-authenticated principal.
  *
  * @author Ruud Senden
  * @since 2.0
  */
-public class WebSpherePreAuthenticatedProcessingFilter extends AbstractPreAuthenticatedProcessingFilter {
-    private final WASUsernameAndGroupsExtractor wasHelper;
+public class WebSpherePreAuthenticatedProcessingFilter extends
+		AbstractPreAuthenticatedProcessingFilter {
+	private final WASUsernameAndGroupsExtractor wasHelper;
 
-    /**
-     * Public constructor which overrides the default AuthenticationDetails
-     * class to be used.
-     */
-    public WebSpherePreAuthenticatedProcessingFilter() {
-        this(new DefaultWASUsernameAndGroupsExtractor());
-    }
+	/**
+	 * Public constructor which overrides the default AuthenticationDetails class to be
+	 * used.
+	 */
+	public WebSpherePreAuthenticatedProcessingFilter() {
+		this(new DefaultWASUsernameAndGroupsExtractor());
+	}
 
-    WebSpherePreAuthenticatedProcessingFilter(WASUsernameAndGroupsExtractor wasHelper) {
-        this.wasHelper = wasHelper;
-        setAuthenticationDetailsSource(new WebSpherePreAuthenticatedWebAuthenticationDetailsSource());
-    }
+	WebSpherePreAuthenticatedProcessingFilter(WASUsernameAndGroupsExtractor wasHelper) {
+		this.wasHelper = wasHelper;
+		setAuthenticationDetailsSource(new WebSpherePreAuthenticatedWebAuthenticationDetailsSource());
+	}
 
+	/**
+	 * Return the WebSphere user name.
+	 */
+	protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
+		Object principal = wasHelper.getCurrentUserName();
+		if (logger.isDebugEnabled()) {
+			logger.debug("PreAuthenticated WebSphere principal: " + principal);
+		}
+		return principal;
+	}
 
-    /**
-     * Return the WebSphere user name.
-     */
-    protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
-        Object principal = wasHelper.getCurrentUserName();
-        if (logger.isDebugEnabled()) {
-            logger.debug("PreAuthenticated WebSphere principal: " + principal);
-        }
-        return principal;
-    }
-
-    /**
-     * For J2EE container-based authentication there is no generic way to
-     * retrieve the credentials, as such this method returns a fixed dummy
-     * value.
-     */
-    protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
-        return "N/A";
-    }
+	/**
+	 * For J2EE container-based authentication there is no generic way to retrieve the
+	 * credentials, as such this method returns a fixed dummy value.
+	 */
+	protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
+		return "N/A";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java
index 3156944f2a..80bcb9933d 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedWebAuthenticationDetailsSource.java
@@ -13,50 +13,58 @@ import java.util.*;
 
 /**
  * This AuthenticationDetailsSource implementation will set the pre-authenticated granted
- * authorities based on the WebSphere groups for the current WebSphere user, mapped using the
- * configured Attributes2GrantedAuthoritiesMapper.
+ * authorities based on the WebSphere groups for the current WebSphere user, mapped using
+ * the configured Attributes2GrantedAuthoritiesMapper.
  *
  * @author Ruud Senden
  */
-public class WebSpherePreAuthenticatedWebAuthenticationDetailsSource implements
-        AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> {
-    private final Log logger = LogFactory.getLog(getClass());
+public class WebSpherePreAuthenticatedWebAuthenticationDetailsSource
+		implements
+		AuthenticationDetailsSource<HttpServletRequest, PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails> {
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private Attributes2GrantedAuthoritiesMapper webSphereGroups2GrantedAuthoritiesMapper = new SimpleAttributes2GrantedAuthoritiesMapper();
+	private Attributes2GrantedAuthoritiesMapper webSphereGroups2GrantedAuthoritiesMapper = new SimpleAttributes2GrantedAuthoritiesMapper();
 
-    private final WASUsernameAndGroupsExtractor wasHelper;
+	private final WASUsernameAndGroupsExtractor wasHelper;
 
-    public WebSpherePreAuthenticatedWebAuthenticationDetailsSource() {
-        this(new DefaultWASUsernameAndGroupsExtractor());
-    }
+	public WebSpherePreAuthenticatedWebAuthenticationDetailsSource() {
+		this(new DefaultWASUsernameAndGroupsExtractor());
+	}
 
-    public WebSpherePreAuthenticatedWebAuthenticationDetailsSource(WASUsernameAndGroupsExtractor wasHelper) {
-        this.wasHelper = wasHelper;
-    }
+	public WebSpherePreAuthenticatedWebAuthenticationDetailsSource(
+			WASUsernameAndGroupsExtractor wasHelper) {
+		this.wasHelper = wasHelper;
+	}
 
-    public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails buildDetails(HttpServletRequest context) {
-        return new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(context, getWebSphereGroupsBasedGrantedAuthorities());
-    }
+	public PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails buildDetails(
+			HttpServletRequest context) {
+		return new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(context,
+				getWebSphereGroupsBasedGrantedAuthorities());
+	}
 
-    /**
-     * Get a list of Granted Authorities based on the current user's WebSphere groups.
-     *
-     * @return authorities mapped from the user's WebSphere groups.
-     */
-    private Collection<? extends GrantedAuthority> getWebSphereGroupsBasedGrantedAuthorities() {
-        List<String> webSphereGroups = wasHelper.getGroupsForCurrentUser();
-        Collection<? extends GrantedAuthority> userGas = webSphereGroups2GrantedAuthoritiesMapper.getGrantedAuthorities(webSphereGroups);
-        if (logger.isDebugEnabled()) {
-            logger.debug("WebSphere groups: " + webSphereGroups + " mapped to Granted Authorities: " + userGas);
-        }
-        return userGas;
-    }
+	/**
+	 * Get a list of Granted Authorities based on the current user's WebSphere groups.
+	 *
+	 * @return authorities mapped from the user's WebSphere groups.
+	 */
+	private Collection<? extends GrantedAuthority> getWebSphereGroupsBasedGrantedAuthorities() {
+		List<String> webSphereGroups = wasHelper.getGroupsForCurrentUser();
+		Collection<? extends GrantedAuthority> userGas = webSphereGroups2GrantedAuthoritiesMapper
+				.getGrantedAuthorities(webSphereGroups);
+		if (logger.isDebugEnabled()) {
+			logger.debug("WebSphere groups: " + webSphereGroups
+					+ " mapped to Granted Authorities: " + userGas);
+		}
+		return userGas;
+	}
 
-    /**
-     * @param mapper The Attributes2GrantedAuthoritiesMapper to use for converting the WAS groups to authorities
-     */
-    public void setWebSphereGroups2GrantedAuthoritiesMapper(Attributes2GrantedAuthoritiesMapper mapper) {
-        webSphereGroups2GrantedAuthoritiesMapper = mapper;
-    }
+	/**
+	 * @param mapper The Attributes2GrantedAuthoritiesMapper to use for converting the WAS
+	 * groups to authorities
+	 */
+	public void setWebSphereGroups2GrantedAuthoritiesMapper(
+			Attributes2GrantedAuthoritiesMapper mapper) {
+		webSphereGroups2GrantedAuthoritiesMapper = mapper;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java
index 6a3a24522f..4c7f9d130c 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractor.java
@@ -14,70 +14,76 @@ import java.util.regex.Pattern;
 import java.util.regex.Matcher;
 
 /**
- * Obtains the principal from a certificate using a regular expression match against the Subject (as returned by a call
- * to {@link X509Certificate#getSubjectDN()}).
+ * Obtains the principal from a certificate using a regular expression match against the
+ * Subject (as returned by a call to {@link X509Certificate#getSubjectDN()}).
  * <p>
- * The regular expression should contain a single group; for example the default expression "CN=(.*?)(?:,|$)" matches the
- * common name field. So "CN=Jimi Hendrix, OU=..." will give a user name of "Jimi Hendrix".
+ * The regular expression should contain a single group; for example the default
+ * expression "CN=(.*?)(?:,|$)" matches the common name field. So
+ * "CN=Jimi Hendrix, OU=..." will give a user name of "Jimi Hendrix".
  * <p>
- * The matches are case insensitive. So "emailAddress=(.?)," will match "EMAILADDRESS=jimi@hendrix.org, CN=..." giving a
- * user name "jimi@hendrix.org"
+ * The matches are case insensitive. So "emailAddress=(.?)," will match
+ * "EMAILADDRESS=jimi@hendrix.org, CN=..." giving a user name "jimi@hendrix.org"
  *
  * @author Luke Taylor
  */
 public class SubjectDnX509PrincipalExtractor implements X509PrincipalExtractor {
-    //~ Instance fields ================================================================================================
-    protected final Log logger = LogFactory.getLog(getClass());
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	// ~ Instance fields
+	// ================================================================================================
+	protected final Log logger = LogFactory.getLog(getClass());
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
 
-    private Pattern subjectDnPattern;
+	private Pattern subjectDnPattern;
 
-    public SubjectDnX509PrincipalExtractor() {
-        setSubjectDnRegex("CN=(.*?)(?:,|$)");
-    }
+	public SubjectDnX509PrincipalExtractor() {
+		setSubjectDnRegex("CN=(.*?)(?:,|$)");
+	}
 
-    public Object extractPrincipal(X509Certificate clientCert) {
-        //String subjectDN = clientCert.getSubjectX500Principal().getName();
-        String subjectDN = clientCert.getSubjectDN().getName();
+	public Object extractPrincipal(X509Certificate clientCert) {
+		// String subjectDN = clientCert.getSubjectX500Principal().getName();
+		String subjectDN = clientCert.getSubjectDN().getName();
 
-        logger.debug("Subject DN is '" + subjectDN + "'");
+		logger.debug("Subject DN is '" + subjectDN + "'");
 
-        Matcher matcher = subjectDnPattern.matcher(subjectDN);
+		Matcher matcher = subjectDnPattern.matcher(subjectDN);
 
-        if (!matcher.find()) {
-            throw new BadCredentialsException(messages.getMessage("SubjectDnX509PrincipalExtractor.noMatching",
-                    new Object[] {subjectDN}, "No matching pattern was found in subject DN: {0}"));
-        }
+		if (!matcher.find()) {
+			throw new BadCredentialsException(messages.getMessage(
+					"SubjectDnX509PrincipalExtractor.noMatching",
+					new Object[] { subjectDN },
+					"No matching pattern was found in subject DN: {0}"));
+		}
 
-        if (matcher.groupCount() != 1) {
-            throw new IllegalArgumentException("Regular expression must contain a single group ");
-        }
+		if (matcher.groupCount() != 1) {
+			throw new IllegalArgumentException(
+					"Regular expression must contain a single group ");
+		}
 
-        String username = matcher.group(1);
+		String username = matcher.group(1);
 
-        logger.debug("Extracted Principal name is '" + username + "'");
+		logger.debug("Extracted Principal name is '" + username + "'");
 
-        return username;
-    }
+		return username;
+	}
 
-    /**
-     * Sets the regular expression which will by used to extract the user name from the certificate's Subject
-     * DN.
-     * <p>
-     * It should contain a single group; for example the default expression "CN=(.*?)(?:,|$)" matches the common
-     * name field. So "CN=Jimi Hendrix, OU=..." will give a user name of "Jimi Hendrix".
-     * <p>
-     * The matches are case insensitive. So "emailAddress=(.?)," will match "EMAILADDRESS=jimi@hendrix.org,
-     * CN=..." giving a user name "jimi@hendrix.org"
-     *
-     * @param subjectDnRegex the regular expression to find in the subject
-     */
-    public void setSubjectDnRegex(String subjectDnRegex) {
-        Assert.hasText(subjectDnRegex, "Regular expression may not be null or empty");
-        subjectDnPattern = Pattern.compile(subjectDnRegex, Pattern.CASE_INSENSITIVE);
-    }
+	/**
+	 * Sets the regular expression which will by used to extract the user name from the
+	 * certificate's Subject DN.
+	 * <p>
+	 * It should contain a single group; for example the default expression
+	 * "CN=(.*?)(?:,|$)" matches the common name field. So "CN=Jimi Hendrix, OU=..." will
+	 * give a user name of "Jimi Hendrix".
+	 * <p>
+	 * The matches are case insensitive. So "emailAddress=(.?)," will match
+	 * "EMAILADDRESS=jimi@hendrix.org, CN=..." giving a user name "jimi@hendrix.org"
+	 *
+	 * @param subjectDnRegex the regular expression to find in the subject
+	 */
+	public void setSubjectDnRegex(String subjectDnRegex) {
+		Assert.hasText(subjectDnRegex, "Regular expression may not be null or empty");
+		subjectDnPattern = Pattern.compile(subjectDnRegex, Pattern.CASE_INSENSITIVE);
+	}
 
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java
index 37518e16f3..61b83ce211 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509AuthenticationFilter.java
@@ -10,41 +10,42 @@ import org.springframework.security.web.authentication.preauth.AbstractPreAuthen
  * @author Luke Taylor
  */
 public class X509AuthenticationFilter extends AbstractPreAuthenticatedProcessingFilter {
-    private X509PrincipalExtractor principalExtractor = new SubjectDnX509PrincipalExtractor();
+	private X509PrincipalExtractor principalExtractor = new SubjectDnX509PrincipalExtractor();
 
-    protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
-        X509Certificate cert = extractClientCertificate(request);
+	protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
+		X509Certificate cert = extractClientCertificate(request);
 
-        if (cert == null) {
-            return null;
-        }
+		if (cert == null) {
+			return null;
+		}
 
-        return principalExtractor.extractPrincipal(cert);
-    }
+		return principalExtractor.extractPrincipal(cert);
+	}
 
-    protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
-        return extractClientCertificate(request);
-    }
+	protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
+		return extractClientCertificate(request);
+	}
 
-    private X509Certificate extractClientCertificate(HttpServletRequest request) {
-        X509Certificate[] certs = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
+	private X509Certificate extractClientCertificate(HttpServletRequest request) {
+		X509Certificate[] certs = (X509Certificate[]) request
+				.getAttribute("javax.servlet.request.X509Certificate");
 
-        if (certs != null && certs.length > 0) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("X.509 client authentication certificate:" + certs[0]);
-            }
+		if (certs != null && certs.length > 0) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("X.509 client authentication certificate:" + certs[0]);
+			}
 
-            return certs[0];
-        }
+			return certs[0];
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("No client certificate found in request.");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("No client certificate found in request.");
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void setPrincipalExtractor(X509PrincipalExtractor principalExtractor) {
-        this.principalExtractor = principalExtractor;
-    }
+	public void setPrincipalExtractor(X509PrincipalExtractor principalExtractor) {
+		this.principalExtractor = principalExtractor;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java
index cbe75ff20a..e3373fffbb 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/x509/X509PrincipalExtractor.java
@@ -9,8 +9,8 @@ import java.security.cert.X509Certificate;
  */
 public interface X509PrincipalExtractor {
 
-    /**
-     * Returns the principal (usually a String) for the given certificate.
-     */
-    Object extractPrincipal(X509Certificate cert);
+	/**
+	 * Returns the principal (usually a String) for the given certificate.
+	 */
+	Object extractPrincipal(X509Certificate cert);
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
index 9d332483b8..6e42e42bf2 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServices.java
@@ -37,426 +37,466 @@ import org.springframework.util.StringUtils;
  * @author Rob Winch
  * @since 2.0
  */
-public abstract class AbstractRememberMeServices implements RememberMeServices, InitializingBean, LogoutHandler {
-    //~ Static fields/initializers =====================================================================================
-
-    public static final String SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY = "remember-me";
-    public static final String DEFAULT_PARAMETER = "remember-me";
-    public static final int TWO_WEEKS_S = 1209600;
-
-    private static final String DELIMITER = ":";
-
-    //~ Instance fields ================================================================================================
-    protected final Log logger = LogFactory.getLog(getClass());
-
-    protected final MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-
-    private UserDetailsService userDetailsService;
-    private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
-
-    private String cookieName = SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY;
-    private String parameter = DEFAULT_PARAMETER;
-    private boolean alwaysRemember;
-    private String key;
-    private int tokenValiditySeconds = TWO_WEEKS_S;
-    private Boolean useSecureCookie = null;
-    private Method setHttpOnlyMethod;
-    private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
-
-    protected AbstractRememberMeServices(String key, UserDetailsService userDetailsService) {
-        Assert.hasLength(key, "key cannot be empty or null");
-        Assert.notNull(userDetailsService, "UserDetailsService cannot be null");
-        this.key = key;
-        this.userDetailsService = userDetailsService;
-        this.setHttpOnlyMethod = ReflectionUtils.findMethod(Cookie.class,"setHttpOnly", boolean.class);
-    }
-
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasLength(key, "key cannot be empty or null");
-        Assert.notNull(userDetailsService, "A UserDetailsService is required");
-    }
-
-    /**
-     * Template implementation which locates the Spring Security cookie, decodes it into
-     * a delimited array of tokens and submits it to subclasses for processing
-     * via the <tt>processAutoLoginCookie</tt> method.
-     * <p>
-     * The returned username is then used to load the UserDetails object for the user, which in turn
-     * is used to create a valid authentication token.
-     */
-    public final Authentication autoLogin(HttpServletRequest request, HttpServletResponse response) {
-        String rememberMeCookie = extractRememberMeCookie(request);
-
-        if (rememberMeCookie == null) {
-            return null;
-        }
-
-        logger.debug("Remember-me cookie detected");
-
-        if (rememberMeCookie.length() == 0) {
-            logger.debug("Cookie was empty");
-            cancelCookie(request, response);
-            return null;
-        }
-
-        UserDetails user = null;
-
-        try {
-            String[] cookieTokens = decodeCookie(rememberMeCookie);
-            user = processAutoLoginCookie(cookieTokens, request, response);
-            userDetailsChecker.check(user);
-
-            logger.debug("Remember-me cookie accepted");
-
-            return createSuccessfulAuthentication(request, user);
-        } catch (CookieTheftException cte) {
-            cancelCookie(request, response);
-            throw cte;
-        } catch (UsernameNotFoundException noUser) {
-            logger.debug("Remember-me login was valid but corresponding user not found.", noUser);
-        } catch (InvalidCookieException invalidCookie) {
-            logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage());
-        } catch (AccountStatusException statusInvalid) {
-            logger.debug("Invalid UserDetails: " + statusInvalid.getMessage());
-        } catch (RememberMeAuthenticationException e) {
-            logger.debug(e.getMessage());
-        }
-
-        cancelCookie(request, response);
-        return null;
-    }
-
-    /**
-     * Locates the Spring Security remember me cookie in the request and returns its value.
-     * The cookie is searched for by name and also by matching the context path to the cookie path.
-     *
-     * @param request the submitted request which is to be authenticated
-     * @return the cookie value (if present), null otherwise.
-     */
-    protected String extractRememberMeCookie(HttpServletRequest request) {
-        Cookie[] cookies = request.getCookies();
-
-        if ((cookies == null) || (cookies.length == 0)) {
-            return null;
-        }
-
-        for (Cookie cookie : cookies) {
-            if (cookieName.equals(cookie.getName())) {
-                return cookie.getValue();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates the final <tt>Authentication</tt> object returned from the <tt>autoLogin</tt> method.
-     * <p>
-     * By default it will create a <tt>RememberMeAuthenticationToken</tt> instance.
-     *
-     * @param request       the original request. The configured <tt>AuthenticationDetailsSource</tt> will
-     *                      use this to build the details property of the returned object.
-     * @param user          the <tt>UserDetails</tt> loaded from the <tt>UserDetailsService</tt>. This will be
-     *                      stored as the principal.
-     *
-     * @return the <tt>Authentication</tt> for the remember-me authenticated user
-     */
-    protected Authentication createSuccessfulAuthentication(HttpServletRequest request, UserDetails user) {
-        RememberMeAuthenticationToken auth = new RememberMeAuthenticationToken(key, user,
-                authoritiesMapper.mapAuthorities(user.getAuthorities()));
-        auth.setDetails(authenticationDetailsSource.buildDetails(request));
-        return auth;
-    }
-
-    /**
-     * Decodes the cookie and splits it into a set of token strings using the ":" delimiter.
-     *
-     * @param cookieValue the value obtained from the submitted cookie
-     * @return the array of tokens.
-     * @throws InvalidCookieException if the cookie was not base64 encoded.
-     */
-    protected String[] decodeCookie(String cookieValue) throws InvalidCookieException {
-        for (int j = 0; j < cookieValue.length() % 4; j++) {
-            cookieValue = cookieValue + "=";
-        }
-
-        if (!Base64.isBase64(cookieValue.getBytes())) {
-            throw new InvalidCookieException( "Cookie token was not Base64 encoded; value was '" + cookieValue + "'");
-        }
-
-        String cookieAsPlainText = new String(Base64.decode(cookieValue.getBytes()));
-
-        String[] tokens = StringUtils.delimitedListToStringArray(cookieAsPlainText, DELIMITER);
-
-        if ((tokens[0].equalsIgnoreCase("http") || tokens[0].equalsIgnoreCase("https")) && tokens[1].startsWith("//")) {
-            // Assume we've accidentally split a URL (OpenID identifier)
-            String[] newTokens = new String[tokens.length - 1];
-            newTokens[0] = tokens[0] + ":" + tokens[1];
-            System.arraycopy(tokens, 2, newTokens, 1, newTokens.length - 1);
-            tokens = newTokens;
-        }
-
-        return tokens;
-    }
-
-    /**
-     * Inverse operation of decodeCookie.
-     *
-     * @param cookieTokens the tokens to be encoded.
-     * @return base64 encoding of the tokens concatenated with the ":" delimiter.
-     */
-    protected String encodeCookie(String[] cookieTokens) {
-        StringBuilder sb = new StringBuilder();
-        for(int i=0; i < cookieTokens.length; i++) {
-            sb.append(cookieTokens[i]);
-
-            if (i < cookieTokens.length - 1) {
-                sb.append(DELIMITER);
-            }
-        }
-
-        String value = sb.toString();
-
-        sb = new StringBuilder(new String(Base64.encode(value.getBytes())));
-
-        while (sb.charAt(sb.length() - 1) == '=') {
-            sb.deleteCharAt(sb.length() - 1);
-        }
-
-        return sb.toString();
-    }
-
-    public final void loginFail(HttpServletRequest request, HttpServletResponse response) {
-        logger.debug("Interactive login attempt was unsuccessful.");
-        cancelCookie(request, response);
-        onLoginFail(request, response);
-    }
-
-    protected void onLoginFail(HttpServletRequest request, HttpServletResponse response) {}
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>
-     * Examines the incoming request and checks for the presence of the configured "remember me" parameter.
-     * If it's present, or if <tt>alwaysRemember</tt> is set to true, calls <tt>onLoginSucces</tt>.
-     * </p>
-     */
-    public final void loginSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication successfulAuthentication) {
-
-        if (!rememberMeRequested(request, parameter)) {
-            logger.debug("Remember-me login not requested.");
-            return;
-        }
-
-        onLoginSuccess(request, response, successfulAuthentication);
-    }
-
-    /**
-     * Called from loginSuccess when a remember-me login has been requested.
-     * Typically implemented by subclasses to set a remember-me cookie and potentially store a record
-     * of it if the implementation requires this.
-     */
-    protected abstract void onLoginSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication successfulAuthentication);
-
-    /**
-     * Allows customization of whether a remember-me login has been requested.
-     * The default is to return true if <tt>alwaysRemember</tt> is set or the configured parameter name has
-     * been included in the request and is set to the value "true".
-     *
-     * @param request the request submitted from an interactive login, which may include additional information
-     * indicating that a persistent login is desired.
-     * @param parameter the configured remember-me parameter name.
-     *
-     * @return true if the request includes information indicating that a persistent login has been
-     * requested.
-     */
-    protected boolean rememberMeRequested(HttpServletRequest request, String parameter) {
-        if (alwaysRemember) {
-            return true;
-        }
-
-        String paramValue = request.getParameter(parameter);
-
-        if (paramValue != null) {
-            if (paramValue.equalsIgnoreCase("true") || paramValue.equalsIgnoreCase("on") ||
-                    paramValue.equalsIgnoreCase("yes") || paramValue.equals("1")) {
-                return true;
-            }
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Did not send remember-me cookie (principal did not set parameter '" + parameter + "')");
-        }
-
-        return false;
-    }
-
-    /**
-     * Called from autoLogin to process the submitted persistent login cookie. Subclasses should
-     * validate the cookie and perform any additional management required.
-     *
-     * @param cookieTokens the decoded and tokenized cookie value
-     * @param request the request
-     * @param response the response, to allow the cookie to be modified if required.
-     * @return the UserDetails for the corresponding user account if the cookie was validated successfully.
-     * @throws RememberMeAuthenticationException if the cookie is invalid or the login is invalid for some
-     * other reason.
-     * @throws UsernameNotFoundException if the user account corresponding to the login cookie couldn't be found
-     * (for example if the user has been removed from the system).
-     */
-    protected abstract UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request,
-            HttpServletResponse response) throws RememberMeAuthenticationException, UsernameNotFoundException;
-
-    /**
-     * Sets a "cancel cookie" (with maxAge = 0) on the response to disable persistent logins.
-     */
-    protected void cancelCookie(HttpServletRequest request, HttpServletResponse response) {
-        logger.debug("Cancelling cookie");
-        Cookie cookie = new Cookie(cookieName, null);
-        cookie.setMaxAge(0);
-        cookie.setPath(getCookiePath(request));
-
-        response.addCookie(cookie);
-    }
-
-    /**
-     * Sets the cookie on the response.
-     *
-     * By default a secure cookie will be used if the connection is secure. You can set the {@code useSecureCookie}
-     * property to {@code false} to override this. If you set it to {@code true}, the cookie will always be flagged
-     * as secure. If Servlet 3.0 is used, the cookie will be marked as HttpOnly.
-     *
-     * @param tokens the tokens which will be encoded to make the cookie value.
-     * @param maxAge the value passed to {@link Cookie#setMaxAge(int)}
-     * @param request the request
-     * @param response the response to add the cookie to.
-     */
-    protected void setCookie(String[] tokens, int maxAge, HttpServletRequest request, HttpServletResponse response) {
-        String cookieValue = encodeCookie(tokens);
-        Cookie cookie = new Cookie(cookieName, cookieValue);
-        cookie.setMaxAge(maxAge);
-        cookie.setPath(getCookiePath(request));
-
-        if(maxAge < 1) {
-            cookie.setVersion(1);
-        }
-
-        if (useSecureCookie == null) {
-            cookie.setSecure(request.isSecure());
-        } else {
-            cookie.setSecure(useSecureCookie);
-        }
-
-        if(setHttpOnlyMethod != null) {
-            ReflectionUtils.invokeMethod(setHttpOnlyMethod, cookie, Boolean.TRUE);
-        } else if (logger.isDebugEnabled()) {
-            logger.debug("Note: Cookie will not be marked as HttpOnly because you are not using Servlet 3.0 (Cookie#setHttpOnly(boolean) was not found).");
-        }
-
-        response.addCookie(cookie);
-    }
-
-    private String getCookiePath(HttpServletRequest request) {
-        String contextPath = request.getContextPath();
-        return contextPath.length() > 0 ? contextPath : "/";
-    }
-
-    /**
-     * Implementation of {@code LogoutHandler}. Default behaviour is to call {@code cancelCookie()}.
-     */
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        if (logger.isDebugEnabled()) {
-            logger.debug( "Logout of user "
-                    + (authentication == null ? "Unknown" : authentication.getName()));
-        }
-        cancelCookie(request, response);
-    }
-
-    public void setCookieName(String cookieName) {
-        Assert.hasLength(cookieName, "Cookie name cannot be empty or null");
-        this.cookieName = cookieName;
-    }
-
-    protected String getCookieName() {
-        return cookieName;
-    }
-
-    public void setAlwaysRemember(boolean alwaysRemember) {
-        this.alwaysRemember = alwaysRemember;
-    }
-
-    /**
-     * Sets the name of the parameter which should be checked for to see if a remember-me has been requested
-     * during a login request. This should be the same name you assign to the checkbox in your login form.
-     *
-     * @param parameter the HTTP request parameter
-     */
-    public void setParameter(String parameter) {
-        Assert.hasText(parameter, "Parameter name cannot be empty or null");
-        this.parameter = parameter;
-    }
-
-    public String getParameter() {
-        return parameter;
-    }
-
-    protected UserDetailsService getUserDetailsService() {
-        return userDetailsService;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setTokenValiditySeconds(int tokenValiditySeconds) {
-        this.tokenValiditySeconds = tokenValiditySeconds;
-    }
-
-    protected int getTokenValiditySeconds() {
-        return tokenValiditySeconds;
-    }
-
-    /**
-     * Whether the cookie should be flagged as secure or not. Secure cookies can only be sent over an HTTPS connection
-     * and thus cannot be accidentally submitted over HTTP where they could be intercepted.
-     * <p>
-     * By default the cookie will be secure if the request is secure. If you only want to use remember-me over
-     * HTTPS (recommended) you should set this property to {@code true}.
-     *
-     * @param useSecureCookie set to {@code true} to always user secure cookies, {@code false} to disable their use.
-     */
-    public void setUseSecureCookie(boolean useSecureCookie) {
-        this.useSecureCookie = useSecureCookie;
-    }
-
-    protected AuthenticationDetailsSource<HttpServletRequest,?> getAuthenticationDetailsSource() {
-        return authenticationDetailsSource;
-    }
-
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource cannot be null");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
-
-    /**
-     * Sets the strategy to be used to validate the {@code UserDetails} object obtained for
-     * the user when processing a remember-me cookie to automatically log in a user.
-     *
-     * @param userDetailsChecker
-     *          the strategy which will be passed the user object to allow it to be rejected if account should not
-     *          be allowed to authenticate (if it is locked, for example). Defaults to a
-     *          {@code AccountStatusUserDetailsChecker} instance.
-     *
-     */
-    public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
-        this.userDetailsChecker = userDetailsChecker;
-    }
-
-    public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
-        this.authoritiesMapper = authoritiesMapper;
-    }
+public abstract class AbstractRememberMeServices implements RememberMeServices,
+		InitializingBean, LogoutHandler {
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	public static final String SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY = "remember-me";
+	public static final String DEFAULT_PARAMETER = "remember-me";
+	public static final int TWO_WEEKS_S = 1209600;
+
+	private static final String DELIMITER = ":";
+
+	// ~ Instance fields
+	// ================================================================================================
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	protected final MessageSourceAccessor messages = SpringSecurityMessageSource
+			.getAccessor();
+
+	private UserDetailsService userDetailsService;
+	private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+
+	private String cookieName = SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY;
+	private String parameter = DEFAULT_PARAMETER;
+	private boolean alwaysRemember;
+	private String key;
+	private int tokenValiditySeconds = TWO_WEEKS_S;
+	private Boolean useSecureCookie = null;
+	private Method setHttpOnlyMethod;
+	private GrantedAuthoritiesMapper authoritiesMapper = new NullAuthoritiesMapper();
+
+	protected AbstractRememberMeServices(String key, UserDetailsService userDetailsService) {
+		Assert.hasLength(key, "key cannot be empty or null");
+		Assert.notNull(userDetailsService, "UserDetailsService cannot be null");
+		this.key = key;
+		this.userDetailsService = userDetailsService;
+		this.setHttpOnlyMethod = ReflectionUtils.findMethod(Cookie.class, "setHttpOnly",
+				boolean.class);
+	}
+
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasLength(key, "key cannot be empty or null");
+		Assert.notNull(userDetailsService, "A UserDetailsService is required");
+	}
+
+	/**
+	 * Template implementation which locates the Spring Security cookie, decodes it into a
+	 * delimited array of tokens and submits it to subclasses for processing via the
+	 * <tt>processAutoLoginCookie</tt> method.
+	 * <p>
+	 * The returned username is then used to load the UserDetails object for the user,
+	 * which in turn is used to create a valid authentication token.
+	 */
+	public final Authentication autoLogin(HttpServletRequest request,
+			HttpServletResponse response) {
+		String rememberMeCookie = extractRememberMeCookie(request);
+
+		if (rememberMeCookie == null) {
+			return null;
+		}
+
+		logger.debug("Remember-me cookie detected");
+
+		if (rememberMeCookie.length() == 0) {
+			logger.debug("Cookie was empty");
+			cancelCookie(request, response);
+			return null;
+		}
+
+		UserDetails user = null;
+
+		try {
+			String[] cookieTokens = decodeCookie(rememberMeCookie);
+			user = processAutoLoginCookie(cookieTokens, request, response);
+			userDetailsChecker.check(user);
+
+			logger.debug("Remember-me cookie accepted");
+
+			return createSuccessfulAuthentication(request, user);
+		}
+		catch (CookieTheftException cte) {
+			cancelCookie(request, response);
+			throw cte;
+		}
+		catch (UsernameNotFoundException noUser) {
+			logger.debug("Remember-me login was valid but corresponding user not found.",
+					noUser);
+		}
+		catch (InvalidCookieException invalidCookie) {
+			logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage());
+		}
+		catch (AccountStatusException statusInvalid) {
+			logger.debug("Invalid UserDetails: " + statusInvalid.getMessage());
+		}
+		catch (RememberMeAuthenticationException e) {
+			logger.debug(e.getMessage());
+		}
+
+		cancelCookie(request, response);
+		return null;
+	}
+
+	/**
+	 * Locates the Spring Security remember me cookie in the request and returns its
+	 * value. The cookie is searched for by name and also by matching the context path to
+	 * the cookie path.
+	 *
+	 * @param request the submitted request which is to be authenticated
+	 * @return the cookie value (if present), null otherwise.
+	 */
+	protected String extractRememberMeCookie(HttpServletRequest request) {
+		Cookie[] cookies = request.getCookies();
+
+		if ((cookies == null) || (cookies.length == 0)) {
+			return null;
+		}
+
+		for (Cookie cookie : cookies) {
+			if (cookieName.equals(cookie.getName())) {
+				return cookie.getValue();
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Creates the final <tt>Authentication</tt> object returned from the
+	 * <tt>autoLogin</tt> method.
+	 * <p>
+	 * By default it will create a <tt>RememberMeAuthenticationToken</tt> instance.
+	 *
+	 * @param request the original request. The configured
+	 * <tt>AuthenticationDetailsSource</tt> will use this to build the details property of
+	 * the returned object.
+	 * @param user the <tt>UserDetails</tt> loaded from the <tt>UserDetailsService</tt>.
+	 * This will be stored as the principal.
+	 *
+	 * @return the <tt>Authentication</tt> for the remember-me authenticated user
+	 */
+	protected Authentication createSuccessfulAuthentication(HttpServletRequest request,
+			UserDetails user) {
+		RememberMeAuthenticationToken auth = new RememberMeAuthenticationToken(key, user,
+				authoritiesMapper.mapAuthorities(user.getAuthorities()));
+		auth.setDetails(authenticationDetailsSource.buildDetails(request));
+		return auth;
+	}
+
+	/**
+	 * Decodes the cookie and splits it into a set of token strings using the ":"
+	 * delimiter.
+	 *
+	 * @param cookieValue the value obtained from the submitted cookie
+	 * @return the array of tokens.
+	 * @throws InvalidCookieException if the cookie was not base64 encoded.
+	 */
+	protected String[] decodeCookie(String cookieValue) throws InvalidCookieException {
+		for (int j = 0; j < cookieValue.length() % 4; j++) {
+			cookieValue = cookieValue + "=";
+		}
+
+		if (!Base64.isBase64(cookieValue.getBytes())) {
+			throw new InvalidCookieException(
+					"Cookie token was not Base64 encoded; value was '" + cookieValue
+							+ "'");
+		}
+
+		String cookieAsPlainText = new String(Base64.decode(cookieValue.getBytes()));
+
+		String[] tokens = StringUtils.delimitedListToStringArray(cookieAsPlainText,
+				DELIMITER);
+
+		if ((tokens[0].equalsIgnoreCase("http") || tokens[0].equalsIgnoreCase("https"))
+				&& tokens[1].startsWith("//")) {
+			// Assume we've accidentally split a URL (OpenID identifier)
+			String[] newTokens = new String[tokens.length - 1];
+			newTokens[0] = tokens[0] + ":" + tokens[1];
+			System.arraycopy(tokens, 2, newTokens, 1, newTokens.length - 1);
+			tokens = newTokens;
+		}
+
+		return tokens;
+	}
+
+	/**
+	 * Inverse operation of decodeCookie.
+	 *
+	 * @param cookieTokens the tokens to be encoded.
+	 * @return base64 encoding of the tokens concatenated with the ":" delimiter.
+	 */
+	protected String encodeCookie(String[] cookieTokens) {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < cookieTokens.length; i++) {
+			sb.append(cookieTokens[i]);
+
+			if (i < cookieTokens.length - 1) {
+				sb.append(DELIMITER);
+			}
+		}
+
+		String value = sb.toString();
+
+		sb = new StringBuilder(new String(Base64.encode(value.getBytes())));
+
+		while (sb.charAt(sb.length() - 1) == '=') {
+			sb.deleteCharAt(sb.length() - 1);
+		}
+
+		return sb.toString();
+	}
+
+	public final void loginFail(HttpServletRequest request, HttpServletResponse response) {
+		logger.debug("Interactive login attempt was unsuccessful.");
+		cancelCookie(request, response);
+		onLoginFail(request, response);
+	}
+
+	protected void onLoginFail(HttpServletRequest request, HttpServletResponse response) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * <p>
+	 * Examines the incoming request and checks for the presence of the configured
+	 * "remember me" parameter. If it's present, or if <tt>alwaysRemember</tt> is set to
+	 * true, calls <tt>onLoginSucces</tt>.
+	 * </p>
+	 */
+	public final void loginSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication successfulAuthentication) {
+
+		if (!rememberMeRequested(request, parameter)) {
+			logger.debug("Remember-me login not requested.");
+			return;
+		}
+
+		onLoginSuccess(request, response, successfulAuthentication);
+	}
+
+	/**
+	 * Called from loginSuccess when a remember-me login has been requested. Typically
+	 * implemented by subclasses to set a remember-me cookie and potentially store a
+	 * record of it if the implementation requires this.
+	 */
+	protected abstract void onLoginSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication successfulAuthentication);
+
+	/**
+	 * Allows customization of whether a remember-me login has been requested. The default
+	 * is to return true if <tt>alwaysRemember</tt> is set or the configured parameter
+	 * name has been included in the request and is set to the value "true".
+	 *
+	 * @param request the request submitted from an interactive login, which may include
+	 * additional information indicating that a persistent login is desired.
+	 * @param parameter the configured remember-me parameter name.
+	 *
+	 * @return true if the request includes information indicating that a persistent login
+	 * has been requested.
+	 */
+	protected boolean rememberMeRequested(HttpServletRequest request, String parameter) {
+		if (alwaysRemember) {
+			return true;
+		}
+
+		String paramValue = request.getParameter(parameter);
+
+		if (paramValue != null) {
+			if (paramValue.equalsIgnoreCase("true") || paramValue.equalsIgnoreCase("on")
+					|| paramValue.equalsIgnoreCase("yes") || paramValue.equals("1")) {
+				return true;
+			}
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Did not send remember-me cookie (principal did not set parameter '"
+					+ parameter + "')");
+		}
+
+		return false;
+	}
+
+	/**
+	 * Called from autoLogin to process the submitted persistent login cookie. Subclasses
+	 * should validate the cookie and perform any additional management required.
+	 *
+	 * @param cookieTokens the decoded and tokenized cookie value
+	 * @param request the request
+	 * @param response the response, to allow the cookie to be modified if required.
+	 * @return the UserDetails for the corresponding user account if the cookie was
+	 * validated successfully.
+	 * @throws RememberMeAuthenticationException if the cookie is invalid or the login is
+	 * invalid for some other reason.
+	 * @throws UsernameNotFoundException if the user account corresponding to the login
+	 * cookie couldn't be found (for example if the user has been removed from the
+	 * system).
+	 */
+	protected abstract UserDetails processAutoLoginCookie(String[] cookieTokens,
+			HttpServletRequest request, HttpServletResponse response)
+			throws RememberMeAuthenticationException, UsernameNotFoundException;
+
+	/**
+	 * Sets a "cancel cookie" (with maxAge = 0) on the response to disable persistent
+	 * logins.
+	 */
+	protected void cancelCookie(HttpServletRequest request, HttpServletResponse response) {
+		logger.debug("Cancelling cookie");
+		Cookie cookie = new Cookie(cookieName, null);
+		cookie.setMaxAge(0);
+		cookie.setPath(getCookiePath(request));
+
+		response.addCookie(cookie);
+	}
+
+	/**
+	 * Sets the cookie on the response.
+	 *
+	 * By default a secure cookie will be used if the connection is secure. You can set
+	 * the {@code useSecureCookie} property to {@code false} to override this. If you set
+	 * it to {@code true}, the cookie will always be flagged as secure. If Servlet 3.0 is
+	 * used, the cookie will be marked as HttpOnly.
+	 *
+	 * @param tokens the tokens which will be encoded to make the cookie value.
+	 * @param maxAge the value passed to {@link Cookie#setMaxAge(int)}
+	 * @param request the request
+	 * @param response the response to add the cookie to.
+	 */
+	protected void setCookie(String[] tokens, int maxAge, HttpServletRequest request,
+			HttpServletResponse response) {
+		String cookieValue = encodeCookie(tokens);
+		Cookie cookie = new Cookie(cookieName, cookieValue);
+		cookie.setMaxAge(maxAge);
+		cookie.setPath(getCookiePath(request));
+
+		if (maxAge < 1) {
+			cookie.setVersion(1);
+		}
+
+		if (useSecureCookie == null) {
+			cookie.setSecure(request.isSecure());
+		}
+		else {
+			cookie.setSecure(useSecureCookie);
+		}
+
+		if (setHttpOnlyMethod != null) {
+			ReflectionUtils.invokeMethod(setHttpOnlyMethod, cookie, Boolean.TRUE);
+		}
+		else if (logger.isDebugEnabled()) {
+			logger.debug("Note: Cookie will not be marked as HttpOnly because you are not using Servlet 3.0 (Cookie#setHttpOnly(boolean) was not found).");
+		}
+
+		response.addCookie(cookie);
+	}
+
+	private String getCookiePath(HttpServletRequest request) {
+		String contextPath = request.getContextPath();
+		return contextPath.length() > 0 ? contextPath : "/";
+	}
+
+	/**
+	 * Implementation of {@code LogoutHandler}. Default behaviour is to call
+	 * {@code cancelCookie()}.
+	 */
+	public void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("Logout of user "
+					+ (authentication == null ? "Unknown" : authentication.getName()));
+		}
+		cancelCookie(request, response);
+	}
+
+	public void setCookieName(String cookieName) {
+		Assert.hasLength(cookieName, "Cookie name cannot be empty or null");
+		this.cookieName = cookieName;
+	}
+
+	protected String getCookieName() {
+		return cookieName;
+	}
+
+	public void setAlwaysRemember(boolean alwaysRemember) {
+		this.alwaysRemember = alwaysRemember;
+	}
+
+	/**
+	 * Sets the name of the parameter which should be checked for to see if a remember-me
+	 * has been requested during a login request. This should be the same name you assign
+	 * to the checkbox in your login form.
+	 *
+	 * @param parameter the HTTP request parameter
+	 */
+	public void setParameter(String parameter) {
+		Assert.hasText(parameter, "Parameter name cannot be empty or null");
+		this.parameter = parameter;
+	}
+
+	public String getParameter() {
+		return parameter;
+	}
+
+	protected UserDetailsService getUserDetailsService() {
+		return userDetailsService;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setTokenValiditySeconds(int tokenValiditySeconds) {
+		this.tokenValiditySeconds = tokenValiditySeconds;
+	}
+
+	protected int getTokenValiditySeconds() {
+		return tokenValiditySeconds;
+	}
+
+	/**
+	 * Whether the cookie should be flagged as secure or not. Secure cookies can only be
+	 * sent over an HTTPS connection and thus cannot be accidentally submitted over HTTP
+	 * where they could be intercepted.
+	 * <p>
+	 * By default the cookie will be secure if the request is secure. If you only want to
+	 * use remember-me over HTTPS (recommended) you should set this property to
+	 * {@code true}.
+	 *
+	 * @param useSecureCookie set to {@code true} to always user secure cookies,
+	 * {@code false} to disable their use.
+	 */
+	public void setUseSecureCookie(boolean useSecureCookie) {
+		this.useSecureCookie = useSecureCookie;
+	}
+
+	protected AuthenticationDetailsSource<HttpServletRequest, ?> getAuthenticationDetailsSource() {
+		return authenticationDetailsSource;
+	}
+
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource cannot be null");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
+
+	/**
+	 * Sets the strategy to be used to validate the {@code UserDetails} object obtained
+	 * for the user when processing a remember-me cookie to automatically log in a user.
+	 *
+	 * @param userDetailsChecker the strategy which will be passed the user object to
+	 * allow it to be rejected if account should not be allowed to authenticate (if it is
+	 * locked, for example). Defaults to a {@code AccountStatusUserDetailsChecker}
+	 * instance.
+	 *
+	 */
+	public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
+		this.userDetailsChecker = userDetailsChecker;
+	}
+
+	public void setAuthoritiesMapper(GrantedAuthoritiesMapper authoritiesMapper) {
+		this.authoritiesMapper = authoritiesMapper;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java
index da962a3a05..26f45b402c 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/CookieTheftException.java
@@ -4,7 +4,7 @@ package org.springframework.security.web.authentication.rememberme;
  * @author Luke Taylor
  */
 public class CookieTheftException extends RememberMeAuthenticationException {
-    public CookieTheftException(String message) {
-        super(message);
-    }
+	public CookieTheftException(String message) {
+		super(message);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java
index 6078887ea0..16bc302b70 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java
@@ -8,48 +8,50 @@ import java.util.Iterator;
 import java.util.Map;
 
 /**
- * Simple <tt>PersistentTokenRepository</tt> implementation backed by a Map. Intended for testing only.
+ * Simple <tt>PersistentTokenRepository</tt> implementation backed by a Map. Intended for
+ * testing only.
  *
  * @author Luke Taylor
  */
 public class InMemoryTokenRepositoryImpl implements PersistentTokenRepository {
-    private final Map<String, PersistentRememberMeToken> seriesTokens = new HashMap<String, PersistentRememberMeToken>();
+	private final Map<String, PersistentRememberMeToken> seriesTokens = new HashMap<String, PersistentRememberMeToken>();
 
-    public synchronized void createNewToken(PersistentRememberMeToken token) {
-        PersistentRememberMeToken current = seriesTokens.get(token.getSeries());
+	public synchronized void createNewToken(PersistentRememberMeToken token) {
+		PersistentRememberMeToken current = seriesTokens.get(token.getSeries());
 
-        if (current != null) {
-            throw new DataIntegrityViolationException("Series Id '"+ token.getSeries() +"' already exists!");
-        }
+		if (current != null) {
+			throw new DataIntegrityViolationException("Series Id '" + token.getSeries()
+					+ "' already exists!");
+		}
 
-        seriesTokens.put(token.getSeries(), token);
-    }
+		seriesTokens.put(token.getSeries(), token);
+	}
 
-    public synchronized void updateToken(String series, String tokenValue, Date lastUsed) {
-        PersistentRememberMeToken token = getTokenForSeries(series);
+	public synchronized void updateToken(String series, String tokenValue, Date lastUsed) {
+		PersistentRememberMeToken token = getTokenForSeries(series);
 
-        PersistentRememberMeToken newToken = new PersistentRememberMeToken(token.getUsername(), series, tokenValue,
-                new Date());
+		PersistentRememberMeToken newToken = new PersistentRememberMeToken(
+				token.getUsername(), series, tokenValue, new Date());
 
-        // Store it, overwriting the existing one.
-        seriesTokens.put(series, newToken);
-    }
+		// Store it, overwriting the existing one.
+		seriesTokens.put(series, newToken);
+	}
 
-    public synchronized PersistentRememberMeToken getTokenForSeries(String seriesId) {
-        return seriesTokens.get(seriesId);
-    }
+	public synchronized PersistentRememberMeToken getTokenForSeries(String seriesId) {
+		return seriesTokens.get(seriesId);
+	}
 
-    public synchronized void removeUserTokens(String username) {
-        Iterator<String> series = seriesTokens.keySet().iterator();
+	public synchronized void removeUserTokens(String username) {
+		Iterator<String> series = seriesTokens.keySet().iterator();
 
-        while (series.hasNext()) {
-            String seriesId = series.next();
+		while (series.hasNext()) {
+			String seriesId = series.next();
 
-            PersistentRememberMeToken token = seriesTokens.get(seriesId);
+			PersistentRememberMeToken token = seriesTokens.get(seriesId);
 
-            if (username.equals(token.getUsername())) {
-                series.remove();
-            }
-        }
-    }
+			if (username.equals(token.getUsername())) {
+				series.remove();
+			}
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java
index 39238cd577..2db89af894 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InvalidCookieException.java
@@ -1,13 +1,13 @@
 package org.springframework.security.web.authentication.rememberme;
 
 /**
- * Exception thrown by a RememberMeServices implementation to indicate
- * that a submitted cookie is of an invalid format or has expired.
+ * Exception thrown by a RememberMeServices implementation to indicate that a submitted
+ * cookie is of an invalid format or has expired.
  *
  * @author Luke Taylor
  */
 public class InvalidCookieException extends RememberMeAuthenticationException {
-    public InvalidCookieException(String message) {
-        super(message);
-    }
+	public InvalidCookieException(String message) {
+		super(message);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
index 5e436aabc3..e0dd0d7059 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
@@ -31,90 +31,96 @@ import java.util.*;
  * @author Luke Taylor
  * @since 2.0
  */
-public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements PersistentTokenRepository {
-    //~ Static fields/initializers =====================================================================================
+public class JdbcTokenRepositoryImpl extends JdbcDaoSupport implements
+		PersistentTokenRepository {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /** Default SQL for creating the database table to store the tokens */
-    public static final String CREATE_TABLE_SQL =
-            "create table persistent_logins (username varchar(64) not null, series varchar(64) primary key, " +
-                    "token varchar(64) not null, last_used timestamp not null)";
-    /** The default SQL used by the <tt>getTokenBySeries</tt> query */
-    public static final String DEF_TOKEN_BY_SERIES_SQL =
-            "select username,series,token,last_used from persistent_logins where series = ?";
-    /** The default SQL used by <tt>createNewToken</tt> */
-    public static final String DEF_INSERT_TOKEN_SQL =
-            "insert into persistent_logins (username, series, token, last_used) values(?,?,?,?)";
-    /** The default SQL used by <tt>updateToken</tt> */
-    public static final String DEF_UPDATE_TOKEN_SQL =
-            "update persistent_logins set token = ?, last_used = ? where series = ?";
-    /** The default SQL used by <tt>removeUserTokens</tt> */
-    public static final String DEF_REMOVE_USER_TOKENS_SQL =
-            "delete from persistent_logins where username = ?";
+	/** Default SQL for creating the database table to store the tokens */
+	public static final String CREATE_TABLE_SQL = "create table persistent_logins (username varchar(64) not null, series varchar(64) primary key, "
+			+ "token varchar(64) not null, last_used timestamp not null)";
+	/** The default SQL used by the <tt>getTokenBySeries</tt> query */
+	public static final String DEF_TOKEN_BY_SERIES_SQL = "select username,series,token,last_used from persistent_logins where series = ?";
+	/** The default SQL used by <tt>createNewToken</tt> */
+	public static final String DEF_INSERT_TOKEN_SQL = "insert into persistent_logins (username, series, token, last_used) values(?,?,?,?)";
+	/** The default SQL used by <tt>updateToken</tt> */
+	public static final String DEF_UPDATE_TOKEN_SQL = "update persistent_logins set token = ?, last_used = ? where series = ?";
+	/** The default SQL used by <tt>removeUserTokens</tt> */
+	public static final String DEF_REMOVE_USER_TOKENS_SQL = "delete from persistent_logins where username = ?";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String tokensBySeriesSql = DEF_TOKEN_BY_SERIES_SQL;
-    private String insertTokenSql = DEF_INSERT_TOKEN_SQL;
-    private String updateTokenSql = DEF_UPDATE_TOKEN_SQL;
-    private String removeUserTokensSql = DEF_REMOVE_USER_TOKENS_SQL;
-    private boolean createTableOnStartup;
+	private String tokensBySeriesSql = DEF_TOKEN_BY_SERIES_SQL;
+	private String insertTokenSql = DEF_INSERT_TOKEN_SQL;
+	private String updateTokenSql = DEF_UPDATE_TOKEN_SQL;
+	private String removeUserTokensSql = DEF_REMOVE_USER_TOKENS_SQL;
+	private boolean createTableOnStartup;
 
-    protected void initDao() {
-        if (createTableOnStartup) {
-            getJdbcTemplate().execute(CREATE_TABLE_SQL);
-        }
-    }
+	protected void initDao() {
+		if (createTableOnStartup) {
+			getJdbcTemplate().execute(CREATE_TABLE_SQL);
+		}
+	}
 
-    public void createNewToken(PersistentRememberMeToken token) {
-        getJdbcTemplate().update(insertTokenSql, token.getUsername(), token.getSeries(),
-                token.getTokenValue(), token.getDate());
-    }
+	public void createNewToken(PersistentRememberMeToken token) {
+		getJdbcTemplate().update(insertTokenSql, token.getUsername(), token.getSeries(),
+				token.getTokenValue(), token.getDate());
+	}
 
-    public void updateToken(String series, String tokenValue, Date lastUsed) {
-        getJdbcTemplate().update(updateTokenSql, tokenValue, lastUsed, series);
-    }
+	public void updateToken(String series, String tokenValue, Date lastUsed) {
+		getJdbcTemplate().update(updateTokenSql, tokenValue, lastUsed, series);
+	}
 
-    /**
-     * Loads the token data for the supplied series identifier.
-     *
-     * If an error occurs, it will be reported and null will be returned (since the result should just be a failed
-     * persistent login).
-     *
-     * @param seriesId
-     * @return the token matching the series, or null if no match found or an exception occurred.
-     */
-    public PersistentRememberMeToken getTokenForSeries(String seriesId) {
-        try {
-            return getJdbcTemplate().queryForObject(tokensBySeriesSql, new RowMapper<PersistentRememberMeToken>() {
-                public PersistentRememberMeToken mapRow(ResultSet rs, int rowNum) throws SQLException {
-                    return new PersistentRememberMeToken(rs.getString(1), rs.getString(2), rs.getString(3), rs.getTimestamp(4));
-                }
-            }, seriesId);
-        } catch(EmptyResultDataAccessException zeroResults) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Querying token for series '" + seriesId + "' returned no results.", zeroResults);
-            }
-        }catch(IncorrectResultSizeDataAccessException moreThanOne) {
-            logger.error("Querying token for series '" + seriesId + "' returned more than one value. Series" +
-                    " should be unique");
-        } catch(DataAccessException e) {
-            logger.error("Failed to load token for series " + seriesId, e);
-        }
+	/**
+	 * Loads the token data for the supplied series identifier.
+	 *
+	 * If an error occurs, it will be reported and null will be returned (since the result
+	 * should just be a failed persistent login).
+	 *
+	 * @param seriesId
+	 * @return the token matching the series, or null if no match found or an exception
+	 * occurred.
+	 */
+	public PersistentRememberMeToken getTokenForSeries(String seriesId) {
+		try {
+			return getJdbcTemplate().queryForObject(tokensBySeriesSql,
+					new RowMapper<PersistentRememberMeToken>() {
+						public PersistentRememberMeToken mapRow(ResultSet rs, int rowNum)
+								throws SQLException {
+							return new PersistentRememberMeToken(rs.getString(1), rs
+									.getString(2), rs.getString(3), rs.getTimestamp(4));
+						}
+					}, seriesId);
+		}
+		catch (EmptyResultDataAccessException zeroResults) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Querying token for series '" + seriesId
+						+ "' returned no results.", zeroResults);
+			}
+		}
+		catch (IncorrectResultSizeDataAccessException moreThanOne) {
+			logger.error("Querying token for series '" + seriesId
+					+ "' returned more than one value. Series" + " should be unique");
+		}
+		catch (DataAccessException e) {
+			logger.error("Failed to load token for series " + seriesId, e);
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void removeUserTokens(String username) {
-        getJdbcTemplate().update(removeUserTokensSql, username);
-    }
+	public void removeUserTokens(String username) {
+		getJdbcTemplate().update(removeUserTokensSql, username);
+	}
 
-    /**
-     * Intended for convenience in debugging. Will create the persistent_tokens database table when the class
-     * is initialized during the initDao method.
-     *
-     * @param createTableOnStartup set to true to execute the
-     */
-    public void setCreateTableOnStartup(boolean createTableOnStartup) {
-        this.createTableOnStartup = createTableOnStartup;
-    }
+	/**
+	 * Intended for convenience in debugging. Will create the persistent_tokens database
+	 * table when the class is initialized during the initDao method.
+	 *
+	 * @param createTableOnStartup set to true to execute the
+	 */
+	public void setCreateTableOnStartup(boolean createTableOnStartup) {
+		this.createTableOnStartup = createTableOnStartup;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java
index 7bf055679d..bdc80f24a3 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentRememberMeToken.java
@@ -6,31 +6,32 @@ import java.util.Date;
  * @author Luke Taylor
  */
 public class PersistentRememberMeToken {
-    private final String username;
-    private final String series;
-    private final String tokenValue;
-    private final Date date;
+	private final String username;
+	private final String series;
+	private final String tokenValue;
+	private final Date date;
 
-    public PersistentRememberMeToken(String username, String series, String tokenValue, Date date) {
-        this.username = username;
-        this.series = series;
-        this.tokenValue = tokenValue;
-        this.date = date;
-    }
+	public PersistentRememberMeToken(String username, String series, String tokenValue,
+			Date date) {
+		this.username = username;
+		this.series = series;
+		this.tokenValue = tokenValue;
+		this.date = date;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public String getSeries() {
-        return series;
-    }
+	public String getSeries() {
+		return series;
+	}
 
-    public String getTokenValue() {
-        return tokenValue;
-    }
+	public String getTokenValue() {
+		return tokenValue;
+	}
 
-    public Date getDate() {
-        return date;
-    }
+	public Date getDate() {
+		return date;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
index 29842544bc..e97dcf63ca 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServices.java
@@ -16,23 +16,27 @@ import org.springframework.security.web.authentication.RememberMeServices;
 import org.springframework.util.Assert;
 
 /**
- * {@link RememberMeServices} implementation based on Barry Jaspan's
- * <a href="http://jaspan.com/improved_persistent_login_cookie_best_practice">Improved Persistent Login Cookie
- * Best Practice</a>.
+ * {@link RememberMeServices} implementation based on Barry Jaspan's <a
+ * href="http://jaspan.com/improved_persistent_login_cookie_best_practice">Improved
+ * Persistent Login Cookie Best Practice</a>.
  *
- * There is a slight modification to the described approach, in that the username is not stored as part of the cookie
- * but obtained from the persistent store via an implementation of {@link PersistentTokenRepository}. The latter
- * should place a unique constraint on the series identifier, so that it is impossible for the same identifier to be
- * allocated to two different users.
+ * There is a slight modification to the described approach, in that the username is not
+ * stored as part of the cookie but obtained from the persistent store via an
+ * implementation of {@link PersistentTokenRepository}. The latter should place a unique
+ * constraint on the series identifier, so that it is impossible for the same identifier
+ * to be allocated to two different users.
  *
- * <p>User management such as changing passwords, removing users and setting user status should be combined
- * with maintenance of the user's persistent tokens.
+ * <p>
+ * User management such as changing passwords, removing users and setting user status
+ * should be combined with maintenance of the user's persistent tokens.
  * </p>
  *
- * <p>Note that while this class will use the date a token was created to check whether a presented cookie
- * is older than the configured <tt>tokenValiditySeconds</tt> property and deny authentication in this case,
- * it will not delete these tokens from storage. A suitable batch process should be run periodically to
- * remove expired tokens from the database.
+ * <p>
+ * Note that while this class will use the date a token was created to check whether a
+ * presented cookie is older than the configured <tt>tokenValiditySeconds</tt> property
+ * and deny authentication in this case, it will not delete these tokens from storage. A
+ * suitable batch process should be run periodically to remove expired tokens from the
+ * database.
  * </p>
  *
  * @author Luke Taylor
@@ -40,141 +44,160 @@ import org.springframework.util.Assert;
  */
 public class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices {
 
-    private PersistentTokenRepository tokenRepository = new InMemoryTokenRepositoryImpl();
-    private SecureRandom random;
+	private PersistentTokenRepository tokenRepository = new InMemoryTokenRepositoryImpl();
+	private SecureRandom random;
 
-    public static final int DEFAULT_SERIES_LENGTH = 16;
-    public static final int DEFAULT_TOKEN_LENGTH = 16;
+	public static final int DEFAULT_SERIES_LENGTH = 16;
+	public static final int DEFAULT_TOKEN_LENGTH = 16;
 
-    private int seriesLength = DEFAULT_SERIES_LENGTH;
-    private int tokenLength = DEFAULT_TOKEN_LENGTH;
+	private int seriesLength = DEFAULT_SERIES_LENGTH;
+	private int tokenLength = DEFAULT_TOKEN_LENGTH;
 
-    public PersistentTokenBasedRememberMeServices(String key, UserDetailsService userDetailsService,
-                                                  PersistentTokenRepository tokenRepository) {
-        super(key, userDetailsService);
-        random = new SecureRandom();
-        this.tokenRepository = tokenRepository;
-    }
+	public PersistentTokenBasedRememberMeServices(String key,
+			UserDetailsService userDetailsService,
+			PersistentTokenRepository tokenRepository) {
+		super(key, userDetailsService);
+		random = new SecureRandom();
+		this.tokenRepository = tokenRepository;
+	}
 
-    /**
-     * Locates the presented cookie data in the token repository, using the series id.
-     * If the data compares successfully with that in the persistent store, a new token is generated and stored with
-     * the same series. The corresponding cookie value is set on the response.
-     *
-     * @param cookieTokens the series and token values
-     *
-     * @throws RememberMeAuthenticationException if there is no stored token corresponding to the submitted cookie, or
-     * if the token in the persistent store has expired.
-     * @throws InvalidCookieException if the cookie doesn't have two tokens as expected.
-     * @throws CookieTheftException if a presented series value is found, but the stored token is different from the
-     * one presented.
-     */
-    protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) {
+	/**
+	 * Locates the presented cookie data in the token repository, using the series id. If
+	 * the data compares successfully with that in the persistent store, a new token is
+	 * generated and stored with the same series. The corresponding cookie value is set on
+	 * the response.
+	 *
+	 * @param cookieTokens the series and token values
+	 *
+	 * @throws RememberMeAuthenticationException if there is no stored token corresponding
+	 * to the submitted cookie, or if the token in the persistent store has expired.
+	 * @throws InvalidCookieException if the cookie doesn't have two tokens as expected.
+	 * @throws CookieTheftException if a presented series value is found, but the stored
+	 * token is different from the one presented.
+	 */
+	protected UserDetails processAutoLoginCookie(String[] cookieTokens,
+			HttpServletRequest request, HttpServletResponse response) {
 
-        if (cookieTokens.length != 2) {
-            throw new InvalidCookieException("Cookie token did not contain " + 2 +
-                    " tokens, but contained '" + Arrays.asList(cookieTokens) + "'");
-        }
+		if (cookieTokens.length != 2) {
+			throw new InvalidCookieException("Cookie token did not contain " + 2
+					+ " tokens, but contained '" + Arrays.asList(cookieTokens) + "'");
+		}
 
-        final String presentedSeries = cookieTokens[0];
-        final String presentedToken = cookieTokens[1];
+		final String presentedSeries = cookieTokens[0];
+		final String presentedToken = cookieTokens[1];
 
-        PersistentRememberMeToken token = tokenRepository.getTokenForSeries(presentedSeries);
+		PersistentRememberMeToken token = tokenRepository
+				.getTokenForSeries(presentedSeries);
 
-        if (token == null) {
-            // No series match, so we can't authenticate using this cookie
-            throw new RememberMeAuthenticationException("No persistent token found for series id: " + presentedSeries);
-        }
+		if (token == null) {
+			// No series match, so we can't authenticate using this cookie
+			throw new RememberMeAuthenticationException(
+					"No persistent token found for series id: " + presentedSeries);
+		}
 
-        // We have a match for this user/series combination
-        if (!presentedToken.equals(token.getTokenValue())) {
-            // Token doesn't match series value. Delete all logins for this user and throw an exception to warn them.
-            tokenRepository.removeUserTokens(token.getUsername());
+		// We have a match for this user/series combination
+		if (!presentedToken.equals(token.getTokenValue())) {
+			// Token doesn't match series value. Delete all logins for this user and throw
+			// an exception to warn them.
+			tokenRepository.removeUserTokens(token.getUsername());
 
-            throw new CookieTheftException(messages.getMessage("PersistentTokenBasedRememberMeServices.cookieStolen",
-                    "Invalid remember-me token (Series/token) mismatch. Implies previous cookie theft attack."));
-        }
+			throw new CookieTheftException(
+					messages.getMessage(
+							"PersistentTokenBasedRememberMeServices.cookieStolen",
+							"Invalid remember-me token (Series/token) mismatch. Implies previous cookie theft attack."));
+		}
 
-        if (token.getDate().getTime() + getTokenValiditySeconds()*1000L < System.currentTimeMillis()) {
-            throw new RememberMeAuthenticationException("Remember-me login has expired");
-        }
+		if (token.getDate().getTime() + getTokenValiditySeconds() * 1000L < System
+				.currentTimeMillis()) {
+			throw new RememberMeAuthenticationException("Remember-me login has expired");
+		}
 
-        // Token also matches, so login is valid. Update the token value, keeping the *same* series number.
-        if (logger.isDebugEnabled()) {
-            logger.debug("Refreshing persistent login token for user '" + token.getUsername() + "', series '" +
-                    token.getSeries() + "'");
-        }
+		// Token also matches, so login is valid. Update the token value, keeping the
+		// *same* series number.
+		if (logger.isDebugEnabled()) {
+			logger.debug("Refreshing persistent login token for user '"
+					+ token.getUsername() + "', series '" + token.getSeries() + "'");
+		}
 
-        PersistentRememberMeToken newToken = new PersistentRememberMeToken(token.getUsername(),
-                token.getSeries(), generateTokenData(), new Date());
+		PersistentRememberMeToken newToken = new PersistentRememberMeToken(
+				token.getUsername(), token.getSeries(), generateTokenData(), new Date());
 
-        try {
-            tokenRepository.updateToken(newToken.getSeries(), newToken.getTokenValue(), newToken.getDate());
-            addCookie(newToken, request, response);
-        } catch (DataAccessException e) {
-            logger.error("Failed to update token: ", e);
-            throw new RememberMeAuthenticationException("Autologin failed due to data access problem");
-        }
+		try {
+			tokenRepository.updateToken(newToken.getSeries(), newToken.getTokenValue(),
+					newToken.getDate());
+			addCookie(newToken, request, response);
+		}
+		catch (DataAccessException e) {
+			logger.error("Failed to update token: ", e);
+			throw new RememberMeAuthenticationException(
+					"Autologin failed due to data access problem");
+		}
 
-        return getUserDetailsService().loadUserByUsername(token.getUsername());
-    }
+		return getUserDetailsService().loadUserByUsername(token.getUsername());
+	}
 
-    /**
-     * Creates a new persistent login token with a new series number, stores the data in the
-     * persistent token repository and adds the corresponding cookie to the response.
-     *
-     */
-    protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
-        String username = successfulAuthentication.getName();
+	/**
+	 * Creates a new persistent login token with a new series number, stores the data in
+	 * the persistent token repository and adds the corresponding cookie to the response.
+	 *
+	 */
+	protected void onLoginSuccess(HttpServletRequest request,
+			HttpServletResponse response, Authentication successfulAuthentication) {
+		String username = successfulAuthentication.getName();
 
-        logger.debug("Creating new persistent login for user " + username);
+		logger.debug("Creating new persistent login for user " + username);
 
-        PersistentRememberMeToken persistentToken = new PersistentRememberMeToken(username, generateSeriesData(),
-                generateTokenData(), new Date());
-        try {
-            tokenRepository.createNewToken(persistentToken);
-            addCookie(persistentToken, request, response);
-        } catch (DataAccessException e) {
-            logger.error("Failed to save persistent token ", e);
-        }
-    }
+		PersistentRememberMeToken persistentToken = new PersistentRememberMeToken(
+				username, generateSeriesData(), generateTokenData(), new Date());
+		try {
+			tokenRepository.createNewToken(persistentToken);
+			addCookie(persistentToken, request, response);
+		}
+		catch (DataAccessException e) {
+			logger.error("Failed to save persistent token ", e);
+		}
+	}
 
-    @Override
-    public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
-        super.logout(request, response, authentication);
+	@Override
+	public void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) {
+		super.logout(request, response, authentication);
 
-        if (authentication != null) {
-            tokenRepository.removeUserTokens(authentication.getName());
-        }
-    }
+		if (authentication != null) {
+			tokenRepository.removeUserTokens(authentication.getName());
+		}
+	}
 
-    protected String generateSeriesData() {
-        byte[] newSeries = new byte[seriesLength];
-        random.nextBytes(newSeries);
-        return new String(Base64.encode(newSeries));
-    }
+	protected String generateSeriesData() {
+		byte[] newSeries = new byte[seriesLength];
+		random.nextBytes(newSeries);
+		return new String(Base64.encode(newSeries));
+	}
 
-    protected String generateTokenData() {
-        byte[] newToken = new byte[tokenLength];
-        random.nextBytes(newToken);
-        return new String(Base64.encode(newToken));
-    }
+	protected String generateTokenData() {
+		byte[] newToken = new byte[tokenLength];
+		random.nextBytes(newToken);
+		return new String(Base64.encode(newToken));
+	}
 
-    private void addCookie(PersistentRememberMeToken token, HttpServletRequest request, HttpServletResponse response) {
-        setCookie(new String[] {token.getSeries(), token.getTokenValue()}, getTokenValiditySeconds(), request, response);
-    }
+	private void addCookie(PersistentRememberMeToken token, HttpServletRequest request,
+			HttpServletResponse response) {
+		setCookie(new String[] { token.getSeries(), token.getTokenValue() },
+				getTokenValiditySeconds(), request, response);
+	}
 
-    public void setSeriesLength(int seriesLength) {
-        this.seriesLength = seriesLength;
-    }
+	public void setSeriesLength(int seriesLength) {
+		this.seriesLength = seriesLength;
+	}
 
-    public void setTokenLength(int tokenLength) {
-        this.tokenLength = tokenLength;
-    }
+	public void setTokenLength(int tokenLength) {
+		this.tokenLength = tokenLength;
+	}
 
-    @Override
-    public void setTokenValiditySeconds(int tokenValiditySeconds) {
-        Assert.isTrue(tokenValiditySeconds > 0, "tokenValiditySeconds must be positive for this implementation");
-        super.setTokenValiditySeconds(tokenValiditySeconds);
-    }
+	@Override
+	public void setTokenValiditySeconds(int tokenValiditySeconds) {
+		Assert.isTrue(tokenValiditySeconds > 0,
+				"tokenValiditySeconds must be positive for this implementation");
+		super.setTokenValiditySeconds(tokenValiditySeconds);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java
index 566cd783ba..3c671c9390 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/PersistentTokenRepository.java
@@ -3,8 +3,8 @@ package org.springframework.security.web.authentication.rememberme;
 import java.util.Date;
 
 /**
- * The abstraction used by {@link PersistentTokenBasedRememberMeServices} to store the persistent
- * login tokens for a user.
+ * The abstraction used by {@link PersistentTokenBasedRememberMeServices} to store the
+ * persistent login tokens for a user.
  *
  * @see JdbcTokenRepositoryImpl
  * @see InMemoryTokenRepositoryImpl
@@ -14,12 +14,12 @@ import java.util.Date;
  */
 public interface PersistentTokenRepository {
 
-    void createNewToken(PersistentRememberMeToken token);
+	void createNewToken(PersistentRememberMeToken token);
 
-    void updateToken(String series, String tokenValue, Date lastUsed);
+	void updateToken(String series, String tokenValue, Date lastUsed);
 
-    PersistentRememberMeToken getTokenForSeries(String seriesId);
+	PersistentRememberMeToken getTokenForSeries(String seriesId);
 
-    void removeUserTokens(String username);
+	void removeUserTokens(String username);
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java
index 2144ad769e..db2acf3098 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationException.java
@@ -3,31 +3,35 @@ package org.springframework.security.web.authentication.rememberme;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * This exception is thrown when an {@link org.springframework.security.core.Authentication} exception occurs while
- * using the remember-me authentication.
+ * This exception is thrown when an
+ * {@link org.springframework.security.core.Authentication} exception occurs while using
+ * the remember-me authentication.
  *
  * @author Luke Taylor
  */
 public class RememberMeAuthenticationException extends AuthenticationException {
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a {@code RememberMeAuthenticationException} with the specified message and root cause.
-     *
-     * @param msg the detail message
-     * @param t the root cause
-     */
-    public RememberMeAuthenticationException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a {@code RememberMeAuthenticationException} with the specified message
+	 * and root cause.
+	 *
+	 * @param msg the detail message
+	 * @param t the root cause
+	 */
+	public RememberMeAuthenticationException(String msg, Throwable t) {
+		super(msg, t);
+	}
 
-    /**
-     * Constructs an {@code RememberMeAuthenticationException} with the specified message and no root cause.
-     *
-     * @param msg the detail message
-     */
-    public RememberMeAuthenticationException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs an {@code RememberMeAuthenticationException} with the specified message
+	 * and no root cause.
+	 *
+	 * @param msg the detail message
+	 */
+	public RememberMeAuthenticationException(String msg) {
+		super(msg);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java
index 6d9ae2f1ed..ec438ddd3e 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilter.java
@@ -36,149 +36,170 @@ import org.springframework.security.web.authentication.RememberMeServices;
 import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
- * Detects if there is no {@code Authentication} object in the {@code SecurityContext}, and populates the context with
- * a remember-me authentication token if a {@link RememberMeServices} implementation so requests.
+ * Detects if there is no {@code Authentication} object in the {@code SecurityContext},
+ * and populates the context with a remember-me authentication token if a
+ * {@link RememberMeServices} implementation so requests.
  * <p>
  * Concrete {@code RememberMeServices} implementations will have their
- * {@link RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)}
- * method called by this filter. If this method returns a non-null {@code Authentication} object, it will be passed
- * to the {@code AuthenticationManager}, so that any authentication-specific behaviour can be achieved.
- * The resulting {@code Authentication} (if successful) will be placed into the {@code SecurityContext}.
+ * {@link RememberMeServices#autoLogin(HttpServletRequest, HttpServletResponse)} method
+ * called by this filter. If this method returns a non-null {@code Authentication} object,
+ * it will be passed to the {@code AuthenticationManager}, so that any
+ * authentication-specific behaviour can be achieved. The resulting {@code Authentication}
+ * (if successful) will be placed into the {@code SecurityContext}.
  * <p>
- * If authentication is successful, an {@link InteractiveAuthenticationSuccessEvent} will be published
- * to the application context. No events will be published if authentication was unsuccessful, because this would
- * generally be recorded via an {@code AuthenticationManager}-specific application event.
+ * If authentication is successful, an {@link InteractiveAuthenticationSuccessEvent} will
+ * be published to the application context. No events will be published if authentication
+ * was unsuccessful, because this would generally be recorded via an
+ * {@code AuthenticationManager}-specific application event.
  * <p>
- * Normally the request will be allowed to proceed regardless of whether authentication succeeds or fails. If
- * some control over the destination for authenticated users is required, an {@link AuthenticationSuccessHandler}
- * can be injected
+ * Normally the request will be allowed to proceed regardless of whether authentication
+ * succeeds or fails. If some control over the destination for authenticated users is
+ * required, an {@link AuthenticationSuccessHandler} can be injected
  *
  * @author Ben Alex
  * @author Luke Taylor
  */
-public class RememberMeAuthenticationFilter extends GenericFilterBean implements ApplicationEventPublisherAware {
+public class RememberMeAuthenticationFilter extends GenericFilterBean implements
+		ApplicationEventPublisherAware {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private ApplicationEventPublisher eventPublisher;
-    private AuthenticationSuccessHandler successHandler;
-    private AuthenticationManager authenticationManager;
-    private RememberMeServices rememberMeServices;
+	private ApplicationEventPublisher eventPublisher;
+	private AuthenticationSuccessHandler successHandler;
+	private AuthenticationManager authenticationManager;
+	private RememberMeServices rememberMeServices;
 
-    public RememberMeAuthenticationFilter(AuthenticationManager authenticationManager,
-                                          RememberMeServices rememberMeServices) {
-        Assert.notNull(authenticationManager, "authenticationManager cannot be null");
-        Assert.notNull(rememberMeServices, "rememberMeServices cannot be null");
-        this.authenticationManager = authenticationManager;
-        this.rememberMeServices = rememberMeServices;
-    }
+	public RememberMeAuthenticationFilter(AuthenticationManager authenticationManager,
+			RememberMeServices rememberMeServices) {
+		Assert.notNull(authenticationManager, "authenticationManager cannot be null");
+		Assert.notNull(rememberMeServices, "rememberMeServices cannot be null");
+		this.authenticationManager = authenticationManager;
+		this.rememberMeServices = rememberMeServices;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(authenticationManager, "authenticationManager must be specified");
-        Assert.notNull(rememberMeServices, "rememberMeServices must be specified");
-    }
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(authenticationManager, "authenticationManager must be specified");
+		Assert.notNull(rememberMeServices, "rememberMeServices must be specified");
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        if (SecurityContextHolder.getContext().getAuthentication() == null) {
-            Authentication rememberMeAuth = rememberMeServices.autoLogin(request, response);
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			Authentication rememberMeAuth = rememberMeServices.autoLogin(request,
+					response);
 
-            if (rememberMeAuth != null) {
-                // Attempt authenticaton via AuthenticationManager
-                try {
-                    rememberMeAuth = authenticationManager.authenticate(rememberMeAuth);
+			if (rememberMeAuth != null) {
+				// Attempt authenticaton via AuthenticationManager
+				try {
+					rememberMeAuth = authenticationManager.authenticate(rememberMeAuth);
 
-                    // Store to SecurityContextHolder
-                    SecurityContextHolder.getContext().setAuthentication(rememberMeAuth);
+					// Store to SecurityContextHolder
+					SecurityContextHolder.getContext().setAuthentication(rememberMeAuth);
 
-                    onSuccessfulAuthentication(request, response, rememberMeAuth);
+					onSuccessfulAuthentication(request, response, rememberMeAuth);
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("SecurityContextHolder populated with remember-me token: '"
-                            + SecurityContextHolder.getContext().getAuthentication() + "'");
-                    }
+					if (logger.isDebugEnabled()) {
+						logger.debug("SecurityContextHolder populated with remember-me token: '"
+								+ SecurityContextHolder.getContext().getAuthentication()
+								+ "'");
+					}
 
-                    // Fire event
-                    if (this.eventPublisher != null) {
-                        eventPublisher.publishEvent(new InteractiveAuthenticationSuccessEvent(
-                                SecurityContextHolder.getContext().getAuthentication(), this.getClass()));
-                    }
+					// Fire event
+					if (this.eventPublisher != null) {
+						eventPublisher
+								.publishEvent(new InteractiveAuthenticationSuccessEvent(
+										SecurityContextHolder.getContext()
+												.getAuthentication(), this.getClass()));
+					}
 
-                    if (successHandler != null) {
-                        successHandler.onAuthenticationSuccess(request, response, rememberMeAuth);
+					if (successHandler != null) {
+						successHandler.onAuthenticationSuccess(request, response,
+								rememberMeAuth);
 
-                        return;
-                    }
+						return;
+					}
 
-                } catch (AuthenticationException authenticationException) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("SecurityContextHolder not populated with remember-me token, as "
-                                + "AuthenticationManager rejected Authentication returned by RememberMeServices: '"
-                                + rememberMeAuth + "'; invalidating remember-me token", authenticationException);
-                    }
+				}
+				catch (AuthenticationException authenticationException) {
+					if (logger.isDebugEnabled()) {
+						logger.debug(
+								"SecurityContextHolder not populated with remember-me token, as "
+										+ "AuthenticationManager rejected Authentication returned by RememberMeServices: '"
+										+ rememberMeAuth
+										+ "'; invalidating remember-me token",
+								authenticationException);
+					}
 
-                    rememberMeServices.loginFail(request, response);
+					rememberMeServices.loginFail(request, response);
 
-                    onUnsuccessfulAuthentication(request, response, authenticationException);
-                }
-            }
+					onUnsuccessfulAuthentication(request, response,
+							authenticationException);
+				}
+			}
 
-            chain.doFilter(request, response);
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug("SecurityContextHolder not populated with remember-me token, as it already contained: '"
-                    + SecurityContextHolder.getContext().getAuthentication() + "'");
-            }
+			chain.doFilter(request, response);
+		}
+		else {
+			if (logger.isDebugEnabled()) {
+				logger.debug("SecurityContextHolder not populated with remember-me token, as it already contained: '"
+						+ SecurityContextHolder.getContext().getAuthentication() + "'");
+			}
 
-            chain.doFilter(request, response);
-        }
-    }
+			chain.doFilter(request, response);
+		}
+	}
 
-    /**
-     * Called if a remember-me token is presented and successfully authenticated by the {@code RememberMeServices}
-     * {@code autoLogin} method and the {@code AuthenticationManager}.
-     */
-    protected void onSuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
-            Authentication authResult) {
-    }
+	/**
+	 * Called if a remember-me token is presented and successfully authenticated by the
+	 * {@code RememberMeServices} {@code autoLogin} method and the
+	 * {@code AuthenticationManager}.
+	 */
+	protected void onSuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, Authentication authResult) {
+	}
 
-    /**
-     * Called if the {@code AuthenticationManager} rejects the authentication object returned from the
-     * {@code RememberMeServices} {@code autoLogin} method. This method will not be called when no remember-me
-     * token is present in the request and {@code autoLogin} reurns null.
-     */
-    protected void onUnsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException failed) {
-    }
+	/**
+	 * Called if the {@code AuthenticationManager} rejects the authentication object
+	 * returned from the {@code RememberMeServices} {@code autoLogin} method. This method
+	 * will not be called when no remember-me token is present in the request and
+	 * {@code autoLogin} reurns null.
+	 */
+	protected void onUnsuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException failed) {
+	}
 
-    public RememberMeServices getRememberMeServices() {
-        return rememberMeServices;
-    }
+	public RememberMeServices getRememberMeServices() {
+		return rememberMeServices;
+	}
 
-    public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) {
-        this.eventPublisher = eventPublisher;
-    }
+	public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher) {
+		this.eventPublisher = eventPublisher;
+	}
 
-    /**
-     * Allows control over the destination a remembered user is sent to when they are successfully authenticated.
-     * By default, the filter will just allow the current request to proceed, but if an
-     * {@code AuthenticationSuccessHandler} is set, it will be invoked and the {@code doFilter()} method will return
-     * immediately, thus allowing the application to redirect the user to a specific URL, regardless of whatthe original
-     * request was for.
-     *
-     * @param successHandler the strategy to invoke immediately before returning from {@code doFilter()}.
-     */
-    public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler successHandler) {
-        Assert.notNull(successHandler, "successHandler cannot be null");
-        this.successHandler = successHandler;
-    }
+	/**
+	 * Allows control over the destination a remembered user is sent to when they are
+	 * successfully authenticated. By default, the filter will just allow the current
+	 * request to proceed, but if an {@code AuthenticationSuccessHandler} is set, it will
+	 * be invoked and the {@code doFilter()} method will return immediately, thus allowing
+	 * the application to redirect the user to a specific URL, regardless of whatthe
+	 * original request was for.
+	 *
+	 * @param successHandler the strategy to invoke immediately before returning from
+	 * {@code doFilter()}.
+	 */
+	public void setAuthenticationSuccessHandler(
+			AuthenticationSuccessHandler successHandler) {
+		Assert.notNull(successHandler, "successHandler cannot be null");
+		this.successHandler = successHandler;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java
index 63a90e72c8..fed473a174 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServices.java
@@ -35,46 +35,47 @@ import java.util.Date;
  * Identifies previously remembered users by a Base-64 encoded cookie.
  *
  * <p>
- * This implementation does not rely on an external database, so is attractive
- * for simple applications. The cookie will be valid for a specific period from
- * the date of the last {@link #loginSuccess(HttpServletRequest, HttpServletResponse, Authentication)}.
- * As per the interface contract, this method will only be called when the
- * principal completes a successful interactive authentication. As such the time
- * period commences from the last authentication attempt where they furnished
- * credentials - not the time period they last logged in via remember-me. The
- * implementation will only send a remember-me token if the parameter defined by
- * {@link #setParameter(String)} is present.
+ * This implementation does not rely on an external database, so is attractive for simple
+ * applications. The cookie will be valid for a specific period from the date of the last
+ * {@link #loginSuccess(HttpServletRequest, HttpServletResponse, Authentication)}. As per
+ * the interface contract, this method will only be called when the principal completes a
+ * successful interactive authentication. As such the time period commences from the last
+ * authentication attempt where they furnished credentials - not the time period they last
+ * logged in via remember-me. The implementation will only send a remember-me token if the
+ * parameter defined by {@link #setParameter(String)} is present.
  * <p>
- * An {@link org.springframework.security.core.userdetails.UserDetailsService} is required by
- * this implementation, so that it can construct a valid
- * <code>Authentication</code> from the returned {@link org.springframework.security.core.userdetails.UserDetails}.
- * This is also necessary so that the user's password is available and can be checked as part of the encoded cookie.
+ * An {@link org.springframework.security.core.userdetails.UserDetailsService} is required
+ * by this implementation, so that it can construct a valid <code>Authentication</code>
+ * from the returned {@link org.springframework.security.core.userdetails.UserDetails}.
+ * This is also necessary so that the user's password is available and can be checked as
+ * part of the encoded cookie.
  * <p>
  * The cookie encoded by this implementation adopts the following form:
  *
  * <pre>
- * username + &quot;:&quot; + expiryTime + &quot;:&quot; + Md5Hex(username + &quot;:&quot; + expiryTime + &quot;:&quot; + password + &quot;:&quot; + key)
+ * username + &quot;:&quot; + expiryTime + &quot;:&quot;
+ * 		+ Md5Hex(username + &quot;:&quot; + expiryTime + &quot;:&quot; + password + &quot;:&quot; + key)
  * </pre>
  *
  * <p>
- * As such, if the user changes their password, any remember-me token will be
- * invalidated. Equally, the system administrator may invalidate every
- * remember-me token on issue by changing the key. This provides some reasonable
- * approaches to recovering from a remember-me token being left on a public
- * machine (e.g. kiosk system, Internet cafe etc). Most importantly, at no time is
- * the user's password ever sent to the user agent, providing an important
- * security safeguard. Unfortunately the username is necessary in this
- * implementation (as we do not want to rely on a database for remember-me
- * services). High security applications should be aware of this occasionally undesired
- * disclosure of a valid username.
+ * As such, if the user changes their password, any remember-me token will be invalidated.
+ * Equally, the system administrator may invalidate every remember-me token on issue by
+ * changing the key. This provides some reasonable approaches to recovering from a
+ * remember-me token being left on a public machine (e.g. kiosk system, Internet cafe
+ * etc). Most importantly, at no time is the user's password ever sent to the user agent,
+ * providing an important security safeguard. Unfortunately the username is necessary in
+ * this implementation (as we do not want to rely on a database for remember-me services).
+ * High security applications should be aware of this occasionally undesired disclosure of
+ * a valid username.
  * <p>
- * This is a basic remember-me implementation which is suitable for many
- * applications. However, we recommend a database-based implementation if you
- * require a more secure remember-me approach (see {@link PersistentTokenBasedRememberMeServices}).
+ * This is a basic remember-me implementation which is suitable for many applications.
+ * However, we recommend a database-based implementation if you require a more secure
+ * remember-me approach (see {@link PersistentTokenBasedRememberMeServices}).
  * <p>
- * By default the tokens will be valid for 14 days from the last successful authentication attempt. This can be changed
- * using {@link #setTokenValiditySeconds(int)}. If this value is less than zero, the <tt>expiryTime</tt> will remain at
- * 14 days, but the negative value will be used for the <tt>maxAge</tt> property of the cookie, meaning that it will
+ * By default the tokens will be valid for 14 days from the last successful authentication
+ * attempt. This can be changed using {@link #setTokenValiditySeconds(int)}. If this value
+ * is less than zero, the <tt>expiryTime</tt> will remain at 14 days, but the negative
+ * value will be used for the <tt>maxAge</tt> property of the cookie, meaning that it will
  * not be stored when the browser is closed.
  *
  *
@@ -82,182 +83,194 @@ import java.util.Date;
  */
 public class TokenBasedRememberMeServices extends AbstractRememberMeServices {
 
-    public TokenBasedRememberMeServices(String key, UserDetailsService userDetailsService) {
-        super(key, userDetailsService);
-    }
+	public TokenBasedRememberMeServices(String key, UserDetailsService userDetailsService) {
+		super(key, userDetailsService);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request,
-            HttpServletResponse response) {
+	@Override
+	protected UserDetails processAutoLoginCookie(String[] cookieTokens,
+			HttpServletRequest request, HttpServletResponse response) {
 
-        if (cookieTokens.length != 3) {
-            throw new InvalidCookieException("Cookie token did not contain 3" +
-                    " tokens, but contained '" + Arrays.asList(cookieTokens) + "'");
-        }
+		if (cookieTokens.length != 3) {
+			throw new InvalidCookieException("Cookie token did not contain 3"
+					+ " tokens, but contained '" + Arrays.asList(cookieTokens) + "'");
+		}
 
-        long tokenExpiryTime;
+		long tokenExpiryTime;
 
-        try {
-            tokenExpiryTime = new Long(cookieTokens[1]).longValue();
-        }
-        catch (NumberFormatException nfe) {
-            throw new InvalidCookieException("Cookie token[1] did not contain a valid number (contained '" +
-                    cookieTokens[1] + "')");
-        }
+		try {
+			tokenExpiryTime = new Long(cookieTokens[1]).longValue();
+		}
+		catch (NumberFormatException nfe) {
+			throw new InvalidCookieException(
+					"Cookie token[1] did not contain a valid number (contained '"
+							+ cookieTokens[1] + "')");
+		}
 
-        if (isTokenExpired(tokenExpiryTime)) {
-            throw new InvalidCookieException("Cookie token[1] has expired (expired on '"
-                    + new Date(tokenExpiryTime) + "'; current time is '" + new Date() + "')");
-        }
+		if (isTokenExpired(tokenExpiryTime)) {
+			throw new InvalidCookieException("Cookie token[1] has expired (expired on '"
+					+ new Date(tokenExpiryTime) + "'; current time is '" + new Date()
+					+ "')");
+		}
 
-        // Check the user exists.
-        // Defer lookup until after expiry time checked, to possibly avoid expensive database call.
+		// Check the user exists.
+		// Defer lookup until after expiry time checked, to possibly avoid expensive
+		// database call.
 
-        UserDetails userDetails = getUserDetailsService().loadUserByUsername(cookieTokens[0]);
+		UserDetails userDetails = getUserDetailsService().loadUserByUsername(
+				cookieTokens[0]);
 
-        // Check signature of token matches remaining details.
-        // 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 that this method is usually only called once per HttpSession - if the token is valid,
-        // it will cause SecurityContextHolder population, whilst if invalid, will cause the cookie to be cancelled.
-        String expectedTokenSignature = makeTokenSignature(tokenExpiryTime, userDetails.getUsername(),
-                userDetails.getPassword());
+		// Check signature of token matches remaining details.
+		// 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 that this method is usually only called once per HttpSession - if
+		// the token is valid,
+		// it will cause SecurityContextHolder population, whilst if invalid, will cause
+		// the cookie to be cancelled.
+		String expectedTokenSignature = makeTokenSignature(tokenExpiryTime,
+				userDetails.getUsername(), userDetails.getPassword());
 
-        if (!equals(expectedTokenSignature,cookieTokens[2])) {
-            throw new InvalidCookieException("Cookie token[2] contained signature '" + cookieTokens[2]
-                                                                                                    + "' but expected '" + expectedTokenSignature + "'");
-        }
+		if (!equals(expectedTokenSignature, cookieTokens[2])) {
+			throw new InvalidCookieException("Cookie token[2] contained signature '"
+					+ cookieTokens[2] + "' but expected '" + expectedTokenSignature + "'");
+		}
 
-        return userDetails;
-    }
+		return userDetails;
+	}
 
-    /**
-     * Calculates the digital signature to be put in the cookie. Default value is
-     * MD5 ("username:tokenExpiryTime:password:key")
-     */
-    protected String makeTokenSignature(long tokenExpiryTime, String username, String password) {
-        String data = username + ":" + tokenExpiryTime + ":" + password + ":" + getKey();
-        MessageDigest digest;
-        try {
-            digest = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalStateException("No MD5 algorithm available!");
-        }
+	/**
+	 * Calculates the digital signature to be put in the cookie. Default value is MD5
+	 * ("username:tokenExpiryTime:password:key")
+	 */
+	protected String makeTokenSignature(long tokenExpiryTime, String username,
+			String password) {
+		String data = username + ":" + tokenExpiryTime + ":" + password + ":" + getKey();
+		MessageDigest digest;
+		try {
+			digest = MessageDigest.getInstance("MD5");
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalStateException("No MD5 algorithm available!");
+		}
 
-        return new String(Hex.encode(digest.digest(data.getBytes())));
-    }
+		return new String(Hex.encode(digest.digest(data.getBytes())));
+	}
 
-    protected boolean isTokenExpired(long tokenExpiryTime) {
-        return tokenExpiryTime < System.currentTimeMillis();
-    }
+	protected boolean isTokenExpired(long tokenExpiryTime) {
+		return tokenExpiryTime < System.currentTimeMillis();
+	}
 
-    @Override
-    public void onLoginSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication successfulAuthentication) {
+	@Override
+	public void onLoginSuccess(HttpServletRequest request, HttpServletResponse response,
+			Authentication successfulAuthentication) {
 
-        String username = retrieveUserName(successfulAuthentication);
-        String password = retrievePassword(successfulAuthentication);
+		String username = retrieveUserName(successfulAuthentication);
+		String password = retrievePassword(successfulAuthentication);
 
-        // If unable to find a username and password, just abort as TokenBasedRememberMeServices is
-        // unable to construct a valid token in this case.
-        if (!StringUtils.hasLength(username)) {
-            logger.debug("Unable to retrieve username");
-            return;
-        }
+		// If unable to find a username and password, just abort as
+		// TokenBasedRememberMeServices is
+		// unable to construct a valid token in this case.
+		if (!StringUtils.hasLength(username)) {
+			logger.debug("Unable to retrieve username");
+			return;
+		}
 
-        if (!StringUtils.hasLength(password)) {
-            UserDetails user = getUserDetailsService().loadUserByUsername(username);
-            password = user.getPassword();
+		if (!StringUtils.hasLength(password)) {
+			UserDetails user = getUserDetailsService().loadUserByUsername(username);
+			password = user.getPassword();
 
-            if (!StringUtils.hasLength(password)) {
-                logger.debug("Unable to obtain password for user: " + username);
-                return;
-            }
-        }
+			if (!StringUtils.hasLength(password)) {
+				logger.debug("Unable to obtain password for user: " + username);
+				return;
+			}
+		}
 
-        int tokenLifetime = calculateLoginLifetime(request, successfulAuthentication);
-        long expiryTime = System.currentTimeMillis();
-        // SEC-949
-        expiryTime += 1000L* (tokenLifetime < 0 ? TWO_WEEKS_S : tokenLifetime);
+		int tokenLifetime = calculateLoginLifetime(request, successfulAuthentication);
+		long expiryTime = System.currentTimeMillis();
+		// SEC-949
+		expiryTime += 1000L * (tokenLifetime < 0 ? TWO_WEEKS_S : tokenLifetime);
 
-        String signatureValue = makeTokenSignature(expiryTime, username, password);
+		String signatureValue = makeTokenSignature(expiryTime, username, password);
 
-        setCookie(new String[] {username, Long.toString(expiryTime), signatureValue}, tokenLifetime, request, response);
+		setCookie(new String[] { username, Long.toString(expiryTime), signatureValue },
+				tokenLifetime, request, response);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Added remember-me cookie for user '" + username + "', expiry: '"
-                    + new Date(expiryTime) + "'");
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Added remember-me cookie for user '" + username
+					+ "', expiry: '" + new Date(expiryTime) + "'");
+		}
+	}
 
-    /**
-     * Calculates the validity period in seconds for a newly generated remember-me login.
-     * After this period (from the current time) the remember-me login will be considered expired.
-     * This method allows customization based on request parameters supplied with the login or information in
-     * the <tt>Authentication</tt> object. The default value is just the token validity period property,
-     * <tt>tokenValiditySeconds</tt>.
-     * <p>
-     * The returned value will be used to work out the expiry time of the token and will also be
-     * used to set the <tt>maxAge</tt> property of the cookie.
-     *
-     * See SEC-485.
-     *
-     * @param request the request passed to onLoginSuccess
-     * @param authentication the successful authentication object.
-     * @return the lifetime in seconds.
-     */
-    protected int calculateLoginLifetime(HttpServletRequest request, Authentication authentication) {
-        return getTokenValiditySeconds();
-    }
+	/**
+	 * Calculates the validity period in seconds for a newly generated remember-me login.
+	 * After this period (from the current time) the remember-me login will be considered
+	 * expired. This method allows customization based on request parameters supplied with
+	 * the login or information in the <tt>Authentication</tt> object. The default value
+	 * is just the token validity period property, <tt>tokenValiditySeconds</tt>.
+	 * <p>
+	 * The returned value will be used to work out the expiry time of the token and will
+	 * also be used to set the <tt>maxAge</tt> property of the cookie.
+	 *
+	 * See SEC-485.
+	 *
+	 * @param request the request passed to onLoginSuccess
+	 * @param authentication the successful authentication object.
+	 * @return the lifetime in seconds.
+	 */
+	protected int calculateLoginLifetime(HttpServletRequest request,
+			Authentication authentication) {
+		return getTokenValiditySeconds();
+	}
 
-    protected String retrieveUserName(Authentication authentication) {
-        if (isInstanceOfUserDetails(authentication)) {
-            return ((UserDetails) authentication.getPrincipal()).getUsername();
-        }
-        else {
-            return authentication.getPrincipal().toString();
-        }
-    }
+	protected String retrieveUserName(Authentication authentication) {
+		if (isInstanceOfUserDetails(authentication)) {
+			return ((UserDetails) authentication.getPrincipal()).getUsername();
+		}
+		else {
+			return authentication.getPrincipal().toString();
+		}
+	}
 
-    protected String retrievePassword(Authentication authentication) {
-        if (isInstanceOfUserDetails(authentication)) {
-            return ((UserDetails) authentication.getPrincipal()).getPassword();
-        }
-        else {
-            if (authentication.getCredentials() == null) {
-                return null;
-            }
-            return authentication.getCredentials().toString();
-        }
-    }
+	protected String retrievePassword(Authentication authentication) {
+		if (isInstanceOfUserDetails(authentication)) {
+			return ((UserDetails) authentication.getPrincipal()).getPassword();
+		}
+		else {
+			if (authentication.getCredentials() == null) {
+				return null;
+			}
+			return authentication.getCredentials().toString();
+		}
+	}
 
-    private boolean isInstanceOfUserDetails(Authentication authentication) {
-        return authentication.getPrincipal() instanceof UserDetails;
-    }
+	private boolean isInstanceOfUserDetails(Authentication authentication) {
+		return authentication.getPrincipal() instanceof UserDetails;
+	}
 
-    /**
-     * Constant time comparison to prevent against timing attacks.
-     */
-    private static boolean equals(String expected, String actual) {
-        byte[] expectedBytes = bytesUtf8(expected);
-        byte[] actualBytes = bytesUtf8(actual);
-        if (expectedBytes.length != actualBytes.length) {
-            return false;
-        }
+	/**
+	 * Constant time comparison to prevent against timing attacks.
+	 */
+	private static boolean equals(String expected, String actual) {
+		byte[] expectedBytes = bytesUtf8(expected);
+		byte[] actualBytes = bytesUtf8(actual);
+		if (expectedBytes.length != actualBytes.length) {
+			return false;
+		}
 
-        int result = 0;
-        for (int i = 0; i < expectedBytes.length; i++) {
-            result |= expectedBytes[i] ^ actualBytes[i];
-        }
-        return result == 0;
-    }
+		int result = 0;
+		for (int i = 0; i < expectedBytes.length; i++) {
+			result |= expectedBytes[i] ^ actualBytes[i];
+		}
+		return result == 0;
+	}
 
-    private static byte[] bytesUtf8(String s) {
-        if (s == null) {
-            return null;
-        }
-        return Utf8.encode(s);
-    }
+	private static byte[] bytesUtf8(String s) {
+		if (s == null) {
+			return null;
+		}
+		return Utf8.encode(s);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java
index 57c9ab51b0..2c4610a838 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java
@@ -34,111 +34,121 @@ import org.springframework.web.util.WebUtils;
  * @author Rob Winch
  * @since 3.2
  */
-abstract class AbstractSessionFixationProtectionStrategy implements SessionAuthenticationStrategy, ApplicationEventPublisherAware {
+abstract class AbstractSessionFixationProtectionStrategy implements
+		SessionAuthenticationStrategy, ApplicationEventPublisherAware {
 
-    protected final Log logger = LogFactory.getLog(this.getClass());
-    /**
-     * Used for publishing events related to session fixation protection, such as {@link SessionFixationProtectionEvent}.
-     */
-    private ApplicationEventPublisher applicationEventPublisher = new NullEventPublisher();
-    /**
-     * If set to {@code true}, a session will always be created, even if one didn't exist at the start of the request.
-     * Defaults to {@code false}.
-     */
-    private boolean alwaysCreateSession;
+	protected final Log logger = LogFactory.getLog(this.getClass());
+	/**
+	 * Used for publishing events related to session fixation protection, such as
+	 * {@link SessionFixationProtectionEvent}.
+	 */
+	private ApplicationEventPublisher applicationEventPublisher = new NullEventPublisher();
+	/**
+	 * If set to {@code true}, a session will always be created, even if one didn't exist
+	 * at the start of the request. Defaults to {@code false}.
+	 */
+	private boolean alwaysCreateSession;
 
-    /**
-     * Called when a user is newly authenticated.
-     * <p>
-     * If a session already exists, and matches the session Id from the client, a new session will be created, and the
-     * session attributes copied to it (if {@code migrateSessionAttributes} is set).
-     * If the client's requested session Id is invalid, nothing will be done, since there is no need to change the
-     * session Id if it doesn't match the current session.
-     * <p>
-     * If there is no session, no action is taken unless the {@code alwaysCreateSession} property is set, in which
-     * case a session will be created if one doesn't already exist.
-     */
-    public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) {
-        boolean hadSessionAlready = request.getSession(false) != null;
+	/**
+	 * Called when a user is newly authenticated.
+	 * <p>
+	 * If a session already exists, and matches the session Id from the client, a new
+	 * session will be created, and the session attributes copied to it (if
+	 * {@code migrateSessionAttributes} is set). If the client's requested session Id is
+	 * invalid, nothing will be done, since there is no need to change the session Id if
+	 * it doesn't match the current session.
+	 * <p>
+	 * If there is no session, no action is taken unless the {@code alwaysCreateSession}
+	 * property is set, in which case a session will be created if one doesn't already
+	 * exist.
+	 */
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response) {
+		boolean hadSessionAlready = request.getSession(false) != null;
 
-        if (!hadSessionAlready && !alwaysCreateSession) {
-            // Session fixation isn't a problem if there's no session
+		if (!hadSessionAlready && !alwaysCreateSession) {
+			// Session fixation isn't a problem if there's no session
 
-            return;
-        }
+			return;
+		}
 
-        // Create new session if necessary
-        HttpSession session = request.getSession();
+		// Create new session if necessary
+		HttpSession session = request.getSession();
 
-        if (hadSessionAlready && request.isRequestedSessionIdValid()) {
+		if (hadSessionAlready && request.isRequestedSessionIdValid()) {
 
-            String originalSessionId;
-            String newSessionId;
-            Object mutex = WebUtils.getSessionMutex(session);
-            synchronized(mutex) {
-                // We need to migrate to a new session
-                originalSessionId = session.getId();
+			String originalSessionId;
+			String newSessionId;
+			Object mutex = WebUtils.getSessionMutex(session);
+			synchronized (mutex) {
+				// We need to migrate to a new session
+				originalSessionId = session.getId();
 
-                session = applySessionFixation(request);
-                newSessionId = session.getId();
-            }
+				session = applySessionFixation(request);
+				newSessionId = session.getId();
+			}
 
-            if (originalSessionId.equals(newSessionId)) {
-                logger.warn("Your servlet container did not change the session ID when a new session was created. You will" +
-                        " not be adequately protected against session-fixation attacks");
-            }
+			if (originalSessionId.equals(newSessionId)) {
+				logger.warn("Your servlet container did not change the session ID when a new session was created. You will"
+						+ " not be adequately protected against session-fixation attacks");
+			}
 
-            onSessionChange(originalSessionId, session, authentication);
-        }
-    }
+			onSessionChange(originalSessionId, session, authentication);
+		}
+	}
 
-    /**
-     * Applies session fixation
-     *
-     * @param request the {@link HttpServletRequest} to apply session fixation protection for
-     * @return the new {@link HttpSession} to use. Cannot be null.
-     */
-    abstract HttpSession applySessionFixation(HttpServletRequest request);
+	/**
+	 * Applies session fixation
+	 *
+	 * @param request the {@link HttpServletRequest} to apply session fixation protection
+	 * for
+	 * @return the new {@link HttpSession} to use. Cannot be null.
+	 */
+	abstract HttpSession applySessionFixation(HttpServletRequest request);
 
-    /**
-     * Called when the session has been changed and the old attributes have been migrated to the new session.
-     * Only called if a session existed to start with. Allows subclasses to plug in additional behaviour.
-     * * <p>
-     * The default implementation of this method publishes a {@link SessionFixationProtectionEvent} to notify
-     * the application that the session ID has changed. If you override this method and still wish these events to be
-     * published, you should call {@code super.onSessionChange()} within your overriding method.
-     *
-     * @param originalSessionId the original session identifier
-     * @param newSession the newly created session
-     * @param auth the token for the newly authenticated principal
-     */
-    protected void onSessionChange(String originalSessionId, HttpSession newSession, Authentication auth) {
-        applicationEventPublisher.publishEvent(new SessionFixationProtectionEvent(
-                auth, originalSessionId, newSession.getId()
-        ));
-    }
+	/**
+	 * Called when the session has been changed and the old attributes have been migrated
+	 * to the new session. Only called if a session existed to start with. Allows
+	 * subclasses to plug in additional behaviour. *
+	 * <p>
+	 * The default implementation of this method publishes a
+	 * {@link SessionFixationProtectionEvent} to notify the application that the session
+	 * ID has changed. If you override this method and still wish these events to be
+	 * published, you should call {@code super.onSessionChange()} within your overriding
+	 * method.
+	 *
+	 * @param originalSessionId the original session identifier
+	 * @param newSession the newly created session
+	 * @param auth the token for the newly authenticated principal
+	 */
+	protected void onSessionChange(String originalSessionId, HttpSession newSession,
+			Authentication auth) {
+		applicationEventPublisher.publishEvent(new SessionFixationProtectionEvent(auth,
+				originalSessionId, newSession.getId()));
+	}
 
-    /**
-     * Sets the {@link ApplicationEventPublisher} to use for submitting
-     * {@link SessionFixationProtectionEvent}. The default is to not submit the
-     * {@link SessionFixationProtectionEvent}.
-     *
-     * @param applicationEventPublisher
-     *            the {@link ApplicationEventPublisher}. Cannot be null.
-     */
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        Assert.notNull(applicationEventPublisher, "applicationEventPublisher cannot be null");
-        this.applicationEventPublisher = applicationEventPublisher;
-    }
+	/**
+	 * Sets the {@link ApplicationEventPublisher} to use for submitting
+	 * {@link SessionFixationProtectionEvent}. The default is to not submit the
+	 * {@link SessionFixationProtectionEvent}.
+	 *
+	 * @param applicationEventPublisher the {@link ApplicationEventPublisher}. Cannot be
+	 * null.
+	 */
+	public void setApplicationEventPublisher(
+			ApplicationEventPublisher applicationEventPublisher) {
+		Assert.notNull(applicationEventPublisher,
+				"applicationEventPublisher cannot be null");
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
 
-    public void setAlwaysCreateSession(boolean alwaysCreateSession) {
-        this.alwaysCreateSession = alwaysCreateSession;
-    }
+	public void setAlwaysCreateSession(boolean alwaysCreateSession) {
+		this.alwaysCreateSession = alwaysCreateSession;
+	}
 
-    protected static final class NullEventPublisher implements
-            ApplicationEventPublisher {
-        public void publishEvent(ApplicationEvent event) {
-        }
-    }
+	protected static final class NullEventPublisher implements ApplicationEventPublisher {
+		public void publishEvent(ApplicationEvent event) {
+		}
+	}
 
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
index cf8810d244..6b08a9a1c9 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
@@ -23,29 +23,36 @@ import javax.servlet.http.HttpSession;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Uses {@link HttpServletRequest#changeSessionId()} to protect against session
- * fixation attacks. This is the default implementation for Servlet 3.1+.
+ * Uses {@link HttpServletRequest#changeSessionId()} to protect against session fixation
+ * attacks. This is the default implementation for Servlet 3.1+.
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class ChangeSessionIdAuthenticationStrategy extends AbstractSessionFixationProtectionStrategy {
-    private final Method changeSessionIdMethod;
+public final class ChangeSessionIdAuthenticationStrategy extends
+		AbstractSessionFixationProtectionStrategy {
+	private final Method changeSessionIdMethod;
 
-    public ChangeSessionIdAuthenticationStrategy() {
-        Method changeSessionIdMethod = ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId");
-        if(changeSessionIdMethod == null) {
-            throw new IllegalStateException("HttpServletRequest.changeSessionId is undefined. Are you using a Servlet 3.1+ environment?");
-        }
-        this.changeSessionIdMethod = changeSessionIdMethod;
-    }
+	public ChangeSessionIdAuthenticationStrategy() {
+		Method changeSessionIdMethod = ReflectionUtils.findMethod(
+				HttpServletRequest.class, "changeSessionId");
+		if (changeSessionIdMethod == null) {
+			throw new IllegalStateException(
+					"HttpServletRequest.changeSessionId is undefined. Are you using a Servlet 3.1+ environment?");
+		}
+		this.changeSessionIdMethod = changeSessionIdMethod;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.authentication.session.AbstractSessionFixationProtectionStrategy#applySessionFixation(javax.servlet.http.HttpServletRequest)
-     */
-    @Override
-    HttpSession applySessionFixation(HttpServletRequest request) {
-        ReflectionUtils.invokeMethod(changeSessionIdMethod, request);
-        return request.getSession();
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.web.authentication.session.
+	 * AbstractSessionFixationProtectionStrategy
+	 * #applySessionFixation(javax.servlet.http.HttpServletRequest)
+	 */
+	@Override
+	HttpSession applySessionFixation(HttpServletRequest request) {
+		ReflectionUtils.invokeMethod(changeSessionIdMethod, request);
+		return request.getSession();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java
index 37ef7ffeaf..687f7d579b 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java
@@ -30,62 +30,68 @@ import org.springframework.util.Assert;
 /**
  * A {@link SessionAuthenticationStrategy} that accepts multiple
  * {@link SessionAuthenticationStrategy} implementations to delegate to. Each
- * {@link SessionAuthenticationStrategy} is invoked in turn. The invocations are
- * short circuited if any exception, (i.e. SessionAuthenticationException) is
- * thrown.
+ * {@link SessionAuthenticationStrategy} is invoked in turn. The invocations are short
+ * circuited if any exception, (i.e. SessionAuthenticationException) is thrown.
  *
  * <p>
  * Typical usage would include having the following delegates (in this order)
  * </p>
  *
  * <ul>
- * <li> {@link ConcurrentSessionControlAuthenticationStrategy} - verifies that a
- * user is allowed to authenticate (i.e. they have not already logged into the
- * application.</li>
- * <li> {@link SessionFixationProtectionStrategy} - If session fixation is
- * desired, {@link SessionFixationProtectionStrategy} should be after
+ * <li> {@link ConcurrentSessionControlAuthenticationStrategy} - verifies that a user is
+ * allowed to authenticate (i.e. they have not already logged into the application.</li>
+ * <li> {@link SessionFixationProtectionStrategy} - If session fixation is desired,
+ * {@link SessionFixationProtectionStrategy} should be after
  * {@link ConcurrentSessionControlAuthenticationStrategy} to prevent unnecessary
  * {@link HttpSession} creation if the
- * {@link ConcurrentSessionControlAuthenticationStrategy} rejects
- * authentication.</li>
- * <li> {@link RegisterSessionAuthenticationStrategy} - It is important this is
- * after {@link SessionFixationProtectionStrategy} so that the correct session
- * is registered.</li>
+ * {@link ConcurrentSessionControlAuthenticationStrategy} rejects authentication.</li>
+ * <li> {@link RegisterSessionAuthenticationStrategy} - It is important this is after
+ * {@link SessionFixationProtectionStrategy} so that the correct session is registered.</li>
  * </ul>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public class CompositeSessionAuthenticationStrategy implements SessionAuthenticationStrategy {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final List<SessionAuthenticationStrategy> delegateStrategies;
+public class CompositeSessionAuthenticationStrategy implements
+		SessionAuthenticationStrategy {
+	private final Log logger = LogFactory.getLog(getClass());
+	private final List<SessionAuthenticationStrategy> delegateStrategies;
 
-    public CompositeSessionAuthenticationStrategy(List<SessionAuthenticationStrategy> delegateStrategies) {
-        Assert.notEmpty(delegateStrategies, "delegateStrategies cannot be null or empty");
-        for(SessionAuthenticationStrategy strategy : delegateStrategies) {
-            if(strategy == null) {
-                throw new IllegalArgumentException("delegateStrategies cannot contain null entires. Got " + delegateStrategies);
-            }
-        }
-        this.delegateStrategies = delegateStrategies;
-    }
+	public CompositeSessionAuthenticationStrategy(
+			List<SessionAuthenticationStrategy> delegateStrategies) {
+		Assert.notEmpty(delegateStrategies, "delegateStrategies cannot be null or empty");
+		for (SessionAuthenticationStrategy strategy : delegateStrategies) {
+			if (strategy == null) {
+				throw new IllegalArgumentException(
+						"delegateStrategies cannot contain null entires. Got "
+								+ delegateStrategies);
+			}
+		}
+		this.delegateStrategies = delegateStrategies;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.authentication.session.SessionAuthenticationStrategy#onAuthentication(org.springframework.security.core.Authentication, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void onAuthentication(Authentication authentication,
-            HttpServletRequest request, HttpServletResponse response)
-            throws SessionAuthenticationException {
-        for(SessionAuthenticationStrategy delegate : delegateStrategies) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Delegating to " + delegate);
-            }
-            delegate.onAuthentication(authentication, request, response);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.authentication.session.SessionAuthenticationStrategy
+	 * #onAuthentication(org.springframework.security.core.Authentication,
+	 * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response)
+			throws SessionAuthenticationException {
+		for (SessionAuthenticationStrategy delegate : delegateStrategies) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Delegating to " + delegate);
+			}
+			delegate.onAuthentication(authentication, request, response);
+		}
+	}
 
-    @Override
-    public String toString() {
-        return getClass().getName() + " [delegateStrategies = " + delegateStrategies + "]";
-    }
+	@Override
+	public String toString() {
+		return getClass().getName() + " [delegateStrategies = " + delegateStrategies
+				+ "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java
index 6314d69f09..60daa0b1bf 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategy.java
@@ -23,23 +23,22 @@ import org.springframework.util.Assert;
  * Strategy which handles concurrent session-control.
  *
  * <p>
- * When invoked following an authentication, it will check whether the user in
- * question should be allowed to proceed, by comparing the number of sessions
- * they already have active with the configured <tt>maximumSessions</tt> value.
- * The {@link SessionRegistry} is used as the source of data on authenticated
- * users and session data.
+ * When invoked following an authentication, it will check whether the user in question
+ * should be allowed to proceed, by comparing the number of sessions they already have
+ * active with the configured <tt>maximumSessions</tt> value. The {@link SessionRegistry}
+ * is used as the source of data on authenticated users and session data.
  * </p>
  * <p>
- * If a user has reached the maximum number of permitted sessions, the behaviour
- * depends on the <tt>exceptionIfMaxExceeded</tt> property. The default
- * behaviour is to expired the least recently used session, which will be
- * invalidated by the {@link ConcurrentSessionFilter} if accessed again. If
- * <tt>exceptionIfMaxExceeded</tt> is set to <tt>true</tt>, however, the user
- * will be prevented from starting a new authenticated session.
+ * If a user has reached the maximum number of permitted sessions, the behaviour depends
+ * on the <tt>exceptionIfMaxExceeded</tt> property. The default behaviour is to expired
+ * the least recently used session, which will be invalidated by the
+ * {@link ConcurrentSessionFilter} if accessed again. If <tt>exceptionIfMaxExceeded</tt>
+ * is set to <tt>true</tt>, however, the user will be prevented from starting a new
+ * authenticated session.
  * </p>
  * <p>
- * This strategy can be injected into both the {@link SessionManagementFilter}
- * and instances of {@link AbstractAuthenticationProcessingFilter} (typically
+ * This strategy can be injected into both the {@link SessionManagementFilter} and
+ * instances of {@link AbstractAuthenticationProcessingFilter} (typically
  * {@link UsernamePasswordAuthenticationFilter}), but is typically combined with
  * {@link RegisterSessionAuthenticationStrategy} using
  * {@link CompositeSessionAuthenticationStrategy}.
@@ -51,133 +50,145 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  * @since 3.2
  */
-public class ConcurrentSessionControlAuthenticationStrategy implements MessageSourceAware, SessionAuthenticationStrategy {
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private final SessionRegistry sessionRegistry;
-    private boolean exceptionIfMaximumExceeded = false;
-    private int maximumSessions = 1;
+public class ConcurrentSessionControlAuthenticationStrategy implements
+		MessageSourceAware, SessionAuthenticationStrategy {
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private final SessionRegistry sessionRegistry;
+	private boolean exceptionIfMaximumExceeded = false;
+	private int maximumSessions = 1;
 
-    /**
-     * @param sessionRegistry the session registry which should be updated when the authenticated session is changed.
-     */
-    public ConcurrentSessionControlAuthenticationStrategy(SessionRegistry sessionRegistry) {
-        Assert.notNull(sessionRegistry, "The sessionRegistry cannot be null");
-        this.sessionRegistry = sessionRegistry;
-    }
+	/**
+	 * @param sessionRegistry the session registry which should be updated when the
+	 * authenticated session is changed.
+	 */
+	public ConcurrentSessionControlAuthenticationStrategy(SessionRegistry sessionRegistry) {
+		Assert.notNull(sessionRegistry, "The sessionRegistry cannot be null");
+		this.sessionRegistry = sessionRegistry;
+	}
 
-    /**
-     * In addition to the steps from the superclass, the sessionRegistry will be updated with the new session information.
-     */
-    public void onAuthentication(Authentication authentication, HttpServletRequest request,
-            HttpServletResponse response) {
+	/**
+	 * In addition to the steps from the superclass, the sessionRegistry will be updated
+	 * with the new session information.
+	 */
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response) {
 
-        final List<SessionInformation> sessions = sessionRegistry.getAllSessions(authentication.getPrincipal(), false);
+		final List<SessionInformation> sessions = sessionRegistry.getAllSessions(
+				authentication.getPrincipal(), false);
 
-        int sessionCount = sessions.size();
-        int allowedSessions = getMaximumSessionsForThisUser(authentication);
+		int sessionCount = sessions.size();
+		int allowedSessions = getMaximumSessionsForThisUser(authentication);
 
-        if (sessionCount < allowedSessions) {
-            // They haven't got too many login sessions running at present
-            return;
-        }
+		if (sessionCount < allowedSessions) {
+			// They haven't got too many login sessions running at present
+			return;
+		}
 
-        if (allowedSessions == -1) {
-            // We permit unlimited logins
-            return;
-        }
+		if (allowedSessions == -1) {
+			// We permit unlimited logins
+			return;
+		}
 
-        if (sessionCount == allowedSessions) {
-            HttpSession session = request.getSession(false);
+		if (sessionCount == allowedSessions) {
+			HttpSession session = request.getSession(false);
 
-            if (session != null) {
-                // Only permit it though if this request is associated with one of the already registered sessions
-                for (SessionInformation si : sessions) {
-                    if (si.getSessionId().equals(session.getId())) {
-                        return;
-                    }
-                }
-            }
-            // If the session is null, a new one will be created by the parent class, exceeding the allowed number
-        }
+			if (session != null) {
+				// Only permit it though if this request is associated with one of the
+				// already registered sessions
+				for (SessionInformation si : sessions) {
+					if (si.getSessionId().equals(session.getId())) {
+						return;
+					}
+				}
+			}
+			// If the session is null, a new one will be created by the parent class,
+			// exceeding the allowed number
+		}
 
-        allowableSessionsExceeded(sessions, allowedSessions, sessionRegistry);
-    }
+		allowableSessionsExceeded(sessions, allowedSessions, sessionRegistry);
+	}
 
-    /**
-     * Method intended for use by subclasses to override the maximum number of sessions that are permitted for
-     * a particular authentication. The default implementation simply returns the <code>maximumSessions</code> value
-     * for the bean.
-     *
-     * @param authentication to determine the maximum sessions for
-     *
-     * @return either -1 meaning unlimited, or a positive integer to limit (never zero)
-     */
-    protected int getMaximumSessionsForThisUser(Authentication authentication) {
-        return maximumSessions;
-    }
+	/**
+	 * Method intended for use by subclasses to override the maximum number of sessions
+	 * that are permitted for a particular authentication. The default implementation
+	 * simply returns the <code>maximumSessions</code> value for the bean.
+	 *
+	 * @param authentication to determine the maximum sessions for
+	 *
+	 * @return either -1 meaning unlimited, or a positive integer to limit (never zero)
+	 */
+	protected int getMaximumSessionsForThisUser(Authentication authentication) {
+		return maximumSessions;
+	}
 
-    /**
-     * Allows subclasses to customise behaviour when too many sessions are detected.
-     *
-     * @param sessions either <code>null</code> or all unexpired sessions associated with the principal
-     * @param allowableSessions the number of concurrent sessions the user is allowed to have
-     * @param registry an instance of the <code>SessionRegistry</code> for subclass use
-     *
-     */
-    protected void allowableSessionsExceeded(List<SessionInformation> sessions, int allowableSessions,
-            SessionRegistry registry) throws SessionAuthenticationException {
-        if (exceptionIfMaximumExceeded || (sessions == null)) {
-            throw new SessionAuthenticationException(messages.getMessage("ConcurrentSessionControlAuthenticationStrategy.exceededAllowed",
-                    new Object[] {Integer.valueOf(allowableSessions)},
-                    "Maximum sessions of {0} for this principal exceeded"));
-        }
+	/**
+	 * Allows subclasses to customise behaviour when too many sessions are detected.
+	 *
+	 * @param sessions either <code>null</code> or all unexpired sessions associated with
+	 * the principal
+	 * @param allowableSessions the number of concurrent sessions the user is allowed to
+	 * have
+	 * @param registry an instance of the <code>SessionRegistry</code> for subclass use
+	 *
+	 */
+	protected void allowableSessionsExceeded(List<SessionInformation> sessions,
+			int allowableSessions, SessionRegistry registry)
+			throws SessionAuthenticationException {
+		if (exceptionIfMaximumExceeded || (sessions == null)) {
+			throw new SessionAuthenticationException(messages.getMessage(
+					"ConcurrentSessionControlAuthenticationStrategy.exceededAllowed",
+					new Object[] { Integer.valueOf(allowableSessions) },
+					"Maximum sessions of {0} for this principal exceeded"));
+		}
 
-        // Determine least recently used session, and mark it for invalidation
-        SessionInformation leastRecentlyUsed = null;
+		// Determine least recently used session, and mark it for invalidation
+		SessionInformation leastRecentlyUsed = null;
 
-        for (SessionInformation session : sessions) {
-            if ((leastRecentlyUsed == null)
-                    || session.getLastRequest().before(leastRecentlyUsed.getLastRequest())) {
-                leastRecentlyUsed = session;
-            }
-        }
+		for (SessionInformation session : sessions) {
+			if ((leastRecentlyUsed == null)
+					|| session.getLastRequest()
+							.before(leastRecentlyUsed.getLastRequest())) {
+				leastRecentlyUsed = session;
+			}
+		}
 
-        leastRecentlyUsed.expireNow();
-    }
+		leastRecentlyUsed.expireNow();
+	}
 
-    /**
-     * Sets the <tt>exceptionIfMaximumExceeded</tt> property, which determines
-     * whether the user should be prevented from opening more sessions than
-     * allowed. If set to <tt>true</tt>, a
-     * <tt>SessionAuthenticationException</tt> will be raised which means the
-     * user authenticating will be prevented from authenticating. if set to
-     * <tt>false</tt>, the user that has already authenticated will be forcibly
-     * logged out.
-     *
-     * @param exceptionIfMaximumExceeded
-     *            defaults to <tt>false</tt>.
-     */
-    public void setExceptionIfMaximumExceeded(boolean exceptionIfMaximumExceeded) {
-        this.exceptionIfMaximumExceeded = exceptionIfMaximumExceeded;
-    }
+	/**
+	 * Sets the <tt>exceptionIfMaximumExceeded</tt> property, which determines whether the
+	 * user should be prevented from opening more sessions than allowed. If set to
+	 * <tt>true</tt>, a <tt>SessionAuthenticationException</tt> will be raised which means
+	 * the user authenticating will be prevented from authenticating. if set to
+	 * <tt>false</tt>, the user that has already authenticated will be forcibly logged
+	 * out.
+	 *
+	 * @param exceptionIfMaximumExceeded defaults to <tt>false</tt>.
+	 */
+	public void setExceptionIfMaximumExceeded(boolean exceptionIfMaximumExceeded) {
+		this.exceptionIfMaximumExceeded = exceptionIfMaximumExceeded;
+	}
 
-    /**
-     * Sets the <tt>maxSessions</tt> property. The default value is 1. Use -1 for unlimited sessions.
-     *
-     * @param maximumSessions the maximimum number of permitted sessions a user can have open simultaneously.
-     */
-    public void setMaximumSessions(int maximumSessions) {
-        Assert.isTrue(maximumSessions != 0,
-            "MaximumLogins must be either -1 to allow unlimited logins, or a positive integer to specify a maximum");
-        this.maximumSessions = maximumSessions;
-    }
+	/**
+	 * Sets the <tt>maxSessions</tt> property. The default value is 1. Use -1 for
+	 * unlimited sessions.
+	 *
+	 * @param maximumSessions the maximimum number of permitted sessions a user can have
+	 * open simultaneously.
+	 */
+	public void setMaximumSessions(int maximumSessions) {
+		Assert.isTrue(
+				maximumSessions != 0,
+				"MaximumLogins must be either -1 to allow unlimited logins, or a positive integer to specify a maximum");
+		this.maximumSessions = maximumSessions;
+	}
 
-    /**
-     * Sets the {@link MessageSource} used for reporting errors back to the user
-     * when the user has exceeded the maximum number of authentications.
-     */
-    public void setMessageSource(MessageSource messageSource) {
-        Assert.notNull(messageSource, "messageSource cannot be null");
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
+	/**
+	 * Sets the {@link MessageSource} used for reporting errors back to the user when the
+	 * user has exceeded the maximum number of authentications.
+	 */
+	public void setMessageSource(MessageSource messageSource) {
+		Assert.notNull(messageSource, "messageSource cannot be null");
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/NullAuthenticatedSessionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/NullAuthenticatedSessionStrategy.java
index c3524aae00..10171981bf 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/NullAuthenticatedSessionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/NullAuthenticatedSessionStrategy.java
@@ -10,9 +10,10 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  * @since 3.0
  */
-public final class NullAuthenticatedSessionStrategy implements SessionAuthenticationStrategy {
+public final class NullAuthenticatedSessionStrategy implements
+		SessionAuthenticationStrategy {
 
-    public void onAuthentication(Authentication authentication, HttpServletRequest request,
-            HttpServletResponse response) {
-    }
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response) {
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
index 74fecf9262..9febfde5f4 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
@@ -9,20 +9,20 @@ import org.springframework.security.web.session.HttpSessionEventPublisher;
 import org.springframework.util.Assert;
 
 /**
- * Strategy used to register a user with the {@link SessionRegistry} after
- * successful {@link Authentication}.
+ * Strategy used to register a user with the {@link SessionRegistry} after successful
+ * {@link Authentication}.
  *
  * <p>
- * {@link RegisterSessionAuthenticationStrategy} is typically used in
- * combination with {@link CompositeSessionAuthenticationStrategy} and
- * {@link ConcurrentSessionControlAuthenticationStrategy}, but can be used on
- * its own if tracking of sessions is desired but no need to control
- * concurrency.</P
+ * {@link RegisterSessionAuthenticationStrategy} is typically used in combination with
+ * {@link CompositeSessionAuthenticationStrategy} and
+ * {@link ConcurrentSessionControlAuthenticationStrategy}, but can be used on its own if
+ * tracking of sessions is desired but no need to control concurrency.</P
  *
  * <p>
- * NOTE: When using a {@link SessionRegistry} it is important that all sessions
- * (including timed out sessions) are removed. This is typically done by adding
- * {@link HttpSessionEventPublisher}.</p>
+ * NOTE: When using a {@link SessionRegistry} it is important that all sessions (including
+ * timed out sessions) are removed. This is typically done by adding
+ * {@link HttpSessionEventPublisher}.
+ * </p>
  *
  * @see CompositeSessionAuthenticationStrategy
  *
@@ -30,22 +30,26 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  * @since 3.2
  */
-public class RegisterSessionAuthenticationStrategy implements SessionAuthenticationStrategy {
-    private final SessionRegistry sessionRegistry;
+public class RegisterSessionAuthenticationStrategy implements
+		SessionAuthenticationStrategy {
+	private final SessionRegistry sessionRegistry;
 
-    /**
-     * @param sessionRegistry the session registry which should be updated when the authenticated session is changed.
-     */
-    public RegisterSessionAuthenticationStrategy(SessionRegistry sessionRegistry) {
-        Assert.notNull(sessionRegistry, "The sessionRegistry cannot be null");
-        this.sessionRegistry = sessionRegistry;
-    }
+	/**
+	 * @param sessionRegistry the session registry which should be updated when the
+	 * authenticated session is changed.
+	 */
+	public RegisterSessionAuthenticationStrategy(SessionRegistry sessionRegistry) {
+		Assert.notNull(sessionRegistry, "The sessionRegistry cannot be null");
+		this.sessionRegistry = sessionRegistry;
+	}
 
-    /**
-     * In addition to the steps from the superclass, the sessionRegistry will be updated with the new session information.
-     */
-    public void onAuthentication(Authentication authentication, HttpServletRequest request,
-            HttpServletResponse response) {
-        sessionRegistry.registerNewSession(request.getSession().getId(), authentication.getPrincipal());
-    }
+	/**
+	 * In addition to the steps from the superclass, the sessionRegistry will be updated
+	 * with the new session information.
+	 */
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response) {
+		sessionRegistry.registerNewSession(request.getSession().getId(),
+				authentication.getPrincipal());
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationException.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationException.java
index a4989e4b11..72de87446b 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationException.java
@@ -3,17 +3,17 @@ package org.springframework.security.web.authentication.session;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * Thrown by an <tt>SessionAuthenticationStrategy</tt> to indicate that an authentication object is not valid for
- * the current session, typically because the same user has exceeded the number of sessions they are allowed to have
- * concurrently.
+ * Thrown by an <tt>SessionAuthenticationStrategy</tt> to indicate that an authentication
+ * object is not valid for the current session, typically because the same user has
+ * exceeded the number of sessions they are allowed to have concurrently.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class SessionAuthenticationException extends AuthenticationException {
 
-    public SessionAuthenticationException(String msg) {
-        super(msg);
-    }
+	public SessionAuthenticationException(String msg) {
+		super(msg);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationStrategy.java
index f3b4d56e4e..c555fc5e33 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionAuthenticationStrategy.java
@@ -6,23 +6,25 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.Authentication;
 
 /**
- * Allows pluggable support for HttpSession-related behaviour when an authentication occurs.
+ * Allows pluggable support for HttpSession-related behaviour when an authentication
+ * occurs.
  * <p>
- * Typical use would be to make sure a session exists or to change the session Id to guard against session-fixation
- * attacks.
+ * Typical use would be to make sure a session exists or to change the session Id to guard
+ * against session-fixation attacks.
  *
  * @author Luke Taylor
  * @since
  */
 public interface SessionAuthenticationStrategy {
 
-    /**
-     * Performs Http session-related functionality when a new authentication occurs.
-     *
-     * @throws SessionAuthenticationException if it is decided that the authentication is not allowed for the session.
-     *          This will typically be because the user has too many sessions open at once.
-     */
-    void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response)
-        throws SessionAuthenticationException;
+	/**
+	 * Performs Http session-related functionality when a new authentication occurs.
+	 *
+	 * @throws SessionAuthenticationException if it is decided that the authentication is
+	 * not allowed for the session. This will typically be because the user has too many
+	 * sessions open at once.
+	 */
+	void onAuthentication(Authentication authentication, HttpServletRequest request,
+			HttpServletResponse response) throws SessionAuthenticationException;
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java
index 085f6d18a7..08338d3940 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java
@@ -28,46 +28,50 @@ import org.springframework.util.Assert;
  * @see SessionFixationProtectionStrategy
  */
 public class SessionFixationProtectionEvent extends AbstractAuthenticationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final String oldSessionId;
+	private final String oldSessionId;
 
-    private final String newSessionId;
+	private final String newSessionId;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Constructs a new session fixation protection event.
-     *
-     * @param authentication The authentication object
-     * @param oldSessionId The old session ID before it was changed
-     * @param newSessionId The new session ID after it was changed
-     */
-    public SessionFixationProtectionEvent(Authentication authentication, String oldSessionId, String newSessionId) {
-        super(authentication);
-        Assert.hasLength(oldSessionId);
-        Assert.hasLength(newSessionId);
-        this.oldSessionId = oldSessionId;
-        this.newSessionId = newSessionId;
-    }
+	/**
+	 * Constructs a new session fixation protection event.
+	 *
+	 * @param authentication The authentication object
+	 * @param oldSessionId The old session ID before it was changed
+	 * @param newSessionId The new session ID after it was changed
+	 */
+	public SessionFixationProtectionEvent(Authentication authentication,
+			String oldSessionId, String newSessionId) {
+		super(authentication);
+		Assert.hasLength(oldSessionId);
+		Assert.hasLength(newSessionId);
+		this.oldSessionId = oldSessionId;
+		this.newSessionId = newSessionId;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Getter for the session ID before it was changed.
-     *
-     * @return the old session ID.
-     */
-    public String getOldSessionId() {
-        return this.oldSessionId;
-    }
+	/**
+	 * Getter for the session ID before it was changed.
+	 *
+	 * @return the old session ID.
+	 */
+	public String getOldSessionId() {
+		return this.oldSessionId;
+	}
 
-    /**
-     * Getter for the session ID after it was changed.
-     *
-     * @return the new session ID.
-     */
-    public String getNewSessionId() {
-        return this.newSessionId;
-    }
+	/**
+	 * Getter for the session ID after it was changed.
+	 *
+	 * @return the new session ID.
+	 */
+	public String getNewSessionId() {
+		return this.newSessionId;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
index 4d38312c3f..78526f4450 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
@@ -27,136 +27,149 @@ import javax.servlet.http.HttpSession;
 import org.springframework.util.Assert;
 
 /**
- * The default implementation of {@link SessionAuthenticationStrategy} when using < Servlet 3.1.
+ * The default implementation of {@link SessionAuthenticationStrategy} when using <
+ * Servlet 3.1.
  * <p>
- * Creates a new session for the newly authenticated user if they already have a session (as a defence against
- * session-fixation protection attacks), and copies their session attributes across to the new session.
- * The copying of the attributes can be disabled by setting {@code migrateSessionAttributes} to {@code false}
- * (note that even in this case, internal Spring Security attributes will still be migrated to the new session).
+ * Creates a new session for the newly authenticated user if they already have a session
+ * (as a defence against session-fixation protection attacks), and copies their session
+ * attributes across to the new session. The copying of the attributes can be disabled by
+ * setting {@code migrateSessionAttributes} to {@code false} (note that even in this case,
+ * internal Spring Security attributes will still be migrated to the new session).
  * <p>
- * This approach will only be effective if your servlet container always assigns a new session Id when a session is
- * invalidated and a new session created by calling {@link HttpServletRequest#getSession()}.
+ * This approach will only be effective if your servlet container always assigns a new
+ * session Id when a session is invalidated and a new session created by calling
+ * {@link HttpServletRequest#getSession()}.
  * <p>
  * <h3>Issues with {@code HttpSessionBindingListener}</h3>
  * <p>
- * The migration of existing attributes to the newly-created session may cause problems if any of the objects
- * implement the {@code HttpSessionBindingListener} interface in a way which makes assumptions about the life-cycle of
- * the object. An example is the use of Spring session-scoped beans, where the initial removal of the bean from the
- * session will cause the {@code DisposableBean} interface to be invoked, in the assumption that the bean is no longer
- * required.
+ * The migration of existing attributes to the newly-created session may cause problems if
+ * any of the objects implement the {@code HttpSessionBindingListener} interface in a way
+ * which makes assumptions about the life-cycle of the object. An example is the use of
+ * Spring session-scoped beans, where the initial removal of the bean from the session
+ * will cause the {@code DisposableBean} interface to be invoked, in the assumption that
+ * the bean is no longer required.
  * <p>
- * We'd recommend that you take account of this when designing your application and do not store attributes which
- * may not function correctly when they are removed and then placed back in the session. Alternatively, you should
- * customize the {@code SessionAuthenticationStrategy} to deal with the issue in an application-specific way.
+ * We'd recommend that you take account of this when designing your application and do not
+ * store attributes which may not function correctly when they are removed and then placed
+ * back in the session. Alternatively, you should customize the
+ * {@code SessionAuthenticationStrategy} to deal with the issue in an application-specific
+ * way.
  *
  * @author Luke Taylor
  * @since 3.0
  */
-public class SessionFixationProtectionStrategy extends AbstractSessionFixationProtectionStrategy {
-    /**
-     * Indicates that the session attributes of an existing session
-     * should be migrated to the new session. Defaults to <code>true</code>.
-     */
-    boolean migrateSessionAttributes = true;
+public class SessionFixationProtectionStrategy extends
+		AbstractSessionFixationProtectionStrategy {
+	/**
+	 * Indicates that the session attributes of an existing session should be migrated to
+	 * the new session. Defaults to <code>true</code>.
+	 */
+	boolean migrateSessionAttributes = true;
 
-    /**
-     * In the case where the attributes will not be migrated, this field allows a list of named attributes
-     * which should <em>not</em> be discarded.
-     */
-    private List<String> retainedAttributes = null;
+	/**
+	 * In the case where the attributes will not be migrated, this field allows a list of
+	 * named attributes which should <em>not</em> be discarded.
+	 */
+	private List<String> retainedAttributes = null;
 
-    /**
-     * Called to extract the existing attributes from the session, prior to invalidating it. If
-     * {@code migrateAttributes} is set to {@code false}, only Spring Security attributes will be retained.
-     * All application attributes will be discarded.
-     * <p>
-     * You can override this method to control exactly what is transferred to the new session.
-     *
-     * @param session the session from which the attributes should be extracted
-     * @return the map of session attributes which should be transferred to the new session
-     */
-    protected Map<String, Object> extractAttributes(HttpSession session) {
-        return createMigratedAttributeMap(session);
-    }
+	/**
+	 * Called to extract the existing attributes from the session, prior to invalidating
+	 * it. If {@code migrateAttributes} is set to {@code false}, only Spring Security
+	 * attributes will be retained. All application attributes will be discarded.
+	 * <p>
+	 * You can override this method to control exactly what is transferred to the new
+	 * session.
+	 *
+	 * @param session the session from which the attributes should be extracted
+	 * @return the map of session attributes which should be transferred to the new
+	 * session
+	 */
+	protected Map<String, Object> extractAttributes(HttpSession session) {
+		return createMigratedAttributeMap(session);
+	}
 
-    @Override
-    final HttpSession applySessionFixation(HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        String originalSessionId = session.getId();
-        if (logger.isDebugEnabled()) {
-            logger.debug("Invalidating session with Id '" + originalSessionId +"' " + (migrateSessionAttributes ?
-                    "and" : "without") +  " migrating attributes.");
-        }
+	@Override
+	final HttpSession applySessionFixation(HttpServletRequest request) {
+		HttpSession session = request.getSession();
+		String originalSessionId = session.getId();
+		if (logger.isDebugEnabled()) {
+			logger.debug("Invalidating session with Id '" + originalSessionId + "' "
+					+ (migrateSessionAttributes ? "and" : "without")
+					+ " migrating attributes.");
+		}
 
-        Map<String, Object> attributesToMigrate = extractAttributes(session);
+		Map<String, Object> attributesToMigrate = extractAttributes(session);
 
-        session.invalidate();
-        session = request.getSession(true); // we now have a new session
+		session.invalidate();
+		session = request.getSession(true); // we now have a new session
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Started new session: " + session.getId());
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Started new session: " + session.getId());
+		}
 
-        transferAttributes(attributesToMigrate, session);
-        return session;
-    }
+		transferAttributes(attributesToMigrate, session);
+		return session;
+	}
 
-    /**
-     * @param attributes the attributes which were extracted from the original session by {@code extractAttributes}
-     * @param newSession the newly created session
-     */
-    void transferAttributes(Map<String, Object> attributes, HttpSession newSession) {
-        if (attributes != null) {
-            for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-                newSession.setAttribute(entry.getKey(), entry.getValue());
-            }
-        }
-    }
+	/**
+	 * @param attributes the attributes which were extracted from the original session by
+	 * {@code extractAttributes}
+	 * @param newSession the newly created session
+	 */
+	void transferAttributes(Map<String, Object> attributes, HttpSession newSession) {
+		if (attributes != null) {
+			for (Map.Entry<String, Object> entry : attributes.entrySet()) {
+				newSession.setAttribute(entry.getKey(), entry.getValue());
+			}
+		}
+	}
 
-    @SuppressWarnings("unchecked")
-    private HashMap<String, Object> createMigratedAttributeMap(HttpSession session) {
-        HashMap<String, Object> attributesToMigrate = null;
+	@SuppressWarnings("unchecked")
+	private HashMap<String, Object> createMigratedAttributeMap(HttpSession session) {
+		HashMap<String, Object> attributesToMigrate = null;
 
-        if (migrateSessionAttributes || retainedAttributes == null) {
-            attributesToMigrate = new HashMap<String, Object>();
+		if (migrateSessionAttributes || retainedAttributes == null) {
+			attributesToMigrate = new HashMap<String, Object>();
 
-            Enumeration enumer = session.getAttributeNames();
+			Enumeration enumer = session.getAttributeNames();
 
-            while (enumer.hasMoreElements()) {
-                String key = (String) enumer.nextElement();
-                if (!migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) {
-                    // Only retain Spring Security attributes
-                    continue;
-                }
-                attributesToMigrate.put(key, session.getAttribute(key));
-            }
-        } else {
-            // Only retain the attributes which have been specified in the retainAttributes list
-            if (!retainedAttributes.isEmpty()) {
-                attributesToMigrate = new HashMap<String, Object>();
-                for (String name : retainedAttributes) {
-                    Object value = session.getAttribute(name);
+			while (enumer.hasMoreElements()) {
+				String key = (String) enumer.nextElement();
+				if (!migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) {
+					// Only retain Spring Security attributes
+					continue;
+				}
+				attributesToMigrate.put(key, session.getAttribute(key));
+			}
+		}
+		else {
+			// Only retain the attributes which have been specified in the
+			// retainAttributes list
+			if (!retainedAttributes.isEmpty()) {
+				attributesToMigrate = new HashMap<String, Object>();
+				for (String name : retainedAttributes) {
+					Object value = session.getAttribute(name);
 
-                    if (value != null) {
-                        attributesToMigrate.put(name, value);
-                    }
-                }
-            }
-        }
-        return attributesToMigrate;
-    }
+					if (value != null) {
+						attributesToMigrate.put(name, value);
+					}
+				}
+			}
+		}
+		return attributesToMigrate;
+	}
 
-    /**
-     * Defines whether attributes should be migrated to a new session or not. Has no effect if you
-     * override the {@code extractAttributes} method.
-     * <p>
-     * Attributes used by Spring Security (to store cached requests, for example) will still be retained by default,
-     * even if you set this value to {@code false}.
-     *
-     * @param migrateSessionAttributes whether the attributes from the session should be transferred to the new,
-     *         authenticated session.
-     */
-    public void setMigrateSessionAttributes(boolean migrateSessionAttributes) {
-        this.migrateSessionAttributes = migrateSessionAttributes;
-    }
+	/**
+	 * Defines whether attributes should be migrated to a new session or not. Has no
+	 * effect if you override the {@code extractAttributes} method.
+	 * <p>
+	 * Attributes used by Spring Security (to store cached requests, for example) will
+	 * still be retained by default, even if you set this value to {@code false}.
+	 *
+	 * @param migrateSessionAttributes whether the attributes from the session should be
+	 * transferred to the new, authenticated session.
+	 */
+	public void setMigrateSessionAttributes(boolean migrateSessionAttributes) {
+		this.migrateSessionAttributes = migrateSessionAttributes;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
index ab68b457f0..1e5f3744a7 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/AuthenticationSwitchUserEvent.java
@@ -15,38 +15,40 @@
 
 package org.springframework.security.web.authentication.switchuser;
 
-
 import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 
-
 /**
  * Application event which indicates that a user context switch.
  *
  * @author Mark St.Godard
  */
 public class AuthenticationSwitchUserEvent extends AbstractAuthenticationEvent {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final UserDetails targetUser;
+	private final UserDetails targetUser;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Switch user context event constructor
-     *
-     * @param authentication The current <code>Authentication</code> object
-     * @param targetUser The target user
-     */
-    public AuthenticationSwitchUserEvent(Authentication authentication, UserDetails targetUser) {
-        super(authentication);
-        this.targetUser = targetUser;
-    }
+	/**
+	 * Switch user context event constructor
+	 *
+	 * @param authentication The current <code>Authentication</code> object
+	 * @param targetUser The target user
+	 */
+	public AuthenticationSwitchUserEvent(Authentication authentication,
+			UserDetails targetUser) {
+		super(authentication);
+		this.targetUser = targetUser;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public UserDetails getTargetUser() {
-        return targetUser;
-    }
+	public UserDetails getTargetUser() {
+		return targetUser;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java
index 699a4dee0a..b0f83c6748 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserAuthorityChanger.java
@@ -7,25 +7,32 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 /**
- * Allows subclasses to modify the {@link GrantedAuthority} list that will be assigned to the principal
- * when they assume the identity of a different principal.
+ * Allows subclasses to modify the {@link GrantedAuthority} list that will be assigned to
+ * the principal when they assume the identity of a different principal.
  *
- * <p>Configured against the {@link SwitchUserFilter}.
+ * <p>
+ * Configured against the {@link SwitchUserFilter}.
  *
  * @author Ben Alex
  *
  */
 public interface SwitchUserAuthorityChanger {
 
-    /**
-     * Allow subclasses to add or remove authorities that will be granted when in switch user mode.
-     *
-     * @param targetUser the UserDetails representing the identity being switched to
-     * @param currentAuthentication the current Authentication of the principal performing the switching
-     * @param authoritiesToBeGranted all {@link org.springframework.security.core.GrantedAuthority} instances to be granted to the user,
-     * excluding the special "switch user" authority that is used internally (guaranteed never null)
-     *
-     * @return the modified list of granted authorities.
-     */
-    Collection<? extends GrantedAuthority> modifyGrantedAuthorities(UserDetails targetUser, Authentication currentAuthentication, Collection<? extends GrantedAuthority> authoritiesToBeGranted);
+	/**
+	 * Allow subclasses to add or remove authorities that will be granted when in switch
+	 * user mode.
+	 *
+	 * @param targetUser the UserDetails representing the identity being switched to
+	 * @param currentAuthentication the current Authentication of the principal performing
+	 * the switching
+	 * @param authoritiesToBeGranted all
+	 * {@link org.springframework.security.core.GrantedAuthority} instances to be granted
+	 * to the user, excluding the special "switch user" authority that is used internally
+	 * (guaranteed never null)
+	 *
+	 * @return the modified list of granted authorities.
+	 */
+	Collection<? extends GrantedAuthority> modifyGrantedAuthorities(
+			UserDetails targetUser, Authentication currentAuthentication,
+			Collection<? extends GrantedAuthority> authoritiesToBeGranted);
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
index 2ce7ce999d..cdc23a4152 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
@@ -60,34 +60,37 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
  * Switch User processing filter responsible for user context switching.
  * <p>
- * This filter is similar to Unix 'su' however for Spring Security-managed web applications.
- * A common use-case for this feature is the ability to allow higher-authority users (e.g. ROLE_ADMIN) to switch to a
- * regular user (e.g. ROLE_USER).
+ * This filter is similar to Unix 'su' however for Spring Security-managed web
+ * applications. A common use-case for this feature is the ability to allow
+ * higher-authority users (e.g. ROLE_ADMIN) to switch to a regular user (e.g. ROLE_USER).
  * <p>
- * This filter assumes that the user performing the switch will be required to be logged in as normal (i.e.
- * as a ROLE_ADMIN user). The user will then access a page/controller that enables the administrator to specify who they
- * wish to become (see <code>switchUserUrl</code>).
+ * This filter assumes that the user performing the switch will be required to be logged
+ * in as normal (i.e. as a ROLE_ADMIN user). The user will then access a page/controller
+ * that enables the administrator to specify who they wish to become (see
+ * <code>switchUserUrl</code>).
  * <p>
- * <b>Note: This URL will be required to have appropriate security constraints configured so that only users of that
- * role can access it (e.g. ROLE_ADMIN).</b>
+ * <b>Note: This URL will be required to have appropriate security constraints configured
+ * so that only users of that role can access it (e.g. ROLE_ADMIN).</b>
  * <p>
- * On a successful switch, the user's  <code>SecurityContext</code> will be updated to reflect the
- * specified user and will also contain an additional
- * {@link org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority} which contains the original user.
- * Before switching, a check will be made on whether the user is already currently switched, and any current switch will
- * be exited to prevent "nested" switches.
+ * On a successful switch, the user's <code>SecurityContext</code> will be updated to
+ * reflect the specified user and will also contain an additional
+ * {@link org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority}
+ * which contains the original user. Before switching, a check will be made on whether the
+ * user is already currently switched, and any current switch will be exited to prevent
+ * "nested" switches.
  * <p>
- * To 'exit' from a user context, the user needs to access a URL (see <code>exitUserUrl</code>)  that
- * will switch back to the original user as identified by the <code>ROLE_PREVIOUS_ADMINISTRATOR</code>.
+ * To 'exit' from a user context, the user needs to access a URL (see
+ * <code>exitUserUrl</code>) that will switch back to the original user as identified by
+ * the <code>ROLE_PREVIOUS_ADMINISTRATOR</code>.
  * <p>
- * To configure the Switch User Processing Filter, create a bean definition for the Switch User processing
- * filter and add to the filterChainProxy. Note that the filter must come <b>after</b> the
- * <tt>FilterSecurityInteceptor</tt> in the chain, in order to apply the correct constraints to the <tt>switchUserUrl</tt>.
- * Example:
+ * To configure the Switch User Processing Filter, create a bean definition for the Switch
+ * User processing filter and add to the filterChainProxy. Note that the filter must come
+ * <b>after</b> the <tt>FilterSecurityInteceptor</tt> in the chain, in order to apply the
+ * correct constraints to the <tt>switchUserUrl</tt>. Example:
+ * 
  * <pre>
  * &lt;bean id="switchUserProcessingFilter" class="org.springframework.security.web.authentication.switchuser.SwitchUserFilter">
  *    &lt;property name="userDetailsService" ref="userDetailsService" />
@@ -101,415 +104,444 @@ import org.springframework.web.filter.GenericFilterBean;
  *
  * @see org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority
  */
-public class SwitchUserFilter extends GenericFilterBean implements ApplicationEventPublisherAware,
-        MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
-
-    public static final String SPRING_SECURITY_SWITCH_USERNAME_KEY = "username";
-    public static final String ROLE_PREVIOUS_ADMINISTRATOR = "ROLE_PREVIOUS_ADMINISTRATOR";
-
-    //~ Instance fields ================================================================================================
-
-    private ApplicationEventPublisher eventPublisher;
-    private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private String exitUserUrl = "/logout/impersonate";
-    private String switchUserUrl = "/login/impersonate";
-    private String targetUrl;
-    private String switchFailureUrl;
-    private String usernameParameter = SPRING_SECURITY_SWITCH_USERNAME_KEY;
-    private SwitchUserAuthorityChanger switchUserAuthorityChanger;
-    private UserDetailsService userDetailsService;
-    private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
-    private AuthenticationSuccessHandler successHandler;
-    private AuthenticationFailureHandler failureHandler;
-
-    //~ Methods ========================================================================================================
-
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(userDetailsService, "userDetailsService must be specified");
-        Assert.isTrue(successHandler != null || targetUrl != null, "You must set either a successHandler or the targetUrl");
-        if (targetUrl != null) {
-            Assert.isNull(successHandler, "You cannot set both successHandler and targetUrl");
-            successHandler = new SimpleUrlAuthenticationSuccessHandler(targetUrl);
-        }
-
-        if (failureHandler == null) {
-            failureHandler = switchFailureUrl == null ? new SimpleUrlAuthenticationFailureHandler() :
-                new SimpleUrlAuthenticationFailureHandler(switchFailureUrl);
-        } else {
-            Assert.isNull(switchFailureUrl, "You cannot set both a switchFailureUrl and a failureHandler");
-        }
-    }
-
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
-
-        // check for switch or exit request
-        if (requiresSwitchUser(request)) {
-            // if set, attempt switch and store original
-            try {
-                Authentication targetUser = attemptSwitchUser(request);
-
-                // update the current context to the new target user
-                SecurityContextHolder.getContext().setAuthentication(targetUser);
-
-                // redirect to target url
-                successHandler.onAuthenticationSuccess(request, response, targetUser);
-            } catch (AuthenticationException e) {
-                logger.debug("Switch User failed", e);
-                failureHandler.onAuthenticationFailure(request, response, e);
-            }
-
-            return;
-        } else if (requiresExitUser(request)) {
-            // get the original authentication object (if exists)
-            Authentication originalUser = attemptExitUser(request);
-
-            // update the current context back to the original user
-            SecurityContextHolder.getContext().setAuthentication(originalUser);
-
-            // redirect to target url
-            successHandler.onAuthenticationSuccess(request, response, originalUser);
-
-            return;
-        }
-
-        chain.doFilter(request, response);
-    }
-
-    /**
-     * Attempt to switch to another user. If the user does not exist or is not active, return null.
-     *
-     * @return The new <code>Authentication</code> request if successfully switched to another user, <code>null</code>
-     *         otherwise.
-     *
-     * @throws UsernameNotFoundException If the target user is not found.
-     * @throws LockedException if the account is locked.
-     * @throws DisabledException If the target user is disabled.
-     * @throws AccountExpiredException If the target user account is expired.
-     * @throws CredentialsExpiredException If the target user credentials are expired.
-     */
-    protected Authentication attemptSwitchUser(HttpServletRequest request) throws AuthenticationException {
-        UsernamePasswordAuthenticationToken targetUserRequest;
-
-        String username = request.getParameter(usernameParameter);
-
-        if (username == null) {
-            username = "";
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Attempt to switch to user [" + username + "]");
-        }
-
-        UserDetails targetUser = userDetailsService.loadUserByUsername(username);
-        userDetailsChecker.check(targetUser);
-
-        // OK, create the switch user token
-        targetUserRequest = createSwitchUserToken(request, targetUser);
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Switch User Token [" + targetUserRequest + "]");
-        }
-
-        // publish event
-        if (this.eventPublisher != null) {
-            eventPublisher.publishEvent(new AuthenticationSwitchUserEvent(
-                    SecurityContextHolder.getContext().getAuthentication(), targetUser));
-        }
-
-        return targetUserRequest;
-    }
-
-    /**
-     * Attempt to exit from an already switched user.
-     *
-     * @param request The http servlet request
-     *
-     * @return The original <code>Authentication</code> object or <code>null</code> otherwise.
-     *
-     * @throws AuthenticationCredentialsNotFoundException If no <code>Authentication</code> associated with this
-     *         request.
-     */
-    protected Authentication attemptExitUser(HttpServletRequest request)
-            throws AuthenticationCredentialsNotFoundException {
-        // need to check to see if the current user has a SwitchUserGrantedAuthority
-        Authentication current = SecurityContextHolder.getContext().getAuthentication();
-
-        if (null == current) {
-            throw new AuthenticationCredentialsNotFoundException(messages.getMessage(
-                    "SwitchUserFilter.noCurrentUser", "No current user associated with this request"));
-        }
-
-        // check to see if the current user did actual switch to another user
-        // if so, get the original source user so we can switch back
-        Authentication original = getSourceAuthentication(current);
-
-        if (original == null) {
-            logger.debug("Could not find original user Authentication object!");
-            throw new AuthenticationCredentialsNotFoundException(messages.getMessage(
-                    "SwitchUserFilter.noOriginalAuthentication",
-                    "Could not find original Authentication object"));
-        }
-
-        // get the source user details
-        UserDetails originalUser = null;
-        Object obj = original.getPrincipal();
-
-        if ((obj != null) && obj instanceof UserDetails) {
-            originalUser = (UserDetails) obj;
-        }
-
-        // publish event
-        if (this.eventPublisher != null) {
-            eventPublisher.publishEvent(new AuthenticationSwitchUserEvent(current, originalUser));
-        }
-
-        return original;
-    }
-
-    /**
-     * Create a switch user token that contains an additional <tt>GrantedAuthority</tt> that contains the
-     * original <code>Authentication</code> object.
-     *
-     * @param request The http servlet request.
-     * @param targetUser The target user
-     *
-     * @return The authentication token
-     *
-     * @see SwitchUserGrantedAuthority
-     */
-    private UsernamePasswordAuthenticationToken createSwitchUserToken(HttpServletRequest request,
-            UserDetails targetUser) {
-
-        UsernamePasswordAuthenticationToken targetUserRequest;
-
-        // grant an additional authority that contains the original Authentication object
-        // which will be used to 'exit' from the current switched user.
-
-        Authentication currentAuth;
-
-        try {
-            // SEC-1763. Check first if we are already switched.
-            currentAuth = attemptExitUser(request);
-        } catch (AuthenticationCredentialsNotFoundException e) {
-            currentAuth = SecurityContextHolder.getContext().getAuthentication();
-        }
-
-        GrantedAuthority switchAuthority = new SwitchUserGrantedAuthority(ROLE_PREVIOUS_ADMINISTRATOR, currentAuth);
-
-        // get the original authorities
-        Collection<? extends GrantedAuthority> orig = targetUser.getAuthorities();
-
-        // Allow subclasses to change the authorities to be granted
-        if (switchUserAuthorityChanger != null) {
-            orig = switchUserAuthorityChanger.modifyGrantedAuthorities(targetUser, currentAuth, orig);
-        }
-
-        // add the new switch user authority
-        List<GrantedAuthority> newAuths = new ArrayList<GrantedAuthority>(orig);
-        newAuths.add(switchAuthority);
-
-        // create the new authentication token
-        targetUserRequest = new UsernamePasswordAuthenticationToken(targetUser, targetUser.getPassword(), newAuths);
-
-        // set details
-        targetUserRequest.setDetails(authenticationDetailsSource.buildDetails(request));
-
-        return targetUserRequest;
-    }
-
-    /**
-     * Find the original <code>Authentication</code> object from the current user's granted authorities. A
-     * successfully switched user should have a <code>SwitchUserGrantedAuthority</code> that contains the original
-     * source user <code>Authentication</code> object.
-     *
-     * @param current The current  <code>Authentication</code> object
-     *
-     * @return The source user <code>Authentication</code> object or <code>null</code> otherwise.
-     */
-    private Authentication getSourceAuthentication(Authentication current) {
-        Authentication original = null;
-
-        // iterate over granted authorities and find the 'switch user' authority
-        Collection<? extends GrantedAuthority> authorities = current.getAuthorities();
-
-        for (GrantedAuthority auth : authorities) {
-            // check for switch user type of authority
-            if (auth instanceof SwitchUserGrantedAuthority) {
-                original = ((SwitchUserGrantedAuthority) auth).getSource();
-                logger.debug("Found original switch user granted authority [" + original + "]");
-            }
-        }
-
-        return original;
-    }
-
-    /**
-     * Checks the request URI for the presence of <tt>exitUserUrl</tt>.
-     *
-     * @param request The http servlet request
-     *
-     * @return <code>true</code> if the request requires a exit user, <code>false</code> otherwise.
-     *
-     * @see SwitchUserFilter#exitUserUrl
-     */
-    protected boolean requiresExitUser(HttpServletRequest request) {
-        String uri = stripUri(request);
-
-        return uri.endsWith(request.getContextPath() + exitUserUrl);
-    }
-
-    /**
-     * Checks the request URI for the presence of <tt>switchUserUrl</tt>.
-     *
-     * @param request The http servlet request
-     *
-     * @return <code>true</code> if the request requires a switch, <code>false</code> otherwise.
-     *
-     * @see SwitchUserFilter#switchUserUrl
-     */
-    protected boolean requiresSwitchUser(HttpServletRequest request) {
-        String uri = stripUri(request);
-
-        return uri.endsWith(request.getContextPath() + switchUserUrl);
-    }
-
-    public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher)
-            throws BeansException {
-        this.eventPublisher = eventPublisher;
-    }
-
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
-
-    public void setMessageSource(MessageSource messageSource) {
-        Assert.notNull(messageSource, "messageSource cannot be null");
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
-
-    /**
-     * Sets the authentication data access object.
-     *
-     * @param userDetailsService The <tt>UserDetailService</tt> which will be used to load information for the user
-     *                           that is being switched to.
-     */
-    public void setUserDetailsService(UserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
-
-    /**
-     * Set the URL to respond to exit user processing.
-     *
-     * @param exitUserUrl The exit user URL.
-     */
-    public void setExitUserUrl(String exitUserUrl) {
-        Assert.isTrue(UrlUtils.isValidRedirectUrl(exitUserUrl),
-                "exitUserUrl cannot be empty and must be a valid redirect URL");
-        this.exitUserUrl = exitUserUrl;
-    }
-
-    /**
-     * Set the URL to respond to switch user processing.
-     *
-     * @param switchUserUrl The switch user URL.
-     */
-    public void setSwitchUserUrl(String switchUserUrl) {
-        Assert.isTrue(UrlUtils.isValidRedirectUrl(switchUserUrl),
-                "switchUserUrl cannot be empty and must be a valid redirect URL");
-        this.switchUserUrl = switchUserUrl;
-    }
-
-    /**
-     * Sets the URL to go to after a successful switch / exit user request.
-     * Use {@link #setSuccessHandler(AuthenticationSuccessHandler) setSuccessHandler} instead if you need more
-     * customized behaviour.
-     *
-     * @param targetUrl The target url.
-     */
-    public void setTargetUrl(String targetUrl) {
-        this.targetUrl = targetUrl;
-    }
-
-    /**
-     * Used to define custom behaviour on a successful switch or exit user.
-     * <p>
-     * Can be used instead of setting <tt>targetUrl</tt>.
-     */
-    public void setSuccessHandler(AuthenticationSuccessHandler successHandler) {
-        Assert.notNull(successHandler, "successHandler cannot be null");
-        this.successHandler = successHandler;
-    }
-
-    /**
-     * Sets the URL to which a user should be redirected if the switch fails. For example, this might happen because
-     * the account they are attempting to switch to is invalid (the user doesn't exist, account is locked etc).
-     * <p>
-     * If not set, an error message will be written to the response.
-     * <p>
-     * Use {@link #setFailureHandler(AuthenticationFailureHandler) failureHandler} instead if you need more
-     * customized behaviour.
-     *
-     * @param switchFailureUrl the url to redirect to.
-     */
-    public void setSwitchFailureUrl(String switchFailureUrl) {
-        Assert.isTrue(StringUtils.hasText(switchUserUrl) && UrlUtils.isValidRedirectUrl(switchFailureUrl),
-                "switchFailureUrl cannot be empty and must be a valid redirect URL");
-        this.switchFailureUrl = switchFailureUrl;
-    }
-
-    /**
-     * Used to define custom behaviour when a switch fails.
-     * <p>
-     * Can be used instead of setting <tt>switchFailureUrl</tt>.
-     */
-    public void setFailureHandler(AuthenticationFailureHandler failureHandler) {
-        Assert.notNull(failureHandler, "failureHandler cannot be null");
-        this.failureHandler = failureHandler;
-    }
-
-    /**
-     * @param switchUserAuthorityChanger to use to fine-tune the authorities granted to subclasses (may be null if
-     * SwitchUserFilter should not fine-tune the authorities)
-     */
-    public void setSwitchUserAuthorityChanger(SwitchUserAuthorityChanger switchUserAuthorityChanger) {
-        this.switchUserAuthorityChanger = switchUserAuthorityChanger;
-    }
-
-    public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
-        this.userDetailsChecker = userDetailsChecker;
-    }
-
-    /**
-     * Allows the parameter containing the username to be customized.
-     *
-     * @param usernameParameter the parameter name. Defaults to {@code username}
-     */
-    public void setUsernameParameter(String usernameParameter) {
-        this.usernameParameter = usernameParameter;
-    }
-
-    /**
-     * Strips any content after the ';' in the request URI
-     *
-     * @param request The http request
-     *
-     * @return The stripped uri
-     */
-    private String stripUri(HttpServletRequest request) {
-        String uri = request.getRequestURI();
-        int idx = uri.indexOf(';');
-
-        if (idx > 0) {
-            uri = uri.substring(0, idx);
-        }
-
-        return uri;
-    }
+public class SwitchUserFilter extends GenericFilterBean implements
+		ApplicationEventPublisherAware, MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	public static final String SPRING_SECURITY_SWITCH_USERNAME_KEY = "username";
+	public static final String ROLE_PREVIOUS_ADMINISTRATOR = "ROLE_PREVIOUS_ADMINISTRATOR";
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	private ApplicationEventPublisher eventPublisher;
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private String exitUserUrl = "/logout/impersonate";
+	private String switchUserUrl = "/login/impersonate";
+	private String targetUrl;
+	private String switchFailureUrl;
+	private String usernameParameter = SPRING_SECURITY_SWITCH_USERNAME_KEY;
+	private SwitchUserAuthorityChanger switchUserAuthorityChanger;
+	private UserDetailsService userDetailsService;
+	private UserDetailsChecker userDetailsChecker = new AccountStatusUserDetailsChecker();
+	private AuthenticationSuccessHandler successHandler;
+	private AuthenticationFailureHandler failureHandler;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(userDetailsService, "userDetailsService must be specified");
+		Assert.isTrue(successHandler != null || targetUrl != null,
+				"You must set either a successHandler or the targetUrl");
+		if (targetUrl != null) {
+			Assert.isNull(successHandler,
+					"You cannot set both successHandler and targetUrl");
+			successHandler = new SimpleUrlAuthenticationSuccessHandler(targetUrl);
+		}
+
+		if (failureHandler == null) {
+			failureHandler = switchFailureUrl == null ? new SimpleUrlAuthenticationFailureHandler()
+					: new SimpleUrlAuthenticationFailureHandler(switchFailureUrl);
+		}
+		else {
+			Assert.isNull(switchFailureUrl,
+					"You cannot set both a switchFailureUrl and a failureHandler");
+		}
+	}
+
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
+
+		// check for switch or exit request
+		if (requiresSwitchUser(request)) {
+			// if set, attempt switch and store original
+			try {
+				Authentication targetUser = attemptSwitchUser(request);
+
+				// update the current context to the new target user
+				SecurityContextHolder.getContext().setAuthentication(targetUser);
+
+				// redirect to target url
+				successHandler.onAuthenticationSuccess(request, response, targetUser);
+			}
+			catch (AuthenticationException e) {
+				logger.debug("Switch User failed", e);
+				failureHandler.onAuthenticationFailure(request, response, e);
+			}
+
+			return;
+		}
+		else if (requiresExitUser(request)) {
+			// get the original authentication object (if exists)
+			Authentication originalUser = attemptExitUser(request);
+
+			// update the current context back to the original user
+			SecurityContextHolder.getContext().setAuthentication(originalUser);
+
+			// redirect to target url
+			successHandler.onAuthenticationSuccess(request, response, originalUser);
+
+			return;
+		}
+
+		chain.doFilter(request, response);
+	}
+
+	/**
+	 * Attempt to switch to another user. If the user does not exist or is not active,
+	 * return null.
+	 *
+	 * @return The new <code>Authentication</code> request if successfully switched to
+	 * another user, <code>null</code> otherwise.
+	 *
+	 * @throws UsernameNotFoundException If the target user is not found.
+	 * @throws LockedException if the account is locked.
+	 * @throws DisabledException If the target user is disabled.
+	 * @throws AccountExpiredException If the target user account is expired.
+	 * @throws CredentialsExpiredException If the target user credentials are expired.
+	 */
+	protected Authentication attemptSwitchUser(HttpServletRequest request)
+			throws AuthenticationException {
+		UsernamePasswordAuthenticationToken targetUserRequest;
+
+		String username = request.getParameter(usernameParameter);
+
+		if (username == null) {
+			username = "";
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Attempt to switch to user [" + username + "]");
+		}
+
+		UserDetails targetUser = userDetailsService.loadUserByUsername(username);
+		userDetailsChecker.check(targetUser);
+
+		// OK, create the switch user token
+		targetUserRequest = createSwitchUserToken(request, targetUser);
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Switch User Token [" + targetUserRequest + "]");
+		}
+
+		// publish event
+		if (this.eventPublisher != null) {
+			eventPublisher.publishEvent(new AuthenticationSwitchUserEvent(
+					SecurityContextHolder.getContext().getAuthentication(), targetUser));
+		}
+
+		return targetUserRequest;
+	}
+
+	/**
+	 * Attempt to exit from an already switched user.
+	 *
+	 * @param request The http servlet request
+	 *
+	 * @return The original <code>Authentication</code> object or <code>null</code>
+	 * otherwise.
+	 *
+	 * @throws AuthenticationCredentialsNotFoundException If no
+	 * <code>Authentication</code> associated with this request.
+	 */
+	protected Authentication attemptExitUser(HttpServletRequest request)
+			throws AuthenticationCredentialsNotFoundException {
+		// need to check to see if the current user has a SwitchUserGrantedAuthority
+		Authentication current = SecurityContextHolder.getContext().getAuthentication();
+
+		if (null == current) {
+			throw new AuthenticationCredentialsNotFoundException(messages.getMessage(
+					"SwitchUserFilter.noCurrentUser",
+					"No current user associated with this request"));
+		}
+
+		// check to see if the current user did actual switch to another user
+		// if so, get the original source user so we can switch back
+		Authentication original = getSourceAuthentication(current);
+
+		if (original == null) {
+			logger.debug("Could not find original user Authentication object!");
+			throw new AuthenticationCredentialsNotFoundException(messages.getMessage(
+					"SwitchUserFilter.noOriginalAuthentication",
+					"Could not find original Authentication object"));
+		}
+
+		// get the source user details
+		UserDetails originalUser = null;
+		Object obj = original.getPrincipal();
+
+		if ((obj != null) && obj instanceof UserDetails) {
+			originalUser = (UserDetails) obj;
+		}
+
+		// publish event
+		if (this.eventPublisher != null) {
+			eventPublisher.publishEvent(new AuthenticationSwitchUserEvent(current,
+					originalUser));
+		}
+
+		return original;
+	}
+
+	/**
+	 * Create a switch user token that contains an additional <tt>GrantedAuthority</tt>
+	 * that contains the original <code>Authentication</code> object.
+	 *
+	 * @param request The http servlet request.
+	 * @param targetUser The target user
+	 *
+	 * @return The authentication token
+	 *
+	 * @see SwitchUserGrantedAuthority
+	 */
+	private UsernamePasswordAuthenticationToken createSwitchUserToken(
+			HttpServletRequest request, UserDetails targetUser) {
+
+		UsernamePasswordAuthenticationToken targetUserRequest;
+
+		// grant an additional authority that contains the original Authentication object
+		// which will be used to 'exit' from the current switched user.
+
+		Authentication currentAuth;
+
+		try {
+			// SEC-1763. Check first if we are already switched.
+			currentAuth = attemptExitUser(request);
+		}
+		catch (AuthenticationCredentialsNotFoundException e) {
+			currentAuth = SecurityContextHolder.getContext().getAuthentication();
+		}
+
+		GrantedAuthority switchAuthority = new SwitchUserGrantedAuthority(
+				ROLE_PREVIOUS_ADMINISTRATOR, currentAuth);
+
+		// get the original authorities
+		Collection<? extends GrantedAuthority> orig = targetUser.getAuthorities();
+
+		// Allow subclasses to change the authorities to be granted
+		if (switchUserAuthorityChanger != null) {
+			orig = switchUserAuthorityChanger.modifyGrantedAuthorities(targetUser,
+					currentAuth, orig);
+		}
+
+		// add the new switch user authority
+		List<GrantedAuthority> newAuths = new ArrayList<GrantedAuthority>(orig);
+		newAuths.add(switchAuthority);
+
+		// create the new authentication token
+		targetUserRequest = new UsernamePasswordAuthenticationToken(targetUser,
+				targetUser.getPassword(), newAuths);
+
+		// set details
+		targetUserRequest.setDetails(authenticationDetailsSource.buildDetails(request));
+
+		return targetUserRequest;
+	}
+
+	/**
+	 * Find the original <code>Authentication</code> object from the current user's
+	 * granted authorities. A successfully switched user should have a
+	 * <code>SwitchUserGrantedAuthority</code> that contains the original source user
+	 * <code>Authentication</code> object.
+	 *
+	 * @param current The current <code>Authentication</code> object
+	 *
+	 * @return The source user <code>Authentication</code> object or <code>null</code>
+	 * otherwise.
+	 */
+	private Authentication getSourceAuthentication(Authentication current) {
+		Authentication original = null;
+
+		// iterate over granted authorities and find the 'switch user' authority
+		Collection<? extends GrantedAuthority> authorities = current.getAuthorities();
+
+		for (GrantedAuthority auth : authorities) {
+			// check for switch user type of authority
+			if (auth instanceof SwitchUserGrantedAuthority) {
+				original = ((SwitchUserGrantedAuthority) auth).getSource();
+				logger.debug("Found original switch user granted authority [" + original
+						+ "]");
+			}
+		}
+
+		return original;
+	}
+
+	/**
+	 * Checks the request URI for the presence of <tt>exitUserUrl</tt>.
+	 *
+	 * @param request The http servlet request
+	 *
+	 * @return <code>true</code> if the request requires a exit user, <code>false</code>
+	 * otherwise.
+	 *
+	 * @see SwitchUserFilter#exitUserUrl
+	 */
+	protected boolean requiresExitUser(HttpServletRequest request) {
+		String uri = stripUri(request);
+
+		return uri.endsWith(request.getContextPath() + exitUserUrl);
+	}
+
+	/**
+	 * Checks the request URI for the presence of <tt>switchUserUrl</tt>.
+	 *
+	 * @param request The http servlet request
+	 *
+	 * @return <code>true</code> if the request requires a switch, <code>false</code>
+	 * otherwise.
+	 *
+	 * @see SwitchUserFilter#switchUserUrl
+	 */
+	protected boolean requiresSwitchUser(HttpServletRequest request) {
+		String uri = stripUri(request);
+
+		return uri.endsWith(request.getContextPath() + switchUserUrl);
+	}
+
+	public void setApplicationEventPublisher(ApplicationEventPublisher eventPublisher)
+			throws BeansException {
+		this.eventPublisher = eventPublisher;
+	}
+
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
+
+	public void setMessageSource(MessageSource messageSource) {
+		Assert.notNull(messageSource, "messageSource cannot be null");
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
+
+	/**
+	 * Sets the authentication data access object.
+	 *
+	 * @param userDetailsService The <tt>UserDetailService</tt> which will be used to load
+	 * information for the user that is being switched to.
+	 */
+	public void setUserDetailsService(UserDetailsService userDetailsService) {
+		this.userDetailsService = userDetailsService;
+	}
+
+	/**
+	 * Set the URL to respond to exit user processing.
+	 *
+	 * @param exitUserUrl The exit user URL.
+	 */
+	public void setExitUserUrl(String exitUserUrl) {
+		Assert.isTrue(UrlUtils.isValidRedirectUrl(exitUserUrl),
+				"exitUserUrl cannot be empty and must be a valid redirect URL");
+		this.exitUserUrl = exitUserUrl;
+	}
+
+	/**
+	 * Set the URL to respond to switch user processing.
+	 *
+	 * @param switchUserUrl The switch user URL.
+	 */
+	public void setSwitchUserUrl(String switchUserUrl) {
+		Assert.isTrue(UrlUtils.isValidRedirectUrl(switchUserUrl),
+				"switchUserUrl cannot be empty and must be a valid redirect URL");
+		this.switchUserUrl = switchUserUrl;
+	}
+
+	/**
+	 * Sets the URL to go to after a successful switch / exit user request. Use
+	 * {@link #setSuccessHandler(AuthenticationSuccessHandler) setSuccessHandler} instead
+	 * if you need more customized behaviour.
+	 *
+	 * @param targetUrl The target url.
+	 */
+	public void setTargetUrl(String targetUrl) {
+		this.targetUrl = targetUrl;
+	}
+
+	/**
+	 * Used to define custom behaviour on a successful switch or exit user.
+	 * <p>
+	 * Can be used instead of setting <tt>targetUrl</tt>.
+	 */
+	public void setSuccessHandler(AuthenticationSuccessHandler successHandler) {
+		Assert.notNull(successHandler, "successHandler cannot be null");
+		this.successHandler = successHandler;
+	}
+
+	/**
+	 * Sets the URL to which a user should be redirected if the switch fails. For example,
+	 * this might happen because the account they are attempting to switch to is invalid
+	 * (the user doesn't exist, account is locked etc).
+	 * <p>
+	 * If not set, an error message will be written to the response.
+	 * <p>
+	 * Use {@link #setFailureHandler(AuthenticationFailureHandler) failureHandler} instead
+	 * if you need more customized behaviour.
+	 *
+	 * @param switchFailureUrl the url to redirect to.
+	 */
+	public void setSwitchFailureUrl(String switchFailureUrl) {
+		Assert.isTrue(
+				StringUtils.hasText(switchUserUrl)
+						&& UrlUtils.isValidRedirectUrl(switchFailureUrl),
+				"switchFailureUrl cannot be empty and must be a valid redirect URL");
+		this.switchFailureUrl = switchFailureUrl;
+	}
+
+	/**
+	 * Used to define custom behaviour when a switch fails.
+	 * <p>
+	 * Can be used instead of setting <tt>switchFailureUrl</tt>.
+	 */
+	public void setFailureHandler(AuthenticationFailureHandler failureHandler) {
+		Assert.notNull(failureHandler, "failureHandler cannot be null");
+		this.failureHandler = failureHandler;
+	}
+
+	/**
+	 * @param switchUserAuthorityChanger to use to fine-tune the authorities granted to
+	 * subclasses (may be null if SwitchUserFilter should not fine-tune the authorities)
+	 */
+	public void setSwitchUserAuthorityChanger(
+			SwitchUserAuthorityChanger switchUserAuthorityChanger) {
+		this.switchUserAuthorityChanger = switchUserAuthorityChanger;
+	}
+
+	public void setUserDetailsChecker(UserDetailsChecker userDetailsChecker) {
+		this.userDetailsChecker = userDetailsChecker;
+	}
+
+	/**
+	 * Allows the parameter containing the username to be customized.
+	 *
+	 * @param usernameParameter the parameter name. Defaults to {@code username}
+	 */
+	public void setUsernameParameter(String usernameParameter) {
+		this.usernameParameter = usernameParameter;
+	}
+
+	/**
+	 * Strips any content after the ';' in the request URI
+	 *
+	 * @param request The http request
+	 *
+	 * @return The stripped uri
+	 */
+	private String stripUri(HttpServletRequest request) {
+		String uri = request.getRequestURI();
+		int idx = uri.indexOf(';');
+
+		if (idx > 0) {
+			uri = uri.substring(0, idx);
+		}
+
+		return uri;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
index 2ade5619ca..f7219d47f8 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserGrantedAuthority.java
@@ -19,12 +19,12 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.SpringSecurityCoreVersion;
 
-
 /**
  * Custom {@code GrantedAuthority} used by
  * {@link org.springframework.security.web.authentication.switchuser.SwitchUserFilter}
  * <p>
- * Stores the {@code Authentication} object of the original user to be used later when 'exiting' from a user switch.
+ * Stores the {@code Authentication} object of the original user to be used later when
+ * 'exiting' from a user switch.
  *
  * @author Mark St.Godard
  *
@@ -32,52 +32,55 @@ import org.springframework.security.core.SpringSecurityCoreVersion;
  */
 public final class SwitchUserGrantedAuthority implements GrantedAuthority {
 
-    private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
+	private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
 
-    //~ Instance fields ================================================================================================
-    private final String role;
-    private final Authentication source;
+	// ~ Instance fields
+	// ================================================================================================
+	private final String role;
+	private final Authentication source;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SwitchUserGrantedAuthority(String role, Authentication source) {
-        this.role = role;
-        this.source = source;
-    }
+	public SwitchUserGrantedAuthority(String role, Authentication source) {
+		this.role = role;
+		this.source = source;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Returns the original user associated with a successful user switch.
-     *
-     * @return The original <code>Authentication</code> object of the switched user.
-     */
-    public Authentication getSource() {
-        return source;
-    }
+	/**
+	 * Returns the original user associated with a successful user switch.
+	 *
+	 * @return The original <code>Authentication</code> object of the switched user.
+	 */
+	public Authentication getSource() {
+		return source;
+	}
 
-    public String getAuthority() {
-        return role;
-    }
+	public String getAuthority() {
+		return role;
+	}
 
-    public int hashCode() {
-        return 31 ^ source.hashCode() ^ role.hashCode();
-    }
+	public int hashCode() {
+		return 31 ^ source.hashCode() ^ role.hashCode();
+	}
 
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
 
-        if (obj instanceof SwitchUserGrantedAuthority) {
-            SwitchUserGrantedAuthority swa = (SwitchUserGrantedAuthority) obj;
-            return this.role.equals(swa.role) && this.source.equals(swa.source);
-        }
+		if (obj instanceof SwitchUserGrantedAuthority) {
+			SwitchUserGrantedAuthority swa = (SwitchUserGrantedAuthority) obj;
+			return this.role.equals(swa.role) && this.source.equals(swa.source);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public String toString() {
-        return "Switch User Authority [" + role + "," + source + "]" ;
-    }
+	public String toString() {
+		return "Switch User Authority [" + role + "," + source + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
index d4debab2a6..341e914391 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java
@@ -19,8 +19,9 @@ import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * For internal use with namespace configuration in the case where a user doesn't configure a login page.
- * The configuration code will insert this filter in the chain instead.
+ * For internal use with namespace configuration in the case where a user doesn't
+ * configure a login page. The configuration code will insert this filter in the chain
+ * instead.
  *
  * Will only work if a redirect is used to the login page.
  *
@@ -28,241 +29,260 @@ import org.springframework.web.filter.GenericFilterBean;
  * @since 2.0
  */
 public class DefaultLoginPageGeneratingFilter extends GenericFilterBean {
-    public static final String DEFAULT_LOGIN_PAGE_URL = "/login";
-    public static final String ERROR_PARAMETER_NAME = "error";
-    private String loginPageUrl;
-    private String logoutSuccessUrl;
-    private String failureUrl;
-    private boolean formLoginEnabled;
-    private boolean openIdEnabled;
-    private String authenticationUrl;
-    private String usernameParameter;
-    private String passwordParameter;
-    private String rememberMeParameter;
-    private String openIDauthenticationUrl;
-    private String openIDusernameParameter;
-    private String openIDrememberMeParameter;
+	public static final String DEFAULT_LOGIN_PAGE_URL = "/login";
+	public static final String ERROR_PARAMETER_NAME = "error";
+	private String loginPageUrl;
+	private String logoutSuccessUrl;
+	private String failureUrl;
+	private boolean formLoginEnabled;
+	private boolean openIdEnabled;
+	private String authenticationUrl;
+	private String usernameParameter;
+	private String passwordParameter;
+	private String rememberMeParameter;
+	private String openIDauthenticationUrl;
+	private String openIDusernameParameter;
+	private String openIDrememberMeParameter;
 
-    public DefaultLoginPageGeneratingFilter() {}
+	public DefaultLoginPageGeneratingFilter() {
+	}
 
-    public DefaultLoginPageGeneratingFilter(AbstractAuthenticationProcessingFilter filter) {
-        if (filter instanceof UsernamePasswordAuthenticationFilter) {
-            init((UsernamePasswordAuthenticationFilter)filter, null);
-        } else {
-            init(null, filter);
-        }
-    }
+	public DefaultLoginPageGeneratingFilter(AbstractAuthenticationProcessingFilter filter) {
+		if (filter instanceof UsernamePasswordAuthenticationFilter) {
+			init((UsernamePasswordAuthenticationFilter) filter, null);
+		}
+		else {
+			init(null, filter);
+		}
+	}
 
-    public DefaultLoginPageGeneratingFilter(UsernamePasswordAuthenticationFilter authFilter, AbstractAuthenticationProcessingFilter openIDFilter) {
-        init(authFilter, openIDFilter);
-    }
+	public DefaultLoginPageGeneratingFilter(
+			UsernamePasswordAuthenticationFilter authFilter,
+			AbstractAuthenticationProcessingFilter openIDFilter) {
+		init(authFilter, openIDFilter);
+	}
 
-    private void init(UsernamePasswordAuthenticationFilter authFilter, AbstractAuthenticationProcessingFilter openIDFilter) {
-        this.loginPageUrl = DEFAULT_LOGIN_PAGE_URL;
-        this.logoutSuccessUrl = DEFAULT_LOGIN_PAGE_URL + "?logout";
-        this.failureUrl = DEFAULT_LOGIN_PAGE_URL + "?" + ERROR_PARAMETER_NAME;
-        if (authFilter != null) {
-            formLoginEnabled = true;
-            usernameParameter = authFilter.getUsernameParameter();
-            passwordParameter = authFilter.getPasswordParameter();
+	private void init(UsernamePasswordAuthenticationFilter authFilter,
+			AbstractAuthenticationProcessingFilter openIDFilter) {
+		this.loginPageUrl = DEFAULT_LOGIN_PAGE_URL;
+		this.logoutSuccessUrl = DEFAULT_LOGIN_PAGE_URL + "?logout";
+		this.failureUrl = DEFAULT_LOGIN_PAGE_URL + "?" + ERROR_PARAMETER_NAME;
+		if (authFilter != null) {
+			formLoginEnabled = true;
+			usernameParameter = authFilter.getUsernameParameter();
+			passwordParameter = authFilter.getPasswordParameter();
 
-            if (authFilter.getRememberMeServices() instanceof AbstractRememberMeServices) {
-                rememberMeParameter = ((AbstractRememberMeServices)authFilter.getRememberMeServices()).getParameter();
-            }
-        }
+			if (authFilter.getRememberMeServices() instanceof AbstractRememberMeServices) {
+				rememberMeParameter = ((AbstractRememberMeServices) authFilter
+						.getRememberMeServices()).getParameter();
+			}
+		}
 
-        if (openIDFilter != null) {
-            openIdEnabled = true;
-            openIDusernameParameter = "openid_identifier";
+		if (openIDFilter != null) {
+			openIdEnabled = true;
+			openIDusernameParameter = "openid_identifier";
 
-            if (openIDFilter.getRememberMeServices() instanceof AbstractRememberMeServices) {
-                openIDrememberMeParameter = ((AbstractRememberMeServices)openIDFilter.getRememberMeServices()).getParameter();
-            }
-        }
-    }
+			if (openIDFilter.getRememberMeServices() instanceof AbstractRememberMeServices) {
+				openIDrememberMeParameter = ((AbstractRememberMeServices) openIDFilter
+						.getRememberMeServices()).getParameter();
+			}
+		}
+	}
 
-    public boolean isEnabled() {
-        return formLoginEnabled || openIdEnabled;
-    }
+	public boolean isEnabled() {
+		return formLoginEnabled || openIdEnabled;
+	}
 
-    public void setLogoutSuccessUrl(String logoutSuccessUrl) {
-        this.logoutSuccessUrl = logoutSuccessUrl;
-    }
+	public void setLogoutSuccessUrl(String logoutSuccessUrl) {
+		this.logoutSuccessUrl = logoutSuccessUrl;
+	}
 
-    public String getLoginPageUrl() {
-        return loginPageUrl;
-    }
+	public String getLoginPageUrl() {
+		return loginPageUrl;
+	}
 
-    public void setLoginPageUrl(String loginPageUrl) {
-        this.loginPageUrl = loginPageUrl;
-    }
+	public void setLoginPageUrl(String loginPageUrl) {
+		this.loginPageUrl = loginPageUrl;
+	}
 
-    public void setFailureUrl(String failureUrl) {
-        this.failureUrl = failureUrl;
-    }
+	public void setFailureUrl(String failureUrl) {
+		this.failureUrl = failureUrl;
+	}
 
-    public void setFormLoginEnabled(boolean formLoginEnabled) {
-        this.formLoginEnabled = formLoginEnabled;
-    }
+	public void setFormLoginEnabled(boolean formLoginEnabled) {
+		this.formLoginEnabled = formLoginEnabled;
+	}
 
-    public void setOpenIdEnabled(boolean openIdEnabled) {
-        this.openIdEnabled = openIdEnabled;
-    }
+	public void setOpenIdEnabled(boolean openIdEnabled) {
+		this.openIdEnabled = openIdEnabled;
+	}
 
-    public void setAuthenticationUrl(String authenticationUrl) {
-        this.authenticationUrl = authenticationUrl;
-    }
+	public void setAuthenticationUrl(String authenticationUrl) {
+		this.authenticationUrl = authenticationUrl;
+	}
 
-    public void setUsernameParameter(String usernameParameter) {
-        this.usernameParameter = usernameParameter;
-    }
+	public void setUsernameParameter(String usernameParameter) {
+		this.usernameParameter = usernameParameter;
+	}
 
-    public void setPasswordParameter(String passwordParameter) {
-        this.passwordParameter = passwordParameter;
-    }
+	public void setPasswordParameter(String passwordParameter) {
+		this.passwordParameter = passwordParameter;
+	}
 
-    public void setRememberMeParameter(String rememberMeParameter) {
-        this.rememberMeParameter = rememberMeParameter;
-        this.openIDrememberMeParameter = rememberMeParameter;
-    }
+	public void setRememberMeParameter(String rememberMeParameter) {
+		this.rememberMeParameter = rememberMeParameter;
+		this.openIDrememberMeParameter = rememberMeParameter;
+	}
 
-    public void setOpenIDauthenticationUrl(String openIDauthenticationUrl) {
-        this.openIDauthenticationUrl = openIDauthenticationUrl;
-    }
+	public void setOpenIDauthenticationUrl(String openIDauthenticationUrl) {
+		this.openIDauthenticationUrl = openIDauthenticationUrl;
+	}
 
-    public void setOpenIDusernameParameter(String openIDusernameParameter) {
-        this.openIDusernameParameter = openIDusernameParameter;
-    }
+	public void setOpenIDusernameParameter(String openIDusernameParameter) {
+		this.openIDusernameParameter = openIDusernameParameter;
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        boolean loginError = isErrorPage(request);
-        boolean logoutSuccess = isLogoutSuccess(request);
-        if (isLoginUrlRequest(request) || loginError || logoutSuccess) {
-            String loginPageHtml = generateLoginPageHtml(request, loginError, logoutSuccess);
-            response.setContentType("text/html;charset=UTF-8");
-            response.setContentLength(loginPageHtml.length());
-            response.getWriter().write(loginPageHtml);
+		boolean loginError = isErrorPage(request);
+		boolean logoutSuccess = isLogoutSuccess(request);
+		if (isLoginUrlRequest(request) || loginError || logoutSuccess) {
+			String loginPageHtml = generateLoginPageHtml(request, loginError,
+					logoutSuccess);
+			response.setContentType("text/html;charset=UTF-8");
+			response.setContentLength(loginPageHtml.length());
+			response.getWriter().write(loginPageHtml);
 
-            return;
-        }
+			return;
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    private String generateLoginPageHtml(HttpServletRequest request, boolean loginError, boolean logoutSuccess) {
-        String errorMsg = "none";
+	private String generateLoginPageHtml(HttpServletRequest request, boolean loginError,
+			boolean logoutSuccess) {
+		String errorMsg = "none";
 
-        if (loginError) {
-            HttpSession session = request.getSession(false);
+		if (loginError) {
+			HttpSession session = request.getSession(false);
 
-            if(session != null) {
-                AuthenticationException ex = (AuthenticationException) session.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
-                errorMsg = ex != null ? ex.getMessage() : "none";
-            }
-        }
+			if (session != null) {
+				AuthenticationException ex = (AuthenticationException) session
+						.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
+				errorMsg = ex != null ? ex.getMessage() : "none";
+			}
+		}
 
-        StringBuilder sb = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 
-        sb.append("<html><head><title>Login Page</title></head>");
+		sb.append("<html><head><title>Login Page</title></head>");
 
-        if (formLoginEnabled) {
-            sb.append("<body onload='document.f.").append(usernameParameter).append(".focus();'>\n");
-        }
+		if (formLoginEnabled) {
+			sb.append("<body onload='document.f.").append(usernameParameter)
+					.append(".focus();'>\n");
+		}
 
-        if (loginError) {
-            sb.append("<p><font color='red'>Your login attempt was not successful, try again.<br/><br/>Reason: ");
-            sb.append(errorMsg);
-            sb.append("</font></p>");
-        }
+		if (loginError) {
+			sb.append("<p><font color='red'>Your login attempt was not successful, try again.<br/><br/>Reason: ");
+			sb.append(errorMsg);
+			sb.append("</font></p>");
+		}
 
-        if (logoutSuccess) {
-            sb.append("<p><font color='green'>You have been logged out</font></p>");
-        }
+		if (logoutSuccess) {
+			sb.append("<p><font color='green'>You have been logged out</font></p>");
+		}
 
-        if (formLoginEnabled) {
-            sb.append("<h3>Login with Username and Password</h3>");
-            sb.append("<form name='f' action='").append(request.getContextPath()).append(authenticationUrl).append("' method='POST'>\n");
-            sb.append(" <table>\n");
-            sb.append("    <tr><td>User:</td><td><input type='text' name='");
-            sb.append(usernameParameter).append("' value='").append("'></td></tr>\n");
-            sb.append("    <tr><td>Password:</td><td><input type='password' name='").append(passwordParameter).append("'/></td></tr>\n");
+		if (formLoginEnabled) {
+			sb.append("<h3>Login with Username and Password</h3>");
+			sb.append("<form name='f' action='").append(request.getContextPath())
+					.append(authenticationUrl).append("' method='POST'>\n");
+			sb.append(" <table>\n");
+			sb.append("    <tr><td>User:</td><td><input type='text' name='");
+			sb.append(usernameParameter).append("' value='").append("'></td></tr>\n");
+			sb.append("    <tr><td>Password:</td><td><input type='password' name='")
+					.append(passwordParameter).append("'/></td></tr>\n");
 
-            if (rememberMeParameter != null) {
-                sb.append("    <tr><td><input type='checkbox' name='").append(rememberMeParameter).append("'/></td><td>Remember me on this computer.</td></tr>\n");
-            }
+			if (rememberMeParameter != null) {
+				sb.append("    <tr><td><input type='checkbox' name='")
+						.append(rememberMeParameter)
+						.append("'/></td><td>Remember me on this computer.</td></tr>\n");
+			}
 
-            sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
-            renderHiddenInputs(sb, request);
-            sb.append("  </table>\n");
-            sb.append("</form>");
-        }
+			sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
+			renderHiddenInputs(sb, request);
+			sb.append("  </table>\n");
+			sb.append("</form>");
+		}
 
-        if(openIdEnabled) {
-            sb.append("<h3>Login with OpenID Identity</h3>");
-            sb.append("<form name='oidf' action='").append(request.getContextPath()).append(openIDauthenticationUrl).append("' method='POST'>\n");
-            sb.append(" <table>\n");
-            sb.append("    <tr><td>Identity:</td><td><input type='text' size='30' name='");
-            sb.append(openIDusernameParameter).append("'/></td></tr>\n");
+		if (openIdEnabled) {
+			sb.append("<h3>Login with OpenID Identity</h3>");
+			sb.append("<form name='oidf' action='").append(request.getContextPath())
+					.append(openIDauthenticationUrl).append("' method='POST'>\n");
+			sb.append(" <table>\n");
+			sb.append("    <tr><td>Identity:</td><td><input type='text' size='30' name='");
+			sb.append(openIDusernameParameter).append("'/></td></tr>\n");
 
-            if (openIDrememberMeParameter != null) {
-                sb.append("    <tr><td><input type='checkbox' name='").append(openIDrememberMeParameter).append("'></td><td>Remember me on this computer.</td></tr>\n");
-            }
+			if (openIDrememberMeParameter != null) {
+				sb.append("    <tr><td><input type='checkbox' name='")
+						.append(openIDrememberMeParameter)
+						.append("'></td><td>Remember me on this computer.</td></tr>\n");
+			}
 
-            sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
-            sb.append("  </table>\n");
-            renderHiddenInputs(sb, request);
-            sb.append("</form>");
-        }
+			sb.append("    <tr><td colspan='2'><input name=\"submit\" type=\"submit\" value=\"Login\"/></td></tr>\n");
+			sb.append("  </table>\n");
+			renderHiddenInputs(sb, request);
+			sb.append("</form>");
+		}
 
-        sb.append("</body></html>");
+		sb.append("</body></html>");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    private void renderHiddenInputs(StringBuilder sb, HttpServletRequest request) {
-        CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
+	private void renderHiddenInputs(StringBuilder sb, HttpServletRequest request) {
+		CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
 
-        if(token != null) {
-            sb.append("    <input name=\""+ token.getParameterName() +"\" type=\"hidden\" value=\""+ token.getToken() +"\" />\n");
-        }
-    }
+		if (token != null) {
+			sb.append("    <input name=\"" + token.getParameterName()
+					+ "\" type=\"hidden\" value=\"" + token.getToken() + "\" />\n");
+		}
+	}
 
-    private boolean isLogoutSuccess(HttpServletRequest request) {
-        return logoutSuccessUrl != null && matches(request, logoutSuccessUrl);
-    }
+	private boolean isLogoutSuccess(HttpServletRequest request) {
+		return logoutSuccessUrl != null && matches(request, logoutSuccessUrl);
+	}
 
-    private boolean isLoginUrlRequest(HttpServletRequest request) {
-        return matches(request, loginPageUrl);
-    }
+	private boolean isLoginUrlRequest(HttpServletRequest request) {
+		return matches(request, loginPageUrl);
+	}
 
-    private boolean isErrorPage(HttpServletRequest request) {
-        return matches(request, failureUrl);
-    }
+	private boolean isErrorPage(HttpServletRequest request) {
+		return matches(request, failureUrl);
+	}
 
-    private boolean matches(HttpServletRequest request, String url) {
-        if(!"GET".equals(request.getMethod()) || url == null) {
-            return false;
-        }
-        String uri = request.getRequestURI();
-        int pathParamIndex = uri.indexOf(';');
+	private boolean matches(HttpServletRequest request, String url) {
+		if (!"GET".equals(request.getMethod()) || url == null) {
+			return false;
+		}
+		String uri = request.getRequestURI();
+		int pathParamIndex = uri.indexOf(';');
 
-        if (pathParamIndex > 0) {
-            // strip everything after the first semi-colon
-            uri = uri.substring(0, pathParamIndex);
-        }
+		if (pathParamIndex > 0) {
+			// strip everything after the first semi-colon
+			uri = uri.substring(0, pathParamIndex);
+		}
 
-        if(request.getQueryString() != null) {
-            uri += "?" + request.getQueryString();
-        }
+		if (request.getQueryString() != null) {
+			uri += "?" + request.getQueryString();
+		}
 
-        if ("".equals(request.getContextPath())) {
-            return uri.equals(url);
-        }
+		if ("".equals(request.getContextPath())) {
+			return uri.equals(url);
+		}
 
-        return uri.equals(request.getContextPath() + url);
-    }
+		return uri.equals(request.getContextPath() + url);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java
index 35c26456c8..d5135f7c0d 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPoint.java
@@ -26,40 +26,46 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-
 /**
- * Used by the <code>ExceptionTraslationFilter</code> to commence authentication via the {@link BasicAuthenticationFilter}.
+ * Used by the <code>ExceptionTraslationFilter</code> to commence authentication via the
+ * {@link BasicAuthenticationFilter}.
  * <p>
- * Once a user agent is authenticated using BASIC authentication, logout requires that
- * the browser be closed or an unauthorized (401) header be sent. The simplest way of achieving the latter is to call
- * the {@link #commence(HttpServletRequest, HttpServletResponse, AuthenticationException)} method below. This will indicate to
- * the browser its credentials are no longer authorized, causing it to prompt the user to login again.
+ * Once a user agent is authenticated using BASIC authentication, logout requires that the
+ * browser be closed or an unauthorized (401) header be sent. The simplest way of
+ * achieving the latter is to call the
+ * {@link #commence(HttpServletRequest, HttpServletResponse, AuthenticationException)}
+ * method below. This will indicate to the browser its credentials are no longer
+ * authorized, causing it to prompt the user to login again.
  *
  * @author Ben Alex
  */
-public class BasicAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean {
-    //~ Instance fields ================================================================================================
+public class BasicAuthenticationEntryPoint implements AuthenticationEntryPoint,
+		InitializingBean {
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String realmName;
+	private String realmName;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.hasText(realmName, "realmName must be specified");
-    }
+	public void afterPropertiesSet() throws Exception {
+		Assert.hasText(realmName, "realmName must be specified");
+	}
 
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
-            throws IOException, ServletException {
-        response.addHeader("WWW-Authenticate", "Basic realm=\"" + realmName + "\"");
-        response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage());
-    }
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
+		response.addHeader("WWW-Authenticate", "Basic realm=\"" + realmName + "\"");
+		response.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+				authException.getMessage());
+	}
 
-    public String getRealmName() {
-        return realmName;
-    }
+	public String getRealmName() {
+		return realmName;
+	}
 
-    public void setRealmName(String realmName) {
-        this.realmName = realmName;
-    }
+	public void setRealmName(String realmName) {
+		this.realmName = realmName;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java
index 6ea10ee532..65081d5942 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilter.java
@@ -41,255 +41,286 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-
 /**
  * Processes a HTTP request's BASIC authorization headers, putting the result into the
  * <code>SecurityContextHolder</code>.
  *
  * <p>
- * For a detailed background on what this filter is designed to process, refer to
- * <a href="http://www.faqs.org/rfcs/rfc1945.html">RFC 1945, Section 11.1</a>. Any realm name presented in
- * the HTTP request is ignored.
+ * For a detailed background on what this filter is designed to process, refer to <a
+ * href="http://www.faqs.org/rfcs/rfc1945.html">RFC 1945, Section 11.1</a>. Any realm name
+ * presented in the HTTP request is ignored.
  *
  * <p>
- * In summary, this filter is responsible for processing any request that has a HTTP request header of
- * <code>Authorization</code> with an authentication scheme of <code>Basic</code> and a Base64-encoded
- * <code>username:password</code> token. For example, to authenticate user "Aladdin" with password "open sesame" the
- * following header would be presented:
+ * In summary, this filter is responsible for processing any request that has a HTTP
+ * request header of <code>Authorization</code> with an authentication scheme of
+ * <code>Basic</code> and a Base64-encoded <code>username:password</code> token. For
+ * example, to authenticate user "Aladdin" with password "open sesame" the following
+ * header would be presented:
+ * 
  * <pre>
  *
  * Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
  * </pre>
  *
  * <p>
- * This filter can be used to provide BASIC authentication services to both remoting protocol clients (such as
- * Hessian and SOAP) as well as standard user agents (such as Internet Explorer and Netscape).
+ * This filter can be used to provide BASIC authentication services to both remoting
+ * protocol clients (such as Hessian and SOAP) as well as standard user agents (such as
+ * Internet Explorer and Netscape).
  * <p>
- * If authentication is successful, the resulting {@link Authentication} object will be placed into the
- * <code>SecurityContextHolder</code>.
+ * If authentication is successful, the resulting {@link Authentication} object will be
+ * placed into the <code>SecurityContextHolder</code>.
  *
  * <p>
- * If authentication fails and <code>ignoreFailure</code> is <code>false</code> (the default), an {@link
- * AuthenticationEntryPoint} implementation is called (unless the <tt>ignoreFailure</tt> property is set to
- * <tt>true</tt>). Usually this should be {@link BasicAuthenticationEntryPoint}, which will prompt the user to
- * authenticate again via BASIC authentication.
+ * If authentication fails and <code>ignoreFailure</code> is <code>false</code> (the
+ * default), an {@link AuthenticationEntryPoint} implementation is called (unless the
+ * <tt>ignoreFailure</tt> property is set to <tt>true</tt>). Usually this should be
+ * {@link BasicAuthenticationEntryPoint}, which will prompt the user to authenticate again
+ * via BASIC authentication.
  *
  * <p>
- * Basic authentication is an attractive protocol because it is simple and widely deployed. However, it still
- * transmits a password in clear text and as such is undesirable in many situations. Digest authentication is also
- * provided by Spring Security and should be used instead of Basic authentication wherever possible. See {@link
- * org.springframework.security.web.authentication.www.DigestAuthenticationFilter}.
+ * Basic authentication is an attractive protocol because it is simple and widely
+ * deployed. However, it still transmits a password in clear text and as such is
+ * undesirable in many situations. Digest authentication is also provided by Spring
+ * Security and should be used instead of Basic authentication wherever possible. See
+ * {@link org.springframework.security.web.authentication.www.DigestAuthenticationFilter}.
  * <p>
- * Note that if a {@link RememberMeServices} is set, this filter will automatically send back remember-me
- * details to the client. Therefore, subsequent requests will not need to present a BASIC authentication header as
- * they will be authenticated using the remember-me mechanism.
+ * Note that if a {@link RememberMeServices} is set, this filter will automatically send
+ * back remember-me details to the client. Therefore, subsequent requests will not need to
+ * present a BASIC authentication header as they will be authenticated using the
+ * remember-me mechanism.
  *
  * @author Ben Alex
  */
 public class BasicAuthenticationFilter extends OncePerRequestFilter {
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
-    private AuthenticationEntryPoint authenticationEntryPoint;
-    private AuthenticationManager authenticationManager;
-    private RememberMeServices rememberMeServices = new NullRememberMeServices();
-    private boolean ignoreFailure = false;
-    private String credentialsCharset = "UTF-8";
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationManager authenticationManager;
+	private RememberMeServices rememberMeServices = new NullRememberMeServices();
+	private boolean ignoreFailure = false;
+	private String credentialsCharset = "UTF-8";
 
-    /**
-     * Creates an instance which will authenticate against the supplied {@code AuthenticationManager}
-     * and which will ignore failed authentication attempts, allowing the request to proceed down the filter chain.
-     *
-     * @param authenticationManager the bean to submit authentication requests to
-     */
-    public BasicAuthenticationFilter(AuthenticationManager authenticationManager) {
-        Assert.notNull(authenticationManager, "authenticationManager cannot be null");
-        this.authenticationManager = authenticationManager;
-        ignoreFailure = true;
-    }
+	/**
+	 * Creates an instance which will authenticate against the supplied
+	 * {@code AuthenticationManager} and which will ignore failed authentication attempts,
+	 * allowing the request to proceed down the filter chain.
+	 *
+	 * @param authenticationManager the bean to submit authentication requests to
+	 */
+	public BasicAuthenticationFilter(AuthenticationManager authenticationManager) {
+		Assert.notNull(authenticationManager, "authenticationManager cannot be null");
+		this.authenticationManager = authenticationManager;
+		ignoreFailure = true;
+	}
 
-    /**
-     * Creates an instance which will authenticate against the supplied {@code AuthenticationManager} and
-     * use the supplied {@code AuthenticationEntryPoint} to handle authentication failures.
-     *
-     * @param authenticationManager the bean to submit authentication requests to
-     * @param authenticationEntryPoint will be invoked when authentication fails. Typically an instance of
-     * {@link BasicAuthenticationEntryPoint}.
-     */
-    public BasicAuthenticationFilter(AuthenticationManager authenticationManager,
-                                     AuthenticationEntryPoint authenticationEntryPoint) {
-        Assert.notNull(authenticationManager, "authenticationManager cannot be null");
-        Assert.notNull(authenticationEntryPoint, "authenticationEntryPoint cannot be null");
-        this.authenticationManager = authenticationManager;
-        this.authenticationEntryPoint = authenticationEntryPoint;
-    }
+	/**
+	 * Creates an instance which will authenticate against the supplied
+	 * {@code AuthenticationManager} and use the supplied {@code AuthenticationEntryPoint}
+	 * to handle authentication failures.
+	 *
+	 * @param authenticationManager the bean to submit authentication requests to
+	 * @param authenticationEntryPoint will be invoked when authentication fails.
+	 * Typically an instance of {@link BasicAuthenticationEntryPoint}.
+	 */
+	public BasicAuthenticationFilter(AuthenticationManager authenticationManager,
+			AuthenticationEntryPoint authenticationEntryPoint) {
+		Assert.notNull(authenticationManager, "authenticationManager cannot be null");
+		Assert.notNull(authenticationEntryPoint,
+				"authenticationEntryPoint cannot be null");
+		this.authenticationManager = authenticationManager;
+		this.authenticationEntryPoint = authenticationEntryPoint;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(this.authenticationManager, "An AuthenticationManager is required");
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(this.authenticationManager, "An AuthenticationManager is required");
 
-        if(!isIgnoreFailure()) {
-            Assert.notNull(this.authenticationEntryPoint, "An AuthenticationEntryPoint is required");
-        }
-    }
+		if (!isIgnoreFailure()) {
+			Assert.notNull(this.authenticationEntryPoint,
+					"An AuthenticationEntryPoint is required");
+		}
+	}
 
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
-        final boolean debug = logger.isDebugEnabled();
+	protected void doFilterInternal(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain) throws IOException,
+			ServletException {
+		final boolean debug = logger.isDebugEnabled();
 
-        String header = request.getHeader("Authorization");
+		String header = request.getHeader("Authorization");
 
-        if (header == null || !header.startsWith("Basic ")) {
-            chain.doFilter(request, response);
-            return;
-        }
+		if (header == null || !header.startsWith("Basic ")) {
+			chain.doFilter(request, response);
+			return;
+		}
 
-        try {
-            String[] tokens = extractAndDecodeHeader(header, request);
-            assert tokens.length == 2;
+		try {
+			String[] tokens = extractAndDecodeHeader(header, request);
+			assert tokens.length == 2;
 
-            String username = tokens[0];
+			String username = tokens[0];
 
-            if (debug) {
-                logger.debug("Basic Authentication Authorization header found for user '" + username + "'");
-            }
+			if (debug) {
+				logger.debug("Basic Authentication Authorization header found for user '"
+						+ username + "'");
+			}
 
-            if (authenticationIsRequired(username)) {
-                UsernamePasswordAuthenticationToken authRequest =
-                        new UsernamePasswordAuthenticationToken(username, tokens[1]);
-                authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
-                Authentication authResult = authenticationManager.authenticate(authRequest);
+			if (authenticationIsRequired(username)) {
+				UsernamePasswordAuthenticationToken authRequest = new UsernamePasswordAuthenticationToken(
+						username, tokens[1]);
+				authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
+				Authentication authResult = authenticationManager
+						.authenticate(authRequest);
 
-                if (debug) {
-                    logger.debug("Authentication success: " + authResult);
-                }
+				if (debug) {
+					logger.debug("Authentication success: " + authResult);
+				}
 
-                SecurityContextHolder.getContext().setAuthentication(authResult);
+				SecurityContextHolder.getContext().setAuthentication(authResult);
 
-                rememberMeServices.loginSuccess(request, response, authResult);
+				rememberMeServices.loginSuccess(request, response, authResult);
 
-                onSuccessfulAuthentication(request, response, authResult);
-            }
+				onSuccessfulAuthentication(request, response, authResult);
+			}
 
-        } catch (AuthenticationException failed) {
-            SecurityContextHolder.clearContext();
+		}
+		catch (AuthenticationException failed) {
+			SecurityContextHolder.clearContext();
 
-            if (debug) {
-                logger.debug("Authentication request for failed: " + failed);
-            }
+			if (debug) {
+				logger.debug("Authentication request for failed: " + failed);
+			}
 
-            rememberMeServices.loginFail(request, response);
+			rememberMeServices.loginFail(request, response);
 
-            onUnsuccessfulAuthentication(request, response, failed);
+			onUnsuccessfulAuthentication(request, response, failed);
 
-            if (ignoreFailure) {
-                chain.doFilter(request, response);
-            } else {
-                authenticationEntryPoint.commence(request, response, failed);
-            }
+			if (ignoreFailure) {
+				chain.doFilter(request, response);
+			}
+			else {
+				authenticationEntryPoint.commence(request, response, failed);
+			}
 
-            return;
-        }
+			return;
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
+	/**
+	 * Decodes the header into a username and password.
+	 *
+	 * @throws BadCredentialsException if the Basic header is not present or is not valid
+	 * Base64
+	 */
+	private String[] extractAndDecodeHeader(String header, HttpServletRequest request)
+			throws IOException {
 
+		byte[] base64Token = header.substring(6).getBytes("UTF-8");
+		byte[] decoded;
+		try {
+			decoded = Base64.decode(base64Token);
+		}
+		catch (IllegalArgumentException e) {
+			throw new BadCredentialsException(
+					"Failed to decode basic authentication token");
+		}
 
-    /**
-     * Decodes the header into a username and password.
-     *
-     * @throws BadCredentialsException if the Basic header is not present or is not valid Base64
-     */
-    private String[] extractAndDecodeHeader(String header, HttpServletRequest request) throws IOException {
+		String token = new String(decoded, getCredentialsCharset(request));
 
-        byte[] base64Token = header.substring(6).getBytes("UTF-8");
-        byte[] decoded;
-        try {
-            decoded = Base64.decode(base64Token);
-        } catch (IllegalArgumentException e) {
-            throw new BadCredentialsException("Failed to decode basic authentication token");
-        }
+		int delim = token.indexOf(":");
 
-        String token = new String(decoded, getCredentialsCharset(request));
+		if (delim == -1) {
+			throw new BadCredentialsException("Invalid basic authentication token");
+		}
+		return new String[] { token.substring(0, delim), token.substring(delim + 1) };
+	}
 
-        int delim = token.indexOf(":");
+	private boolean authenticationIsRequired(String username) {
+		// Only reauthenticate if username doesn't match SecurityContextHolder and user
+		// isn't authenticated
+		// (see SEC-53)
+		Authentication existingAuth = SecurityContextHolder.getContext()
+				.getAuthentication();
 
-        if (delim == -1) {
-            throw new BadCredentialsException("Invalid basic authentication token");
-        }
-        return new String[] {token.substring(0, delim), token.substring(delim + 1)};
-    }
+		if (existingAuth == null || !existingAuth.isAuthenticated()) {
+			return true;
+		}
 
-    private boolean authenticationIsRequired(String username) {
-        // Only reauthenticate if username doesn't match SecurityContextHolder and user isn't authenticated
-        // (see SEC-53)
-        Authentication existingAuth = SecurityContextHolder.getContext().getAuthentication();
+		// Limit username comparison to providers which use usernames (ie
+		// UsernamePasswordAuthenticationToken)
+		// (see SEC-348)
 
-        if(existingAuth == null || !existingAuth.isAuthenticated()) {
-            return true;
-        }
+		if (existingAuth instanceof UsernamePasswordAuthenticationToken
+				&& !existingAuth.getName().equals(username)) {
+			return true;
+		}
 
-        // Limit username comparison to providers which use usernames (ie UsernamePasswordAuthenticationToken)
-        // (see SEC-348)
+		// Handle unusual condition where an AnonymousAuthenticationToken is already
+		// present
+		// This shouldn't happen very often, as BasicProcessingFitler is meant to be
+		// earlier in the filter
+		// chain than AnonymousAuthenticationFilter. Nevertheless, presence of both an
+		// AnonymousAuthenticationToken
+		// together with a BASIC authentication request header should indicate
+		// reauthentication using the
+		// BASIC protocol is desirable. This behaviour is also consistent with that
+		// provided by form and digest,
+		// both of which force re-authentication if the respective header is detected (and
+		// in doing so replace
+		// any existing AnonymousAuthenticationToken). See SEC-610.
+		if (existingAuth instanceof AnonymousAuthenticationToken) {
+			return true;
+		}
 
-        if (existingAuth instanceof UsernamePasswordAuthenticationToken && !existingAuth.getName().equals(username)) {
-            return true;
-        }
+		return false;
+	}
 
-        // Handle unusual condition where an AnonymousAuthenticationToken is already present
-        // This shouldn't happen very often, as BasicProcessingFitler is meant to be earlier in the filter
-        // chain than AnonymousAuthenticationFilter. Nevertheless, presence of both an AnonymousAuthenticationToken
-        // together with a BASIC authentication request header should indicate reauthentication using the
-        // BASIC protocol is desirable. This behaviour is also consistent with that provided by form and digest,
-        // both of which force re-authentication if the respective header is detected (and in doing so replace
-        // any existing AnonymousAuthenticationToken). See SEC-610.
-        if (existingAuth instanceof AnonymousAuthenticationToken) {
-            return true;
-        }
+	protected void onSuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, Authentication authResult) throws IOException {
+	}
 
-        return false;
-    }
+	protected void onUnsuccessfulAuthentication(HttpServletRequest request,
+			HttpServletResponse response, AuthenticationException failed)
+			throws IOException {
+	}
 
-    protected void onSuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
-            Authentication authResult) throws IOException {
-    }
+	protected AuthenticationEntryPoint getAuthenticationEntryPoint() {
+		return authenticationEntryPoint;
+	}
 
-    protected void onUnsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
-            AuthenticationException failed) throws IOException {
-    }
+	protected AuthenticationManager getAuthenticationManager() {
+		return authenticationManager;
+	}
 
-    protected AuthenticationEntryPoint getAuthenticationEntryPoint() {
-        return authenticationEntryPoint;
-    }
+	protected boolean isIgnoreFailure() {
+		return ignoreFailure;
+	}
 
-    protected AuthenticationManager getAuthenticationManager() {
-        return authenticationManager;
-    }
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
 
-    protected boolean isIgnoreFailure() {
-        return ignoreFailure;
-    }
+	public void setRememberMeServices(RememberMeServices rememberMeServices) {
+		Assert.notNull(rememberMeServices, "rememberMeServices cannot be null");
+		this.rememberMeServices = rememberMeServices;
+	}
 
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
+	public void setCredentialsCharset(String credentialsCharset) {
+		Assert.hasText(credentialsCharset, "credentialsCharset cannot be null or empty");
+		this.credentialsCharset = credentialsCharset;
+	}
 
-    public void setRememberMeServices(RememberMeServices rememberMeServices) {
-        Assert.notNull(rememberMeServices, "rememberMeServices cannot be null");
-        this.rememberMeServices = rememberMeServices;
-    }
-
-    public void setCredentialsCharset(String credentialsCharset) {
-        Assert.hasText(credentialsCharset, "credentialsCharset cannot be null or empty");
-        this.credentialsCharset = credentialsCharset;
-    }
-
-    protected String getCredentialsCharset(HttpServletRequest httpRequest) {
-        return credentialsCharset;
-    }
+	protected String getCredentialsCharset(HttpServletRequest httpRequest) {
+		return credentialsCharset;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java
index 1c6cac55c3..25b0028efe 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java
@@ -13,188 +13,203 @@ import org.springframework.util.StringUtils;
 
 final class DigestAuthUtils {
 
-    private static final String[] EMPTY_STRING_ARRAY = new String[0];
+	private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
-    static String encodePasswordInA1Format(String username, String realm, String password) {
-        String a1 = username + ":" + realm + ":" + password;
+	static String encodePasswordInA1Format(String username, String realm, String password) {
+		String a1 = username + ":" + realm + ":" + password;
 
-        return md5Hex(a1);
-    }
+		return md5Hex(a1);
+	}
 
-    static String[] splitIgnoringQuotes(String str, char separatorChar) {
-        if (str == null) {
-            return null;
-        }
+	static String[] splitIgnoringQuotes(String str, char separatorChar) {
+		if (str == null) {
+			return null;
+		}
 
-        int len = str.length();
+		int len = str.length();
 
-        if (len == 0) {
-            return EMPTY_STRING_ARRAY;
-        }
+		if (len == 0) {
+			return EMPTY_STRING_ARRAY;
+		}
 
-        List<String> list = new ArrayList<String>();
-        int i = 0;
-        int start = 0;
-        boolean match = false;
+		List<String> list = new ArrayList<String>();
+		int i = 0;
+		int start = 0;
+		boolean match = false;
 
-        while (i < len) {
-            if (str.charAt(i) == '"') {
-                i++;
-                while (i < len) {
-                    if (str.charAt(i) == '"') {
-                        i++;
-                        break;
-                    }
-                    i++;
-                }
-                match = true;
-                continue;
-            }
-            if (str.charAt(i) == separatorChar) {
-                if (match) {
-                    list.add(str.substring(start, i));
-                    match = false;
-                }
-                start = ++i;
-                continue;
-            }
-            match = true;
-            i++;
-        }
-        if (match) {
-            list.add(str.substring(start, i));
-        }
+		while (i < len) {
+			if (str.charAt(i) == '"') {
+				i++;
+				while (i < len) {
+					if (str.charAt(i) == '"') {
+						i++;
+						break;
+					}
+					i++;
+				}
+				match = true;
+				continue;
+			}
+			if (str.charAt(i) == separatorChar) {
+				if (match) {
+					list.add(str.substring(start, i));
+					match = false;
+				}
+				start = ++i;
+				continue;
+			}
+			match = true;
+			i++;
+		}
+		if (match) {
+			list.add(str.substring(start, i));
+		}
 
-        return list.toArray(new String[list.size()]);
-    }
+		return list.toArray(new String[list.size()]);
+	}
 
-    /**
-     * Computes the <code>response</code> portion of a Digest authentication header. Both the server and user
-     * agent should compute the <code>response</code> independently. Provided as a static method to simplify the
-     * coding of user agents.
-     *
-     * @param passwordAlreadyEncoded true if the password argument is already encoded in the correct format. False if
-     *                               it is plain text.
-     * @param username               the user's login name.
-     * @param realm                  the name of the realm.
-     * @param password               the user's password in plaintext or ready-encoded.
-     * @param httpMethod             the HTTP request method (GET, POST etc.)
-     * @param uri                    the request URI.
-     * @param qop                    the qop directive, or null if not set.
-     * @param nonce                  the nonce supplied by the server
-     * @param nc                     the "nonce-count" as defined in RFC 2617.
-     * @param cnonce                 opaque string supplied by the client when qop is set.
-     * @return the MD5 of the digest authentication response, encoded in hex
-     * @throws IllegalArgumentException if the supplied qop value is unsupported.
-     */
-    static String generateDigest(boolean passwordAlreadyEncoded, String username, String realm, String password,
-                                        String httpMethod, String uri, String qop, String nonce, String nc, String cnonce)
-            throws IllegalArgumentException {
-        String a1Md5;
-        String a2 = httpMethod + ":" + uri;
-        String a2Md5 = md5Hex(a2);
+	/**
+	 * Computes the <code>response</code> portion of a Digest authentication header. Both
+	 * the server and user agent should compute the <code>response</code> independently.
+	 * Provided as a static method to simplify the coding of user agents.
+	 *
+	 * @param passwordAlreadyEncoded true if the password argument is already encoded in
+	 * the correct format. False if it is plain text.
+	 * @param username the user's login name.
+	 * @param realm the name of the realm.
+	 * @param password the user's password in plaintext or ready-encoded.
+	 * @param httpMethod the HTTP request method (GET, POST etc.)
+	 * @param uri the request URI.
+	 * @param qop the qop directive, or null if not set.
+	 * @param nonce the nonce supplied by the server
+	 * @param nc the "nonce-count" as defined in RFC 2617.
+	 * @param cnonce opaque string supplied by the client when qop is set.
+	 * @return the MD5 of the digest authentication response, encoded in hex
+	 * @throws IllegalArgumentException if the supplied qop value is unsupported.
+	 */
+	static String generateDigest(boolean passwordAlreadyEncoded, String username,
+			String realm, String password, String httpMethod, String uri, String qop,
+			String nonce, String nc, String cnonce) throws IllegalArgumentException {
+		String a1Md5;
+		String a2 = httpMethod + ":" + uri;
+		String a2Md5 = md5Hex(a2);
 
-        if (passwordAlreadyEncoded) {
-            a1Md5 = password;
-        } else {
-            a1Md5 = DigestAuthUtils.encodePasswordInA1Format(username, realm, password);
-        }
+		if (passwordAlreadyEncoded) {
+			a1Md5 = password;
+		}
+		else {
+			a1Md5 = DigestAuthUtils.encodePasswordInA1Format(username, realm, password);
+		}
 
-        String digest;
+		String digest;
 
-        if (qop == null) {
-            // as per RFC 2069 compliant clients (also reaffirmed by RFC 2617)
-            digest = a1Md5 + ":" + nonce + ":" + a2Md5;
-        } else if ("auth".equals(qop)) {
-            // As per RFC 2617 compliant clients
-            digest = a1Md5 + ":" + nonce + ":" + nc + ":" + cnonce + ":" + qop + ":" + a2Md5;
-        } else {
-            throw new IllegalArgumentException("This method does not support a qop: '" + qop + "'");
-        }
+		if (qop == null) {
+			// as per RFC 2069 compliant clients (also reaffirmed by RFC 2617)
+			digest = a1Md5 + ":" + nonce + ":" + a2Md5;
+		}
+		else if ("auth".equals(qop)) {
+			// As per RFC 2617 compliant clients
+			digest = a1Md5 + ":" + nonce + ":" + nc + ":" + cnonce + ":" + qop + ":"
+					+ a2Md5;
+		}
+		else {
+			throw new IllegalArgumentException("This method does not support a qop: '"
+					+ qop + "'");
+		}
 
-        return md5Hex(digest);
-    }
+		return md5Hex(digest);
+	}
 
-    /**
-     * Takes an array of <code>String</code>s, and for each element removes any instances of
-     * <code>removeCharacter</code>, and splits the element based on the <code>delimiter</code>. A <code>Map</code> is
-     * then generated, with the left of the delimiter providing the key, and the right of the delimiter providing the
-     * value.<p>Will trim both the key and value before adding to the <code>Map</code>.</p>
-     *
-     * @param array            the array to process
-     * @param delimiter        to split each element using (typically the equals symbol)
-     * @param removeCharacters one or more characters to remove from each element prior to attempting the split
-     *                         operation (typically the quotation mark symbol) or <code>null</code> if no removal should occur
-     * @return a <code>Map</code> representing the array contents, or <code>null</code> if the array to process was
-     *         null or empty
-     */
-    static Map<String, String> splitEachArrayElementAndCreateMap(String[] array, String delimiter, String removeCharacters) {
-        if ((array == null) || (array.length == 0)) {
-            return null;
-        }
+	/**
+	 * Takes an array of <code>String</code>s, and for each element removes any instances
+	 * of <code>removeCharacter</code>, and splits the element based on the
+	 * <code>delimiter</code>. A <code>Map</code> is then generated, with the left of the
+	 * delimiter providing the key, and the right of the delimiter providing the value.
+	 * <p>
+	 * Will trim both the key and value before adding to the <code>Map</code>.
+	 * </p>
+	 *
+	 * @param array the array to process
+	 * @param delimiter to split each element using (typically the equals symbol)
+	 * @param removeCharacters one or more characters to remove from each element prior to
+	 * attempting the split operation (typically the quotation mark symbol) or
+	 * <code>null</code> if no removal should occur
+	 * @return a <code>Map</code> representing the array contents, or <code>null</code> if
+	 * the array to process was null or empty
+	 */
+	static Map<String, String> splitEachArrayElementAndCreateMap(String[] array,
+			String delimiter, String removeCharacters) {
+		if ((array == null) || (array.length == 0)) {
+			return null;
+		}
 
-        Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<String, String>();
 
-        for (String s : array) {
-            String postRemove;
+		for (String s : array) {
+			String postRemove;
 
-            if (removeCharacters == null) {
-                postRemove = s;
-            } else {
-                postRemove = StringUtils.replace(s, removeCharacters, "");
-            }
+			if (removeCharacters == null) {
+				postRemove = s;
+			}
+			else {
+				postRemove = StringUtils.replace(s, removeCharacters, "");
+			}
 
-            String[] splitThisArrayElement = split(postRemove, delimiter);
+			String[] splitThisArrayElement = split(postRemove, delimiter);
 
-            if (splitThisArrayElement == null) {
-                continue;
-            }
+			if (splitThisArrayElement == null) {
+				continue;
+			}
 
-            map.put(splitThisArrayElement[0].trim(), splitThisArrayElement[1].trim());
-        }
+			map.put(splitThisArrayElement[0].trim(), splitThisArrayElement[1].trim());
+		}
 
-        return map;
-    }
+		return map;
+	}
 
+	/**
+	 * Splits a <code>String</code> at the first instance of the delimiter.
+	 * <p>
+	 * Does not include the delimiter in the response.
+	 * </p>
+	 *
+	 * @param toSplit the string to split
+	 * @param delimiter to split the string up with
+	 * @return a two element array with index 0 being before the delimiter, and index 1
+	 * being after the delimiter (neither element includes the delimiter)
+	 * @throws IllegalArgumentException if an argument was invalid
+	 */
+	static String[] split(String toSplit, String delimiter) {
+		Assert.hasLength(toSplit, "Cannot split a null or empty string");
+		Assert.hasLength(delimiter,
+				"Cannot use a null or empty delimiter to split a string");
 
-    /**
-     * Splits a <code>String</code> at the first instance of the delimiter.<p>Does not include the delimiter in
-     * the response.</p>
-     *
-     * @param toSplit   the string to split
-     * @param delimiter to split the string up with
-     * @return a two element array with index 0 being before the delimiter, and index 1 being after the delimiter
-     *         (neither element includes the delimiter)
-     * @throws IllegalArgumentException if an argument was invalid
-     */
-    static String[] split(String toSplit, String delimiter) {
-        Assert.hasLength(toSplit, "Cannot split a null or empty string");
-        Assert.hasLength(delimiter, "Cannot use a null or empty delimiter to split a string");
+		if (delimiter.length() != 1) {
+			throw new IllegalArgumentException(
+					"Delimiter can only be one character in length");
+		}
 
-        if (delimiter.length() != 1) {
-            throw new IllegalArgumentException("Delimiter can only be one character in length");
-        }
+		int offset = toSplit.indexOf(delimiter);
 
-        int offset = toSplit.indexOf(delimiter);
+		if (offset < 0) {
+			return null;
+		}
 
-        if (offset < 0) {
-            return null;
-        }
+		String beforeDelimiter = toSplit.substring(0, offset);
+		String afterDelimiter = toSplit.substring(offset + 1);
 
-        String beforeDelimiter = toSplit.substring(0, offset);
-        String afterDelimiter = toSplit.substring(offset + 1);
+		return new String[] { beforeDelimiter, afterDelimiter };
+	}
 
-        return new String[]{beforeDelimiter, afterDelimiter};
-    }
+	static String md5Hex(String data) {
+		MessageDigest digest;
+		try {
+			digest = MessageDigest.getInstance("MD5");
+		}
+		catch (NoSuchAlgorithmException e) {
+			throw new IllegalStateException("No MD5 algorithm available!");
+		}
 
-    static String md5Hex(String data) {
-        MessageDigest digest;
-        try {
-            digest = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            throw new IllegalStateException("No MD5 algorithm available!");
-        }
-
-        return new String(Hex.encode(digest.digest(data.getBytes())));
-    }
+		return new String(Hex.encode(digest.digest(data.getBytes())));
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java
index c6c8417edd..b9ce9dd488 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPoint.java
@@ -29,102 +29,110 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.web.AuthenticationEntryPoint;
 
-
 /**
- * Used by the <code>SecurityEnforcementFilter</code> to commence authentication via the {@link
- * DigestAuthenticationFilter}.
+ * Used by the <code>SecurityEnforcementFilter</code> to commence authentication via the
+ * {@link DigestAuthenticationFilter}.
  * <p>
  * The nonce sent back to the user agent will be valid for the period indicated by
- * {@link #setNonceValiditySeconds(int)}. By default this is 300 seconds. Shorter times should be used if replay
- * attacks are a major concern. Larger values can be used if performance is a greater concern. This class correctly
- * presents the <code>stale=true</code> header when the nonce has expired, so properly implemented user agents will
- * automatically renegotiate with a new nonce value (i.e. without presenting a new password dialog box to the user).
+ * {@link #setNonceValiditySeconds(int)}. By default this is 300 seconds. Shorter times
+ * should be used if replay attacks are a major concern. Larger values can be used if
+ * performance is a greater concern. This class correctly presents the
+ * <code>stale=true</code> header when the nonce has expired, so properly implemented user
+ * agents will automatically renegotiate with a new nonce value (i.e. without presenting a
+ * new password dialog box to the user).
  *
  * @author Ben Alex
  */
-public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint, InitializingBean, Ordered {
-    //~ Static fields/initializers =====================================================================================
+public class DigestAuthenticationEntryPoint implements AuthenticationEntryPoint,
+		InitializingBean, Ordered {
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final Log logger = LogFactory.getLog(DigestAuthenticationEntryPoint.class);
+	private static final Log logger = LogFactory
+			.getLog(DigestAuthenticationEntryPoint.class);
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String key;
-    private String realmName;
-    private int nonceValiditySeconds = 300;
-    private int order = Integer.MAX_VALUE; // ~ default
+	private String key;
+	private String realmName;
+	private int nonceValiditySeconds = 300;
+	private int order = Integer.MAX_VALUE; // ~ default
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public int getOrder() {
-        return order;
-    }
+	public int getOrder() {
+		return order;
+	}
 
-    public void setOrder(int order) {
-        this.order = order;
-    }
+	public void setOrder(int order) {
+		this.order = order;
+	}
 
-    public void afterPropertiesSet() throws Exception {
-        if ((realmName == null) || "".equals(realmName)) {
-            throw new IllegalArgumentException("realmName must be specified");
-        }
+	public void afterPropertiesSet() throws Exception {
+		if ((realmName == null) || "".equals(realmName)) {
+			throw new IllegalArgumentException("realmName must be specified");
+		}
 
-        if ((key == null) || "".equals(key)) {
-            throw new IllegalArgumentException("key must be specified");
-        }
-    }
+		if ((key == null) || "".equals(key)) {
+			throw new IllegalArgumentException("key must be specified");
+		}
+	}
 
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException)
-        throws IOException, ServletException {
-        HttpServletResponse httpResponse = (HttpServletResponse) response;
+	public void commence(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException authException) throws IOException, ServletException {
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
 
-        // compute a nonce (do not use remote IP address due to proxy farms)
-        // format of nonce is:
-        //   base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
-        long expiryTime = System.currentTimeMillis() + (nonceValiditySeconds * 1000);
-        String signatureValue = DigestAuthUtils.md5Hex(expiryTime + ":" + key);
-        String nonceValue = expiryTime + ":" + signatureValue;
-        String nonceValueBase64 = new String(Base64.encode(nonceValue.getBytes()));
+		// compute a nonce (do not use remote IP address due to proxy farms)
+		// format of nonce is:
+		// base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
+		long expiryTime = System.currentTimeMillis() + (nonceValiditySeconds * 1000);
+		String signatureValue = DigestAuthUtils.md5Hex(expiryTime + ":" + key);
+		String nonceValue = expiryTime + ":" + signatureValue;
+		String nonceValueBase64 = new String(Base64.encode(nonceValue.getBytes()));
 
-        // qop is quality of protection, as defined by RFC 2617.
-        // we do not use opaque due to IE violation of RFC 2617 in not
-        // representing opaque on subsequent requests in same session.
-        String authenticateHeader = "Digest realm=\"" + realmName + "\", " + "qop=\"auth\", nonce=\""
-            + nonceValueBase64 + "\"";
+		// qop is quality of protection, as defined by RFC 2617.
+		// we do not use opaque due to IE violation of RFC 2617 in not
+		// representing opaque on subsequent requests in same session.
+		String authenticateHeader = "Digest realm=\"" + realmName + "\", "
+				+ "qop=\"auth\", nonce=\"" + nonceValueBase64 + "\"";
 
-        if (authException instanceof NonceExpiredException) {
-            authenticateHeader = authenticateHeader + ", stale=\"true\"";
-        }
+		if (authException instanceof NonceExpiredException) {
+			authenticateHeader = authenticateHeader + ", stale=\"true\"";
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("WWW-Authenticate header sent to user agent: " + authenticateHeader);
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("WWW-Authenticate header sent to user agent: "
+					+ authenticateHeader);
+		}
 
-        httpResponse.addHeader("WWW-Authenticate", authenticateHeader);
-        httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage());
-    }
+		httpResponse.addHeader("WWW-Authenticate", authenticateHeader);
+		httpResponse.sendError(HttpServletResponse.SC_UNAUTHORIZED,
+				authException.getMessage());
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public int getNonceValiditySeconds() {
-        return nonceValiditySeconds;
-    }
+	public int getNonceValiditySeconds() {
+		return nonceValiditySeconds;
+	}
 
-    public String getRealmName() {
-        return realmName;
-    }
+	public String getRealmName() {
+		return realmName;
+	}
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+	public void setKey(String key) {
+		this.key = key;
+	}
 
-    public void setNonceValiditySeconds(int nonceValiditySeconds) {
-        this.nonceValiditySeconds = nonceValiditySeconds;
-    }
+	public void setNonceValiditySeconds(int nonceValiditySeconds) {
+		this.nonceValiditySeconds = nonceValiditySeconds;
+	}
 
-    public void setRealmName(String realmName) {
-        this.realmName = realmName;
-    }
+	public void setRealmName(String realmName) {
+		this.realmName = realmName;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java
index ced37900d2..02947e5179 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilter.java
@@ -49,359 +49,405 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
  * Processes a HTTP request's Digest authorization headers, putting the result into the
  * <code>SecurityContextHolder</code>.
  * <p>
- * For a detailed background on what this filter is designed to process, refer to
- * <a href="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617</a> (which superseded RFC 2069, although this
- * filter support clients that implement either RFC 2617 or RFC 2069).
+ * For a detailed background on what this filter is designed to process, refer to <a
+ * href="http://www.ietf.org/rfc/rfc2617.txt">RFC 2617</a> (which superseded RFC 2069,
+ * although this filter support clients that implement either RFC 2617 or RFC 2069).
  * <p>
- * This filter can be used to provide Digest authentication services to both remoting protocol clients (such as
- * Hessian and SOAP) as well as standard user agents (such as Internet Explorer and FireFox).
+ * This filter can be used to provide Digest authentication services to both remoting
+ * protocol clients (such as Hessian and SOAP) as well as standard user agents (such as
+ * Internet Explorer and FireFox).
  * <p>
- * 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
- * DigestAuthenticationEntryPoint}.
+ * 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 DigestAuthenticationEntryPoint}.
  * <p>
- * If authentication is successful, the resulting {@link org.springframework.security.core.Authentication Authentication}
- * object will be placed into the <code>SecurityContextHolder</code>.
+ * If authentication is successful, the resulting
+ * {@link org.springframework.security.core.Authentication Authentication} object will be
+ * placed into the <code>SecurityContextHolder</code>.
  * <p>
- * If authentication fails, an {@link org.springframework.security.web.AuthenticationEntryPoint AuthenticationEntryPoint}
- * implementation is called. This must always be {@link DigestAuthenticationEntryPoint}, which will prompt the user
- * to authenticate again via Digest authentication.
+ * If authentication fails, an
+ * {@link org.springframework.security.web.AuthenticationEntryPoint
+ * AuthenticationEntryPoint} implementation is called. This must always be
+ * {@link DigestAuthenticationEntryPoint}, which will prompt the user to authenticate
+ * again via Digest authentication.
  * <p>
- * Note there are limitations to Digest authentication, although it is a more comprehensive and secure solution
- * than Basic authentication. Please see RFC 2617 section 4 for a full discussion on the advantages of Digest
- * authentication over Basic authentication, including commentary on the limitations that it still imposes.
+ * Note there are limitations to Digest authentication, although it is a more
+ * comprehensive and secure solution than Basic authentication. Please see RFC 2617
+ * section 4 for a full discussion on the advantages of Digest authentication over Basic
+ * authentication, including commentary on the limitations that it still imposes.
  *
  * @author Ben Alex
  * @author Luke Taylor
  * @since 1.0.0
  */
-public class DigestAuthenticationFilter extends GenericFilterBean implements MessageSourceAware {
-    //~ Static fields/initializers =====================================================================================
-
-
-    private static final Log logger = LogFactory.getLog(DigestAuthenticationFilter.class);
-
-    //~ Instance fields ================================================================================================
-
-    private AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
-    private DigestAuthenticationEntryPoint authenticationEntryPoint;
-    protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-    private UserCache userCache = new NullUserCache();
-    private UserDetailsService userDetailsService;
-    private boolean passwordAlreadyEncoded = false;
-    private boolean createAuthenticatedToken = false;
-
-    //~ Methods ========================================================================================================
-
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(userDetailsService, "A UserDetailsService is required");
-        Assert.notNull(authenticationEntryPoint, "A DigestAuthenticationEntryPoint is required");
-    }
-
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
-
-        String header = request.getHeader("Authorization");
-
-        if (header == null || !header.startsWith("Digest ")) {
-            chain.doFilter(request, response);
-
-            return;
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Digest Authorization header received from user agent: " + header);
-        }
-
-        DigestData digestAuth = new DigestData(header);
-
-        try {
-            digestAuth.validateAndDecode(authenticationEntryPoint.getKey(), authenticationEntryPoint.getRealmName());
-        } catch (BadCredentialsException e) {
-            fail(request, response, e);
-
-            return;
-        }
-
-        // Lookup password for presented username
-        // NB: DAO-provided password MUST be clear text - not encoded/salted
-        // (unless this instance's passwordAlreadyEncoded property is 'false')
-        boolean cacheWasUsed = true;
-        UserDetails user = userCache.getUserFromCache(digestAuth.getUsername());
-        String serverDigestMd5;
-
-        try {
-            if (user == null) {
-                cacheWasUsed = false;
-                user = userDetailsService.loadUserByUsername(digestAuth.getUsername());
-
-                if (user == null) {
-                    throw new AuthenticationServiceException(
-                            "AuthenticationDao returned null, which is an interface contract violation");
-                }
-
-                userCache.putUserInCache(user);
-            }
-
-            serverDigestMd5 = digestAuth.calculateServerDigest(user.getPassword(), request.getMethod());
-
-            // If digest is incorrect, try refreshing from backend and recomputing
-            if (!serverDigestMd5.equals(digestAuth.getResponse()) && cacheWasUsed) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug(
-                            "Digest comparison failure; trying to refresh user from DAO in case password had changed");
-                }
-
-                user = userDetailsService.loadUserByUsername(digestAuth.getUsername());
-                userCache.putUserInCache(user);
-                serverDigestMd5 = digestAuth.calculateServerDigest(user.getPassword(), request.getMethod());
-            }
-
-        } catch (UsernameNotFoundException notFound) {
-            fail(request, response,
-                    new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.usernameNotFound",
-                            new Object[]{digestAuth.getUsername()}, "Username {0} not found")));
-
-            return;
-        }
-
-
-        // If digest is still incorrect, definitely reject authentication attempt
-        if (!serverDigestMd5.equals(digestAuth.getResponse())) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Expected response: '" + serverDigestMd5 + "' but received: '" + digestAuth.getResponse()
-                        + "'; is AuthenticationDao returning clear text passwords?");
-            }
-
-            fail(request, response,
-                    new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.incorrectResponse",
-                            "Incorrect response")));
-            return;
-        }
-
-        // To get this far, the digest must have been valid
-        // Check the nonce has not expired
-        // We do this last so we can direct the user agent its nonce is stale
-        // but the request was otherwise appearing to be valid
-        if (digestAuth.isNonceExpired()) {
-            fail(request, response,
-                    new NonceExpiredException(messages.getMessage("DigestAuthenticationFilter.nonceExpired",
-                            "Nonce has expired/timed out")));
-
-            return;
-        }
-
-        if (logger.isDebugEnabled()) {
-            logger.debug("Authentication success for user: '" + digestAuth.getUsername()
-                    + "' with response: '" + digestAuth.getResponse() + "'");
-        }
-
-        SecurityContextHolder.getContext().setAuthentication(createSuccessfulAuthentication(request, user));
-
-        chain.doFilter(request, response);
-    }
-
-    private Authentication createSuccessfulAuthentication(HttpServletRequest request, UserDetails user) {
-        UsernamePasswordAuthenticationToken authRequest;
-        if (createAuthenticatedToken) {
-            authRequest = new UsernamePasswordAuthenticationToken(user, user.getPassword(), user.getAuthorities());
-        }
-        else {
-            authRequest = new UsernamePasswordAuthenticationToken(user, user.getPassword());
-        }
-
-        authRequest.setDetails(authenticationDetailsSource.buildDetails((HttpServletRequest) request));
-
-        return authRequest;
-    }
-
-    private void fail(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed)
-            throws IOException, ServletException {
-        SecurityContextHolder.getContext().setAuthentication(null);
-
-        if (logger.isDebugEnabled()) {
-            logger.debug(failed);
-        }
-
-        authenticationEntryPoint.commence(request, response, failed);
-    }
-
-    protected final DigestAuthenticationEntryPoint getAuthenticationEntryPoint() {
-        return authenticationEntryPoint;
-    }
-
-    public UserCache getUserCache() {
-        return userCache;
-    }
-
-    public UserDetailsService getUserDetailsService() {
-        return userDetailsService;
-    }
-
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
-        Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
-        this.authenticationDetailsSource = authenticationDetailsSource;
-    }
-
-    public void setAuthenticationEntryPoint(DigestAuthenticationEntryPoint authenticationEntryPoint) {
-        this.authenticationEntryPoint = authenticationEntryPoint;
-    }
-
-    public void setMessageSource(MessageSource messageSource) {
-        this.messages = new MessageSourceAccessor(messageSource);
-    }
-
-    public void setPasswordAlreadyEncoded(boolean passwordAlreadyEncoded) {
-        this.passwordAlreadyEncoded = passwordAlreadyEncoded;
-    }
-
-    public void setUserCache(UserCache userCache) {
-        this.userCache = userCache;
-    }
-
-    public void setUserDetailsService(UserDetailsService userDetailsService) {
-        this.userDetailsService = userDetailsService;
-    }
-
-
-    /**
-     * If you set this property, the Authentication object, which is
-     * created after the successful digest authentication will be marked
-     * as <b>authenticated</b> and filled with the authorities loaded by
-     * the UserDetailsService. It therefore will not be re-authenticated
-     * by your AuthenticationProvider. This means, that only the password
-     * of the user is checked, but not the flags like isEnabled() or
-     * isAccountNonExpired(). You will save some time by enabling this flag,
-     * as otherwise your UserDetailsService will be called twice. A more secure
-     * option would be to introduce a cache around your UserDetailsService, but
-     * if you don't use these flags, you can also safely enable this option.
-     *
-     * @param createAuthenticatedToken default is false
-     */
-    public void setCreateAuthenticatedToken(boolean createAuthenticatedToken) {
-        this.createAuthenticatedToken = createAuthenticatedToken;
-    }
-
-    private class DigestData {
-        private final String username;
-        private final String realm;
-        private final String nonce;
-        private final String uri;
-        private final String response;
-        private final String qop;
-        private final String nc;
-        private final String cnonce;
-        private final String section212response;
-        private long nonceExpiryTime;
-
-        DigestData(String header) {
-            section212response = header.substring(7);
-            String[] headerEntries = DigestAuthUtils.splitIgnoringQuotes(section212response, ',');
-            Map<String,String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
-
-            username = headerMap.get("username");
-            realm = headerMap.get("realm");
-            nonce = headerMap.get("nonce");
-            uri = headerMap.get("uri");
-            response = headerMap.get("response");
-            qop = headerMap.get("qop"); // RFC 2617 extension
-            nc = headerMap.get("nc"); // RFC 2617 extension
-            cnonce = headerMap.get("cnonce"); // RFC 2617 extension
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Extracted username: '" + username + "'; realm: '" + realm + "'; nonce: '"
-                        + nonce + "'; uri: '" + uri + "'; response: '" + response + "'");
-            }
-        }
-
-        void validateAndDecode(String entryPointKey, String expectedRealm) throws BadCredentialsException {
-            // Check all required parameters were supplied (ie RFC 2069)
-            if ((username == null) || (realm == null) || (nonce == null) || (uri == null) || (response == null)) {
-                throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.missingMandatory",
-                            new Object[]{section212response}, "Missing mandatory digest value; received header {0}"));
-            }
-            // Check all required parameters for an "auth" qop were supplied (ie RFC 2617)
-            if ("auth".equals(qop)) {
-                if ((nc == null) || (cnonce == null)) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("extracted nc: '" + nc + "'; cnonce: '" + cnonce + "'");
-                    }
-
-                    throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.missingAuth",
-                            new Object[]{section212response}, "Missing mandatory digest value; received header {0}"));
-                }
-            }
-
-            // Check realm name equals what we expected
-            if (!expectedRealm.equals(realm)) {
-                throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.incorrectRealm",
-                            new Object[]{realm, expectedRealm},
-                            "Response realm name '{0}' does not match system realm name of '{1}'"));
-            }
-
-            // Check nonce was Base64 encoded (as sent by DigestAuthenticationEntryPoint)
-            if (!Base64.isBase64(nonce.getBytes())) {
-                throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.nonceEncoding",
-                           new Object[]{nonce}, "Nonce is not encoded in Base64; received nonce {0}"));
-            }
-
-            // Decode nonce from Base64
-            // format of nonce is:
-            // base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
-            String nonceAsPlainText = new String(Base64.decode(nonce.getBytes()));
-            String[] nonceTokens = StringUtils.delimitedListToStringArray(nonceAsPlainText, ":");
-
-            if (nonceTokens.length != 2) {
-                throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.nonceNotTwoTokens",
-                                new Object[]{nonceAsPlainText}, "Nonce should have yielded two tokens but was {0}"));
-            }
-
-            // Extract expiry time from nonce
-
-            try {
-                nonceExpiryTime = new Long(nonceTokens[0]).longValue();
-            } catch (NumberFormatException nfe) {
-                throw new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.nonceNotNumeric",
-                                new Object[]{nonceAsPlainText},
-                                "Nonce token should have yielded a numeric first token, but was {0}"));
-            }
-
-            // Check signature of nonce matches this expiry time
-            String expectedNonceSignature = DigestAuthUtils.md5Hex(nonceExpiryTime + ":" + entryPointKey);
-
-            if (!expectedNonceSignature.equals(nonceTokens[1])) {
-                new BadCredentialsException(messages.getMessage("DigestAuthenticationFilter.nonceCompromised",
-                                new Object[]{nonceAsPlainText}, "Nonce token compromised {0}"));
-            }
-        }
-
-        String calculateServerDigest(String password, String httpMethod) {
-            // Compute the expected response-digest (will be in hex form)
-
-            // Don't catch IllegalArgumentException (already checked validity)
-            return DigestAuthUtils.generateDigest(passwordAlreadyEncoded, username, realm, password,
-                    httpMethod, uri, qop, nonce, nc, cnonce);
-        }
-
-        boolean isNonceExpired() {
-            long now = System.currentTimeMillis();
-            return nonceExpiryTime < now;
-        }
-
-        String getUsername() {
-            return username;
-        }
-
-        String getResponse() {
-            return response;
-        }
-    }
+public class DigestAuthenticationFilter extends GenericFilterBean implements
+		MessageSourceAware {
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	private static final Log logger = LogFactory.getLog(DigestAuthenticationFilter.class);
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	private AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource = new WebAuthenticationDetailsSource();
+	private DigestAuthenticationEntryPoint authenticationEntryPoint;
+	protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+	private UserCache userCache = new NullUserCache();
+	private UserDetailsService userDetailsService;
+	private boolean passwordAlreadyEncoded = false;
+	private boolean createAuthenticatedToken = false;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(userDetailsService, "A UserDetailsService is required");
+		Assert.notNull(authenticationEntryPoint,
+				"A DigestAuthenticationEntryPoint is required");
+	}
+
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
+
+		String header = request.getHeader("Authorization");
+
+		if (header == null || !header.startsWith("Digest ")) {
+			chain.doFilter(request, response);
+
+			return;
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Digest Authorization header received from user agent: "
+					+ header);
+		}
+
+		DigestData digestAuth = new DigestData(header);
+
+		try {
+			digestAuth.validateAndDecode(authenticationEntryPoint.getKey(),
+					authenticationEntryPoint.getRealmName());
+		}
+		catch (BadCredentialsException e) {
+			fail(request, response, e);
+
+			return;
+		}
+
+		// Lookup password for presented username
+		// NB: DAO-provided password MUST be clear text - not encoded/salted
+		// (unless this instance's passwordAlreadyEncoded property is 'false')
+		boolean cacheWasUsed = true;
+		UserDetails user = userCache.getUserFromCache(digestAuth.getUsername());
+		String serverDigestMd5;
+
+		try {
+			if (user == null) {
+				cacheWasUsed = false;
+				user = userDetailsService.loadUserByUsername(digestAuth.getUsername());
+
+				if (user == null) {
+					throw new AuthenticationServiceException(
+							"AuthenticationDao returned null, which is an interface contract violation");
+				}
+
+				userCache.putUserInCache(user);
+			}
+
+			serverDigestMd5 = digestAuth.calculateServerDigest(user.getPassword(),
+					request.getMethod());
+
+			// If digest is incorrect, try refreshing from backend and recomputing
+			if (!serverDigestMd5.equals(digestAuth.getResponse()) && cacheWasUsed) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("Digest comparison failure; trying to refresh user from DAO in case password had changed");
+				}
+
+				user = userDetailsService.loadUserByUsername(digestAuth.getUsername());
+				userCache.putUserInCache(user);
+				serverDigestMd5 = digestAuth.calculateServerDigest(user.getPassword(),
+						request.getMethod());
+			}
+
+		}
+		catch (UsernameNotFoundException notFound) {
+			fail(request,
+					response,
+					new BadCredentialsException(messages.getMessage(
+							"DigestAuthenticationFilter.usernameNotFound",
+							new Object[] { digestAuth.getUsername() },
+							"Username {0} not found")));
+
+			return;
+		}
+
+		// If digest is still incorrect, definitely reject authentication attempt
+		if (!serverDigestMd5.equals(digestAuth.getResponse())) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Expected response: '" + serverDigestMd5
+						+ "' but received: '" + digestAuth.getResponse()
+						+ "'; is AuthenticationDao returning clear text passwords?");
+			}
+
+			fail(request,
+					response,
+					new BadCredentialsException(messages.getMessage(
+							"DigestAuthenticationFilter.incorrectResponse",
+							"Incorrect response")));
+			return;
+		}
+
+		// To get this far, the digest must have been valid
+		// Check the nonce has not expired
+		// We do this last so we can direct the user agent its nonce is stale
+		// but the request was otherwise appearing to be valid
+		if (digestAuth.isNonceExpired()) {
+			fail(request,
+					response,
+					new NonceExpiredException(messages.getMessage(
+							"DigestAuthenticationFilter.nonceExpired",
+							"Nonce has expired/timed out")));
+
+			return;
+		}
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("Authentication success for user: '" + digestAuth.getUsername()
+					+ "' with response: '" + digestAuth.getResponse() + "'");
+		}
+
+		SecurityContextHolder.getContext().setAuthentication(
+				createSuccessfulAuthentication(request, user));
+
+		chain.doFilter(request, response);
+	}
+
+	private Authentication createSuccessfulAuthentication(HttpServletRequest request,
+			UserDetails user) {
+		UsernamePasswordAuthenticationToken authRequest;
+		if (createAuthenticatedToken) {
+			authRequest = new UsernamePasswordAuthenticationToken(user,
+					user.getPassword(), user.getAuthorities());
+		}
+		else {
+			authRequest = new UsernamePasswordAuthenticationToken(user,
+					user.getPassword());
+		}
+
+		authRequest.setDetails(authenticationDetailsSource
+				.buildDetails((HttpServletRequest) request));
+
+		return authRequest;
+	}
+
+	private void fail(HttpServletRequest request, HttpServletResponse response,
+			AuthenticationException failed) throws IOException, ServletException {
+		SecurityContextHolder.getContext().setAuthentication(null);
+
+		if (logger.isDebugEnabled()) {
+			logger.debug(failed);
+		}
+
+		authenticationEntryPoint.commence(request, response, failed);
+	}
+
+	protected final DigestAuthenticationEntryPoint getAuthenticationEntryPoint() {
+		return authenticationEntryPoint;
+	}
+
+	public UserCache getUserCache() {
+		return userCache;
+	}
+
+	public UserDetailsService getUserDetailsService() {
+		return userDetailsService;
+	}
+
+	public void setAuthenticationDetailsSource(
+			AuthenticationDetailsSource<HttpServletRequest, ?> authenticationDetailsSource) {
+		Assert.notNull(authenticationDetailsSource,
+				"AuthenticationDetailsSource required");
+		this.authenticationDetailsSource = authenticationDetailsSource;
+	}
+
+	public void setAuthenticationEntryPoint(
+			DigestAuthenticationEntryPoint authenticationEntryPoint) {
+		this.authenticationEntryPoint = authenticationEntryPoint;
+	}
+
+	public void setMessageSource(MessageSource messageSource) {
+		this.messages = new MessageSourceAccessor(messageSource);
+	}
+
+	public void setPasswordAlreadyEncoded(boolean passwordAlreadyEncoded) {
+		this.passwordAlreadyEncoded = passwordAlreadyEncoded;
+	}
+
+	public void setUserCache(UserCache userCache) {
+		this.userCache = userCache;
+	}
+
+	public void setUserDetailsService(UserDetailsService userDetailsService) {
+		this.userDetailsService = userDetailsService;
+	}
+
+	/**
+	 * If you set this property, the Authentication object, which is created after the
+	 * successful digest authentication will be marked as <b>authenticated</b> and filled
+	 * with the authorities loaded by the UserDetailsService. It therefore will not be
+	 * re-authenticated by your AuthenticationProvider. This means, that only the password
+	 * of the user is checked, but not the flags like isEnabled() or
+	 * isAccountNonExpired(). You will save some time by enabling this flag, as otherwise
+	 * your UserDetailsService will be called twice. A more secure option would be to
+	 * introduce a cache around your UserDetailsService, but if you don't use these flags,
+	 * you can also safely enable this option.
+	 *
+	 * @param createAuthenticatedToken default is false
+	 */
+	public void setCreateAuthenticatedToken(boolean createAuthenticatedToken) {
+		this.createAuthenticatedToken = createAuthenticatedToken;
+	}
+
+	private class DigestData {
+		private final String username;
+		private final String realm;
+		private final String nonce;
+		private final String uri;
+		private final String response;
+		private final String qop;
+		private final String nc;
+		private final String cnonce;
+		private final String section212response;
+		private long nonceExpiryTime;
+
+		DigestData(String header) {
+			section212response = header.substring(7);
+			String[] headerEntries = DigestAuthUtils.splitIgnoringQuotes(
+					section212response, ',');
+			Map<String, String> headerMap = DigestAuthUtils
+					.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
+
+			username = headerMap.get("username");
+			realm = headerMap.get("realm");
+			nonce = headerMap.get("nonce");
+			uri = headerMap.get("uri");
+			response = headerMap.get("response");
+			qop = headerMap.get("qop"); // RFC 2617 extension
+			nc = headerMap.get("nc"); // RFC 2617 extension
+			cnonce = headerMap.get("cnonce"); // RFC 2617 extension
+
+			if (logger.isDebugEnabled()) {
+				logger.debug("Extracted username: '" + username + "'; realm: '" + realm
+						+ "'; nonce: '" + nonce + "'; uri: '" + uri + "'; response: '"
+						+ response + "'");
+			}
+		}
+
+		void validateAndDecode(String entryPointKey, String expectedRealm)
+				throws BadCredentialsException {
+			// Check all required parameters were supplied (ie RFC 2069)
+			if ((username == null) || (realm == null) || (nonce == null) || (uri == null)
+					|| (response == null)) {
+				throw new BadCredentialsException(messages.getMessage(
+						"DigestAuthenticationFilter.missingMandatory",
+						new Object[] { section212response },
+						"Missing mandatory digest value; received header {0}"));
+			}
+			// Check all required parameters for an "auth" qop were supplied (ie RFC 2617)
+			if ("auth".equals(qop)) {
+				if ((nc == null) || (cnonce == null)) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("extracted nc: '" + nc + "'; cnonce: '" + cnonce
+								+ "'");
+					}
+
+					throw new BadCredentialsException(messages.getMessage(
+							"DigestAuthenticationFilter.missingAuth",
+							new Object[] { section212response },
+							"Missing mandatory digest value; received header {0}"));
+				}
+			}
+
+			// Check realm name equals what we expected
+			if (!expectedRealm.equals(realm)) {
+				throw new BadCredentialsException(
+						messages.getMessage("DigestAuthenticationFilter.incorrectRealm",
+								new Object[] { realm, expectedRealm },
+								"Response realm name '{0}' does not match system realm name of '{1}'"));
+			}
+
+			// Check nonce was Base64 encoded (as sent by DigestAuthenticationEntryPoint)
+			if (!Base64.isBase64(nonce.getBytes())) {
+				throw new BadCredentialsException(messages.getMessage(
+						"DigestAuthenticationFilter.nonceEncoding",
+						new Object[] { nonce },
+						"Nonce is not encoded in Base64; received nonce {0}"));
+			}
+
+			// Decode nonce from Base64
+			// format of nonce is:
+			// base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
+			String nonceAsPlainText = new String(Base64.decode(nonce.getBytes()));
+			String[] nonceTokens = StringUtils.delimitedListToStringArray(
+					nonceAsPlainText, ":");
+
+			if (nonceTokens.length != 2) {
+				throw new BadCredentialsException(messages.getMessage(
+						"DigestAuthenticationFilter.nonceNotTwoTokens",
+						new Object[] { nonceAsPlainText },
+						"Nonce should have yielded two tokens but was {0}"));
+			}
+
+			// Extract expiry time from nonce
+
+			try {
+				nonceExpiryTime = new Long(nonceTokens[0]).longValue();
+			}
+			catch (NumberFormatException nfe) {
+				throw new BadCredentialsException(
+						messages.getMessage("DigestAuthenticationFilter.nonceNotNumeric",
+								new Object[] { nonceAsPlainText },
+								"Nonce token should have yielded a numeric first token, but was {0}"));
+			}
+
+			// Check signature of nonce matches this expiry time
+			String expectedNonceSignature = DigestAuthUtils.md5Hex(nonceExpiryTime + ":"
+					+ entryPointKey);
+
+			if (!expectedNonceSignature.equals(nonceTokens[1])) {
+				new BadCredentialsException(messages.getMessage(
+						"DigestAuthenticationFilter.nonceCompromised",
+						new Object[] { nonceAsPlainText }, "Nonce token compromised {0}"));
+			}
+		}
+
+		String calculateServerDigest(String password, String httpMethod) {
+			// Compute the expected response-digest (will be in hex form)
+
+			// Don't catch IllegalArgumentException (already checked validity)
+			return DigestAuthUtils.generateDigest(passwordAlreadyEncoded, username,
+					realm, password, httpMethod, uri, qop, nonce, nc, cnonce);
+		}
+
+		boolean isNonceExpired() {
+			long now = System.currentTimeMillis();
+			return nonceExpiryTime < now;
+		}
+
+		String getUsername() {
+			return username;
+		}
+
+		String getResponse() {
+			return response;
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java
index f6e83b9dc3..3096a19039 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/www/NonceExpiredException.java
@@ -17,33 +17,32 @@ package org.springframework.security.web.authentication.www;
 
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
  * Thrown if an authentication request is rejected because the digest nonce has expired.
  *
  * @author Ben Alex
  */
 public class NonceExpiredException extends AuthenticationException {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-/**
-     * Constructs a <code>NonceExpiredException</code> with the specified
-     * message.
-     *
-     * @param msg the detail message
-     */
-    public NonceExpiredException(String msg) {
-        super(msg);
-    }
+	/**
+	 * Constructs a <code>NonceExpiredException</code> with the specified message.
+	 *
+	 * @param msg the detail message
+	 */
+	public NonceExpiredException(String msg) {
+		super(msg);
+	}
 
-/**
-     * Constructs a <code>NonceExpiredException</code> with the specified
-     * message and root cause.
-     *
-     * @param msg the detail message
-     * @param t root cause
-     */
-    public NonceExpiredException(String msg, Throwable t) {
-        super(msg, t);
-    }
+	/**
+	 * Constructs a <code>NonceExpiredException</code> with the specified message and root
+	 * cause.
+	 *
+	 * @param msg the detail message
+	 * @param t root cause
+	 */
+	public NonceExpiredException(String msg, Throwable t) {
+		super(msg, t);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/bind/annotation/AuthenticationPrincipal.java b/web/src/main/java/org/springframework/security/web/bind/annotation/AuthenticationPrincipal.java
index 0c0ab9535f..efd43c65a7 100644
--- a/web/src/main/java/org/springframework/security/web/bind/annotation/AuthenticationPrincipal.java
+++ b/web/src/main/java/org/springframework/security/web/bind/annotation/AuthenticationPrincipal.java
@@ -25,11 +25,12 @@ import org.springframework.security.core.Authentication;
 
 /**
  * Annotation that binds a method parameter or method return value to the
- * {@link Authentication#getPrincipal()}. This is necessary to signal that the
- * argument should be resolved to the current user rather than a user that might
- * be edited on a form.
+ * {@link Authentication#getPrincipal()}. This is necessary to signal that the argument
+ * should be resolved to the current user rather than a user that might be edited on a
+ * form.
  *
- * @deprecated Use org.springframework.security.core.annotation.AuthenticationPrincipal instead
+ * @deprecated Use org.springframework.security.core.annotation.AuthenticationPrincipal
+ * instead
  *
  * @author Rob Winch
  * @since 3.2
@@ -39,12 +40,11 @@ import org.springframework.security.core.Authentication;
 @Documented
 public @interface AuthenticationPrincipal {
 
-    /**
-     * True if a {@link ClassCastException} should be thrown
-     * when the current {@link Authentication#getPrincipal()} is the incorrect
-     * type. Default is false.
-     *
-     * @return
-     */
-    boolean errorOnInvalidType() default false;
+	/**
+	 * True if a {@link ClassCastException} should be thrown when the current
+	 * {@link Authentication#getPrincipal()} is the incorrect type. Default is false.
+	 *
+	 * @return
+	 */
+	boolean errorOnInvalidType() default false;
 }
diff --git a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
index c215843fa4..25e36a1713 100644
--- a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
+++ b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
@@ -28,7 +28,6 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-
 /**
  * Allows resolving the {@link Authentication#getPrincipal()} using the
  * {@link AuthenticationPrincipal} annotation. For example, the following
@@ -45,12 +44,12 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * </pre>
  *
  * <p>
- * Will resolve the CustomUser argument using
- * {@link Authentication#getPrincipal()} from the {@link SecurityContextHolder}.
- * If the {@link Authentication} or {@link Authentication#getPrincipal()} is
- * null, it will return null. If the types do not match, null will be returned
- * unless {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which
- * case a {@link ClassCastException} will be thrown.
+ * Will resolve the CustomUser argument using {@link Authentication#getPrincipal()} from
+ * the {@link SecurityContextHolder}. If the {@link Authentication} or
+ * {@link Authentication#getPrincipal()} is null, it will return null. If the types do not
+ * match, null will be returned unless
+ * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
+ * {@link ClassCastException} will be thrown.
  * </p>
  *
  * <p>
@@ -79,63 +78,83 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  *     }
  * </pre>
  *
- * @deprecated use org.springframework.security.web.method.annotation.AuthenticationPrincipalArgumentResolver
+ * @deprecated use org.springframework.security.web.method.annotation.
+ * AuthenticationPrincipalArgumentResolver
  *
  * @author Rob Winch
  * @since 3.2
  */
 @Deprecated
 public final class AuthenticationPrincipalArgumentResolver implements
-    HandlerMethodArgumentResolver {
+		HandlerMethodArgumentResolver {
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter)
-     */
-    public boolean supportsParameter(MethodParameter parameter) {
-        return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter
+	 * (org.springframework.core.MethodParameter)
+	 */
+	public boolean supportsParameter(MethodParameter parameter) {
+		return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory)
-     */
-    public Object resolveArgument(MethodParameter parameter,
-            ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
-            WebDataBinderFactory binderFactory) throws Exception {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if(authentication == null) {
-            return null;
-        }
-        Object principal = authentication.getPrincipal();
-        if(principal != null && !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
-            AuthenticationPrincipal authPrincipal = findMethodAnnotation(AuthenticationPrincipal.class, parameter);
-            if(authPrincipal.errorOnInvalidType()) {
-                throw new ClassCastException(principal + " is not assignable to " + parameter.getParameterType());
-            } else {
-                return null;
-            }
-        }
-        return principal;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument
+	 * (org.springframework.core.MethodParameter,
+	 * org.springframework.web.method.support.ModelAndViewContainer,
+	 * org.springframework.web.context.request.NativeWebRequest,
+	 * org.springframework.web.bind.support.WebDataBinderFactory)
+	 */
+	public Object resolveArgument(MethodParameter parameter,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
+			WebDataBinderFactory binderFactory) throws Exception {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (authentication == null) {
+			return null;
+		}
+		Object principal = authentication.getPrincipal();
+		if (principal != null
+				&& !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
+			AuthenticationPrincipal authPrincipal = findMethodAnnotation(
+					AuthenticationPrincipal.class, parameter);
+			if (authPrincipal.errorOnInvalidType()) {
+				throw new ClassCastException(principal + " is not assignable to "
+						+ parameter.getParameterType());
+			}
+			else {
+				return null;
+			}
+		}
+		return principal;
+	}
 
-    /**
-     * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
-     *
-     * @param annotationClass the class of the {@link Annotation} to find on the {@link MethodParameter}
-     * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
-     * @return the {@link Annotation} that was found or null.
-     */
-    private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass, MethodParameter parameter) {
-        T annotation = parameter.getParameterAnnotation(annotationClass);
-        if(annotation != null) {
-            return annotation;
-        }
-        Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
-        for(Annotation toSearch : annotationsToSearch) {
-            annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(), annotationClass);
-            if(annotation != null) {
-                return annotation;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
+	 *
+	 * @param annotationClass the class of the {@link Annotation} to find on the
+	 * {@link MethodParameter}
+	 * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
+	 * @return the {@link Annotation} that was found or null.
+	 */
+	private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass,
+			MethodParameter parameter) {
+		T annotation = parameter.getParameterAnnotation(annotationClass);
+		if (annotation != null) {
+			return annotation;
+		}
+		Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
+		for (Annotation toSearch : annotationsToSearch) {
+			annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(),
+					annotationClass);
+			if (annotation != null) {
+				return annotation;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
index 2da38dd368..f329c1269d 100644
--- a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
+++ b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
@@ -40,282 +40,284 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 import org.springframework.web.filter.DelegatingFilterProxy;
 
 /**
- * Registers the {@link DelegatingFilterProxy} to use the
- * springSecurityFilterChain before any other registered {@link Filter}. When
- * used with {@link #AbstractSecurityWebApplicationInitializer(Class...)}, it
- * will also register a {@link ContextLoaderListener}. When used with
- * {@link #AbstractSecurityWebApplicationInitializer()}, this class is typically
- * used in addition to a subclass of {@link AbstractContextLoaderInitializer}.
+ * Registers the {@link DelegatingFilterProxy} to use the springSecurityFilterChain before
+ * any other registered {@link Filter}. When used with
+ * {@link #AbstractSecurityWebApplicationInitializer(Class...)}, it will also register a
+ * {@link ContextLoaderListener}. When used with
+ * {@link #AbstractSecurityWebApplicationInitializer()}, this class is typically used in
+ * addition to a subclass of {@link AbstractContextLoaderInitializer}.
  *
  * <p>
- * By default the {@link DelegatingFilterProxy} is registered without support,
- * but can be enabled by overriding {@link #isAsyncSecuritySupported()} and
+ * By default the {@link DelegatingFilterProxy} is registered without support, but can be
+ * enabled by overriding {@link #isAsyncSecuritySupported()} and
  * {@link #getSecurityDispatcherTypes()}.
  * </p>
  *
  * <p>
- * Additional configuration before and after the springSecurityFilterChain can
- * be added by overriding
- * {@link #afterSpringSecurityFilterChain(ServletContext)}.
+ * Additional configuration before and after the springSecurityFilterChain can be added by
+ * overriding {@link #afterSpringSecurityFilterChain(ServletContext)}.
  * </p>
  *
  *
  * <h2>Caveats</h2>
  * <p>
- * Subclasses of AbstractDispatcherServletInitializer will register their
- * filters before any other {@link Filter}. This means that you will typically
- * want to ensure subclasses of AbstractDispatcherServletInitializer are invoked
- * first. This can be done by ensuring the {@link Order} or {@link Ordered} of
- * AbstractDispatcherServletInitializer are sooner than subclasses of
- * {@link AbstractSecurityWebApplicationInitializer}.
+ * Subclasses of AbstractDispatcherServletInitializer will register their filters before
+ * any other {@link Filter}. This means that you will typically want to ensure subclasses
+ * of AbstractDispatcherServletInitializer are invoked first. This can be done by ensuring
+ * the {@link Order} or {@link Ordered} of AbstractDispatcherServletInitializer are sooner
+ * than subclasses of {@link AbstractSecurityWebApplicationInitializer}.
  * </p>
  *
  * @author Rob Winch
  * @author Keesun Baik
  */
-public abstract class AbstractSecurityWebApplicationInitializer implements WebApplicationInitializer {
+public abstract class AbstractSecurityWebApplicationInitializer implements
+		WebApplicationInitializer {
 
-    private static final String SERVLET_CONTEXT_PREFIX = "org.springframework.web.servlet.FrameworkServlet.CONTEXT.";
+	private static final String SERVLET_CONTEXT_PREFIX = "org.springframework.web.servlet.FrameworkServlet.CONTEXT.";
 
-    public static final String DEFAULT_FILTER_NAME = "springSecurityFilterChain";
+	public static final String DEFAULT_FILTER_NAME = "springSecurityFilterChain";
 
-    private final Class<?>[] configurationClasses;
+	private final Class<?>[] configurationClasses;
 
-    /**
-     * Creates a new instance that assumes the Spring Security configuration is
-     * loaded by some other means than this class. For example, a user might
-     * create a {@link ContextLoaderListener} using a subclass of
-     * {@link AbstractContextLoaderInitializer}.
-     *
-     * @see ContextLoaderListener
-     */
-    protected AbstractSecurityWebApplicationInitializer() {
-        this.configurationClasses = null;
-    }
+	/**
+	 * Creates a new instance that assumes the Spring Security configuration is loaded by
+	 * some other means than this class. For example, a user might create a
+	 * {@link ContextLoaderListener} using a subclass of
+	 * {@link AbstractContextLoaderInitializer}.
+	 *
+	 * @see ContextLoaderListener
+	 */
+	protected AbstractSecurityWebApplicationInitializer() {
+		this.configurationClasses = null;
+	}
 
-    /**
-     * Creates a new instance that will instantiate the
-     * {@link ContextLoaderListener} with the specified classes.
-     *
-     * @param configurationClasses
-     */
-    protected AbstractSecurityWebApplicationInitializer(Class<?>... configurationClasses) {
-        this.configurationClasses = configurationClasses;
-    }
+	/**
+	 * Creates a new instance that will instantiate the {@link ContextLoaderListener} with
+	 * the specified classes.
+	 *
+	 * @param configurationClasses
+	 */
+	protected AbstractSecurityWebApplicationInitializer(Class<?>... configurationClasses) {
+		this.configurationClasses = configurationClasses;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.WebApplicationInitializer#onStartup(javax.servlet.ServletContext)
-     */
-    public final void onStartup(ServletContext servletContext)
-            throws ServletException {
-        beforeSpringSecurityFilterChain(servletContext);
-        if(configurationClasses != null) {
-            AnnotationConfigWebApplicationContext rootAppContext = new AnnotationConfigWebApplicationContext();
-            rootAppContext.register(configurationClasses);
-            servletContext.addListener(new ContextLoaderListener(rootAppContext));
-        }
-        if(enableHttpSessionEventPublisher()) {
-            servletContext.addListener("org.springframework.security.web.session.HttpSessionEventPublisher");
-        }
-        servletContext.setSessionTrackingModes(getSessionTrackingModes());
-        insertSpringSecurityFilterChain(servletContext);
-        afterSpringSecurityFilterChain(servletContext);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.web.WebApplicationInitializer#onStartup(javax.servlet.
+	 * ServletContext)
+	 */
+	public final void onStartup(ServletContext servletContext) throws ServletException {
+		beforeSpringSecurityFilterChain(servletContext);
+		if (configurationClasses != null) {
+			AnnotationConfigWebApplicationContext rootAppContext = new AnnotationConfigWebApplicationContext();
+			rootAppContext.register(configurationClasses);
+			servletContext.addListener(new ContextLoaderListener(rootAppContext));
+		}
+		if (enableHttpSessionEventPublisher()) {
+			servletContext
+					.addListener("org.springframework.security.web.session.HttpSessionEventPublisher");
+		}
+		servletContext.setSessionTrackingModes(getSessionTrackingModes());
+		insertSpringSecurityFilterChain(servletContext);
+		afterSpringSecurityFilterChain(servletContext);
+	}
 
-    /**
-     * Override this if {@link HttpSessionEventPublisher} should be added as a
-     * listener. This should be true, if session management has specified a
-     * maximum number of sessions.
-     *
-     * @return true to add {@link HttpSessionEventPublisher}, else false
-     */
-    protected boolean enableHttpSessionEventPublisher() {
-        return false;
-    }
+	/**
+	 * Override this if {@link HttpSessionEventPublisher} should be added as a listener.
+	 * This should be true, if session management has specified a maximum number of
+	 * sessions.
+	 *
+	 * @return true to add {@link HttpSessionEventPublisher}, else false
+	 */
+	protected boolean enableHttpSessionEventPublisher() {
+		return false;
+	}
 
-    /**
-     * Registers the springSecurityFilterChain
-     * @param servletContext the {@link ServletContext}
-     */
-    private void insertSpringSecurityFilterChain(ServletContext servletContext) {
-        String filterName = DEFAULT_FILTER_NAME;
-        DelegatingFilterProxy springSecurityFilterChain = new DelegatingFilterProxy(filterName);
-        String contextAttribute = getWebApplicationContextAttribute();
-        if(contextAttribute != null) {
-            springSecurityFilterChain.setContextAttribute(contextAttribute);
-        }
-        registerFilter(servletContext, true, filterName, springSecurityFilterChain);
-    }
+	/**
+	 * Registers the springSecurityFilterChain
+	 * @param servletContext the {@link ServletContext}
+	 */
+	private void insertSpringSecurityFilterChain(ServletContext servletContext) {
+		String filterName = DEFAULT_FILTER_NAME;
+		DelegatingFilterProxy springSecurityFilterChain = new DelegatingFilterProxy(
+				filterName);
+		String contextAttribute = getWebApplicationContextAttribute();
+		if (contextAttribute != null) {
+			springSecurityFilterChain.setContextAttribute(contextAttribute);
+		}
+		registerFilter(servletContext, true, filterName, springSecurityFilterChain);
+	}
 
-    /**
-     * Inserts the provided {@link Filter}s before existing {@link Filter}s
-     * using default generated names, {@link #getSecurityDispatcherTypes()}, and
-     * {@link #isAsyncSecuritySupported()}.
-     *
-     * @param servletContext
-     *            the {@link ServletContext} to use
-     * @param filters
-     *            the {@link Filter}s to register
-     */
-    protected final void insertFilters(ServletContext servletContext,Filter... filters) {
-        registerFilters(servletContext, true, filters);
-    }
+	/**
+	 * Inserts the provided {@link Filter}s before existing {@link Filter}s using default
+	 * generated names, {@link #getSecurityDispatcherTypes()}, and
+	 * {@link #isAsyncSecuritySupported()}.
+	 *
+	 * @param servletContext the {@link ServletContext} to use
+	 * @param filters the {@link Filter}s to register
+	 */
+	protected final void insertFilters(ServletContext servletContext, Filter... filters) {
+		registerFilters(servletContext, true, filters);
+	}
 
-    /**
-     * Inserts the provided {@link Filter}s after existing {@link Filter}s
-     * using default generated names, {@link #getSecurityDispatcherTypes()}, and
-     * {@link #isAsyncSecuritySupported()}.
-     *
-     * @param servletContext
-     *            the {@link ServletContext} to use
-     * @param filters
-     *            the {@link Filter}s to register
-     */
-    protected final void appendFilters(ServletContext servletContext,Filter... filters) {
-        registerFilters(servletContext, false, filters);
-    }
+	/**
+	 * Inserts the provided {@link Filter}s after existing {@link Filter}s using default
+	 * generated names, {@link #getSecurityDispatcherTypes()}, and
+	 * {@link #isAsyncSecuritySupported()}.
+	 *
+	 * @param servletContext the {@link ServletContext} to use
+	 * @param filters the {@link Filter}s to register
+	 */
+	protected final void appendFilters(ServletContext servletContext, Filter... filters) {
+		registerFilters(servletContext, false, filters);
+	}
 
-    /**
-     * Registers the provided {@link Filter}s using default generated names,
-     * {@link #getSecurityDispatcherTypes()}, and
-     * {@link #isAsyncSecuritySupported()}.
-     *
-     * @param servletContext
-     *            the {@link ServletContext} to use
-     * @param insertBeforeOtherFilters
-     *            if true, will insert the provided {@link Filter}s before other
-     *            {@link Filter}s. Otherwise, will insert the {@link Filter}s
-     *            after other {@link Filter}s.
-     * @param filters
-     *            the {@link Filter}s to register
-     */
-    private void registerFilters(ServletContext servletContext, boolean insertBeforeOtherFilters, Filter... filters) {
-        Assert.notEmpty(filters, "filters cannot be null or empty");
+	/**
+	 * Registers the provided {@link Filter}s using default generated names,
+	 * {@link #getSecurityDispatcherTypes()}, and {@link #isAsyncSecuritySupported()}.
+	 *
+	 * @param servletContext the {@link ServletContext} to use
+	 * @param insertBeforeOtherFilters if true, will insert the provided {@link Filter}s
+	 * before other {@link Filter}s. Otherwise, will insert the {@link Filter}s after
+	 * other {@link Filter}s.
+	 * @param filters the {@link Filter}s to register
+	 */
+	private void registerFilters(ServletContext servletContext,
+			boolean insertBeforeOtherFilters, Filter... filters) {
+		Assert.notEmpty(filters, "filters cannot be null or empty");
 
-        for(Filter filter : filters) {
-            if(filter == null) {
-                throw new IllegalArgumentException("filters cannot contain null values. Got " + Arrays.asList(filters));
-            }
-            String filterName = Conventions.getVariableName(filter);
-            registerFilter(servletContext, insertBeforeOtherFilters, filterName, filter);
-        }
-    }
+		for (Filter filter : filters) {
+			if (filter == null) {
+				throw new IllegalArgumentException(
+						"filters cannot contain null values. Got "
+								+ Arrays.asList(filters));
+			}
+			String filterName = Conventions.getVariableName(filter);
+			registerFilter(servletContext, insertBeforeOtherFilters, filterName, filter);
+		}
+	}
 
-    /**
-     * Registers the provided filter using the {@link #isAsyncSecuritySupported()} and {@link #getSecurityDispatcherTypes()}.
-     *
-     * @param servletContext
-     * @param insertBeforeOtherFilters should this Filter be inserted before or after other {@link Filter}
-     * @param filterName
-     * @param filter
-     */
-    private final void registerFilter(ServletContext servletContext, boolean insertBeforeOtherFilters, String filterName, Filter filter) {
-        Dynamic registration = servletContext.addFilter(filterName, filter);
-        if(registration == null) {
-            throw new IllegalStateException("Duplicate Filter registration for '" + filterName +"'. Check to ensure the Filter is only configured once.");
-        }
-        registration.setAsyncSupported(isAsyncSecuritySupported());
-        EnumSet<DispatcherType> dispatcherTypes = getSecurityDispatcherTypes();
-        registration.addMappingForUrlPatterns(dispatcherTypes, !insertBeforeOtherFilters, "/*");
-    }
+	/**
+	 * Registers the provided filter using the {@link #isAsyncSecuritySupported()} and
+	 * {@link #getSecurityDispatcherTypes()}.
+	 *
+	 * @param servletContext
+	 * @param insertBeforeOtherFilters should this Filter be inserted before or after
+	 * other {@link Filter}
+	 * @param filterName
+	 * @param filter
+	 */
+	private final void registerFilter(ServletContext servletContext,
+			boolean insertBeforeOtherFilters, String filterName, Filter filter) {
+		Dynamic registration = servletContext.addFilter(filterName, filter);
+		if (registration == null) {
+			throw new IllegalStateException("Duplicate Filter registration for '"
+					+ filterName
+					+ "'. Check to ensure the Filter is only configured once.");
+		}
+		registration.setAsyncSupported(isAsyncSecuritySupported());
+		EnumSet<DispatcherType> dispatcherTypes = getSecurityDispatcherTypes();
+		registration.addMappingForUrlPatterns(dispatcherTypes, !insertBeforeOtherFilters,
+				"/*");
+	}
 
-    /**
-     * Returns the {@link DelegatingFilterProxy#getContextAttribute()} or null
-     * if the parent {@link ApplicationContext} should be used. The default
-     * behavior is to use the parent {@link ApplicationContext}.
-     *
-     * <p>
-     * If {@link #getDispatcherWebApplicationContextSuffix()} is non-null the
-     * {@link WebApplicationContext} for the Dispatcher will be used. This means
-     * the child {@link ApplicationContext} is used to look up the
-     * springSecurityFilterChain bean.
-     * </p>
-     *
-     * @return the {@link DelegatingFilterProxy#getContextAttribute()} or null
-     * if the parent {@link ApplicationContext} should be used
-     */
-    private String getWebApplicationContextAttribute() {
-        String dispatcherServletName = getDispatcherWebApplicationContextSuffix();
-        if(dispatcherServletName == null) {
-            return null;
-        }
-        return SERVLET_CONTEXT_PREFIX + dispatcherServletName;
-    }
+	/**
+	 * Returns the {@link DelegatingFilterProxy#getContextAttribute()} or null if the
+	 * parent {@link ApplicationContext} should be used. The default behavior is to use
+	 * the parent {@link ApplicationContext}.
+	 *
+	 * <p>
+	 * If {@link #getDispatcherWebApplicationContextSuffix()} is non-null the
+	 * {@link WebApplicationContext} for the Dispatcher will be used. This means the child
+	 * {@link ApplicationContext} is used to look up the springSecurityFilterChain bean.
+	 * </p>
+	 *
+	 * @return the {@link DelegatingFilterProxy#getContextAttribute()} or null if the
+	 * parent {@link ApplicationContext} should be used
+	 */
+	private String getWebApplicationContextAttribute() {
+		String dispatcherServletName = getDispatcherWebApplicationContextSuffix();
+		if (dispatcherServletName == null) {
+			return null;
+		}
+		return SERVLET_CONTEXT_PREFIX + dispatcherServletName;
+	}
 
-    /**
-     * Determines how a session should be tracked. By default,
-     * {@link SessionTrackingMode#COOKIE} is used.
-     *
-     * <p>
-     * Note that {@link SessionTrackingMode#URL} is intentionally omitted to
-     * help protected against <a
-     * href="http://en.wikipedia.org/wiki/Session_fixation">session fixation
-     * attacks</a>. {@link SessionTrackingMode#SSL} is omitted because SSL
-     * configuration is required for this to work.
-     * </p>
-     *
-     * <p>
-     * Subclasses can override this method to make customizations.
-     * </p>
-     *
-     * @return
-     */
-    protected Set<SessionTrackingMode> getSessionTrackingModes() {
-        return EnumSet.of(SessionTrackingMode.COOKIE);
-    }
+	/**
+	 * Determines how a session should be tracked. By default,
+	 * {@link SessionTrackingMode#COOKIE} is used.
+	 *
+	 * <p>
+	 * Note that {@link SessionTrackingMode#URL} is intentionally omitted to help
+	 * protected against <a href="http://en.wikipedia.org/wiki/Session_fixation">session
+	 * fixation attacks</a>. {@link SessionTrackingMode#SSL} is omitted because SSL
+	 * configuration is required for this to work.
+	 * </p>
+	 *
+	 * <p>
+	 * Subclasses can override this method to make customizations.
+	 * </p>
+	 *
+	 * @return
+	 */
+	protected Set<SessionTrackingMode> getSessionTrackingModes() {
+		return EnumSet.of(SessionTrackingMode.COOKIE);
+	}
 
-    /**
-     * Return the <servlet-name> to use the DispatcherServlet's
-     * {@link WebApplicationContext} to find the {@link DelegatingFilterProxy}
-     * or null to use the parent {@link ApplicationContext}.
-     *
-     * <p>
-     * For example, if you are using AbstractDispatcherServletInitializer or
-     * AbstractAnnotationConfigDispatcherServletInitializer and using the
-     * provided Servlet name, you can return "dispatcher" from this method to
-     * use the DispatcherServlet's {@link WebApplicationContext}.
-     * </p>
-     *
-     * @return the <servlet-name> of the DispatcherServlet to use its
-     *         {@link WebApplicationContext} or null (default) to use the parent
-     *         {@link ApplicationContext}.
-     */
-    protected String getDispatcherWebApplicationContextSuffix() {
-        return null;
-    }
+	/**
+	 * Return the <servlet-name> to use the DispatcherServlet's
+	 * {@link WebApplicationContext} to find the {@link DelegatingFilterProxy} or null to
+	 * use the parent {@link ApplicationContext}.
+	 *
+	 * <p>
+	 * For example, if you are using AbstractDispatcherServletInitializer or
+	 * AbstractAnnotationConfigDispatcherServletInitializer and using the provided Servlet
+	 * name, you can return "dispatcher" from this method to use the DispatcherServlet's
+	 * {@link WebApplicationContext}.
+	 * </p>
+	 *
+	 * @return the <servlet-name> of the DispatcherServlet to use its
+	 * {@link WebApplicationContext} or null (default) to use the parent
+	 * {@link ApplicationContext}.
+	 */
+	protected String getDispatcherWebApplicationContextSuffix() {
+		return null;
+	}
 
-    /**
-     * Invoked before the springSecurityFilterChain is added.
-     * @param servletContext the {@link ServletContext}
-     */
-    protected void beforeSpringSecurityFilterChain(ServletContext servletContext) {
+	/**
+	 * Invoked before the springSecurityFilterChain is added.
+	 * @param servletContext the {@link ServletContext}
+	 */
+	protected void beforeSpringSecurityFilterChain(ServletContext servletContext) {
 
-    }
+	}
 
-    /**
-     * Invoked after the springSecurityFilterChain is added.
-     * @param servletContext the {@link ServletContext}
-     */
-    protected void afterSpringSecurityFilterChain(ServletContext servletContext) {
+	/**
+	 * Invoked after the springSecurityFilterChain is added.
+	 * @param servletContext the {@link ServletContext}
+	 */
+	protected void afterSpringSecurityFilterChain(ServletContext servletContext) {
 
-    }
+	}
 
-    /**
-     * Get the {@link DispatcherType} for the springSecurityFilterChain.
-     * @return
-     */
-    protected EnumSet<DispatcherType> getSecurityDispatcherTypes() {
-        return EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR, DispatcherType.ASYNC);
-    }
+	/**
+	 * Get the {@link DispatcherType} for the springSecurityFilterChain.
+	 * @return
+	 */
+	protected EnumSet<DispatcherType> getSecurityDispatcherTypes() {
+		return EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR,
+				DispatcherType.ASYNC);
+	}
 
-    /**
-     * Determine if the springSecurityFilterChain should be marked as supporting
-     * asynch. Default is true.
-     *
-     * @return true if springSecurityFilterChain should be marked as supporting
-     *         asynch
-     */
-    protected boolean isAsyncSecuritySupported() {
-        return true;
-    }
+	/**
+	 * Determine if the springSecurityFilterChain should be marked as supporting asynch.
+	 * Default is true.
+	 *
+	 * @return true if springSecurityFilterChain should be marked as supporting asynch
+	 */
+	protected boolean isAsyncSecuritySupported() {
+		return true;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
index 4153b53538..b4ac9f18f2 100644
--- a/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
+++ b/web/src/main/java/org/springframework/security/web/context/HttpRequestResponseHolder.java
@@ -4,35 +4,37 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Used to pass the incoming request to {@link SecurityContextRepository#loadContext(HttpRequestResponseHolder)},
- * allowing the method to swap the request for a wrapped version, as well as returning the <tt>SecurityContext</tt>
- * value.
+ * Used to pass the incoming request to
+ * {@link SecurityContextRepository#loadContext(HttpRequestResponseHolder)}, allowing the
+ * method to swap the request for a wrapped version, as well as returning the
+ * <tt>SecurityContext</tt> value.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public final class HttpRequestResponseHolder {
-    private HttpServletRequest request;
-    private HttpServletResponse response;
+	private HttpServletRequest request;
+	private HttpServletResponse response;
 
-    public HttpRequestResponseHolder(HttpServletRequest request, HttpServletResponse response) {
-        this.request = request;
-        this.response = response;
-    }
+	public HttpRequestResponseHolder(HttpServletRequest request,
+			HttpServletResponse response) {
+		this.request = request;
+		this.response = response;
+	}
 
-    public HttpServletRequest getRequest() {
-        return request;
-    }
+	public HttpServletRequest getRequest() {
+		return request;
+	}
 
-    public void setRequest(HttpServletRequest request) {
-        this.request = request;
-    }
+	public void setRequest(HttpServletRequest request) {
+		this.request = request;
+	}
 
-    public HttpServletResponse getResponse() {
-        return response;
-    }
+	public HttpServletResponse getResponse() {
+		return response;
+	}
 
-    public void setResponse(HttpServletResponse response) {
-        this.response = response;
-    }
+	public void setResponse(HttpServletResponse response) {
+		this.response = response;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java
index f72bea5a37..2017727283 100644
--- a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java
+++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java
@@ -21,378 +21,416 @@ import org.springframework.util.ClassUtils;
 import org.springframework.web.util.WebUtils;
 
 /**
- * A {@code SecurityContextRepository} implementation which stores the security context in the {@code HttpSession}
- * between requests.
+ * A {@code SecurityContextRepository} implementation which stores the security context in
+ * the {@code HttpSession} between requests.
  * <p>
- * The {@code HttpSession} will be queried to retrieve the {@code SecurityContext} in the <tt>loadContext</tt>
- * method (using the key {@link #SPRING_SECURITY_CONTEXT_KEY} by default). If a valid {@code SecurityContext} cannot be
- * obtained from the {@code HttpSession} for whatever reason, a fresh {@code SecurityContext} will be created
- * by calling by {@link SecurityContextHolder#createEmptyContext()} and this instance will be returned instead.
+ * The {@code HttpSession} will be queried to retrieve the {@code SecurityContext} in the
+ * <tt>loadContext</tt> method (using the key {@link #SPRING_SECURITY_CONTEXT_KEY} by
+ * default). If a valid {@code SecurityContext} cannot be obtained from the
+ * {@code HttpSession} for whatever reason, a fresh {@code SecurityContext} will be
+ * created by calling by {@link SecurityContextHolder#createEmptyContext()} and this
+ * instance will be returned instead.
  * <p>
- * When <tt>saveContext</tt> is called, the context will be stored under the same key, provided
+ * When <tt>saveContext</tt> is called, the context will be stored under the same key,
+ * provided
  * <ol>
  * <li>The value has changed</li>
- * <li>The configured <tt>AuthenticationTrustResolver</tt> does not report that the contents represent an anonymous
- * user</li>
+ * <li>The configured <tt>AuthenticationTrustResolver</tt> does not report that the
+ * contents represent an anonymous user</li>
  * </ol>
  * <p>
- * With the standard configuration, no {@code HttpSession} will be created during <tt>loadContext</tt> if one does
- * not already exist. When <tt>saveContext</tt> is called at the end of the web request, and no session exists, a new
- * {@code HttpSession} will <b>only</b> be created if the supplied {@code SecurityContext} is not equal
- * to an empty {@code SecurityContext} instance. This avoids needless <code>HttpSession</code> creation,
- * but automates the storage of changes made to the context during the request. Note that if
- * {@link SecurityContextPersistenceFilter} is configured to eagerly create sessions, then the session-minimisation
- * logic applied here will not make any difference. If you are using eager session creation, then you should
- * ensure that the <tt>allowSessionCreation</tt> property of this class is set to <tt>true</tt> (the default).
+ * With the standard configuration, no {@code HttpSession} will be created during
+ * <tt>loadContext</tt> if one does not already exist. When <tt>saveContext</tt> is called
+ * at the end of the web request, and no session exists, a new {@code HttpSession} will
+ * <b>only</b> be created if the supplied {@code SecurityContext} is not equal to an empty
+ * {@code SecurityContext} instance. This avoids needless <code>HttpSession</code>
+ * creation, but automates the storage of changes made to the context during the request.
+ * Note that if {@link SecurityContextPersistenceFilter} is configured to eagerly create
+ * sessions, then the session-minimisation logic applied here will not make any
+ * difference. If you are using eager session creation, then you should ensure that the
+ * <tt>allowSessionCreation</tt> property of this class is set to <tt>true</tt> (the
+ * default).
  * <p>
- * If for whatever reason no {@code HttpSession} should <b>ever</b> be created (for example, if
- * Basic authentication is being used or similar clients that will never present the same {@code jsessionid}), then
- * {@link #setAllowSessionCreation(boolean) allowSessionCreation} should be set to <code>false</code>.
- * Only do this if you really need to conserve server memory and ensure all classes using the
- * {@code SecurityContextHolder} are designed to have no persistence of the {@code SecurityContext}
- * between web requests.
+ * If for whatever reason no {@code HttpSession} should <b>ever</b> be created (for
+ * example, if Basic authentication is being used or similar clients that will never
+ * present the same {@code jsessionid}), then {@link #setAllowSessionCreation(boolean)
+ * allowSessionCreation} should be set to <code>false</code>. Only do this if you really
+ * need to conserve server memory and ensure all classes using the
+ * {@code SecurityContextHolder} are designed to have no persistence of the
+ * {@code SecurityContext} between web requests.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class HttpSessionSecurityContextRepository implements SecurityContextRepository {
-    /**
-     * The default key under which the security context will be stored in the session.
-     */
-    public static final String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT";
+	/**
+	 * The default key under which the security context will be stored in the session.
+	 */
+	public static final String SPRING_SECURITY_CONTEXT_KEY = "SPRING_SECURITY_CONTEXT";
 
-    protected final Log logger = LogFactory.getLog(this.getClass());
+	protected final Log logger = LogFactory.getLog(this.getClass());
 
-    /** SecurityContext instance used to check for equality with default (unauthenticated) content */
-    private final Object contextObject = SecurityContextHolder.createEmptyContext();
-    private boolean allowSessionCreation = true;
-    private boolean disableUrlRewriting = false;
-    private boolean isServlet3 = ClassUtils.hasMethod(ServletRequest.class, "startAsync");
-    private String springSecurityContextKey = SPRING_SECURITY_CONTEXT_KEY;
+	/**
+	 * SecurityContext instance used to check for equality with default (unauthenticated)
+	 * content
+	 */
+	private final Object contextObject = SecurityContextHolder.createEmptyContext();
+	private boolean allowSessionCreation = true;
+	private boolean disableUrlRewriting = false;
+	private boolean isServlet3 = ClassUtils.hasMethod(ServletRequest.class, "startAsync");
+	private String springSecurityContextKey = SPRING_SECURITY_CONTEXT_KEY;
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
 
-    /**
-     * Gets the security context for the current request (if available) and returns it.
-     * <p>
-     * If the session is null, the context object is null or the context object stored in the session
-     * is not an instance of {@code SecurityContext}, a new context object will be generated and
-     * returned.
-     */
-    public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
-        HttpServletRequest request = requestResponseHolder.getRequest();
-        HttpServletResponse response = requestResponseHolder.getResponse();
-        HttpSession httpSession = request.getSession(false);
+	/**
+	 * Gets the security context for the current request (if available) and returns it.
+	 * <p>
+	 * If the session is null, the context object is null or the context object stored in
+	 * the session is not an instance of {@code SecurityContext}, a new context object
+	 * will be generated and returned.
+	 */
+	public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
+		HttpServletRequest request = requestResponseHolder.getRequest();
+		HttpServletResponse response = requestResponseHolder.getResponse();
+		HttpSession httpSession = request.getSession(false);
 
-        SecurityContext context = readSecurityContextFromSession(httpSession);
+		SecurityContext context = readSecurityContextFromSession(httpSession);
 
-        if (context == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("No SecurityContext was available from the HttpSession: " + httpSession +". " +
-                        "A new one will be created.");
-            }
-            context = generateNewContext();
+		if (context == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("No SecurityContext was available from the HttpSession: "
+						+ httpSession + ". " + "A new one will be created.");
+			}
+			context = generateNewContext();
 
-        }
+		}
 
-        SaveToSessionResponseWrapper wrappedResponse = new SaveToSessionResponseWrapper(response, request, httpSession != null, context);
-        requestResponseHolder.setResponse(wrappedResponse);
+		SaveToSessionResponseWrapper wrappedResponse = new SaveToSessionResponseWrapper(
+				response, request, httpSession != null, context);
+		requestResponseHolder.setResponse(wrappedResponse);
 
-        if(isServlet3) {
-            requestResponseHolder.setRequest(new Servlet3SaveToSessionRequestWrapper(request, wrappedResponse));
-        }
+		if (isServlet3) {
+			requestResponseHolder.setRequest(new Servlet3SaveToSessionRequestWrapper(
+					request, wrappedResponse));
+		}
 
-        return context;
-    }
+		return context;
+	}
 
-    public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) {
-        SaveContextOnUpdateOrErrorResponseWrapper responseWrapper = WebUtils.getNativeResponse(response, SaveContextOnUpdateOrErrorResponseWrapper.class);
-        if(responseWrapper == null) {
-            throw new IllegalStateException("Cannot invoke saveContext on response " + response + ". You must use the HttpRequestResponseHolder.response after invoking loadContext");
-        }
-        // saveContext() might already be called by the response wrapper
-        // if something in the chain called sendError() or sendRedirect(). This ensures we only call it
-        // once per request.
-        if (!responseWrapper.isContextSaved() ) {
-            responseWrapper.saveContext(context);
-        }
-    }
+	public void saveContext(SecurityContext context, HttpServletRequest request,
+			HttpServletResponse response) {
+		SaveContextOnUpdateOrErrorResponseWrapper responseWrapper = WebUtils
+				.getNativeResponse(response,
+						SaveContextOnUpdateOrErrorResponseWrapper.class);
+		if (responseWrapper == null) {
+			throw new IllegalStateException(
+					"Cannot invoke saveContext on response "
+							+ response
+							+ ". You must use the HttpRequestResponseHolder.response after invoking loadContext");
+		}
+		// saveContext() might already be called by the response wrapper
+		// if something in the chain called sendError() or sendRedirect(). This ensures we
+		// only call it
+		// once per request.
+		if (!responseWrapper.isContextSaved()) {
+			responseWrapper.saveContext(context);
+		}
+	}
 
-    public boolean containsContext(HttpServletRequest request) {
-        HttpSession session = request.getSession(false);
+	public boolean containsContext(HttpServletRequest request) {
+		HttpSession session = request.getSession(false);
 
-        if (session == null) {
-            return false;
-        }
+		if (session == null) {
+			return false;
+		}
 
-        return session.getAttribute(springSecurityContextKey) != null;
-    }
+		return session.getAttribute(springSecurityContextKey) != null;
+	}
 
-    /**
-     *
-     * @param httpSession the session obtained from the request.
-     */
-    private SecurityContext readSecurityContextFromSession(HttpSession httpSession) {
-        final boolean debug = logger.isDebugEnabled();
+	/**
+	 *
+	 * @param httpSession the session obtained from the request.
+	 */
+	private SecurityContext readSecurityContextFromSession(HttpSession httpSession) {
+		final boolean debug = logger.isDebugEnabled();
 
-        if (httpSession == null) {
-            if (debug) {
-                logger.debug("No HttpSession currently exists");
-            }
+		if (httpSession == null) {
+			if (debug) {
+				logger.debug("No HttpSession currently exists");
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        // Session exists, so try to obtain a context from it.
+		// Session exists, so try to obtain a context from it.
 
-        Object contextFromSession = httpSession.getAttribute(springSecurityContextKey);
+		Object contextFromSession = httpSession.getAttribute(springSecurityContextKey);
 
-        if (contextFromSession == null) {
-            if (debug) {
-                logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT");
-            }
+		if (contextFromSession == null) {
+			if (debug) {
+				logger.debug("HttpSession returned null object for SPRING_SECURITY_CONTEXT");
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        // We now have the security context object from the session.
-        if (!(contextFromSession instanceof SecurityContext)) {
-            if (logger.isWarnEnabled()) {
-                logger.warn(springSecurityContextKey + " did not contain a SecurityContext but contained: '"
-                        + contextFromSession + "'; are you improperly modifying the HttpSession directly "
-                        + "(you should always use SecurityContextHolder) or using the HttpSession attribute "
-                        + "reserved for this class?");
-            }
+		// We now have the security context object from the session.
+		if (!(contextFromSession instanceof SecurityContext)) {
+			if (logger.isWarnEnabled()) {
+				logger.warn(springSecurityContextKey
+						+ " did not contain a SecurityContext but contained: '"
+						+ contextFromSession
+						+ "'; are you improperly modifying the HttpSession directly "
+						+ "(you should always use SecurityContextHolder) or using the HttpSession attribute "
+						+ "reserved for this class?");
+			}
 
-            return null;
-        }
+			return null;
+		}
 
-        if (debug) {
-            logger.debug("Obtained a valid SecurityContext from " + springSecurityContextKey + ": '" + contextFromSession + "'");
-        }
+		if (debug) {
+			logger.debug("Obtained a valid SecurityContext from "
+					+ springSecurityContextKey + ": '" + contextFromSession + "'");
+		}
 
-        // Everything OK. The only non-null return from this method.
+		// Everything OK. The only non-null return from this method.
 
-        return (SecurityContext) contextFromSession;
-    }
+		return (SecurityContext) contextFromSession;
+	}
 
-    /**
-     * By default, calls {@link SecurityContextHolder#createEmptyContext()} to obtain a new context (there should be
-     * no context present in the holder when this method is called). Using this approach the context creation
-     * strategy is decided by the {@link SecurityContextHolderStrategy} in use. The default implementations
-     * will return a new <tt>SecurityContextImpl</tt>.
-     *
-     * @return a new SecurityContext instance. Never null.
-     */
-    protected SecurityContext generateNewContext() {
-        return SecurityContextHolder.createEmptyContext();
-    }
+	/**
+	 * By default, calls {@link SecurityContextHolder#createEmptyContext()} to obtain a
+	 * new context (there should be no context present in the holder when this method is
+	 * called). Using this approach the context creation strategy is decided by the
+	 * {@link SecurityContextHolderStrategy} in use. The default implementations will
+	 * return a new <tt>SecurityContextImpl</tt>.
+	 *
+	 * @return a new SecurityContext instance. Never null.
+	 */
+	protected SecurityContext generateNewContext() {
+		return SecurityContextHolder.createEmptyContext();
+	}
 
-    /**
-     * If set to true (the default), a session will be created (if required) to store the security context if it is
-     * determined that its contents are different from the default empty context value.
-     * <p>
-     * Note that setting this flag to false does not prevent this class from storing the security context. If your
-     * application (or another filter) creates a session, then the security context will still be stored for an
-     * authenticated user.
-     *
-     * @param allowSessionCreation
-     */
-    public void setAllowSessionCreation(boolean allowSessionCreation) {
-        this.allowSessionCreation = allowSessionCreation;
-    }
+	/**
+	 * If set to true (the default), a session will be created (if required) to store the
+	 * security context if it is determined that its contents are different from the
+	 * default empty context value.
+	 * <p>
+	 * Note that setting this flag to false does not prevent this class from storing the
+	 * security context. If your application (or another filter) creates a session, then
+	 * the security context will still be stored for an authenticated user.
+	 *
+	 * @param allowSessionCreation
+	 */
+	public void setAllowSessionCreation(boolean allowSessionCreation) {
+		this.allowSessionCreation = allowSessionCreation;
+	}
 
-    /**
-     * Allows the use of session identifiers in URLs to be disabled. Off by default.
-     *
-     * @param disableUrlRewriting set to <tt>true</tt> to disable URL encoding methods in the response wrapper
-     *                            and prevent the use of <tt>jsessionid</tt> parameters.
-     */
-    public void setDisableUrlRewriting(boolean disableUrlRewriting) {
-        this.disableUrlRewriting = disableUrlRewriting;
-    }
+	/**
+	 * Allows the use of session identifiers in URLs to be disabled. Off by default.
+	 *
+	 * @param disableUrlRewriting set to <tt>true</tt> to disable URL encoding methods in
+	 * the response wrapper and prevent the use of <tt>jsessionid</tt> parameters.
+	 */
+	public void setDisableUrlRewriting(boolean disableUrlRewriting) {
+		this.disableUrlRewriting = disableUrlRewriting;
+	}
 
-    /**
-     * Allows the session attribute name to be customized for this repository instance.
-     *
-     * @param springSecurityContextKey the key under which the security context will be stored. Defaults to
-     * {@link #SPRING_SECURITY_CONTEXT_KEY}.
-     */
-    public void setSpringSecurityContextKey(String springSecurityContextKey) {
-        Assert.hasText(springSecurityContextKey, "springSecurityContextKey cannot be empty");
-        this.springSecurityContextKey = springSecurityContextKey;
-    }
+	/**
+	 * Allows the session attribute name to be customized for this repository instance.
+	 *
+	 * @param springSecurityContextKey the key under which the security context will be
+	 * stored. Defaults to {@link #SPRING_SECURITY_CONTEXT_KEY}.
+	 */
+	public void setSpringSecurityContextKey(String springSecurityContextKey) {
+		Assert.hasText(springSecurityContextKey,
+				"springSecurityContextKey cannot be empty");
+		this.springSecurityContextKey = springSecurityContextKey;
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private static class Servlet3SaveToSessionRequestWrapper extends HttpServletRequestWrapper {
-        private final SaveContextOnUpdateOrErrorResponseWrapper response;
+	private static class Servlet3SaveToSessionRequestWrapper extends
+			HttpServletRequestWrapper {
+		private final SaveContextOnUpdateOrErrorResponseWrapper response;
 
-        public Servlet3SaveToSessionRequestWrapper(HttpServletRequest request,SaveContextOnUpdateOrErrorResponseWrapper response) {
-            super(request);
-            this.response = response;
-        }
+		public Servlet3SaveToSessionRequestWrapper(HttpServletRequest request,
+				SaveContextOnUpdateOrErrorResponseWrapper response) {
+			super(request);
+			this.response = response;
+		}
 
-        @Override
-        public AsyncContext startAsync() {
-            response.disableSaveOnResponseCommitted();
-            return super.startAsync();
-        }
+		@Override
+		public AsyncContext startAsync() {
+			response.disableSaveOnResponseCommitted();
+			return super.startAsync();
+		}
 
-        @Override
-        public AsyncContext startAsync(ServletRequest servletRequest,
-                ServletResponse servletResponse) throws IllegalStateException {
-            response.disableSaveOnResponseCommitted();
-            return super.startAsync(servletRequest, servletResponse);
-        }
-    }
+		@Override
+		public AsyncContext startAsync(ServletRequest servletRequest,
+				ServletResponse servletResponse) throws IllegalStateException {
+			response.disableSaveOnResponseCommitted();
+			return super.startAsync(servletRequest, servletResponse);
+		}
+	}
 
-    /**
-     * Wrapper that is applied to every request/response to update the <code>HttpSession<code> with
-     * the <code>SecurityContext</code> when a <code>sendError()</code> or <code>sendRedirect</code>
-     * happens. See SEC-398.
-     * <p>
-     * Stores the necessary state from the start of the request in order to make a decision about whether
-     * the security context has changed before saving it.
-     */
-    final class SaveToSessionResponseWrapper extends SaveContextOnUpdateOrErrorResponseWrapper {
+	/**
+	 * Wrapper that is applied to every request/response to update the
+	 * <code>HttpSession<code> with
+	 * the <code>SecurityContext</code> when a <code>sendError()</code> or
+	 * <code>sendRedirect</code> happens. See SEC-398.
+	 * <p>
+	 * Stores the necessary state from the start of the request in order to make a
+	 * decision about whether the security context has changed before saving it.
+	 */
+	final class SaveToSessionResponseWrapper extends
+			SaveContextOnUpdateOrErrorResponseWrapper {
 
-        private final HttpServletRequest request;
-        private final boolean httpSessionExistedAtStartOfRequest;
-        private final SecurityContext contextBeforeExecution;
-        private final Authentication authBeforeExecution;
+		private final HttpServletRequest request;
+		private final boolean httpSessionExistedAtStartOfRequest;
+		private final SecurityContext contextBeforeExecution;
+		private final Authentication authBeforeExecution;
 
-        /**
-         * Takes the parameters required to call <code>saveContext()</code> successfully in
-         * addition to the request and the response object we are wrapping.
-         *
-         * @param request the request object (used to obtain the session, if one exists).
-         * @param httpSessionExistedAtStartOfRequest indicates whether there was a session in place before the
-         *        filter chain executed. If this is true, and the session is found to be null, this indicates that it was
-         *        invalidated during the request and a new session will now be created.
-         * @param context the context before the filter chain executed.
-         *        The context will only be stored if it or its contents changed during the request.
-         */
-        SaveToSessionResponseWrapper(HttpServletResponse response, HttpServletRequest request,
-                                                      boolean httpSessionExistedAtStartOfRequest,
-                                                      SecurityContext context) {
-            super(response, disableUrlRewriting);
-            this.request = request;
-            this.httpSessionExistedAtStartOfRequest = httpSessionExistedAtStartOfRequest;
-            this.contextBeforeExecution = context;
-            this.authBeforeExecution = context.getAuthentication();
-        }
+		/**
+		 * Takes the parameters required to call <code>saveContext()</code> successfully
+		 * in addition to the request and the response object we are wrapping.
+		 *
+		 * @param request the request object (used to obtain the session, if one exists).
+		 * @param httpSessionExistedAtStartOfRequest indicates whether there was a session
+		 * in place before the filter chain executed. If this is true, and the session is
+		 * found to be null, this indicates that it was invalidated during the request and
+		 * a new session will now be created.
+		 * @param context the context before the filter chain executed. The context will
+		 * only be stored if it or its contents changed during the request.
+		 */
+		SaveToSessionResponseWrapper(HttpServletResponse response,
+				HttpServletRequest request, boolean httpSessionExistedAtStartOfRequest,
+				SecurityContext context) {
+			super(response, disableUrlRewriting);
+			this.request = request;
+			this.httpSessionExistedAtStartOfRequest = httpSessionExistedAtStartOfRequest;
+			this.contextBeforeExecution = context;
+			this.authBeforeExecution = context.getAuthentication();
+		}
 
-        /**
-         * Stores the supplied security context in the session (if available) and if it has changed since it was
-         * set at the start of the request. If the AuthenticationTrustResolver identifies the current user as
-         * anonymous, then the context will not be stored.
-         *
-         * @param context the context object obtained from the SecurityContextHolder after the request has
-         *        been processed by the filter chain. SecurityContextHolder.getContext() cannot be used to obtain
-         *        the context as it has already been cleared by the time this method is called.
-         *
-         */
-        @Override
-        protected void saveContext(SecurityContext context) {
-            final Authentication authentication = context.getAuthentication();
-            HttpSession httpSession = request.getSession(false);
+		/**
+		 * Stores the supplied security context in the session (if available) and if it
+		 * has changed since it was set at the start of the request. If the
+		 * AuthenticationTrustResolver identifies the current user as anonymous, then the
+		 * context will not be stored.
+		 *
+		 * @param context the context object obtained from the SecurityContextHolder after
+		 * the request has been processed by the filter chain.
+		 * SecurityContextHolder.getContext() cannot be used to obtain the context as it
+		 * has already been cleared by the time this method is called.
+		 *
+		 */
+		@Override
+		protected void saveContext(SecurityContext context) {
+			final Authentication authentication = context.getAuthentication();
+			HttpSession httpSession = request.getSession(false);
 
-            // See SEC-776
-            if (authentication == null || trustResolver.isAnonymous(authentication)) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("SecurityContext is empty or contents are anonymous - context will not be stored in HttpSession.");
-                }
+			// See SEC-776
+			if (authentication == null || trustResolver.isAnonymous(authentication)) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("SecurityContext is empty or contents are anonymous - context will not be stored in HttpSession.");
+				}
 
-                if (httpSession != null && !contextObject.equals(contextBeforeExecution)) {
-                    // SEC-1587 A non-anonymous context may still be in the session
-                    // SEC-1735 remove if the contextBeforeExecution was not anonymous
-                    httpSession.removeAttribute(springSecurityContextKey);
-                }
-                return;
-            }
+				if (httpSession != null && !contextObject.equals(contextBeforeExecution)) {
+					// SEC-1587 A non-anonymous context may still be in the session
+					// SEC-1735 remove if the contextBeforeExecution was not anonymous
+					httpSession.removeAttribute(springSecurityContextKey);
+				}
+				return;
+			}
 
-            if (httpSession == null) {
-                httpSession = createNewSessionIfAllowed(context);
-            }
+			if (httpSession == null) {
+				httpSession = createNewSessionIfAllowed(context);
+			}
 
-            // If HttpSession exists, store current SecurityContext but only if it has
-            // actually changed in this thread (see SEC-37, SEC-1307, SEC-1528)
-            if (httpSession != null) {
-                // We may have a new session, so check also whether the context attribute is set SEC-1561
-                if (contextChanged(context) || httpSession.getAttribute(springSecurityContextKey) == null) {
-                    httpSession.setAttribute(springSecurityContextKey, context);
+			// If HttpSession exists, store current SecurityContext but only if it has
+			// actually changed in this thread (see SEC-37, SEC-1307, SEC-1528)
+			if (httpSession != null) {
+				// We may have a new session, so check also whether the context attribute
+				// is set SEC-1561
+				if (contextChanged(context)
+						|| httpSession.getAttribute(springSecurityContextKey) == null) {
+					httpSession.setAttribute(springSecurityContextKey, context);
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("SecurityContext '" + context + "' stored to HttpSession: '" + httpSession);
-                    }
-                }
-            }
-        }
+					if (logger.isDebugEnabled()) {
+						logger.debug("SecurityContext '" + context
+								+ "' stored to HttpSession: '" + httpSession);
+					}
+				}
+			}
+		}
 
-        private boolean contextChanged(SecurityContext context) {
-            return context != contextBeforeExecution || context.getAuthentication() != authBeforeExecution;
-        }
+		private boolean contextChanged(SecurityContext context) {
+			return context != contextBeforeExecution
+					|| context.getAuthentication() != authBeforeExecution;
+		}
 
-        private HttpSession createNewSessionIfAllowed(SecurityContext context) {
-            if (httpSessionExistedAtStartOfRequest) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("HttpSession is now null, but was not null at start of request; "
-                            + "session was invalidated, so do not create a new session");
-                }
+		private HttpSession createNewSessionIfAllowed(SecurityContext context) {
+			if (httpSessionExistedAtStartOfRequest) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("HttpSession is now null, but was not null at start of request; "
+							+ "session was invalidated, so do not create a new session");
+				}
 
-                return null;
-            }
+				return null;
+			}
 
-            if (!allowSessionCreation) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("The HttpSession is currently null, and the "
-                                    + HttpSessionSecurityContextRepository.class.getSimpleName()
-                                    + " is prohibited from creating an HttpSession "
-                                    + "(because the allowSessionCreation property is false) - SecurityContext thus not "
-                                    + "stored for next request");
-                }
+			if (!allowSessionCreation) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("The HttpSession is currently null, and the "
+							+ HttpSessionSecurityContextRepository.class.getSimpleName()
+							+ " is prohibited from creating an HttpSession "
+							+ "(because the allowSessionCreation property is false) - SecurityContext thus not "
+							+ "stored for next request");
+				}
 
-                return null;
-            }
-            // Generate a HttpSession only if we need to
+				return null;
+			}
+			// Generate a HttpSession only if we need to
 
-            if (contextObject.equals(context)) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("HttpSession is null, but SecurityContext has not changed from default empty context: ' "
-                            + context
-                            + "'; not creating HttpSession or storing SecurityContext");
-                }
+			if (contextObject.equals(context)) {
+				if (logger.isDebugEnabled()) {
+					logger.debug("HttpSession is null, but SecurityContext has not changed from default empty context: ' "
+							+ context
+							+ "'; not creating HttpSession or storing SecurityContext");
+				}
 
-                return null;
-            }
+				return null;
+			}
 
-            if (logger.isDebugEnabled()) {
-                logger.debug("HttpSession being created as SecurityContext is non-default");
-            }
+			if (logger.isDebugEnabled()) {
+				logger.debug("HttpSession being created as SecurityContext is non-default");
+			}
 
-            try {
-                return request.getSession(true);
-            } catch (IllegalStateException e) {
-                // Response must already be committed, therefore can't create a new session
-                logger.warn("Failed to create a session, as response has been committed. Unable to store" +
-                        " SecurityContext.");
-            }
+			try {
+				return request.getSession(true);
+			}
+			catch (IllegalStateException e) {
+				// Response must already be committed, therefore can't create a new
+				// session
+				logger.warn("Failed to create a session, as response has been committed. Unable to store"
+						+ " SecurityContext.");
+			}
 
-            return null;
-        }
-    }
+			return null;
+		}
+	}
 
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/NullSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/NullSecurityContextRepository.java
index c36e9d9944..39b1557c62 100644
--- a/web/src/main/java/org/springframework/security/web/context/NullSecurityContextRepository.java
+++ b/web/src/main/java/org/springframework/security/web/context/NullSecurityContextRepository.java
@@ -12,15 +12,16 @@ import org.springframework.security.core.context.SecurityContextHolder;
  */
 public final class NullSecurityContextRepository implements SecurityContextRepository {
 
-    public boolean containsContext(HttpServletRequest request) {
-        return false;
-    }
+	public boolean containsContext(HttpServletRequest request) {
+		return false;
+	}
 
-    public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
-        return SecurityContextHolder.createEmptyContext();
-    }
+	public SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder) {
+		return SecurityContextHolder.createEmptyContext();
+	}
 
-    public void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response) {
-    }
+	public void saveContext(SecurityContext context, HttpServletRequest request,
+			HttpServletResponse response) {
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
index 0c9983b4bf..64c032ade8 100644
--- a/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapper.java
@@ -26,11 +26,13 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Base class for response wrappers which encapsulate the logic for storing a security context and which store the
- * <code>SecurityContext</code> when a <code>sendError()</code>, <code>sendRedirect</code>,
- * <code>getOutputStream().close()</code>, <code>getOutputStream().flush()</code>, <code>getWriter().close()</code>, or
- * <code>getWriter().flush()</code> happens on the same thread that this
- * {@link SaveContextOnUpdateOrErrorResponseWrapper} was created. See issue SEC-398 and SEC-2005.
+ * Base class for response wrappers which encapsulate the logic for storing a security
+ * context and which store the <code>SecurityContext</code> when a
+ * <code>sendError()</code>, <code>sendRedirect</code>,
+ * <code>getOutputStream().close()</code>, <code>getOutputStream().flush()</code>,
+ * <code>getWriter().close()</code>, or <code>getWriter().flush()</code> happens on the
+ * same thread that this {@link SaveContextOnUpdateOrErrorResponseWrapper} was created.
+ * See issue SEC-398 and SEC-2005.
  * <p>
  * Sub-classes should implement the {@link #saveContext(SecurityContext context)} method.
  * <p>
@@ -41,424 +43,431 @@ import org.springframework.security.core.context.SecurityContextHolder;
  * @author Rob Winch
  * @since 3.0
  */
-public abstract class SaveContextOnUpdateOrErrorResponseWrapper extends HttpServletResponseWrapper {
-    private final Log logger = LogFactory.getLog(getClass());
-
-    private boolean disableSaveOnResponseCommitted;
-
-    private boolean contextSaved = false;
-    /* See SEC-1052 */
-    private final boolean disableUrlRewriting;
-
-    /**
-     * @param response              the response to be wrapped
-     * @param disableUrlRewriting   turns the URL encoding methods into null operations, preventing the use
-     *                              of URL rewriting to add the session identifier as a URL parameter.
-     */
-    public SaveContextOnUpdateOrErrorResponseWrapper(HttpServletResponse response, boolean disableUrlRewriting) {
-        super(response);
-        this.disableUrlRewriting = disableUrlRewriting;
-    }
-
-    /**
-     * Invoke this method to disable automatic saving of the
-     * {@link SecurityContext} when the {@link HttpServletResponse} is
-     * committed. This can be useful in the event that Async Web Requests are
-     * made which may no longer contain the {@link SecurityContext} on it.
-     */
-    public void disableSaveOnResponseCommitted() {
-        this.disableSaveOnResponseCommitted = true;
-    }
-
-    /**
-     * Implements the logic for storing the security context.
-     *
-     * @param context the <tt>SecurityContext</tt> instance to store
-     */
-    protected abstract void saveContext(SecurityContext context);
-
-    /**
-     * Makes sure the session is updated before calling the
-     * superclass <code>sendError()</code>
-     */
-    @Override
-    public final void sendError(int sc) throws IOException {
-        doSaveContext();
-        super.sendError(sc);
-    }
-
-    /**
-     * Makes sure the session is updated before calling the
-     * superclass <code>sendError()</code>
-     */
-    @Override
-    public final void sendError(int sc, String msg) throws IOException {
-        doSaveContext();
-        super.sendError(sc, msg);
-    }
-
-    /**
-     * Makes sure the context is stored before calling the
-     * superclass <code>sendRedirect()</code>
-     */
-    @Override
-    public final void sendRedirect(String location) throws IOException {
-        doSaveContext();
-        super.sendRedirect(location);
-    }
-
-    /**
-     * Makes sure the context is stored before calling <code>getOutputStream().close()</code> or
-     * <code>getOutputStream().flush()</code>
-     */
-    @Override
-    public ServletOutputStream getOutputStream() throws IOException {
-        return new SaveContextServletOutputStream(super.getOutputStream());
-    }
-
-    /**
-     * Makes sure the context is stored before calling <code>getWriter().close()</code> or
-     * <code>getWriter().flush()</code>
-     */
-    @Override
-    public PrintWriter getWriter() throws IOException {
-        return new SaveContextPrintWriter(super.getWriter());
-    }
-
-    /**
-     * Makes sure the context is stored before calling the
-     * superclass <code>flushBuffer()</code>
-     */
-    @Override
-    public void flushBuffer() throws IOException {
-        doSaveContext();
-        super.flushBuffer();
-    }
-
-    /**
-     * Calls <code>saveContext()</code> with the current contents of the
-     * <tt>SecurityContextHolder</tt> as long as
-     * {@link #disableSaveOnResponseCommitted()()} was not invoked.
-     */
-    private void doSaveContext() {
-        if(!disableSaveOnResponseCommitted) {
-            saveContext(SecurityContextHolder.getContext());
-            contextSaved = true;
-        } else if(logger.isDebugEnabled()){
-            logger.debug("Skip saving SecurityContext since saving on response commited is disabled");
-        }
-    }
-
-    @Override
-    public final String encodeRedirectUrl(String url) {
-        if (disableUrlRewriting) {
-            return url;
-        }
-        return super.encodeRedirectUrl(url);
-    }
-
-    @Override
-    public final String encodeRedirectURL(String url) {
-        if (disableUrlRewriting) {
-            return url;
-        }
-        return super.encodeRedirectURL(url);
-    }
-
-    @Override
-    public final String encodeUrl(String url) {
-        if (disableUrlRewriting) {
-            return url;
-        }
-        return super.encodeUrl(url);
-    }
-
-    @Override
-    public final String encodeURL(String url) {
-        if (disableUrlRewriting) {
-            return url;
-        }
-        return super.encodeURL(url);
-    }
-
-    /**
-     * Tells if the response wrapper has called <code>saveContext()</code> because of this wrapper.
-     */
-    public final boolean isContextSaved() {
-        return contextSaved;
-    }
-
-    /**
-     * Ensures the {@link SecurityContext} is updated prior to methods that commit the response. We delegate all methods
-     * to the original {@link PrintWriter} to ensure that the behavior is as close to the original {@link PrintWriter}
-     * as possible. See SEC-2039
-     * @author Rob Winch
-     */
-    private class SaveContextPrintWriter extends PrintWriter {
-        private final PrintWriter delegate;
-
-        public SaveContextPrintWriter(PrintWriter delegate) {
-            super(delegate);
-            this.delegate = delegate;
-        }
-
-        public void flush() {
-            doSaveContext();
-            delegate.flush();
-        }
-
-        public void close() {
-            doSaveContext();
-            delegate.close();
-        }
-
-        public int hashCode() {
-            return delegate.hashCode();
-        }
-
-        public boolean equals(Object obj) {
-            return delegate.equals(obj);
-        }
-
-        public String toString() {
-            return getClass().getName() + "[delegate=" + delegate.toString() + "]";
-        }
-
-        public boolean checkError() {
-            return delegate.checkError();
-        }
-
-        public void write(int c) {
-            delegate.write(c);
-        }
-
-        public void write(char[] buf, int off, int len) {
-            delegate.write(buf, off, len);
-        }
-
-        public void write(char[] buf) {
-            delegate.write(buf);
-        }
-
-        public void write(String s, int off, int len) {
-            delegate.write(s, off, len);
-        }
-
-        public void write(String s) {
-            delegate.write(s);
-        }
-
-        public void print(boolean b) {
-            delegate.print(b);
-        }
-
-        public void print(char c) {
-            delegate.print(c);
-        }
-
-        public void print(int i) {
-            delegate.print(i);
-        }
-
-        public void print(long l) {
-            delegate.print(l);
-        }
-
-        public void print(float f) {
-            delegate.print(f);
-        }
-
-        public void print(double d) {
-            delegate.print(d);
-        }
-
-        public void print(char[] s) {
-            delegate.print(s);
-        }
-
-        public void print(String s) {
-            delegate.print(s);
-        }
-
-        public void print(Object obj) {
-            delegate.print(obj);
-        }
-
-        public void println() {
-            delegate.println();
-        }
-
-        public void println(boolean x) {
-            delegate.println(x);
-        }
-
-        public void println(char x) {
-            delegate.println(x);
-        }
-
-        public void println(int x) {
-            delegate.println(x);
-        }
-
-        public void println(long x) {
-            delegate.println(x);
-        }
-
-        public void println(float x) {
-            delegate.println(x);
-        }
-
-        public void println(double x) {
-            delegate.println(x);
-        }
-
-        public void println(char[] x) {
-            delegate.println(x);
-        }
-
-        public void println(String x) {
-            delegate.println(x);
-        }
-
-        public void println(Object x) {
-            delegate.println(x);
-        }
-
-        public PrintWriter printf(String format, Object... args) {
-            return delegate.printf(format, args);
-        }
-
-        public PrintWriter printf(Locale l, String format, Object... args) {
-            return delegate.printf(l, format, args);
-        }
-
-        public PrintWriter format(String format, Object... args) {
-            return delegate.format(format, args);
-        }
-
-        public PrintWriter format(Locale l, String format, Object... args) {
-            return delegate.format(l, format, args);
-        }
-
-        public PrintWriter append(CharSequence csq) {
-            return delegate.append(csq);
-        }
-
-        public PrintWriter append(CharSequence csq, int start, int end) {
-            return delegate.append(csq, start, end);
-        }
-
-        public PrintWriter append(char c) {
-            return delegate.append(c);
-        }
-    }
-
-    /**
-     * Ensures the {@link SecurityContext} is updated prior to methods that commit the response. We delegate all methods
-     * to the original {@link ServletOutputStream} to ensure that the behavior is as close to the original {@link ServletOutputStream}
-     * as possible. See SEC-2039
-     *
-     * @author Rob Winch
-     */
-    private class SaveContextServletOutputStream extends ServletOutputStream {
-        private final ServletOutputStream delegate;
-
-        public SaveContextServletOutputStream(ServletOutputStream delegate) {
-            this.delegate = delegate;
-        }
-
-        public void write(int b) throws IOException {
-            this.delegate.write(b);
-        }
-
-        public void flush() throws IOException {
-            doSaveContext();
-            delegate.flush();
-        }
-
-        public void close() throws IOException {
-            doSaveContext();
-            delegate.close();
-        }
-
-        public int hashCode() {
-            return delegate.hashCode();
-        }
-
-        public boolean equals(Object obj) {
-            return delegate.equals(obj);
-        }
-
-        public void print(boolean b) throws IOException {
-            delegate.print(b);
-        }
-
-        public void print(char c) throws IOException {
-            delegate.print(c);
-        }
-
-        public void print(double d) throws IOException {
-            delegate.print(d);
-        }
-
-        public void print(float f) throws IOException {
-            delegate.print(f);
-        }
-
-        public void print(int i) throws IOException {
-            delegate.print(i);
-        }
-
-        public void print(long l) throws IOException {
-            delegate.print(l);
-        }
-
-        public void print(String arg0) throws IOException {
-            delegate.print(arg0);
-        }
-
-        public void println() throws IOException {
-            delegate.println();
-        }
-
-        public void println(boolean b) throws IOException {
-            delegate.println(b);
-        }
-
-        public void println(char c) throws IOException {
-            delegate.println(c);
-        }
-
-        public void println(double d) throws IOException {
-            delegate.println(d);
-        }
-
-        public void println(float f) throws IOException {
-            delegate.println(f);
-        }
-
-        public void println(int i) throws IOException {
-            delegate.println(i);
-        }
-
-        public void println(long l) throws IOException {
-            delegate.println(l);
-        }
-
-        public void println(String s) throws IOException {
-            delegate.println(s);
-        }
-
-        public void write(byte[] b) throws IOException {
-            delegate.write(b);
-        }
-
-        public void write(byte[] b, int off, int len) throws IOException {
-            delegate.write(b, off, len);
-        }
-
-        public String toString() {
-            return getClass().getName() + "[delegate=" + delegate.toString() + "]";
-        }
-    }
+public abstract class SaveContextOnUpdateOrErrorResponseWrapper extends
+		HttpServletResponseWrapper {
+	private final Log logger = LogFactory.getLog(getClass());
+
+	private boolean disableSaveOnResponseCommitted;
+
+	private boolean contextSaved = false;
+	/* See SEC-1052 */
+	private final boolean disableUrlRewriting;
+
+	/**
+	 * @param response the response to be wrapped
+	 * @param disableUrlRewriting turns the URL encoding methods into null operations,
+	 * preventing the use of URL rewriting to add the session identifier as a URL
+	 * parameter.
+	 */
+	public SaveContextOnUpdateOrErrorResponseWrapper(HttpServletResponse response,
+			boolean disableUrlRewriting) {
+		super(response);
+		this.disableUrlRewriting = disableUrlRewriting;
+	}
+
+	/**
+	 * Invoke this method to disable automatic saving of the {@link SecurityContext} when
+	 * the {@link HttpServletResponse} is committed. This can be useful in the event that
+	 * Async Web Requests are made which may no longer contain the {@link SecurityContext}
+	 * on it.
+	 */
+	public void disableSaveOnResponseCommitted() {
+		this.disableSaveOnResponseCommitted = true;
+	}
+
+	/**
+	 * Implements the logic for storing the security context.
+	 *
+	 * @param context the <tt>SecurityContext</tt> instance to store
+	 */
+	protected abstract void saveContext(SecurityContext context);
+
+	/**
+	 * Makes sure the session is updated before calling the superclass
+	 * <code>sendError()</code>
+	 */
+	@Override
+	public final void sendError(int sc) throws IOException {
+		doSaveContext();
+		super.sendError(sc);
+	}
+
+	/**
+	 * Makes sure the session is updated before calling the superclass
+	 * <code>sendError()</code>
+	 */
+	@Override
+	public final void sendError(int sc, String msg) throws IOException {
+		doSaveContext();
+		super.sendError(sc, msg);
+	}
+
+	/**
+	 * Makes sure the context is stored before calling the superclass
+	 * <code>sendRedirect()</code>
+	 */
+	@Override
+	public final void sendRedirect(String location) throws IOException {
+		doSaveContext();
+		super.sendRedirect(location);
+	}
+
+	/**
+	 * Makes sure the context is stored before calling
+	 * <code>getOutputStream().close()</code> or <code>getOutputStream().flush()</code>
+	 */
+	@Override
+	public ServletOutputStream getOutputStream() throws IOException {
+		return new SaveContextServletOutputStream(super.getOutputStream());
+	}
+
+	/**
+	 * Makes sure the context is stored before calling <code>getWriter().close()</code> or
+	 * <code>getWriter().flush()</code>
+	 */
+	@Override
+	public PrintWriter getWriter() throws IOException {
+		return new SaveContextPrintWriter(super.getWriter());
+	}
+
+	/**
+	 * Makes sure the context is stored before calling the superclass
+	 * <code>flushBuffer()</code>
+	 */
+	@Override
+	public void flushBuffer() throws IOException {
+		doSaveContext();
+		super.flushBuffer();
+	}
+
+	/**
+	 * Calls <code>saveContext()</code> with the current contents of the
+	 * <tt>SecurityContextHolder</tt> as long as {@link #disableSaveOnResponseCommitted()
+	 * ()} was not invoked.
+	 */
+	private void doSaveContext() {
+		if (!disableSaveOnResponseCommitted) {
+			saveContext(SecurityContextHolder.getContext());
+			contextSaved = true;
+		}
+		else if (logger.isDebugEnabled()) {
+			logger.debug("Skip saving SecurityContext since saving on response commited is disabled");
+		}
+	}
+
+	@Override
+	public final String encodeRedirectUrl(String url) {
+		if (disableUrlRewriting) {
+			return url;
+		}
+		return super.encodeRedirectUrl(url);
+	}
+
+	@Override
+	public final String encodeRedirectURL(String url) {
+		if (disableUrlRewriting) {
+			return url;
+		}
+		return super.encodeRedirectURL(url);
+	}
+
+	@Override
+	public final String encodeUrl(String url) {
+		if (disableUrlRewriting) {
+			return url;
+		}
+		return super.encodeUrl(url);
+	}
+
+	@Override
+	public final String encodeURL(String url) {
+		if (disableUrlRewriting) {
+			return url;
+		}
+		return super.encodeURL(url);
+	}
+
+	/**
+	 * Tells if the response wrapper has called <code>saveContext()</code> because of this
+	 * wrapper.
+	 */
+	public final boolean isContextSaved() {
+		return contextSaved;
+	}
+
+	/**
+	 * Ensures the {@link SecurityContext} is updated prior to methods that commit the
+	 * response. We delegate all methods to the original {@link PrintWriter} to ensure
+	 * that the behavior is as close to the original {@link PrintWriter} as possible. See
+	 * SEC-2039
+	 * @author Rob Winch
+	 */
+	private class SaveContextPrintWriter extends PrintWriter {
+		private final PrintWriter delegate;
+
+		public SaveContextPrintWriter(PrintWriter delegate) {
+			super(delegate);
+			this.delegate = delegate;
+		}
+
+		public void flush() {
+			doSaveContext();
+			delegate.flush();
+		}
+
+		public void close() {
+			doSaveContext();
+			delegate.close();
+		}
+
+		public int hashCode() {
+			return delegate.hashCode();
+		}
+
+		public boolean equals(Object obj) {
+			return delegate.equals(obj);
+		}
+
+		public String toString() {
+			return getClass().getName() + "[delegate=" + delegate.toString() + "]";
+		}
+
+		public boolean checkError() {
+			return delegate.checkError();
+		}
+
+		public void write(int c) {
+			delegate.write(c);
+		}
+
+		public void write(char[] buf, int off, int len) {
+			delegate.write(buf, off, len);
+		}
+
+		public void write(char[] buf) {
+			delegate.write(buf);
+		}
+
+		public void write(String s, int off, int len) {
+			delegate.write(s, off, len);
+		}
+
+		public void write(String s) {
+			delegate.write(s);
+		}
+
+		public void print(boolean b) {
+			delegate.print(b);
+		}
+
+		public void print(char c) {
+			delegate.print(c);
+		}
+
+		public void print(int i) {
+			delegate.print(i);
+		}
+
+		public void print(long l) {
+			delegate.print(l);
+		}
+
+		public void print(float f) {
+			delegate.print(f);
+		}
+
+		public void print(double d) {
+			delegate.print(d);
+		}
+
+		public void print(char[] s) {
+			delegate.print(s);
+		}
+
+		public void print(String s) {
+			delegate.print(s);
+		}
+
+		public void print(Object obj) {
+			delegate.print(obj);
+		}
+
+		public void println() {
+			delegate.println();
+		}
+
+		public void println(boolean x) {
+			delegate.println(x);
+		}
+
+		public void println(char x) {
+			delegate.println(x);
+		}
+
+		public void println(int x) {
+			delegate.println(x);
+		}
+
+		public void println(long x) {
+			delegate.println(x);
+		}
+
+		public void println(float x) {
+			delegate.println(x);
+		}
+
+		public void println(double x) {
+			delegate.println(x);
+		}
+
+		public void println(char[] x) {
+			delegate.println(x);
+		}
+
+		public void println(String x) {
+			delegate.println(x);
+		}
+
+		public void println(Object x) {
+			delegate.println(x);
+		}
+
+		public PrintWriter printf(String format, Object... args) {
+			return delegate.printf(format, args);
+		}
+
+		public PrintWriter printf(Locale l, String format, Object... args) {
+			return delegate.printf(l, format, args);
+		}
+
+		public PrintWriter format(String format, Object... args) {
+			return delegate.format(format, args);
+		}
+
+		public PrintWriter format(Locale l, String format, Object... args) {
+			return delegate.format(l, format, args);
+		}
+
+		public PrintWriter append(CharSequence csq) {
+			return delegate.append(csq);
+		}
+
+		public PrintWriter append(CharSequence csq, int start, int end) {
+			return delegate.append(csq, start, end);
+		}
+
+		public PrintWriter append(char c) {
+			return delegate.append(c);
+		}
+	}
+
+	/**
+	 * Ensures the {@link SecurityContext} is updated prior to methods that commit the
+	 * response. We delegate all methods to the original {@link ServletOutputStream} to
+	 * ensure that the behavior is as close to the original {@link ServletOutputStream} as
+	 * possible. See SEC-2039
+	 *
+	 * @author Rob Winch
+	 */
+	private class SaveContextServletOutputStream extends ServletOutputStream {
+		private final ServletOutputStream delegate;
+
+		public SaveContextServletOutputStream(ServletOutputStream delegate) {
+			this.delegate = delegate;
+		}
+
+		public void write(int b) throws IOException {
+			this.delegate.write(b);
+		}
+
+		public void flush() throws IOException {
+			doSaveContext();
+			delegate.flush();
+		}
+
+		public void close() throws IOException {
+			doSaveContext();
+			delegate.close();
+		}
+
+		public int hashCode() {
+			return delegate.hashCode();
+		}
+
+		public boolean equals(Object obj) {
+			return delegate.equals(obj);
+		}
+
+		public void print(boolean b) throws IOException {
+			delegate.print(b);
+		}
+
+		public void print(char c) throws IOException {
+			delegate.print(c);
+		}
+
+		public void print(double d) throws IOException {
+			delegate.print(d);
+		}
+
+		public void print(float f) throws IOException {
+			delegate.print(f);
+		}
+
+		public void print(int i) throws IOException {
+			delegate.print(i);
+		}
+
+		public void print(long l) throws IOException {
+			delegate.print(l);
+		}
+
+		public void print(String arg0) throws IOException {
+			delegate.print(arg0);
+		}
+
+		public void println() throws IOException {
+			delegate.println();
+		}
+
+		public void println(boolean b) throws IOException {
+			delegate.println(b);
+		}
+
+		public void println(char c) throws IOException {
+			delegate.println(c);
+		}
+
+		public void println(double d) throws IOException {
+			delegate.println(d);
+		}
+
+		public void println(float f) throws IOException {
+			delegate.println(f);
+		}
+
+		public void println(int i) throws IOException {
+			delegate.println(i);
+		}
+
+		public void println(long l) throws IOException {
+			delegate.println(l);
+		}
+
+		public void println(String s) throws IOException {
+			delegate.println(s);
+		}
+
+		public void write(byte[] b) throws IOException {
+			delegate.write(b);
+		}
+
+		public void write(byte[] b, int off, int len) throws IOException {
+			delegate.write(b, off, len);
+		}
+
+		public String toString() {
+			return getClass().getName() + "[delegate=" + delegate.toString() + "]";
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
index a7b71432c5..f69dde3627 100644
--- a/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
+++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextPersistenceFilter.java
@@ -16,90 +16,98 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * Populates the {@link SecurityContextHolder} with information obtained from
- * the configured {@link SecurityContextRepository} prior to the request and stores it back in the repository
- * once the request has completed and clearing the context holder. By default it uses an
- * {@link HttpSessionSecurityContextRepository}. See this class for information <tt>HttpSession</tt> related
- * configuration options.
+ * Populates the {@link SecurityContextHolder} with information obtained from the
+ * configured {@link SecurityContextRepository} prior to the request and stores it back in
+ * the repository once the request has completed and clearing the context holder. By
+ * default it uses an {@link HttpSessionSecurityContextRepository}. See this class for
+ * information <tt>HttpSession</tt> related configuration options.
  * <p>
- * This filter will only execute once per request, to resolve servlet container (specifically Weblogic)
- * incompatibilities.
+ * This filter will only execute once per request, to resolve servlet container
+ * (specifically Weblogic) incompatibilities.
  * <p>
- * This filter MUST be executed BEFORE any authentication processing mechanisms. Authentication processing mechanisms
- * (e.g. BASIC, CAS processing filters etc) expect the <code>SecurityContextHolder</code> to contain a valid
- * <code>SecurityContext</code> by the time they execute.
+ * This filter MUST be executed BEFORE any authentication processing mechanisms.
+ * Authentication processing mechanisms (e.g. BASIC, CAS processing filters etc) expect
+ * the <code>SecurityContextHolder</code> to contain a valid <code>SecurityContext</code>
+ * by the time they execute.
  * <p>
- * This is essentially a refactoring of the old <tt>HttpSessionContextIntegrationFilter</tt> to delegate
- * the storage issues to a separate strategy, allowing for more customization in the way the security context is
+ * This is essentially a refactoring of the old
+ * <tt>HttpSessionContextIntegrationFilter</tt> to delegate the storage issues to a
+ * separate strategy, allowing for more customization in the way the security context is
  * maintained between requests.
  * <p>
- * The <tt>forceEagerSessionCreation</tt> property can be used to ensure that a session is always available before
- * the filter chain executes (the default is <code>false</code>, as this is resource intensive and not recommended).
+ * The <tt>forceEagerSessionCreation</tt> property can be used to ensure that a session is
+ * always available before the filter chain executes (the default is <code>false</code>,
+ * as this is resource intensive and not recommended).
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class SecurityContextPersistenceFilter extends GenericFilterBean {
 
-    static final String FILTER_APPLIED = "__spring_security_scpf_applied";
+	static final String FILTER_APPLIED = "__spring_security_scpf_applied";
 
-    private SecurityContextRepository repo;
+	private SecurityContextRepository repo;
 
-    private boolean forceEagerSessionCreation = false;
+	private boolean forceEagerSessionCreation = false;
 
-    public SecurityContextPersistenceFilter() {
-        this(new HttpSessionSecurityContextRepository());
-    }
+	public SecurityContextPersistenceFilter() {
+		this(new HttpSessionSecurityContextRepository());
+	}
 
-    public SecurityContextPersistenceFilter(SecurityContextRepository repo) {
-        this.repo = repo;
-    }
+	public SecurityContextPersistenceFilter(SecurityContextRepository repo) {
+		this.repo = repo;
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        if (request.getAttribute(FILTER_APPLIED) != null) {
-            // ensure that filter is only applied once per request
-            chain.doFilter(request, response);
-            return;
-        }
+		if (request.getAttribute(FILTER_APPLIED) != null) {
+			// ensure that filter is only applied once per request
+			chain.doFilter(request, response);
+			return;
+		}
 
-        final boolean debug = logger.isDebugEnabled();
+		final boolean debug = logger.isDebugEnabled();
 
-        request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
+		request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
 
-        if (forceEagerSessionCreation) {
-            HttpSession session = request.getSession();
+		if (forceEagerSessionCreation) {
+			HttpSession session = request.getSession();
 
-            if (debug && session.isNew()) {
-                logger.debug("Eagerly created session: " + session.getId());
-            }
-        }
+			if (debug && session.isNew()) {
+				logger.debug("Eagerly created session: " + session.getId());
+			}
+		}
 
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext contextBeforeChainExecution = repo.loadContext(holder);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext contextBeforeChainExecution = repo.loadContext(holder);
 
-        try {
-            SecurityContextHolder.setContext(contextBeforeChainExecution);
+		try {
+			SecurityContextHolder.setContext(contextBeforeChainExecution);
 
-            chain.doFilter(holder.getRequest(), holder.getResponse());
+			chain.doFilter(holder.getRequest(), holder.getResponse());
 
-        } finally {
-            SecurityContext contextAfterChainExecution = SecurityContextHolder.getContext();
-            // Crucial removal of SecurityContextHolder contents - do this before anything else.
-            SecurityContextHolder.clearContext();
-            repo.saveContext(contextAfterChainExecution, holder.getRequest(), holder.getResponse());
-            request.removeAttribute(FILTER_APPLIED);
+		}
+		finally {
+			SecurityContext contextAfterChainExecution = SecurityContextHolder
+					.getContext();
+			// Crucial removal of SecurityContextHolder contents - do this before anything
+			// else.
+			SecurityContextHolder.clearContext();
+			repo.saveContext(contextAfterChainExecution, holder.getRequest(),
+					holder.getResponse());
+			request.removeAttribute(FILTER_APPLIED);
 
-            if (debug) {
-                logger.debug("SecurityContextHolder now cleared, as request processing completed");
-            }
-        }
-    }
+			if (debug) {
+				logger.debug("SecurityContextHolder now cleared, as request processing completed");
+			}
+		}
+	}
 
-    public void setForceEagerSessionCreation(boolean forceEagerSessionCreation) {
-        this.forceEagerSessionCreation = forceEagerSessionCreation;
-    }
+	public void setForceEagerSessionCreation(boolean forceEagerSessionCreation) {
+		this.forceEagerSessionCreation = forceEagerSessionCreation;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
index 29c9b2805b..f88a5fc978 100644
--- a/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
+++ b/web/src/main/java/org/springframework/security/web/context/SecurityContextRepository.java
@@ -8,12 +8,12 @@ import org.springframework.security.core.context.SecurityContext;
 /**
  * Strategy used for persisting a {@link SecurityContext} between requests.
  * <p>
- * Used by {@link SecurityContextPersistenceFilter} to obtain the context which should be used for the current thread
- * of execution and to store the context once it has been removed from thread-local storage and the request has
- * completed.
+ * Used by {@link SecurityContextPersistenceFilter} to obtain the context which should be
+ * used for the current thread of execution and to store the context once it has been
+ * removed from thread-local storage and the request has completed.
  * <p>
- * The persistence mechanism used will depend on the implementation, but most commonly the <tt>HttpSession</tt> will
- * be used to store the context.
+ * The persistence mechanism used will depend on the implementation, but most commonly the
+ * <tt>HttpSession</tt> will be used to store the context.
  *
  * @author Luke Taylor
  * @since 3.0
@@ -24,38 +24,43 @@ import org.springframework.security.core.context.SecurityContext;
  */
 public interface SecurityContextRepository {
 
-    /**
-     * Obtains the security context for the supplied request. For an unauthenticated user, an empty context
-     * implementation should be returned. This method should not return null.
-     * <p>
-     * The use of the <tt>HttpRequestResponseHolder</tt> parameter allows implementations to return wrapped versions of
-     * the request or response (or both), allowing them to access implementation-specific state for the request.
-     * The values obtained from the holder will be passed on to the filter chain and also to the <tt>saveContext</tt>
-     * method when it is finally called. Implementations may wish to return a subclass of
-     * {@link SaveContextOnUpdateOrErrorResponseWrapper} as the response object, which guarantees that the context is
-     * persisted when an error or redirect occurs.
-     *
-     * @param requestResponseHolder holder for the current request and response for which the context should be loaded.
-     *
-     * @return The security context which should be used for the current request, never null.
-     */
-    SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder);
+	/**
+	 * Obtains the security context for the supplied request. For an unauthenticated user,
+	 * an empty context implementation should be returned. This method should not return
+	 * null.
+	 * <p>
+	 * The use of the <tt>HttpRequestResponseHolder</tt> parameter allows implementations
+	 * to return wrapped versions of the request or response (or both), allowing them to
+	 * access implementation-specific state for the request. The values obtained from the
+	 * holder will be passed on to the filter chain and also to the <tt>saveContext</tt>
+	 * method when it is finally called. Implementations may wish to return a subclass of
+	 * {@link SaveContextOnUpdateOrErrorResponseWrapper} as the response object, which
+	 * guarantees that the context is persisted when an error or redirect occurs.
+	 *
+	 * @param requestResponseHolder holder for the current request and response for which
+	 * the context should be loaded.
+	 *
+	 * @return The security context which should be used for the current request, never
+	 * null.
+	 */
+	SecurityContext loadContext(HttpRequestResponseHolder requestResponseHolder);
 
-    /**
-     * Stores the security context on completion of a request.
-     *
-     * @param context the non-null context which was obtained from the holder.
-     * @param request
-     * @param response
-     */
-    void saveContext(SecurityContext context, HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Stores the security context on completion of a request.
+	 *
+	 * @param context the non-null context which was obtained from the holder.
+	 * @param request
+	 * @param response
+	 */
+	void saveContext(SecurityContext context, HttpServletRequest request,
+			HttpServletResponse response);
 
-    /**
-     * Allows the repository to be queried as to whether it contains a security context for the
-     * current request.
-     *
-     * @param request the current request
-     * @return true if a context is found for the request, false otherwise
-     */
-    boolean containsContext(HttpServletRequest request);
+	/**
+	 * Allows the repository to be queried as to whether it contains a security context
+	 * for the current request.
+	 *
+	 * @param request the current request
+	 * @return true if a context is found for the request, false otherwise
+	 */
+	boolean containsContext(HttpServletRequest request);
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java b/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java
index 2b27422025..20c5f80158 100644
--- a/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java
+++ b/web/src/main/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptor.java
@@ -26,54 +26,62 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept
  * Allows for integration with Spring MVC's {@link Callable} support.
  * </p>
  * <p>
- * A {@link CallableProcessingInterceptor} that establishes the injected {@link SecurityContext} on the
- * {@link SecurityContextHolder} when {@link #preProcess(NativeWebRequest, Callable)} is invoked. It also clear out the
- * {@link SecurityContextHolder} by invoking {@link SecurityContextHolder#clearContext()} in the
- * {@link #postProcess(NativeWebRequest, Callable, Object)} method.
+ * A {@link CallableProcessingInterceptor} that establishes the injected
+ * {@link SecurityContext} on the {@link SecurityContextHolder} when
+ * {@link #preProcess(NativeWebRequest, Callable)} is invoked. It also clear out the
+ * {@link SecurityContextHolder} by invoking {@link SecurityContextHolder#clearContext()}
+ * in the {@link #postProcess(NativeWebRequest, Callable, Object)} method.
  * </p>
  *
  * @author Rob Winch
  * @since 3.2
  */
-public final class SecurityContextCallableProcessingInterceptor extends CallableProcessingInterceptorAdapter {
-    private SecurityContext securityContext;
+public final class SecurityContextCallableProcessingInterceptor extends
+		CallableProcessingInterceptorAdapter {
+	private SecurityContext securityContext;
 
-    /**
-     * Create a new {@link SecurityContextCallableProcessingInterceptor} that uses the {@link SecurityContext} from the
-     * {@link SecurityContextHolder} at the time {@link #beforeConcurrentHandling(NativeWebRequest, Callable)} is invoked.
-     */
-    public SecurityContextCallableProcessingInterceptor() {
-    }
+	/**
+	 * Create a new {@link SecurityContextCallableProcessingInterceptor} that uses the
+	 * {@link SecurityContext} from the {@link SecurityContextHolder} at the time
+	 * {@link #beforeConcurrentHandling(NativeWebRequest, Callable)} is invoked.
+	 */
+	public SecurityContextCallableProcessingInterceptor() {
+	}
 
-    /**
-     * Creates a new {@link SecurityContextCallableProcessingInterceptor} with the specified {@link SecurityContext}.
-     * @param securityContext the {@link SecurityContext} to set on the {@link SecurityContextHolder} in
-     * {@link #preProcess(NativeWebRequest, Callable)}. Cannot be null.
-     * @throws IllegalArgumentException if {@link SecurityContext} is null.
-     */
-    public SecurityContextCallableProcessingInterceptor(SecurityContext securityContext) {
-        Assert.notNull(securityContext, "securityContext cannot be null");
-        setSecurityContext(securityContext);
-    }
+	/**
+	 * Creates a new {@link SecurityContextCallableProcessingInterceptor} with the
+	 * specified {@link SecurityContext}.
+	 * @param securityContext the {@link SecurityContext} to set on the
+	 * {@link SecurityContextHolder} in {@link #preProcess(NativeWebRequest, Callable)}.
+	 * Cannot be null.
+	 * @throws IllegalArgumentException if {@link SecurityContext} is null.
+	 */
+	public SecurityContextCallableProcessingInterceptor(SecurityContext securityContext) {
+		Assert.notNull(securityContext, "securityContext cannot be null");
+		setSecurityContext(securityContext);
+	}
 
-    @Override
-    public <T> void beforeConcurrentHandling(NativeWebRequest request, Callable<T> task) throws Exception {
-        if(securityContext == null) {
-            setSecurityContext(SecurityContextHolder.getContext());
-        }
-    }
+	@Override
+	public <T> void beforeConcurrentHandling(NativeWebRequest request, Callable<T> task)
+			throws Exception {
+		if (securityContext == null) {
+			setSecurityContext(SecurityContextHolder.getContext());
+		}
+	}
 
-    @Override
-    public <T> void preProcess(NativeWebRequest request, Callable<T> task) throws Exception {
-        SecurityContextHolder.setContext(securityContext);
-    }
+	@Override
+	public <T> void preProcess(NativeWebRequest request, Callable<T> task)
+			throws Exception {
+		SecurityContextHolder.setContext(securityContext);
+	}
 
-    @Override
-    public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult) throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@Override
+	public <T> void postProcess(NativeWebRequest request, Callable<T> task,
+			Object concurrentResult) throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    private void setSecurityContext(SecurityContext securityContext) {
-        this.securityContext = securityContext;
-    }
+	private void setSecurityContext(SecurityContext securityContext) {
+		this.securityContext = securityContext;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilter.java
index b6de62b8fe..3245540c4b 100644
--- a/web/src/main/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilter.java
@@ -26,7 +26,8 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
- * Provides integration between the {@link SecurityContext} and Spring Web's {@link WebAsyncManager} by using the
+ * Provides integration between the {@link SecurityContext} and Spring Web's
+ * {@link WebAsyncManager} by using the
  * {@link SecurityContextCallableProcessingInterceptor#beforeConcurrentHandling(org.springframework.web.context.request.NativeWebRequest, Callable)}
  * to populate the {@link SecurityContext} on the {@link Callable}.
  *
@@ -34,19 +35,21 @@ import org.springframework.web.filter.OncePerRequestFilter;
  * @see SecurityContextCallableProcessingInterceptor
  */
 public final class WebAsyncManagerIntegrationFilter extends OncePerRequestFilter {
-    private static final Object CALLABLE_INTERCEPTOR_KEY = new Object();
+	private static final Object CALLABLE_INTERCEPTOR_KEY = new Object();
 
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
+	@Override
+	protected void doFilterInternal(HttpServletRequest request,
+			HttpServletResponse response, FilterChain filterChain)
+			throws ServletException, IOException {
+		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request);
 
-        SecurityContextCallableProcessingInterceptor securityProcessingInterceptor = (SecurityContextCallableProcessingInterceptor) asyncManager.getCallableInterceptor(CALLABLE_INTERCEPTOR_KEY);
-        if (securityProcessingInterceptor == null) {
-            asyncManager.registerCallableInterceptor(CALLABLE_INTERCEPTOR_KEY,
-                    new SecurityContextCallableProcessingInterceptor());
-        }
+		SecurityContextCallableProcessingInterceptor securityProcessingInterceptor = (SecurityContextCallableProcessingInterceptor) asyncManager
+				.getCallableInterceptor(CALLABLE_INTERCEPTOR_KEY);
+		if (securityProcessingInterceptor == null) {
+			asyncManager.registerCallableInterceptor(CALLABLE_INTERCEPTOR_KEY,
+					new SecurityContextCallableProcessingInterceptor());
+		}
 
-        filterChain.doFilter(request, response);
-    }
+		filterChain.doFilter(request, response);
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
index 4240038f2e..35eef4fe70 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
@@ -31,113 +31,118 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  * @since 3.2
  */
-public final class CsrfAuthenticationStrategy implements
-        SessionAuthenticationStrategy {
+public final class CsrfAuthenticationStrategy implements SessionAuthenticationStrategy {
 
-    private final CsrfTokenRepository csrfTokenRepository;
+	private final CsrfTokenRepository csrfTokenRepository;
 
-    /**
-     * Creates a new instance
-     * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
-     */
-    public CsrfAuthenticationStrategy(CsrfTokenRepository csrfTokenRepository) {
-        Assert.notNull(csrfTokenRepository,"csrfTokenRepository cannot be null");
-        this.csrfTokenRepository = csrfTokenRepository;
-    }
+	/**
+	 * Creates a new instance
+	 * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
+	 */
+	public CsrfAuthenticationStrategy(CsrfTokenRepository csrfTokenRepository) {
+		Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
+		this.csrfTokenRepository = csrfTokenRepository;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.authentication.session.SessionAuthenticationStrategy#onAuthentication(org.springframework.security.core.Authentication, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void onAuthentication(Authentication authentication,
-            HttpServletRequest request, HttpServletResponse response)
-            throws SessionAuthenticationException {
-        boolean containsToken = this.csrfTokenRepository.loadToken(request) != null;
-        if(containsToken) {
-            this.csrfTokenRepository.saveToken(null, request, response);
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.authentication.session.SessionAuthenticationStrategy
+	 * #onAuthentication(org.springframework.security.core.Authentication,
+	 * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	public void onAuthentication(Authentication authentication,
+			HttpServletRequest request, HttpServletResponse response)
+			throws SessionAuthenticationException {
+		boolean containsToken = this.csrfTokenRepository.loadToken(request) != null;
+		if (containsToken) {
+			this.csrfTokenRepository.saveToken(null, request, response);
 
-            CsrfToken newToken = this.csrfTokenRepository.generateToken(request);
-            CsrfToken tokenForRequest = new SaveOnAccessCsrfToken(csrfTokenRepository, request, response, newToken);
+			CsrfToken newToken = this.csrfTokenRepository.generateToken(request);
+			CsrfToken tokenForRequest = new SaveOnAccessCsrfToken(csrfTokenRepository,
+					request, response, newToken);
 
-            request.setAttribute(CsrfToken.class.getName(), tokenForRequest);
-            request.setAttribute(newToken.getParameterName(), tokenForRequest);
-        }
-    }
+			request.setAttribute(CsrfToken.class.getName(), tokenForRequest);
+			request.setAttribute(newToken.getParameterName(), tokenForRequest);
+		}
+	}
 
-    private static final class SaveOnAccessCsrfToken implements CsrfToken {
-        private transient CsrfTokenRepository tokenRepository;
-        private transient HttpServletRequest request;
-        private transient HttpServletResponse response;
+	private static final class SaveOnAccessCsrfToken implements CsrfToken {
+		private transient CsrfTokenRepository tokenRepository;
+		private transient HttpServletRequest request;
+		private transient HttpServletResponse response;
 
-        private final CsrfToken delegate;
+		private final CsrfToken delegate;
 
-        public SaveOnAccessCsrfToken(CsrfTokenRepository tokenRepository,
-                                     HttpServletRequest request, HttpServletResponse response,
-                                     CsrfToken delegate) {
-            super();
-            this.tokenRepository = tokenRepository;
-            this.request = request;
-            this.response = response;
-            this.delegate = delegate;
-        }
+		public SaveOnAccessCsrfToken(CsrfTokenRepository tokenRepository,
+				HttpServletRequest request, HttpServletResponse response,
+				CsrfToken delegate) {
+			super();
+			this.tokenRepository = tokenRepository;
+			this.request = request;
+			this.response = response;
+			this.delegate = delegate;
+		}
 
-        public String getHeaderName() {
-            return delegate.getHeaderName();
-        }
+		public String getHeaderName() {
+			return delegate.getHeaderName();
+		}
 
-        public String getParameterName() {
-            return delegate.getParameterName();
-        }
+		public String getParameterName() {
+			return delegate.getParameterName();
+		}
 
-        public String getToken() {
-            saveTokenIfNecessary();
-            return delegate.getToken();
-        }
+		public String getToken() {
+			saveTokenIfNecessary();
+			return delegate.getToken();
+		}
 
-        @Override
-        public String toString() {
-            return "SaveOnAccessCsrfToken [delegate=" + delegate + "]";
-        }
+		@Override
+		public String toString() {
+			return "SaveOnAccessCsrfToken [delegate=" + delegate + "]";
+		}
 
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result
-                    + ((delegate == null) ? 0 : delegate.hashCode());
-            return result;
-        }
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((delegate == null) ? 0 : delegate.hashCode());
+			return result;
+		}
 
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            SaveOnAccessCsrfToken other = (SaveOnAccessCsrfToken) obj;
-            if (delegate == null) {
-                if (other.delegate != null)
-                    return false;
-            } else if (!delegate.equals(other.delegate))
-                return false;
-            return true;
-        }
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			SaveOnAccessCsrfToken other = (SaveOnAccessCsrfToken) obj;
+			if (delegate == null) {
+				if (other.delegate != null)
+					return false;
+			}
+			else if (!delegate.equals(other.delegate))
+				return false;
+			return true;
+		}
 
-        private void saveTokenIfNecessary() {
-            if(this.tokenRepository == null) {
-                return;
-            }
+		private void saveTokenIfNecessary() {
+			if (this.tokenRepository == null) {
+				return;
+			}
 
-            synchronized(this) {
-                if(tokenRepository != null) {
-                    this.tokenRepository.saveToken(delegate, request, response);
-                    this.tokenRepository = null;
-                    this.request = null;
-                    this.response = null;
-                }
-            }
-        }
+			synchronized (this) {
+				if (tokenRepository != null) {
+					this.tokenRepository.saveToken(delegate, request, response);
+					this.tokenRepository = null;
+					this.request = null;
+					this.response = null;
+				}
+			}
+		}
 
-    }
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfException.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfException.java
index f21c50c208..e19867df72 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfException.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfException.java
@@ -26,7 +26,7 @@ import org.springframework.security.access.AccessDeniedException;
 @SuppressWarnings("serial")
 public class CsrfException extends AccessDeniedException {
 
-    public CsrfException(String message) {
-        super(message);
-    }
+	public CsrfException(String message) {
+		super(message);
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java
index 83ea69308a..1699b09593 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java
@@ -35,205 +35,217 @@ import org.springframework.web.filter.OncePerRequestFilter;
 
 /**
  * <p>
- * Applies <a
- * href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)"
- * >CSRF</a> protection using a synchronizer token pattern. Developers are
- * required to ensure that {@link CsrfFilter} is invoked for any request that
- * allows state to change. Typically this just means that they should ensure
- * their web application follows proper REST semantics (i.e. do not change state
- * with the HTTP methods GET, HEAD, TRACE, OPTIONS).
+ * Applies <a href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)"
+ * >CSRF</a> protection using a synchronizer token pattern. Developers are required to
+ * ensure that {@link CsrfFilter} is invoked for any request that allows state to change.
+ * Typically this just means that they should ensure their web application follows proper
+ * REST semantics (i.e. do not change state with the HTTP methods GET, HEAD, TRACE,
+ * OPTIONS).
  * </p>
  *
  * <p>
  * Typically the {@link CsrfTokenRepository} implementation chooses to store the
- * {@link CsrfToken} in {@link HttpSession} with
- * {@link HttpSessionCsrfTokenRepository}. This is preferred to storing the
- * token in a cookie which.
+ * {@link CsrfToken} in {@link HttpSession} with {@link HttpSessionCsrfTokenRepository}.
+ * This is preferred to storing the token in a cookie which.
  * </p>
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class CsrfFilter extends OncePerRequestFilter {
-    /**
-     * The default {@link RequestMatcher} that indicates if CSRF protection is
-     * required or not. The default is to ignore GET, HEAD, TRACE, OPTIONS and
-     * process all other requests.
-     */
-    public static final RequestMatcher DEFAULT_CSRF_MATCHER = new DefaultRequiresCsrfMatcher();
+	/**
+	 * The default {@link RequestMatcher} that indicates if CSRF protection is required or
+	 * not. The default is to ignore GET, HEAD, TRACE, OPTIONS and process all other
+	 * requests.
+	 */
+	public static final RequestMatcher DEFAULT_CSRF_MATCHER = new DefaultRequiresCsrfMatcher();
 
-    private final Log logger = LogFactory.getLog(getClass());
-    private final CsrfTokenRepository tokenRepository;
-    private RequestMatcher requireCsrfProtectionMatcher = new DefaultRequiresCsrfMatcher();
-    private AccessDeniedHandler accessDeniedHandler = new AccessDeniedHandlerImpl();
+	private final Log logger = LogFactory.getLog(getClass());
+	private final CsrfTokenRepository tokenRepository;
+	private RequestMatcher requireCsrfProtectionMatcher = new DefaultRequiresCsrfMatcher();
+	private AccessDeniedHandler accessDeniedHandler = new AccessDeniedHandlerImpl();
 
-    public CsrfFilter(CsrfTokenRepository csrfTokenRepository) {
-        Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
-        this.tokenRepository = csrfTokenRepository;
-    }
+	public CsrfFilter(CsrfTokenRepository csrfTokenRepository) {
+		Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
+		this.tokenRepository = csrfTokenRepository;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.filter.OncePerRequestFilter#doFilterInternal(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, javax.servlet.FilterChain)
-     */
-    @Override
-    protected void doFilterInternal(HttpServletRequest request,
-            HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        CsrfToken csrfToken = tokenRepository.loadToken(request);
-        final boolean missingToken = csrfToken == null;
-        if(missingToken) {
-            CsrfToken generatedToken = tokenRepository.generateToken(request);
-            csrfToken = new SaveOnAccessCsrfToken(tokenRepository, request, response, generatedToken);
-        }
-        request.setAttribute(CsrfToken.class.getName(), csrfToken);
-        request.setAttribute(csrfToken.getParameterName(), csrfToken);
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.filter.OncePerRequestFilter#doFilterInternal(javax.servlet
+	 * .http.HttpServletRequest, javax.servlet.http.HttpServletResponse,
+	 * javax.servlet.FilterChain)
+	 */
+	@Override
+	protected void doFilterInternal(HttpServletRequest request,
+			HttpServletResponse response, FilterChain filterChain)
+			throws ServletException, IOException {
+		CsrfToken csrfToken = tokenRepository.loadToken(request);
+		final boolean missingToken = csrfToken == null;
+		if (missingToken) {
+			CsrfToken generatedToken = tokenRepository.generateToken(request);
+			csrfToken = new SaveOnAccessCsrfToken(tokenRepository, request, response,
+					generatedToken);
+		}
+		request.setAttribute(CsrfToken.class.getName(), csrfToken);
+		request.setAttribute(csrfToken.getParameterName(), csrfToken);
 
-        if(!requireCsrfProtectionMatcher.matches(request)) {
-            filterChain.doFilter(request, response);
-            return;
-        }
+		if (!requireCsrfProtectionMatcher.matches(request)) {
+			filterChain.doFilter(request, response);
+			return;
+		}
 
-        String actualToken = request.getHeader(csrfToken.getHeaderName());
-        if(actualToken == null) {
-            actualToken = request.getParameter(csrfToken.getParameterName());
-        }
-        if(!csrfToken.getToken().equals(actualToken)) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Invalid CSRF token found for " + UrlUtils.buildFullRequestUrl(request));
-            }
-            if(missingToken) {
-                accessDeniedHandler.handle(request, response, new MissingCsrfTokenException(actualToken));
-            } else {
-                accessDeniedHandler.handle(request, response, new InvalidCsrfTokenException(csrfToken, actualToken));
-            }
-            return;
-        }
+		String actualToken = request.getHeader(csrfToken.getHeaderName());
+		if (actualToken == null) {
+			actualToken = request.getParameter(csrfToken.getParameterName());
+		}
+		if (!csrfToken.getToken().equals(actualToken)) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Invalid CSRF token found for "
+						+ UrlUtils.buildFullRequestUrl(request));
+			}
+			if (missingToken) {
+				accessDeniedHandler.handle(request, response,
+						new MissingCsrfTokenException(actualToken));
+			}
+			else {
+				accessDeniedHandler.handle(request, response,
+						new InvalidCsrfTokenException(csrfToken, actualToken));
+			}
+			return;
+		}
 
-        filterChain.doFilter(request, response);
-    }
+		filterChain.doFilter(request, response);
+	}
 
-    /**
-     * Specifies a {@link RequestMatcher} that is used to determine if CSRF
-     * protection should be applied. If the {@link RequestMatcher} returns true
-     * for a given request, then CSRF protection is applied.
-     *
-     * <p>
-     * The default is to apply CSRF protection for any HTTP method other than
-     * GET, HEAD, TRACE, OPTIONS.
-     * </p>
-     *
-     * @param requireCsrfProtectionMatcher
-     *            the {@link RequestMatcher} used to determine if CSRF
-     *            protection should be applied.
-     */
-    public void setRequireCsrfProtectionMatcher(RequestMatcher requireCsrfProtectionMatcher) {
-        Assert.notNull(requireCsrfProtectionMatcher, "requireCsrfProtectionMatcher cannot be null");
-        this.requireCsrfProtectionMatcher = requireCsrfProtectionMatcher;
-    }
+	/**
+	 * Specifies a {@link RequestMatcher} that is used to determine if CSRF protection
+	 * should be applied. If the {@link RequestMatcher} returns true for a given request,
+	 * then CSRF protection is applied.
+	 *
+	 * <p>
+	 * The default is to apply CSRF protection for any HTTP method other than GET, HEAD,
+	 * TRACE, OPTIONS.
+	 * </p>
+	 *
+	 * @param requireCsrfProtectionMatcher the {@link RequestMatcher} used to determine if
+	 * CSRF protection should be applied.
+	 */
+	public void setRequireCsrfProtectionMatcher(
+			RequestMatcher requireCsrfProtectionMatcher) {
+		Assert.notNull(requireCsrfProtectionMatcher,
+				"requireCsrfProtectionMatcher cannot be null");
+		this.requireCsrfProtectionMatcher = requireCsrfProtectionMatcher;
+	}
 
+	/**
+	 * Specifies a {@link AccessDeniedHandler} that should be used when CSRF protection
+	 * fails.
+	 *
+	 * <p>
+	 * The default is to use AccessDeniedHandlerImpl with no arguments.
+	 * </p>
+	 *
+	 * @param accessDeniedHandler the {@link AccessDeniedHandler} to use
+	 */
+	public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
+		Assert.notNull(accessDeniedHandler, "accessDeniedHandler cannot be null");
+		this.accessDeniedHandler = accessDeniedHandler;
+	}
 
-    /**
-     * Specifies a {@link AccessDeniedHandler} that should be used when CSRF protection fails.
-     *
-     * <p>
-     * The default is to use AccessDeniedHandlerImpl with no arguments.
-     * </p>
-     *
-     * @param accessDeniedHandler
-     *            the {@link AccessDeniedHandler} to use
-     */
-    public void setAccessDeniedHandler(AccessDeniedHandler accessDeniedHandler) {
-        Assert.notNull(accessDeniedHandler, "accessDeniedHandler cannot be null");
-        this.accessDeniedHandler = accessDeniedHandler;
-    }
+	@SuppressWarnings("serial")
+	private static final class SaveOnAccessCsrfToken implements CsrfToken {
+		private transient CsrfTokenRepository tokenRepository;
+		private transient HttpServletRequest request;
+		private transient HttpServletResponse response;
 
-    @SuppressWarnings("serial")
-    private static final class SaveOnAccessCsrfToken implements CsrfToken {
-        private transient CsrfTokenRepository tokenRepository;
-        private transient HttpServletRequest request;
-        private transient HttpServletResponse response;
+		private final CsrfToken delegate;
 
-        private final CsrfToken delegate;
+		public SaveOnAccessCsrfToken(CsrfTokenRepository tokenRepository,
+				HttpServletRequest request, HttpServletResponse response,
+				CsrfToken delegate) {
+			super();
+			this.tokenRepository = tokenRepository;
+			this.request = request;
+			this.response = response;
+			this.delegate = delegate;
+		}
 
-        public SaveOnAccessCsrfToken(CsrfTokenRepository tokenRepository,
-                HttpServletRequest request, HttpServletResponse response,
-                CsrfToken delegate) {
-            super();
-            this.tokenRepository = tokenRepository;
-            this.request = request;
-            this.response = response;
-            this.delegate = delegate;
-        }
+		public String getHeaderName() {
+			return delegate.getHeaderName();
+		}
 
-        public String getHeaderName() {
-            return delegate.getHeaderName();
-        }
+		public String getParameterName() {
+			return delegate.getParameterName();
+		}
 
-        public String getParameterName() {
-            return delegate.getParameterName();
-        }
+		public String getToken() {
+			saveTokenIfNecessary();
+			return delegate.getToken();
+		}
 
-        public String getToken() {
-            saveTokenIfNecessary();
-            return delegate.getToken();
-        }
+		@Override
+		public String toString() {
+			return "SaveOnAccessCsrfToken [delegate=" + delegate + "]";
+		}
 
-        @Override
-        public String toString() {
-            return "SaveOnAccessCsrfToken [delegate=" + delegate + "]";
-        }
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + ((delegate == null) ? 0 : delegate.hashCode());
+			return result;
+		}
 
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result
-                    + ((delegate == null) ? 0 : delegate.hashCode());
-            return result;
-        }
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			SaveOnAccessCsrfToken other = (SaveOnAccessCsrfToken) obj;
+			if (delegate == null) {
+				if (other.delegate != null)
+					return false;
+			}
+			else if (!delegate.equals(other.delegate))
+				return false;
+			return true;
+		}
 
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            SaveOnAccessCsrfToken other = (SaveOnAccessCsrfToken) obj;
-            if (delegate == null) {
-                if (other.delegate != null)
-                    return false;
-            } else if (!delegate.equals(other.delegate))
-                return false;
-            return true;
-        }
+		private void saveTokenIfNecessary() {
+			if (this.tokenRepository == null) {
+				return;
+			}
 
-        private void saveTokenIfNecessary() {
-            if(this.tokenRepository == null) {
-                return;
-            }
+			synchronized (this) {
+				if (tokenRepository != null) {
+					this.tokenRepository.saveToken(delegate, request, response);
+					this.tokenRepository = null;
+					this.request = null;
+					this.response = null;
+				}
+			}
+		}
 
-            synchronized(this) {
-                if(tokenRepository != null) {
-                    this.tokenRepository.saveToken(delegate, request, response);
-                    this.tokenRepository = null;
-                    this.request = null;
-                    this.response = null;
-                }
-            }
-        }
+	}
 
-    }
+	private static final class DefaultRequiresCsrfMatcher implements RequestMatcher {
+		private Pattern allowedMethods = Pattern.compile("^(GET|HEAD|TRACE|OPTIONS)$");
 
-    private static final class DefaultRequiresCsrfMatcher implements RequestMatcher {
-        private Pattern allowedMethods = Pattern.compile("^(GET|HEAD|TRACE|OPTIONS)$");
-
-        /* (non-Javadoc)
-         * @see org.springframework.security.web.util.matcher.RequestMatcher#matches(javax.servlet.http.HttpServletRequest)
-         */
-        public boolean matches(HttpServletRequest request) {
-            return !allowedMethods.matcher(request.getMethod()).matches();
-        }
-    }
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see
+		 * org.springframework.security.web.util.matcher.RequestMatcher#matches(javax.
+		 * servlet.http.HttpServletRequest)
+		 */
+		public boolean matches(HttpServletRequest request) {
+			return !allowedMethods.matcher(request.getMethod()).matches();
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfLogoutHandler.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfLogoutHandler.java
index 35b07df109..0a680507cb 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfLogoutHandler.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfLogoutHandler.java
@@ -23,32 +23,33 @@ import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.util.Assert;
 
 /**
- * {@link CsrfLogoutHandler} is in charge of removing the {@link CsrfToken} upon
- * logout. A new {@link CsrfToken} will then be generated by the framework upon
- * the next request.
+ * {@link CsrfLogoutHandler} is in charge of removing the {@link CsrfToken} upon logout. A
+ * new {@link CsrfToken} will then be generated by the framework upon the next request.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class CsrfLogoutHandler implements LogoutHandler {
-    private final CsrfTokenRepository csrfTokenRepository;
+	private final CsrfTokenRepository csrfTokenRepository;
 
-    /**
-     * Creates a new instance
-     * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
-     */
-    public CsrfLogoutHandler(CsrfTokenRepository csrfTokenRepository) {
-        Assert.notNull(csrfTokenRepository,"csrfTokenRepository cannot be null");
-        this.csrfTokenRepository = csrfTokenRepository;
-    }
+	/**
+	 * Creates a new instance
+	 * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
+	 */
+	public CsrfLogoutHandler(CsrfTokenRepository csrfTokenRepository) {
+		Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
+		this.csrfTokenRepository = csrfTokenRepository;
+	}
 
-    /**
-     * Clears the {@link CsrfToken}
-     *
-     * @see org.springframework.security.web.authentication.logout.LogoutHandler#logout(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.springframework.security.core.Authentication)
-     */
-    public void logout(HttpServletRequest request,
-            HttpServletResponse response, Authentication authentication) {
-        this.csrfTokenRepository.saveToken(null, request, response);
-    }
+	/**
+	 * Clears the {@link CsrfToken}
+	 *
+	 * @see org.springframework.security.web.authentication.logout.LogoutHandler#logout(javax.servlet.http.HttpServletRequest,
+	 * javax.servlet.http.HttpServletResponse,
+	 * org.springframework.security.core.Authentication)
+	 */
+	public void logout(HttpServletRequest request, HttpServletResponse response,
+			Authentication authentication) {
+		this.csrfTokenRepository.saveToken(null, request, response);
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfToken.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfToken.java
index 1f98c405e8..2e9b66a063 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfToken.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfToken.java
@@ -28,25 +28,25 @@ import java.io.Serializable;
  */
 public interface CsrfToken extends Serializable {
 
-    /**
-     * Gets the HTTP header that the CSRF is populated on the response and can
-     * be placed on requests instead of the parameter. Cannot be null.
-     *
-     * @return the HTTP header that the CSRF is populated on the response and
-     *         can be placed on requests instead of the parameter
-     */
-    String getHeaderName();
+	/**
+	 * Gets the HTTP header that the CSRF is populated on the response and can be placed
+	 * on requests instead of the parameter. Cannot be null.
+	 *
+	 * @return the HTTP header that the CSRF is populated on the response and can be
+	 * placed on requests instead of the parameter
+	 */
+	String getHeaderName();
 
-    /**
-     * Gets the HTTP parameter name that should contain the token. Cannot be null.
-     * @return the HTTP parameter name that should contain the token.
-     */
-    String getParameterName();
+	/**
+	 * Gets the HTTP parameter name that should contain the token. Cannot be null.
+	 * @return the HTTP parameter name that should contain the token.
+	 */
+	String getParameterName();
 
-    /**
-     * Gets the token value. Cannot be null.
-     * @return the token value
-     */
-    String getToken();
+	/**
+	 * Gets the token value. Cannot be null.
+	 * @return the token value
+	 */
+	String getToken();
 
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfTokenRepository.java
index 36a8109a7d..f4239e9fc9 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/CsrfTokenRepository.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfTokenRepository.java
@@ -20,9 +20,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 /**
- * An API to allow changing the method in which the expected {@link CsrfToken}
- * is associated to the {@link HttpServletRequest}. For example, it may be
- * stored in {@link HttpSession}.
+ * An API to allow changing the method in which the expected {@link CsrfToken} is
+ * associated to the {@link HttpServletRequest}. For example, it may be stored in
+ * {@link HttpSession}.
  *
  * @see HttpSessionCsrfTokenRepository
  *
@@ -32,37 +32,31 @@ import javax.servlet.http.HttpSession;
  */
 public interface CsrfTokenRepository {
 
-    /**
-     * Generates a {@link CsrfToken}
-     *
-     * @param request
-     *            the {@link HttpServletRequest} to use
-     * @return the {@link CsrfToken} that was generated. Cannot be
-     *         null.
-     */
-    CsrfToken generateToken(HttpServletRequest request);
+	/**
+	 * Generates a {@link CsrfToken}
+	 *
+	 * @param request the {@link HttpServletRequest} to use
+	 * @return the {@link CsrfToken} that was generated. Cannot be null.
+	 */
+	CsrfToken generateToken(HttpServletRequest request);
 
-    /**
-     * Saves the {@link CsrfToken} using the {@link HttpServletRequest} and
-     * {@link HttpServletResponse}. If the {@link CsrfToken} is null, it is the
-     * same as deleting it.
-     *
-     * @param token
-     *            the {@link CsrfToken} to save or null to delete
-     * @param request
-     *            the {@link HttpServletRequest} to use
-     * @param response
-     *            the {@link HttpServletResponse} to use
-     */
-    void saveToken(CsrfToken token, HttpServletRequest request,
-            HttpServletResponse response);
+	/**
+	 * Saves the {@link CsrfToken} using the {@link HttpServletRequest} and
+	 * {@link HttpServletResponse}. If the {@link CsrfToken} is null, it is the same as
+	 * deleting it.
+	 *
+	 * @param token the {@link CsrfToken} to save or null to delete
+	 * @param request the {@link HttpServletRequest} to use
+	 * @param response the {@link HttpServletResponse} to use
+	 */
+	void saveToken(CsrfToken token, HttpServletRequest request,
+			HttpServletResponse response);
 
-    /**
-     * Loads the expected {@link CsrfToken} from the {@link HttpServletRequest}
-     *
-     * @param request
-     *            the {@link HttpServletRequest} to use
-     * @return the {@link CsrfToken} or null if none exists
-     */
-    CsrfToken loadToken(HttpServletRequest request);
+	/**
+	 * Loads the expected {@link CsrfToken} from the {@link HttpServletRequest}
+	 *
+	 * @param request the {@link HttpServletRequest} to use
+	 * @return the {@link CsrfToken} or null if none exists
+	 */
+	CsrfToken loadToken(HttpServletRequest request);
 }
diff --git a/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java b/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java
index 8c9dc20dbb..932f9975d9 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java
@@ -26,45 +26,52 @@ import org.springframework.util.Assert;
 @SuppressWarnings("serial")
 public final class DefaultCsrfToken implements CsrfToken {
 
-    private final String token;
+	private final String token;
 
-    private final String parameterName;
+	private final String parameterName;
 
-    private final String headerName;
+	private final String headerName;
 
-    /**
-     * Creates a new instance
-     * @param headerName the HTTP header name to use
-     * @param parameterName the HTTP parameter name to use
-     * @param token the value of the token (i.e. expected value of the HTTP parameter of parametername).
-     */
-    public DefaultCsrfToken(String headerName, String parameterName, String token) {
-        Assert.hasLength(headerName, "headerName cannot be null or empty");
-        Assert.hasLength(parameterName, "parameterName cannot be null or empty");
-        Assert.hasLength(token, "token cannot be null or empty");
-        this.headerName = headerName;
-        this.parameterName = parameterName;
-        this.token = token;
-    }
+	/**
+	 * Creates a new instance
+	 * @param headerName the HTTP header name to use
+	 * @param parameterName the HTTP parameter name to use
+	 * @param token the value of the token (i.e. expected value of the HTTP parameter of
+	 * parametername).
+	 */
+	public DefaultCsrfToken(String headerName, String parameterName, String token) {
+		Assert.hasLength(headerName, "headerName cannot be null or empty");
+		Assert.hasLength(parameterName, "parameterName cannot be null or empty");
+		Assert.hasLength(token, "token cannot be null or empty");
+		this.headerName = headerName;
+		this.parameterName = parameterName;
+		this.token = token;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfToken#getHeaderName()
-     */
-    public String getHeaderName() {
-        return headerName;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.web.csrf.CsrfToken#getHeaderName()
+	 */
+	public String getHeaderName() {
+		return headerName;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfToken#getParameterName()
-     */
-    public String getParameterName() {
-        return parameterName;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.web.csrf.CsrfToken#getParameterName()
+	 */
+	public String getParameterName() {
+		return parameterName;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfToken#getToken()
-     */
-    public String getToken() {
-        return token;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.web.csrf.CsrfToken#getToken()
+	 */
+	public String getToken() {
+		return token;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java
index 283e9c45fa..e777c75d7a 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java
@@ -24,92 +24,106 @@ import javax.servlet.http.HttpSession;
 import org.springframework.util.Assert;
 
 /**
- * A {@link CsrfTokenRepository} that stores the {@link CsrfToken} in the {@link HttpSession}.
+ * A {@link CsrfTokenRepository} that stores the {@link CsrfToken} in the
+ * {@link HttpSession}.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class HttpSessionCsrfTokenRepository implements CsrfTokenRepository {
-    private static final String DEFAULT_CSRF_PARAMETER_NAME = "_csrf";
+	private static final String DEFAULT_CSRF_PARAMETER_NAME = "_csrf";
 
-    private static final String DEFAULT_CSRF_HEADER_NAME = "X-CSRF-TOKEN";
+	private static final String DEFAULT_CSRF_HEADER_NAME = "X-CSRF-TOKEN";
 
-    private static final String DEFAULT_CSRF_TOKEN_ATTR_NAME = HttpSessionCsrfTokenRepository.class.getName().concat(".CSRF_TOKEN");
+	private static final String DEFAULT_CSRF_TOKEN_ATTR_NAME = HttpSessionCsrfTokenRepository.class
+			.getName().concat(".CSRF_TOKEN");
 
-    private String parameterName = DEFAULT_CSRF_PARAMETER_NAME;
+	private String parameterName = DEFAULT_CSRF_PARAMETER_NAME;
 
-    private String headerName = DEFAULT_CSRF_HEADER_NAME;
+	private String headerName = DEFAULT_CSRF_HEADER_NAME;
 
-    private String sessionAttributeName = DEFAULT_CSRF_TOKEN_ATTR_NAME;
+	private String sessionAttributeName = DEFAULT_CSRF_TOKEN_ATTR_NAME;
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfTokenRepository#saveToken(org.springframework.security.web.csrf.CsrfToken, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void saveToken(CsrfToken token, HttpServletRequest request,
-            HttpServletResponse response) {
-        if (token == null) {
-            HttpSession session = request.getSession(false);
-            if (session != null) {
-                session.removeAttribute(sessionAttributeName);
-            }
-        } else {
-            HttpSession session = request.getSession();
-            session.setAttribute(sessionAttributeName, token);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.csrf.CsrfTokenRepository#saveToken(org.springframework
+	 * .security.web.csrf.CsrfToken, javax.servlet.http.HttpServletRequest,
+	 * javax.servlet.http.HttpServletResponse)
+	 */
+	public void saveToken(CsrfToken token, HttpServletRequest request,
+			HttpServletResponse response) {
+		if (token == null) {
+			HttpSession session = request.getSession(false);
+			if (session != null) {
+				session.removeAttribute(sessionAttributeName);
+			}
+		}
+		else {
+			HttpSession session = request.getSession();
+			session.setAttribute(sessionAttributeName, token);
+		}
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfTokenRepository#loadToken(javax.servlet.http.HttpServletRequest)
-     */
-    public CsrfToken loadToken(HttpServletRequest request) {
-        HttpSession session = request.getSession(false);
-        if (session == null) {
-            return null;
-        }
-        return (CsrfToken) session.getAttribute(sessionAttributeName);
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.csrf.CsrfTokenRepository#loadToken(javax.servlet
+	 * .http.HttpServletRequest)
+	 */
+	public CsrfToken loadToken(HttpServletRequest request) {
+		HttpSession session = request.getSession(false);
+		if (session == null) {
+			return null;
+		}
+		return (CsrfToken) session.getAttribute(sessionAttributeName);
+	}
 
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.security.web.csrf.CsrfTokenRepository#generateToken(javax.servlet.http.HttpServletRequest)
-     */
-    public CsrfToken generateToken(HttpServletRequest request) {
-        return new DefaultCsrfToken(headerName, parameterName, createNewToken());
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.csrf.CsrfTokenRepository#generateToken(javax.servlet
+	 * .http.HttpServletRequest)
+	 */
+	public CsrfToken generateToken(HttpServletRequest request) {
+		return new DefaultCsrfToken(headerName, parameterName, createNewToken());
+	}
 
-    /**
-     * Sets the {@link HttpServletRequest} parameter name that the {@link CsrfToken} is expected to appear on
-     * @param parameterName the new parameter name to use
-     */
-    public void setParameterName(String parameterName) {
-        Assert.hasLength(parameterName, "parameterName cannot be null or empty");
-        this.parameterName = parameterName;
-    }
+	/**
+	 * Sets the {@link HttpServletRequest} parameter name that the {@link CsrfToken} is
+	 * expected to appear on
+	 * @param parameterName the new parameter name to use
+	 */
+	public void setParameterName(String parameterName) {
+		Assert.hasLength(parameterName, "parameterName cannot be null or empty");
+		this.parameterName = parameterName;
+	}
 
-    /**
-     * Sets the header name that the {@link CsrfToken} is expected to appear on
-     * and the header that the response will contain the {@link CsrfToken}.
-     *
-     * @param headerName
-     *            the new header name to use
-     */
-    public void setHeaderName(String headerName) {
-        Assert.hasLength(headerName, "headerName cannot be null or empty");
-        this.headerName = headerName;
-    }
+	/**
+	 * Sets the header name that the {@link CsrfToken} is expected to appear on and the
+	 * header that the response will contain the {@link CsrfToken}.
+	 *
+	 * @param headerName the new header name to use
+	 */
+	public void setHeaderName(String headerName) {
+		Assert.hasLength(headerName, "headerName cannot be null or empty");
+		this.headerName = headerName;
+	}
 
+	/**
+	 * Sets the {@link HttpSession} attribute name that the {@link CsrfToken} is stored in
+	 * @param sessionAttributeName the new attribute name to use
+	 */
+	public void setSessionAttributeName(String sessionAttributeName) {
+		Assert.hasLength(sessionAttributeName,
+				"sessionAttributename cannot be null or empty");
+		this.sessionAttributeName = sessionAttributeName;
+	}
 
-    /**
-     * Sets the {@link HttpSession} attribute name that the {@link CsrfToken} is stored in
-     * @param sessionAttributeName the new attribute name to use
-     */
-    public void setSessionAttributeName(String sessionAttributeName) {
-        Assert.hasLength(sessionAttributeName, "sessionAttributename cannot be null or empty");
-        this.sessionAttributeName = sessionAttributeName;
-    }
-
-    private String createNewToken() {
-        return UUID.randomUUID().toString();
-    }
+	private String createNewToken() {
+		return UUID.randomUUID().toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java b/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
index 3b8fc0ef0d..ab4577a607 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
@@ -18,8 +18,8 @@ package org.springframework.security.web.csrf;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Thrown when an expected {@link CsrfToken} exists, but it does not match the
- * value present on the {@link HttpServletRequest}
+ * Thrown when an expected {@link CsrfToken} exists, but it does not match the value
+ * present on the {@link HttpServletRequest}
  *
  * @author Rob Winch
  * @since 3.2
@@ -27,13 +27,14 @@ import javax.servlet.http.HttpServletRequest;
 @SuppressWarnings("serial")
 public class InvalidCsrfTokenException extends CsrfException {
 
-    /**
-     * @param msg
-     */
-    public InvalidCsrfTokenException(CsrfToken expectedAccessToken, String actualAccessToken) {
-        super("Invalid CSRF Token '" + actualAccessToken
-                + "' was found on the request parameter '"
-                + expectedAccessToken.getParameterName() + "' or header '"
-                + expectedAccessToken.getHeaderName() + "'.");
-    }
+	/**
+	 * @param msg
+	 */
+	public InvalidCsrfTokenException(CsrfToken expectedAccessToken,
+			String actualAccessToken) {
+		super("Invalid CSRF Token '" + actualAccessToken
+				+ "' was found on the request parameter '"
+				+ expectedAccessToken.getParameterName() + "' or header '"
+				+ expectedAccessToken.getHeaderName() + "'.");
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/csrf/MissingCsrfTokenException.java b/web/src/main/java/org/springframework/security/web/csrf/MissingCsrfTokenException.java
index 855a0201de..aa11cb3c9d 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/MissingCsrfTokenException.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/MissingCsrfTokenException.java
@@ -24,7 +24,7 @@ package org.springframework.security.web.csrf;
 @SuppressWarnings("serial")
 public class MissingCsrfTokenException extends CsrfException {
 
-    public MissingCsrfTokenException(String actualToken) {
-        super("Expected CSRF token not found. Has your session expired?");
-    }
+	public MissingCsrfTokenException(String actualToken) {
+		super("Expected CSRF token not found. Has your session expired?");
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java
index 6d7ef508b1..5dec2bd4bd 100644
--- a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java
+++ b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java
@@ -20,8 +20,9 @@ import java.util.*;
 /**
  * Spring Security debugging filter.
  * <p>
- * Logs information (such as session creation) to help the user understand how requests are being handled
- * by Spring Security and provide them with other relevant information (such as when sessions are being created).
+ * Logs information (such as session creation) to help the user understand how requests
+ * are being handled by Spring Security and provide them with other relevant information
+ * (such as when sessions are being created).
  *
  *
  * @author Luke Taylor
@@ -29,131 +30,135 @@ import java.util.*;
  * @since 3.1
  */
 public final class DebugFilter implements Filter {
-    private static final String ALREADY_FILTERED_ATTR_NAME = DebugFilter.class.getName().concat(".FILTERED");
+	private static final String ALREADY_FILTERED_ATTR_NAME = DebugFilter.class.getName()
+			.concat(".FILTERED");
 
-    private final FilterChainProxy fcp;
-    private final Logger logger = new Logger();
+	private final FilterChainProxy fcp;
+	private final Logger logger = new Logger();
 
-    public DebugFilter(FilterChainProxy fcp) {
-        this.fcp = fcp;
-    }
+	public DebugFilter(FilterChainProxy fcp) {
+		this.fcp = fcp;
+	}
 
-    public final void doFilter(ServletRequest srvltRequest, ServletResponse srvltResponse, FilterChain filterChain)
-            throws ServletException, IOException {
+	public final void doFilter(ServletRequest srvltRequest,
+			ServletResponse srvltResponse, FilterChain filterChain)
+			throws ServletException, IOException {
 
-        if (!(srvltRequest instanceof HttpServletRequest) || !(srvltResponse instanceof HttpServletResponse)) {
-            throw new ServletException("DebugFilter just supports HTTP requests");
-        }
-        HttpServletRequest request = (HttpServletRequest) srvltRequest;
-        HttpServletResponse response = (HttpServletResponse) srvltResponse;
+		if (!(srvltRequest instanceof HttpServletRequest)
+				|| !(srvltResponse instanceof HttpServletResponse)) {
+			throw new ServletException("DebugFilter just supports HTTP requests");
+		}
+		HttpServletRequest request = (HttpServletRequest) srvltRequest;
+		HttpServletResponse response = (HttpServletResponse) srvltResponse;
 
-        List<Filter> filters = getFilters(request);
-        logger.info("Request received for " + request.getMethod() + " '" + UrlUtils.buildRequestUrl(request) + "':\n\n" +
-                request + "\n\n" +
-                "servletPath:" + request.getServletPath() + "\n" +
-                "pathInfo:" + request.getPathInfo() + "\n" +
-                "headers: \n" + formatHeaders(request) + "\n\n" +
-                formatFilters(filters));
+		List<Filter> filters = getFilters(request);
+		logger.info("Request received for " + request.getMethod() + " '"
+				+ UrlUtils.buildRequestUrl(request) + "':\n\n" + request + "\n\n"
+				+ "servletPath:" + request.getServletPath() + "\n" + "pathInfo:"
+				+ request.getPathInfo() + "\n" + "headers: \n" + formatHeaders(request)
+				+ "\n\n" + formatFilters(filters));
 
-        if (request.getAttribute(ALREADY_FILTERED_ATTR_NAME) == null) {
-            invokeWithWrappedRequest(request, response, filterChain);
-        } else {
-            fcp.doFilter(request, response, filterChain);
-        }
-    }
+		if (request.getAttribute(ALREADY_FILTERED_ATTR_NAME) == null) {
+			invokeWithWrappedRequest(request, response, filterChain);
+		}
+		else {
+			fcp.doFilter(request, response, filterChain);
+		}
+	}
 
-    private void invokeWithWrappedRequest(HttpServletRequest request,
-            HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException {
-        request.setAttribute(ALREADY_FILTERED_ATTR_NAME, Boolean.TRUE);
-        request = new DebugRequestWrapper(request);
-        try {
-            fcp.doFilter(request, response, filterChain);
-        }
-        finally {
-            request.removeAttribute(ALREADY_FILTERED_ATTR_NAME);
-        }
-    }
+	private void invokeWithWrappedRequest(HttpServletRequest request,
+			HttpServletResponse response, FilterChain filterChain) throws IOException,
+			ServletException {
+		request.setAttribute(ALREADY_FILTERED_ATTR_NAME, Boolean.TRUE);
+		request = new DebugRequestWrapper(request);
+		try {
+			fcp.doFilter(request, response, filterChain);
+		}
+		finally {
+			request.removeAttribute(ALREADY_FILTERED_ATTR_NAME);
+		}
+	}
 
-    String formatHeaders(HttpServletRequest request) {
-        StringBuilder sb = new StringBuilder();
-        Enumeration<String> eHeaderNames = request.getHeaderNames();
-        while(eHeaderNames.hasMoreElements()) {
-            String headerName = eHeaderNames.nextElement();
-            sb.append(headerName);
-            sb.append(": ");
-            Enumeration<String> eHeaderValues = request.getHeaders(headerName);
-            while(eHeaderValues.hasMoreElements()) {
-                sb.append(eHeaderValues.nextElement());
-                if(eHeaderValues.hasMoreElements()) {
-                    sb.append(", ");
-                }
-            }
-            sb.append("\n");
-        }
-        return sb.toString();
-    }
+	String formatHeaders(HttpServletRequest request) {
+		StringBuilder sb = new StringBuilder();
+		Enumeration<String> eHeaderNames = request.getHeaderNames();
+		while (eHeaderNames.hasMoreElements()) {
+			String headerName = eHeaderNames.nextElement();
+			sb.append(headerName);
+			sb.append(": ");
+			Enumeration<String> eHeaderValues = request.getHeaders(headerName);
+			while (eHeaderValues.hasMoreElements()) {
+				sb.append(eHeaderValues.nextElement());
+				if (eHeaderValues.hasMoreElements()) {
+					sb.append(", ");
+				}
+			}
+			sb.append("\n");
+		}
+		return sb.toString();
+	}
 
-    String formatFilters(List<Filter> filters) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Security filter chain: ");
-        if (filters == null) {
-            sb.append("no match");
-        } else if (filters.isEmpty()) {
-            sb.append("[] empty (bypassed by security='none') ");
-        } else {
-            sb.append("[\n");
-            for (Filter f : filters) {
-                sb.append("  ").append(f.getClass().getSimpleName()).append("\n");
-            }
-            sb.append("]");
-        }
+	String formatFilters(List<Filter> filters) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Security filter chain: ");
+		if (filters == null) {
+			sb.append("no match");
+		}
+		else if (filters.isEmpty()) {
+			sb.append("[] empty (bypassed by security='none') ");
+		}
+		else {
+			sb.append("[\n");
+			for (Filter f : filters) {
+				sb.append("  ").append(f.getClass().getSimpleName()).append("\n");
+			}
+			sb.append("]");
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    private List<Filter> getFilters(HttpServletRequest request)  {
-        for (SecurityFilterChain chain : fcp.getFilterChains()) {
-            if (chain.matches(request)) {
-                return chain.getFilters();
-            }
-        }
+	private List<Filter> getFilters(HttpServletRequest request) {
+		for (SecurityFilterChain chain : fcp.getFilterChains()) {
+			if (chain.matches(request)) {
+				return chain.getFilters();
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void init(FilterConfig filterConfig) throws ServletException {
-    }
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
 
-    public void destroy() {
-    }
+	public void destroy() {
+	}
 }
 
 class DebugRequestWrapper extends HttpServletRequestWrapper {
-    private static final Logger logger = new Logger();
+	private static final Logger logger = new Logger();
 
-    public DebugRequestWrapper(HttpServletRequest request) {
-        super(request);
-    }
+	public DebugRequestWrapper(HttpServletRequest request) {
+		super(request);
+	}
 
-    @Override
-    public HttpSession getSession() {
-        boolean sessionExists = super.getSession(false) != null;
-        HttpSession session = super.getSession();
+	@Override
+	public HttpSession getSession() {
+		boolean sessionExists = super.getSession(false) != null;
+		HttpSession session = super.getSession();
 
-        if (!sessionExists) {
-            logger.info("New HTTP session created: " + session.getId(), true);
-        }
+		if (!sessionExists) {
+			logger.info("New HTTP session created: " + session.getId(), true);
+		}
 
-        return session;
-    }
+		return session;
+	}
 
-    @Override
-    public HttpSession getSession(boolean create) {
-        if (!create) {
-            return super.getSession(create);
-        }
-        return getSession();
-    }
+	@Override
+	public HttpSession getSession(boolean create) {
+		if (!create) {
+			return super.getSession(create);
+		}
+		return getSession();
+	}
 }
-
-
diff --git a/web/src/main/java/org/springframework/security/web/debug/Logger.java b/web/src/main/java/org/springframework/security/web/debug/Logger.java
index e70d6f6cf8..1905952bf8 100644
--- a/web/src/main/java/org/springframework/security/web/debug/Logger.java
+++ b/web/src/main/java/org/springframework/security/web/debug/Logger.java
@@ -13,29 +13,29 @@ import org.apache.commons.logging.LogFactory;
  * @since 3.1
  */
 final class Logger {
-    private static final Log logger = LogFactory.getLog("Spring Security Debugger");
+	private static final Log logger = LogFactory.getLog("Spring Security Debugger");
 
-    public void info(String message) {
-        info(message, false);
-    }
+	public void info(String message) {
+		info(message, false);
+	}
 
-    public void info(String message, boolean dumpStack) {
-        StringBuilder output = new StringBuilder(256);
-        output.append("\n\n************************************************************\n\n");
-        output.append(message).append("\n");
+	public void info(String message, boolean dumpStack) {
+		StringBuilder output = new StringBuilder(256);
+		output.append("\n\n************************************************************\n\n");
+		output.append(message).append("\n");
 
-        if (dumpStack) {
-            StringWriter os = new StringWriter();
-            new Exception().printStackTrace(new PrintWriter(os));
-            StringBuffer buffer = os.getBuffer();
-            // Remove the exception in case it scares people.
-            int start = buffer.indexOf("java.lang.Exception");
-            buffer.replace(start, start + 19, "");
-            output.append("\nCall stack: \n").append(os.toString());
-        }
+		if (dumpStack) {
+			StringWriter os = new StringWriter();
+			new Exception().printStackTrace(new PrintWriter(os));
+			StringBuffer buffer = os.getBuffer();
+			// Remove the exception in case it scares people.
+			int start = buffer.indexOf("java.lang.Exception");
+			buffer.replace(start, start + 19, "");
+			output.append("\nCall stack: \n").append(os.toString());
+		}
 
-        output.append("\n\n************************************************************\n\n");
+		output.append("\n\n************************************************************\n\n");
 
-        logger.info(output.toString());
-    }
+		logger.info(output.toString());
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/DefaultHttpFirewall.java b/web/src/main/java/org/springframework/security/web/firewall/DefaultHttpFirewall.java
index 5592e9d050..063fb48f78 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/DefaultHttpFirewall.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/DefaultHttpFirewall.java
@@ -4,64 +4,71 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Default implementation which wraps requests in order to provide consistent values of the {@code servletPath} and
- * {@code pathInfo}, which do not contain path parameters (as defined in
- * <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>). Different servlet containers
- * interpret the servlet spec differently as to how path parameters are treated and it is possible they might be added
- * in order to bypass particular security constraints. When using this implementation, they will be removed for all
- * requests as the request passes through the security filter chain. Note that this means that any segments in the
- * decoded path which contain a semi-colon, will have the part following the semi-colon removed for
- * request matching. Your application should not contain any valid paths which contain semi-colons.
+ * Default implementation which wraps requests in order to provide consistent values of
+ * the {@code servletPath} and {@code pathInfo}, which do not contain path parameters (as
+ * defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>). Different
+ * servlet containers interpret the servlet spec differently as to how path parameters are
+ * treated and it is possible they might be added in order to bypass particular security
+ * constraints. When using this implementation, they will be removed for all requests as
+ * the request passes through the security filter chain. Note that this means that any
+ * segments in the decoded path which contain a semi-colon, will have the part following
+ * the semi-colon removed for request matching. Your application should not contain any
+ * valid paths which contain semi-colons.
  * <p>
- * If any un-normalized paths are found (containing directory-traversal character sequences), the request will be
- * rejected immediately. Most containers normalize the paths before performing the servlet-mapping, but again this is
- * not guaranteed by the servlet spec.
+ * If any un-normalized paths are found (containing directory-traversal character
+ * sequences), the request will be rejected immediately. Most containers normalize the
+ * paths before performing the servlet-mapping, but again this is not guaranteed by the
+ * servlet spec.
  *
  * @author Luke Taylor
  */
 public class DefaultHttpFirewall implements HttpFirewall {
 
-    public FirewalledRequest getFirewalledRequest(HttpServletRequest request) throws RequestRejectedException {
-        FirewalledRequest fwr = new RequestWrapper(request);
+	public FirewalledRequest getFirewalledRequest(HttpServletRequest request)
+			throws RequestRejectedException {
+		FirewalledRequest fwr = new RequestWrapper(request);
 
-        if (!isNormalized(fwr.getServletPath()) || !isNormalized(fwr.getPathInfo())) {
-            throw new RequestRejectedException("Un-normalized paths are not supported: " + fwr.getServletPath() +
-                (fwr.getPathInfo() != null ? fwr.getPathInfo() : ""));
-        }
+		if (!isNormalized(fwr.getServletPath()) || !isNormalized(fwr.getPathInfo())) {
+			throw new RequestRejectedException("Un-normalized paths are not supported: "
+					+ fwr.getServletPath()
+					+ (fwr.getPathInfo() != null ? fwr.getPathInfo() : ""));
+		}
 
-        return fwr;
-    }
+		return fwr;
+	}
 
-    public HttpServletResponse getFirewalledResponse(HttpServletResponse response) {
-        return new FirewalledResponse(response);
-    }
+	public HttpServletResponse getFirewalledResponse(HttpServletResponse response) {
+		return new FirewalledResponse(response);
+	}
 
-    /**
-     * Checks whether a path is normalized (doesn't contain path traversal sequences like "./", "/../" or "/.")
-     *
-     * @param path the path to test
-     * @return true if the path doesn't contain any path-traversal character sequences.
-     */
-    private boolean isNormalized(String path) {
-        if (path == null) {
-            return true;
-        }
+	/**
+	 * Checks whether a path is normalized (doesn't contain path traversal sequences like
+	 * "./", "/../" or "/.")
+	 *
+	 * @param path the path to test
+	 * @return true if the path doesn't contain any path-traversal character sequences.
+	 */
+	private boolean isNormalized(String path) {
+		if (path == null) {
+			return true;
+		}
 
-        for (int j = path.length(); j > 0;) {
-            int i = path.lastIndexOf('/', j - 1);
-            int gap = j - i;
+		for (int j = path.length(); j > 0;) {
+			int i = path.lastIndexOf('/', j - 1);
+			int gap = j - i;
 
-            if (gap == 2 && path.charAt(i+1) == '.') {
-                // ".", "/./" or "/."
-                return false;
-            } else if (gap == 3 && path.charAt(i+1) == '.'&& path.charAt(i+2) == '.') {
-                return false;
-            }
+			if (gap == 2 && path.charAt(i + 1) == '.') {
+				// ".", "/./" or "/."
+				return false;
+			}
+			else if (gap == 3 && path.charAt(i + 1) == '.' && path.charAt(i + 2) == '.') {
+				return false;
+			}
 
-            j = i;
-        }
+			j = i;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/FirewalledRequest.java b/web/src/main/java/org/springframework/security/web/firewall/FirewalledRequest.java
index 0f2acf86bb..71f316c356 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/FirewalledRequest.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/FirewalledRequest.java
@@ -6,35 +6,34 @@ import javax.servlet.http.HttpServletRequestWrapper;
 /**
  * Request wrapper which is returned by the {@code HttpFirewall} interface.
  * <p>
- * The only difference is the {@code reset} method which allows some
- * or all of the state to be reset by the {@code FilterChainProxy} when the
- * request leaves the security filter chain.
+ * The only difference is the {@code reset} method which allows some or all of the state
+ * to be reset by the {@code FilterChainProxy} when the request leaves the security filter
+ * chain.
  *
  * @author Luke Taylor
  */
 public abstract class FirewalledRequest extends HttpServletRequestWrapper {
-    /**
-     * Constructs a request object wrapping the given request.
-     *
-     * @throws IllegalArgumentException if the request is null
-     */
-    public FirewalledRequest(HttpServletRequest request) {
-        super(request);
-    }
+	/**
+	 * Constructs a request object wrapping the given request.
+	 *
+	 * @throws IllegalArgumentException if the request is null
+	 */
+	public FirewalledRequest(HttpServletRequest request) {
+		super(request);
+	}
 
-    /**
-     * This method will be called once the request has passed through the
-     * security filter chain, when it is about to proceed to the application
-     * proper.
-     * <p>
-     * An implementation can thus choose to modify the state of the request
-     * for the security infrastructure, while still maintaining the original
-     * {@link HttpServletRequest}.
-     */
-    public abstract void reset();
+	/**
+	 * This method will be called once the request has passed through the security filter
+	 * chain, when it is about to proceed to the application proper.
+	 * <p>
+	 * An implementation can thus choose to modify the state of the request for the
+	 * security infrastructure, while still maintaining the original
+	 * {@link HttpServletRequest}.
+	 */
+	public abstract void reset();
 
-    @Override
-    public String toString() {
-        return "FirewalledRequest[ " + getRequest() + "]";
-    }
+	@Override
+	public String toString() {
+		return "FirewalledRequest[ " + getRequest() + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java b/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java
index b7360091a0..2d42c70076 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java
@@ -9,19 +9,20 @@ import java.util.regex.Pattern;
  * @author Luke Taylor
  */
 class FirewalledResponse extends HttpServletResponseWrapper {
-    private static final Pattern CR_OR_LF = Pattern.compile("\\r|\\n");
+	private static final Pattern CR_OR_LF = Pattern.compile("\\r|\\n");
 
-    public FirewalledResponse(HttpServletResponse response) {
-        super(response);
-    }
+	public FirewalledResponse(HttpServletResponse response) {
+		super(response);
+	}
 
-    @Override
-    public void sendRedirect(String location) throws IOException {
-        // TODO: implement pluggable validation, instead of simple blacklisting.
-        // SEC-1790. Prevent redirects containing CRLF
-        if (CR_OR_LF.matcher(location).find()) {
-            throw new IllegalArgumentException("Invalid characters (CR/LF) in redirect location");
-        }
-        super.sendRedirect(location);
-    }
+	@Override
+	public void sendRedirect(String location) throws IOException {
+		// TODO: implement pluggable validation, instead of simple blacklisting.
+		// SEC-1790. Prevent redirects containing CRLF
+		if (CR_OR_LF.matcher(location).find()) {
+			throw new IllegalArgumentException(
+					"Invalid characters (CR/LF) in redirect location");
+		}
+		super.sendRedirect(location);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/HttpFirewall.java b/web/src/main/java/org/springframework/security/web/firewall/HttpFirewall.java
index de7b9af17e..09d6c35f84 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/HttpFirewall.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/HttpFirewall.java
@@ -4,29 +4,30 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Interface which can be used to reject potentially dangerous requests and/or wrap them to
- * control their behaviour.
+ * Interface which can be used to reject potentially dangerous requests and/or wrap them
+ * to control their behaviour.
  * <p>
- * The implementation is injected into the {@code FilterChainProxy} and will be invoked before
- * sending any request through the filter chain. It can also provide a response wrapper if the response
- * behaviour should also be restricted.
+ * The implementation is injected into the {@code FilterChainProxy} and will be invoked
+ * before sending any request through the filter chain. It can also provide a response
+ * wrapper if the response behaviour should also be restricted.
  *
  * @author Luke Taylor
  */
 public interface HttpFirewall {
 
-    /**
-     * Provides the request object which will be passed through the filter chain.
-     *
-     * @throws RequestRejectedException if the request should be rejected immediately
-     */
-    FirewalledRequest getFirewalledRequest(HttpServletRequest request) throws RequestRejectedException;
+	/**
+	 * Provides the request object which will be passed through the filter chain.
+	 *
+	 * @throws RequestRejectedException if the request should be rejected immediately
+	 */
+	FirewalledRequest getFirewalledRequest(HttpServletRequest request)
+			throws RequestRejectedException;
 
-    /**
-     * Provides the response which will be passed through the filter chain.
-     *
-     * @param response the original response
-     * @return either the original response or a replacement/wrapper.
-     */
-    HttpServletResponse getFirewalledResponse(HttpServletResponse response);
+	/**
+	 * Provides the response which will be passed through the filter chain.
+	 *
+	 * @param response the original response
+	 * @return either the original response or a replacement/wrapper.
+	 */
+	HttpServletResponse getFirewalledResponse(HttpServletResponse response);
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedException.java b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedException.java
index fe334219a0..aaa952accd 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedException.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/RequestRejectedException.java
@@ -4,7 +4,7 @@ package org.springframework.security.web.firewall;
  * @author Luke Taylor
  */
 public class RequestRejectedException extends RuntimeException {
-    public RequestRejectedException(String message) {
-        super(message);
-    }
+	public RequestRejectedException(String message) {
+		super(message);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java
index 1b2bb377c6..1b1679a140 100644
--- a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java
@@ -10,134 +10,142 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * Request wrapper which ensures values of {@code servletPath} and {@code pathInfo} are returned which are suitable for
- * pattern matching against. It strips out path parameters and extra consecutive '/' characters.
+ * Request wrapper which ensures values of {@code servletPath} and {@code pathInfo} are
+ * returned which are suitable for pattern matching against. It strips out path parameters
+ * and extra consecutive '/' characters.
  *
- * <h3>Path Parameters</h3>
- * Parameters (as defined in <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) are stripped from the path
+ * <h3>Path Parameters</h3> Parameters (as defined in <a
+ * href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>) are stripped from the path
  * segments of the {@code servletPath} and {@code pathInfo} values of the request.
  * <p>
- * The parameter sequence is demarcated by a semi-colon, so each segment is checked for the occurrence of a ";"
- * character and truncated at that point if it is present.
+ * The parameter sequence is demarcated by a semi-colon, so each segment is checked for
+ * the occurrence of a ";" character and truncated at that point if it is present.
  * <p>
- * The behaviour differs between servlet containers in how they interpret the servlet spec, which
- * does not clearly state what the behaviour should be. For consistency, we make sure they are always removed, to
- * avoid the risk of URL matching rules being bypassed by the malicious addition of parameters to the path component.
+ * The behaviour differs between servlet containers in how they interpret the servlet
+ * spec, which does not clearly state what the behaviour should be. For consistency, we
+ * make sure they are always removed, to avoid the risk of URL matching rules being
+ * bypassed by the malicious addition of parameters to the path component.
  *
  * @author Luke Taylor
  */
 final class RequestWrapper extends FirewalledRequest {
-    private final String strippedServletPath;
-    private final String strippedPathInfo;
-    private boolean stripPaths = true;
+	private final String strippedServletPath;
+	private final String strippedPathInfo;
+	private boolean stripPaths = true;
 
-    public RequestWrapper(HttpServletRequest request) {
-        super(request);
-        strippedServletPath = strip(request.getServletPath());
-        String pathInfo = strip(request.getPathInfo());
-        if (pathInfo != null && pathInfo.length() == 0) {
-            pathInfo = null;
-        }
-        strippedPathInfo = pathInfo;
-    }
+	public RequestWrapper(HttpServletRequest request) {
+		super(request);
+		strippedServletPath = strip(request.getServletPath());
+		String pathInfo = strip(request.getPathInfo());
+		if (pathInfo != null && pathInfo.length() == 0) {
+			pathInfo = null;
+		}
+		strippedPathInfo = pathInfo;
+	}
 
-    /**
-     * Removes path parameters from each path segment in the supplied path and truncates sequences of multiple '/'
-     * characters to a single '/'.
-     *
-     * @param path either the {@code servletPath} and {@code pathInfo} from the original request
-     *
-     * @return the supplied value, with path parameters removed and sequences of multiple '/' characters truncated,
-     *  or null if the supplied path was null.
-     */
-    private String strip(String path) {
-        if (path == null) {
-            return null;
-        }
+	/**
+	 * Removes path parameters from each path segment in the supplied path and truncates
+	 * sequences of multiple '/' characters to a single '/'.
+	 *
+	 * @param path either the {@code servletPath} and {@code pathInfo} from the original
+	 * request
+	 *
+	 * @return the supplied value, with path parameters removed and sequences of multiple
+	 * '/' characters truncated, or null if the supplied path was null.
+	 */
+	private String strip(String path) {
+		if (path == null) {
+			return null;
+		}
 
-        int scIndex = path.indexOf(';');
+		int scIndex = path.indexOf(';');
 
-        if (scIndex < 0) {
-            int doubleSlashIndex = path.indexOf("//");
-            if (doubleSlashIndex < 0) {
-                // Most likely case, no parameters in any segment and no '//', so no stripping required
-                return path;
-            }
-        }
+		if (scIndex < 0) {
+			int doubleSlashIndex = path.indexOf("//");
+			if (doubleSlashIndex < 0) {
+				// Most likely case, no parameters in any segment and no '//', so no
+				// stripping required
+				return path;
+			}
+		}
 
-        StringTokenizer st = new StringTokenizer(path, "/");
-        StringBuilder stripped = new StringBuilder(path.length());
+		StringTokenizer st = new StringTokenizer(path, "/");
+		StringBuilder stripped = new StringBuilder(path.length());
 
-        if (path.charAt(0) == '/') {
-            stripped.append('/');
-        }
+		if (path.charAt(0) == '/') {
+			stripped.append('/');
+		}
 
-        while(st.hasMoreTokens()) {
-            String segment = st.nextToken();
-            scIndex = segment.indexOf(';');
+		while (st.hasMoreTokens()) {
+			String segment = st.nextToken();
+			scIndex = segment.indexOf(';');
 
-            if (scIndex >= 0) {
-                segment = segment.substring(0, scIndex);
-            }
-            stripped.append(segment).append('/');
-        }
+			if (scIndex >= 0) {
+				segment = segment.substring(0, scIndex);
+			}
+			stripped.append(segment).append('/');
+		}
 
-        // Remove the trailing slash if the original path didn't have one
-        if (path.charAt(path.length() - 1) != '/') {
-            stripped.deleteCharAt(stripped.length() - 1);
-        }
+		// Remove the trailing slash if the original path didn't have one
+		if (path.charAt(path.length() - 1) != '/') {
+			stripped.deleteCharAt(stripped.length() - 1);
+		}
 
-        return stripped.toString();
-    }
+		return stripped.toString();
+	}
 
-    @Override
-    public String getPathInfo() {
-        return stripPaths ? strippedPathInfo : super.getPathInfo();
-    }
+	@Override
+	public String getPathInfo() {
+		return stripPaths ? strippedPathInfo : super.getPathInfo();
+	}
 
-    @Override
-    public String getServletPath() {
-        return stripPaths ? strippedServletPath : super.getServletPath();
-    }
+	@Override
+	public String getServletPath() {
+		return stripPaths ? strippedServletPath : super.getServletPath();
+	}
 
-    @Override
-    public RequestDispatcher getRequestDispatcher(String path) {
-        return this.stripPaths ? new FirewalledRequestAwareRequestDispatcher(path) : super.getRequestDispatcher(path);
-    }
+	@Override
+	public RequestDispatcher getRequestDispatcher(String path) {
+		return this.stripPaths ? new FirewalledRequestAwareRequestDispatcher(path)
+				: super.getRequestDispatcher(path);
+	}
 
-    public void reset() {
-        this.stripPaths = false;
-    }
+	public void reset() {
+		this.stripPaths = false;
+	}
 
-    /**
-     * Ensures {@link FirewalledRequest#reset()} is called prior to performing a forward. It then delegates work to the
-     * {@link RequestDispatcher} from the original {@link HttpServletRequest}.
-     *
-     * @author Rob Winch
-     */
-    private class FirewalledRequestAwareRequestDispatcher implements RequestDispatcher {
-        private final String path;
+	/**
+	 * Ensures {@link FirewalledRequest#reset()} is called prior to performing a forward.
+	 * It then delegates work to the {@link RequestDispatcher} from the original
+	 * {@link HttpServletRequest}.
+	 *
+	 * @author Rob Winch
+	 */
+	private class FirewalledRequestAwareRequestDispatcher implements RequestDispatcher {
+		private final String path;
 
-        /**
-         *
-         * @param path the {@code path} that will be used to obtain the delegate {@link RequestDispatcher} from the
-         * original {@link HttpServletRequest}.
-         */
-        public FirewalledRequestAwareRequestDispatcher(String path) {
-            this.path = path;
-        }
+		/**
+		 *
+		 * @param path the {@code path} that will be used to obtain the delegate
+		 * {@link RequestDispatcher} from the original {@link HttpServletRequest}.
+		 */
+		public FirewalledRequestAwareRequestDispatcher(String path) {
+			this.path = path;
+		}
 
-        public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-            reset();
-            getDelegateDispatcher().forward(request, response);
-        }
+		public void forward(ServletRequest request, ServletResponse response)
+				throws ServletException, IOException {
+			reset();
+			getDelegateDispatcher().forward(request, response);
+		}
 
-        public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-            getDelegateDispatcher().include(request, response);
-        }
+		public void include(ServletRequest request, ServletResponse response)
+				throws ServletException, IOException {
+			getDelegateDispatcher().include(request, response);
+		}
 
-        private RequestDispatcher getDelegateDispatcher() {
-            return RequestWrapper.super.getRequestDispatcher(path);
-        }
-    }
+		private RequestDispatcher getDelegateDispatcher() {
+			return RequestWrapper.super.getRequestDispatcher(path);
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/Header.java b/web/src/main/java/org/springframework/security/web/header/Header.java
index 7f1b6397de..240daab801 100644
--- a/web/src/main/java/org/springframework/security/web/header/Header.java
+++ b/web/src/main/java/org/springframework/security/web/header/Header.java
@@ -12,45 +12,44 @@ import org.springframework.util.Assert;
  */
 public final class Header {
 
-    private final String headerName;
-    private final List<String> headerValues;
+	private final String headerName;
+	private final List<String> headerValues;
 
-    /**
-     * Creates a new instance
-     * @param headerName the name of the header
-     * @param headerValues the values of the header
-     */
-    public Header(String headerName, String... headerValues) {
-        Assert.hasText(headerName, "headerName is required");
-        Assert.notEmpty(headerValues, "headerValues cannot be null or empty");
-        Assert.noNullElements(headerValues, "headerValues cannot contain null values");
-        this.headerName = headerName;
-        this.headerValues = Arrays.asList(headerValues);
-    }
+	/**
+	 * Creates a new instance
+	 * @param headerName the name of the header
+	 * @param headerValues the values of the header
+	 */
+	public Header(String headerName, String... headerValues) {
+		Assert.hasText(headerName, "headerName is required");
+		Assert.notEmpty(headerValues, "headerValues cannot be null or empty");
+		Assert.noNullElements(headerValues, "headerValues cannot contain null values");
+		this.headerName = headerName;
+		this.headerValues = Arrays.asList(headerValues);
+	}
 
-    /**
-     * Gets the name of the header. Cannot be <code>null</code>.
-     * @return the name of the header.
-     */
-    public String getName() {
-        return this.headerName;
-    }
+	/**
+	 * Gets the name of the header. Cannot be <code>null</code>.
+	 * @return the name of the header.
+	 */
+	public String getName() {
+		return this.headerName;
+	}
 
-    /**
-     * Gets the values of the header. Cannot be null, empty, or contain null
-     * values.
-     *
-     * @return the values of the header
-     */
-    public List<String> getValues() {
-        return this.headerValues;
-    }
+	/**
+	 * Gets the values of the header. Cannot be null, empty, or contain null values.
+	 *
+	 * @return the values of the header
+	 */
+	public List<String> getValues() {
+		return this.headerValues;
+	}
 
-    public int hashCode() {
-        return headerName.hashCode() + headerValues.hashCode();
-    }
+	public int hashCode() {
+		return headerName.hashCode() + headerValues.hashCode();
+	}
 
-    public String toString() {
-        return "Header [name: " + headerName + ", values: " + headerValues +"]";
-    }
+	public String toString() {
+		return "Header [name: " + headerName + ", values: " + headerValues + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/HeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/HeaderWriter.java
index 6282d98b91..1c44878b78 100644
--- a/web/src/main/java/org/springframework/security/web/header/HeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/HeaderWriter.java
@@ -29,11 +29,11 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface HeaderWriter {
 
-    /**
-     * Create a {@code Header} instance.
-     *
-     * @param request the request
-     * @param response the response
-     */
-    void writeHeaders(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Create a {@code Header} instance.
+	 *
+	 * @param request the request
+	 * @param response the response
+	 */
+	void writeHeaders(HttpServletRequest request, HttpServletResponse response);
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
index 8e928d95c8..3a410b5d13 100644
--- a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
+++ b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java
@@ -26,8 +26,9 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * Filter implementation to add headers to the current request. Can be useful to add certain headers which enable
- * browser protection. Like X-Frame-Options, X-XSS-Protection and X-Content-Type-Options.
+ * Filter implementation to add headers to the current request. Can be useful to add
+ * certain headers which enable browser protection. Like X-Frame-Options, X-XSS-Protection
+ * and X-Content-Type-Options.
  *
  * @author Marten Deinum
  * @since 3.2
@@ -35,26 +36,32 @@ import java.util.*;
  */
 public class HeaderWriterFilter extends OncePerRequestFilter {
 
-    /** Collection of {@link HeaderWriter} instances to  write out the headers to the response . */
-    private final List<HeaderWriter> headerWriters;
+	/**
+	 * Collection of {@link HeaderWriter} instances to write out the headers to the
+	 * response .
+	 */
+	private final List<HeaderWriter> headerWriters;
 
-    /**
-     * Creates a new instance.
-     *
-     * @param headerWriters the {@link HeaderWriter} instances to write out headers to the {@link HttpServletResponse}.
-     */
-    public HeaderWriterFilter(List<HeaderWriter> headerWriters) {
-        Assert.notEmpty(headerWriters, "headerWriters cannot be null or empty");
-        this.headerWriters = headerWriters;
-    }
+	/**
+	 * Creates a new instance.
+	 *
+	 * @param headerWriters the {@link HeaderWriter} instances to write out headers to the
+	 * {@link HttpServletResponse}.
+	 */
+	public HeaderWriterFilter(List<HeaderWriter> headerWriters) {
+		Assert.notEmpty(headerWriters, "headerWriters cannot be null or empty");
+		this.headerWriters = headerWriters;
+	}
 
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+	@Override
+	protected void doFilterInternal(HttpServletRequest request,
+			HttpServletResponse response, FilterChain filterChain)
+			throws ServletException, IOException {
 
-        for (HeaderWriter factory : headerWriters) {
-            factory.writeHeaders(request, response);
-        }
-        filterChain.doFilter(request, response);
-    }
+		for (HeaderWriter factory : headerWriters) {
+			factory.writeHeaders(request, response);
+		}
+		filterChain.doFilter(request, response);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java
index c0a752e764..ae6c93443e 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java
@@ -21,8 +21,8 @@ import java.util.List;
 import org.springframework.security.web.header.Header;
 
 /**
- * A {@link StaticHeadersWriter} that inserts headers to prevent caching.
- * Specifically it adds the following headers:
+ * A {@link StaticHeadersWriter} that inserts headers to prevent caching. Specifically it
+ * adds the following headers:
  * <ul>
  * <li>Cache-Control: no-cache, no-store, max-age=0, must-revalidate</li>
  * <li>Pragma: no-cache</li>
@@ -34,18 +34,19 @@ import org.springframework.security.web.header.Header;
  */
 public final class CacheControlHeadersWriter extends StaticHeadersWriter {
 
-    /**
-     * Creates a new instance
-     */
-    public CacheControlHeadersWriter() {
-        super(createHeaders());
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public CacheControlHeadersWriter() {
+		super(createHeaders());
+	}
 
-    private static List<Header> createHeaders() {
-        List<Header> headers = new ArrayList<Header>(2);
-        headers.add(new Header("Cache-Control","no-cache, no-store, max-age=0, must-revalidate"));
-        headers.add(new Header("Pragma","no-cache"));
-        headers.add(new Header("Expires","0"));
-        return headers;
-    }
+	private static List<Header> createHeaders() {
+		List<Header> headers = new ArrayList<Header>(2);
+		headers.add(new Header("Cache-Control",
+				"no-cache, no-store, max-age=0, must-revalidate"));
+		headers.add(new Header("Pragma", "no-cache"));
+		headers.add(new Header("Expires", "0"));
+		return headers;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
index a5c90d9f61..42e55cc9ea 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java
@@ -30,42 +30,42 @@ import org.springframework.util.Assert;
  * @since 3.2
  */
 public final class DelegatingRequestMatcherHeaderWriter implements HeaderWriter {
-    private final RequestMatcher requestMatcher;
+	private final RequestMatcher requestMatcher;
 
-    private final HeaderWriter delegateHeaderWriter;
+	private final HeaderWriter delegateHeaderWriter;
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatcher
-     *            the {@link RequestMatcher} to use. If returns true, the
-     *            delegateHeaderWriter will be invoked.
-     * @param delegateHeaderWriter
-     *            the {@link HeaderWriter} to invoke if the
-     *            {@link RequestMatcher} returns true.
-     */
-    public DelegatingRequestMatcherHeaderWriter(RequestMatcher requestMatcher,
-            HeaderWriter delegateHeaderWriter) {
-        Assert.notNull(requestMatcher, "requestMatcher cannot be null");
-        Assert.notNull(delegateHeaderWriter, "delegateHeaderWriter cannot be null");
-        this.requestMatcher = requestMatcher;
-        this.delegateHeaderWriter = delegateHeaderWriter;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatcher the {@link RequestMatcher} to use. If returns true, the
+	 * delegateHeaderWriter will be invoked.
+	 * @param delegateHeaderWriter the {@link HeaderWriter} to invoke if the
+	 * {@link RequestMatcher} returns true.
+	 */
+	public DelegatingRequestMatcherHeaderWriter(RequestMatcher requestMatcher,
+			HeaderWriter delegateHeaderWriter) {
+		Assert.notNull(requestMatcher, "requestMatcher cannot be null");
+		Assert.notNull(delegateHeaderWriter, "delegateHeaderWriter cannot be null");
+		this.requestMatcher = requestMatcher;
+		this.delegateHeaderWriter = delegateHeaderWriter;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void writeHeaders(HttpServletRequest request,
-            HttpServletResponse response) {
-        if(requestMatcher.matches(request)) {
-            delegateHeaderWriter.writeHeaders(request, response);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax.servlet
+	 * .http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
+		if (requestMatcher.matches(request)) {
+			delegateHeaderWriter.writeHeaders(request, response);
+		}
+	}
 
-    @Override
-    public String toString() {
-        return getClass().getName()+ " [requestMatcher="
-                + requestMatcher + ", delegateHeaderWriter="
-                + delegateHeaderWriter + "]";
-    }
+	@Override
+	public String toString() {
+		return getClass().getName() + " [requestMatcher=" + requestMatcher
+				+ ", delegateHeaderWriter=" + delegateHeaderWriter + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
index 67c7451884..23ce3c4eb2 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java
@@ -25,187 +25,178 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * Provides support for <a href="http://tools.ietf.org/html/rfc6797">HTTP Strict
- * Transport Security (HSTS)</a>.
+ * Provides support for <a href="http://tools.ietf.org/html/rfc6797">HTTP Strict Transport
+ * Security (HSTS)</a>.
  *
  * <p>
- * By default the expiration is one year and subdomains will be included. This
- * can be customized using {@link #setMaxAgeInSeconds(long)} and
+ * By default the expiration is one year and subdomains will be included. This can be
+ * customized using {@link #setMaxAgeInSeconds(long)} and
  * {@link #setIncludeSubDomains(boolean)} respectively.
  * </p>
  *
  * <p>
- * Since <a href="http://tools.ietf.org/html/rfc6797#section-7.2">section
- * 7.2</a> states that HSTS Host MUST NOT include the STS header in HTTP
- * responses, the default behavior is that the "Strict-Transport-Security" will
- * only be added when {@link HttpServletRequest#isSecure()} returns {@code true}
- * . At times this may need to be customized. For example, in some situations
- * where SSL termination is used, something else may be used to determine if SSL
- * was used. For these circumstances, {@link #setRequestMatcher(RequestMatcher)}
- * can be invoked with a custom {@link RequestMatcher}.
+ * Since <a href="http://tools.ietf.org/html/rfc6797#section-7.2">section 7.2</a> states
+ * that HSTS Host MUST NOT include the STS header in HTTP responses, the default behavior
+ * is that the "Strict-Transport-Security" will only be added when
+ * {@link HttpServletRequest#isSecure()} returns {@code true} . At times this may need to
+ * be customized. For example, in some situations where SSL termination is used, something
+ * else may be used to determine if SSL was used. For these circumstances,
+ * {@link #setRequestMatcher(RequestMatcher)} can be invoked with a custom
+ * {@link RequestMatcher}.
  * </p>
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class HstsHeaderWriter implements HeaderWriter {
-    private static final long DEFAULT_MAX_AGE_SECONDS = 31536000;
+	private static final long DEFAULT_MAX_AGE_SECONDS = 31536000;
 
-    private static final String HSTS_HEADER_NAME = "Strict-Transport-Security";
+	private static final String HSTS_HEADER_NAME = "Strict-Transport-Security";
 
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private RequestMatcher requestMatcher;
+	private RequestMatcher requestMatcher;
 
-    private long maxAgeInSeconds;
+	private long maxAgeInSeconds;
 
-    private boolean includeSubDomains;
+	private boolean includeSubDomains;
 
-    private String hstsHeaderValue;
+	private String hstsHeaderValue;
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatcher maps to {@link #setRequestMatcher(RequestMatcher)}
-     * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
-     * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
-     */
-    public HstsHeaderWriter(RequestMatcher requestMatcher,
-            long maxAgeInSeconds, boolean includeSubDomains) {
-        super();
-        this.requestMatcher = requestMatcher;
-        this.maxAgeInSeconds = maxAgeInSeconds;
-        this.includeSubDomains = includeSubDomains;
-        updateHstsHeaderValue();
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatcher maps to {@link #setRequestMatcher(RequestMatcher)}
+	 * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
+	 * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
+	 */
+	public HstsHeaderWriter(RequestMatcher requestMatcher, long maxAgeInSeconds,
+			boolean includeSubDomains) {
+		super();
+		this.requestMatcher = requestMatcher;
+		this.maxAgeInSeconds = maxAgeInSeconds;
+		this.includeSubDomains = includeSubDomains;
+		updateHstsHeaderValue();
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
-     * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
-     */
-    public HstsHeaderWriter(long maxAgeInSeconds, boolean includeSubDomains) {
-        this(new SecureRequestMatcher(),maxAgeInSeconds,includeSubDomains);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
+	 * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
+	 */
+	public HstsHeaderWriter(long maxAgeInSeconds, boolean includeSubDomains) {
+		this(new SecureRequestMatcher(), maxAgeInSeconds, includeSubDomains);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
-     */
-    public HstsHeaderWriter(long maxAgeInSeconds) {
-        this(new SecureRequestMatcher(),maxAgeInSeconds,true);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param maxAgeInSeconds maps to {@link #setMaxAgeInSeconds(long)}
+	 */
+	public HstsHeaderWriter(long maxAgeInSeconds) {
+		this(new SecureRequestMatcher(), maxAgeInSeconds, true);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
-     */
-    public HstsHeaderWriter(boolean includeSubDomains) {
-        this(new SecureRequestMatcher(),DEFAULT_MAX_AGE_SECONDS,includeSubDomains);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param includeSubDomains maps to {@link #setIncludeSubDomains(boolean)}
+	 */
+	public HstsHeaderWriter(boolean includeSubDomains) {
+		this(new SecureRequestMatcher(), DEFAULT_MAX_AGE_SECONDS, includeSubDomains);
+	}
 
-    /**
-     * Creates a new instance
-     */
-    public HstsHeaderWriter() {
-        this(DEFAULT_MAX_AGE_SECONDS);
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public HstsHeaderWriter() {
+		this(DEFAULT_MAX_AGE_SECONDS);
+	}
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax
-     * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-     */
-    public void writeHeaders(HttpServletRequest request,
-            HttpServletResponse response) {
-        if (requestMatcher.matches(request)) {
-            response.setHeader(HSTS_HEADER_NAME, hstsHeaderValue);
-        } else if (logger.isDebugEnabled()) {
-            logger.debug("Not injecting HSTS header since it did not match the requestMatcher "
-                    + requestMatcher);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax
+	 * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+	 */
+	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
+		if (requestMatcher.matches(request)) {
+			response.setHeader(HSTS_HEADER_NAME, hstsHeaderValue);
+		}
+		else if (logger.isDebugEnabled()) {
+			logger.debug("Not injecting HSTS header since it did not match the requestMatcher "
+					+ requestMatcher);
+		}
+	}
 
-    /**
-     * Sets the {@link RequestMatcher} used to determine if the
-     * "Strict-Transport-Security" should be added. If true the header is added,
-     * else the header is not added. By default the header is added when
-     * {@link HttpServletRequest#isSecure()} returns true.
-     *
-     * @param requestMatcher
-     *            the {@link RequestMatcher} to use.
-     * @throws IllegalArgumentException
-     *             if {@link RequestMatcher} is null
-     */
-    public void setRequestMatcher(RequestMatcher requestMatcher) {
-        Assert.notNull(requestMatcher, "requestMatcher cannot be null");
-        this.requestMatcher = requestMatcher;
-    }
+	/**
+	 * Sets the {@link RequestMatcher} used to determine if the
+	 * "Strict-Transport-Security" should be added. If true the header is added, else the
+	 * header is not added. By default the header is added when
+	 * {@link HttpServletRequest#isSecure()} returns true.
+	 *
+	 * @param requestMatcher the {@link RequestMatcher} to use.
+	 * @throws IllegalArgumentException if {@link RequestMatcher} is null
+	 */
+	public void setRequestMatcher(RequestMatcher requestMatcher) {
+		Assert.notNull(requestMatcher, "requestMatcher cannot be null");
+		this.requestMatcher = requestMatcher;
+	}
 
-    /**
-     * <p>
-     * Sets the value (in seconds) for the max-age directive of the
-     * Strict-Transport-Security header. The default is one year.
-     * </p>
-     *
-     * <p>
-     * This instructs browsers how long to remember to keep this domain as a
-     * known HSTS Host. See <a
-     * href="http://tools.ietf.org/html/rfc6797#section-6.1.1">Section 6.1.1</a>
-     * for additional details.
-     * </p>
-     *
-     * @param maxAgeInSeconds
-     *            the maximum amount of time (in seconds) to consider this
-     *            domain as a known HSTS Host.
-     * @throws IllegalArgumentException
-     *             if maxAgeInSeconds is negative
-     */
-    public void setMaxAgeInSeconds(long maxAgeInSeconds) {
-        if (maxAgeInSeconds < 0) {
-            throw new IllegalArgumentException(
-                    "maxAgeInSeconds must be non-negative. Got "
-                            + maxAgeInSeconds);
-        }
-        this.maxAgeInSeconds = maxAgeInSeconds;
-        updateHstsHeaderValue();
-    }
+	/**
+	 * <p>
+	 * Sets the value (in seconds) for the max-age directive of the
+	 * Strict-Transport-Security header. The default is one year.
+	 * </p>
+	 *
+	 * <p>
+	 * This instructs browsers how long to remember to keep this domain as a known HSTS
+	 * Host. See <a href="http://tools.ietf.org/html/rfc6797#section-6.1.1">Section
+	 * 6.1.1</a> for additional details.
+	 * </p>
+	 *
+	 * @param maxAgeInSeconds the maximum amount of time (in seconds) to consider this
+	 * domain as a known HSTS Host.
+	 * @throws IllegalArgumentException if maxAgeInSeconds is negative
+	 */
+	public void setMaxAgeInSeconds(long maxAgeInSeconds) {
+		if (maxAgeInSeconds < 0) {
+			throw new IllegalArgumentException(
+					"maxAgeInSeconds must be non-negative. Got " + maxAgeInSeconds);
+		}
+		this.maxAgeInSeconds = maxAgeInSeconds;
+		updateHstsHeaderValue();
+	}
 
-    /**
-     * <p>
-     * If true, subdomains should be considered HSTS Hosts too. The default is
-     * true.
-     * </p>
-     *
-     * <p>
-     * See <a href="http://tools.ietf.org/html/rfc6797#section-6.1.2">Section
-     * 6.1.2</a> for additional details.
-     * </p>
-     *
-     * @param includeSubDomains
-     *            true to include subdomains, else false
-     */
-    public void setIncludeSubDomains(boolean includeSubDomains) {
-        this.includeSubDomains = includeSubDomains;
-        updateHstsHeaderValue();
-    }
+	/**
+	 * <p>
+	 * If true, subdomains should be considered HSTS Hosts too. The default is true.
+	 * </p>
+	 *
+	 * <p>
+	 * See <a href="http://tools.ietf.org/html/rfc6797#section-6.1.2">Section 6.1.2</a>
+	 * for additional details.
+	 * </p>
+	 *
+	 * @param includeSubDomains true to include subdomains, else false
+	 */
+	public void setIncludeSubDomains(boolean includeSubDomains) {
+		this.includeSubDomains = includeSubDomains;
+		updateHstsHeaderValue();
+	}
 
-    private void updateHstsHeaderValue() {
-        String headerValue = "max-age=" + maxAgeInSeconds;
-        if (includeSubDomains) {
-            headerValue += " ; includeSubDomains";
-        }
-        this.hstsHeaderValue = headerValue;
-    }
+	private void updateHstsHeaderValue() {
+		String headerValue = "max-age=" + maxAgeInSeconds;
+		if (includeSubDomains) {
+			headerValue += " ; includeSubDomains";
+		}
+		this.hstsHeaderValue = headerValue;
+	}
 
-    private static final class SecureRequestMatcher implements RequestMatcher {
-        public boolean matches(HttpServletRequest request) {
-            return request.isSecure();
-        }
-    }
+	private static final class SecureRequestMatcher implements RequestMatcher {
+		public boolean matches(HttpServletRequest request) {
+			return request.isSecure();
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java
index d06c6f9630..58df25d3cc 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/StaticHeadersWriter.java
@@ -19,36 +19,36 @@ import org.springframework.util.Assert;
  */
 public class StaticHeadersWriter implements HeaderWriter {
 
-    private final List<Header> headers;
+	private final List<Header> headers;
 
-    /**
-     * Creates a new instance
-     * @param headers the {@link Header} instances to use
-     */
-    public StaticHeadersWriter(List<Header> headers) {
-        Assert.notEmpty(headers,"headers cannot be null or empty");
-        this.headers = headers;
-    }
+	/**
+	 * Creates a new instance
+	 * @param headers the {@link Header} instances to use
+	 */
+	public StaticHeadersWriter(List<Header> headers) {
+		Assert.notEmpty(headers, "headers cannot be null or empty");
+		this.headers = headers;
+	}
 
-    /**
-     * Creates a new instance with a single header
-     * @param headerName the name of the header
-     * @param headerValues the values for the header
-     */
-    public StaticHeadersWriter(String headerName, String... headerValues) {
-        this(Collections.singletonList(new Header(headerName, headerValues)));
-    }
+	/**
+	 * Creates a new instance with a single header
+	 * @param headerName the name of the header
+	 * @param headerValues the values for the header
+	 */
+	public StaticHeadersWriter(String headerName, String... headerValues) {
+		this(Collections.singletonList(new Header(headerName, headerValues)));
+	}
 
-    public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
-        for(Header header : headers) {
-            for(String value : header.getValues()) {
-                response.addHeader(header.getName(), value);
-            }
-        }
-    }
+	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
+		for (Header header : headers) {
+			for (String value : header.getValues()) {
+				response.addHeader(header.getName(), value);
+			}
+		}
+	}
 
-    @Override
-    public String toString() {
-        return getClass().getName() + " [headers=" + headers + "]";
-    }
+	@Override
+	public String toString() {
+		return getClass().getName() + " [headers=" + headers + "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriter.java
index 9ac2ecb260..4598ac475b 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriter.java
@@ -15,10 +15,9 @@
  */
 package org.springframework.security.web.header.writers;
 
-
 /**
- * A {@link StaticHeadersWriter} that inserts headers to prevent content
- * sniffing. Specifically the following headers are set:
+ * A {@link StaticHeadersWriter} that inserts headers to prevent content sniffing.
+ * Specifically the following headers are set:
  * <ul>
  * <li>X-Content-Type-Options: nosniff</li>
  * </ul>
@@ -28,10 +27,10 @@ package org.springframework.security.web.header.writers;
  */
 public final class XContentTypeOptionsHeaderWriter extends StaticHeadersWriter {
 
-    /**
-     * Creates a new instance
-     */
-    public XContentTypeOptionsHeaderWriter() {
-        super("X-Content-Type-Options","nosniff");
-    }
+	/**
+	 * Creates a new instance
+	 */
+	public XContentTypeOptionsHeaderWriter() {
+		super("X-Content-Type-Options", "nosniff");
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
index 172f77e777..429a74c1fb 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
@@ -29,89 +29,86 @@ import org.springframework.security.web.header.HeaderWriter;
  * @since 3.2
  */
 public final class XXssProtectionHeaderWriter implements HeaderWriter {
-    private static final String XSS_PROTECTION_HEADER = "X-XSS-Protection";
+	private static final String XSS_PROTECTION_HEADER = "X-XSS-Protection";
 
-    private boolean enabled;
+	private boolean enabled;
 
-    private boolean block;
+	private boolean block;
 
-    private String headerValue;
+	private String headerValue;
 
-    /**
-     * Create a new instance
-     */
-    public XXssProtectionHeaderWriter() {
-        this.enabled = true;
-        this.block = true;
-        updateHeaderValue();
-    }
+	/**
+	 * Create a new instance
+	 */
+	public XXssProtectionHeaderWriter() {
+		this.enabled = true;
+		this.block = true;
+		updateHeaderValue();
+	}
 
-    public void writeHeaders(HttpServletRequest request,
-            HttpServletResponse response) {
-        response.setHeader(XSS_PROTECTION_HEADER, headerValue);
-    }
+	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
+		response.setHeader(XSS_PROTECTION_HEADER, headerValue);
+	}
 
-    /**
-     * If true, will contain a value of 1. For example:
-     *
-     * <pre>
-     * X-XSS-Protection: 1
-     * </pre>
-     *
-     * or if {@link #setBlock(boolean)} is true
-     *
-     *
-     * <pre>
-     * X-XSS-Protection: 1; mode=block
-     * </pre>
-     *
-     * If false, will explicitly disable specify that X-XSS-Protection is
-     * disabled. For example:
-     *
-     * <pre>
-     * X-XSS-Protection: 0
-     * </pre>
-     *
-     * @param enabled the new value
-     */
-    public void setEnabled(boolean enabled) {
-        if(!enabled) {
-            setBlock(false);
-        }
-        this.enabled = enabled;
-        updateHeaderValue();
-    }
+	/**
+	 * If true, will contain a value of 1. For example:
+	 *
+	 * <pre>
+	 * X-XSS-Protection: 1
+	 * </pre>
+	 *
+	 * or if {@link #setBlock(boolean)} is true
+	 *
+	 *
+	 * <pre>
+	 * X-XSS-Protection: 1; mode=block
+	 * </pre>
+	 *
+	 * If false, will explicitly disable specify that X-XSS-Protection is disabled. For
+	 * example:
+	 *
+	 * <pre>
+	 * X-XSS-Protection: 0
+	 * </pre>
+	 *
+	 * @param enabled the new value
+	 */
+	public void setEnabled(boolean enabled) {
+		if (!enabled) {
+			setBlock(false);
+		}
+		this.enabled = enabled;
+		updateHeaderValue();
+	}
 
+	/**
+	 * If false, will not specify the mode as blocked. In this instance, any content will
+	 * be attempted to be fixed. If true, the content will be replaced with "#".
+	 *
+	 * @param enabled the new value
+	 */
+	public void setBlock(boolean block) {
+		if (!enabled && block) {
+			throw new IllegalArgumentException(
+					"Cannot set block to true with enabled false");
+		}
+		this.block = block;
+		updateHeaderValue();
+	}
 
-    /**
-     * If false, will not specify the mode as blocked. In this instance, any
-     * content will be attempted to be fixed. If true, the content will be
-     * replaced with "#".
-     *
-     * @param enabled
-     *            the new value
-     */
-    public void setBlock(boolean block) {
-        if(!enabled && block) {
-            throw new IllegalArgumentException("Cannot set block to true with enabled false");
-        }
-        this.block = block;
-        updateHeaderValue();
-    }
+	private void updateHeaderValue() {
+		if (!enabled) {
+			this.headerValue = "0";
+			return;
+		}
+		this.headerValue = "1";
+		if (block) {
+			this.headerValue += "; mode=block";
+		}
+	}
 
-    private void updateHeaderValue() {
-        if(!enabled) {
-            this.headerValue = "0";
-            return;
-        }
-        this.headerValue = "1";
-        if(block) {
-            this.headerValue += "; mode=block";
-        }
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getName() + " [headerValue=" + headerValue + "]";
-    }
+	@Override
+	public String toString() {
+		return getClass().getName() + " [headerValue=" + headerValue + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java
index 3ba0e66685..604a19efc6 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java
@@ -8,51 +8,53 @@ import org.springframework.util.StringUtils;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Base class for AllowFromStrategy implementations which use a request parameter to retrieve the origin. By default
- * the parameter named <code>x-frames-allow-from</code> is read from the request.
+ * Base class for AllowFromStrategy implementations which use a request parameter to
+ * retrieve the origin. By default the parameter named <code>x-frames-allow-from</code> is
+ * read from the request.
  *
  * @author Marten Deinum
  * @since 3.2
  */
 abstract class AbstractRequestParameterAllowFromStrategy implements AllowFromStrategy {
 
-    private static final String DEFAULT_ORIGIN_REQUEST_PARAMETER = "x-frames-allow-from";
+	private static final String DEFAULT_ORIGIN_REQUEST_PARAMETER = "x-frames-allow-from";
 
-    private String allowFromParameterName = DEFAULT_ORIGIN_REQUEST_PARAMETER;
+	private String allowFromParameterName = DEFAULT_ORIGIN_REQUEST_PARAMETER;
 
-    /** Logger for use by subclasses */
-    protected final Log log = LogFactory.getLog(getClass());
+	/** Logger for use by subclasses */
+	protected final Log log = LogFactory.getLog(getClass());
 
+	public String getAllowFromValue(HttpServletRequest request) {
+		String allowFromOrigin = request.getParameter(allowFromParameterName);
+		if (log.isDebugEnabled()) {
+			log.debug("Supplied origin '" + allowFromOrigin + "'");
+		}
+		if (StringUtils.hasText(allowFromOrigin) && allowed(allowFromOrigin)) {
+			return allowFromOrigin;
+		}
+		else {
+			return "DENY";
+		}
+	}
 
-    public String getAllowFromValue(HttpServletRequest request) {
-        String allowFromOrigin = request.getParameter(allowFromParameterName);
-        if (log.isDebugEnabled()) {
-            log.debug("Supplied origin '"+allowFromOrigin+"'");
-        }
-        if (StringUtils.hasText(allowFromOrigin) && allowed(allowFromOrigin)) {
-            return allowFromOrigin;
-        } else {
-            return "DENY";
-        }
-    }
+	/**
+	 * Sets the HTTP parameter used to retrieve the value for the origin that is allowed
+	 * from. The value of the parameter should be a valid URL. The default parameter name
+	 * is "x-frames-allow-from".
+	 *
+	 * @param allowFromParameterName the name of the HTTP parameter to
+	 */
+	public void setAllowFromParameterName(String allowFromParameterName) {
+		Assert.notNull(allowFromParameterName, "allowFromParameterName cannot be null");
+		this.allowFromParameterName = allowFromParameterName;
+	}
 
-    /**
-     * Sets the HTTP parameter used to retrieve the value for the origin that is
-     * allowed from. The value of the parameter should be a valid URL. The
-     * default parameter name is "x-frames-allow-from".
-     *
-     * @param allowFromParameterName the name of the HTTP parameter to
-     */
-    public void setAllowFromParameterName(String allowFromParameterName) {
-        Assert.notNull(allowFromParameterName, "allowFromParameterName cannot be null");
-        this.allowFromParameterName = allowFromParameterName;
-    }
-
-    /**
-     * Method to be implemented by base classes, used to determine if the supplied origin is allowed.
-     *
-     * @param allowFromOrigin the supplied origin
-     * @return <code>true</code> if the supplied origin is allowed.
-     */
-    protected abstract boolean allowed(String allowFromOrigin);
+	/**
+	 * Method to be implemented by base classes, used to determine if the supplied origin
+	 * is allowed.
+	 *
+	 * @param allowFromOrigin the supplied origin
+	 * @return <code>true</code> if the supplied origin is allowed.
+	 */
+	protected abstract boolean allowed(String allowFromOrigin);
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AllowFromStrategy.java
index db0868a6e5..e64498edb9 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AllowFromStrategy.java
@@ -3,20 +3,21 @@ package org.springframework.security.web.header.writers.frameoptions;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Strategy interfaces used by the {@code FrameOptionsHeaderWriter} to determine the actual value to use for the
- * X-Frame-Options header when using the ALLOW-FROM directive.
+ * Strategy interfaces used by the {@code FrameOptionsHeaderWriter} to determine the
+ * actual value to use for the X-Frame-Options header when using the ALLOW-FROM directive.
  *
  * @author Marten Deinum
  * @since 3.2
  */
 public interface AllowFromStrategy {
 
-    /**
-     * Gets the value for ALLOW-FROM excluding the ALLOW-FROM. For example, the
-     * result might be "https://example.com/".
-     *
-     * @param request the {@link HttpServletRequest}
-     * @return the value for ALLOW-FROM or null if no header should be added for this request.
-     */
-    String getAllowFromValue(HttpServletRequest request);
+	/**
+	 * Gets the value for ALLOW-FROM excluding the ALLOW-FROM. For example, the result
+	 * might be "https://example.com/".
+	 *
+	 * @param request the {@link HttpServletRequest}
+	 * @return the value for ALLOW-FROM or null if no header should be added for this
+	 * request.
+	 */
+	String getAllowFromValue(HttpServletRequest request);
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
index 0dbeb83bf7..9badedbe9f 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
@@ -5,31 +5,31 @@ import org.springframework.util.Assert;
 import java.util.regex.Pattern;
 
 /**
- * Implementation which uses a regular expression to validate the supplied
- * origin. If the value of the HTTP parameter matches the pattern, then the the
- * result will be ALLOW-FROM <paramter-value>.
+ * Implementation which uses a regular expression to validate the supplied origin. If the
+ * value of the HTTP parameter matches the pattern, then the the result will be ALLOW-FROM
+ * <paramter-value>.
  *
  * @author Marten Deinum
  * @since 3.2
  */
-public final class RegExpAllowFromStrategy extends AbstractRequestParameterAllowFromStrategy {
+public final class RegExpAllowFromStrategy extends
+		AbstractRequestParameterAllowFromStrategy {
 
-    private final Pattern pattern;
+	private final Pattern pattern;
 
-    /**
-     * Creates a new instance
-     *
-     * @param pattern
-     *            the Pattern to compare against the HTTP parameter value. If
-     *            the pattern matches, the domain will be allowed, else denied.
-     */
-    public RegExpAllowFromStrategy(String pattern) {
-        Assert.hasText(pattern, "Pattern cannot be empty.");
-        this.pattern = Pattern.compile(pattern);
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param pattern the Pattern to compare against the HTTP parameter value. If the
+	 * pattern matches, the domain will be allowed, else denied.
+	 */
+	public RegExpAllowFromStrategy(String pattern) {
+		Assert.hasText(pattern, "Pattern cannot be empty.");
+		this.pattern = Pattern.compile(pattern);
+	}
 
-    @Override
-    protected boolean allowed(String allowFromOrigin) {
-        return pattern.matcher(allowFromOrigin).matches();
-    }
+	@Override
+	protected boolean allowed(String allowFromOrigin) {
+		return pattern.matcher(allowFromOrigin).matches();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java
index c5b2d4f302..16172b9e58 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategy.java
@@ -8,13 +8,13 @@ import java.net.URI;
  */
 public final class StaticAllowFromStrategy implements AllowFromStrategy {
 
-    private final URI uri;
+	private final URI uri;
 
-    public StaticAllowFromStrategy(URI uri) {
-        this.uri = uri;
-    }
+	public StaticAllowFromStrategy(URI uri) {
+		this.uri = uri;
+	}
 
-    public String getAllowFromValue(HttpServletRequest request) {
-        return uri.toString();
-    }
+	public String getAllowFromValue(HttpServletRequest request) {
+		return uri.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java
index b031168904..459b2a470b 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategy.java
@@ -10,21 +10,22 @@ import org.springframework.util.Assert;
  * @author Marten Deinum
  * @since 3.2
  */
-public final class WhiteListedAllowFromStrategy extends AbstractRequestParameterAllowFromStrategy {
+public final class WhiteListedAllowFromStrategy extends
+		AbstractRequestParameterAllowFromStrategy {
 
-    private final Collection<String> allowed;
+	private final Collection<String> allowed;
 
-    /**
-     * Creates a new instance
-     * @param allowed the origins that are allowed.
-     */
-    public WhiteListedAllowFromStrategy(Collection<String> allowed) {
-        Assert.notEmpty(allowed, "Allowed origins cannot be empty.");
-        this.allowed = allowed;
-    }
+	/**
+	 * Creates a new instance
+	 * @param allowed the origins that are allowed.
+	 */
+	public WhiteListedAllowFromStrategy(Collection<String> allowed) {
+		Assert.notEmpty(allowed, "Allowed origins cannot be empty.");
+		this.allowed = allowed;
+	}
 
-    @Override
-    protected boolean allowed(String allowFromOrigin) {
-        return allowed.contains(allowFromOrigin);
-    }
+	@Override
+	protected boolean allowed(String allowFromOrigin) {
+		return allowed.contains(allowFromOrigin);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
index 1be69816fe..ab3ff499c1 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
@@ -22,8 +22,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * {@code HeaderWriter} implementation for the X-Frame-Options headers. When using the ALLOW-FROM directive the actual
- * value is determined by a {@code AllowFromStrategy}.
+ * {@code HeaderWriter} implementation for the X-Frame-Options headers. When using the
+ * ALLOW-FROM directive the actual value is determined by a {@code AllowFromStrategy}.
  *
  * @author Marten Deinum
  * @author Rob Winch
@@ -33,85 +33,83 @@ import javax.servlet.http.HttpServletResponse;
  */
 public final class XFrameOptionsHeaderWriter implements HeaderWriter {
 
-    public static final String XFRAME_OPTIONS_HEADER = "X-Frame-Options";
+	public static final String XFRAME_OPTIONS_HEADER = "X-Frame-Options";
 
-    private final AllowFromStrategy allowFromStrategy;
-    private final XFrameOptionsMode frameOptionsMode;
+	private final AllowFromStrategy allowFromStrategy;
+	private final XFrameOptionsMode frameOptionsMode;
 
-    /**
-     * Creates an instance with {@link XFrameOptionsMode#DENY}
-     */
-    public XFrameOptionsHeaderWriter() {
-        this(XFrameOptionsMode.DENY);
-    }
+	/**
+	 * Creates an instance with {@link XFrameOptionsMode#DENY}
+	 */
+	public XFrameOptionsHeaderWriter() {
+		this(XFrameOptionsMode.DENY);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param frameOptionsMode
-     *            the {@link XFrameOptionsMode} to use. If using
-     *            {@link XFrameOptionsMode#ALLOW_FROM}, use
-     *            {@link #FrameOptionsHeaderWriter(AllowFromStrategy)}
-     *            instead.
-     */
-    public XFrameOptionsHeaderWriter(XFrameOptionsMode frameOptionsMode) {
-        Assert.notNull(frameOptionsMode, "frameOptionsMode cannot be null");
-        if(XFrameOptionsMode.ALLOW_FROM.equals(frameOptionsMode)) {
-            throw new IllegalArgumentException(
-                    "ALLOW_FROM requires an AllowFromStrategy. Please use FrameOptionsHeaderWriter(AllowFromStrategy allowFromStrategy) instead");
-        }
-        this.frameOptionsMode = frameOptionsMode;
-        this.allowFromStrategy = null;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param frameOptionsMode the {@link XFrameOptionsMode} to use. If using
+	 * {@link XFrameOptionsMode#ALLOW_FROM}, use
+	 * {@link #FrameOptionsHeaderWriter(AllowFromStrategy)} instead.
+	 */
+	public XFrameOptionsHeaderWriter(XFrameOptionsMode frameOptionsMode) {
+		Assert.notNull(frameOptionsMode, "frameOptionsMode cannot be null");
+		if (XFrameOptionsMode.ALLOW_FROM.equals(frameOptionsMode)) {
+			throw new IllegalArgumentException(
+					"ALLOW_FROM requires an AllowFromStrategy. Please use FrameOptionsHeaderWriter(AllowFromStrategy allowFromStrategy) instead");
+		}
+		this.frameOptionsMode = frameOptionsMode;
+		this.allowFromStrategy = null;
+	}
 
-    /**
-     * Creates a new instance with {@link XFrameOptionsMode#ALLOW_FROM}.
-     *
-     * @param allowFromStrategy
-     *            the strategy for determining what the value for ALLOW_FROM is.
-     */
-    public XFrameOptionsHeaderWriter(AllowFromStrategy allowFromStrategy) {
-        Assert.notNull(allowFromStrategy, "allowFromStrategy cannot be null");
-        this.frameOptionsMode = XFrameOptionsMode.ALLOW_FROM;
-        this.allowFromStrategy = allowFromStrategy;
-    }
+	/**
+	 * Creates a new instance with {@link XFrameOptionsMode#ALLOW_FROM}.
+	 *
+	 * @param allowFromStrategy the strategy for determining what the value for ALLOW_FROM
+	 * is.
+	 */
+	public XFrameOptionsHeaderWriter(AllowFromStrategy allowFromStrategy) {
+		Assert.notNull(allowFromStrategy, "allowFromStrategy cannot be null");
+		this.frameOptionsMode = XFrameOptionsMode.ALLOW_FROM;
+		this.allowFromStrategy = allowFromStrategy;
+	}
 
-    public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
-        if (XFrameOptionsMode.ALLOW_FROM.equals(frameOptionsMode)) {
-            String allowFromValue = allowFromStrategy.getAllowFromValue(request);
-            if(allowFromValue != null) {
-                response.addHeader(XFRAME_OPTIONS_HEADER, XFrameOptionsMode.ALLOW_FROM.getMode() + " " + allowFromValue);
-            }
-        } else {
-            response.addHeader(XFRAME_OPTIONS_HEADER, frameOptionsMode.getMode());
-        }
-    }
+	public void writeHeaders(HttpServletRequest request, HttpServletResponse response) {
+		if (XFrameOptionsMode.ALLOW_FROM.equals(frameOptionsMode)) {
+			String allowFromValue = allowFromStrategy.getAllowFromValue(request);
+			if (allowFromValue != null) {
+				response.addHeader(XFRAME_OPTIONS_HEADER,
+						XFrameOptionsMode.ALLOW_FROM.getMode() + " " + allowFromValue);
+			}
+		}
+		else {
+			response.addHeader(XFRAME_OPTIONS_HEADER, frameOptionsMode.getMode());
+		}
+	}
 
-    /**
-     * The possible values for the X-Frame-Options header.
-     *
-     * @author Rob Winch
-     * @since 3.2
-     */
-    public enum XFrameOptionsMode {
-        DENY("DENY"),
-        SAMEORIGIN("SAMEORIGIN"),
-        ALLOW_FROM("ALLOW-FROM");
+	/**
+	 * The possible values for the X-Frame-Options header.
+	 *
+	 * @author Rob Winch
+	 * @since 3.2
+	 */
+	public enum XFrameOptionsMode {
+		DENY("DENY"), SAMEORIGIN("SAMEORIGIN"), ALLOW_FROM("ALLOW-FROM");
 
-        private String mode;
+		private String mode;
 
-        private XFrameOptionsMode(String mode) {
-            this.mode = mode;
-        }
+		private XFrameOptionsMode(String mode) {
+			this.mode = mode;
+		}
 
-        /**
-         * Gets the mode for the X-Frame-Options header value. For example,
-         * DENY, SAMEORIGIN, ALLOW-FROM. Cannot be null.
-         *
-         * @return the mode for the X-Frame-Options header value.
-         */
-        private String getMode() {
-            return mode;
-        }
-    }
+		/**
+		 * Gets the mode for the X-Frame-Options header value. For example, DENY,
+		 * SAMEORIGIN, ALLOW-FROM. Cannot be null.
+		 *
+		 * @return the mode for the X-Frame-Options header value.
+		 */
+		private String getMode() {
+			return mode;
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
index 4d5b60c630..4847c15053 100644
--- a/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
+++ b/web/src/main/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilter.java
@@ -33,16 +33,14 @@ import org.springframework.web.filter.GenericFilterBean;
 
 /**
  * <p>
- * A <code>Filter</code> which attempts to obtain a JAAS <code>Subject</code>
- * and continue the <code>FilterChain</code> running as that
- * <code>Subject</code>.
+ * A <code>Filter</code> which attempts to obtain a JAAS <code>Subject</code> and continue
+ * the <code>FilterChain</code> running as that <code>Subject</code>.
  * </p>
  * <p>
  * By using this <code>Filter</code> in conjunction with Spring's
- * <code>JaasAuthenticationProvider</code> both Spring's
- * <code>SecurityContext</code> and a JAAS <code>Subject</code> can be populated
- * simultaneously. This is useful when integrating with code that requires a
- * JAAS <code>Subject</code> to be populated.
+ * <code>JaasAuthenticationProvider</code> both Spring's <code>SecurityContext</code> and
+ * a JAAS <code>Subject</code> can be populated simultaneously. This is useful when
+ * integrating with code that requires a JAAS <code>Subject</code> to be populated.
  * </p>
  *
  * @author Rob Winch
@@ -50,114 +48,116 @@ import org.springframework.web.filter.GenericFilterBean;
  * @see #obtainSubject(ServletRequest)
  */
 public class JaasApiIntegrationFilter extends GenericFilterBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private boolean createEmptySubject;
+	private boolean createEmptySubject;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * <p>
-     * Attempts to obtain and run as a JAAS <code>Subject</code> using
-     * {@link #obtainSubject(ServletRequest)}.
-     * </p>
-     *
-     * <p>
-     * If the <code>Subject</code> is <code>null</code> and
-     * <tt>createEmptySubject</tt> is <code>true</code>, an empty, writeable
-     * <code>Subject</code> is used. This allows for the <code>Subject</code> to
-     * be populated at the time of login. If the <code>Subject</code> is
-     * <code>null</code>, the <code>FilterChain</code> continues with no
-     * additional processing. If the <code>Subject</code> is not
-     * <code>null</code>, the <code>FilterChain</code> is ran with
-     * {@link Subject#doAs(Subject, PrivilegedExceptionAction)} in conjunction
-     * with the <code>Subject</code> obtained.
-     * </p>
-     */
-    public final void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
-            throws ServletException, IOException {
+	/**
+	 * <p>
+	 * Attempts to obtain and run as a JAAS <code>Subject</code> using
+	 * {@link #obtainSubject(ServletRequest)}.
+	 * </p>
+	 *
+	 * <p>
+	 * If the <code>Subject</code> is <code>null</code> and <tt>createEmptySubject</tt> is
+	 * <code>true</code>, an empty, writeable <code>Subject</code> is used. This allows
+	 * for the <code>Subject</code> to be populated at the time of login. If the
+	 * <code>Subject</code> is <code>null</code>, the <code>FilterChain</code> continues
+	 * with no additional processing. If the <code>Subject</code> is not <code>null</code>
+	 * , the <code>FilterChain</code> is ran with
+	 * {@link Subject#doAs(Subject, PrivilegedExceptionAction)} in conjunction with the
+	 * <code>Subject</code> obtained.
+	 * </p>
+	 */
+	public final void doFilter(final ServletRequest request,
+			final ServletResponse response, final FilterChain chain)
+			throws ServletException, IOException {
 
-        Subject subject = obtainSubject(request);
-        if (subject == null && createEmptySubject) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Subject returned was null and createEmtpySubject is true; creating new empty subject to run as.");
-            }
-            subject = new Subject();
-        }
-        if (subject == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Subject is null continue running with no Subject.");
-            }
-            chain.doFilter(request, response);
-            return;
-        }
-        final PrivilegedExceptionAction<Object> continueChain = new PrivilegedExceptionAction<Object>() {
-            public Object run() throws IOException, ServletException {
-                chain.doFilter(request, response);
-                return null;
-            }
-        };
+		Subject subject = obtainSubject(request);
+		if (subject == null && createEmptySubject) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Subject returned was null and createEmtpySubject is true; creating new empty subject to run as.");
+			}
+			subject = new Subject();
+		}
+		if (subject == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Subject is null continue running with no Subject.");
+			}
+			chain.doFilter(request, response);
+			return;
+		}
+		final PrivilegedExceptionAction<Object> continueChain = new PrivilegedExceptionAction<Object>() {
+			public Object run() throws IOException, ServletException {
+				chain.doFilter(request, response);
+				return null;
+			}
+		};
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Running as Subject " + subject);
-        }
-        try {
-            Subject.doAs(subject, continueChain);
-        } catch (PrivilegedActionException e) {
-            throw new ServletException(e.getMessage(), e);
-        }
-    }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Running as Subject " + subject);
+		}
+		try {
+			Subject.doAs(subject, continueChain);
+		}
+		catch (PrivilegedActionException e) {
+			throw new ServletException(e.getMessage(), e);
+		}
+	}
 
-    /**
-     * <p>
-     * Obtains the <code>Subject</code> to run as or <code>null</code> if no
-     * <code>Subject</code> is available.
-     * </p>
-     * <p>
-     * The default implementation attempts to obtain the <code>Subject</code>
-     * from the <code>SecurityContext</code>'s <code>Authentication</code>. If
-     * it is of type <code>JaasAuthenticationToken</code> and is authenticated,
-     * the <code>Subject</code> is returned from it. Otherwise,
-     * <code>null</code> is returned.
-     * </p>
-     *
-     * @param request
-     *            the current <code>ServletRequest</code>
-     * @return the Subject to run as or <code>null</code> if no
-     *         <code>Subject</code> is available.
-     */
-    protected Subject obtainSubject(ServletRequest request) {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (logger.isDebugEnabled()) {
-            logger.debug("Attempting to obtainSubject using authentication : " + authentication);
-        }
-        if (authentication == null) {
-            return null;
-        }
-        if (!authentication.isAuthenticated()) {
-            return null;
-        }
-        if (!(authentication instanceof JaasAuthenticationToken)) {
-            return null;
-        }
-        JaasAuthenticationToken token = (JaasAuthenticationToken) authentication;
-        LoginContext loginContext = token.getLoginContext();
-        if (loginContext == null) {
-            return null;
-        }
-        return loginContext.getSubject();
-    }
+	/**
+	 * <p>
+	 * Obtains the <code>Subject</code> to run as or <code>null</code> if no
+	 * <code>Subject</code> is available.
+	 * </p>
+	 * <p>
+	 * The default implementation attempts to obtain the <code>Subject</code> from the
+	 * <code>SecurityContext</code>'s <code>Authentication</code>. If it is of type
+	 * <code>JaasAuthenticationToken</code> and is authenticated, the <code>Subject</code>
+	 * is returned from it. Otherwise, <code>null</code> is returned.
+	 * </p>
+	 *
+	 * @param request the current <code>ServletRequest</code>
+	 * @return the Subject to run as or <code>null</code> if no <code>Subject</code> is
+	 * available.
+	 */
+	protected Subject obtainSubject(ServletRequest request) {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (logger.isDebugEnabled()) {
+			logger.debug("Attempting to obtainSubject using authentication : "
+					+ authentication);
+		}
+		if (authentication == null) {
+			return null;
+		}
+		if (!authentication.isAuthenticated()) {
+			return null;
+		}
+		if (!(authentication instanceof JaasAuthenticationToken)) {
+			return null;
+		}
+		JaasAuthenticationToken token = (JaasAuthenticationToken) authentication;
+		LoginContext loginContext = token.getLoginContext();
+		if (loginContext == null) {
+			return null;
+		}
+		return loginContext.getSubject();
+	}
 
-    /**
-     * Sets <code>createEmptySubject</code>. If the value is <code>true</code>,
-     * and {@link #obtainSubject(ServletRequest)} returns <code>null</code>, an
-     * empty, writeable <code>Subject</code> is created instead. Otherwise no
-     * <code>Subject</code> is used. The default is <code>false</code>.
-     *
-     * @param createEmptySubject
-     *            the new value
-     */
-    public final void setCreateEmptySubject(boolean createEmptySubject) {
-        this.createEmptySubject = createEmptySubject;
-    }
+	/**
+	 * Sets <code>createEmptySubject</code>. If the value is <code>true</code>, and
+	 * {@link #obtainSubject(ServletRequest)} returns <code>null</code>, an empty,
+	 * writeable <code>Subject</code> is created instead. Otherwise no
+	 * <code>Subject</code> is used. The default is <code>false</code>.
+	 *
+	 * @param createEmptySubject the new value
+	 */
+	public final void setCreateEmptySubject(boolean createEmptySubject) {
+		this.createEmptySubject = createEmptySubject;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
index 31e020ec4d..ba56970760 100644
--- a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
+++ b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
@@ -28,7 +28,6 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-
 /**
  * Allows resolving the {@link Authentication#getPrincipal()} using the
  * {@link AuthenticationPrincipal} annotation. For example, the following
@@ -44,12 +43,12 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * </pre>
  *
  * <p>
- * Will resolve the CustomUser argument using
- * {@link Authentication#getPrincipal()} from the {@link SecurityContextHolder}.
- * If the {@link Authentication} or {@link Authentication#getPrincipal()} is
- * null, it will return null. If the types do not match, null will be returned
- * unless {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which
- * case a {@link ClassCastException} will be thrown.
+ * Will resolve the CustomUser argument using {@link Authentication#getPrincipal()} from
+ * the {@link SecurityContextHolder}. If the {@link Authentication} or
+ * {@link Authentication#getPrincipal()} is null, it will return null. If the types do not
+ * match, null will be returned unless
+ * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
+ * {@link ClassCastException} will be thrown.
  * </p>
  *
  * <p>
@@ -81,57 +80,75 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * @since 4.0
  */
 public final class AuthenticationPrincipalArgumentResolver implements
-    HandlerMethodArgumentResolver {
+		HandlerMethodArgumentResolver {
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter
+	 * (org.springframework.core.MethodParameter)
+	 */
+	public boolean supportsParameter(MethodParameter parameter) {
+		return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter)
-     */
-    public boolean supportsParameter(MethodParameter parameter) {
-        return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument
+	 * (org.springframework.core.MethodParameter,
+	 * org.springframework.web.method.support.ModelAndViewContainer,
+	 * org.springframework.web.context.request.NativeWebRequest,
+	 * org.springframework.web.bind.support.WebDataBinderFactory)
+	 */
+	public Object resolveArgument(MethodParameter parameter,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
+			WebDataBinderFactory binderFactory) throws Exception {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (authentication == null) {
+			return null;
+		}
+		Object principal = authentication.getPrincipal();
+		if (principal != null
+				&& !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
+			AuthenticationPrincipal authPrincipal = findMethodAnnotation(
+					AuthenticationPrincipal.class, parameter);
+			if (authPrincipal.errorOnInvalidType()) {
+				throw new ClassCastException(principal + " is not assignable to "
+						+ parameter.getParameterType());
+			}
+			else {
+				return null;
+			}
+		}
+		return principal;
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory)
-     */
-    public Object resolveArgument(MethodParameter parameter,
-            ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
-            WebDataBinderFactory binderFactory) throws Exception {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if(authentication == null) {
-            return null;
-        }
-        Object principal = authentication.getPrincipal();
-        if(principal != null && !parameter.getParameterType().isAssignableFrom(principal.getClass())) {
-            AuthenticationPrincipal authPrincipal = findMethodAnnotation(AuthenticationPrincipal.class, parameter);
-            if(authPrincipal.errorOnInvalidType()) {
-                throw new ClassCastException(principal + " is not assignable to " + parameter.getParameterType());
-            } else {
-                return null;
-            }
-        }
-        return principal;
-    }
-
-    /**
-     * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
-     *
-     * @param annotationClass the class of the {@link Annotation} to find on the {@link MethodParameter}
-     * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
-     * @return the {@link Annotation} that was found or null.
-     */
-    private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass, MethodParameter parameter) {
-        T annotation = parameter.getParameterAnnotation(annotationClass);
-        if(annotation != null) {
-            return annotation;
-        }
-        Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
-        for(Annotation toSearch : annotationsToSearch) {
-            annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(), annotationClass);
-            if(annotation != null) {
-                return annotation;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Obtains the specified {@link Annotation} on the specified {@link MethodParameter}.
+	 *
+	 * @param annotationClass the class of the {@link Annotation} to find on the
+	 * {@link MethodParameter}
+	 * @param parameter the {@link MethodParameter} to search for an {@link Annotation}
+	 * @return the {@link Annotation} that was found or null.
+	 */
+	private <T extends Annotation> T findMethodAnnotation(Class<T> annotationClass,
+			MethodParameter parameter) {
+		T annotation = parameter.getParameterAnnotation(annotationClass);
+		if (annotation != null) {
+			return annotation;
+		}
+		Annotation[] annotationsToSearch = parameter.getParameterAnnotations();
+		for (Annotation toSearch : annotationsToSearch) {
+			annotation = AnnotationUtils.findAnnotation(toSearch.annotationType(),
+					annotationClass);
+			if (annotation != null) {
+				return annotation;
+			}
+		}
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java
index 0bcf4027a1..97f9b4cfe7 100644
--- a/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java
+++ b/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java
@@ -23,7 +23,6 @@ import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-
 /**
  * Allows resolving the current {@link CsrfToken}. For example, the following
  * {@link RestController} will resolve the current {@link CsrfToken}:
@@ -41,24 +40,34 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * @author Rob Winch
  * @since 4.0
  */
-public final class CsrfTokenArgumentResolver implements
-    HandlerMethodArgumentResolver {
+public final class CsrfTokenArgumentResolver implements HandlerMethodArgumentResolver {
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter
+	 * (org.springframework.core.MethodParameter)
+	 */
+	public boolean supportsParameter(MethodParameter parameter) {
+		return CsrfToken.class.equals(parameter.getParameterType());
+	}
 
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#supportsParameter(org.springframework.core.MethodParameter)
-     */
-    public boolean supportsParameter(MethodParameter parameter) {
-        return CsrfToken.class.equals(parameter.getParameterType());
-    }
-
-    /* (non-Javadoc)
-     * @see org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument(org.springframework.core.MethodParameter, org.springframework.web.method.support.ModelAndViewContainer, org.springframework.web.context.request.NativeWebRequest, org.springframework.web.bind.support.WebDataBinderFactory)
-     */
-    public Object resolveArgument(MethodParameter parameter,
-            ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
-            WebDataBinderFactory binderFactory) throws Exception {
-        CsrfToken token = (CsrfToken) webRequest.getAttribute(CsrfToken.class.getName(), NativeWebRequest.SCOPE_REQUEST);
-        return token;
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.springframework.web.method.support.HandlerMethodArgumentResolver#resolveArgument
+	 * (org.springframework.core.MethodParameter,
+	 * org.springframework.web.method.support.ModelAndViewContainer,
+	 * org.springframework.web.context.request.NativeWebRequest,
+	 * org.springframework.web.bind.support.WebDataBinderFactory)
+	 */
+	public Object resolveArgument(MethodParameter parameter,
+			ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
+			WebDataBinderFactory binderFactory) throws Exception {
+		CsrfToken token = (CsrfToken) webRequest.getAttribute(CsrfToken.class.getName(),
+				NativeWebRequest.SCOPE_REQUEST);
+		return token;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
index 795642e13b..30f9ad0a76 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java
@@ -25,17 +25,19 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
-
 /**
  * Represents central information from a {@code HttpServletRequest}.
  * <p>
- * This class is used by {@link org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter}
+ * This class is used by
+ * {@link org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter}
  * and {@link org.springframework.security.web.savedrequest.SavedRequestAwareWrapper} to
- * reproduce the request after successful authentication. An instance of this class is stored at the time of an
- * authentication exception by {@link org.springframework.security.web.access.ExceptionTranslationFilter}.
+ * reproduce the request after successful authentication. An instance of this class is
+ * stored at the time of an authentication exception by
+ * {@link org.springframework.security.web.access.ExceptionTranslationFilter}.
  * <p>
- * <em>IMPLEMENTATION NOTE</em>: It is assumed that this object is accessed only from the context of a single
- * thread, so no synchronization around internal collection classes is performed.
+ * <em>IMPLEMENTATION NOTE</em>: It is assumed that this object is accessed only from the
+ * context of a single thread, so no synchronization around internal collection classes is
+ * performed.
  * <p>
  * This class is based on code in Apache Tomcat.
  *
@@ -45,297 +47,312 @@ import java.util.*;
  * @author Luke Taylor
  */
 public class DefaultSavedRequest implements SavedRequest {
-    //~ Static fields/initializers =====================================================================================
-
-    protected static final Log logger = LogFactory.getLog(DefaultSavedRequest.class);
-
-    private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
-    private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
-
-    //~ Instance fields ================================================================================================
-
-    private final ArrayList<SavedCookie> cookies = new ArrayList<SavedCookie>();
-    private final ArrayList<Locale> locales = new ArrayList<Locale>();
-    private final Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
-    private final Map<String, String[]> parameters = new TreeMap<String, String[]>(String.CASE_INSENSITIVE_ORDER);
-    private final String contextPath;
-    private final String method;
-    private final String pathInfo;
-    private final String queryString;
-    private final String requestURI;
-    private final String requestURL;
-    private final String scheme;
-    private final String serverName;
-    private final String servletPath;
-    private final int serverPort;
-
-    //~ Constructors ===================================================================================================
-
-    @SuppressWarnings("unchecked")
-    public DefaultSavedRequest(HttpServletRequest request, PortResolver portResolver) {
-        Assert.notNull(request, "Request required");
-        Assert.notNull(portResolver, "PortResolver required");
-
-        // Cookies
-        Cookie[] cookies = request.getCookies();
-
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                this.addCookie(cookie);
-            }
-        }
-
-        // Headers
-        Enumeration<String> names = request.getHeaderNames();
-
-        while (names.hasMoreElements()) {
-            String name = names.nextElement();
-            // Skip If-Modified-Since and If-None-Match header. SEC-1412, SEC-1624.
-            if (HEADER_IF_MODIFIED_SINCE.equalsIgnoreCase(name) || HEADER_IF_NONE_MATCH.equalsIgnoreCase(name)) {
-                continue;
-            }
-            Enumeration<String> values = request.getHeaders(name);
-
-            while (values.hasMoreElements()) {
-                this.addHeader(name, values.nextElement());
-            }
-        }
-
-        // Locales
-        Enumeration<Locale> locales = request.getLocales();
-
-        while (locales.hasMoreElements()) {
-            Locale locale = (Locale) locales.nextElement();
-            this.addLocale(locale);
-        }
-
-        // Parameters
-        Map<String,String[]> parameters = request.getParameterMap();
-
-        for(String paramName : parameters.keySet()) {
-            Object paramValues = parameters.get(paramName);
-            if (paramValues instanceof String[]) {
-                this.addParameter(paramName, (String[]) paramValues);
-            } else {
-                if (logger.isWarnEnabled()) {
-                    logger.warn("ServletRequest.getParameterMap() returned non-String array");
-                }
-            }
-        }
-
-        // Primitives
-        this.method = request.getMethod();
-        this.pathInfo = request.getPathInfo();
-        this.queryString = request.getQueryString();
-        this.requestURI = request.getRequestURI();
-        this.serverPort = portResolver.getServerPort(request);
-        this.requestURL = request.getRequestURL().toString();
-        this.scheme = request.getScheme();
-        this.serverName = request.getServerName();
-        this.contextPath = request.getContextPath();
-        this.servletPath = request.getServletPath();
-    }
-
-    //~ Methods ========================================================================================================
-
-    private void addCookie(Cookie cookie) {
-        cookies.add(new SavedCookie(cookie));
-    }
-
-    private void addHeader(String name, String value) {
-        List<String> values = headers.get(name);
-
-        if (values == null) {
-            values = new ArrayList<String>();
-            headers.put(name, values);
-        }
-
-        values.add(value);
-    }
-
-    private void addLocale(Locale locale) {
-        locales.add(locale);
-    }
-
-    private void addParameter(String name, String[] values) {
-        parameters.put(name, values);
-    }
-
-    /**
-     * Determines if the current request matches the <code>DefaultSavedRequest</code>.
-     * <p>
-     * All URL arguments are considered but not cookies, locales, headers or parameters.
-     *
-     * @param request the actual request to be matched against this one
-     * @param portResolver used to obtain the server port of the request
-     * @return true if the request is deemed to match this one.
-     *
-     */
-    public boolean doesRequestMatch(HttpServletRequest request, PortResolver portResolver) {
-
-        if (!propertyEquals("pathInfo", this.pathInfo, request.getPathInfo())) {
-            return false;
-        }
-
-        if (!propertyEquals("queryString", this.queryString, request.getQueryString())) {
-            return false;
-        }
-
-        if (!propertyEquals("requestURI", this.requestURI, request.getRequestURI())) {
-            return false;
-        }
-
-        if (!"GET".equals(request.getMethod()) && "GET".equals(method)) {
-            // A save GET should not match an incoming non-GET method
-            return false;
-        }
-
-        if (!propertyEquals("serverPort", Integer.valueOf(this.serverPort), Integer.valueOf(portResolver.getServerPort(request)))) {
-            return false;
-        }
-
-        if (!propertyEquals("requestURL", this.requestURL, request.getRequestURL().toString())) {
-            return false;
-        }
-
-        if (!propertyEquals("scheme", this.scheme, request.getScheme())) {
-            return false;
-        }
-
-        if (!propertyEquals("serverName", this.serverName, request.getServerName())) {
-            return false;
-        }
-
-        if (!propertyEquals("contextPath", this.contextPath, request.getContextPath())) {
-            return false;
-        }
-
-        return propertyEquals("servletPath", this.servletPath, request.getServletPath());
-
-    }
-
-    public String getContextPath() {
-        return contextPath;
-    }
-
-    public List<Cookie> getCookies() {
-        List<Cookie> cookieList = new ArrayList<Cookie>(cookies.size());
-
-        for (SavedCookie savedCookie : cookies) {
-            cookieList.add(savedCookie.getCookie());
-        }
-
-        return cookieList;
-    }
-
-    /**
-     * Indicates the URL that the user agent used for this request.
-     *
-     * @return the full URL of this request
-     */
-    public String getRedirectUrl() {
-        return UrlUtils.buildFullRequestUrl(scheme, serverName, serverPort, requestURI, queryString);
-    }
-
-    public Collection<String> getHeaderNames() {
-        return headers.keySet();
-    }
-
-    public List<String> getHeaderValues(String name) {
-        List<String> values = headers.get(name);
-
-        if (values == null) {
-            return Collections.emptyList();
-        }
-
-        return values;
-    }
-
-    public List<Locale> getLocales() {
-        return locales;
-    }
-
-    public String getMethod() {
-        return method;
-    }
-
-    public Map<String, String[]> getParameterMap() {
-        return parameters;
-    }
-
-    public Collection<String> getParameterNames() {
-        return parameters.keySet();
-    }
-
-    public String[] getParameterValues(String name) {
-        return parameters.get(name);
-    }
-
-    public String getPathInfo() {
-        return pathInfo;
-    }
-
-    public String getQueryString() {
-        return (this.queryString);
-    }
-
-    public String getRequestURI() {
-        return (this.requestURI);
-    }
-
-    public String getRequestURL() {
-        return requestURL;
-    }
-
-    public String getScheme() {
-        return scheme;
-    }
-
-    public String getServerName() {
-        return serverName;
-    }
-
-    public int getServerPort() {
-        return serverPort;
-    }
-
-    public String getServletPath() {
-        return servletPath;
-    }
-
-    private boolean propertyEquals(String log, Object arg1, Object arg2) {
-        if ((arg1 == null) && (arg2 == null)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(log + ": both null (property equals)");
-            }
-
-            return true;
-        }
-
-        if (arg1 == null || arg2 == null) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2 + " (property not equals)");
-            }
-
-            return false;
-        }
-
-        if (arg1.equals(arg2)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2 + " (property equals)");
-            }
-
-            return true;
-        } else {
-            if (logger.isDebugEnabled()) {
-                logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2 + " (property not equals)");
-            }
-
-            return false;
-        }
-    }
-
-    public String toString() {
-        return "DefaultSavedRequest[" + getRedirectUrl() + "]";
-    }
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	protected static final Log logger = LogFactory.getLog(DefaultSavedRequest.class);
+
+	private static final String HEADER_IF_NONE_MATCH = "If-None-Match";
+	private static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	private final ArrayList<SavedCookie> cookies = new ArrayList<SavedCookie>();
+	private final ArrayList<Locale> locales = new ArrayList<Locale>();
+	private final Map<String, List<String>> headers = new TreeMap<String, List<String>>(
+			String.CASE_INSENSITIVE_ORDER);
+	private final Map<String, String[]> parameters = new TreeMap<String, String[]>(
+			String.CASE_INSENSITIVE_ORDER);
+	private final String contextPath;
+	private final String method;
+	private final String pathInfo;
+	private final String queryString;
+	private final String requestURI;
+	private final String requestURL;
+	private final String scheme;
+	private final String serverName;
+	private final String servletPath;
+	private final int serverPort;
+
+	// ~ Constructors
+	// ===================================================================================================
+
+	@SuppressWarnings("unchecked")
+	public DefaultSavedRequest(HttpServletRequest request, PortResolver portResolver) {
+		Assert.notNull(request, "Request required");
+		Assert.notNull(portResolver, "PortResolver required");
+
+		// Cookies
+		Cookie[] cookies = request.getCookies();
+
+		if (cookies != null) {
+			for (Cookie cookie : cookies) {
+				this.addCookie(cookie);
+			}
+		}
+
+		// Headers
+		Enumeration<String> names = request.getHeaderNames();
+
+		while (names.hasMoreElements()) {
+			String name = names.nextElement();
+			// Skip If-Modified-Since and If-None-Match header. SEC-1412, SEC-1624.
+			if (HEADER_IF_MODIFIED_SINCE.equalsIgnoreCase(name)
+					|| HEADER_IF_NONE_MATCH.equalsIgnoreCase(name)) {
+				continue;
+			}
+			Enumeration<String> values = request.getHeaders(name);
+
+			while (values.hasMoreElements()) {
+				this.addHeader(name, values.nextElement());
+			}
+		}
+
+		// Locales
+		Enumeration<Locale> locales = request.getLocales();
+
+		while (locales.hasMoreElements()) {
+			Locale locale = (Locale) locales.nextElement();
+			this.addLocale(locale);
+		}
+
+		// Parameters
+		Map<String, String[]> parameters = request.getParameterMap();
+
+		for (String paramName : parameters.keySet()) {
+			Object paramValues = parameters.get(paramName);
+			if (paramValues instanceof String[]) {
+				this.addParameter(paramName, (String[]) paramValues);
+			}
+			else {
+				if (logger.isWarnEnabled()) {
+					logger.warn("ServletRequest.getParameterMap() returned non-String array");
+				}
+			}
+		}
+
+		// Primitives
+		this.method = request.getMethod();
+		this.pathInfo = request.getPathInfo();
+		this.queryString = request.getQueryString();
+		this.requestURI = request.getRequestURI();
+		this.serverPort = portResolver.getServerPort(request);
+		this.requestURL = request.getRequestURL().toString();
+		this.scheme = request.getScheme();
+		this.serverName = request.getServerName();
+		this.contextPath = request.getContextPath();
+		this.servletPath = request.getServletPath();
+	}
+
+	// ~ Methods
+	// ========================================================================================================
+
+	private void addCookie(Cookie cookie) {
+		cookies.add(new SavedCookie(cookie));
+	}
+
+	private void addHeader(String name, String value) {
+		List<String> values = headers.get(name);
+
+		if (values == null) {
+			values = new ArrayList<String>();
+			headers.put(name, values);
+		}
+
+		values.add(value);
+	}
+
+	private void addLocale(Locale locale) {
+		locales.add(locale);
+	}
+
+	private void addParameter(String name, String[] values) {
+		parameters.put(name, values);
+	}
+
+	/**
+	 * Determines if the current request matches the <code>DefaultSavedRequest</code>.
+	 * <p>
+	 * All URL arguments are considered but not cookies, locales, headers or parameters.
+	 *
+	 * @param request the actual request to be matched against this one
+	 * @param portResolver used to obtain the server port of the request
+	 * @return true if the request is deemed to match this one.
+	 *
+	 */
+	public boolean doesRequestMatch(HttpServletRequest request, PortResolver portResolver) {
+
+		if (!propertyEquals("pathInfo", this.pathInfo, request.getPathInfo())) {
+			return false;
+		}
+
+		if (!propertyEquals("queryString", this.queryString, request.getQueryString())) {
+			return false;
+		}
+
+		if (!propertyEquals("requestURI", this.requestURI, request.getRequestURI())) {
+			return false;
+		}
+
+		if (!"GET".equals(request.getMethod()) && "GET".equals(method)) {
+			// A save GET should not match an incoming non-GET method
+			return false;
+		}
+
+		if (!propertyEquals("serverPort", Integer.valueOf(this.serverPort),
+				Integer.valueOf(portResolver.getServerPort(request)))) {
+			return false;
+		}
+
+		if (!propertyEquals("requestURL", this.requestURL, request.getRequestURL()
+				.toString())) {
+			return false;
+		}
+
+		if (!propertyEquals("scheme", this.scheme, request.getScheme())) {
+			return false;
+		}
+
+		if (!propertyEquals("serverName", this.serverName, request.getServerName())) {
+			return false;
+		}
+
+		if (!propertyEquals("contextPath", this.contextPath, request.getContextPath())) {
+			return false;
+		}
+
+		return propertyEquals("servletPath", this.servletPath, request.getServletPath());
+
+	}
+
+	public String getContextPath() {
+		return contextPath;
+	}
+
+	public List<Cookie> getCookies() {
+		List<Cookie> cookieList = new ArrayList<Cookie>(cookies.size());
+
+		for (SavedCookie savedCookie : cookies) {
+			cookieList.add(savedCookie.getCookie());
+		}
+
+		return cookieList;
+	}
+
+	/**
+	 * Indicates the URL that the user agent used for this request.
+	 *
+	 * @return the full URL of this request
+	 */
+	public String getRedirectUrl() {
+		return UrlUtils.buildFullRequestUrl(scheme, serverName, serverPort, requestURI,
+				queryString);
+	}
+
+	public Collection<String> getHeaderNames() {
+		return headers.keySet();
+	}
+
+	public List<String> getHeaderValues(String name) {
+		List<String> values = headers.get(name);
+
+		if (values == null) {
+			return Collections.emptyList();
+		}
+
+		return values;
+	}
+
+	public List<Locale> getLocales() {
+		return locales;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public Map<String, String[]> getParameterMap() {
+		return parameters;
+	}
+
+	public Collection<String> getParameterNames() {
+		return parameters.keySet();
+	}
+
+	public String[] getParameterValues(String name) {
+		return parameters.get(name);
+	}
+
+	public String getPathInfo() {
+		return pathInfo;
+	}
+
+	public String getQueryString() {
+		return (this.queryString);
+	}
+
+	public String getRequestURI() {
+		return (this.requestURI);
+	}
+
+	public String getRequestURL() {
+		return requestURL;
+	}
+
+	public String getScheme() {
+		return scheme;
+	}
+
+	public String getServerName() {
+		return serverName;
+	}
+
+	public int getServerPort() {
+		return serverPort;
+	}
+
+	public String getServletPath() {
+		return servletPath;
+	}
+
+	private boolean propertyEquals(String log, Object arg1, Object arg2) {
+		if ((arg1 == null) && (arg2 == null)) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(log + ": both null (property equals)");
+			}
+
+			return true;
+		}
+
+		if (arg1 == null || arg2 == null) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2
+						+ " (property not equals)");
+			}
+
+			return false;
+		}
+
+		if (arg1.equals(arg2)) {
+			if (logger.isDebugEnabled()) {
+				logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2
+						+ " (property equals)");
+			}
+
+			return true;
+		}
+		else {
+			if (logger.isDebugEnabled()) {
+				logger.debug(log + ": arg1=" + arg1 + "; arg2=" + arg2
+						+ " (property not equals)");
+			}
+
+			return false;
+		}
+	}
+
+	public String toString() {
+		return "DefaultSavedRequest[" + getRedirectUrl() + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java
index 8313d41803..23aa1224ef 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java
@@ -23,116 +23,125 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-
 /**
- * <p>Adapter that wraps an <code>Enumeration</code> around a Java 2 collection <code>Iterator</code>.</p>
- * <p>Constructors are provided to easily create such wrappers.</p>
- * <p>This class is based on code in Apache Tomcat.</p>
+ * <p>
+ * Adapter that wraps an <code>Enumeration</code> around a Java 2 collection
+ * <code>Iterator</code>.
+ * </p>
+ * <p>
+ * Constructors are provided to easily create such wrappers.
+ * </p>
+ * <p>
+ * This class is based on code in Apache Tomcat.
+ * </p>
  *
  * @author Craig McClanahan
  * @author Andrey Grebnev
  */
 public class Enumerator<T> implements Enumeration<T> {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    /**
-     * The <code>Iterator</code> over which the <code>Enumeration</code> represented by this class actually operates.
-     */
-    private Iterator<T> iterator = null;
+	/**
+	 * The <code>Iterator</code> over which the <code>Enumeration</code> represented by
+	 * this class actually operates.
+	 */
+	private Iterator<T> iterator = null;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Return an Enumeration over the values of the specified Collection.
-     *
-     * @param collection Collection whose values should be enumerated
-     */
-    public Enumerator(Collection<T> collection) {
-        this(collection.iterator());
-    }
+	/**
+	 * Return an Enumeration over the values of the specified Collection.
+	 *
+	 * @param collection Collection whose values should be enumerated
+	 */
+	public Enumerator(Collection<T> collection) {
+		this(collection.iterator());
+	}
 
-    /**
-     * Return an Enumeration over the values of the specified Collection.
-     *
-     * @param collection Collection whose values should be enumerated
-     * @param clone true to clone iterator
-     */
-    public Enumerator(Collection<T> collection, boolean clone) {
-        this(collection.iterator(), clone);
-    }
+	/**
+	 * Return an Enumeration over the values of the specified Collection.
+	 *
+	 * @param collection Collection whose values should be enumerated
+	 * @param clone true to clone iterator
+	 */
+	public Enumerator(Collection<T> collection, boolean clone) {
+		this(collection.iterator(), clone);
+	}
 
-    /**
-     * Return an Enumeration over the values returned by the specified
-     * Iterator.
-     *
-     * @param iterator Iterator to be wrapped
-     */
-    public Enumerator(Iterator<T> iterator) {
-        this.iterator = iterator;
-    }
+	/**
+	 * Return an Enumeration over the values returned by the specified Iterator.
+	 *
+	 * @param iterator Iterator to be wrapped
+	 */
+	public Enumerator(Iterator<T> iterator) {
+		this.iterator = iterator;
+	}
 
-    /**
-     * Return an Enumeration over the values returned by the specified
-     * Iterator.
-     *
-     * @param iterator Iterator to be wrapped
-     * @param clone true to clone iterator
-     */
-    public Enumerator(Iterator<T> iterator, boolean clone) {
+	/**
+	 * Return an Enumeration over the values returned by the specified Iterator.
+	 *
+	 * @param iterator Iterator to be wrapped
+	 * @param clone true to clone iterator
+	 */
+	public Enumerator(Iterator<T> iterator, boolean clone) {
 
-        if (!clone) {
-            this.iterator = iterator;
-        } else {
-            List<T> list = new ArrayList<T>();
+		if (!clone) {
+			this.iterator = iterator;
+		}
+		else {
+			List<T> list = new ArrayList<T>();
 
-            while (iterator.hasNext()) {
-                list.add(iterator.next());
-            }
+			while (iterator.hasNext()) {
+				list.add(iterator.next());
+			}
 
-            this.iterator = list.iterator();
-        }
-    }
+			this.iterator = list.iterator();
+		}
+	}
 
-    /**
-     * Return an Enumeration over the values of the specified Map.
-     *
-     * @param map Map whose values should be enumerated
-     */
-    public Enumerator(Map<?, T> map) {
-        this(map.values().iterator());
-    }
+	/**
+	 * Return an Enumeration over the values of the specified Map.
+	 *
+	 * @param map Map whose values should be enumerated
+	 */
+	public Enumerator(Map<?, T> map) {
+		this(map.values().iterator());
+	}
 
-    /**
-     * Return an Enumeration over the values of the specified Map.
-     *
-     * @param map Map whose values should be enumerated
-     * @param clone true to clone iterator
-     */
-    public Enumerator(Map<?, T> map, boolean clone) {
-        this(map.values().iterator(), clone);
-    }
+	/**
+	 * Return an Enumeration over the values of the specified Map.
+	 *
+	 * @param map Map whose values should be enumerated
+	 * @param clone true to clone iterator
+	 */
+	public Enumerator(Map<?, T> map, boolean clone) {
+		this(map.values().iterator(), clone);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Tests if this enumeration contains more elements.
-     *
-     * @return <code>true</code> if and only if this enumeration object contains at least one more element to provide,
-     *         <code>false</code> otherwise
-     */
-    public boolean hasMoreElements() {
-        return (iterator.hasNext());
-    }
+	/**
+	 * Tests if this enumeration contains more elements.
+	 *
+	 * @return <code>true</code> if and only if this enumeration object contains at least
+	 * one more element to provide, <code>false</code> otherwise
+	 */
+	public boolean hasMoreElements() {
+		return (iterator.hasNext());
+	}
 
-    /**
-     * Returns the next element of this enumeration if this enumeration has at least one more element to
-     * provide.
-     *
-     * @return the next element of this enumeration
-     *
-     * @exception NoSuchElementException if no more elements exist
-     */
-    public T nextElement() throws NoSuchElementException {
-        return (iterator.next());
-    }
+	/**
+	 * Returns the next element of this enumeration if this enumeration has at least one
+	 * more element to provide.
+	 *
+	 * @return the next element of this enumeration
+	 *
+	 * @exception NoSuchElementException if no more elements exist
+	 */
+	public T nextElement() throws NoSuchElementException {
+		return (iterator.next());
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java
index 50b2c4973d..4ff38496b4 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
 
-
 /**
  * Utility class to generate HTTP dates.
  * <p>
@@ -34,186 +33,199 @@ import java.util.TimeZone;
  * @author Andrey Grebnev
  */
 public class FastHttpDateFormat {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    /** HTTP date format. */
-    protected static final SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+	/** HTTP date format. */
+	protected static final SimpleDateFormat format = new SimpleDateFormat(
+			"EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
 
-    /** The set of SimpleDateFormat formats to use in <code>getDateHeader()</code>. */
-    protected static final SimpleDateFormat[] formats = {
-            new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
-            new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
-            new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US)
-        };
+	/** The set of SimpleDateFormat formats to use in <code>getDateHeader()</code>. */
+	protected static final SimpleDateFormat[] formats = {
+			new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US),
+			new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US),
+			new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US) };
 
-    /** GMT time zone - all HTTP dates are on GMT */
-    protected static final TimeZone gmtZone = TimeZone.getTimeZone("GMT");
+	/** GMT time zone - all HTTP dates are on GMT */
+	protected static final TimeZone gmtZone = TimeZone.getTimeZone("GMT");
 
-    static {
-        format.setTimeZone(gmtZone);
+	static {
+		format.setTimeZone(gmtZone);
 
-        formats[0].setTimeZone(gmtZone);
-        formats[1].setTimeZone(gmtZone);
-        formats[2].setTimeZone(gmtZone);
-    }
+		formats[0].setTimeZone(gmtZone);
+		formats[1].setTimeZone(gmtZone);
+		formats[2].setTimeZone(gmtZone);
+	}
 
-    /** Instant on which the currentDate object was generated. */
-    protected static long currentDateGenerated = 0L;
+	/** Instant on which the currentDate object was generated. */
+	protected static long currentDateGenerated = 0L;
 
-    /** Current formatted date. */
-    protected static String currentDate = null;
+	/** Current formatted date. */
+	protected static String currentDate = null;
 
-    /** Formatter cache. */
-    protected static final HashMap<Long,String> formatCache = new HashMap<Long,String>();
+	/** Formatter cache. */
+	protected static final HashMap<Long, String> formatCache = new HashMap<Long, String>();
 
-    /** Parser cache. */
-    protected static final HashMap<String,Long> parseCache = new HashMap<String,Long>();
+	/** Parser cache. */
+	protected static final HashMap<String, Long> parseCache = new HashMap<String, Long>();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Formats a specified date to HTTP format. If local format is not <code>null</code>, it's used instead.
-     *
-     * @param value Date value to format
-     * @param threadLocalformat The format to use (or <code>null</code> -- then HTTP format will be used)
-     *
-     * @return Formatted date
-     */
-    public static String formatDate(long value, DateFormat threadLocalformat) {
-        String cachedDate = null;
-        Long longValue = Long.valueOf(value);
+	/**
+	 * Formats a specified date to HTTP format. If local format is not <code>null</code>,
+	 * it's used instead.
+	 *
+	 * @param value Date value to format
+	 * @param threadLocalformat The format to use (or <code>null</code> -- then HTTP
+	 * format will be used)
+	 *
+	 * @return Formatted date
+	 */
+	public static String formatDate(long value, DateFormat threadLocalformat) {
+		String cachedDate = null;
+		Long longValue = Long.valueOf(value);
 
-        try {
-            cachedDate = formatCache.get(longValue);
-        } catch (Exception ignored) {}
+		try {
+			cachedDate = formatCache.get(longValue);
+		}
+		catch (Exception ignored) {
+		}
 
-        if (cachedDate != null) {
-            return cachedDate;
-        }
+		if (cachedDate != null) {
+			return cachedDate;
+		}
 
-        String newDate;
-        Date dateValue = new Date(value);
+		String newDate;
+		Date dateValue = new Date(value);
 
-        if (threadLocalformat != null) {
-            newDate = threadLocalformat.format(dateValue);
+		if (threadLocalformat != null) {
+			newDate = threadLocalformat.format(dateValue);
 
-            synchronized (formatCache) {
-                updateCache(formatCache, longValue, newDate);
-            }
-        } else {
-            synchronized (formatCache) {
-                newDate = format.format(dateValue);
-                updateCache(formatCache, longValue, newDate);
-            }
-        }
+			synchronized (formatCache) {
+				updateCache(formatCache, longValue, newDate);
+			}
+		}
+		else {
+			synchronized (formatCache) {
+				newDate = format.format(dateValue);
+				updateCache(formatCache, longValue, newDate);
+			}
+		}
 
-        return newDate;
-    }
+		return newDate;
+	}
 
-    /**
-     * Gets the current date in HTTP format.
-     *
-     * @return Current date in HTTP format
-     */
-    public static String getCurrentDate() {
-        long now = System.currentTimeMillis();
+	/**
+	 * Gets the current date in HTTP format.
+	 *
+	 * @return Current date in HTTP format
+	 */
+	public static String getCurrentDate() {
+		long now = System.currentTimeMillis();
 
-        if ((now - currentDateGenerated) > 1000) {
-            synchronized (format) {
-                if ((now - currentDateGenerated) > 1000) {
-                    currentDateGenerated = now;
-                    currentDate = format.format(new Date(now));
-                }
-            }
-        }
+		if ((now - currentDateGenerated) > 1000) {
+			synchronized (format) {
+				if ((now - currentDateGenerated) > 1000) {
+					currentDateGenerated = now;
+					currentDate = format.format(new Date(now));
+				}
+			}
+		}
 
-        return currentDate;
-    }
+		return currentDate;
+	}
 
-    /**
-     * Parses date with given formatters.
-     *
-     * @param value The string to parse
-     * @param formats Array of formats to use
-     *
-     * @return Parsed date (or <code>null</code> if no formatter mached)
-     */
-    private static Long internalParseDate(String value, DateFormat[] formats) {
-        Date date = null;
+	/**
+	 * Parses date with given formatters.
+	 *
+	 * @param value The string to parse
+	 * @param formats Array of formats to use
+	 *
+	 * @return Parsed date (or <code>null</code> if no formatter mached)
+	 */
+	private static Long internalParseDate(String value, DateFormat[] formats) {
+		Date date = null;
 
-        for (int i = 0; (date == null) && (i < formats.length); i++) {
-            try {
-                date = formats[i].parse(value);
-            } catch (ParseException ignored) {
-            }
-        }
+		for (int i = 0; (date == null) && (i < formats.length); i++) {
+			try {
+				date = formats[i].parse(value);
+			}
+			catch (ParseException ignored) {
+			}
+		}
 
-        if (date == null) {
-            return null;
-        }
+		if (date == null) {
+			return null;
+		}
 
-        return new Long(date.getTime());
-    }
+		return new Long(date.getTime());
+	}
 
-    /**
-     * Tries to parse the given date as an HTTP date. If local format list is not <code>null</code>, it's used
-     * instead.
-     *
-     * @param value The string to parse
-     * @param threadLocalformats Array of formats to use for parsing. If <code>null</code>, HTTP formats are used.
-     *
-     * @return Parsed date (or -1 if error occurred)
-     */
-    public static long parseDate(String value, DateFormat[] threadLocalformats) {
-        Long cachedDate = null;
+	/**
+	 * Tries to parse the given date as an HTTP date. If local format list is not
+	 * <code>null</code>, it's used instead.
+	 *
+	 * @param value The string to parse
+	 * @param threadLocalformats Array of formats to use for parsing. If <code>null</code>
+	 * , HTTP formats are used.
+	 *
+	 * @return Parsed date (or -1 if error occurred)
+	 */
+	public static long parseDate(String value, DateFormat[] threadLocalformats) {
+		Long cachedDate = null;
 
-        try {
-            cachedDate = (Long) parseCache.get(value);
-        } catch (Exception ignored) {}
+		try {
+			cachedDate = (Long) parseCache.get(value);
+		}
+		catch (Exception ignored) {
+		}
 
-        if (cachedDate != null) {
-            return cachedDate.longValue();
-        }
+		if (cachedDate != null) {
+			return cachedDate.longValue();
+		}
 
-        Long date;
+		Long date;
 
-        if (threadLocalformats != null) {
-            date = internalParseDate(value, threadLocalformats);
+		if (threadLocalformats != null) {
+			date = internalParseDate(value, threadLocalformats);
 
-            synchronized (parseCache) {
-                updateCache(parseCache, value, date);
-            }
-        } else {
-            synchronized (parseCache) {
-                date = internalParseDate(value, formats);
-                updateCache(parseCache, value, date);
-            }
-        }
+			synchronized (parseCache) {
+				updateCache(parseCache, value, date);
+			}
+		}
+		else {
+			synchronized (parseCache) {
+				date = internalParseDate(value, formats);
+				updateCache(parseCache, value, date);
+			}
+		}
 
-        if (date == null) {
-            return (-1L);
-        } else {
-            return date.longValue();
-        }
-    }
+		if (date == null) {
+			return (-1L);
+		}
+		else {
+			return date.longValue();
+		}
+	}
 
-    /**
-     * Updates cache.
-     *
-     * @param cache Cache to be updated
-     * @param key Key to be updated
-     * @param value New value
-     */
-    @SuppressWarnings("unchecked")
-    private static void updateCache(HashMap cache, Object key, Object value) {
-        if (value == null) {
-            return;
-        }
+	/**
+	 * Updates cache.
+	 *
+	 * @param cache Cache to be updated
+	 * @param key Key to be updated
+	 * @param value New value
+	 */
+	@SuppressWarnings("unchecked")
+	private static void updateCache(HashMap cache, Object key, Object value) {
+		if (value == null) {
+			return;
+		}
 
-        if (cache.size() > 1000) {
-            cache.clear();
-        }
+		if (cache.size() > 1000) {
+			cache.clear();
+		}
 
-        cache.put(key, value);
-    }
+		cache.put(key, value);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java b/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java
index 37b1a39f13..ad2d1af19b 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/HttpSessionRequestCache.java
@@ -20,91 +20,98 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @since 3.0
  */
 public class HttpSessionRequestCache implements RequestCache {
-    static final String SAVED_REQUEST = "SPRING_SECURITY_SAVED_REQUEST";
-    protected final Log logger = LogFactory.getLog(this.getClass());
+	static final String SAVED_REQUEST = "SPRING_SECURITY_SAVED_REQUEST";
+	protected final Log logger = LogFactory.getLog(this.getClass());
 
-    private PortResolver portResolver = new PortResolverImpl();
-    private boolean createSessionAllowed = true;
-    private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
+	private PortResolver portResolver = new PortResolverImpl();
+	private boolean createSessionAllowed = true;
+	private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE;
 
-    /**
-     * Stores the current request, provided the configuration properties allow it.
-     */
-    public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
-        if (requestMatcher.matches(request)) {
-            DefaultSavedRequest savedRequest = new DefaultSavedRequest(request, portResolver);
+	/**
+	 * Stores the current request, provided the configuration properties allow it.
+	 */
+	public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
+		if (requestMatcher.matches(request)) {
+			DefaultSavedRequest savedRequest = new DefaultSavedRequest(request,
+					portResolver);
 
-            if (createSessionAllowed || request.getSession(false) != null) {
-                // Store the HTTP request itself. Used by AbstractAuthenticationProcessingFilter
-                // for redirection after successful authentication (SEC-29)
-                request.getSession().setAttribute(SAVED_REQUEST, savedRequest);
-                logger.debug("DefaultSavedRequest added to Session: " + savedRequest);
-            }
-        } else {
-            logger.debug("Request not saved as configured RequestMatcher did not match");
-        }
-    }
+			if (createSessionAllowed || request.getSession(false) != null) {
+				// Store the HTTP request itself. Used by
+				// AbstractAuthenticationProcessingFilter
+				// for redirection after successful authentication (SEC-29)
+				request.getSession().setAttribute(SAVED_REQUEST, savedRequest);
+				logger.debug("DefaultSavedRequest added to Session: " + savedRequest);
+			}
+		}
+		else {
+			logger.debug("Request not saved as configured RequestMatcher did not match");
+		}
+	}
 
-    public SavedRequest getRequest(HttpServletRequest currentRequest, HttpServletResponse response) {
-        HttpSession session = currentRequest.getSession(false);
+	public SavedRequest getRequest(HttpServletRequest currentRequest,
+			HttpServletResponse response) {
+		HttpSession session = currentRequest.getSession(false);
 
-        if (session != null) {
-            return (SavedRequest) session.getAttribute(SAVED_REQUEST);
-        }
+		if (session != null) {
+			return (SavedRequest) session.getAttribute(SAVED_REQUEST);
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    public void removeRequest(HttpServletRequest currentRequest, HttpServletResponse response) {
-        HttpSession session = currentRequest.getSession(false);
+	public void removeRequest(HttpServletRequest currentRequest,
+			HttpServletResponse response) {
+		HttpSession session = currentRequest.getSession(false);
 
-        if (session != null) {
-            logger.debug("Removing DefaultSavedRequest from session if present");
-            session.removeAttribute(SAVED_REQUEST);
-        }
-    }
+		if (session != null) {
+			logger.debug("Removing DefaultSavedRequest from session if present");
+			session.removeAttribute(SAVED_REQUEST);
+		}
+	}
 
-    public HttpServletRequest getMatchingRequest(HttpServletRequest request, HttpServletResponse response) {
-        DefaultSavedRequest saved = (DefaultSavedRequest) getRequest(request, response);
+	public HttpServletRequest getMatchingRequest(HttpServletRequest request,
+			HttpServletResponse response) {
+		DefaultSavedRequest saved = (DefaultSavedRequest) getRequest(request, response);
 
-        if (saved == null) {
-            return null;
-        }
+		if (saved == null) {
+			return null;
+		}
 
-        if (!saved.doesRequestMatch(request, portResolver)) {
-            logger.debug("saved request doesn't match");
-            return null;
-        }
+		if (!saved.doesRequestMatch(request, portResolver)) {
+			logger.debug("saved request doesn't match");
+			return null;
+		}
 
-        removeRequest(request, response);
+		removeRequest(request, response);
 
-        return new SavedRequestAwareWrapper(saved, request);
-    }
+		return new SavedRequestAwareWrapper(saved, request);
+	}
 
-    /**
-     * Allows selective use of saved requests for a subset of requests. By default any request will be cached
-     * by the {@code saveRequest} method.
-     * <p>
-     * If set, only matching requests will be cached.
-     *
-     * @param requestMatcher a request matching strategy which defines which requests should be cached.
-     */
-    public void setRequestMatcher(RequestMatcher requestMatcher) {
-        this.requestMatcher = requestMatcher;
-    }
+	/**
+	 * Allows selective use of saved requests for a subset of requests. By default any
+	 * request will be cached by the {@code saveRequest} method.
+	 * <p>
+	 * If set, only matching requests will be cached.
+	 *
+	 * @param requestMatcher a request matching strategy which defines which requests
+	 * should be cached.
+	 */
+	public void setRequestMatcher(RequestMatcher requestMatcher) {
+		this.requestMatcher = requestMatcher;
+	}
 
-    /**
-     * If <code>true</code>, indicates that it is permitted to store the target
-     * URL and exception information in a new <code>HttpSession</code> (the default).
-     * In situations where you do not wish to unnecessarily create <code>HttpSession</code>s - because the user agent
-     * will know the failed URL, such as with BASIC or Digest authentication - you may wish to set this property to
-     * <code>false</code>.
-     */
-    public void setCreateSessionAllowed(boolean createSessionAllowed) {
-        this.createSessionAllowed = createSessionAllowed;
-    }
+	/**
+	 * If <code>true</code>, indicates that it is permitted to store the target URL and
+	 * exception information in a new <code>HttpSession</code> (the default). In
+	 * situations where you do not wish to unnecessarily create <code>HttpSession</code>s
+	 * - because the user agent will know the failed URL, such as with BASIC or Digest
+	 * authentication - you may wish to set this property to <code>false</code>.
+	 */
+	public void setCreateSessionAllowed(boolean createSessionAllowed) {
+		this.createSessionAllowed = createSessionAllowed;
+	}
 
-    public void setPortResolver(PortResolver portResolver) {
-        this.portResolver = portResolver;
-    }
+	public void setPortResolver(PortResolver portResolver) {
+		this.portResolver = portResolver;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/NullRequestCache.java b/web/src/main/java/org/springframework/security/web/savedrequest/NullRequestCache.java
index 98ecd04795..9843c083d9 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/NullRequestCache.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/NullRequestCache.java
@@ -4,27 +4,29 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Null implementation of <tt>RequestCache</tt>.
- * Typically used when creation of a session is not desired.
+ * Null implementation of <tt>RequestCache</tt>. Typically used when creation of a session
+ * is not desired.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class NullRequestCache implements RequestCache {
 
-    public SavedRequest getRequest(HttpServletRequest request, HttpServletResponse response) {
-        return null;
-    }
+	public SavedRequest getRequest(HttpServletRequest request,
+			HttpServletResponse response) {
+		return null;
+	}
 
-    public void removeRequest(HttpServletRequest request, HttpServletResponse response) {
+	public void removeRequest(HttpServletRequest request, HttpServletResponse response) {
 
-    }
+	}
 
-    public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
-    }
+	public void saveRequest(HttpServletRequest request, HttpServletResponse response) {
+	}
 
-    public HttpServletRequest getMatchingRequest(HttpServletRequest request, HttpServletResponse response) {
-        return null;
-    }
+	public HttpServletRequest getMatchingRequest(HttpServletRequest request,
+			HttpServletResponse response) {
+		return null;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCache.java b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCache.java
index 378d30ca28..4415ca3c4f 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCache.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCache.java
@@ -4,46 +4,47 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Implements "saved request" logic, allowing a single request to be retrieved and restarted after redirecting to
- * an authentication mechanism.
+ * Implements "saved request" logic, allowing a single request to be retrieved and
+ * restarted after redirecting to an authentication mechanism.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface RequestCache {
 
-    /**
-     * Caches the current request for later retrieval, once authentication has taken place.
-     * Used by <tt>ExceptionTranslationFilter</tt>.
-     *
-     * @param request the request to be stored
-     */
-    void saveRequest(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Caches the current request for later retrieval, once authentication has taken
+	 * place. Used by <tt>ExceptionTranslationFilter</tt>.
+	 *
+	 * @param request the request to be stored
+	 */
+	void saveRequest(HttpServletRequest request, HttpServletResponse response);
 
-    /**
-     * Returns the saved request, leaving it cached.
-     *
-     * @param request the current request
-     * @return the saved request which was previously cached, or null if there is none.
-     */
-    SavedRequest getRequest(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Returns the saved request, leaving it cached.
+	 *
+	 * @param request the current request
+	 * @return the saved request which was previously cached, or null if there is none.
+	 */
+	SavedRequest getRequest(HttpServletRequest request, HttpServletResponse response);
 
-    /**
-     * Returns a wrapper around the saved request, if it matches the current request. The saved request should
-     * be removed from the cache.
-     *
-     * @param request
-     * @param response
-     * @return the wrapped save request, if it matches the original, or null if there is no cached request or it doesn't
-     *    match.
-     */
-    HttpServletRequest getMatchingRequest(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Returns a wrapper around the saved request, if it matches the current request. The
+	 * saved request should be removed from the cache.
+	 *
+	 * @param request
+	 * @param response
+	 * @return the wrapped save request, if it matches the original, or null if there is
+	 * no cached request or it doesn't match.
+	 */
+	HttpServletRequest getMatchingRequest(HttpServletRequest request,
+			HttpServletResponse response);
 
-    /**
-     * Removes the cached request.
-     *
-     * @param request the current request, allowing access to the cache.
-     */
-    void removeRequest(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Removes the cached request.
+	 *
+	 * @param request the current request, allowing access to the cache.
+	 */
+	void removeRequest(HttpServletRequest request, HttpServletResponse response);
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java
index 93cf6752c0..61a1b8e2bb 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilter.java
@@ -13,36 +13,40 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * Responsible for reconstituting the saved request if one is cached and it matches the current request.
+ * Responsible for reconstituting the saved request if one is cached and it matches the
+ * current request.
  * <p>
- * It will call {@link RequestCache#getMatchingRequest(HttpServletRequest, HttpServletResponse) getMatchingRequest}
- * on the configured <tt>RequestCache</tt>. If the method returns a value (a wrapper of the saved request), it will
- * pass this to the filter chain's <tt>doFilter</tt> method.
- * If null is returned by the cache, the original request is used and the filter has no effect.
+ * It will call
+ * {@link RequestCache#getMatchingRequest(HttpServletRequest, HttpServletResponse)
+ * getMatchingRequest} on the configured <tt>RequestCache</tt>. If the method returns a
+ * value (a wrapper of the saved request), it will pass this to the filter chain's
+ * <tt>doFilter</tt> method. If null is returned by the cache, the original request is
+ * used and the filter has no effect.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public class RequestCacheAwareFilter extends GenericFilterBean {
 
-    private RequestCache requestCache;
+	private RequestCache requestCache;
 
-    public RequestCacheAwareFilter() {
-        this(new HttpSessionRequestCache());
-    }
+	public RequestCacheAwareFilter() {
+		this(new HttpSessionRequestCache());
+	}
 
-    public RequestCacheAwareFilter(RequestCache requestCache) {
-        Assert.notNull(requestCache, "requestCache cannot be null");
-        this.requestCache = requestCache;
-    }
+	public RequestCacheAwareFilter(RequestCache requestCache) {
+		Assert.notNull(requestCache, "requestCache cannot be null");
+		this.requestCache = requestCache;
+	}
 
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
 
-        HttpServletRequest wrappedSavedRequest =
-            requestCache.getMatchingRequest((HttpServletRequest)request, (HttpServletResponse)response);
+		HttpServletRequest wrappedSavedRequest = requestCache.getMatchingRequest(
+				(HttpServletRequest) request, (HttpServletResponse) response);
 
-        chain.doFilter(wrappedSavedRequest == null ? request : wrappedSavedRequest, response);
-    }
+		chain.doFilter(wrappedSavedRequest == null ? request : wrappedSavedRequest,
+				response);
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java
index 61edc16fc7..a11cca7f39 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedCookie.java
@@ -9,78 +9,80 @@ import java.io.Serializable;
  * @author Ray Krueger
  */
 public class SavedCookie implements Serializable {
-    private final java.lang.String name;
-    private final java.lang.String value;
-    private final java.lang.String comment;
-    private final java.lang.String domain;
-    private final int maxAge;
-    private final java.lang.String path;
-    private final boolean secure;
-    private final int version;
+	private final java.lang.String name;
+	private final java.lang.String value;
+	private final java.lang.String comment;
+	private final java.lang.String domain;
+	private final int maxAge;
+	private final java.lang.String path;
+	private final boolean secure;
+	private final int version;
 
-    public SavedCookie(String name, String value, String comment, String domain, int maxAge, String path, boolean secure, int version) {
-        this.name = name;
-        this.value = value;
-        this.comment = comment;
-        this.domain = domain;
-        this.maxAge = maxAge;
-        this.path = path;
-        this.secure = secure;
-        this.version = version;
-    }
+	public SavedCookie(String name, String value, String comment, String domain,
+			int maxAge, String path, boolean secure, int version) {
+		this.name = name;
+		this.value = value;
+		this.comment = comment;
+		this.domain = domain;
+		this.maxAge = maxAge;
+		this.path = path;
+		this.secure = secure;
+		this.version = version;
+	}
 
-    public SavedCookie(Cookie cookie) {
-        this(cookie.getName(), cookie.getValue(), cookie.getComment(),
-                cookie.getDomain(), cookie.getMaxAge(), cookie.getPath(), cookie.getSecure(), cookie.getVersion());
-    }
+	public SavedCookie(Cookie cookie) {
+		this(cookie.getName(), cookie.getValue(), cookie.getComment(),
+				cookie.getDomain(), cookie.getMaxAge(), cookie.getPath(), cookie
+						.getSecure(), cookie.getVersion());
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    public String getComment() {
-        return comment;
-    }
+	public String getComment() {
+		return comment;
+	}
 
-    public String getDomain() {
-        return domain;
-    }
+	public String getDomain() {
+		return domain;
+	}
 
-    public int getMaxAge() {
-        return maxAge;
-    }
+	public int getMaxAge() {
+		return maxAge;
+	}
 
-    public String getPath() {
-        return path;
-    }
+	public String getPath() {
+		return path;
+	}
 
-    public boolean isSecure() {
-        return secure;
-    }
+	public boolean isSecure() {
+		return secure;
+	}
 
-    public int getVersion() {
-        return version;
-    }
+	public int getVersion() {
+		return version;
+	}
 
-    public Cookie getCookie() {
-        Cookie c = new Cookie(getName(), getValue());
+	public Cookie getCookie() {
+		Cookie c = new Cookie(getName(), getValue());
 
-        if (getComment() != null)
-            c.setComment(getComment());
+		if (getComment() != null)
+			c.setComment(getComment());
 
-        if (getDomain() != null)
-            c.setDomain(getDomain());
+		if (getDomain() != null)
+			c.setDomain(getDomain());
 
-        if (getPath() != null)
-            c.setPath(getPath());
+		if (getPath() != null)
+			c.setPath(getPath());
 
-        c.setVersion(getVersion());
-        c.setMaxAge(getMaxAge());
-        c.setSecure(isSecure());
-        return c;
-    }
+		c.setVersion(getVersion());
+		c.setMaxAge(getMaxAge());
+		c.setSecure(isSecure());
+		return c;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
index 491642cfa4..5a7589eed9 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequest.java
@@ -8,31 +8,32 @@ import java.util.Map;
 import javax.servlet.http.Cookie;
 
 /**
- * Encapsulates the functionality required of a cached request for both an authentication mechanism (typically
- * form-based login) to redirect to the original URL and for a <tt>RequestCache</tt> to build a wrapped request,
- * reproducing the original request data.
+ * Encapsulates the functionality required of a cached request for both an authentication
+ * mechanism (typically form-based login) to redirect to the original URL and for a
+ * <tt>RequestCache</tt> to build a wrapped request, reproducing the original request
+ * data.
  *
  * @author Luke Taylor
  * @since 3.0
  */
 public interface SavedRequest extends java.io.Serializable {
 
-    /**
-     * @return the URL for the saved request, allowing a redirect to be performed.
-     */
-    String getRedirectUrl();
+	/**
+	 * @return the URL for the saved request, allowing a redirect to be performed.
+	 */
+	String getRedirectUrl();
 
-    List<Cookie> getCookies();
+	List<Cookie> getCookies();
 
-    String getMethod();
+	String getMethod();
 
-    List<String> getHeaderValues(String name);
+	List<String> getHeaderValues(String name);
 
-    Collection<String> getHeaderNames();
+	Collection<String> getHeaderNames();
 
-    List<Locale> getLocales();
+	List<Locale> getLocales();
 
-    String[] getParameterValues(String name);
+	String[] getParameterValues(String name);
 
-    Map<String,String[]> getParameterMap();
+	Map<String, String[]> getParameterMap();
 }
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
index 4664c0df8e..21480decec 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
@@ -34,209 +34,221 @@ import javax.servlet.http.HttpServletRequestWrapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-
 /**
- * Provides request parameters, headers and cookies from either an original request or a saved request.
- *
- * <p>Note that not all request parameters in the original request are emulated by this wrapper.
- * Nevertheless, the important data from the original request is emulated and this should prove
- * adequate for most purposes (in particular standard HTTP GET and POST operations).</p>
+ * Provides request parameters, headers and cookies from either an original request or a
+ * saved request.
  *
  * <p>
- * Added into a request by {@link org.springframework.security.web.savedrequest.RequestCacheAwareFilter}.
+ * Note that not all request parameters in the original request are emulated by this
+ * wrapper. Nevertheless, the important data from the original request is emulated and
+ * this should prove adequate for most purposes (in particular standard HTTP GET and POST
+ * operations).
+ * </p>
+ *
+ * <p>
+ * Added into a request by
+ * {@link org.springframework.security.web.savedrequest.RequestCacheAwareFilter}.
  *
  * @author Andrey Grebnev
  * @author Ben Alex
  * @author Luke Taylor
  */
 class SavedRequestAwareWrapper extends HttpServletRequestWrapper {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    protected static final Log logger = LogFactory.getLog(SavedRequestAwareWrapper.class);
-    protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
+	protected static final Log logger = LogFactory.getLog(SavedRequestAwareWrapper.class);
+	protected static final TimeZone GMT_ZONE = TimeZone.getTimeZone("GMT");
 
-    /** The default Locale if none are specified. */
-    protected static Locale defaultLocale = Locale.getDefault();
+	/** The default Locale if none are specified. */
+	protected static Locale defaultLocale = Locale.getDefault();
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    protected SavedRequest savedRequest = null;
+	protected SavedRequest savedRequest = null;
 
-    /**
-     * The set of SimpleDateFormat formats to use in getDateHeader(). Notice that because SimpleDateFormat is
-     * not thread-safe, we can't declare formats[] as a static variable.
-     */
-    protected final SimpleDateFormat[] formats = new SimpleDateFormat[3];
+	/**
+	 * The set of SimpleDateFormat formats to use in getDateHeader(). Notice that because
+	 * SimpleDateFormat is not thread-safe, we can't declare formats[] as a static
+	 * variable.
+	 */
+	protected final SimpleDateFormat[] formats = new SimpleDateFormat[3];
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) {
-        super(request);
-        savedRequest = saved;
+	public SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) {
+		super(request);
+		savedRequest = saved;
 
-        formats[0] = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
-        formats[1] = new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US);
-        formats[2] = new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US);
+		formats[0] = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+		formats[1] = new SimpleDateFormat("EEEEEE, dd-MMM-yy HH:mm:ss zzz", Locale.US);
+		formats[2] = new SimpleDateFormat("EEE MMMM d HH:mm:ss yyyy", Locale.US);
 
-        formats[0].setTimeZone(GMT_ZONE);
-        formats[1].setTimeZone(GMT_ZONE);
-        formats[2].setTimeZone(GMT_ZONE);
-    }
+		formats[0].setTimeZone(GMT_ZONE);
+		formats[1].setTimeZone(GMT_ZONE);
+		formats[2].setTimeZone(GMT_ZONE);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Override
-    public long getDateHeader(String name) {
-        String value = getHeader(name);
+	@Override
+	public long getDateHeader(String name) {
+		String value = getHeader(name);
 
-        if (value == null) {
-            return -1L;
-        }
+		if (value == null) {
+			return -1L;
+		}
 
-        // Attempt to convert the date header in a variety of formats
-        long result = FastHttpDateFormat.parseDate(value, formats);
+		// Attempt to convert the date header in a variety of formats
+		long result = FastHttpDateFormat.parseDate(value, formats);
 
-        if (result != -1L) {
-            return result;
-        }
+		if (result != -1L) {
+			return result;
+		}
 
-        throw new IllegalArgumentException(value);
-    }
+		throw new IllegalArgumentException(value);
+	}
 
-    @Override
-    public String getHeader(String name) {
-        List<String> values = savedRequest.getHeaderValues(name);
+	@Override
+	public String getHeader(String name) {
+		List<String> values = savedRequest.getHeaderValues(name);
 
-        return values.isEmpty() ? null : values.get(0);
-    }
+		return values.isEmpty() ? null : values.get(0);
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getHeaderNames() {
-        return new Enumerator<String>(savedRequest.getHeaderNames());
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	public Enumeration getHeaderNames() {
+		return new Enumerator<String>(savedRequest.getHeaderNames());
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getHeaders(String name) {
-        return new Enumerator<String>(savedRequest.getHeaderValues(name));
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	public Enumeration getHeaders(String name) {
+		return new Enumerator<String>(savedRequest.getHeaderValues(name));
+	}
 
-    @Override
-    public int getIntHeader(String name) {
-        String value = getHeader(name);
+	@Override
+	public int getIntHeader(String name) {
+		String value = getHeader(name);
 
-        if (value == null) {
-            return -1;
-        } else {
-            return Integer.parseInt(value);
-        }
-    }
+		if (value == null) {
+			return -1;
+		}
+		else {
+			return Integer.parseInt(value);
+		}
+	}
 
-    @Override
-    public Locale getLocale() {
-        List<Locale> locales = savedRequest.getLocales();
+	@Override
+	public Locale getLocale() {
+		List<Locale> locales = savedRequest.getLocales();
 
-        return locales.isEmpty() ? Locale.getDefault() : locales.get(0);
-    }
+		return locales.isEmpty() ? Locale.getDefault() : locales.get(0);
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getLocales() {
-        List<Locale> locales = savedRequest.getLocales();
+	@Override
+	@SuppressWarnings("unchecked")
+	public Enumeration getLocales() {
+		List<Locale> locales = savedRequest.getLocales();
 
-        if (locales.isEmpty()) {
-            // Fall back to default locale
-            locales = new ArrayList<Locale>(1);
-            locales.add(Locale.getDefault());
-        }
+		if (locales.isEmpty()) {
+			// Fall back to default locale
+			locales = new ArrayList<Locale>(1);
+			locales.add(Locale.getDefault());
+		}
 
-        return new Enumerator<Locale>(locales);
-    }
+		return new Enumerator<Locale>(locales);
+	}
 
-    @Override
-    public String getMethod() {
-        return savedRequest.getMethod();
-    }
+	@Override
+	public String getMethod() {
+		return savedRequest.getMethod();
+	}
 
-    /**
-     * If the parameter is available from the wrapped request then the request has been forwarded/included to a URL
-     * with parameters, either supplementing or overriding the saved request values.
-     * <p>
-     * In this case, the value from the wrapped request should be used.
-     * <p>
-     * If the value from the wrapped request is null, an attempt will be made to retrieve the parameter
-     * from the saved request.
-     */
-    @Override
-    public String getParameter(String name) {
-        String value = super.getParameter(name);
+	/**
+	 * If the parameter is available from the wrapped request then the request has been
+	 * forwarded/included to a URL with parameters, either supplementing or overriding the
+	 * saved request values.
+	 * <p>
+	 * In this case, the value from the wrapped request should be used.
+	 * <p>
+	 * If the value from the wrapped request is null, an attempt will be made to retrieve
+	 * the parameter from the saved request.
+	 */
+	@Override
+	public String getParameter(String name) {
+		String value = super.getParameter(name);
 
-        if (value != null) {
-            return value;
-        }
+		if (value != null) {
+			return value;
+		}
 
-        String[] values = savedRequest.getParameterValues(name);
+		String[] values = savedRequest.getParameterValues(name);
 
-        if (values == null || values.length == 0) {
-            return null;
-        }
+		if (values == null || values.length == 0) {
+			return null;
+		}
 
-        return values[0];
-    }
+		return values[0];
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map getParameterMap() {
-        Set<String> names = getCombinedParameterNames();
-        Map<String, String[]> parameterMap = new HashMap<String, String[]>(names.size());
+	@Override
+	@SuppressWarnings("unchecked")
+	public Map getParameterMap() {
+		Set<String> names = getCombinedParameterNames();
+		Map<String, String[]> parameterMap = new HashMap<String, String[]>(names.size());
 
-        for (String name : names) {
-            parameterMap.put(name, getParameterValues(name));
-        }
+		for (String name : names) {
+			parameterMap.put(name, getParameterValues(name));
+		}
 
-        return parameterMap;
-    }
+		return parameterMap;
+	}
 
-    @SuppressWarnings("unchecked")
-    private Set<String> getCombinedParameterNames() {
-        Set<String> names = new HashSet<String>();
-        names.addAll(super.getParameterMap().keySet());
-        names.addAll(savedRequest.getParameterMap().keySet());
+	@SuppressWarnings("unchecked")
+	private Set<String> getCombinedParameterNames() {
+		Set<String> names = new HashSet<String>();
+		names.addAll(super.getParameterMap().keySet());
+		names.addAll(savedRequest.getParameterMap().keySet());
 
-        return names;
-    }
+		return names;
+	}
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public Enumeration getParameterNames() {
-        return new Enumerator(getCombinedParameterNames());
-    }
+	@Override
+	@SuppressWarnings("unchecked")
+	public Enumeration getParameterNames() {
+		return new Enumerator(getCombinedParameterNames());
+	}
 
-    @Override
-    public String[] getParameterValues(String name) {
-        String[] savedRequestParams = savedRequest.getParameterValues(name);
-        String[] wrappedRequestParams = super.getParameterValues(name);
+	@Override
+	public String[] getParameterValues(String name) {
+		String[] savedRequestParams = savedRequest.getParameterValues(name);
+		String[] wrappedRequestParams = super.getParameterValues(name);
 
-        if (savedRequestParams == null) {
-            return wrappedRequestParams;
-        }
+		if (savedRequestParams == null) {
+			return wrappedRequestParams;
+		}
 
-        if (wrappedRequestParams == null) {
-            return savedRequestParams;
-        }
+		if (wrappedRequestParams == null) {
+			return savedRequestParams;
+		}
 
-        // We have parameters in both saved and wrapped requests so have to merge them
-        List<String> wrappedParamsList = Arrays.asList(wrappedRequestParams);
-        List<String> combinedParams = new ArrayList<String>(wrappedParamsList);
+		// We have parameters in both saved and wrapped requests so have to merge them
+		List<String> wrappedParamsList = Arrays.asList(wrappedRequestParams);
+		List<String> combinedParams = new ArrayList<String>(wrappedParamsList);
 
-        // We want to add all parameters of the saved request *apart from* duplicates of those already added
-        for (String savedRequestParam : savedRequestParams) {
-            if (!wrappedParamsList.contains(savedRequestParam)) {
-                combinedParams.add(savedRequestParam);
-            }
-        }
+		// We want to add all parameters of the saved request *apart from* duplicates of
+		// those already added
+		for (String savedRequestParam : savedRequestParams) {
+			if (!wrappedParamsList.contains(savedRequestParam)) {
+				combinedParams.add(savedRequestParam);
+			}
+		}
 
-        return combinedParams.toArray(new String[combinedParams.size()]);
-    }
+		return combinedParams.toArray(new String[combinedParams.size()]);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java
index 367f02319c..376f31dd9e 100644
--- a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java
+++ b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java
@@ -26,52 +26,53 @@ import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.web.servlet.support.RequestDataValueProcessor;
 
 /**
- * Integration with Spring Web MVC that automatically adds the {@link CsrfToken}
- * into forms with hidden inputs when using Spring tag libraries.
+ * Integration with Spring Web MVC that automatically adds the {@link CsrfToken} into
+ * forms with hidden inputs when using Spring tag libraries.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class CsrfRequestDataValueProcessor implements RequestDataValueProcessor {
-    private Pattern DISABLE_CSRF_TOKEN_PATTERN = Pattern.compile("(?i)^(GET|HEAD|TRACE|OPTIONS)$");
+	private Pattern DISABLE_CSRF_TOKEN_PATTERN = Pattern
+			.compile("(?i)^(GET|HEAD|TRACE|OPTIONS)$");
 
-    private String DISABLE_CSRF_TOKEN_ATTR = "DISABLE_CSRF_TOKEN_ATTR";
+	private String DISABLE_CSRF_TOKEN_ATTR = "DISABLE_CSRF_TOKEN_ATTR";
 
-    public String processAction(HttpServletRequest request, String action) {
-        return action;
-    }
+	public String processAction(HttpServletRequest request, String action) {
+		return action;
+	}
 
-    public String processAction(HttpServletRequest request, String action, String method) {
-        if(method != null && DISABLE_CSRF_TOKEN_PATTERN.matcher(method).matches()) {
-            request.setAttribute(DISABLE_CSRF_TOKEN_ATTR, Boolean.TRUE);
-        } else {
-            request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR);
-        }
-        return action;
-    }
+	public String processAction(HttpServletRequest request, String action, String method) {
+		if (method != null && DISABLE_CSRF_TOKEN_PATTERN.matcher(method).matches()) {
+			request.setAttribute(DISABLE_CSRF_TOKEN_ATTR, Boolean.TRUE);
+		}
+		else {
+			request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR);
+		}
+		return action;
+	}
 
-    public String processFormFieldValue(HttpServletRequest request,
-            String name, String value, String type) {
-        return value;
-    }
+	public String processFormFieldValue(HttpServletRequest request, String name,
+			String value, String type) {
+		return value;
+	}
 
-    public Map<String, String> getExtraHiddenFields(HttpServletRequest request) {
-        if(Boolean.TRUE.equals(request.getAttribute(DISABLE_CSRF_TOKEN_ATTR))) {
-            request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR);
-            return Collections.emptyMap();
-        }
+	public Map<String, String> getExtraHiddenFields(HttpServletRequest request) {
+		if (Boolean.TRUE.equals(request.getAttribute(DISABLE_CSRF_TOKEN_ATTR))) {
+			request.removeAttribute(DISABLE_CSRF_TOKEN_ATTR);
+			return Collections.emptyMap();
+		}
 
-        CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class
-                .getName());
-        if (token == null) {
-            return Collections.emptyMap();
-        }
-        Map<String, String> hiddenFields = new HashMap<String, String>(1);
-        hiddenFields.put(token.getParameterName(), token.getToken());
-        return hiddenFields;
-    }
+		CsrfToken token = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
+		if (token == null) {
+			return Collections.emptyMap();
+		}
+		Map<String, String> hiddenFields = new HashMap<String, String>(1);
+		hiddenFields.put(token.getParameterName(), token.getToken());
+		return hiddenFields;
+	}
 
-    public String processUrl(HttpServletRequest request, String url) {
-        return url;
-    }
+	public String processUrl(HttpServletRequest request, String url) {
+		return url;
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet25RequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet25RequestFactory.java
index d10601e31e..7feb02d524 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet25RequestFactory.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet25RequestFactory.java
@@ -25,15 +25,18 @@ import org.springframework.util.Assert;
  * @see SecurityContextHolderAwareRequestWrapper
  */
 final class HttpServlet25RequestFactory implements HttpServletRequestFactory {
-    private final String rolePrefix;
-    private final AuthenticationTrustResolver trustResolver;
+	private final String rolePrefix;
+	private final AuthenticationTrustResolver trustResolver;
 
-    HttpServlet25RequestFactory(AuthenticationTrustResolver trustResolver, String rolePrefix) {
-        this.trustResolver = trustResolver;
-        this.rolePrefix = rolePrefix;
-    }
+	HttpServlet25RequestFactory(AuthenticationTrustResolver trustResolver,
+			String rolePrefix) {
+		this.trustResolver = trustResolver;
+		this.rolePrefix = rolePrefix;
+	}
 
-    public HttpServletRequest create(HttpServletRequest request, HttpServletResponse response) {
-        return new SecurityContextHolderAwareRequestWrapper(request, trustResolver, rolePrefix) ;
-    }
+	public HttpServletRequest create(HttpServletRequest request,
+			HttpServletResponse response) {
+		return new SecurityContextHolderAwareRequestWrapper(request, trustResolver,
+				rolePrefix);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java
index 4364a6fc68..634a2abfc0 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java
@@ -42,20 +42,24 @@ import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.util.Assert;
 
 /**
- * Provides integration with the Servlet 3 APIs in addition to the ones found in {@link HttpServlet25RequestFactory}.
- * The additional methods that are integrated with can be found below:
+ * Provides integration with the Servlet 3 APIs in addition to the ones found in
+ * {@link HttpServlet25RequestFactory}. The additional methods that are integrated with
+ * can be found below:
  *
  * <ul>
- * <li> {@link HttpServletRequest#authenticate(HttpServletResponse)} - Allows the user to determine if they are
- * authenticated and if not send the user to the login page. See
+ * <li> {@link HttpServletRequest#authenticate(HttpServletResponse)} - Allows the user to
+ * determine if they are authenticated and if not send the user to the login page. See
  * {@link #setAuthenticationEntryPoint(AuthenticationEntryPoint)}.</li>
- * <li> {@link HttpServletRequest#login(String, String)} - Allows the user to authenticate using the
- * {@link AuthenticationManager}. See {@link #setAuthenticationManager(AuthenticationManager)}.</li>
- * <li> {@link HttpServletRequest#logout()} - Allows the user to logout using the {@link LogoutHandler}s configured in
- * Spring Security. See {@link #setLogoutHandlers(List)}.</li>
- * <li> {@link AsyncContext#start(Runnable)} - Automatically copy the {@link SecurityContext} from the
- * {@link SecurityContextHolder} found on the Thread that invoked {@link AsyncContext#start(Runnable)} to the Thread
- * that processes the {@link Runnable}.</li>
+ * <li> {@link HttpServletRequest#login(String, String)} - Allows the user to authenticate
+ * using the {@link AuthenticationManager}. See
+ * {@link #setAuthenticationManager(AuthenticationManager)}.</li>
+ * <li> {@link HttpServletRequest#logout()} - Allows the user to logout using the
+ * {@link LogoutHandler}s configured in Spring Security. See
+ * {@link #setLogoutHandlers(List)}.</li>
+ * <li> {@link AsyncContext#start(Runnable)} - Automatically copy the
+ * {@link SecurityContext} from the {@link SecurityContextHolder} found on the Thread that
+ * invoked {@link AsyncContext#start(Runnable)} to the Thread that processes the
+ * {@link Runnable}.</li>
  * </ul>
  *
  * @author Rob Winch
@@ -66,225 +70,243 @@ import org.springframework.util.Assert;
  * @see SecurityContextAsyncContext
  */
 final class HttpServlet3RequestFactory implements HttpServletRequestFactory {
-    private Log logger = LogFactory.getLog(getClass());
+	private Log logger = LogFactory.getLog(getClass());
 
-    private final String rolePrefix;
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
-    private AuthenticationEntryPoint authenticationEntryPoint;
-    private AuthenticationManager authenticationManager;
-    private List<LogoutHandler> logoutHandlers;
+	private final String rolePrefix;
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationManager authenticationManager;
+	private List<LogoutHandler> logoutHandlers;
 
-    HttpServlet3RequestFactory(String rolePrefix) {
-        this.rolePrefix = rolePrefix;
-    }
+	HttpServlet3RequestFactory(String rolePrefix) {
+		this.rolePrefix = rolePrefix;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link AuthenticationEntryPoint} used when integrating {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically, it will be used when {@link HttpServletRequest#authenticate(HttpServletResponse)} is called and the
-     * user is not authenticated.
-     * </p>
-     * <p>
-     * If the value is null (default), then the default container behavior will be be retained when invoking
-     * {@link HttpServletRequest#authenticate(HttpServletResponse)}.
-     * </p>
-     * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use when invoking
-     * {@link HttpServletRequest#authenticate(HttpServletResponse)} if the user is not authenticated.
-     */
+	/**
+	 * <p>
+	 * Sets the {@link AuthenticationEntryPoint} used when integrating
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically, it will be used when
+	 * {@link HttpServletRequest#authenticate(HttpServletResponse)} is called and the user
+	 * is not authenticated.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), then the default container behavior will be be
+	 * retained when invoking {@link HttpServletRequest#authenticate(HttpServletResponse)}
+	 * .
+	 * </p>
+	 * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use when
+	 * invoking {@link HttpServletRequest#authenticate(HttpServletResponse)} if the user
+	 * is not authenticated.
+	 */
 
-    public void setAuthenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) {
-        this.authenticationEntryPoint = authenticationEntryPoint;
-    }
+	public void setAuthenticationEntryPoint(
+			AuthenticationEntryPoint authenticationEntryPoint) {
+		this.authenticationEntryPoint = authenticationEntryPoint;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link AuthenticationManager} used when integrating {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically, it will be used when {@link HttpServletRequest#login(String, String)} is invoked to determine if
-     * the user is authenticated.
-     * </p>
-     * <p>
-     * If the value is null (default), then the default container behavior will be retained when invoking
-     * {@link HttpServletRequest#login(String, String)}.
-     * </p>
-     *
-     * @param authenticationManager the {@link AuthenticationManager} to use when invoking
-     * {@link HttpServletRequest#login(String, String)}
-     */
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	/**
+	 * <p>
+	 * Sets the {@link AuthenticationManager} used when integrating
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically, it will be used when
+	 * {@link HttpServletRequest#login(String, String)} is invoked to determine if the
+	 * user is authenticated.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), then the default container behavior will be
+	 * retained when invoking {@link HttpServletRequest#login(String, String)}.
+	 * </p>
+	 *
+	 * @param authenticationManager the {@link AuthenticationManager} to use when invoking
+	 * {@link HttpServletRequest#login(String, String)}
+	 */
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link LogoutHandler}s used when integrating with {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically it will be used when {@link HttpServletRequest#logout()} is invoked in order to log the user out. So
-     * long as the {@link LogoutHandler}s do not commit the {@link HttpServletResponse} (expected), then the user is in
-     * charge of handling the response.
-     * </p>
-     * <p>
-     * If the value is null (default), the default container behavior will be retained when invoking
-     * {@link HttpServletRequest#logout()}.
-     * </p>
-     *
-     * @param logoutHandlers the {@link List<LogoutHandler>}s when invoking {@link HttpServletRequest#logout()}.
-     */
-    public void setLogoutHandlers(List<LogoutHandler> logoutHandlers) {
-        this.logoutHandlers = logoutHandlers;
-    }
+	/**
+	 * <p>
+	 * Sets the {@link LogoutHandler}s used when integrating with
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically it will be used when
+	 * {@link HttpServletRequest#logout()} is invoked in order to log the user out. So
+	 * long as the {@link LogoutHandler}s do not commit the {@link HttpServletResponse}
+	 * (expected), then the user is in charge of handling the response.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), the default container behavior will be retained
+	 * when invoking {@link HttpServletRequest#logout()}.
+	 * </p>
+	 *
+	 * @param logoutHandlers the {@link List<LogoutHandler>}s when invoking
+	 * {@link HttpServletRequest#logout()}.
+	 */
+	public void setLogoutHandlers(List<LogoutHandler> logoutHandlers) {
+		this.logoutHandlers = logoutHandlers;
+	}
 
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 
+	public HttpServletRequest create(HttpServletRequest request,
+			HttpServletResponse response) {
+		return new Servlet3SecurityContextHolderAwareRequestWrapper(request, rolePrefix,
+				response);
+	}
 
-    public HttpServletRequest create(HttpServletRequest request, HttpServletResponse response) {
-         return new Servlet3SecurityContextHolderAwareRequestWrapper(request, rolePrefix, response);
-    }
+	private class Servlet3SecurityContextHolderAwareRequestWrapper extends
+			SecurityContextHolderAwareRequestWrapper {
+		private final HttpServletResponse response;
 
-    private class Servlet3SecurityContextHolderAwareRequestWrapper extends SecurityContextHolderAwareRequestWrapper {
-        private final HttpServletResponse response;
+		public Servlet3SecurityContextHolderAwareRequestWrapper(
+				HttpServletRequest request, String rolePrefix,
+				HttpServletResponse response) {
+			super(request, trustResolver, rolePrefix);
+			this.response = response;
+		}
 
-        public Servlet3SecurityContextHolderAwareRequestWrapper(HttpServletRequest request, String rolePrefix, HttpServletResponse response) {
-            super(request, trustResolver, rolePrefix);
-            this.response = response;
-        }
+		public AsyncContext getAsyncContext() {
+			AsyncContext asyncContext = super.getAsyncContext();
+			return new SecurityContextAsyncContext(asyncContext);
+		}
 
-        public AsyncContext getAsyncContext() {
-            AsyncContext asyncContext = super.getAsyncContext();
-            return new SecurityContextAsyncContext(asyncContext);
-        }
+		public AsyncContext startAsync() {
+			AsyncContext startAsync = super.startAsync();
+			return new SecurityContextAsyncContext(startAsync);
+		}
 
-        public AsyncContext startAsync() {
-            AsyncContext startAsync = super.startAsync();
-            return new SecurityContextAsyncContext(startAsync);
-        }
+		public AsyncContext startAsync(ServletRequest servletRequest,
+				ServletResponse servletResponse) throws IllegalStateException {
+			AsyncContext startAsync = super.startAsync(servletRequest, servletResponse);
+			return new SecurityContextAsyncContext(startAsync);
+		}
 
-        public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
-                throws IllegalStateException {
-            AsyncContext startAsync = super.startAsync(servletRequest, servletResponse);
-            return new SecurityContextAsyncContext(startAsync);
-        }
+		public boolean authenticate(HttpServletResponse response) throws IOException,
+				ServletException {
+			AuthenticationEntryPoint entryPoint = authenticationEntryPoint;
+			if (entryPoint == null) {
+				logger.debug("authenticationEntryPoint is null, so allowing original HttpServletRequest to handle authenticate");
+				return super.authenticate(response);
+			}
+			if (isAuthenticated()) {
+				return true;
+			}
+			entryPoint.commence(this, response,
+					new AuthenticationCredentialsNotFoundException(
+							"User is not Authenticated"));
+			return false;
+		}
 
-        public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
-            AuthenticationEntryPoint entryPoint = authenticationEntryPoint;
-            if(entryPoint == null) {
-                logger.debug("authenticationEntryPoint is null, so allowing original HttpServletRequest to handle authenticate");
-                return super.authenticate(response);
-            }
-            if(isAuthenticated()) {
-                return true;
-            }
-            entryPoint.commence(this, response, new AuthenticationCredentialsNotFoundException("User is not Authenticated"));
-            return false;
-        }
+		public void login(String username, String password) throws ServletException {
+			if (isAuthenticated()) {
+				throw new ServletException("Cannot perform login for '" + username
+						+ "' already authenticated as '" + getRemoteUser() + "'");
+			}
+			AuthenticationManager authManager = authenticationManager;
+			if (authManager == null) {
+				logger.debug("authenticationManager is null, so allowing original HttpServletRequest to handle login");
+				super.login(username, password);
+				return;
+			}
+			Authentication authentication;
+			try {
+				authentication = authManager
+						.authenticate(new UsernamePasswordAuthenticationToken(username,
+								password));
+			}
+			catch (AuthenticationException loginFailed) {
+				SecurityContextHolder.clearContext();
+				throw new ServletException(loginFailed.getMessage(), loginFailed);
+			}
+			SecurityContextHolder.getContext().setAuthentication(authentication);
+		}
 
-        public void login(String username, String password) throws ServletException {
-            if(isAuthenticated()) {
-                throw new ServletException("Cannot perform login for '"
-                        + username + "' already authenticated as '"
-                        + getRemoteUser() + "'");
-            }
-            AuthenticationManager authManager = authenticationManager;
-            if(authManager == null) {
-                logger.debug("authenticationManager is null, so allowing original HttpServletRequest to handle login");
-                super.login(username, password);
-                return;
-            }
-            Authentication authentication;
-            try {
-                authentication = authManager.authenticate(new UsernamePasswordAuthenticationToken(username,password));
-            } catch(AuthenticationException loginFailed) {
-                SecurityContextHolder.clearContext();
-                throw new ServletException(loginFailed.getMessage(), loginFailed);
-            }
-            SecurityContextHolder.getContext().setAuthentication(authentication);
-        }
+		public void logout() throws ServletException {
+			List<LogoutHandler> handlers = logoutHandlers;
+			if (handlers == null) {
+				logger.debug("logoutHandlers is null, so allowing original HttpServletRequest to handle logout");
+				super.logout();
+				return;
+			}
+			Authentication authentication = SecurityContextHolder.getContext()
+					.getAuthentication();
+			for (LogoutHandler logoutHandler : handlers) {
+				logoutHandler.logout(this, response, authentication);
+			}
+		}
 
-        public void logout() throws ServletException {
-            List<LogoutHandler> handlers = logoutHandlers;
-            if(handlers == null) {
-                logger.debug("logoutHandlers is null, so allowing original HttpServletRequest to handle logout");
-                super.logout();
-                return;
-            }
-            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-            for(LogoutHandler logoutHandler : handlers) {
-                logoutHandler.logout(this, response, authentication);
-            }
-        }
+		private boolean isAuthenticated() {
+			Principal userPrincipal = getUserPrincipal();
+			return userPrincipal != null;
+		}
+	}
 
-        private boolean isAuthenticated() {
-            Principal userPrincipal = getUserPrincipal();
-            return userPrincipal != null;
-        }
-    }
+	private static class SecurityContextAsyncContext implements AsyncContext {
+		private final AsyncContext asyncContext;
 
-    private static class SecurityContextAsyncContext implements AsyncContext {
-        private final AsyncContext asyncContext;
+		public SecurityContextAsyncContext(AsyncContext asyncContext) {
+			this.asyncContext = asyncContext;
+		}
 
-        public SecurityContextAsyncContext(AsyncContext asyncContext) {
-            this.asyncContext = asyncContext;
-        }
+		public ServletRequest getRequest() {
+			return asyncContext.getRequest();
+		}
 
-        public ServletRequest getRequest() {
-            return asyncContext.getRequest();
-        }
+		public ServletResponse getResponse() {
+			return asyncContext.getResponse();
+		}
 
-        public ServletResponse getResponse() {
-            return asyncContext.getResponse();
-        }
+		public boolean hasOriginalRequestAndResponse() {
+			return asyncContext.hasOriginalRequestAndResponse();
+		}
 
-        public boolean hasOriginalRequestAndResponse() {
-            return asyncContext.hasOriginalRequestAndResponse();
-        }
+		public void dispatch() {
+			asyncContext.dispatch();
+		}
 
-        public void dispatch() {
-            asyncContext.dispatch();
-        }
+		public void dispatch(String path) {
+			asyncContext.dispatch(path);
+		}
 
-        public void dispatch(String path) {
-            asyncContext.dispatch(path);
-        }
+		public void dispatch(ServletContext context, String path) {
+			asyncContext.dispatch(context, path);
+		}
 
-        public void dispatch(ServletContext context, String path) {
-            asyncContext.dispatch(context, path);
-        }
+		public void complete() {
+			asyncContext.complete();
+		}
 
-        public void complete() {
-            asyncContext.complete();
-        }
+		public void start(Runnable run) {
+			asyncContext.start(new DelegatingSecurityContextRunnable(run));
+		}
 
-        public void start(Runnable run) {
-            asyncContext.start(new DelegatingSecurityContextRunnable(run));
-        }
+		public void addListener(AsyncListener listener) {
+			asyncContext.addListener(listener);
+		}
 
-        public void addListener(AsyncListener listener) {
-            asyncContext.addListener(listener);
-        }
+		public void addListener(AsyncListener listener, ServletRequest request,
+				ServletResponse response) {
+			asyncContext.addListener(listener, request, response);
+		}
 
-        public void addListener(AsyncListener listener, ServletRequest request, ServletResponse response) {
-            asyncContext.addListener(listener, request, response);
-        }
+		public <T extends AsyncListener> T createListener(Class<T> clazz)
+				throws ServletException {
+			return asyncContext.createListener(clazz);
+		}
 
-        public <T extends AsyncListener> T createListener(Class<T> clazz) throws ServletException {
-            return asyncContext.createListener(clazz);
-        }
+		public long getTimeout() {
+			return asyncContext.getTimeout();
+		}
 
-        public long getTimeout() {
-            return asyncContext.getTimeout();
-        }
-
-        public void setTimeout(long timeout) {
-            asyncContext.setTimeout(timeout);
-        }
-    }
+		public void setTimeout(long timeout) {
+			asyncContext.setTimeout(timeout);
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java
index ef4a7f5f0f..d7a698482b 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java
@@ -16,8 +16,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * Internal interface for creating a {@link HttpServletRequest}. This allows for creating a different implementation for
- * Servlet 2.5 and Servlet 3.0 environments.
+ * Internal interface for creating a {@link HttpServletRequest}. This allows for creating
+ * a different implementation for Servlet 2.5 and Servlet 3.0 environments.
  *
  * @author Rob Winch
  * @since 3.2
@@ -26,12 +26,13 @@ import javax.servlet.http.HttpServletResponse;
  */
 interface HttpServletRequestFactory {
 
-    /**
-     * Given a {@link HttpServletRequest} returns a {@link HttpServletRequest} that in most cases wraps the original
-     * {@link HttpServletRequest}.
-     * @param request the original {@link HttpServletRequest}. Cannot be null.
-     * @param response the original {@link HttpServletResponse}. Cannot be null.
-     * @return a non-null HttpServletRequest
-     */
-    public HttpServletRequest create(HttpServletRequest request, HttpServletResponse response);
+	/**
+	 * Given a {@link HttpServletRequest} returns a {@link HttpServletRequest} that in
+	 * most cases wraps the original {@link HttpServletRequest}.
+	 * @param request the original {@link HttpServletRequest}. Cannot be null.
+	 * @param response the original {@link HttpServletResponse}. Cannot be null.
+	 * @return a non-null HttpServletRequest
+	 */
+	public HttpServletRequest create(HttpServletRequest request,
+			HttpServletResponse response);
 }
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
index 53f0fc7f84..722f5251d3 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
@@ -38,27 +38,32 @@ import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
- * A <code>Filter</code> which populates the <code>ServletRequest</code> with a request wrapper
- * which implements the servlet API security methods.
+ * A <code>Filter</code> which populates the <code>ServletRequest</code> with a request
+ * wrapper which implements the servlet API security methods.
  * <p>
- * In pre servlet 3 environment the wrapper class used is {@link SecurityContextHolderAwareRequestWrapper}. See its javadoc for the methods that are implemented.
+ * In pre servlet 3 environment the wrapper class used is
+ * {@link SecurityContextHolderAwareRequestWrapper}. See its javadoc for the methods that
+ * are implemented.
  * </p>
  * <p>
- * In a servlet 3 environment {@link SecurityContextHolderAwareRequestWrapper} is extended to provide the following additional methods:
+ * In a servlet 3 environment {@link SecurityContextHolderAwareRequestWrapper} is extended
+ * to provide the following additional methods:
  * </p>
  * <ul>
- * <li> {@link HttpServletRequest#authenticate(HttpServletResponse)} - Allows the user to determine if they are
- * authenticated and if not send the user to the login page. See
+ * <li> {@link HttpServletRequest#authenticate(HttpServletResponse)} - Allows the user to
+ * determine if they are authenticated and if not send the user to the login page. See
  * {@link #setAuthenticationEntryPoint(AuthenticationEntryPoint)}.</li>
- * <li> {@link HttpServletRequest#login(String, String)} - Allows the user to authenticate using the
- * {@link AuthenticationManager}. See {@link #setAuthenticationManager(AuthenticationManager)}.</li>
- * <li> {@link HttpServletRequest#logout()} - Allows the user to logout using the {@link LogoutHandler}s configured in
- * Spring Security. See {@link #setLogoutHandlers(List)}.</li>
- * <li> {@link AsyncContext#start(Runnable)} - Automatically copy the {@link SecurityContext} from the
- * {@link SecurityContextHolder} found on the Thread that invoked {@link AsyncContext#start(Runnable)} to the Thread
- * that processes the {@link Runnable}.</li>
+ * <li> {@link HttpServletRequest#login(String, String)} - Allows the user to authenticate
+ * using the {@link AuthenticationManager}. See
+ * {@link #setAuthenticationManager(AuthenticationManager)}.</li>
+ * <li> {@link HttpServletRequest#logout()} - Allows the user to logout using the
+ * {@link LogoutHandler}s configured in Spring Security. See
+ * {@link #setLogoutHandlers(List)}.</li>
+ * <li> {@link AsyncContext#start(Runnable)} - Automatically copy the
+ * {@link SecurityContext} from the {@link SecurityContextHolder} found on the Thread that
+ * invoked {@link AsyncContext#start(Runnable)} to the Thread that processes the
+ * {@link Runnable}.</li>
  * </ul>
  *
  *
@@ -68,126 +73,135 @@ import org.springframework.web.filter.GenericFilterBean;
  * @author Rob Winch
  */
 public class SecurityContextHolderAwareRequestFilter extends GenericFilterBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private String rolePrefix;
+	private String rolePrefix;
 
-    private HttpServletRequestFactory requestFactory;
+	private HttpServletRequestFactory requestFactory;
 
-    private AuthenticationEntryPoint authenticationEntryPoint;
+	private AuthenticationEntryPoint authenticationEntryPoint;
 
-    private AuthenticationManager authenticationManager;
+	private AuthenticationManager authenticationManager;
 
-    private List<LogoutHandler> logoutHandlers;
+	private List<LogoutHandler> logoutHandlers;
 
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void setRolePrefix(String rolePrefix) {
-        Assert.notNull(rolePrefix, "Role prefix must not be null");
-        this.rolePrefix = rolePrefix;
-    }
+	public void setRolePrefix(String rolePrefix) {
+		Assert.notNull(rolePrefix, "Role prefix must not be null");
+		this.rolePrefix = rolePrefix;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link AuthenticationEntryPoint} used when integrating {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically, it will be used when {@link HttpServletRequest#authenticate(HttpServletResponse)} is called and the
-     * user is not authenticated.
-     * </p>
-     * <p>
-     * If the value is null (default), then the default container behavior will be be retained when invoking
-     * {@link HttpServletRequest#authenticate(HttpServletResponse)}.
-     * </p>
-     *
-     * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use when invoking
-     * {@link HttpServletRequest#authenticate(HttpServletResponse)} if the user is not authenticated.
-     *
-     * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
-     */
-    public void setAuthenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) {
-        this.authenticationEntryPoint = authenticationEntryPoint;
-    }
+	/**
+	 * <p>
+	 * Sets the {@link AuthenticationEntryPoint} used when integrating
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically, it will be used when
+	 * {@link HttpServletRequest#authenticate(HttpServletResponse)} is called and the user
+	 * is not authenticated.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), then the default container behavior will be be
+	 * retained when invoking {@link HttpServletRequest#authenticate(HttpServletResponse)}
+	 * .
+	 * </p>
+	 *
+	 * @param authenticationEntryPoint the {@link AuthenticationEntryPoint} to use when
+	 * invoking {@link HttpServletRequest#authenticate(HttpServletResponse)} if the user
+	 * is not authenticated.
+	 *
+	 * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
+	 */
+	public void setAuthenticationEntryPoint(
+			AuthenticationEntryPoint authenticationEntryPoint) {
+		this.authenticationEntryPoint = authenticationEntryPoint;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link AuthenticationManager} used when integrating {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically, it will be used when {@link HttpServletRequest#login(String, String)} is invoked to determine if
-     * the user is authenticated.
-     * </p>
-     * <p>
-     * If the value is null (default), then the default container behavior will be retained when invoking
-     * {@link HttpServletRequest#login(String, String)}.
-     * </p>
-     *
-     * @param authenticationManager the {@link AuthenticationManager} to use when invoking
-     * {@link HttpServletRequest#login(String, String)}
-     *
-     * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
-     */
-    public void setAuthenticationManager(AuthenticationManager authenticationManager) {
-        this.authenticationManager = authenticationManager;
-    }
+	/**
+	 * <p>
+	 * Sets the {@link AuthenticationManager} used when integrating
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically, it will be used when
+	 * {@link HttpServletRequest#login(String, String)} is invoked to determine if the
+	 * user is authenticated.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), then the default container behavior will be
+	 * retained when invoking {@link HttpServletRequest#login(String, String)}.
+	 * </p>
+	 *
+	 * @param authenticationManager the {@link AuthenticationManager} to use when invoking
+	 * {@link HttpServletRequest#login(String, String)}
+	 *
+	 * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
+	 */
+	public void setAuthenticationManager(AuthenticationManager authenticationManager) {
+		this.authenticationManager = authenticationManager;
+	}
 
-    /**
-     * <p>
-     * Sets the {@link LogoutHandler}s used when integrating with {@link HttpServletRequest} with Servlet 3 APIs.
-     * Specifically it will be used when {@link HttpServletRequest#logout()} is invoked in order to log the user out. So
-     * long as the {@link LogoutHandler}s do not commit the {@link HttpServletResponse} (expected), then the user is in
-     * charge of handling the response.
-     * </p>
-     * <p>
-     * If the value is null (default), the default container behavior will be retained when invoking
-     * {@link HttpServletRequest#logout()}.
-     * </p>
-     *
-     * @param logoutHandlers the {@link List<LogoutHandler>}s when invoking {@link HttpServletRequest#logout()}.
-     *
-     * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
-     */
-    public void setLogoutHandlers(List<LogoutHandler> logoutHandlers) {
-        this.logoutHandlers = logoutHandlers;
-    }
+	/**
+	 * <p>
+	 * Sets the {@link LogoutHandler}s used when integrating with
+	 * {@link HttpServletRequest} with Servlet 3 APIs. Specifically it will be used when
+	 * {@link HttpServletRequest#logout()} is invoked in order to log the user out. So
+	 * long as the {@link LogoutHandler}s do not commit the {@link HttpServletResponse}
+	 * (expected), then the user is in charge of handling the response.
+	 * </p>
+	 * <p>
+	 * If the value is null (default), the default container behavior will be retained
+	 * when invoking {@link HttpServletRequest#logout()}.
+	 * </p>
+	 *
+	 * @param logoutHandlers the {@link List<LogoutHandler>}s when invoking
+	 * {@link HttpServletRequest#logout()}.
+	 *
+	 * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
+	 */
+	public void setLogoutHandlers(List<LogoutHandler> logoutHandlers) {
+		this.logoutHandlers = logoutHandlers;
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        chain.doFilter(requestFactory.create((HttpServletRequest)req, (HttpServletResponse) res), res);
-    }
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		chain.doFilter(requestFactory.create((HttpServletRequest) req,
+				(HttpServletResponse) res), res);
+	}
 
-    @Override
-    public void afterPropertiesSet() throws ServletException {
-        super.afterPropertiesSet();
-        requestFactory = isServlet3() ? createServlet3Factory(rolePrefix) : new HttpServlet25RequestFactory(trustResolver, rolePrefix);
-    }
+	@Override
+	public void afterPropertiesSet() throws ServletException {
+		super.afterPropertiesSet();
+		requestFactory = isServlet3() ? createServlet3Factory(rolePrefix)
+				: new HttpServlet25RequestFactory(trustResolver, rolePrefix);
+	}
 
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 
+	private HttpServletRequestFactory createServlet3Factory(String rolePrefix) {
+		HttpServlet3RequestFactory factory = new HttpServlet3RequestFactory(rolePrefix);
+		factory.setTrustResolver(trustResolver);
+		factory.setAuthenticationEntryPoint(authenticationEntryPoint);
+		factory.setAuthenticationManager(authenticationManager);
+		factory.setLogoutHandlers(logoutHandlers);
+		return factory;
+	}
 
-    private HttpServletRequestFactory createServlet3Factory(String rolePrefix) {
-        HttpServlet3RequestFactory factory = new HttpServlet3RequestFactory(rolePrefix);
-        factory.setTrustResolver(trustResolver);
-        factory.setAuthenticationEntryPoint(authenticationEntryPoint);
-        factory.setAuthenticationManager(authenticationManager);
-        factory.setLogoutHandlers(logoutHandlers);
-        return factory;
-    }
-
-    /**
-     * Returns true if the Servlet 3 APIs are detected.
-     * @return
-     */
-    private boolean isServlet3() {
-        return ClassUtils.hasMethod(ServletRequest.class, "startAsync");
-    }
+	/**
+	 * Returns true if the Servlet 3 APIs are detected.
+	 * @return
+	 */
+	private boolean isServlet3() {
+		return ClassUtils.hasMethod(ServletRequest.class, "startAsync");
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
index 3f8445cf88..dbe3b5c004 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapper.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.servletapi;
 
-
 import java.security.Principal;
 import java.util.Collection;
 
@@ -30,11 +29,10 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.util.Assert;
 
-
 /**
  * A Spring Security-aware <code>HttpServletRequestWrapper</code>, which uses the
- * <code>SecurityContext</code>-defined <code>Authentication</code> object to implement the servlet API security
- * methods:
+ * <code>SecurityContext</code>-defined <code>Authentication</code> object to implement
+ * the servlet API security methods:
  *
  * <ul>
  * <li>{@link #getUserPrincipal()}</li>
@@ -50,145 +48,152 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  */
 public class SecurityContextHolderAwareRequestWrapper extends HttpServletRequestWrapper {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final AuthenticationTrustResolver trustResolver;
+	private final AuthenticationTrustResolver trustResolver;
 
-    /**
-     * The prefix passed by the filter. It will be prepended to any supplied role values before
-     * comparing it with the roles obtained from the security context.
-     */
-    private final String rolePrefix;
+	/**
+	 * The prefix passed by the filter. It will be prepended to any supplied role values
+	 * before comparing it with the roles obtained from the security context.
+	 */
+	private final String rolePrefix;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    /**
-     * Creates a new instance with {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param request
-     * @param rolePrefix
-     */
-    public SecurityContextHolderAwareRequestWrapper(HttpServletRequest request, String rolePrefix) {
-        this(request, new AuthenticationTrustResolverImpl(), rolePrefix);
-    }
+	/**
+	 * Creates a new instance with {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param request
+	 * @param rolePrefix
+	 */
+	public SecurityContextHolderAwareRequestWrapper(HttpServletRequest request,
+			String rolePrefix) {
+		this(request, new AuthenticationTrustResolverImpl(), rolePrefix);
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param request the original {@link HttpServletRequest}
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     * @param rolePrefix The prefix to be added to {@link #isUserInRole(String)} or null if no prefix.
-     */
-    public SecurityContextHolderAwareRequestWrapper(HttpServletRequest request, AuthenticationTrustResolver trustResolver, String rolePrefix) {
-        super(request);
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.rolePrefix = rolePrefix;
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param request the original {@link HttpServletRequest}
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 * @param rolePrefix The prefix to be added to {@link #isUserInRole(String)} or null
+	 * if no prefix.
+	 */
+	public SecurityContextHolderAwareRequestWrapper(HttpServletRequest request,
+			AuthenticationTrustResolver trustResolver, String rolePrefix) {
+		super(request);
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.rolePrefix = rolePrefix;
+		this.trustResolver = trustResolver;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Obtain the current active <code>Authentication</code>
-     *
-     * @return the authentication object or <code>null</code>
-     */
-    private Authentication getAuthentication() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+	/**
+	 * Obtain the current active <code>Authentication</code>
+	 *
+	 * @return the authentication object or <code>null</code>
+	 */
+	private Authentication getAuthentication() {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        if (!trustResolver.isAnonymous(auth)) {
-            return auth;
-        }
+		if (!trustResolver.isAnonymous(auth)) {
+			return auth;
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Returns the principal's name, as obtained from the <code>SecurityContextHolder</code>. Properly handles
-     * both <code>String</code>-based and <code>UserDetails</code>-based principals.
-     *
-     * @return the username or <code>null</code> if unavailable
-     */
-    @Override
-    public String getRemoteUser() {
-        Authentication auth = getAuthentication();
+	/**
+	 * Returns the principal's name, as obtained from the
+	 * <code>SecurityContextHolder</code>. Properly handles both <code>String</code>-based
+	 * and <code>UserDetails</code>-based principals.
+	 *
+	 * @return the username or <code>null</code> if unavailable
+	 */
+	@Override
+	public String getRemoteUser() {
+		Authentication auth = getAuthentication();
 
-        if ((auth == null) || (auth.getPrincipal() == null)) {
-            return null;
-        }
+		if ((auth == null) || (auth.getPrincipal() == null)) {
+			return null;
+		}
 
-        if (auth.getPrincipal() instanceof UserDetails) {
-            return ((UserDetails) auth.getPrincipal()).getUsername();
-        }
+		if (auth.getPrincipal() instanceof UserDetails) {
+			return ((UserDetails) auth.getPrincipal()).getUsername();
+		}
 
-        return auth.getPrincipal().toString();
-    }
+		return auth.getPrincipal().toString();
+	}
 
-    /**
-     * Returns the <code>Authentication</code> (which is a subclass of <code>Principal</code>), or
-     * <code>null</code> if unavailable.
-     *
-     * @return the <code>Authentication</code>, or <code>null</code>
-     */
-    @Override
-    public Principal getUserPrincipal() {
-        Authentication auth = getAuthentication();
+	/**
+	 * Returns the <code>Authentication</code> (which is a subclass of
+	 * <code>Principal</code>), or <code>null</code> if unavailable.
+	 *
+	 * @return the <code>Authentication</code>, or <code>null</code>
+	 */
+	@Override
+	public Principal getUserPrincipal() {
+		Authentication auth = getAuthentication();
 
-        if ((auth == null) || (auth.getPrincipal() == null)) {
-            return null;
-        }
+		if ((auth == null) || (auth.getPrincipal() == null)) {
+			return null;
+		}
 
-        return auth;
-    }
+		return auth;
+	}
 
-    private boolean isGranted(String role) {
-        Authentication auth = getAuthentication();
+	private boolean isGranted(String role) {
+		Authentication auth = getAuthentication();
 
-        if( rolePrefix != null ) {
-            role = rolePrefix + role;
-        }
+		if (rolePrefix != null) {
+			role = rolePrefix + role;
+		}
 
-        if ((auth == null) || (auth.getPrincipal() == null)) {
-            return false;
-        }
+		if ((auth == null) || (auth.getPrincipal() == null)) {
+			return false;
+		}
 
-        Collection<? extends GrantedAuthority> authorities = auth.getAuthorities();
+		Collection<? extends GrantedAuthority> authorities = auth.getAuthorities();
 
-        if (authorities == null) {
-            return false;
-        }
+		if (authorities == null) {
+			return false;
+		}
 
+		for (GrantedAuthority grantedAuthority : authorities) {
+			if (role.equals(grantedAuthority.getAuthority())) {
+				return true;
+			}
+		}
 
-        for (GrantedAuthority grantedAuthority : authorities) {
-            if (role.equals(grantedAuthority.getAuthority())) {
-                return true;
-            }
-        }
+		return false;
+	}
 
-        return false;
-    }
+	/**
+	 * Simple searches for an exactly matching
+	 * {@link org.springframework.security.core.GrantedAuthority#getAuthority()}.
+	 * <p>
+	 * Will always return <code>false</code> if the <code>SecurityContextHolder</code>
+	 * contains an <code>Authentication</code> with <code>null</code>
+	 * <code>principal</code> and/or <code>GrantedAuthority[]</code> objects.
+	 *
+	 * @param role the <code>GrantedAuthority</code><code>String</code> representation to
+	 * check for
+	 *
+	 * @return <code>true</code> if an <b>exact</b> (case sensitive) matching granted
+	 * authority is located, <code>false</code> otherwise
+	 */
+	@Override
+	public boolean isUserInRole(String role) {
+		return isGranted(role);
+	}
 
-    /**
-     * Simple searches for an exactly matching {@link org.springframework.security.core.GrantedAuthority#getAuthority()}.
-     * <p>
-     * Will always return <code>false</code> if the <code>SecurityContextHolder</code> contains an
-     * <code>Authentication</code> with <code>null</code><code>principal</code> and/or <code>GrantedAuthority[]</code>
-     * objects.
-     *
-     * @param role the <code>GrantedAuthority</code><code>String</code> representation to check for
-     *
-     * @return <code>true</code> if an <b>exact</b> (case sensitive) matching granted authority is located,
-     *         <code>false</code> otherwise
-     */
-    @Override
-    public boolean isUserInRole(String role) {
-        return isGranted(role);
-    }
-
-    @Override
-    public String toString() {
-        return "SecurityContextHolderAwareRequestWrapper[ " + getRequest() + "]";
-    }
+	@Override
+	public String toString() {
+		return "SecurityContextHolderAwareRequestWrapper[ " + getRequest() + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java
index 8a672f1e91..1642fbaf55 100644
--- a/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java
+++ b/web/src/main/java/org/springframework/security/web/session/ConcurrentSessionFilter.java
@@ -37,109 +37,121 @@ import org.springframework.security.web.util.UrlUtils;
 import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
-
 /**
  * Filter required by concurrent session handling package.
  * <p>
  * This filter performs two functions. First, it calls
- * {@link org.springframework.security.core.session.SessionRegistry#refreshLastRequest(String)} for each request
- * so that registered sessions always have a correct "last update" date/time. Second, it retrieves a
- * {@link org.springframework.security.core.session.SessionInformation} from the <code>SessionRegistry</code>
- * for each request and checks if the session has been marked as expired.
- * If it has been marked as expired, the configured logout handlers will be called (as happens with
- * {@link org.springframework.security.web.authentication.logout.LogoutFilter}), typically to invalidate the session.
- * A redirect to the expiredURL specified will be performed, and the session invalidation will cause an
- * {@link org.springframework.security.web.session.HttpSessionDestroyedEvent} to be published via the
- * {@link org.springframework.security.web.session.HttpSessionEventPublisher} registered in <code>web.xml</code>.</p>
+ * {@link org.springframework.security.core.session.SessionRegistry#refreshLastRequest(String)}
+ * for each request so that registered sessions always have a correct "last update"
+ * date/time. Second, it retrieves a
+ * {@link org.springframework.security.core.session.SessionInformation} from the
+ * <code>SessionRegistry</code> for each request and checks if the session has been marked
+ * as expired. If it has been marked as expired, the configured logout handlers will be
+ * called (as happens with
+ * {@link org.springframework.security.web.authentication.logout.LogoutFilter}), typically
+ * to invalidate the session. A redirect to the expiredURL specified will be performed,
+ * and the session invalidation will cause an
+ * {@link org.springframework.security.web.session.HttpSessionDestroyedEvent} to be
+ * published via the
+ * {@link org.springframework.security.web.session.HttpSessionEventPublisher} registered
+ * in <code>web.xml</code>.
+ * </p>
  *
  * @author Ben Alex
  */
 public class ConcurrentSessionFilter extends GenericFilterBean {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private SessionRegistry sessionRegistry;
-    private String expiredUrl;
-    private LogoutHandler[] handlers = new LogoutHandler[] {new SecurityContextLogoutHandler()};
-    private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private SessionRegistry sessionRegistry;
+	private String expiredUrl;
+	private LogoutHandler[] handlers = new LogoutHandler[] { new SecurityContextLogoutHandler() };
+	private RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public ConcurrentSessionFilter(SessionRegistry sessionRegistry) {
-        Assert.notNull(sessionRegistry, "SessionRegistry required");
-        this.sessionRegistry = sessionRegistry;
-    }
+	public ConcurrentSessionFilter(SessionRegistry sessionRegistry) {
+		Assert.notNull(sessionRegistry, "SessionRegistry required");
+		this.sessionRegistry = sessionRegistry;
+	}
 
-    public ConcurrentSessionFilter(SessionRegistry sessionRegistry, String expiredUrl) {
-        Assert.notNull(sessionRegistry, "SessionRegistry required");
-        Assert.isTrue(expiredUrl == null || UrlUtils.isValidRedirectUrl(expiredUrl),
-                expiredUrl + " isn't a valid redirect URL");
-        this.sessionRegistry = sessionRegistry;
-        this.expiredUrl = expiredUrl;
-    }
+	public ConcurrentSessionFilter(SessionRegistry sessionRegistry, String expiredUrl) {
+		Assert.notNull(sessionRegistry, "SessionRegistry required");
+		Assert.isTrue(expiredUrl == null || UrlUtils.isValidRedirectUrl(expiredUrl),
+				expiredUrl + " isn't a valid redirect URL");
+		this.sessionRegistry = sessionRegistry;
+		this.expiredUrl = expiredUrl;
+	}
 
-    @Override
-    public void afterPropertiesSet() {
-        Assert.notNull(sessionRegistry, "SessionRegistry required");
-        Assert.isTrue(expiredUrl == null || UrlUtils.isValidRedirectUrl(expiredUrl),
-                expiredUrl + " isn't a valid redirect URL");
-    }
+	@Override
+	public void afterPropertiesSet() {
+		Assert.notNull(sessionRegistry, "SessionRegistry required");
+		Assert.isTrue(expiredUrl == null || UrlUtils.isValidRedirectUrl(expiredUrl),
+				expiredUrl + " isn't a valid redirect URL");
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        HttpSession session = request.getSession(false);
+		HttpSession session = request.getSession(false);
 
-        if (session != null) {
-            SessionInformation info = sessionRegistry.getSessionInformation(session.getId());
+		if (session != null) {
+			SessionInformation info = sessionRegistry.getSessionInformation(session
+					.getId());
 
-            if (info != null) {
-                if (info.isExpired()) {
-                    // Expired - abort processing
-                    doLogout(request, response);
+			if (info != null) {
+				if (info.isExpired()) {
+					// Expired - abort processing
+					doLogout(request, response);
 
-                    String targetUrl = determineExpiredUrl(request, info);
+					String targetUrl = determineExpiredUrl(request, info);
 
-                    if (targetUrl != null) {
-                        redirectStrategy.sendRedirect(request, response, targetUrl);
+					if (targetUrl != null) {
+						redirectStrategy.sendRedirect(request, response, targetUrl);
 
-                        return;
-                    } else {
-                        response.getWriter().print("This session has been expired (possibly due to multiple concurrent " +
-                                "logins being attempted as the same user).");
-                        response.flushBuffer();
-                    }
+						return;
+					}
+					else {
+						response.getWriter().print(
+								"This session has been expired (possibly due to multiple concurrent "
+										+ "logins being attempted as the same user).");
+						response.flushBuffer();
+					}
 
-                    return;
-                } else {
-                    // Non-expired - update last request date/time
-                    sessionRegistry.refreshLastRequest(info.getSessionId());
-                }
-            }
-        }
+					return;
+				}
+				else {
+					// Non-expired - update last request date/time
+					sessionRegistry.refreshLastRequest(info.getSessionId());
+				}
+			}
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    protected String determineExpiredUrl(HttpServletRequest request, SessionInformation info) {
-        return expiredUrl;
-    }
+	protected String determineExpiredUrl(HttpServletRequest request,
+			SessionInformation info) {
+		return expiredUrl;
+	}
 
-    private void doLogout(HttpServletRequest request, HttpServletResponse response) {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+	private void doLogout(HttpServletRequest request, HttpServletResponse response) {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
 
-        for (LogoutHandler handler : handlers) {
-            handler.logout(request, response, auth);
-        }
-    }
+		for (LogoutHandler handler : handlers) {
+			handler.logout(request, response, auth);
+		}
+	}
 
-    public void setLogoutHandlers(LogoutHandler[] handlers) {
-        Assert.notNull(handlers);
-        this.handlers = handlers;
-    }
+	public void setLogoutHandlers(LogoutHandler[] handlers) {
+		Assert.notNull(handlers);
+		this.handlers = handlers;
+	}
 
-    public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
-        this.redirectStrategy = redirectStrategy;
-    }
+	public void setRedirectStrategy(RedirectStrategy redirectStrategy) {
+		this.redirectStrategy = redirectStrategy;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java
index bc1cc71fc1..7b80aade1d 100644
--- a/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java
+++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionCreatedEvent.java
@@ -20,19 +20,21 @@ import javax.servlet.http.HttpSession;
 import org.springframework.security.core.session.SessionCreationEvent;
 
 /**
- * Published by the {@link HttpSessionEventPublisher} when an {@code HttpSession} is created by the container
+ * Published by the {@link HttpSessionEventPublisher} when an {@code HttpSession} is
+ * created by the container
  *
  * @author Ray Krueger
  * @author Luke Taylor
  */
 public class HttpSessionCreatedEvent extends SessionCreationEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public HttpSessionCreatedEvent(HttpSession session) {
-        super(session);
-    }
+	public HttpSessionCreatedEvent(HttpSession session) {
+		super(session);
+	}
 
-    public HttpSession getSession() {
-        return (HttpSession) getSource();
-    }
+	public HttpSession getSession() {
+		return (HttpSession) getSource();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java
index e28c3dd1e1..bc6593ac68 100644
--- a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java
+++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java
@@ -23,45 +23,47 @@ import org.springframework.security.core.session.SessionDestroyedEvent;
 import java.util.*;
 
 /**
- * Published by the {@link HttpSessionEventPublisher} when a HttpSession is created in the container
+ * Published by the {@link HttpSessionEventPublisher} when a HttpSession is created in the
+ * container
  *
  * @author Ray Krueger
  * @author Luke Taylor
  * @author Rob Winch
  */
 public class HttpSessionDestroyedEvent extends SessionDestroyedEvent {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public HttpSessionDestroyedEvent(HttpSession session) {
-        super(session);
-    }
+	public HttpSessionDestroyedEvent(HttpSession session) {
+		super(session);
+	}
 
-    public HttpSession getSession() {
-        return (HttpSession) getSource();
-    }
+	public HttpSession getSession() {
+		return (HttpSession) getSource();
+	}
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<SecurityContext> getSecurityContexts() {
-        HttpSession session = getSession();
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<SecurityContext> getSecurityContexts() {
+		HttpSession session = getSession();
 
-        Enumeration<String> attributes = session.getAttributeNames();
+		Enumeration<String> attributes = session.getAttributeNames();
 
-        ArrayList<SecurityContext> contexts = new ArrayList<SecurityContext>();
+		ArrayList<SecurityContext> contexts = new ArrayList<SecurityContext>();
 
-        while(attributes.hasMoreElements()) {
-            String attributeName = attributes.nextElement();
-            Object attributeValue = session.getAttribute(attributeName);
-            if (attributeValue instanceof SecurityContext) {
-                contexts.add((SecurityContext) attributeValue);
-            }
-        }
+		while (attributes.hasMoreElements()) {
+			String attributeName = attributes.nextElement();
+			Object attributeValue = session.getAttribute(attributeName);
+			if (attributeValue instanceof SecurityContext) {
+				contexts.add((SecurityContext) attributeValue);
+			}
+		}
 
-        return contexts;
-    }
+		return contexts;
+	}
 
-    @Override
-    public String getId() {
-        return getSession().getId();
-    }
+	@Override
+	public String getId() {
+		return getSession().getId();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java
index fddd54f808..c20b1b7b86 100644
--- a/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java
+++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionEventPublisher.java
@@ -26,63 +26,68 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 
-
 /**
  * Declared in web.xml as
+ * 
  * <pre>
  * &lt;listener&gt;
  *     &lt;listener-class&gt;org.springframework.security.web.session.HttpSessionEventPublisher&lt;/listener-class&gt;
  * &lt;/listener&gt;
  * </pre>
  *
- * Publishes <code>HttpSessionApplicationEvent</code>s to the Spring Root WebApplicationContext. Maps
- * javax.servlet.http.HttpSessionListener.sessionCreated() to {@link HttpSessionCreatedEvent}. Maps
- * javax.servlet.http.HttpSessionListener.sessionDestroyed() to {@link HttpSessionDestroyedEvent}.
+ * Publishes <code>HttpSessionApplicationEvent</code>s to the Spring Root
+ * WebApplicationContext. Maps javax.servlet.http.HttpSessionListener.sessionCreated() to
+ * {@link HttpSessionCreatedEvent}. Maps
+ * javax.servlet.http.HttpSessionListener.sessionDestroyed() to
+ * {@link HttpSessionDestroyedEvent}.
  *
  * @author Ray Krueger
  */
 public class HttpSessionEventPublisher implements HttpSessionListener {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    private static final String LOGGER_NAME = HttpSessionEventPublisher.class.getName();
+	private static final String LOGGER_NAME = HttpSessionEventPublisher.class.getName();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    ApplicationContext getContext(ServletContext servletContext) {
-        return WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-    }
+	ApplicationContext getContext(ServletContext servletContext) {
+		return WebApplicationContextUtils
+				.getRequiredWebApplicationContext(servletContext);
+	}
 
-    /**
-     * Handles the HttpSessionEvent by publishing a {@link HttpSessionCreatedEvent} to the application
-     * appContext.
-     *
-     * @param event HttpSessionEvent passed in by the container
-     */
-    public void sessionCreated(HttpSessionEvent event) {
-        HttpSessionCreatedEvent e = new HttpSessionCreatedEvent(event.getSession());
-        Log log = LogFactory.getLog(LOGGER_NAME);
+	/**
+	 * Handles the HttpSessionEvent by publishing a {@link HttpSessionCreatedEvent} to the
+	 * application appContext.
+	 *
+	 * @param event HttpSessionEvent passed in by the container
+	 */
+	public void sessionCreated(HttpSessionEvent event) {
+		HttpSessionCreatedEvent e = new HttpSessionCreatedEvent(event.getSession());
+		Log log = LogFactory.getLog(LOGGER_NAME);
 
-        if (log.isDebugEnabled()) {
-            log.debug("Publishing event: " + e);
-        }
+		if (log.isDebugEnabled()) {
+			log.debug("Publishing event: " + e);
+		}
 
-        getContext(event.getSession().getServletContext()).publishEvent(e);
-    }
+		getContext(event.getSession().getServletContext()).publishEvent(e);
+	}
 
-    /**
-     * Handles the HttpSessionEvent by publishing a {@link HttpSessionDestroyedEvent} to the application
-     * appContext.
-     *
-     * @param event The HttpSessionEvent pass in by the container
-     */
-    public void sessionDestroyed(HttpSessionEvent event) {
-        HttpSessionDestroyedEvent e = new HttpSessionDestroyedEvent(event.getSession());
-        Log log = LogFactory.getLog(LOGGER_NAME);
+	/**
+	 * Handles the HttpSessionEvent by publishing a {@link HttpSessionDestroyedEvent} to
+	 * the application appContext.
+	 *
+	 * @param event The HttpSessionEvent pass in by the container
+	 */
+	public void sessionDestroyed(HttpSessionEvent event) {
+		HttpSessionDestroyedEvent e = new HttpSessionDestroyedEvent(event.getSession());
+		Log log = LogFactory.getLog(LOGGER_NAME);
 
-        if (log.isDebugEnabled()) {
-            log.debug("Publishing event: " + e);
-        }
+		if (log.isDebugEnabled()) {
+			log.debug("Publishing event: " + e);
+		}
 
-        getContext(event.getSession().getServletContext()).publishEvent(e);
-    }
+		getContext(event.getSession().getServletContext()).publishEvent(e);
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java b/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java
index b8f7b1d82b..afca7ea8d9 100644
--- a/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java
+++ b/web/src/main/java/org/springframework/security/web/session/InvalidSessionAccessDeniedHandler.java
@@ -32,22 +32,20 @@ import org.springframework.util.Assert;
  * @since 3.2
  */
 public final class InvalidSessionAccessDeniedHandler implements AccessDeniedHandler {
-    private final InvalidSessionStrategy invalidSessionStrategy;
+	private final InvalidSessionStrategy invalidSessionStrategy;
 
-    /**
-     * Creates a new instance
-     * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to delegate to
-     */
-    public InvalidSessionAccessDeniedHandler(
-            InvalidSessionStrategy invalidSessionStrategy) {
-        Assert.notNull(invalidSessionStrategy, "invalidSessionStrategy cannot be null");
-        this.invalidSessionStrategy = invalidSessionStrategy;
-    }
+	/**
+	 * Creates a new instance
+	 * @param invalidSessionStrategy the {@link InvalidSessionStrategy} to delegate to
+	 */
+	public InvalidSessionAccessDeniedHandler(InvalidSessionStrategy invalidSessionStrategy) {
+		Assert.notNull(invalidSessionStrategy, "invalidSessionStrategy cannot be null");
+		this.invalidSessionStrategy = invalidSessionStrategy;
+	}
 
-    public void handle(HttpServletRequest request,
-            HttpServletResponse response,
-            AccessDeniedException accessDeniedException) throws IOException,
-            ServletException {
-        invalidSessionStrategy.onInvalidSessionDetected(request, response);
-    }
+	public void handle(HttpServletRequest request, HttpServletResponse response,
+			AccessDeniedException accessDeniedException) throws IOException,
+			ServletException {
+		invalidSessionStrategy.onInvalidSessionDetected(request, response);
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/session/InvalidSessionStrategy.java b/web/src/main/java/org/springframework/security/web/session/InvalidSessionStrategy.java
index e9eaed5882..11b54869f5 100644
--- a/web/src/main/java/org/springframework/security/web/session/InvalidSessionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/session/InvalidSessionStrategy.java
@@ -6,13 +6,14 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * Determines the behaviour of the {@code SessionManagementFilter} when an invalid session Id is submitted and
- * detected in the {@code SessionManagementFilter}.
+ * Determines the behaviour of the {@code SessionManagementFilter} when an invalid session
+ * Id is submitted and detected in the {@code SessionManagementFilter}.
  *
  * @author Luke Taylor
  */
 public interface InvalidSessionStrategy {
 
-    void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException;
+	void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response)
+			throws IOException, ServletException;
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java
index 906d5c888d..061e92ab07 100644
--- a/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java
+++ b/web/src/main/java/org/springframework/security/web/session/SessionManagementFilter.java
@@ -23,118 +23,139 @@ import org.springframework.util.Assert;
 import org.springframework.web.filter.GenericFilterBean;
 
 /**
- * Detects that a user has been authenticated since the start of the request and, if they have, calls the
- * configured {@link SessionAuthenticationStrategy} to perform any session-related activity such as
- * activating session-fixation protection mechanisms or checking for multiple concurrent logins.
+ * Detects that a user has been authenticated since the start of the request and, if they
+ * have, calls the configured {@link SessionAuthenticationStrategy} to perform any
+ * session-related activity such as activating session-fixation protection mechanisms or
+ * checking for multiple concurrent logins.
  *
  * @author Martin Algesten
  * @author Luke Taylor
  * @since 2.0
  */
 public class SessionManagementFilter extends GenericFilterBean {
-    //~ Static fields/initializers =====================================================================================
+	// ~ Static fields/initializers
+	// =====================================================================================
 
-    static final String FILTER_APPLIED = "__spring_security_session_mgmt_filter_applied";
+	static final String FILTER_APPLIED = "__spring_security_session_mgmt_filter_applied";
 
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private final SecurityContextRepository securityContextRepository;
-    private SessionAuthenticationStrategy sessionAuthenticationStrategy;
-    private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
-    private InvalidSessionStrategy invalidSessionStrategy = null;
-    private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
+	private final SecurityContextRepository securityContextRepository;
+	private SessionAuthenticationStrategy sessionAuthenticationStrategy;
+	private AuthenticationTrustResolver trustResolver = new AuthenticationTrustResolverImpl();
+	private InvalidSessionStrategy invalidSessionStrategy = null;
+	private AuthenticationFailureHandler failureHandler = new SimpleUrlAuthenticationFailureHandler();
 
-    public SessionManagementFilter(SecurityContextRepository securityContextRepository) {
-        this(securityContextRepository, new SessionFixationProtectionStrategy());
-    }
+	public SessionManagementFilter(SecurityContextRepository securityContextRepository) {
+		this(securityContextRepository, new SessionFixationProtectionStrategy());
+	}
 
-    public SessionManagementFilter(SecurityContextRepository securityContextRepository, SessionAuthenticationStrategy sessionStrategy) {
-        Assert.notNull(securityContextRepository, "SecurityContextRepository cannot be null");
-        Assert.notNull(sessionStrategy, "SessionAuthenticationStrategy cannot be null");
-        this.securityContextRepository = securityContextRepository;
-        this.sessionAuthenticationStrategy = sessionStrategy;
-    }
+	public SessionManagementFilter(SecurityContextRepository securityContextRepository,
+			SessionAuthenticationStrategy sessionStrategy) {
+		Assert.notNull(securityContextRepository,
+				"SecurityContextRepository cannot be null");
+		Assert.notNull(sessionStrategy, "SessionAuthenticationStrategy cannot be null");
+		this.securityContextRepository = securityContextRepository;
+		this.sessionAuthenticationStrategy = sessionStrategy;
+	}
 
-    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) req;
-        HttpServletResponse response = (HttpServletResponse) res;
+	public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) req;
+		HttpServletResponse response = (HttpServletResponse) res;
 
-        if (request.getAttribute(FILTER_APPLIED) != null) {
-            chain.doFilter(request, response);
-            return;
-        }
+		if (request.getAttribute(FILTER_APPLIED) != null) {
+			chain.doFilter(request, response);
+			return;
+		}
 
-        request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
+		request.setAttribute(FILTER_APPLIED, Boolean.TRUE);
 
-        if (!securityContextRepository.containsContext(request)) {
-            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		if (!securityContextRepository.containsContext(request)) {
+			Authentication authentication = SecurityContextHolder.getContext()
+					.getAuthentication();
 
-            if (authentication != null && !trustResolver.isAnonymous(authentication)) {
-             // The user has been authenticated during the current request, so call the session strategy
-                try {
-                    sessionAuthenticationStrategy.onAuthentication(authentication, request, response);
-                } catch (SessionAuthenticationException e) {
-                    // The session strategy can reject the authentication
-                    logger.debug("SessionAuthenticationStrategy rejected the authentication object", e);
-                    SecurityContextHolder.clearContext();
-                    failureHandler.onAuthenticationFailure(request, response, e);
+			if (authentication != null && !trustResolver.isAnonymous(authentication)) {
+				// The user has been authenticated during the current request, so call the
+				// session strategy
+				try {
+					sessionAuthenticationStrategy.onAuthentication(authentication,
+							request, response);
+				}
+				catch (SessionAuthenticationException e) {
+					// The session strategy can reject the authentication
+					logger.debug(
+							"SessionAuthenticationStrategy rejected the authentication object",
+							e);
+					SecurityContextHolder.clearContext();
+					failureHandler.onAuthenticationFailure(request, response, e);
 
-                    return;
-                }
-                // Eagerly save the security context to make it available for any possible re-entrant
-                // requests which may occur before the current request completes. SEC-1396.
-                securityContextRepository.saveContext(SecurityContextHolder.getContext(), request, response);
-            } else {
-             // No security context or authentication present. Check for a session timeout
-                if (request.getRequestedSessionId() != null && !request.isRequestedSessionIdValid()) {
-                    if(logger.isDebugEnabled()) {
-                        logger.debug("Requested session ID " + request.getRequestedSessionId() + " is invalid.");
-                    }
+					return;
+				}
+				// Eagerly save the security context to make it available for any possible
+				// re-entrant
+				// requests which may occur before the current request completes.
+				// SEC-1396.
+				securityContextRepository.saveContext(SecurityContextHolder.getContext(),
+						request, response);
+			}
+			else {
+				// No security context or authentication present. Check for a session
+				// timeout
+				if (request.getRequestedSessionId() != null
+						&& !request.isRequestedSessionIdValid()) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Requested session ID "
+								+ request.getRequestedSessionId() + " is invalid.");
+					}
 
-                    if (invalidSessionStrategy != null) {
-                        invalidSessionStrategy.onInvalidSessionDetected(request, response);
-                        return;
-                    }
-                }
-            }
-        }
+					if (invalidSessionStrategy != null) {
+						invalidSessionStrategy
+								.onInvalidSessionDetected(request, response);
+						return;
+					}
+				}
+			}
+		}
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    /**
-     * Sets the strategy which will be invoked instead of allowing the filter chain to prceed, if the user agent
-     * requests an invalid session Id. If the property is not set, no action will be taken.
-     *
-     * @param invalidSessionStrategy the strategy to invoke. Typically a {@link SimpleRedirectInvalidSessionStrategy}.
-     */
-    public void setInvalidSessionStrategy(InvalidSessionStrategy invalidSessionStrategy) {
-        this.invalidSessionStrategy = invalidSessionStrategy;
-    }
+	/**
+	 * Sets the strategy which will be invoked instead of allowing the filter chain to
+	 * prceed, if the user agent requests an invalid session Id. If the property is not
+	 * set, no action will be taken.
+	 *
+	 * @param invalidSessionStrategy the strategy to invoke. Typically a
+	 * {@link SimpleRedirectInvalidSessionStrategy}.
+	 */
+	public void setInvalidSessionStrategy(InvalidSessionStrategy invalidSessionStrategy) {
+		this.invalidSessionStrategy = invalidSessionStrategy;
+	}
 
-    /**
-     * The handler which will be invoked if the <tt>AuthenticatedSessionStrategy</tt> raises a
-     * <tt>SessionAuthenticationException</tt>, indicating that the user is not allowed to be authenticated for this
-     * session (typically because they already have too many sessions open).
-     *
-     */
-    public void setAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
-        Assert.notNull(failureHandler, "failureHandler cannot be null");
-        this.failureHandler = failureHandler;
-    }
+	/**
+	 * The handler which will be invoked if the <tt>AuthenticatedSessionStrategy</tt>
+	 * raises a <tt>SessionAuthenticationException</tt>, indicating that the user is not
+	 * allowed to be authenticated for this session (typically because they already have
+	 * too many sessions open).
+	 *
+	 */
+	public void setAuthenticationFailureHandler(
+			AuthenticationFailureHandler failureHandler) {
+		Assert.notNull(failureHandler, "failureHandler cannot be null");
+		this.failureHandler = failureHandler;
+	}
 
-
-    /**
-     * Sets the {@link AuthenticationTrustResolver} to be used. The default is
-     * {@link AuthenticationTrustResolverImpl}.
-     *
-     * @param trustResolver
-     *            the {@link AuthenticationTrustResolver} to use. Cannot be
-     *            null.
-     */
-    public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
-        Assert.notNull(trustResolver, "trustResolver cannot be null");
-        this.trustResolver = trustResolver;
-    }
+	/**
+	 * Sets the {@link AuthenticationTrustResolver} to be used. The default is
+	 * {@link AuthenticationTrustResolverImpl}.
+	 *
+	 * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be
+	 * null.
+	 */
+	public void setTrustResolver(AuthenticationTrustResolver trustResolver) {
+		Assert.notNull(trustResolver, "trustResolver cannot be null");
+		this.trustResolver = trustResolver;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java
index 16e5e2d934..cd425bb595 100644
--- a/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/session/SimpleRedirectInvalidSessionStrategy.java
@@ -12,37 +12,42 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * Performs a redirect to a fixed URL when an invalid requested session is detected by the {@code SessionManagementFilter}.
+ * Performs a redirect to a fixed URL when an invalid requested session is detected by the
+ * {@code SessionManagementFilter}.
  *
  * @author Luke Taylor
  */
 public final class SimpleRedirectInvalidSessionStrategy implements InvalidSessionStrategy {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final String destinationUrl;
-    private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
-    private boolean createNewSession = true;
+	private final Log logger = LogFactory.getLog(getClass());
+	private final String destinationUrl;
+	private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
+	private boolean createNewSession = true;
 
-    public SimpleRedirectInvalidSessionStrategy(String invalidSessionUrl) {
-        Assert.isTrue(UrlUtils.isValidRedirectUrl(invalidSessionUrl), "url must start with '/' or with 'http(s)'");
-        this.destinationUrl = invalidSessionUrl;
-    }
+	public SimpleRedirectInvalidSessionStrategy(String invalidSessionUrl) {
+		Assert.isTrue(UrlUtils.isValidRedirectUrl(invalidSessionUrl),
+				"url must start with '/' or with 'http(s)'");
+		this.destinationUrl = invalidSessionUrl;
+	}
 
-    public void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        logger.debug("Starting new session (if required) and redirecting to '" + destinationUrl + "'");
-        if (createNewSession) {
-            request.getSession();
-        }
-        redirectStrategy.sendRedirect(request, response, destinationUrl);
-    }
+	public void onInvalidSessionDetected(HttpServletRequest request,
+			HttpServletResponse response) throws IOException {
+		logger.debug("Starting new session (if required) and redirecting to '"
+				+ destinationUrl + "'");
+		if (createNewSession) {
+			request.getSession();
+		}
+		redirectStrategy.sendRedirect(request, response, destinationUrl);
+	}
 
-    /**
-     * Determines whether a new session should be created before redirecting (to avoid possible looping issues where
-     * the same session ID is sent with the redirected request). Alternatively, ensure that the configured URL
-     * does not pass through the {@code SessionManagementFilter}.
-     *
-     * @param createNewSession defaults to {@code true}.
-     */
-    public void setCreateNewSession(boolean createNewSession) {
-        this.createNewSession = createNewSession;
-    }
+	/**
+	 * Determines whether a new session should be created before redirecting (to avoid
+	 * possible looping issues where the same session ID is sent with the redirected
+	 * request). Alternatively, ensure that the configured URL does not pass through the
+	 * {@code SessionManagementFilter}.
+	 *
+	 * @param createNewSession defaults to {@code true}.
+	 */
+	public void setCreateNewSession(boolean createNewSession) {
+		this.createNewSession = createNewSession;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java
index 8ce448a4e0..79a3f435a9 100644
--- a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java
+++ b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java
@@ -11,74 +11,74 @@ import org.springframework.util.Assert;
  * @since 2.0
  */
 public class RedirectUrlBuilder {
-    private String scheme;
-    private String serverName;
-    private int port;
-    private String contextPath;
-    private String servletPath;
-    private String pathInfo;
-    private String query;
+	private String scheme;
+	private String serverName;
+	private int port;
+	private String contextPath;
+	private String servletPath;
+	private String pathInfo;
+	private String query;
 
-    public void setScheme(String scheme) {
-        if(! ("http".equals(scheme) | "https".equals(scheme)) ) {
-            throw new IllegalArgumentException("Unsupported scheme '" + scheme + "'");
-        }
-        this.scheme = scheme;
-    }
+	public void setScheme(String scheme) {
+		if (!("http".equals(scheme) | "https".equals(scheme))) {
+			throw new IllegalArgumentException("Unsupported scheme '" + scheme + "'");
+		}
+		this.scheme = scheme;
+	}
 
-    public void setServerName(String serverName) {
-        this.serverName = serverName;
-    }
+	public void setServerName(String serverName) {
+		this.serverName = serverName;
+	}
 
-    public void setPort(int port) {
-        this.port = port;
-    }
+	public void setPort(int port) {
+		this.port = port;
+	}
 
-    public void setContextPath(String contextPath) {
-        this.contextPath = contextPath;
-    }
+	public void setContextPath(String contextPath) {
+		this.contextPath = contextPath;
+	}
 
-    public void setServletPath(String servletPath) {
-        this.servletPath = servletPath;
-    }
+	public void setServletPath(String servletPath) {
+		this.servletPath = servletPath;
+	}
 
-    public void setPathInfo(String pathInfo) {
-        this.pathInfo = pathInfo;
-    }
+	public void setPathInfo(String pathInfo) {
+		this.pathInfo = pathInfo;
+	}
 
-    public void setQuery(String query) {
-        this.query = query;
-    }
+	public void setQuery(String query) {
+		this.query = query;
+	}
 
-    public String getUrl() {
-        StringBuilder sb = new StringBuilder();
+	public String getUrl() {
+		StringBuilder sb = new StringBuilder();
 
-        Assert.notNull(scheme);
-        Assert.notNull(serverName);
+		Assert.notNull(scheme);
+		Assert.notNull(serverName);
 
-        sb.append(scheme).append("://").append(serverName);
+		sb.append(scheme).append("://").append(serverName);
 
-        // Append the port number if it's not standard for the scheme
-        if (port != (scheme.equals("http") ? 80 : 443)) {
-            sb.append(":").append(Integer.toString(port));
-        }
+		// Append the port number if it's not standard for the scheme
+		if (port != (scheme.equals("http") ? 80 : 443)) {
+			sb.append(":").append(Integer.toString(port));
+		}
 
-        if (contextPath != null) {
-            sb.append(contextPath);
-        }
+		if (contextPath != null) {
+			sb.append(contextPath);
+		}
 
-        if (servletPath != null) {
-            sb.append(servletPath);
-        }
+		if (servletPath != null) {
+			sb.append(servletPath);
+		}
 
-        if (pathInfo != null) {
-            sb.append(pathInfo);
-        }
+		if (pathInfo != null) {
+			sb.append(pathInfo);
+		}
 
-        if (query != null) {
-            sb.append("?").append(query);
-        }
+		if (query != null) {
+			sb.append("?").append(query);
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/TextEscapeUtils.java b/web/src/main/java/org/springframework/security/web/util/TextEscapeUtils.java
index ca349d51f9..c81d33668a 100644
--- a/web/src/main/java/org/springframework/security/web/util/TextEscapeUtils.java
+++ b/web/src/main/java/org/springframework/security/web/util/TextEscapeUtils.java
@@ -8,52 +8,64 @@ package org.springframework.security.web.util;
  */
 public abstract class TextEscapeUtils {
 
-    public static String escapeEntities(String s) {
-        if (s == null || s.length() == 0) {
-            return s;
-        }
+	public static String escapeEntities(String s) {
+		if (s == null || s.length() == 0) {
+			return s;
+		}
 
-        StringBuilder sb = new StringBuilder();
+		StringBuilder sb = new StringBuilder();
 
-        for (int i=0; i < s.length(); i++) {
-            char c = s.charAt(i);
+		for (int i = 0; i < s.length(); i++) {
+			char c = s.charAt(i);
 
-            if (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9') {
-                sb.append(c);
-            } else if(c == '<') {
-                sb.append("&lt;");
-            } else if (c == '>') {
-                sb.append("&gt;");
-            } else if (c == '&') {
-                sb.append("&amp;");
-            } else if (Character.isWhitespace(c)) {
-                sb.append("&#").append((int)c).append(";");
-            } else if (Character.isISOControl(c)) {
-                // ignore control chars
-            } else if (Character.isHighSurrogate(c)) {
-                if (i + 1 >= s.length()) {
-                    // Unexpected end
-                    throw new IllegalArgumentException("Missing low surrogate character at end of string");
-                }
-                char low = s.charAt(i + 1);
+			if (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9') {
+				sb.append(c);
+			}
+			else if (c == '<') {
+				sb.append("&lt;");
+			}
+			else if (c == '>') {
+				sb.append("&gt;");
+			}
+			else if (c == '&') {
+				sb.append("&amp;");
+			}
+			else if (Character.isWhitespace(c)) {
+				sb.append("&#").append((int) c).append(";");
+			}
+			else if (Character.isISOControl(c)) {
+				// ignore control chars
+			}
+			else if (Character.isHighSurrogate(c)) {
+				if (i + 1 >= s.length()) {
+					// Unexpected end
+					throw new IllegalArgumentException(
+							"Missing low surrogate character at end of string");
+				}
+				char low = s.charAt(i + 1);
 
-                if (!Character.isLowSurrogate(low)) {
-                    throw new IllegalArgumentException("Expected low surrogate character but found value = " + (int)low);
-                }
+				if (!Character.isLowSurrogate(low)) {
+					throw new IllegalArgumentException(
+							"Expected low surrogate character but found value = "
+									+ (int) low);
+				}
 
-                int codePoint = Character.toCodePoint(c, low);
-                if (Character.isDefined(codePoint)) {
-                    sb.append("&#").append(codePoint).append(";");
-                }
-                i++; // skip the next character as we have already dealt with it
-            } else if (Character.isLowSurrogate(c)) {
-                throw new IllegalArgumentException("Unexpected low surrogate character, value = " + (int)c);
-            } else if (Character.isDefined(c)) {
-                sb.append("&#").append((int) c).append(";");
-            }
-            // Ignore anything else
-        }
+				int codePoint = Character.toCodePoint(c, low);
+				if (Character.isDefined(codePoint)) {
+					sb.append("&#").append(codePoint).append(";");
+				}
+				i++; // skip the next character as we have already dealt with it
+			}
+			else if (Character.isLowSurrogate(c)) {
+				throw new IllegalArgumentException(
+						"Unexpected low surrogate character, value = " + (int) c);
+			}
+			else if (Character.isDefined(c)) {
+				sb.append("&#").append((int) c).append(";");
+			}
+			// Ignore anything else
+		}
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
index 1ac4a2536f..90a0239b3d 100755
--- a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
+++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
@@ -20,221 +20,227 @@ import org.springframework.util.Assert;
  */
 public class ThrowableAnalyzer {
 
-    /**
-     * Default extractor for {@link Throwable} instances.
-     *
-     * @see Throwable#getCause()
-     */
-    public static final ThrowableCauseExtractor DEFAULT_EXTRACTOR
-        = new ThrowableCauseExtractor() {
-            public Throwable extractCause(Throwable throwable) {
-                return throwable.getCause();
-            }
-        };
+	/**
+	 * Default extractor for {@link Throwable} instances.
+	 *
+	 * @see Throwable#getCause()
+	 */
+	public static final ThrowableCauseExtractor DEFAULT_EXTRACTOR = new ThrowableCauseExtractor() {
+		public Throwable extractCause(Throwable throwable) {
+			return throwable.getCause();
+		}
+	};
 
-    /**
-     * Default extractor for {@link InvocationTargetException} instances.
-     *
-     * @see InvocationTargetException#getTargetException()
-     */
-    public static final ThrowableCauseExtractor INVOCATIONTARGET_EXTRACTOR
-        = new ThrowableCauseExtractor() {
-            public Throwable extractCause(Throwable throwable) {
-                verifyThrowableHierarchy(throwable, InvocationTargetException.class);
-                return ((InvocationTargetException) throwable).getTargetException();
-            }
-        };
+	/**
+	 * Default extractor for {@link InvocationTargetException} instances.
+	 *
+	 * @see InvocationTargetException#getTargetException()
+	 */
+	public static final ThrowableCauseExtractor INVOCATIONTARGET_EXTRACTOR = new ThrowableCauseExtractor() {
+		public Throwable extractCause(Throwable throwable) {
+			verifyThrowableHierarchy(throwable, InvocationTargetException.class);
+			return ((InvocationTargetException) throwable).getTargetException();
+		}
+	};
 
-    /**
-     * Comparator to order classes ascending according to their hierarchy relation.
-     * If two classes have a hierarchical relation, the "higher" class is considered
-     * to be greater by this comparator.<br>
-     * For hierarchically unrelated classes their fully qualified name will be compared.
-     */
-    private static final Comparator<Class<? extends Throwable>> CLASS_HIERARCHY_COMPARATOR =
-        new Comparator<Class<? extends Throwable>>() {
+	/**
+	 * Comparator to order classes ascending according to their hierarchy relation. If two
+	 * classes have a hierarchical relation, the "higher" class is considered to be
+	 * greater by this comparator.<br>
+	 * For hierarchically unrelated classes their fully qualified name will be compared.
+	 */
+	private static final Comparator<Class<? extends Throwable>> CLASS_HIERARCHY_COMPARATOR = new Comparator<Class<? extends Throwable>>() {
 
-        public int compare(Class<? extends Throwable> class1, Class<? extends Throwable> class2) {
-            if (class1.isAssignableFrom(class2)) {
-                return 1;
-            } else if (class2.isAssignableFrom(class1)) {
-                return -1;
-            } else {
-                return class1.getName().compareTo(class2.getName());
-            }
-        }
+		public int compare(Class<? extends Throwable> class1,
+				Class<? extends Throwable> class2) {
+			if (class1.isAssignableFrom(class2)) {
+				return 1;
+			}
+			else if (class2.isAssignableFrom(class1)) {
+				return -1;
+			}
+			else {
+				return class1.getName().compareTo(class2.getName());
+			}
+		}
 
-    };
+	};
 
+	/**
+	 * Map of registered cause extractors. key: Class<Throwable>; value:
+	 * ThrowableCauseExctractor
+	 */
+	private final Map<Class<? extends Throwable>, ThrowableCauseExtractor> extractorMap;
 
-    /**
-     * Map of registered cause extractors.
-     * key: Class<Throwable>; value: ThrowableCauseExctractor
-     */
-    private final Map<Class<? extends Throwable>, ThrowableCauseExtractor> extractorMap;
+	/**
+	 * Creates a new <code>ThrowableAnalyzer</code> instance.
+	 */
+	public ThrowableAnalyzer() {
+		this.extractorMap = new TreeMap<Class<? extends Throwable>, ThrowableCauseExtractor>(
+				CLASS_HIERARCHY_COMPARATOR);
 
+		initExtractorMap();
+	}
 
-    /**
-     * Creates a new <code>ThrowableAnalyzer</code> instance.
-     */
-    public ThrowableAnalyzer() {
-        this.extractorMap = new TreeMap<Class<? extends Throwable>, ThrowableCauseExtractor>(CLASS_HIERARCHY_COMPARATOR);
+	/**
+	 * Registers a <code>ThrowableCauseExtractor</code> for the specified type. <i>Can be
+	 * used in subclasses overriding {@link #initExtractorMap()}.</i>
+	 *
+	 * @param throwableType the type (has to be a subclass of <code>Throwable</code>)
+	 * @param extractor the associated <code>ThrowableCauseExtractor</code> (not
+	 * <code>null</code>)
+	 *
+	 * @throws IllegalArgumentException if one of the arguments is invalid
+	 */
+	protected final void registerExtractor(Class<? extends Throwable> throwableType,
+			ThrowableCauseExtractor extractor) {
+		Assert.notNull(extractor, "Invalid extractor: null");
 
-        initExtractorMap();
-    }
+		this.extractorMap.put(throwableType, extractor);
+	}
 
-    /**
-     * Registers a <code>ThrowableCauseExtractor</code> for the specified type.
-     * <i>Can be used in subclasses overriding {@link #initExtractorMap()}.</i>
-     *
-     * @param throwableType the type (has to be a subclass of <code>Throwable</code>)
-     * @param extractor the associated <code>ThrowableCauseExtractor</code> (not <code>null</code>)
-     *
-     * @throws IllegalArgumentException if one of the arguments is invalid
-     */
-    protected final void registerExtractor(Class<? extends Throwable> throwableType, ThrowableCauseExtractor extractor) {
-        Assert.notNull(extractor, "Invalid extractor: null");
+	/**
+	 * Initializes associations between <code>Throwable</code>s and
+	 * <code>ThrowableCauseExtractor</code>s. The default implementation performs the
+	 * following registrations: <li>{@link #DEFAULT_EXTRACTOR} for {@link Throwable}</li>
+	 * <li>{@link #INVOCATIONTARGET_EXTRACTOR} for {@link InvocationTargetException}</li> <br>
+	 * Subclasses overriding this method are encouraged to invoke the super method to
+	 * perform the default registrations. They can register additional extractors as
+	 * required.
+	 * <p>
+	 * Note: An extractor registered for a specific type is applicable for that type
+	 * <i>and all subtypes thereof</i>. However, extractors registered to more specific
+	 * types are guaranteed to be resolved first. So in the default case
+	 * InvocationTargetExceptions will be handled by {@link #INVOCATIONTARGET_EXTRACTOR}
+	 * while all other throwables are handled by {@link #DEFAULT_EXTRACTOR}.
+	 *
+	 * @see #registerExtractor(Class, ThrowableCauseExtractor)
+	 */
+	protected void initExtractorMap() {
+		registerExtractor(InvocationTargetException.class, INVOCATIONTARGET_EXTRACTOR);
+		registerExtractor(Throwable.class, DEFAULT_EXTRACTOR);
+	}
 
-        this.extractorMap.put(throwableType, extractor);
-    }
+	/**
+	 * Returns an array containing the classes for which extractors are registered. The
+	 * order of the classes is the order in which comparisons will occur for resolving a
+	 * matching extractor.
+	 *
+	 * @return the types for which extractors are registered
+	 */
+	@SuppressWarnings("unchecked")
+	final Class<? extends Throwable>[] getRegisteredTypes() {
+		Set<Class<? extends Throwable>> typeList = this.extractorMap.keySet();
+		return typeList.toArray(new Class[typeList.size()]);
+	}
 
-    /**
-     * Initializes associations between <code>Throwable</code>s and <code>ThrowableCauseExtractor</code>s.
-     * The default implementation performs the following registrations:
-     * <li>{@link #DEFAULT_EXTRACTOR} for {@link Throwable}</li>
-     * <li>{@link #INVOCATIONTARGET_EXTRACTOR} for {@link InvocationTargetException}</li>
-     * <br>
-     * Subclasses overriding this method are encouraged to invoke the super method to perform the
-     * default registrations. They can register additional extractors as required.
-     * <p>
-     * Note: An extractor registered for a specific type is applicable for that type <i>and all subtypes thereof</i>.
-     * However, extractors registered to more specific types are guaranteed to be resolved first.
-     * So in the default case InvocationTargetExceptions will be handled by {@link #INVOCATIONTARGET_EXTRACTOR}
-     * while all other throwables are handled by {@link #DEFAULT_EXTRACTOR}.
-     *
-     * @see #registerExtractor(Class, ThrowableCauseExtractor)
-     */
-    protected void initExtractorMap() {
-        registerExtractor(InvocationTargetException.class, INVOCATIONTARGET_EXTRACTOR);
-        registerExtractor(Throwable.class, DEFAULT_EXTRACTOR);
-    }
+	/**
+	 * Determines the cause chain of the provided <code>Throwable</code>. The returned
+	 * array contains all throwables extracted from the stacktrace, using the registered
+	 * {@link ThrowableCauseExtractor extractors}. The elements of the array are ordered:
+	 * The first element is the passed in throwable itself. The following elements appear
+	 * in their order downward the stacktrace.
+	 * <p>
+	 * Note: If no {@link ThrowableCauseExtractor} is registered for this instance then
+	 * the returned array will always only contain the passed in throwable.
+	 *
+	 * @param throwable the <code>Throwable</code> to analyze
+	 * @return an array of all determined throwables from the stacktrace
+	 *
+	 * @throws IllegalArgumentException if the throwable is <code>null</code>
+	 *
+	 * @see #initExtractorMap()
+	 */
+	public final Throwable[] determineCauseChain(Throwable throwable) {
+		if (throwable == null) {
+			throw new IllegalArgumentException("Invalid throwable: null");
+		}
 
-    /**
-     * Returns an array containing the classes for which extractors are registered.
-     * The order of the classes is the order in which comparisons will occur for
-     * resolving a matching extractor.
-     *
-     * @return the types for which extractors are registered
-     */
-    @SuppressWarnings("unchecked")
-    final Class<? extends Throwable>[] getRegisteredTypes() {
-        Set<Class<? extends Throwable>> typeList = this.extractorMap.keySet();
-        return typeList.toArray(new Class[typeList.size()]);
-    }
+		List<Throwable> chain = new ArrayList<Throwable>();
+		Throwable currentThrowable = throwable;
 
-    /**
-     * Determines the cause chain of the provided <code>Throwable</code>.
-     * The returned array contains all throwables extracted from the stacktrace, using the registered
-     * {@link ThrowableCauseExtractor extractors}. The elements of the array are ordered:
-     * The first element is the passed in throwable itself. The following elements
-     * appear in their order downward the stacktrace.
-     * <p>
-     * Note: If no {@link ThrowableCauseExtractor} is registered for this instance
-     * then the returned array will always only contain the passed in throwable.
-     *
-     * @param throwable the <code>Throwable</code> to analyze
-     * @return an array of all determined throwables from the stacktrace
-     *
-     * @throws IllegalArgumentException if the throwable is <code>null</code>
-     *
-     * @see #initExtractorMap()
-     */
-    public final Throwable[] determineCauseChain(Throwable throwable) {
-        if (throwable == null) {
-            throw new IllegalArgumentException("Invalid throwable: null");
-        }
+		while (currentThrowable != null) {
+			chain.add(currentThrowable);
+			currentThrowable = extractCause(currentThrowable);
+		}
 
-        List<Throwable> chain = new ArrayList<Throwable>();
-        Throwable currentThrowable = throwable;
+		return chain.toArray(new Throwable[chain.size()]);
+	}
 
-        while (currentThrowable != null) {
-            chain.add(currentThrowable);
-            currentThrowable = extractCause(currentThrowable);
-        }
+	/**
+	 * Extracts the cause of the given throwable using an appropriate extractor.
+	 *
+	 * @param throwable the <code>Throwable</code> (not <code>null</code>
+	 * @return the cause, may be <code>null</code> if none could be resolved
+	 */
+	private Throwable extractCause(Throwable throwable) {
+		for (Map.Entry<Class<? extends Throwable>, ThrowableCauseExtractor> entry : extractorMap
+				.entrySet()) {
+			Class<? extends Throwable> throwableType = entry.getKey();
+			if (throwableType.isInstance(throwable)) {
+				ThrowableCauseExtractor extractor = entry.getValue();
+				return extractor.extractCause(throwable);
+			}
+		}
 
-        return chain.toArray(new Throwable[chain.size()]);
-    }
+		return null;
+	}
 
-    /**
-     * Extracts the cause of the given throwable using an appropriate extractor.
-     *
-     * @param throwable the <code>Throwable</code> (not <code>null</code>
-     * @return the cause, may be <code>null</code> if none could be resolved
-     */
-    private Throwable extractCause(Throwable throwable) {
-        for (Map.Entry<Class<? extends Throwable>, ThrowableCauseExtractor> entry : extractorMap.entrySet()) {
-            Class<? extends Throwable> throwableType = entry.getKey();
-            if (throwableType.isInstance(throwable)) {
-                ThrowableCauseExtractor extractor = entry.getValue();
-                return extractor.extractCause(throwable);
-            }
-        }
+	/**
+	 * Returns the first throwable from the passed in array that is assignable to the
+	 * provided type. A returned instance is safe to be cast to the specified type.
+	 * <p>
+	 * If the passed in array is null or empty this method returns <code>null</code>.
+	 *
+	 * @param throwableType the type to look for
+	 * @param chain the array (will be processed in element order)
+	 * @return the found <code>Throwable</code>, <code>null</code> if not found
+	 *
+	 * @throws IllegalArgumentException if the provided type is <code>null</code> or no
+	 * subclass of <code>Throwable</code>
+	 */
+	public final Throwable getFirstThrowableOfType(
+			Class<? extends Throwable> throwableType, Throwable[] chain) {
+		if (chain != null) {
+			for (Throwable t : chain) {
+				if ((t != null) && throwableType.isInstance(t)) {
+					return t;
+				}
+			}
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    /**
-     * Returns the first throwable from the passed in array that is assignable to the provided type.
-     * A returned instance is safe to be cast to the specified type.
-     * <p>
-     * If the passed in array is null or empty this method returns <code>null</code>.
-     *
-     * @param throwableType the type to look for
-     * @param chain the array (will be processed in element order)
-     * @return the found <code>Throwable</code>, <code>null</code> if not found
-     *
-     * @throws IllegalArgumentException if the provided type is <code>null</code>
-     * or no subclass of <code>Throwable</code>
-     */
-    public final Throwable getFirstThrowableOfType(Class<? extends Throwable> throwableType, Throwable[] chain) {
-        if (chain != null) {
-            for (Throwable t : chain) {
-                if ((t != null) && throwableType.isInstance(t)) {
-                    return t;
-                }
-            }
-        }
+	/**
+	 * Verifies that the provided throwable is a valid subclass of the provided type (or
+	 * of the type itself). If <code>expectdBaseType</code> is <code>null</code>, no check
+	 * will be performed.
+	 * <p>
+	 * Can be used for verification purposes in implementations of
+	 * {@link ThrowableCauseExtractor extractors}.
+	 *
+	 * @param throwable the <code>Throwable</code> to check
+	 * @param expectedBaseType the type to check against
+	 *
+	 * @throws IllegalArgumentException if <code>throwable</code> is either
+	 * <code>null</code> or its type is not assignable to <code>expectedBaseType</code>
+	 */
+	public static void verifyThrowableHierarchy(Throwable throwable,
+			Class<? extends Throwable> expectedBaseType) {
+		if (expectedBaseType == null) {
+			return;
+		}
 
-        return null;
-    }
+		if (throwable == null) {
+			throw new IllegalArgumentException("Invalid throwable: null");
+		}
+		Class<? extends Throwable> throwableType = throwable.getClass();
 
-    /**
-     * Verifies that the provided throwable is a valid subclass of the provided type (or of the type itself).
-     * If <code>expectdBaseType</code> is <code>null</code>, no check will be performed.
-     * <p>
-     * Can be used for verification purposes in implementations
-     * of {@link ThrowableCauseExtractor extractors}.
-     *
-     * @param throwable the <code>Throwable</code> to check
-     * @param expectedBaseType the type to check against
-     *
-     * @throws IllegalArgumentException if <code>throwable</code> is either <code>null</code>
-     * or its type is not assignable to <code>expectedBaseType</code>
-     */
-    public static void verifyThrowableHierarchy(Throwable throwable, Class<? extends Throwable> expectedBaseType) {
-        if (expectedBaseType == null) {
-            return;
-        }
-
-        if (throwable == null) {
-            throw new IllegalArgumentException("Invalid throwable: null");
-        }
-        Class<? extends Throwable> throwableType = throwable.getClass();
-
-        if (!expectedBaseType.isAssignableFrom(throwableType)) {
-            throw new IllegalArgumentException("Invalid type: '"
-                    + throwableType.getName()
-                    + "'. Has to be a subclass of '" + expectedBaseType.getName() + "'");
-        }
-    }
+		if (!expectedBaseType.isAssignableFrom(throwableType)) {
+			throw new IllegalArgumentException("Invalid type: '"
+					+ throwableType.getName() + "'. Has to be a subclass of '"
+					+ expectedBaseType.getName() + "'");
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java b/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java
index 7526d84139..b4d149eb0e 100755
--- a/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java
+++ b/web/src/main/java/org/springframework/security/web/util/ThrowableCauseExtractor.java
@@ -1,6 +1,5 @@
 package org.springframework.security.web.util;
 
-
 /**
  * Interface for handlers extracting the cause out of a specific {@link Throwable} type.
  *
@@ -11,14 +10,14 @@ package org.springframework.security.web.util;
  */
 public interface ThrowableCauseExtractor {
 
-    /**
-     * Extracts the cause from the provided <code>Throwable</code>.
-     *
-     * @param throwable the <code>Throwable</code>
-     * @return the extracted cause (maybe <code>null</code>)
-     *
-     * @throws IllegalArgumentException if <code>throwable</code> is <code>null</code>
-     * or otherwise considered invalid for the implementation
-     */
-    Throwable extractCause(Throwable throwable);
+	/**
+	 * Extracts the cause from the provided <code>Throwable</code>.
+	 *
+	 * @param throwable the <code>Throwable</code>
+	 * @return the extracted cause (maybe <code>null</code>)
+	 *
+	 * @throws IllegalArgumentException if <code>throwable</code> is <code>null</code> or
+	 * otherwise considered invalid for the implementation
+	 */
+	Throwable extractCause(Throwable throwable);
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
index c4f40cf170..74b4480833 100644
--- a/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
+++ b/web/src/main/java/org/springframework/security/web/util/UrlUtils.java
@@ -19,118 +19,126 @@ import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServletRequest;
 
-
 /**
  * Provides static methods for composing URLs.
  * <p>
- * Placed into a separate class for visibility, so that changes to URL formatting conventions will affect all users.
+ * Placed into a separate class for visibility, so that changes to URL formatting
+ * conventions will affect all users.
  *
  * @author Ben Alex
  */
 public final class UrlUtils {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static String buildFullRequestUrl(HttpServletRequest r) {
-        return buildFullRequestUrl(r.getScheme(), r.getServerName(), r.getServerPort(), r.getRequestURI(),
-                r.getQueryString());
-    }
+	public static String buildFullRequestUrl(HttpServletRequest r) {
+		return buildFullRequestUrl(r.getScheme(), r.getServerName(), r.getServerPort(),
+				r.getRequestURI(), r.getQueryString());
+	}
 
-    /**
-     * Obtains the full URL the client used to make the request.
-     * <p>
-     * Note that the server port will not be shown if it is the default server port for HTTP or HTTPS
-     * (80 and 443 respectively).
-     *
-     * @return the full URL, suitable for redirects (not decoded).
-     */
-    public static String buildFullRequestUrl(String scheme, String serverName, int serverPort, String requestURI,
-            String queryString) {
+	/**
+	 * Obtains the full URL the client used to make the request.
+	 * <p>
+	 * Note that the server port will not be shown if it is the default server port for
+	 * HTTP or HTTPS (80 and 443 respectively).
+	 *
+	 * @return the full URL, suitable for redirects (not decoded).
+	 */
+	public static String buildFullRequestUrl(String scheme, String serverName,
+			int serverPort, String requestURI, String queryString) {
 
-        scheme = scheme.toLowerCase();
+		scheme = scheme.toLowerCase();
 
-        StringBuilder url = new StringBuilder();
-        url.append(scheme).append("://").append(serverName);
+		StringBuilder url = new StringBuilder();
+		url.append(scheme).append("://").append(serverName);
 
-        // Only add port if not default
-        if ("http".equals(scheme)) {
-            if (serverPort != 80) {
-                url.append(":").append(serverPort);
-            }
-        } else if ("https".equals(scheme)) {
-            if (serverPort != 443) {
-                url.append(":").append(serverPort);
-            }
-        }
+		// Only add port if not default
+		if ("http".equals(scheme)) {
+			if (serverPort != 80) {
+				url.append(":").append(serverPort);
+			}
+		}
+		else if ("https".equals(scheme)) {
+			if (serverPort != 443) {
+				url.append(":").append(serverPort);
+			}
+		}
 
-        // Use the requestURI as it is encoded (RFC 3986) and hence suitable for redirects.
-        url.append(requestURI);
+		// Use the requestURI as it is encoded (RFC 3986) and hence suitable for
+		// redirects.
+		url.append(requestURI);
 
-        if (queryString != null) {
-            url.append("?").append(queryString);
-        }
+		if (queryString != null) {
+			url.append("?").append(queryString);
+		}
 
-        return url.toString();
-    }
+		return url.toString();
+	}
 
-    /**
-     * Obtains the web application-specific fragment of the request URL.
-     * <p>
-     * Under normal spec conditions,
-     * <pre>
-     * requestURI = contextPath + servletPath + pathInfo
-     * </pre>
-     *
-     * But the requestURI is not decoded, whereas the servletPath and pathInfo are (SEC-1255).
-     * This method is typically used to return a URL for matching against secured paths, hence the decoded form is
-     * used in preference to the requestURI for building the returned value. But this method may also be called using
-     * dummy request objects which just have the requestURI and contextPatth set, for example, so it will fall back to
-     * using those.
-     *
-     * @return the decoded URL, excluding any server name, context path or servlet path
-     *
-     */
-    public static String buildRequestUrl(HttpServletRequest r) {
-        return buildRequestUrl(r.getServletPath(), r.getRequestURI(), r.getContextPath(), r.getPathInfo(),
-            r.getQueryString());
-    }
+	/**
+	 * Obtains the web application-specific fragment of the request URL.
+	 * <p>
+	 * Under normal spec conditions,
+	 * 
+	 * <pre>
+	 * requestURI = contextPath + servletPath + pathInfo
+	 * </pre>
+	 *
+	 * But the requestURI is not decoded, whereas the servletPath and pathInfo are
+	 * (SEC-1255). This method is typically used to return a URL for matching against
+	 * secured paths, hence the decoded form is used in preference to the requestURI for
+	 * building the returned value. But this method may also be called using dummy request
+	 * objects which just have the requestURI and contextPatth set, for example, so it
+	 * will fall back to using those.
+	 *
+	 * @return the decoded URL, excluding any server name, context path or servlet path
+	 *
+	 */
+	public static String buildRequestUrl(HttpServletRequest r) {
+		return buildRequestUrl(r.getServletPath(), r.getRequestURI(), r.getContextPath(),
+				r.getPathInfo(), r.getQueryString());
+	}
 
-    /**
-     * Obtains the web application-specific fragment of the URL.
-     */
-    private static String buildRequestUrl(String servletPath, String requestURI, String contextPath, String pathInfo,
-            String queryString) {
+	/**
+	 * Obtains the web application-specific fragment of the URL.
+	 */
+	private static String buildRequestUrl(String servletPath, String requestURI,
+			String contextPath, String pathInfo, String queryString) {
 
-        StringBuilder url = new StringBuilder();
+		StringBuilder url = new StringBuilder();
 
-        if (servletPath != null) {
-            url.append(servletPath);
-            if (pathInfo != null) {
-                url.append(pathInfo);
-            }
-        } else {
-            url.append(requestURI.substring(contextPath.length()));
-        }
+		if (servletPath != null) {
+			url.append(servletPath);
+			if (pathInfo != null) {
+				url.append(pathInfo);
+			}
+		}
+		else {
+			url.append(requestURI.substring(contextPath.length()));
+		}
 
-        if (queryString != null) {
-            url.append("?").append(queryString);
-        }
+		if (queryString != null) {
+			url.append("?").append(queryString);
+		}
 
-        return url.toString();
-    }
+		return url.toString();
+	}
 
-    /**
-     * Returns true if the supplied URL starts with a "/" or is absolute.
-     */
-    public static boolean isValidRedirectUrl(String url) {
-        return url != null && url.startsWith("/") || isAbsoluteUrl(url);
-    }
+	/**
+	 * Returns true if the supplied URL starts with a "/" or is absolute.
+	 */
+	public static boolean isValidRedirectUrl(String url) {
+		return url != null && url.startsWith("/") || isAbsoluteUrl(url);
+	}
 
-    /**
-     * Decides if a URL is absolute based on whether it contains a valid scheme name, as defined in RFC 1738.
-     */
-    public static boolean isAbsoluteUrl(String url) {
-        final Pattern ABSOLUTE_URL = Pattern.compile("\\A[a-z0-9.+-]+://.*", Pattern.CASE_INSENSITIVE);
+	/**
+	 * Decides if a URL is absolute based on whether it contains a valid scheme name, as
+	 * defined in RFC 1738.
+	 */
+	public static boolean isAbsoluteUrl(String url) {
+		final Pattern ABSOLUTE_URL = Pattern.compile("\\A[a-z0-9.+-]+://.*",
+				Pattern.CASE_INSENSITIVE);
 
-        return ABSOLUTE_URL.matcher(url).matches();
-    }
+		return ABSOLUTE_URL.matcher(url).matches();
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java
index 35cdb659f9..52947595d6 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/AndRequestMatcher.java
@@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
-
 /**
  * {@link RequestMatcher} that will return true if all of the passed in
  * {@link RequestMatcher} instances match.
@@ -34,48 +33,49 @@ import org.springframework.util.Assert;
  * @since 3.2
  */
 public final class AndRequestMatcher implements RequestMatcher {
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final List<RequestMatcher> requestMatchers;
+	private final List<RequestMatcher> requestMatchers;
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances to try
-     */
-    public AndRequestMatcher(List<RequestMatcher> requestMatchers) {
-        Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
-        if(requestMatchers.contains(null)) {
-            throw new IllegalArgumentException("requestMatchers cannot contain null values");
-        }
-        this.requestMatchers = requestMatchers;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances to try
+	 */
+	public AndRequestMatcher(List<RequestMatcher> requestMatchers) {
+		Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
+		if (requestMatchers.contains(null)) {
+			throw new IllegalArgumentException(
+					"requestMatchers cannot contain null values");
+		}
+		this.requestMatchers = requestMatchers;
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances to try
-     */
-    public AndRequestMatcher(RequestMatcher... requestMatchers) {
-        this(Arrays.asList(requestMatchers));
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances to try
+	 */
+	public AndRequestMatcher(RequestMatcher... requestMatchers) {
+		this(Arrays.asList(requestMatchers));
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        for(RequestMatcher matcher : requestMatchers) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Trying to match using " + matcher);
-            }
-            if(!matcher.matches(request)) {
-                logger.debug("Did not match");
-                return false;
-            }
-        }
-        logger.debug("All requestMatchers returned true");
-        return true;
-    }
+	public boolean matches(HttpServletRequest request) {
+		for (RequestMatcher matcher : requestMatchers) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Trying to match using " + matcher);
+			}
+			if (!matcher.matches(request)) {
+				logger.debug("Did not match");
+				return false;
+			}
+		}
+		logger.debug("All requestMatchers returned true");
+		return true;
+	}
 
-    @Override
-    public String toString() {
-        return "AndRequestMatcher [requestMatchers=" + requestMatchers + "]";
-    }
+	@Override
+	public String toString() {
+		return "AndRequestMatcher [requestMatchers=" + requestMatchers + "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
index 88fd46f90a..e2145fd84e 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/AntPathRequestMatcher.java
@@ -23,19 +23,21 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
- * Matcher which compares a pre-defined ant-style pattern against the URL
- * ({@code servletPath + pathInfo}) of an {@code HttpServletRequest}.
- * The query string of the URL is ignored and matching is case-insensitive or case-sensitive depending on
- * the arguments passed into the constructor.
+ * Matcher which compares a pre-defined ant-style pattern against the URL (
+ * {@code servletPath + pathInfo}) of an {@code HttpServletRequest}. The query string of
+ * the URL is ignored and matching is case-insensitive or case-sensitive depending on the
+ * arguments passed into the constructor.
  * <p>
- * Using a pattern value of {@code /**} or {@code **} is treated as a universal
- * match, which will match any request. Patterns which end with {@code /**} (and have no other wildcards)
- * are optimized by using a substring match &mdash; a pattern of {@code /aaa/**} will match {@code /aaa},
- * {@code /aaa/} and any sub-directories, such as {@code /aaa/bbb/ccc}.
+ * Using a pattern value of {@code /**} or {@code **} is treated as a universal match,
+ * which will match any request. Patterns which end with {@code /**} (and have no other
+ * wildcards) are optimized by using a substring match &mdash; a pattern of
+ * {@code /aaa/**} will match {@code /aaa}, {@code /aaa/} and any sub-directories, such as
+ * {@code /aaa/bbb/ccc}.
  * </p>
  * <p>
- * For all other cases, Spring's {@link AntPathMatcher} is used to perform the match. See the Spring documentation
- * for this class for comprehensive information on the syntax used.
+ * For all other cases, Spring's {@link AntPathMatcher} is used to perform the match. See
+ * the Spring documentation for this class for comprehensive information on the syntax
+ * used.
  * </p>
  *
  * @author Luke Taylor
@@ -45,210 +47,218 @@ import org.springframework.util.StringUtils;
  * @see org.springframework.util.AntPathMatcher
  */
 public final class AntPathRequestMatcher implements RequestMatcher {
-    private static final Log logger = LogFactory.getLog(AntPathRequestMatcher.class);
-    private static final String MATCH_ALL = "/**";
+	private static final Log logger = LogFactory.getLog(AntPathRequestMatcher.class);
+	private static final String MATCH_ALL = "/**";
 
-    private final Matcher matcher;
-    private final String pattern;
-    private final HttpMethod httpMethod;
-    private final boolean caseSensitive;
+	private final Matcher matcher;
+	private final String pattern;
+	private final HttpMethod httpMethod;
+	private final boolean caseSensitive;
 
-    /**
-     * Creates a matcher with the specific pattern which will match all HTTP
-     * methods in a case insensitive manner.
-     *
-     * @param pattern
-     *            the ant pattern to use for matching
-     */
-    public AntPathRequestMatcher(String pattern) {
-        this(pattern, null);
-    }
+	/**
+	 * Creates a matcher with the specific pattern which will match all HTTP methods in a
+	 * case insensitive manner.
+	 *
+	 * @param pattern the ant pattern to use for matching
+	 */
+	public AntPathRequestMatcher(String pattern) {
+		this(pattern, null);
+	}
 
-    /**
-     * Creates a matcher with the supplied pattern and HTTP method in a case
-     * insensitive manner.
-     *
-     * @param pattern
-     *            the ant pattern to use for matching
-     * @param httpMethod
-     *            the HTTP method. The {@code matches} method will return false
-     *            if the incoming request doesn't have the same method.
-     */
-    public AntPathRequestMatcher(String pattern, String httpMethod) {
-        this(pattern,httpMethod,false);
-    }
+	/**
+	 * Creates a matcher with the supplied pattern and HTTP method in a case insensitive
+	 * manner.
+	 *
+	 * @param pattern the ant pattern to use for matching
+	 * @param httpMethod the HTTP method. The {@code matches} method will return false if
+	 * the incoming request doesn't have the same method.
+	 */
+	public AntPathRequestMatcher(String pattern, String httpMethod) {
+		this(pattern, httpMethod, false);
+	}
 
-    /**
-     * Creates a matcher with the supplied pattern which will match the
-     * specified Http method
-     *
-     * @param pattern
-     *            the ant pattern to use for matching
-     * @param httpMethod
-     *            the HTTP method. The {@code matches} method will return false
-     *            if the incoming request doesn't doesn't have the same method.
-     * @param caseSensitive
-     *            true if the matcher should consider case, else false
-     */
-    public AntPathRequestMatcher(String pattern, String httpMethod, boolean caseSensitive) {
-        Assert.hasText(pattern, "Pattern cannot be null or empty");
-        this.caseSensitive = caseSensitive;
+	/**
+	 * Creates a matcher with the supplied pattern which will match the specified Http
+	 * method
+	 *
+	 * @param pattern the ant pattern to use for matching
+	 * @param httpMethod the HTTP method. The {@code matches} method will return false if
+	 * the incoming request doesn't doesn't have the same method.
+	 * @param caseSensitive true if the matcher should consider case, else false
+	 */
+	public AntPathRequestMatcher(String pattern, String httpMethod, boolean caseSensitive) {
+		Assert.hasText(pattern, "Pattern cannot be null or empty");
+		this.caseSensitive = caseSensitive;
 
-        if (pattern.equals(MATCH_ALL) || pattern.equals("**")) {
-            pattern = MATCH_ALL;
-            matcher = null;
-        } else {
-            if(!caseSensitive) {
-                pattern = pattern.toLowerCase();
-            }
+		if (pattern.equals(MATCH_ALL) || pattern.equals("**")) {
+			pattern = MATCH_ALL;
+			matcher = null;
+		}
+		else {
+			if (!caseSensitive) {
+				pattern = pattern.toLowerCase();
+			}
 
-            // If the pattern ends with {@code /**} and has no other wildcards or path variables, then optimize to a sub-path match
-            if (pattern.endsWith(MATCH_ALL) && (pattern.indexOf('?') == -1 && pattern.indexOf('{') == -1 && pattern.indexOf('}') == -1) &&
-                    pattern.indexOf("*") == pattern.length() - 2) {
-                matcher = new SubpathMatcher(pattern.substring(0, pattern.length() - 3));
-            } else {
-                matcher = new SpringAntMatcher(pattern);
-            }
-        }
+			// If the pattern ends with {@code /**} and has no other wildcards or path
+			// variables, then optimize to a sub-path match
+			if (pattern.endsWith(MATCH_ALL)
+					&& (pattern.indexOf('?') == -1 && pattern.indexOf('{') == -1 && pattern
+							.indexOf('}') == -1)
+					&& pattern.indexOf("*") == pattern.length() - 2) {
+				matcher = new SubpathMatcher(pattern.substring(0, pattern.length() - 3));
+			}
+			else {
+				matcher = new SpringAntMatcher(pattern);
+			}
+		}
 
-        this.pattern = pattern;
-        this.httpMethod = StringUtils.hasText(httpMethod) ? HttpMethod.valueOf(httpMethod) : null;
-    }
+		this.pattern = pattern;
+		this.httpMethod = StringUtils.hasText(httpMethod) ? HttpMethod
+				.valueOf(httpMethod) : null;
+	}
 
-    /**
-     * Returns true if the configured pattern (and HTTP-Method) match those of the supplied request.
-     *
-     * @param request the request to match against. The ant pattern will be matched against the
-     *    {@code servletPath} + {@code pathInfo} of the request.
-     */
-    public boolean matches(HttpServletRequest request) {
-        if (httpMethod != null && StringUtils.hasText(request.getMethod()) && httpMethod != valueOf(request.getMethod())) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Request '" + request.getMethod() + " " + getRequestPath(request) + "'"
-                        + " doesn't match '" + httpMethod  + " " + pattern);
-            }
+	/**
+	 * Returns true if the configured pattern (and HTTP-Method) match those of the
+	 * supplied request.
+	 *
+	 * @param request the request to match against. The ant pattern will be matched
+	 * against the {@code servletPath} + {@code pathInfo} of the request.
+	 */
+	public boolean matches(HttpServletRequest request) {
+		if (httpMethod != null && StringUtils.hasText(request.getMethod())
+				&& httpMethod != valueOf(request.getMethod())) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Request '" + request.getMethod() + " "
+						+ getRequestPath(request) + "'" + " doesn't match '" + httpMethod
+						+ " " + pattern);
+			}
 
-            return false;
-        }
+			return false;
+		}
 
-        if (pattern.equals(MATCH_ALL)) {
-            if (logger.isDebugEnabled()) {
-                logger.debug("Request '" + getRequestPath(request) + "' matched by universal pattern '/**'");
-            }
+		if (pattern.equals(MATCH_ALL)) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Request '" + getRequestPath(request)
+						+ "' matched by universal pattern '/**'");
+			}
 
-            return true;
-        }
+			return true;
+		}
 
-        String url = getRequestPath(request);
+		String url = getRequestPath(request);
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Checking match of request : '" + url + "'; against '" + pattern + "'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Checking match of request : '" + url + "'; against '" + pattern
+					+ "'");
+		}
 
-        return matcher.matches(url);
-    }
+		return matcher.matches(url);
+	}
 
-    private String getRequestPath(HttpServletRequest request) {
-        String url = request.getServletPath();
+	private String getRequestPath(HttpServletRequest request) {
+		String url = request.getServletPath();
 
-        if (request.getPathInfo() != null) {
-            url += request.getPathInfo();
-        }
+		if (request.getPathInfo() != null) {
+			url += request.getPathInfo();
+		}
 
-        if(!caseSensitive) {
-            url = url.toLowerCase();
-        }
+		if (!caseSensitive) {
+			url = url.toLowerCase();
+		}
 
-        return url;
-    }
+		return url;
+	}
 
-    public String getPattern() {
-        return pattern;
-    }
+	public String getPattern() {
+		return pattern;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof AntPathRequestMatcher)) {
-            return false;
-        }
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof AntPathRequestMatcher)) {
+			return false;
+		}
 
-        AntPathRequestMatcher other = (AntPathRequestMatcher) obj;
-        return this.pattern.equals(other.pattern) &&
-                this.httpMethod == other.httpMethod &&
-                this.caseSensitive == other.caseSensitive;
-    }
+		AntPathRequestMatcher other = (AntPathRequestMatcher) obj;
+		return this.pattern.equals(other.pattern) && this.httpMethod == other.httpMethod
+				&& this.caseSensitive == other.caseSensitive;
+	}
 
-    @Override
-    public int hashCode() {
-        int code = 31 ^ pattern.hashCode();
-        if (httpMethod != null) {
-            code ^= httpMethod.hashCode();
-        }
-        return code;
-    }
+	@Override
+	public int hashCode() {
+		int code = 31 ^ pattern.hashCode();
+		if (httpMethod != null) {
+			code ^= httpMethod.hashCode();
+		}
+		return code;
+	}
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Ant [pattern='").append(pattern).append("'");
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+		sb.append("Ant [pattern='").append(pattern).append("'");
 
-        if (httpMethod != null) {
-            sb.append(", ").append(httpMethod);
-        }
+		if (httpMethod != null) {
+			sb.append(", ").append(httpMethod);
+		}
 
-        sb.append("]");
+		sb.append("]");
 
-        return sb.toString();
-    }
+		return sb.toString();
+	}
 
-    /**
-     * Provides a save way of obtaining the HttpMethod from a String. If the method is invalid, returns null.
-     *
-     * @param method the HTTP method to use.
-     *
-     * @return the HttpMethod or null if method is invalid.
-     */
-    private static HttpMethod valueOf(String method) {
-        try {
-            return HttpMethod.valueOf(method);
-        } catch(IllegalArgumentException e) {}
+	/**
+	 * Provides a save way of obtaining the HttpMethod from a String. If the method is
+	 * invalid, returns null.
+	 *
+	 * @param method the HTTP method to use.
+	 *
+	 * @return the HttpMethod or null if method is invalid.
+	 */
+	private static HttpMethod valueOf(String method) {
+		try {
+			return HttpMethod.valueOf(method);
+		}
+		catch (IllegalArgumentException e) {
+		}
 
-        return null;
-    }
+		return null;
+	}
 
-    private static interface Matcher {
-        boolean matches(String path);
-    }
+	private static interface Matcher {
+		boolean matches(String path);
+	}
 
-    private static class SpringAntMatcher implements Matcher {
-        private static final AntPathMatcher antMatcher = new AntPathMatcher();
+	private static class SpringAntMatcher implements Matcher {
+		private static final AntPathMatcher antMatcher = new AntPathMatcher();
 
-        private final String pattern;
+		private final String pattern;
 
-        private SpringAntMatcher(String pattern) {
-            this.pattern = pattern;
-        }
+		private SpringAntMatcher(String pattern) {
+			this.pattern = pattern;
+		}
 
-        public boolean matches(String path) {
-            return antMatcher.match(pattern, path);
-        }
-    }
+		public boolean matches(String path) {
+			return antMatcher.match(pattern, path);
+		}
+	}
 
-    /**
-     * Optimized matcher for trailing wildcards
-     */
-    private static class SubpathMatcher implements Matcher {
-        private final String subpath;
-        private final int length;
+	/**
+	 * Optimized matcher for trailing wildcards
+	 */
+	private static class SubpathMatcher implements Matcher {
+		private final String subpath;
+		private final int length;
 
-        private SubpathMatcher(String subpath) {
-            assert !subpath.contains("*");
-            this.subpath = subpath;
-            this.length = subpath.length();
-        }
+		private SubpathMatcher(String subpath) {
+			assert !subpath.contains("*");
+			this.subpath = subpath;
+			this.length = subpath.length();
+		}
 
-        public boolean matches(String path) {
-            return path.startsWith(subpath) && (path.length() == length || path.charAt(length) == '/');
-        }
-    }
+		public boolean matches(String path) {
+			return path.startsWith(subpath)
+					&& (path.length() == length || path.charAt(length) == '/');
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/AnyRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/AnyRequestMatcher.java
index 569e30df94..c18268d9f6 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/AnyRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/AnyRequestMatcher.java
@@ -26,22 +26,24 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @since 3.1
  */
 public final class AnyRequestMatcher implements RequestMatcher {
-    public static final RequestMatcher INSTANCE = new AnyRequestMatcher();
+	public static final RequestMatcher INSTANCE = new AnyRequestMatcher();
 
-    public boolean matches(HttpServletRequest request) {
-        return true;
-    }
+	public boolean matches(HttpServletRequest request) {
+		return true;
+	}
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean equals(Object obj) {
-        return obj instanceof AnyRequestMatcher || obj instanceof org.springframework.security.web.util.matcher.AnyRequestMatcher;
-    }
+	@Override
+	@SuppressWarnings("deprecation")
+	public boolean equals(Object obj) {
+		return obj instanceof AnyRequestMatcher
+				|| obj instanceof org.springframework.security.web.util.matcher.AnyRequestMatcher;
+	}
 
-    @Override
-    public int hashCode() {
-        return 1;
-    }
+	@Override
+	public int hashCode() {
+		return 1;
+	}
 
-    private AnyRequestMatcher() {}
+	private AnyRequestMatcher() {
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java
index 8087c32dd5..495d03a690 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcher.java
@@ -28,10 +28,14 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 /**
  * A RequestMatcher implementation which uses a SpEL expression
  *
- * <p>With the default EvaluationContext ({@link ELRequestMatcherContext}) you can use
- * <code>hasIpAdress()</code> and <code>hasHeader()</code></p>
+ * <p>
+ * With the default EvaluationContext ({@link ELRequestMatcherContext}) you can use
+ * <code>hasIpAdress()</code> and <code>hasHeader()</code>
+ * </p>
  *
- * <p>See {@link DelegatingAuthenticationEntryPoint} for an example configuration.</p>
+ * <p>
+ * See {@link DelegatingAuthenticationEntryPoint} for an example configuration.
+ * </p>
  *
  *
  * @author Mike Wiesner
@@ -39,25 +43,26 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  */
 public class ELRequestMatcher implements RequestMatcher {
 
-    private final Expression expression;
+	private final Expression expression;
 
-    public ELRequestMatcher(String el) {
-        SpelExpressionParser parser = new SpelExpressionParser();
-        expression = parser.parseExpression(el);
-    }
+	public ELRequestMatcher(String el) {
+		SpelExpressionParser parser = new SpelExpressionParser();
+		expression = parser.parseExpression(el);
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        EvaluationContext context = createELContext(request);
-        return expression.getValue(context, Boolean.class).booleanValue();
-    }
+	public boolean matches(HttpServletRequest request) {
+		EvaluationContext context = createELContext(request);
+		return expression.getValue(context, Boolean.class).booleanValue();
+	}
 
-    /**
-     * Subclasses can override this methode if they want to use a different EL root context
-     *
-     * @return EL root context which is used to evaluate the expression
-     */
-    public EvaluationContext createELContext(HttpServletRequest request) {
-        return new StandardEvaluationContext(new ELRequestMatcherContext(request));
-    }
+	/**
+	 * Subclasses can override this methode if they want to use a different EL root
+	 * context
+	 *
+	 * @return EL root context which is used to evaluate the expression
+	 */
+	public EvaluationContext createELContext(HttpServletRequest request) {
+		return new StandardEvaluationContext(new ELRequestMatcherContext(request));
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java
index da15df2e7e..4b30dd5a43 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java
@@ -15,34 +15,33 @@
  */
 package org.springframework.security.web.util.matcher;
 
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.util.StringUtils;
 
 class ELRequestMatcherContext {
 
-    private final HttpServletRequest request;
+	private final HttpServletRequest request;
 
-    public ELRequestMatcherContext(HttpServletRequest request) {
-        this.request = request;
-    }
+	public ELRequestMatcherContext(HttpServletRequest request) {
+		this.request = request;
+	}
 
-    public boolean hasIpAddress(String ipAddress) {
-        return (new IpAddressMatcher(ipAddress).matches(request));
-    }
+	public boolean hasIpAddress(String ipAddress) {
+		return (new IpAddressMatcher(ipAddress).matches(request));
+	}
 
-    public boolean hasHeader(String headerName, String value) {
-        String header = request.getHeader(headerName);
-        if (!StringUtils.hasText(header)) {
-            return false;
-        }
+	public boolean hasHeader(String headerName, String value) {
+		String header = request.getHeader(headerName);
+		if (!StringUtils.hasText(header)) {
+			return false;
+		}
 
-        if (header.contains(value)) {
-            return true;
-        }
+		if (header.contains(value)) {
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java
index d63d229ef1..1cf8ff23bc 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/IpAddressMatcher.java
@@ -10,82 +10,86 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.StringUtils;
 
 /**
- * Matches a request based on IP Address or subnet mask matching against the remote address.
+ * Matches a request based on IP Address or subnet mask matching against the remote
+ * address.
  * <p>
- * Both IPv6 and IPv4 addresses are supported, but a matcher which is configured with an IPv4 address will
- * never match a request which returns an IPv6 address, and vice-versa.
+ * Both IPv6 and IPv4 addresses are supported, but a matcher which is configured with an
+ * IPv4 address will never match a request which returns an IPv6 address, and vice-versa.
  *
  * @author Luke Taylor
  * @since 3.0.2
  */
 public final class IpAddressMatcher implements RequestMatcher {
-    private final int nMaskBits;
-    private final InetAddress requiredAddress;
+	private final int nMaskBits;
+	private final InetAddress requiredAddress;
 
-    /**
-     * Takes a specific IP address or a range specified using the
-     * IP/Netmask (e.g. 192.168.1.0/24 or 202.24.0.0/14).
-     *
-     * @param ipAddress the address or range of addresses from which the request must come.
-     */
-    public IpAddressMatcher(String ipAddress) {
+	/**
+	 * Takes a specific IP address or a range specified using the IP/Netmask (e.g.
+	 * 192.168.1.0/24 or 202.24.0.0/14).
+	 *
+	 * @param ipAddress the address or range of addresses from which the request must
+	 * come.
+	 */
+	public IpAddressMatcher(String ipAddress) {
 
-        if (ipAddress.indexOf('/') > 0) {
-            String[] addressAndMask = StringUtils.split(ipAddress, "/");
-            ipAddress = addressAndMask[0];
-            nMaskBits = Integer.parseInt(addressAndMask[1]);
-        } else {
-            nMaskBits = -1;
-        }
-        requiredAddress = parseAddress(ipAddress);
-    }
+		if (ipAddress.indexOf('/') > 0) {
+			String[] addressAndMask = StringUtils.split(ipAddress, "/");
+			ipAddress = addressAndMask[0];
+			nMaskBits = Integer.parseInt(addressAndMask[1]);
+		}
+		else {
+			nMaskBits = -1;
+		}
+		requiredAddress = parseAddress(ipAddress);
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        return matches(request.getRemoteAddr());
-    }
+	public boolean matches(HttpServletRequest request) {
+		return matches(request.getRemoteAddr());
+	}
 
-    public boolean matches(String address) {
-        InetAddress remoteAddress = parseAddress(address);
+	public boolean matches(String address) {
+		InetAddress remoteAddress = parseAddress(address);
 
-        if (!requiredAddress.getClass().equals(remoteAddress.getClass())) {
-            return false;
-        }
+		if (!requiredAddress.getClass().equals(remoteAddress.getClass())) {
+			return false;
+		}
 
-        if (nMaskBits < 0) {
-            return remoteAddress.equals(requiredAddress);
-        }
+		if (nMaskBits < 0) {
+			return remoteAddress.equals(requiredAddress);
+		}
 
-        byte[] remAddr = remoteAddress.getAddress();
-        byte[] reqAddr = requiredAddress.getAddress();
+		byte[] remAddr = remoteAddress.getAddress();
+		byte[] reqAddr = requiredAddress.getAddress();
 
-        int oddBits = nMaskBits % 8;
-        int nMaskBytes = nMaskBits/8 + (oddBits == 0 ? 0 : 1);
-        byte[] mask = new byte[nMaskBytes];
+		int oddBits = nMaskBits % 8;
+		int nMaskBytes = nMaskBits / 8 + (oddBits == 0 ? 0 : 1);
+		byte[] mask = new byte[nMaskBytes];
 
-        Arrays.fill(mask, 0, oddBits == 0 ? mask.length : mask.length - 1, (byte)0xFF);
+		Arrays.fill(mask, 0, oddBits == 0 ? mask.length : mask.length - 1, (byte) 0xFF);
 
-        if (oddBits != 0) {
-            int finalByte = (1 << oddBits) - 1;
-            finalByte <<= 8-oddBits;
-            mask[mask.length - 1] = (byte) finalByte;
-        }
+		if (oddBits != 0) {
+			int finalByte = (1 << oddBits) - 1;
+			finalByte <<= 8 - oddBits;
+			mask[mask.length - 1] = (byte) finalByte;
+		}
 
- //       System.out.println("Mask is " + new sun.misc.HexDumpEncoder().encode(mask));
+		// System.out.println("Mask is " + new sun.misc.HexDumpEncoder().encode(mask));
 
-        for (int i=0; i < mask.length; i++) {
-            if ((remAddr[i] & mask[i]) != (reqAddr[i] & mask[i])) {
-                return false;
-            }
-        }
+		for (int i = 0; i < mask.length; i++) {
+			if ((remAddr[i] & mask[i]) != (reqAddr[i] & mask[i])) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    private InetAddress parseAddress(String address) {
-        try {
-            return InetAddress.getByName(address);
-        } catch (UnknownHostException e) {
-            throw new IllegalArgumentException("Failed to parse address" + address, e);
-        }
-    }
+	private InetAddress parseAddress(String address) {
+		try {
+			return InetAddress.getByName(address);
+		}
+		catch (UnknownHostException e) {
+			throw new IllegalArgumentException("Failed to parse address" + address, e);
+		}
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcher.java
index e77c161b06..c600331eec 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcher.java
@@ -33,20 +33,20 @@ import org.springframework.web.accept.ContentNegotiationStrategy;
 import org.springframework.web.context.request.ServletWebRequest;
 
 /**
- * Allows matching {@link HttpServletRequest} based upon the {@link MediaType}'s
- * resolved from a {@link ContentNegotiationStrategy}.
+ * Allows matching {@link HttpServletRequest} based upon the {@link MediaType}'s resolved
+ * from a {@link ContentNegotiationStrategy}.
  *
  * By default, the matching process will perform the following:
  *
  * <ul>
- * <li>The {@link ContentNegotiationStrategy} will resolve the {@link MediaType}
- * 's for the current request</li>
- * <li>Each matchingMediaTypes that was passed into the constructor will be
- * compared against the {@link MediaType} instances resolved from the
+ * <li>The {@link ContentNegotiationStrategy} will resolve the {@link MediaType} 's for
+ * the current request</li>
+ * <li>Each matchingMediaTypes that was passed into the constructor will be compared
+ * against the {@link MediaType} instances resolved from the
  * {@link ContentNegotiationStrategy}.</li>
  * <li>If one of the matchingMediaTypes is compatible with one of the resolved
- * {@link MediaType} returned from the {@link ContentNegotiationStrategy}, then
- * it returns true</li>
+ * {@link MediaType} returned from the {@link ContentNegotiationStrategy}, then it returns
+ * true</li>
  * </ul>
  *
  * For example, consider the following example
@@ -54,7 +54,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * <pre>
  * GET /
  * Accept: application/json
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * assert matcher.matches(request) == true // returns true
@@ -65,7 +65,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * <pre>
  * GET /
  * Accept: *&#47;*
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * assert matcher.matches(request) == true // returns true
@@ -73,14 +73,13 @@ import org.springframework.web.context.request.ServletWebRequest;
  *
  * <h3>Ignoring Media Types</h3>
  *
- * Sometimes you may want to ignore certain types of media types. For example,
- * you may want to match on "application/json" but ignore "*&#47;" sent by a web
- * browser.
+ * Sometimes you may want to ignore certain types of media types. For example, you may
+ * want to match on "application/json" but ignore "*&#47;" sent by a web browser.
  *
  * <pre>
  * GET /
  * Accept: *&#47;*
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
@@ -90,7 +89,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * <pre>
  * GET /
  * Accept: application/json
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
@@ -101,14 +100,14 @@ import org.springframework.web.context.request.ServletWebRequest;
  *
  * By default as long as the {@link MediaType} discovered by
  * {@link ContentNegotiationStrategy} returns true for
- * {@link MediaType#isCompatibleWith(MediaType)} on the matchingMediaTypes, the
- * result of the match is true. However, sometimes you may want to perform an
- * exact match. This can be done with the following examples:
+ * {@link MediaType#isCompatibleWith(MediaType)} on the matchingMediaTypes, the result of
+ * the match is true. However, sometimes you may want to perform an exact match. This can
+ * be done with the following examples:
  *
  * <pre>
  * GET /
  * Accept: application/json
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * matcher.setUseEquals(true);
@@ -118,7 +117,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * <pre>
  * GET /
  * Accept: application/*
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * matcher.setUseEquals(true);
@@ -128,7 +127,7 @@ import org.springframework.web.context.request.ServletWebRequest;
  * <pre>
  * GET /
  * Accept: *&#47;*
- *
+ * 
  * ContentNegotiationStrategy negotiationStrategy = new HeaderContentNegotiationStrategy()
  * MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
  * matcher.setUseEquals(true);
@@ -140,111 +139,116 @@ import org.springframework.web.context.request.ServletWebRequest;
  */
 
 public final class MediaTypeRequestMatcher implements RequestMatcher {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final ContentNegotiationStrategy contentNegotiationStrategy;
-    private final Collection<MediaType> matchingMediaTypes;
-    private boolean useEquals;
-    private Set<MediaType> ignoredMediaTypes = Collections.emptySet();
+	private final Log logger = LogFactory.getLog(getClass());
+	private final ContentNegotiationStrategy contentNegotiationStrategy;
+	private final Collection<MediaType> matchingMediaTypes;
+	private boolean useEquals;
+	private Set<MediaType> ignoredMediaTypes = Collections.emptySet();
 
-    /**
-     * Creates an instance
-     * @param contentNegotiationStrategy the {@link ContentNegotiationStrategy} to use
-     * @param matchingMediaTypes the {@link MediaType} that will make the {@link RequestMatcher} return true
-     */
-    public MediaTypeRequestMatcher(ContentNegotiationStrategy contentNegotiationStrategy, MediaType... matchingMediaTypes) {
-        this(contentNegotiationStrategy, Arrays.asList(matchingMediaTypes));
-    }
+	/**
+	 * Creates an instance
+	 * @param contentNegotiationStrategy the {@link ContentNegotiationStrategy} to use
+	 * @param matchingMediaTypes the {@link MediaType} that will make the
+	 * {@link RequestMatcher} return true
+	 */
+	public MediaTypeRequestMatcher(ContentNegotiationStrategy contentNegotiationStrategy,
+			MediaType... matchingMediaTypes) {
+		this(contentNegotiationStrategy, Arrays.asList(matchingMediaTypes));
+	}
 
-    /**
-     * Creates an instance
-     * @param contentNegotiationStrategy the {@link ContentNegotiationStrategy} to use
-     * @param matchingMediaTypes the {@link MediaType} that will make the {@link RequestMatcher} return true
-     */
-    public MediaTypeRequestMatcher(ContentNegotiationStrategy contentNegotiationStrategy, Collection<MediaType> matchingMediaTypes) {
-        Assert.notNull(contentNegotiationStrategy, "ContentNegotiationStrategy cannot be null");
-        Assert.notEmpty(matchingMediaTypes, "matchingMediaTypes cannot be null or empty");
-        this.contentNegotiationStrategy = contentNegotiationStrategy;
-        this.matchingMediaTypes = matchingMediaTypes;
-    }
+	/**
+	 * Creates an instance
+	 * @param contentNegotiationStrategy the {@link ContentNegotiationStrategy} to use
+	 * @param matchingMediaTypes the {@link MediaType} that will make the
+	 * {@link RequestMatcher} return true
+	 */
+	public MediaTypeRequestMatcher(ContentNegotiationStrategy contentNegotiationStrategy,
+			Collection<MediaType> matchingMediaTypes) {
+		Assert.notNull(contentNegotiationStrategy,
+				"ContentNegotiationStrategy cannot be null");
+		Assert.notEmpty(matchingMediaTypes, "matchingMediaTypes cannot be null or empty");
+		this.contentNegotiationStrategy = contentNegotiationStrategy;
+		this.matchingMediaTypes = matchingMediaTypes;
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        List<MediaType> httpRequestMediaTypes;
-        try {
-            httpRequestMediaTypes = contentNegotiationStrategy.resolveMediaTypes(new ServletWebRequest(request));
-        }
-        catch (HttpMediaTypeNotAcceptableException e) {
-            logger.debug("Failed to parse MediaTypes, returning false", e);
-            return false;
-        }
-        if(logger.isDebugEnabled()) {
-            logger.debug("httpRequestMediaTypes=" + httpRequestMediaTypes);
-        }
-        for(MediaType httpRequestMediaType : httpRequestMediaTypes) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Processing " + httpRequestMediaType);
-            }
-            if(shouldIgnore(httpRequestMediaType)) {
-                logger.debug("Ignoring");
-                continue;
-            }
-            if(useEquals) {
-                boolean isEqualTo = matchingMediaTypes.contains(httpRequestMediaType);
-                logger.debug("isEqualTo " + isEqualTo);
-                return isEqualTo;
-            }
-            for(MediaType matchingMediaType : matchingMediaTypes) {
-                boolean isCompatibleWith = matchingMediaType.isCompatibleWith(httpRequestMediaType);
-                if(logger.isDebugEnabled()) {
-                    logger.debug(matchingMediaType + " .isCompatibleWith " + httpRequestMediaType + " = " + isCompatibleWith);
-                }
-                if(isCompatibleWith) {
-                    return true;
-                }
-            }
-        }
-        logger.debug("Did not match any media types");
-        return false;
-    }
+	public boolean matches(HttpServletRequest request) {
+		List<MediaType> httpRequestMediaTypes;
+		try {
+			httpRequestMediaTypes = contentNegotiationStrategy
+					.resolveMediaTypes(new ServletWebRequest(request));
+		}
+		catch (HttpMediaTypeNotAcceptableException e) {
+			logger.debug("Failed to parse MediaTypes, returning false", e);
+			return false;
+		}
+		if (logger.isDebugEnabled()) {
+			logger.debug("httpRequestMediaTypes=" + httpRequestMediaTypes);
+		}
+		for (MediaType httpRequestMediaType : httpRequestMediaTypes) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Processing " + httpRequestMediaType);
+			}
+			if (shouldIgnore(httpRequestMediaType)) {
+				logger.debug("Ignoring");
+				continue;
+			}
+			if (useEquals) {
+				boolean isEqualTo = matchingMediaTypes.contains(httpRequestMediaType);
+				logger.debug("isEqualTo " + isEqualTo);
+				return isEqualTo;
+			}
+			for (MediaType matchingMediaType : matchingMediaTypes) {
+				boolean isCompatibleWith = matchingMediaType
+						.isCompatibleWith(httpRequestMediaType);
+				if (logger.isDebugEnabled()) {
+					logger.debug(matchingMediaType + " .isCompatibleWith "
+							+ httpRequestMediaType + " = " + isCompatibleWith);
+				}
+				if (isCompatibleWith) {
+					return true;
+				}
+			}
+		}
+		logger.debug("Did not match any media types");
+		return false;
+	}
 
-    private boolean shouldIgnore(MediaType httpRequestMediaType) {
-        for(MediaType ignoredMediaType : ignoredMediaTypes) {
-            if(httpRequestMediaType.includes(ignoredMediaType)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	private boolean shouldIgnore(MediaType httpRequestMediaType) {
+		for (MediaType ignoredMediaType : ignoredMediaTypes) {
+			if (httpRequestMediaType.includes(ignoredMediaType)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-    /**
-     * If set to true, matches on exact {@link MediaType}, else uses
-     * {@link MediaType#isCompatibleWith(MediaType)}.
-     *
-     * @param useEquals
-     *            specify if equals comparison should be used.
-     */
-    public void setUseEquals(boolean useEquals) {
-        this.useEquals = useEquals;
-    }
+	/**
+	 * If set to true, matches on exact {@link MediaType}, else uses
+	 * {@link MediaType#isCompatibleWith(MediaType)}.
+	 *
+	 * @param useEquals specify if equals comparison should be used.
+	 */
+	public void setUseEquals(boolean useEquals) {
+		this.useEquals = useEquals;
+	}
 
-    /**
-     * Set the {@link MediaType} to ignore from the
-     * {@link ContentNegotiationStrategy}. This is useful if for example, you
-     * want to match on {@link MediaType#APPLICATION_JSON} but want to ignore
-     * {@link MediaType#ALL}.
-     *
-     * @param ignoredMediaTypes
-     *            the {@link MediaType}'s to ignore from the
-     *            {@link ContentNegotiationStrategy}
-     */
-    public void setIgnoredMediaTypes(Set<MediaType> ignoredMediaTypes) {
-        this.ignoredMediaTypes = ignoredMediaTypes;
-    }
+	/**
+	 * Set the {@link MediaType} to ignore from the {@link ContentNegotiationStrategy}.
+	 * This is useful if for example, you want to match on
+	 * {@link MediaType#APPLICATION_JSON} but want to ignore {@link MediaType#ALL}.
+	 *
+	 * @param ignoredMediaTypes the {@link MediaType}'s to ignore from the
+	 * {@link ContentNegotiationStrategy}
+	 */
+	public void setIgnoredMediaTypes(Set<MediaType> ignoredMediaTypes) {
+		this.ignoredMediaTypes = ignoredMediaTypes;
+	}
 
-    @Override
-    public String toString() {
-        return "MediaTypeRequestMatcher [contentNegotiationStrategy="
-                + contentNegotiationStrategy + ", matchingMediaTypes="
-                + matchingMediaTypes + ", useEquals=" + useEquals
-                + ", ignoredMediaTypes=" + ignoredMediaTypes + "]";
-    }
+	@Override
+	public String toString() {
+		return "MediaTypeRequestMatcher [contentNegotiationStrategy="
+				+ contentNegotiationStrategy + ", matchingMediaTypes="
+				+ matchingMediaTypes + ", useEquals=" + useEquals
+				+ ", ignoredMediaTypes=" + ignoredMediaTypes + "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java
index 7c0fa5fa37..4664aea434 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/NegatedRequestMatcher.java
@@ -23,38 +23,38 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * A {@link RequestMatcher} that will negate the {@link RequestMatcher} passed
- * in. For example, if the {@link RequestMatcher} passed in returns true,
- * {@link NegatedRequestMatcher} will return false. If the {@link RequestMatcher}
- * passed in returns false, {@link NegatedRequestMatcher} will return true.
+ * A {@link RequestMatcher} that will negate the {@link RequestMatcher} passed in. For
+ * example, if the {@link RequestMatcher} passed in returns true,
+ * {@link NegatedRequestMatcher} will return false. If the {@link RequestMatcher} passed
+ * in returns false, {@link NegatedRequestMatcher} will return true.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public class NegatedRequestMatcher implements RequestMatcher {
-    private final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
-    private final RequestMatcher requestMatcher;
+	private final RequestMatcher requestMatcher;
 
-    /**
-     * Creates a new instance
-     * @param requestMatcher the {@link RequestMatcher} that will be negated.
-     */
-    public NegatedRequestMatcher(RequestMatcher requestMatcher) {
-        Assert.notNull(requestMatcher, "requestMatcher cannot be null");
-        this.requestMatcher = requestMatcher;
-    }
+	/**
+	 * Creates a new instance
+	 * @param requestMatcher the {@link RequestMatcher} that will be negated.
+	 */
+	public NegatedRequestMatcher(RequestMatcher requestMatcher) {
+		Assert.notNull(requestMatcher, "requestMatcher cannot be null");
+		this.requestMatcher = requestMatcher;
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        boolean result = !requestMatcher.matches(request);
-        if(logger.isDebugEnabled()) {
-            logger.debug("matches = " + result);
-        }
-        return result;
-    }
+	public boolean matches(HttpServletRequest request) {
+		boolean result = !requestMatcher.matches(request);
+		if (logger.isDebugEnabled()) {
+			logger.debug("matches = " + result);
+		}
+		return result;
+	}
 
-    @Override
-    public String toString() {
-        return "NegatedRequestMatcher [requestMatcher=" + requestMatcher + "]";
-    }
+	@Override
+	public String toString() {
+		return "NegatedRequestMatcher [requestMatcher=" + requestMatcher + "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java
index 62eefdf2c7..9402dd90c8 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/OrRequestMatcher.java
@@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
-
 /**
  * {@link RequestMatcher} that will return true if any of the passed in
  * {@link RequestMatcher} instances match.
@@ -34,47 +33,48 @@ import org.springframework.util.Assert;
  * @since 3.2
  */
 public final class OrRequestMatcher implements RequestMatcher {
-    private final Log logger = LogFactory.getLog(getClass());
-    private final List<RequestMatcher> requestMatchers;
+	private final Log logger = LogFactory.getLog(getClass());
+	private final List<RequestMatcher> requestMatchers;
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances to try
-     */
-    public OrRequestMatcher(List<RequestMatcher> requestMatchers) {
-        Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
-        if(requestMatchers.contains(null)) {
-            throw new IllegalArgumentException("requestMatchers cannot contain null values");
-        }
-        this.requestMatchers = requestMatchers;
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances to try
+	 */
+	public OrRequestMatcher(List<RequestMatcher> requestMatchers) {
+		Assert.notEmpty(requestMatchers, "requestMatchers must contain a value");
+		if (requestMatchers.contains(null)) {
+			throw new IllegalArgumentException(
+					"requestMatchers cannot contain null values");
+		}
+		this.requestMatchers = requestMatchers;
+	}
 
-    /**
-     * Creates a new instance
-     *
-     * @param requestMatchers the {@link RequestMatcher} instances to try
-     */
-    public OrRequestMatcher(RequestMatcher... requestMatchers) {
-        this(Arrays.asList(requestMatchers));
-    }
+	/**
+	 * Creates a new instance
+	 *
+	 * @param requestMatchers the {@link RequestMatcher} instances to try
+	 */
+	public OrRequestMatcher(RequestMatcher... requestMatchers) {
+		this(Arrays.asList(requestMatchers));
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        for(RequestMatcher matcher : requestMatchers) {
-            if(logger.isDebugEnabled()) {
-                logger.debug("Trying to match using " + matcher);
-            }
-            if(matcher.matches(request)) {
-                logger.debug("matched");
-                return true;
-            }
-        }
-        logger.debug("No matches found");
-        return false;
-    }
+	public boolean matches(HttpServletRequest request) {
+		for (RequestMatcher matcher : requestMatchers) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Trying to match using " + matcher);
+			}
+			if (matcher.matches(request)) {
+				logger.debug("matched");
+				return true;
+			}
+		}
+		logger.debug("No matches found");
+		return false;
+	}
 
-    @Override
-    public String toString() {
-        return "OrRequestMatcher [requestMatchers=" + requestMatchers + "]";
-    }
+	@Override
+	public String toString() {
+		return "OrRequestMatcher [requestMatchers=" + requestMatchers + "]";
+	}
 }
\ No newline at end of file
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java
index 46a6b3acce..e0fff6cc82 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/RegexRequestMatcher.java
@@ -23,99 +23,108 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.StringUtils;
 
 /**
- * Uses a regular expression to decide whether a supplied the URL of a supplied {@code HttpServletRequest}.
+ * Uses a regular expression to decide whether a supplied the URL of a supplied
+ * {@code HttpServletRequest}.
  *
  * Can also be configured to match a specific HTTP method.
  *
- * The match is performed against the {@code servletPath + pathInfo + queryString} of the request and is case-sensitive
- * by default. Case-insensitive matching can be used by using the constructor which takes the {@code caseInsensitive}
- * argument.
+ * The match is performed against the {@code servletPath + pathInfo + queryString} of the
+ * request and is case-sensitive by default. Case-insensitive matching can be used by
+ * using the constructor which takes the {@code caseInsensitive} argument.
  *
  * @author Luke Taylor
  * @author Rob Winch
  * @since 3.1
  */
 public final class RegexRequestMatcher implements RequestMatcher {
-    private final static Log logger = LogFactory.getLog(RegexRequestMatcher.class);
+	private final static Log logger = LogFactory.getLog(RegexRequestMatcher.class);
 
-    private final Pattern pattern;
-    private final HttpMethod httpMethod;
+	private final Pattern pattern;
+	private final HttpMethod httpMethod;
 
-    /**
-     * Creates a case-sensitive {@code Pattern} instance to match against the request.
-     *
-     * @param pattern the regular expression to compile into a pattern.
-     * @param httpMethod the HTTP method to match. May be null to match all methods.
-     */
-    public RegexRequestMatcher(String pattern, String httpMethod) {
-        this(pattern, httpMethod, false);
-    }
+	/**
+	 * Creates a case-sensitive {@code Pattern} instance to match against the request.
+	 *
+	 * @param pattern the regular expression to compile into a pattern.
+	 * @param httpMethod the HTTP method to match. May be null to match all methods.
+	 */
+	public RegexRequestMatcher(String pattern, String httpMethod) {
+		this(pattern, httpMethod, false);
+	}
 
-    /**
-     * As above, but allows setting of whether case-insensitive matching should be used.
-     *
-     * @param pattern the regular expression to compile into a pattern.
-     * @param httpMethod the HTTP method to match. May be null to match all methods.
-     * @param caseInsensitive if true, the pattern will be compiled with the {@link Pattern#CASE_INSENSITIVE} flag set.
-     */
-    public RegexRequestMatcher(String pattern, String httpMethod, boolean caseInsensitive) {
-        if (caseInsensitive) {
-            this.pattern = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE);
-        } else {
-            this.pattern = Pattern.compile(pattern);
-        }
-        this.httpMethod = StringUtils.hasText(httpMethod) ? HttpMethod.valueOf(httpMethod) : null;
-    }
+	/**
+	 * As above, but allows setting of whether case-insensitive matching should be used.
+	 *
+	 * @param pattern the regular expression to compile into a pattern.
+	 * @param httpMethod the HTTP method to match. May be null to match all methods.
+	 * @param caseInsensitive if true, the pattern will be compiled with the
+	 * {@link Pattern#CASE_INSENSITIVE} flag set.
+	 */
+	public RegexRequestMatcher(String pattern, String httpMethod, boolean caseInsensitive) {
+		if (caseInsensitive) {
+			this.pattern = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE);
+		}
+		else {
+			this.pattern = Pattern.compile(pattern);
+		}
+		this.httpMethod = StringUtils.hasText(httpMethod) ? HttpMethod
+				.valueOf(httpMethod) : null;
+	}
 
-    /**
-     * Performs the match of the request URL ({@code servletPath + pathInfo + queryString}) against
-     * the compiled pattern. If the query string is present, a question mark will be prepended.
-     *
-     * @param request the request to match
-     * @return true if the pattern matches the URL, false otherwise.
-     */
-    public boolean matches(HttpServletRequest request) {
-        if (httpMethod != null && request.getMethod() != null && httpMethod != valueOf(request.getMethod())) {
-            return false;
-        }
+	/**
+	 * Performs the match of the request URL ({@code servletPath + pathInfo + queryString}
+	 * ) against the compiled pattern. If the query string is present, a question mark
+	 * will be prepended.
+	 *
+	 * @param request the request to match
+	 * @return true if the pattern matches the URL, false otherwise.
+	 */
+	public boolean matches(HttpServletRequest request) {
+		if (httpMethod != null && request.getMethod() != null
+				&& httpMethod != valueOf(request.getMethod())) {
+			return false;
+		}
 
-        String url = request.getServletPath();
-        String pathInfo = request.getPathInfo();
-        String query = request.getQueryString();
+		String url = request.getServletPath();
+		String pathInfo = request.getPathInfo();
+		String query = request.getQueryString();
 
-        if (pathInfo != null || query != null) {
-            StringBuilder sb = new StringBuilder(url);
+		if (pathInfo != null || query != null) {
+			StringBuilder sb = new StringBuilder(url);
 
-            if (pathInfo != null) {
-                sb.append(pathInfo);
-            }
+			if (pathInfo != null) {
+				sb.append(pathInfo);
+			}
 
-            if (query != null) {
-                sb.append('?').append(query);
-            }
-            url = sb.toString();
-        }
+			if (query != null) {
+				sb.append('?').append(query);
+			}
+			url = sb.toString();
+		}
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Checking match of request : '" + url + "'; against '" + pattern + "'");
-        }
+		if (logger.isDebugEnabled()) {
+			logger.debug("Checking match of request : '" + url + "'; against '" + pattern
+					+ "'");
+		}
 
-        return pattern.matcher(url).matches();
-    }
+		return pattern.matcher(url).matches();
+	}
 
+	/**
+	 * Provides a save way of obtaining the HttpMethod from a String. If the method is
+	 * invalid, returns null.
+	 *
+	 * @param method the HTTP method to use.
+	 *
+	 * @return the HttpMethod or null if method is invalid.
+	 */
+	private static HttpMethod valueOf(String method) {
+		try {
+			return HttpMethod.valueOf(method);
+		}
+		catch (IllegalArgumentException e) {
+		}
 
-    /**
-     * Provides a save way of obtaining the HttpMethod from a String. If the method is invalid, returns null.
-     *
-     * @param method the HTTP method to use.
-     *
-     * @return the HttpMethod or null if method is invalid.
-     */
-    private static HttpMethod valueOf(String method) {
-        try {
-            return HttpMethod.valueOf(method);
-        } catch(IllegalArgumentException e) {}
-
-        return null;
-    }
+		return null;
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java
index 335916699b..a8cbbcafed 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcher.java
@@ -21,83 +21,79 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**
- * A {@link RequestMatcher} that can be used to match request that contain a
- * header with an expected header name and an expected value.
+ * A {@link RequestMatcher} that can be used to match request that contain a header with
+ * an expected header name and an expected value.
  *
  * <p>
- * For example, the following will match an request that contains a header with
- * the name X-Requested-With no matter what the value is.
+ * For example, the following will match an request that contains a header with the name
+ * X-Requested-With no matter what the value is.
  * </p>
  *
  * <pre>
  * RequestMatcher matcher = new RequestHeaderRequestMatcher(&quot;X-Requested-With&quot;);
  * </pre>
  *
- * Alternatively, the RequestHeaderRequestMatcher can be more precise and
- * require a specific value. For example the following will match on requests
- * with the header name of X-Requested-With with the value of "XMLHttpRequest",
- * but will not match on header name of "X-Requested-With" with the value of
- * "Other".
+ * Alternatively, the RequestHeaderRequestMatcher can be more precise and require a
+ * specific value. For example the following will match on requests with the header name
+ * of X-Requested-With with the value of "XMLHttpRequest", but will not match on header
+ * name of "X-Requested-With" with the value of "Other".
  *
  * <pre>
  * RequestMatcher matcher = new RequestHeaderRequestMatcher(&quot;X-Requested-With&quot;,
  * 		&quot;XMLHttpRequest&quot;);
  * </pre>
  *
- * The value used to compare is the first header value, so in the previous
- * example if the header "X-Requested-With" contains the values "Other" and
- * "XMLHttpRequest", then it will not match.
+ * The value used to compare is the first header value, so in the previous example if the
+ * header "X-Requested-With" contains the values "Other" and "XMLHttpRequest", then it
+ * will not match.
  *
  * @author Rob Winch
  * @since 3.2
  */
 public final class RequestHeaderRequestMatcher implements RequestMatcher {
-    private final String expectedHeaderName;
-    private final String expectedHeaderValue;
+	private final String expectedHeaderName;
+	private final String expectedHeaderValue;
 
-    /**
-     * Creates a new instance that will match if a header by the name of
-     * {@link #expectedHeaderName} is present. In this instance, the value does
-     * not matter.
-     *
-     * @param expectedHeaderName
-     *            the name of the expected header that if present the request
-     *            will match. Cannot be null.
-     */
-    public RequestHeaderRequestMatcher(String expectedHeaderName) {
-        this(expectedHeaderName, null);
-    }
+	/**
+	 * Creates a new instance that will match if a header by the name of
+	 * {@link #expectedHeaderName} is present. In this instance, the value does not
+	 * matter.
+	 *
+	 * @param expectedHeaderName the name of the expected header that if present the
+	 * request will match. Cannot be null.
+	 */
+	public RequestHeaderRequestMatcher(String expectedHeaderName) {
+		this(expectedHeaderName, null);
+	}
 
-    /**
-     * Creates a new instance that will match if a header by the name of
-     * {@link #expectedHeaderName} is present and if the
-     * {@link #expectedHeaderValue} is non-null the first value is the same.
-     *
-     * @param expectedHeaderName
-     *            the name of the expected header. Cannot be null
-     * @param expectedHeaderValue
-     *            the expected header value or null if the value does not matter
-     */
-    public RequestHeaderRequestMatcher(String expectedHeaderName,
-            String expectedHeaderValue) {
-        Assert.notNull(expectedHeaderName, "headerName cannot be null");
-        this.expectedHeaderName = expectedHeaderName;
-        this.expectedHeaderValue = expectedHeaderValue;
-    }
+	/**
+	 * Creates a new instance that will match if a header by the name of
+	 * {@link #expectedHeaderName} is present and if the {@link #expectedHeaderValue} is
+	 * non-null the first value is the same.
+	 *
+	 * @param expectedHeaderName the name of the expected header. Cannot be null
+	 * @param expectedHeaderValue the expected header value or null if the value does not
+	 * matter
+	 */
+	public RequestHeaderRequestMatcher(String expectedHeaderName,
+			String expectedHeaderValue) {
+		Assert.notNull(expectedHeaderName, "headerName cannot be null");
+		this.expectedHeaderName = expectedHeaderName;
+		this.expectedHeaderValue = expectedHeaderValue;
+	}
 
-    public boolean matches(HttpServletRequest request) {
-        String actualHeaderValue = request.getHeader(expectedHeaderName);
-        if (expectedHeaderValue == null) {
-            return actualHeaderValue != null;
-        }
+	public boolean matches(HttpServletRequest request) {
+		String actualHeaderValue = request.getHeader(expectedHeaderName);
+		if (expectedHeaderValue == null) {
+			return actualHeaderValue != null;
+		}
 
-        return expectedHeaderValue.equals(actualHeaderValue);
-    }
+		return expectedHeaderValue.equals(actualHeaderValue);
+	}
 
-    @Override
-    public String toString() {
-        return "RequestHeaderRequestMatcher [expectedHeaderName="
-                + expectedHeaderName + ", expectedHeaderValue="
-                + expectedHeaderValue + "]";
-    }
+	@Override
+	public String toString() {
+		return "RequestHeaderRequestMatcher [expectedHeaderName=" + expectedHeaderName
+				+ ", expectedHeaderValue=" + expectedHeaderValue + "]";
+	}
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcher.java b/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcher.java
index 7b6a84cb85..ff3330e943 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcher.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcher.java
@@ -10,12 +10,12 @@ import javax.servlet.http.HttpServletRequest;
  */
 public interface RequestMatcher {
 
-    /**
-     * Decides whether the rule implemented by the strategy matches the supplied request.
-     *
-     * @param request the request to check for a match
-     * @return true if the request matches, false otherwise
-     */
-    boolean matches(HttpServletRequest request);
+	/**
+	 * Decides whether the rule implemented by the strategy matches the supplied request.
+	 *
+	 * @param request the request to check for a match
+	 * @return true if the request matches, false otherwise
+	 */
+	boolean matches(HttpServletRequest request);
 
 }
diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcherEditor.java b/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcherEditor.java
index 9c847dfa21..d7c019697e 100644
--- a/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcherEditor.java
+++ b/web/src/main/java/org/springframework/security/web/util/matcher/RequestMatcherEditor.java
@@ -23,17 +23,17 @@ import org.springframework.security.web.authentication.DelegatingAuthenticationE
 /**
  * PropertyEditor which creates ELRequestMatcher instances from Strings
  *
- * This allows to use a String in a BeanDefinition instead of an (inner) bean
- * if a RequestMatcher is required, e.g. in {@link DelegatingAuthenticationEntryPoint}
+ * This allows to use a String in a BeanDefinition instead of an (inner) bean if a
+ * RequestMatcher is required, e.g. in {@link DelegatingAuthenticationEntryPoint}
  *
  * @author Mike Wiesner
  * @since 3.0.2
  */
 public class RequestMatcherEditor extends PropertyEditorSupport {
 
-    @Override
-    public void setAsText(String text) throws IllegalArgumentException {
-        setValue(new ELRequestMatcher(text));
-    }
+	@Override
+	public void setAsText(String text) throws IllegalArgumentException {
+		setValue(new ELRequestMatcher(text));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/MockFilterConfig.java b/web/src/test/java/org/springframework/security/MockFilterConfig.java
index 0b79951107..680150f8a6 100644
--- a/web/src/test/java/org/springframework/security/MockFilterConfig.java
+++ b/web/src/test/java/org/springframework/security/MockFilterConfig.java
@@ -22,41 +22,43 @@ import java.util.Map;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
 
-
 /**
  *
  * @author Ben Alex
  */
 @SuppressWarnings("unchecked")
 public class MockFilterConfig implements FilterConfig {
-    //~ Instance fields ================================================================================================
-    private Map map = new HashMap();
+	// ~ Instance fields
+	// ================================================================================================
+	private Map map = new HashMap();
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public String getFilterName() {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
+	public String getFilterName() {
+		throw new UnsupportedOperationException("mock method not implemented");
+	}
 
-    public String getInitParameter(String arg0) {
-        Object result = map.get(arg0);
+	public String getInitParameter(String arg0) {
+		Object result = map.get(arg0);
 
-        if (result != null) {
-            return (String) result;
-        } else {
-            return null;
-        }
-    }
+		if (result != null) {
+			return (String) result;
+		}
+		else {
+			return null;
+		}
+	}
 
-    public Enumeration getInitParameterNames() {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
+	public Enumeration getInitParameterNames() {
+		throw new UnsupportedOperationException("mock method not implemented");
+	}
 
-    public ServletContext getServletContext() {
-        throw new UnsupportedOperationException("mock method not implemented");
-    }
+	public ServletContext getServletContext() {
+		throw new UnsupportedOperationException("mock method not implemented");
+	}
 
-    public void setInitParmeter(String parameter, String value) {
-        map.put(parameter, value);
-    }
+	public void setInitParmeter(String parameter, String value) {
+		map.put(parameter, value);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/MockPortResolver.java b/web/src/test/java/org/springframework/security/MockPortResolver.java
index c90b2b1ef8..d4d61cca20 100644
--- a/web/src/test/java/org/springframework/security/MockPortResolver.java
+++ b/web/src/test/java/org/springframework/security/MockPortResolver.java
@@ -19,32 +19,35 @@ import org.springframework.security.web.PortResolver;
 
 import javax.servlet.ServletRequest;
 
-
 /**
  * Always returns the constructor-specified HTTP and HTTPS ports.
  *
  * @author Ben Alex
  */
 public class MockPortResolver implements PortResolver {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private int http = 80;
-    private int https = 443;
+	private int http = 80;
+	private int https = 443;
 
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public MockPortResolver(int http, int https) {
-        this.http = http;
-        this.https = https;
-    }
+	public MockPortResolver(int http, int https) {
+		this.http = http;
+		this.https = https;
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public int getServerPort(ServletRequest request) {
-        if ((request.getScheme() != null) && request.getScheme().equals("https")) {
-            return https;
-        } else {
-            return http;
-        }
-    }
+	public int getServerPort(ServletRequest request) {
+		if ((request.getScheme() != null) && request.getScheme().equals("https")) {
+			return https;
+		}
+		else {
+			return http;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java b/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java
index 81f5c702cd..40db4d2ef8 100644
--- a/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/DefaultRedirectStrategyTests.java
@@ -12,30 +12,33 @@ import org.springframework.mock.web.MockHttpServletResponse;
  * @since 3.0
  */
 public class DefaultRedirectStrategyTests {
-    @Test
-    public void contextRelativeUrlWithContextNameInHostnameIsHandledCorrectly() throws Exception {
-        DefaultRedirectStrategy rds = new DefaultRedirectStrategy();
-        rds.setContextRelative(true);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("/context");
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void contextRelativeUrlWithContextNameInHostnameIsHandledCorrectly()
+			throws Exception {
+		DefaultRedirectStrategy rds = new DefaultRedirectStrategy();
+		rds.setContextRelative(true);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("/context");
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        rds.sendRedirect(request, response, "http://context.blah.com/context/remainder");
+		rds.sendRedirect(request, response, "http://context.blah.com/context/remainder");
 
-        assertEquals("remainder", response.getRedirectedUrl());
-    }
+		assertEquals("remainder", response.getRedirectedUrl());
+	}
 
-    // SEC-2177
-    @Test
-    public void contextRelativeUrlWithMultipleSchemesInHostnameIsHandledCorrectly() throws Exception {
-        DefaultRedirectStrategy rds = new DefaultRedirectStrategy();
-        rds.setContextRelative(true);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("/context");
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	// SEC-2177
+	@Test
+	public void contextRelativeUrlWithMultipleSchemesInHostnameIsHandledCorrectly()
+			throws Exception {
+		DefaultRedirectStrategy rds = new DefaultRedirectStrategy();
+		rds.setContextRelative(true);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("/context");
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        rds.sendRedirect(request, response, "http://http://context.blah.com/context/remainder");
+		rds.sendRedirect(request, response,
+				"http://http://context.blah.com/context/remainder");
 
-        assertEquals("remainder", response.getRedirectedUrl());
-    }
+		assertEquals("remainder", response.getRedirectedUrl());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
index b67017adc2..4c9c5407b6 100644
--- a/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
+++ b/web/src/test/java/org/springframework/security/web/FilterChainProxyTests.java
@@ -29,189 +29,215 @@ import java.util.*;
  * @author Rob Winch
  */
 public class FilterChainProxyTests {
-    private FilterChainProxy fcp;
-    private RequestMatcher matcher;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private FilterChain chain;
-    private Filter filter;
+	private FilterChainProxy fcp;
+	private RequestMatcher matcher;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private FilterChain chain;
+	private Filter filter;
 
-    @Before
-    public void setup() throws Exception {
-        matcher = mock(RequestMatcher.class);
-        filter = mock(Filter.class);
-        doAnswer(new Answer<Object>() {
-                    public Object answer(InvocationOnMock inv) throws Throwable {
-                        Object[] args = inv.getArguments();
-                        FilterChain fc = (FilterChain) args[2];
-                        HttpServletRequestWrapper extraWrapper =
-                                new HttpServletRequestWrapper((HttpServletRequest) args[0]);
-                        fc.doFilter(extraWrapper, (HttpServletResponse) args[1]);
-                        return null;
-                    }
-                }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
-        fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, Arrays.asList(filter)));
-        fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class));
-        request = new MockHttpServletRequest();
-        request.setServletPath("/path");
-        response = new MockHttpServletResponse();
-        chain = mock(FilterChain.class);
-    }
+	@Before
+	public void setup() throws Exception {
+		matcher = mock(RequestMatcher.class);
+		filter = mock(Filter.class);
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock inv) throws Throwable {
+				Object[] args = inv.getArguments();
+				FilterChain fc = (FilterChain) args[2];
+				HttpServletRequestWrapper extraWrapper = new HttpServletRequestWrapper(
+						(HttpServletRequest) args[0]);
+				fc.doFilter(extraWrapper, (HttpServletResponse) args[1]);
+				return null;
+			}
+		}).when(filter).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
+		fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher,
+				Arrays.asList(filter)));
+		fcp.setFilterChainValidator(mock(FilterChainProxy.FilterChainValidator.class));
+		request = new MockHttpServletRequest();
+		request.setServletPath("/path");
+		response = new MockHttpServletResponse();
+		chain = mock(FilterChain.class);
+	}
 
-    @After
-    public void teardown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void teardown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void toStringCallSucceeds() throws Exception {
-        fcp.afterPropertiesSet();
-        fcp.toString();
-    }
+	@Test
+	public void toStringCallSucceeds() throws Exception {
+		fcp.afterPropertiesSet();
+		fcp.toString();
+	}
 
-    @Test
-    public void securityFilterChainIsNotInvokedIfMatchFails() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
-        fcp.doFilter(request, response, chain);
-        assertEquals(1, fcp.getFilterChains().size());
-        assertSame(filter, fcp.getFilterChains().get(0).getFilters().get(0));
+	@Test
+	public void securityFilterChainIsNotInvokedIfMatchFails() throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
+		fcp.doFilter(request, response, chain);
+		assertEquals(1, fcp.getFilterChains().size());
+		assertSame(filter, fcp.getFilterChains().get(0).getFilters().get(0));
 
-        verifyZeroInteractions(filter);
-        // The actual filter chain should be invoked though
-        verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		verifyZeroInteractions(filter);
+		// The actual filter chain should be invoked though
+		verify(chain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void originalChainIsInvokedAfterSecurityChainIfMatchSucceeds() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        fcp.doFilter(request, response, chain);
+	@Test
+	public void originalChainIsInvokedAfterSecurityChainIfMatchSucceeds()
+			throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		fcp.doFilter(request, response, chain);
 
-        verify(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
-        verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		verify(filter).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
+		verify(chain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void originalFilterChainIsInvokedIfMatchingSecurityChainIsEmpty() throws Exception {
-        List<Filter> noFilters = Collections.emptyList();
-        fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, noFilters));
+	@Test
+	public void originalFilterChainIsInvokedIfMatchingSecurityChainIsEmpty()
+			throws Exception {
+		List<Filter> noFilters = Collections.emptyList();
+		fcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, noFilters));
 
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        fcp.doFilter(request, response, chain);
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		fcp.doFilter(request, response, chain);
 
-        verify(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		verify(chain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void requestIsWrappedForMatchingAndFilteringWhenMatchIsFound() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        fcp.doFilter(request, response, chain);
-        verify(matcher).matches(any(FirewalledRequest.class));
-        verify(filter).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
-        verify(chain).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class));
-    }
+	@Test
+	public void requestIsWrappedForMatchingAndFilteringWhenMatchIsFound()
+			throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		fcp.doFilter(request, response, chain);
+		verify(matcher).matches(any(FirewalledRequest.class));
+		verify(filter).doFilter(any(FirewalledRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
+		verify(chain).doFilter(any(FirewalledRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void requestIsWrappedForMatchingAndFilteringWhenMatchIsNotFound() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
-        fcp.doFilter(request, response, chain);
-        verify(matcher).matches(any(FirewalledRequest.class));
-        verifyZeroInteractions(filter);
-        verify(chain).doFilter(any(FirewalledRequest.class), any(HttpServletResponse.class));
-    }
+	@Test
+	public void requestIsWrappedForMatchingAndFilteringWhenMatchIsNotFound()
+			throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
+		fcp.doFilter(request, response, chain);
+		verify(matcher).matches(any(FirewalledRequest.class));
+		verifyZeroInteractions(filter);
+		verify(chain).doFilter(any(FirewalledRequest.class),
+				any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void wrapperIsResetWhenNoMatchingFilters() throws Exception {
-        HttpFirewall fw = mock(HttpFirewall.class);
-        FirewalledRequest fwr = mock (FirewalledRequest.class);
-        when(fwr.getRequestURI()).thenReturn("/");
-        when(fwr.getContextPath()).thenReturn("");
-        fcp.setFirewall(fw);
-        when(fw.getFirewalledRequest(request)).thenReturn(fwr);
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
-        fcp.doFilter(request, response, chain);
-        verify(fwr).reset();
-    }
+	@Test
+	public void wrapperIsResetWhenNoMatchingFilters() throws Exception {
+		HttpFirewall fw = mock(HttpFirewall.class);
+		FirewalledRequest fwr = mock(FirewalledRequest.class);
+		when(fwr.getRequestURI()).thenReturn("/");
+		when(fwr.getContextPath()).thenReturn("");
+		fcp.setFirewall(fw);
+		when(fw.getFirewalledRequest(request)).thenReturn(fwr);
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(false);
+		fcp.doFilter(request, response, chain);
+		verify(fwr).reset();
+	}
 
-    // SEC-1639
-    @Test
-    public void bothWrappersAreResetWithNestedFcps() throws Exception {
-        HttpFirewall fw = mock(HttpFirewall.class);
-        FilterChainProxy firstFcp = new FilterChainProxy(new DefaultSecurityFilterChain(matcher, fcp));
-        firstFcp.setFirewall(fw);
-        fcp.setFirewall(fw);
-        FirewalledRequest firstFwr = mock(FirewalledRequest.class, "firstFwr");
-        when(firstFwr.getRequestURI()).thenReturn("/");
-        when(firstFwr.getContextPath()).thenReturn("");
-        FirewalledRequest fwr = mock(FirewalledRequest.class, "fwr");
-        when(fwr.getRequestURI()).thenReturn("/");
-        when(fwr.getContextPath()).thenReturn("");
-        when(fw.getFirewalledRequest(request)).thenReturn(firstFwr);
-        when(fw.getFirewalledRequest(firstFwr)).thenReturn(fwr);
-        when(fwr.getRequest()).thenReturn(firstFwr);
-        when(firstFwr.getRequest()).thenReturn(request);
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        firstFcp.doFilter(request, response, chain);
-        verify(firstFwr).reset();
-        verify(fwr).reset();
-    }
+	// SEC-1639
+	@Test
+	public void bothWrappersAreResetWithNestedFcps() throws Exception {
+		HttpFirewall fw = mock(HttpFirewall.class);
+		FilterChainProxy firstFcp = new FilterChainProxy(new DefaultSecurityFilterChain(
+				matcher, fcp));
+		firstFcp.setFirewall(fw);
+		fcp.setFirewall(fw);
+		FirewalledRequest firstFwr = mock(FirewalledRequest.class, "firstFwr");
+		when(firstFwr.getRequestURI()).thenReturn("/");
+		when(firstFwr.getContextPath()).thenReturn("");
+		FirewalledRequest fwr = mock(FirewalledRequest.class, "fwr");
+		when(fwr.getRequestURI()).thenReturn("/");
+		when(fwr.getContextPath()).thenReturn("");
+		when(fw.getFirewalledRequest(request)).thenReturn(firstFwr);
+		when(fw.getFirewalledRequest(firstFwr)).thenReturn(fwr);
+		when(fwr.getRequest()).thenReturn(firstFwr);
+		when(firstFwr.getRequest()).thenReturn(request);
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		firstFcp.doFilter(request, response, chain);
+		verify(firstFwr).reset();
+		verify(fwr).reset();
+	}
 
-    @Test
-    public void doFilterClearsSecurityContextHolder() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        doAnswer(new Answer<Object>() {
-            public Object answer(InvocationOnMock inv) throws Throwable {
-                SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("username", "password"));
-                return null;
-            }
-        }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
+	@Test
+	public void doFilterClearsSecurityContextHolder() throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock inv) throws Throwable {
+				SecurityContextHolder.getContext().setAuthentication(
+						new TestingAuthenticationToken("username", "password"));
+				return null;
+			}
+		}).when(filter).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
 
-        fcp.doFilter(request, response, chain);
+		fcp.doFilter(request, response, chain);
 
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void doFilterClearsSecurityContextHolderWithException() throws Exception {
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        doAnswer(new Answer<Object>() {
-            public Object answer(InvocationOnMock inv) throws Throwable {
-                SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("username", "password"));
-                throw new ServletException("oops");
-            }
-        }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
+	@Test
+	public void doFilterClearsSecurityContextHolderWithException() throws Exception {
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock inv) throws Throwable {
+				SecurityContextHolder.getContext().setAuthentication(
+						new TestingAuthenticationToken("username", "password"));
+				throw new ServletException("oops");
+			}
+		}).when(filter).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
 
-        try {
-            fcp.doFilter(request, response, chain);
-            fail("Expected Exception");
-        }catch(ServletException success) {}
+		try {
+			fcp.doFilter(request, response, chain);
+			fail("Expected Exception");
+		}
+		catch (ServletException success) {
+		}
 
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    // SEC-2027
-    @Test
-    public void doFilterClearsSecurityContextHolderOnceOnForwards() throws Exception {
-        final FilterChain innerChain = mock(FilterChain.class);
-        when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
-        doAnswer(new Answer<Object>() {
-            public Object answer(InvocationOnMock inv) throws Throwable {
-                TestingAuthenticationToken expected = new TestingAuthenticationToken("username", "password");
-                SecurityContextHolder.getContext().setAuthentication(expected);
-                doAnswer(new Answer<Object>() {
-                    public Object answer(InvocationOnMock inv) throws Throwable {
-                        innerChain.doFilter(request, response);
-                        return null;
-                    }
-                }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));;
-                fcp.doFilter(request, response, innerChain);
-                assertSame(expected, SecurityContextHolder.getContext().getAuthentication());
-                return null;
-            }
-        }).when(filter).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class), any(FilterChain.class));
+	// SEC-2027
+	@Test
+	public void doFilterClearsSecurityContextHolderOnceOnForwards() throws Exception {
+		final FilterChain innerChain = mock(FilterChain.class);
+		when(matcher.matches(any(HttpServletRequest.class))).thenReturn(true);
+		doAnswer(new Answer<Object>() {
+			public Object answer(InvocationOnMock inv) throws Throwable {
+				TestingAuthenticationToken expected = new TestingAuthenticationToken(
+						"username", "password");
+				SecurityContextHolder.getContext().setAuthentication(expected);
+				doAnswer(new Answer<Object>() {
+					public Object answer(InvocationOnMock inv) throws Throwable {
+						innerChain.doFilter(request, response);
+						return null;
+					}
+				}).when(filter).doFilter(any(HttpServletRequest.class),
+						any(HttpServletResponse.class), any(FilterChain.class));
+				;
+				fcp.doFilter(request, response, innerChain);
+				assertSame(expected, SecurityContextHolder.getContext()
+						.getAuthentication());
+				return null;
+			}
+		}).when(filter).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(FilterChain.class));
 
-        fcp.doFilter(request, response, chain);
+		fcp.doFilter(request, response, chain);
 
-        verify(innerChain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+		verify(innerChain).doFilter(any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java
index b62ac9c446..adf0c51f47 100644
--- a/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java
+++ b/web/src/test/java/org/springframework/security/web/FilterInvocationTests.java
@@ -36,100 +36,109 @@ import org.springframework.security.web.util.UrlUtils;
  */
 public class FilterInvocationTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testGettersAndStringMethods() {
-        MockHttpServletRequest request = new MockHttpServletRequest(null, null);
-        request.setServletPath("/HelloWorld");
-        request.setPathInfo("/some/more/segments.html");
-        request.setServerName("www.example.com");
-        request.setScheme("http");
-        request.setServerPort(80);
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/HelloWorld/some/more/segments.html");
+	@Test
+	public void testGettersAndStringMethods() {
+		MockHttpServletRequest request = new MockHttpServletRequest(null, null);
+		request.setServletPath("/HelloWorld");
+		request.setPathInfo("/some/more/segments.html");
+		request.setServerName("www.example.com");
+		request.setScheme("http");
+		request.setServerPort(80);
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/HelloWorld/some/more/segments.html");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain chain = mock(FilterChain.class);
-        FilterInvocation fi = new FilterInvocation(request, response, chain);
-        assertEquals(request, fi.getRequest());
-        assertEquals(request, fi.getHttpRequest());
-        assertEquals(response, fi.getResponse());
-        assertEquals(response, fi.getHttpResponse());
-        assertEquals(chain, fi.getChain());
-        assertEquals("/HelloWorld/some/more/segments.html", fi.getRequestUrl());
-        assertEquals("FilterInvocation: URL: /HelloWorld/some/more/segments.html", fi.toString());
-        assertEquals("http://www.example.com/mycontext/HelloWorld/some/more/segments.html", fi.getFullRequestUrl());
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain chain = mock(FilterChain.class);
+		FilterInvocation fi = new FilterInvocation(request, response, chain);
+		assertEquals(request, fi.getRequest());
+		assertEquals(request, fi.getHttpRequest());
+		assertEquals(response, fi.getResponse());
+		assertEquals(response, fi.getHttpResponse());
+		assertEquals(chain, fi.getChain());
+		assertEquals("/HelloWorld/some/more/segments.html", fi.getRequestUrl());
+		assertEquals("FilterInvocation: URL: /HelloWorld/some/more/segments.html",
+				fi.toString());
+		assertEquals(
+				"http://www.example.com/mycontext/HelloWorld/some/more/segments.html",
+				fi.getFullRequestUrl());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNullFilterChain() {
-        MockHttpServletRequest request = new MockHttpServletRequest(null, null);
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNullFilterChain() {
+		MockHttpServletRequest request = new MockHttpServletRequest(null, null);
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        new FilterInvocation(request, response, null);
-    }
+		new FilterInvocation(request, response, null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNullServletRequest() {
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNullServletRequest() {
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        new FilterInvocation(null, response, mock(FilterChain.class));
-    }
+		new FilterInvocation(null, response, mock(FilterChain.class));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testRejectsNullServletResponse() {
-        MockHttpServletRequest request = new MockHttpServletRequest(null, null);
+	@Test(expected = IllegalArgumentException.class)
+	public void testRejectsNullServletResponse() {
+		MockHttpServletRequest request = new MockHttpServletRequest(null, null);
 
-        new FilterInvocation(request, null, mock(FilterChain.class));
-    }
+		new FilterInvocation(request, null, mock(FilterChain.class));
+	}
 
-    @Test
-    public void testStringMethodsWithAQueryString() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("foo=bar");
-        request.setServletPath("/HelloWorld");
-        request.setServerName("www.example.com");
-        request.setScheme("http");
-        request.setServerPort(80);
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/HelloWorld");
+	@Test
+	public void testStringMethodsWithAQueryString() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("foo=bar");
+		request.setServletPath("/HelloWorld");
+		request.setServerName("www.example.com");
+		request.setScheme("http");
+		request.setServerPort(80);
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/HelloWorld");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
-        assertEquals("/HelloWorld?foo=bar", fi.getRequestUrl());
-        assertEquals("FilterInvocation: URL: /HelloWorld?foo=bar", fi.toString());
-        assertEquals("http://www.example.com/mycontext/HelloWorld?foo=bar", fi.getFullRequestUrl());
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
+		assertEquals("/HelloWorld?foo=bar", fi.getRequestUrl());
+		assertEquals("FilterInvocation: URL: /HelloWorld?foo=bar", fi.toString());
+		assertEquals("http://www.example.com/mycontext/HelloWorld?foo=bar",
+				fi.getFullRequestUrl());
+	}
 
-    @Test
-    public void testStringMethodsWithoutAnyQueryString() {
-        MockHttpServletRequest request = new MockHttpServletRequest(null, null);
-        request.setServletPath("/HelloWorld");
-        request.setServerName("www.example.com");
-        request.setScheme("http");
-        request.setServerPort(80);
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/HelloWorld");
+	@Test
+	public void testStringMethodsWithoutAnyQueryString() {
+		MockHttpServletRequest request = new MockHttpServletRequest(null, null);
+		request.setServletPath("/HelloWorld");
+		request.setServerName("www.example.com");
+		request.setScheme("http");
+		request.setServerPort(80);
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/HelloWorld");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
-        assertEquals("/HelloWorld", fi.getRequestUrl());
-        assertEquals("FilterInvocation: URL: /HelloWorld", fi.toString());
-        assertEquals("http://www.example.com/mycontext/HelloWorld", fi.getFullRequestUrl());
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
+		assertEquals("/HelloWorld", fi.getRequestUrl());
+		assertEquals("FilterInvocation: URL: /HelloWorld", fi.toString());
+		assertEquals("http://www.example.com/mycontext/HelloWorld",
+				fi.getFullRequestUrl());
+	}
 
-    @Test(expected=UnsupportedOperationException.class)
-    public void dummyChainRejectsInvocation() throws Exception {
-        FilterInvocation.DUMMY_CHAIN.doFilter(mock(HttpServletRequest.class), mock(HttpServletResponse.class));
-    }
+	@Test(expected = UnsupportedOperationException.class)
+	public void dummyChainRejectsInvocation() throws Exception {
+		FilterInvocation.DUMMY_CHAIN.doFilter(mock(HttpServletRequest.class),
+				mock(HttpServletResponse.class));
+	}
 
-    @Test
-    public void dummyRequestIsSupportedByUrlUtils() throws Exception {
-        DummyRequest request = new DummyRequest();
-        request.setContextPath("");
-        request.setRequestURI("/something");
-        UrlUtils.buildRequestUrl(request);
-    }
+	@Test
+	public void dummyRequestIsSupportedByUrlUtils() throws Exception {
+		DummyRequest request = new DummyRequest();
+		request.setContextPath("");
+		request.setRequestURI("/something");
+		UrlUtils.buildRequestUrl(request);
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java
index 7a1f1b4c81..06d99deff4 100644
--- a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java
@@ -22,76 +22,83 @@ import java.util.Map;
 
 import org.springframework.security.web.PortMapperImpl;
 
-
 /**
  * Tests {@link PortMapperImpl}.
  *
  * @author Ben Alex
  */
 public class PortMapperImplTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDefaultMappingsAreKnown() throws Exception {
-        PortMapperImpl portMapper = new PortMapperImpl();
-        assertEquals(Integer.valueOf(80), portMapper.lookupHttpPort(Integer.valueOf(443)));
-        assertEquals(Integer.valueOf(8080), portMapper.lookupHttpPort(Integer.valueOf(8443)));
-        assertEquals(Integer.valueOf(443), portMapper.lookupHttpsPort(Integer.valueOf(80)));
-        assertEquals(Integer.valueOf(8443), portMapper.lookupHttpsPort(Integer.valueOf(8080)));
-    }
+	public void testDefaultMappingsAreKnown() throws Exception {
+		PortMapperImpl portMapper = new PortMapperImpl();
+		assertEquals(Integer.valueOf(80), portMapper.lookupHttpPort(Integer.valueOf(443)));
+		assertEquals(Integer.valueOf(8080),
+				portMapper.lookupHttpPort(Integer.valueOf(8443)));
+		assertEquals(Integer.valueOf(443),
+				portMapper.lookupHttpsPort(Integer.valueOf(80)));
+		assertEquals(Integer.valueOf(8443),
+				portMapper.lookupHttpsPort(Integer.valueOf(8080)));
+	}
 
-    public void testDetectsEmptyMap() throws Exception {
-        PortMapperImpl portMapper = new PortMapperImpl();
+	public void testDetectsEmptyMap() throws Exception {
+		PortMapperImpl portMapper = new PortMapperImpl();
 
-        try {
-            portMapper.setPortMappings(new HashMap<String,String>());
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			portMapper.setPortMappings(new HashMap<String, String>());
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testDetectsNullMap() throws Exception {
-        PortMapperImpl portMapper = new PortMapperImpl();
+	public void testDetectsNullMap() throws Exception {
+		PortMapperImpl portMapper = new PortMapperImpl();
 
-        try {
-            portMapper.setPortMappings(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			portMapper.setPortMappings(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGetTranslatedPortMappings() {
-        PortMapperImpl portMapper = new PortMapperImpl();
-        assertEquals(2, portMapper.getTranslatedPortMappings().size());
-    }
+	public void testGetTranslatedPortMappings() {
+		PortMapperImpl portMapper = new PortMapperImpl();
+		assertEquals(2, portMapper.getTranslatedPortMappings().size());
+	}
 
-    public void testRejectsOutOfRangeMappings() {
-        PortMapperImpl portMapper = new PortMapperImpl();
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("79", "80559");
+	public void testRejectsOutOfRangeMappings() {
+		PortMapperImpl portMapper = new PortMapperImpl();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("79", "80559");
 
-        try {
-            portMapper.setPortMappings(map);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			portMapper.setPortMappings(map);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testReturnsNullIfHttpPortCannotBeFound() {
-        PortMapperImpl portMapper = new PortMapperImpl();
-        assertTrue(portMapper.lookupHttpPort(Integer.valueOf("34343")) == null);
-    }
+	public void testReturnsNullIfHttpPortCannotBeFound() {
+		PortMapperImpl portMapper = new PortMapperImpl();
+		assertTrue(portMapper.lookupHttpPort(Integer.valueOf("34343")) == null);
+	}
 
-    public void testSupportsCustomMappings() {
-        PortMapperImpl portMapper = new PortMapperImpl();
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("79", "442");
+	public void testSupportsCustomMappings() {
+		PortMapperImpl portMapper = new PortMapperImpl();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("79", "442");
 
-        portMapper.setPortMappings(map);
+		portMapper.setPortMappings(map);
 
-        assertEquals(Integer.valueOf(79), portMapper.lookupHttpPort(Integer.valueOf(442)));
-        assertEquals(Integer.valueOf(442), portMapper.lookupHttpsPort(Integer.valueOf(79)));
-    }
+		assertEquals(Integer.valueOf(79), portMapper.lookupHttpPort(Integer.valueOf(442)));
+		assertEquals(Integer.valueOf(442),
+				portMapper.lookupHttpsPort(Integer.valueOf(79)));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java
index 008a958657..09f96b2081 100644
--- a/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/PortResolverImplTests.java
@@ -21,71 +21,73 @@ import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.web.PortMapperImpl;
 import org.springframework.security.web.PortResolverImpl;
 
-
 /**
  * Tests {@link PortResolverImpl}.
  *
  * @author Ben Alex
  */
 public class PortResolverImplTests extends TestCase {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public PortResolverImplTests() {
-        super();
-    }
+	public PortResolverImplTests() {
+		super();
+	}
 
-    public PortResolverImplTests(String arg0) {
-        super(arg0);
-    }
+	public PortResolverImplTests(String arg0) {
+		super(arg0);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testDetectsBuggyIeHttpRequest() throws Exception {
-        PortResolverImpl pr = new PortResolverImpl();
+	public void testDetectsBuggyIeHttpRequest() throws Exception {
+		PortResolverImpl pr = new PortResolverImpl();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServerPort(8443);
-        request.setScheme("HTtP"); // proves case insensitive handling
-        assertEquals(8080, pr.getServerPort(request));
-    }
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServerPort(8443);
+		request.setScheme("HTtP"); // proves case insensitive handling
+		assertEquals(8080, pr.getServerPort(request));
+	}
 
-    public void testDetectsBuggyIeHttpsRequest() throws Exception {
-        PortResolverImpl pr = new PortResolverImpl();
+	public void testDetectsBuggyIeHttpsRequest() throws Exception {
+		PortResolverImpl pr = new PortResolverImpl();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServerPort(8080);
-        request.setScheme("HTtPs"); // proves case insensitive handling
-        assertEquals(8443, pr.getServerPort(request));
-    }
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServerPort(8080);
+		request.setScheme("HTtPs"); // proves case insensitive handling
+		assertEquals(8443, pr.getServerPort(request));
+	}
 
-    public void testDetectsEmptyPortMapper() throws Exception {
-        PortResolverImpl pr = new PortResolverImpl();
+	public void testDetectsEmptyPortMapper() throws Exception {
+		PortResolverImpl pr = new PortResolverImpl();
 
-        try {
-            pr.setPortMapper(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			pr.setPortMapper(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGettersSetters() throws Exception {
-        PortResolverImpl pr = new PortResolverImpl();
-        assertTrue(pr.getPortMapper() != null);
-        pr.setPortMapper(new PortMapperImpl());
-        assertTrue(pr.getPortMapper() != null);
-    }
+	public void testGettersSetters() throws Exception {
+		PortResolverImpl pr = new PortResolverImpl();
+		assertTrue(pr.getPortMapper() != null);
+		pr.setPortMapper(new PortMapperImpl());
+		assertTrue(pr.getPortMapper() != null);
+	}
 
-    public void testNormalOperation() throws Exception {
-        PortResolverImpl pr = new PortResolverImpl();
+	public void testNormalOperation() throws Exception {
+		PortResolverImpl pr = new PortResolverImpl();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setScheme("http");
-        request.setServerPort(1021);
-        assertEquals(1021, pr.getServerPort(request));
-    }
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setScheme("http");
+		request.setServerPort(1021);
+		assertEquals(1021, pr.getServerPort(request));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
index 968c9b2b5e..e60127622b 100644
--- a/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/DefaultWebInvocationPrivilegeEvaluatorTests.java
@@ -32,70 +32,83 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
 
-
 /**
- * Tests {@link org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator}.
+ * Tests
+ * {@link org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator}.
  *
  * @author Ben Alex
  */
 public class DefaultWebInvocationPrivilegeEvaluatorTests {
-    private AccessDecisionManager adm;
-    private FilterInvocationSecurityMetadataSource ods;
-    private RunAsManager ram;
-    private FilterSecurityInterceptor interceptor;
+	private AccessDecisionManager adm;
+	private FilterInvocationSecurityMetadataSource ods;
+	private RunAsManager ram;
+	private FilterSecurityInterceptor interceptor;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public final void setUp() {
-        interceptor = new FilterSecurityInterceptor();
-        ods = mock(FilterInvocationSecurityMetadataSource.class);
-        adm = mock(AccessDecisionManager.class);
-        ram = mock(RunAsManager.class);
-        interceptor.setAuthenticationManager(mock(AuthenticationManager.class));
-        interceptor.setSecurityMetadataSource(ods);
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setRunAsManager(ram);
-        interceptor.setApplicationEventPublisher(mock(ApplicationEventPublisher.class));
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public final void setUp() {
+		interceptor = new FilterSecurityInterceptor();
+		ods = mock(FilterInvocationSecurityMetadataSource.class);
+		adm = mock(AccessDecisionManager.class);
+		ram = mock(RunAsManager.class);
+		interceptor.setAuthenticationManager(mock(AuthenticationManager.class));
+		interceptor.setSecurityMetadataSource(ods);
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setRunAsManager(ram);
+		interceptor.setApplicationEventPublisher(mock(ApplicationEventPublisher.class));
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void permitsAccessIfNoMatchingAttributesAndPublicInvocationsAllowed() throws Exception {
-        DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor);
-        when(ods.getAttributes(anyObject())).thenReturn(null);
-        assertTrue(wipe.isAllowed("/context", "/foo/index.jsp", "GET", mock(Authentication.class)));
-    }
+	@Test
+	public void permitsAccessIfNoMatchingAttributesAndPublicInvocationsAllowed()
+			throws Exception {
+		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
+				interceptor);
+		when(ods.getAttributes(anyObject())).thenReturn(null);
+		assertTrue(wipe.isAllowed("/context", "/foo/index.jsp", "GET",
+				mock(Authentication.class)));
+	}
 
-    @Test
-    public void deniesAccessIfNoMatchingAttributesAndPublicInvocationsNotAllowed() throws Exception {
-        DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor);
-        when(ods.getAttributes(anyObject())).thenReturn(null);
-        interceptor.setRejectPublicInvocations(true);
-        assertFalse(wipe.isAllowed("/context", "/foo/index.jsp", "GET", mock(Authentication.class)));
-    }
+	@Test
+	public void deniesAccessIfNoMatchingAttributesAndPublicInvocationsNotAllowed()
+			throws Exception {
+		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
+				interceptor);
+		when(ods.getAttributes(anyObject())).thenReturn(null);
+		interceptor.setRejectPublicInvocations(true);
+		assertFalse(wipe.isAllowed("/context", "/foo/index.jsp", "GET",
+				mock(Authentication.class)));
+	}
 
-    @Test
-    public void deniesAccessIfAuthenticationIsNull() throws Exception {
-        DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor);
-        assertFalse(wipe.isAllowed("/foo/index.jsp", null));
-    }
+	@Test
+	public void deniesAccessIfAuthenticationIsNull() throws Exception {
+		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
+				interceptor);
+		assertFalse(wipe.isAllowed("/foo/index.jsp", null));
+	}
 
-    @Test
-    public void allowsAccessIfAccessDecisionMangerDoes() throws Exception {
-        Authentication token = new TestingAuthenticationToken("test", "Password", "MOCK_INDEX");
-        DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor);
-        assertTrue(wipe.isAllowed("/foo/index.jsp", token));
-    }
+	@Test
+	public void allowsAccessIfAccessDecisionMangerDoes() throws Exception {
+		Authentication token = new TestingAuthenticationToken("test", "Password",
+				"MOCK_INDEX");
+		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
+				interceptor);
+		assertTrue(wipe.isAllowed("/foo/index.jsp", token));
+	}
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void deniesAccessIfAccessDecisionMangerDoes() throws Exception {
-        Authentication token = new TestingAuthenticationToken("test", "Password", "MOCK_INDEX");
-        DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(interceptor);
+	@SuppressWarnings("unchecked")
+	@Test
+	public void deniesAccessIfAccessDecisionMangerDoes() throws Exception {
+		Authentication token = new TestingAuthenticationToken("test", "Password",
+				"MOCK_INDEX");
+		DefaultWebInvocationPrivilegeEvaluator wipe = new DefaultWebInvocationPrivilegeEvaluator(
+				interceptor);
 
-        doThrow(new AccessDeniedException("")).when(adm).decide(any(Authentication.class), anyObject(), anyList());
+		doThrow(new AccessDeniedException("")).when(adm).decide(
+				any(Authentication.class), anyObject(), anyList());
 
-        assertFalse(wipe.isAllowed("/foo/index.jsp", token));
-    }
+		assertFalse(wipe.isAllowed("/foo/index.jsp", token));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java
index 6d8e59bb63..8c097f63ba 100644
--- a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java
@@ -36,49 +36,52 @@ import org.springframework.security.web.csrf.MissingCsrfTokenException;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingAccessDeniedHandlerTests {
-    @Mock
-    private AccessDeniedHandler handler1;
-    @Mock
-    private AccessDeniedHandler handler2;
-    @Mock
-    private AccessDeniedHandler handler3;
-    @Mock
-    private HttpServletRequest request;
-    @Mock
-    private HttpServletResponse response;
+	@Mock
+	private AccessDeniedHandler handler1;
+	@Mock
+	private AccessDeniedHandler handler2;
+	@Mock
+	private AccessDeniedHandler handler3;
+	@Mock
+	private HttpServletRequest request;
+	@Mock
+	private HttpServletResponse response;
 
-    private LinkedHashMap<Class<? extends AccessDeniedException>,AccessDeniedHandler> handlers;
+	private LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers;
 
-    private DelegatingAccessDeniedHandler handler;
+	private DelegatingAccessDeniedHandler handler;
 
-    @Before
-    public void setup() {
-            handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
-    }
+	@Before
+	public void setup() {
+		handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
+	}
 
-    @Test
-    public void moreSpecificDoesNotInvokeLessSpecific() throws Exception {
-        handlers.put(CsrfException.class, handler1);
-        handler = new DelegatingAccessDeniedHandler(handlers, handler3);
+	@Test
+	public void moreSpecificDoesNotInvokeLessSpecific() throws Exception {
+		handlers.put(CsrfException.class, handler1);
+		handler = new DelegatingAccessDeniedHandler(handlers, handler3);
 
-        AccessDeniedException accessDeniedException = new AccessDeniedException("");
-        handler.handle(request, response, accessDeniedException);
+		AccessDeniedException accessDeniedException = new AccessDeniedException("");
+		handler.handle(request, response, accessDeniedException);
 
-        verify(handler1,never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class));
-        verify(handler3).handle(request, response, accessDeniedException);
-    }
+		verify(handler1, never()).handle(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AccessDeniedException.class));
+		verify(handler3).handle(request, response, accessDeniedException);
+	}
 
-    @Test
-    public void matchesDoesNotInvokeDefault() throws Exception {
-        handlers.put(InvalidCsrfTokenException.class, handler1);
-        handlers.put(MissingCsrfTokenException.class, handler2);
-        handler = new DelegatingAccessDeniedHandler(handlers, handler3);
+	@Test
+	public void matchesDoesNotInvokeDefault() throws Exception {
+		handlers.put(InvalidCsrfTokenException.class, handler1);
+		handlers.put(MissingCsrfTokenException.class, handler2);
+		handler = new DelegatingAccessDeniedHandler(handlers, handler3);
 
-        AccessDeniedException accessDeniedException = new MissingCsrfTokenException("123");
-        handler.handle(request, response, accessDeniedException);
+		AccessDeniedException accessDeniedException = new MissingCsrfTokenException("123");
+		handler.handle(request, response, accessDeniedException);
 
-        verify(handler1,never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class));
-        verify(handler2).handle(request, response, accessDeniedException);
-        verify(handler3,never()).handle(any(HttpServletRequest.class), any(HttpServletResponse.class), any(AccessDeniedException.class));
-    }
+		verify(handler1, never()).handle(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AccessDeniedException.class));
+		verify(handler2).handle(request, response, accessDeniedException);
+		verify(handler3, never()).handle(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AccessDeniedException.class));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java
index 5ce1ff52c6..488580d5d0 100644
--- a/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/ExceptionTranslationFilterTests.java
@@ -53,183 +53,200 @@ import java.io.IOException;
  */
 public class ExceptionTranslationFilterTests {
 
-    @After
-    @Before
-    public void clearContext() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	@Before
+	public void clearContext() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    private static String getSavedRequestUrl(HttpServletRequest request) {
-        HttpSession session = request.getSession(false);
+	private static String getSavedRequestUrl(HttpServletRequest request) {
+		HttpSession session = request.getSession(false);
 
-        if (session == null) {
-            return null;
-        }
+		if (session == null) {
+			return null;
+		}
 
-        HttpSessionRequestCache rc = new HttpSessionRequestCache();
-        SavedRequest sr = rc.getRequest(request, new MockHttpServletResponse());
+		HttpSessionRequestCache rc = new HttpSessionRequestCache();
+		SavedRequest sr = rc.getRequest(request, new MockHttpServletResponse());
 
-        return sr.getRedirectUrl();
-    }
+		return sr.getRedirectUrl();
+	}
 
-    @Test
-    public void testAccessDeniedWhenAnonymous() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
-        request.setServerPort(80);
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/secure/page.html");
+	@Test
+	public void testAccessDeniedWhenAnonymous() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
+		request.setServerPort(80);
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/secure/page.html");
 
-        // Setup the FilterChain to thrown an access denied exception
-        FilterChain fc = mock(FilterChain.class);
-        doThrow(new AccessDeniedException("")).when(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// Setup the FilterChain to thrown an access denied exception
+		FilterChain fc = mock(FilterChain.class);
+		doThrow(new AccessDeniedException("")).when(fc).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
 
-        // Setup SecurityContextHolder, as filter needs to check if user is
-        // anonymous
-        SecurityContextHolder.getContext().setAuthentication(
-                new AnonymousAuthenticationToken("ignored", "ignored", AuthorityUtils.createAuthorityList("IGNORED")));
+		// Setup SecurityContextHolder, as filter needs to check if user is
+		// anonymous
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("ignored", "ignored", AuthorityUtils
+						.createAuthorityList("IGNORED")));
 
-        // Test
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
-        filter.setAuthenticationTrustResolver(new AuthenticationTrustResolverImpl());
-        assertNotNull(filter.getAuthenticationTrustResolver());
+		// Test
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
+		filter.setAuthenticationTrustResolver(new AuthenticationTrustResolverImpl());
+		assertNotNull(filter.getAuthenticationTrustResolver());
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, fc);
-        assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
-        assertEquals("http://www.example.com/mycontext/secure/page.html", getSavedRequestUrl(request));
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, fc);
+		assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
+		assertEquals("http://www.example.com/mycontext/secure/page.html",
+				getSavedRequestUrl(request));
+	}
 
-    @Test
-    public void testAccessDeniedWhenNonAnonymous() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
+	@Test
+	public void testAccessDeniedWhenNonAnonymous() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
 
-        // Setup the FilterChain to thrown an access denied exception
-        FilterChain fc = mock(FilterChain.class);
-        doThrow(new AccessDeniedException("")).when(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// Setup the FilterChain to thrown an access denied exception
+		FilterChain fc = mock(FilterChain.class);
+		doThrow(new AccessDeniedException("")).when(fc).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
 
-        // Setup SecurityContextHolder, as filter needs to check if user is
-        // anonymous
-        SecurityContextHolder.clearContext();
+		// Setup SecurityContextHolder, as filter needs to check if user is
+		// anonymous
+		SecurityContextHolder.clearContext();
 
-        // Setup a new AccessDeniedHandlerImpl that will do a "forward"
-        AccessDeniedHandlerImpl adh = new AccessDeniedHandlerImpl();
-        adh.setErrorPage("/error.jsp");
+		// Setup a new AccessDeniedHandlerImpl that will do a "forward"
+		AccessDeniedHandlerImpl adh = new AccessDeniedHandlerImpl();
+		adh.setErrorPage("/error.jsp");
 
-        // Test
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
-        filter.setAccessDeniedHandler(adh);
+		// Test
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
+		filter.setAccessDeniedHandler(adh);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, fc);
-        assertEquals(403, response.getStatus());
-        assertEquals(AccessDeniedException.class, request.getAttribute(WebAttributes.ACCESS_DENIED_403).getClass());
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, fc);
+		assertEquals(403, response.getStatus());
+		assertEquals(AccessDeniedException.class,
+				request.getAttribute(WebAttributes.ACCESS_DENIED_403).getClass());
+	}
 
-    @Test
-    public void redirectedToLoginFormAndSessionShowsOriginalTargetWhenAuthenticationException() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
-        request.setServerPort(80);
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/secure/page.html");
+	@Test
+	public void redirectedToLoginFormAndSessionShowsOriginalTargetWhenAuthenticationException()
+			throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
+		request.setServerPort(80);
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/secure/page.html");
 
-        // Setup the FilterChain to thrown an authentication failure exception
-        FilterChain fc = mock(FilterChain.class);
-        doThrow(new BadCredentialsException("")).when(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// Setup the FilterChain to thrown an authentication failure exception
+		FilterChain fc = mock(FilterChain.class);
+		doThrow(new BadCredentialsException("")).when(fc).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
 
-        // Test
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
-        filter.afterPropertiesSet();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, fc);
-        assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
-        assertEquals("http://www.example.com/mycontext/secure/page.html", getSavedRequestUrl(request));
-    }
+		// Test
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
+		filter.afterPropertiesSet();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, fc);
+		assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
+		assertEquals("http://www.example.com/mycontext/secure/page.html",
+				getSavedRequestUrl(request));
+	}
 
-    @Test
-    public void redirectedToLoginFormAndSessionShowsOriginalTargetWithExoticPortWhenAuthenticationException()
-            throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
-        request.setServerPort(8080);
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/mycontext");
-        request.setRequestURI("/mycontext/secure/page.html");
+	@Test
+	public void redirectedToLoginFormAndSessionShowsOriginalTargetWithExoticPortWhenAuthenticationException()
+			throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
+		request.setServerPort(8080);
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/mycontext");
+		request.setRequestURI("/mycontext/secure/page.html");
 
-        // Setup the FilterChain to thrown an authentication failure exception
-        FilterChain fc = mock(FilterChain.class);
-        doThrow(new BadCredentialsException("")).when(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// Setup the FilterChain to thrown an authentication failure exception
+		FilterChain fc = mock(FilterChain.class);
+		doThrow(new BadCredentialsException("")).when(fc).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
 
-        // Test
-        HttpSessionRequestCache requestCache = new HttpSessionRequestCache();
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint, requestCache);
-        requestCache.setPortResolver(new MockPortResolver(8080, 8443));
-        filter.afterPropertiesSet();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, fc);
-        assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
-        assertEquals("http://www.example.com:8080/mycontext/secure/page.html", getSavedRequestUrl(request));
-    }
+		// Test
+		HttpSessionRequestCache requestCache = new HttpSessionRequestCache();
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(
+				mockEntryPoint, requestCache);
+		requestCache.setPortResolver(new MockPortResolver(8080, 8443));
+		filter.afterPropertiesSet();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, fc);
+		assertEquals("/mycontext/login.jsp", response.getRedirectedUrl());
+		assertEquals("http://www.example.com:8080/mycontext/secure/page.html",
+				getSavedRequestUrl(request));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void startupDetectsMissingAuthenticationEntryPoint() throws Exception {
-        new ExceptionTranslationFilter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingAuthenticationEntryPoint() throws Exception {
+		new ExceptionTranslationFilter(null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void startupDetectsMissingRequestCache() throws Exception {
-        new ExceptionTranslationFilter(mockEntryPoint, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingRequestCache() throws Exception {
+		new ExceptionTranslationFilter(mockEntryPoint, null);
+	}
 
-    @Test
-    public void successfulAccessGrant() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
+	@Test
+	public void successfulAccessGrant() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
 
-        // Test
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
-        assertSame(mockEntryPoint, filter.getAuthenticationEntryPoint());
+		// Test
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
+		assertSame(mockEntryPoint, filter.getAuthenticationEntryPoint());
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, mock(FilterChain.class));
-    }
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, mock(FilterChain.class));
+	}
 
-    @Test
-    public void thrownIOExceptionServletExceptionAndRuntimeExceptionsAreRethrown() throws Exception {
-        ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
+	@Test
+	public void thrownIOExceptionServletExceptionAndRuntimeExceptionsAreRethrown()
+			throws Exception {
+		ExceptionTranslationFilter filter = new ExceptionTranslationFilter(mockEntryPoint);
 
-        filter.afterPropertiesSet();
-        Exception[] exceptions = {new IOException(), new ServletException(), new RuntimeException()};
-        for (Exception e : exceptions) {
-            FilterChain fc = mock(FilterChain.class);
+		filter.afterPropertiesSet();
+		Exception[] exceptions = { new IOException(), new ServletException(),
+				new RuntimeException() };
+		for (Exception e : exceptions) {
+			FilterChain fc = mock(FilterChain.class);
 
-            doThrow(e).when(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-            try {
-                filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), fc);
-                fail("Should have thrown Exception");
-            }
-            catch (Exception expected) {
-                assertSame("The exception thrown should not have been wrapped", e, expected);
-            }
-        }
-    }
+			doThrow(e).when(fc).doFilter(any(HttpServletRequest.class),
+					any(HttpServletResponse.class));
+			try {
+				filter.doFilter(new MockHttpServletRequest(),
+						new MockHttpServletResponse(), fc);
+				fail("Should have thrown Exception");
+			}
+			catch (Exception expected) {
+				assertSame("The exception thrown should not have been wrapped", e,
+						expected);
+			}
+		}
+	}
 
-    private final AuthenticationEntryPoint mockEntryPoint = new AuthenticationEntryPoint() {
-        public void commence(HttpServletRequest request, HttpServletResponse response,
-                    AuthenticationException authException) throws IOException, ServletException {
-            response.sendRedirect(request.getContextPath() + "/login.jsp");
-        }
-    };
+	private final AuthenticationEntryPoint mockEntryPoint = new AuthenticationEntryPoint() {
+		public void commence(HttpServletRequest request, HttpServletResponse response,
+				AuthenticationException authException) throws IOException,
+				ServletException {
+			response.sendRedirect(request.getContextPath() + "/login.jsp");
+		}
+	};
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java
index 20ee3ff87b..ea67f5e515 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java
@@ -36,7 +36,6 @@ import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.channel.ChannelDecisionManagerImpl;
 import org.springframework.security.web.access.channel.ChannelProcessor;
 
-
 /**
  * Tests {@link ChannelDecisionManagerImpl}.
  *
@@ -44,175 +43,186 @@ import org.springframework.security.web.access.channel.ChannelProcessor;
  */
 @SuppressWarnings("unchecked")
 public class ChannelDecisionManagerImplTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testCannotSetEmptyChannelProcessorsList() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+	public void testCannotSetEmptyChannelProcessorsList() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
 
-        try {
-            cdm.setChannelProcessors(new Vector());
-            cdm.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("A list of ChannelProcessors is required", expected.getMessage());
-        }
-    }
+		try {
+			cdm.setChannelProcessors(new Vector());
+			cdm.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("A list of ChannelProcessors is required", expected.getMessage());
+		}
+	}
 
-    public void testCannotSetIncorrectObjectTypesIntoChannelProcessorsList() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        List list = new Vector();
-        list.add("THIS IS NOT A CHANNELPROCESSOR");
+	public void testCannotSetIncorrectObjectTypesIntoChannelProcessorsList()
+			throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		List list = new Vector();
+		list.add("THIS IS NOT A CHANNELPROCESSOR");
 
-        try {
-            cdm.setChannelProcessors(list);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			cdm.setChannelProcessors(list);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testCannotSetNullChannelProcessorsList() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+	public void testCannotSetNullChannelProcessorsList() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
 
-        try {
-            cdm.setChannelProcessors(null);
-            cdm.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("A list of ChannelProcessors is required", expected.getMessage());
-        }
-    }
+		try {
+			cdm.setChannelProcessors(null);
+			cdm.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("A list of ChannelProcessors is required", expected.getMessage());
+		}
+	}
 
-    public void testDecideIsOperational() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
-        MockChannelProcessor cpAbc = new MockChannelProcessor("abc", true);
-        List list = new Vector();
-        list.add(cpXyz);
-        list.add(cpAbc);
-        cdm.setChannelProcessors(list);
-        cdm.afterPropertiesSet();
+	public void testDecideIsOperational() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
+		MockChannelProcessor cpAbc = new MockChannelProcessor("abc", true);
+		List list = new Vector();
+		list.add(cpXyz);
+		list.add(cpAbc);
+		cdm.setChannelProcessors(list);
+		cdm.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        List<ConfigAttribute> cad = SecurityConfig.createList("xyz");
+		List<ConfigAttribute> cad = SecurityConfig.createList("xyz");
 
-        cdm.decide(fi, cad);
-        assertTrue(fi.getResponse().isCommitted());
-    }
+		cdm.decide(fi, cad);
+		assertTrue(fi.getResponse().isCommitted());
+	}
 
-    public void testAnyChannelAttributeCausesProcessorsToBeSkipped() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        MockChannelProcessor cpAbc = new MockChannelProcessor("abc", true);
-        List list = new Vector();
-        list.add(cpAbc);
-        cdm.setChannelProcessors(list);
-        cdm.afterPropertiesSet();
+	public void testAnyChannelAttributeCausesProcessorsToBeSkipped() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		MockChannelProcessor cpAbc = new MockChannelProcessor("abc", true);
+		List list = new Vector();
+		list.add(cpAbc);
+		cdm.setChannelProcessors(list);
+		cdm.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        cdm.decide(fi, SecurityConfig.createList(new String[]{"abc", "ANY_CHANNEL"}));
-        assertFalse(fi.getResponse().isCommitted());
-    }
+		cdm.decide(fi, SecurityConfig.createList(new String[] { "abc", "ANY_CHANNEL" }));
+		assertFalse(fi.getResponse().isCommitted());
+	}
 
-    public void testDecideIteratesAllProcessorsIfNoneCommitAResponse() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
-        MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
-        List list = new Vector();
-        list.add(cpXyz);
-        list.add(cpAbc);
-        cdm.setChannelProcessors(list);
-        cdm.afterPropertiesSet();
+	public void testDecideIteratesAllProcessorsIfNoneCommitAResponse() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
+		MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
+		List list = new Vector();
+		list.add(cpXyz);
+		list.add(cpAbc);
+		cdm.setChannelProcessors(list);
+		cdm.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        cdm.decide(fi, SecurityConfig.createList("SOME_ATTRIBUTE_NO_PROCESSORS_SUPPORT"));
-        assertFalse(fi.getResponse().isCommitted());
-    }
+		cdm.decide(fi, SecurityConfig.createList("SOME_ATTRIBUTE_NO_PROCESSORS_SUPPORT"));
+		assertFalse(fi.getResponse().isCommitted());
+	}
 
-    public void testDelegatesSupports() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
-        MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
-        List list = new Vector();
-        list.add(cpXyz);
-        list.add(cpAbc);
-        cdm.setChannelProcessors(list);
-        cdm.afterPropertiesSet();
+	public void testDelegatesSupports() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
+		MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
+		List list = new Vector();
+		list.add(cpXyz);
+		list.add(cpAbc);
+		cdm.setChannelProcessors(list);
+		cdm.afterPropertiesSet();
 
-        assertTrue(cdm.supports(new SecurityConfig("xyz")));
-        assertTrue(cdm.supports(new SecurityConfig("abc")));
-        assertFalse(cdm.supports(new SecurityConfig("UNSUPPORTED")));
-    }
+		assertTrue(cdm.supports(new SecurityConfig("xyz")));
+		assertTrue(cdm.supports(new SecurityConfig("abc")));
+		assertFalse(cdm.supports(new SecurityConfig("UNSUPPORTED")));
+	}
 
-    public void testGettersSetters() {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
-        assertNull(cdm.getChannelProcessors());
+	public void testGettersSetters() {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+		assertNull(cdm.getChannelProcessors());
 
-        MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
-        MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
-        List list = new Vector();
-        list.add(cpXyz);
-        list.add(cpAbc);
-        cdm.setChannelProcessors(list);
+		MockChannelProcessor cpXyz = new MockChannelProcessor("xyz", false);
+		MockChannelProcessor cpAbc = new MockChannelProcessor("abc", false);
+		List list = new Vector();
+		list.add(cpXyz);
+		list.add(cpAbc);
+		cdm.setChannelProcessors(list);
 
-        assertEquals(list, cdm.getChannelProcessors());
-    }
+		assertEquals(list, cdm.getChannelProcessors());
+	}
 
-    public void testStartupFailsWithEmptyChannelProcessorsList() throws Exception {
-        ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
+	public void testStartupFailsWithEmptyChannelProcessorsList() throws Exception {
+		ChannelDecisionManagerImpl cdm = new ChannelDecisionManagerImpl();
 
-        try {
-            cdm.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("A list of ChannelProcessors is required", expected.getMessage());
-        }
-    }
+		try {
+			cdm.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("A list of ChannelProcessors is required", expected.getMessage());
+		}
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockChannelProcessor implements ChannelProcessor {
-        private String configAttribute;
-        private boolean failIfCalled;
+	private class MockChannelProcessor implements ChannelProcessor {
+		private String configAttribute;
+		private boolean failIfCalled;
 
-        public MockChannelProcessor(String configAttribute, boolean failIfCalled) {
-            this.configAttribute = configAttribute;
-            this.failIfCalled = failIfCalled;
-        }
+		public MockChannelProcessor(String configAttribute, boolean failIfCalled) {
+			this.configAttribute = configAttribute;
+			this.failIfCalled = failIfCalled;
+		}
 
-        public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
-                throws IOException, ServletException {
-            Iterator iter = config.iterator();
+		public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+				throws IOException, ServletException {
+			Iterator iter = config.iterator();
 
-            if (failIfCalled) {
-                fail("Should not have called this channel processor: " + configAttribute);
-            }
+			if (failIfCalled) {
+				fail("Should not have called this channel processor: " + configAttribute);
+			}
 
-            while (iter.hasNext()) {
-                ConfigAttribute attr = (ConfigAttribute) iter.next();
+			while (iter.hasNext()) {
+				ConfigAttribute attr = (ConfigAttribute) iter.next();
 
-                if (attr.getAttribute().equals(configAttribute)) {
-                    invocation.getHttpResponse().sendRedirect("/redirected");
+				if (attr.getAttribute().equals(configAttribute)) {
+					invocation.getHttpResponse().sendRedirect("/redirected");
 
-                    return;
-                }
-            }
-        }
+					return;
+				}
+			}
+		}
 
-        public boolean supports(ConfigAttribute attribute) {
-            if (attribute.getAttribute().equals(configAttribute)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+		public boolean supports(ConfigAttribute attribute) {
+			if (attribute.getAttribute().equals(configAttribute)) {
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java
index 5fd81f20ef..c23dde73c9 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java
@@ -32,182 +32,199 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
 
-
 /**
  * Tests {@link ChannelProcessingFilter}.
  *
  * @author Ben Alex
  */
 public class ChannelProcessingFilterTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingChannelDecisionManager() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingChannelDecisionManager() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "MOCK");
-        filter.setSecurityMetadataSource(fids);
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "MOCK");
+		filter.setSecurityMetadataSource(fids);
 
-        filter.afterPropertiesSet();
-    }
+		filter.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingFilterInvocationSecurityMetadataSource() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "MOCK"));
-        filter.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingFilterInvocationSecurityMetadataSource()
+			throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "MOCK"));
+		filter.afterPropertiesSet();
+	}
 
-    @Test
-    public void testDetectsSupportedConfigAttribute() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "SUPPORTS_MOCK_ONLY"));
+	@Test
+	public void testDetectsSupportedConfigAttribute() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false,
+				"SUPPORTS_MOCK_ONLY"));
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "SUPPORTS_MOCK_ONLY");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "SUPPORTS_MOCK_ONLY");
 
-        filter.setSecurityMetadataSource(fids);
+		filter.setSecurityMetadataSource(fids);
 
-        filter.afterPropertiesSet();
-    }
+		filter.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsUnsupportedConfigAttribute() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "SUPPORTS_MOCK_ONLY"));
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsUnsupportedConfigAttribute() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false,
+				"SUPPORTS_MOCK_ONLY"));
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "SUPPORTS_MOCK_ONLY", "INVALID_ATTRIBUTE");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "SUPPORTS_MOCK_ONLY", "INVALID_ATTRIBUTE");
 
-        filter.setSecurityMetadataSource(fids);
-        filter.afterPropertiesSet();
-    }
+		filter.setSecurityMetadataSource(fids);
+		filter.afterPropertiesSet();
+	}
 
-    @Test
-    public void testDoFilterWhenManagerDoesCommitResponse() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(true, "SOME_ATTRIBUTE"));
+	@Test
+	public void testDoFilterWhenManagerDoesCommitResponse() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(true,
+				"SOME_ATTRIBUTE"));
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "SOME_ATTRIBUTE");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "SOME_ATTRIBUTE");
 
-        filter.setSecurityMetadataSource(fids);
+		filter.setSecurityMetadataSource(fids);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=now");
-        request.setServletPath("/path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=now");
+		request.setServletPath("/path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(request, response, mock(FilterChain.class));
-    }
+		filter.doFilter(request, response, mock(FilterChain.class));
+	}
 
-    @Test
-    public void testDoFilterWhenManagerDoesNotCommitResponse() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "SOME_ATTRIBUTE"));
+	@Test
+	public void testDoFilterWhenManagerDoesNotCommitResponse() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false,
+				"SOME_ATTRIBUTE"));
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "SOME_ATTRIBUTE");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "SOME_ATTRIBUTE");
 
-        filter.setSecurityMetadataSource(fids);
+		filter.setSecurityMetadataSource(fids);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=now");
-        request.setServletPath("/path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=now");
+		request.setServletPath("/path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(request, response, mock(FilterChain.class));
-    }
+		filter.doFilter(request, response, mock(FilterChain.class));
+	}
 
-    @Test
-    public void testDoFilterWhenNullConfigAttributeReturned() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "NOT_USED"));
+	@Test
+	public void testDoFilterWhenNullConfigAttributeReturned() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "NOT_USED"));
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", true, "NOT_USED");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", true, "NOT_USED");
 
-        filter.setSecurityMetadataSource(fids);
+		filter.setSecurityMetadataSource(fids);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=now");
-        request.setServletPath("/PATH_NOT_MATCHING_CONFIG_ATTRIBUTE");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=now");
+		request.setServletPath("/PATH_NOT_MATCHING_CONFIG_ATTRIBUTE");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(request, response, mock(FilterChain.class));
-    }
+		filter.doFilter(request, response, mock(FilterChain.class));
+	}
 
-    @Test
-    public void testGetterSetters() throws Exception {
-        ChannelProcessingFilter filter = new ChannelProcessingFilter();
-        filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "MOCK"));
-        assertTrue(filter.getChannelDecisionManager() != null);
+	@Test
+	public void testGetterSetters() throws Exception {
+		ChannelProcessingFilter filter = new ChannelProcessingFilter();
+		filter.setChannelDecisionManager(new MockChannelDecisionManager(false, "MOCK"));
+		assertTrue(filter.getChannelDecisionManager() != null);
 
-        MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap("/path", false, "MOCK");
+		MockFilterInvocationDefinitionMap fids = new MockFilterInvocationDefinitionMap(
+				"/path", false, "MOCK");
 
-        filter.setSecurityMetadataSource(fids);
-        assertSame(fids, filter.getSecurityMetadataSource());
+		filter.setSecurityMetadataSource(fids);
+		assertSame(fids, filter.getSecurityMetadataSource());
 
-        filter.afterPropertiesSet();
-    }
+		filter.afterPropertiesSet();
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockChannelDecisionManager implements ChannelDecisionManager {
-        private String supportAttribute;
-        private boolean commitAResponse;
+	private class MockChannelDecisionManager implements ChannelDecisionManager {
+		private String supportAttribute;
+		private boolean commitAResponse;
 
-        public MockChannelDecisionManager(boolean commitAResponse, String supportAttribute) {
-            this.commitAResponse = commitAResponse;
-            this.supportAttribute = supportAttribute;
-        }
+		public MockChannelDecisionManager(boolean commitAResponse, String supportAttribute) {
+			this.commitAResponse = commitAResponse;
+			this.supportAttribute = supportAttribute;
+		}
 
-        public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
-            throws IOException, ServletException {
-            if (commitAResponse) {
-                invocation.getHttpResponse().sendRedirect("/redirected");
-            }
-        }
+		public void decide(FilterInvocation invocation, Collection<ConfigAttribute> config)
+				throws IOException, ServletException {
+			if (commitAResponse) {
+				invocation.getHttpResponse().sendRedirect("/redirected");
+			}
+		}
 
-        public boolean supports(ConfigAttribute attribute) {
-            if (attribute.getAttribute().equals(supportAttribute)) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+		public boolean supports(ConfigAttribute attribute) {
+			if (attribute.getAttribute().equals(supportAttribute)) {
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
+	}
 
-    private class MockFilterInvocationDefinitionMap implements FilterInvocationSecurityMetadataSource {
-        private Collection<ConfigAttribute> toReturn;
-        private String servletPath;
-        private boolean provideIterator;
+	private class MockFilterInvocationDefinitionMap implements
+			FilterInvocationSecurityMetadataSource {
+		private Collection<ConfigAttribute> toReturn;
+		private String servletPath;
+		private boolean provideIterator;
 
-        public MockFilterInvocationDefinitionMap(String servletPath, boolean provideIterator, String... toReturn) {
-            this.servletPath = servletPath;
-            this.toReturn = SecurityConfig.createList(toReturn);
-            this.provideIterator = provideIterator;
-        }
+		public MockFilterInvocationDefinitionMap(String servletPath,
+				boolean provideIterator, String... toReturn) {
+			this.servletPath = servletPath;
+			this.toReturn = SecurityConfig.createList(toReturn);
+			this.provideIterator = provideIterator;
+		}
 
-        public Collection<ConfigAttribute> getAttributes(Object object)
-            throws IllegalArgumentException {
-            FilterInvocation fi = (FilterInvocation) object;
+		public Collection<ConfigAttribute> getAttributes(Object object)
+				throws IllegalArgumentException {
+			FilterInvocation fi = (FilterInvocation) object;
 
-            if (servletPath.equals(fi.getHttpRequest().getServletPath())) {
-                return toReturn;
-            } else {
-                return null;
-            }
-        }
+			if (servletPath.equals(fi.getHttpRequest().getServletPath())) {
+				return toReturn;
+			}
+			else {
+				return null;
+			}
+		}
 
-        public Collection<ConfigAttribute> getAllConfigAttributes() {
-            if (!provideIterator) {
-                return null;
-            }
+		public Collection<ConfigAttribute> getAllConfigAttributes() {
+			if (!provideIterator) {
+				return null;
+			}
 
-            return toReturn;
-        }
+			return toReturn;
+		}
 
-        public boolean supports(Class<?> clazz) {
-            return true;
-        }
-    }
+		public boolean supports(Class<?> clazz) {
+			return true;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java
index 773626103f..e9f2e16e7b 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/InsecureChannelProcessorTests.java
@@ -27,7 +27,6 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.channel.InsecureChannelProcessor;
 
-
 /**
  * Tests {@link InsecureChannelProcessor}.
  *
@@ -35,104 +34,113 @@ import org.springframework.security.web.access.channel.InsecureChannelProcessor;
  */
 public class InsecureChannelProcessorTests extends TestCase {
 
-    public void testDecideDetectsAcceptableChannel() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=true");
-        request.setServerName("localhost");
-        request.setContextPath("/bigapp");
-        request.setServletPath("/servlet");
-        request.setScheme("http");
-        request.setServerPort(8080);
+	public void testDecideDetectsAcceptableChannel() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=true");
+		request.setServerName("localhost");
+		request.setContextPath("/bigapp");
+		request.setServletPath("/servlet");
+		request.setScheme("http");
+		request.setServerPort(8080);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE", "REQUIRES_INSECURE_CHANNEL"));
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE",
+				"REQUIRES_INSECURE_CHANNEL"));
 
-        assertFalse(fi.getResponse().isCommitted());
-    }
+		assertFalse(fi.getResponse().isCommitted());
+	}
 
-    public void testDecideDetectsUnacceptableChannel()
-        throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=true");
-        request.setServerName("localhost");
-        request.setContextPath("/bigapp");
-        request.setServletPath("/servlet");
-        request.setScheme("https");
-        request.setSecure(true);
-        request.setServerPort(8443);
+	public void testDecideDetectsUnacceptableChannel() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=true");
+		request.setServerName("localhost");
+		request.setContextPath("/bigapp");
+		request.setServletPath("/servlet");
+		request.setScheme("https");
+		request.setSecure(true);
+		request.setServerPort(8443);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        processor.decide(fi, SecurityConfig.createList(new String[]{"SOME_IGNORED_ATTRIBUTE", "REQUIRES_INSECURE_CHANNEL"}));
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		processor.decide(
+				fi,
+				SecurityConfig.createList(new String[] { "SOME_IGNORED_ATTRIBUTE",
+						"REQUIRES_INSECURE_CHANNEL" }));
 
-        assertTrue(fi.getResponse().isCommitted());
-    }
+		assertTrue(fi.getResponse().isCommitted());
+	}
 
-    public void testDecideRejectsNulls() throws Exception {
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        processor.afterPropertiesSet();
+	public void testDecideRejectsNulls() throws Exception {
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		processor.afterPropertiesSet();
 
-        try {
-            processor.decide(null, null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			processor.decide(null, null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGettersSetters() {
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        assertEquals("REQUIRES_INSECURE_CHANNEL", processor.getInsecureKeyword());
-        processor.setInsecureKeyword("X");
-        assertEquals("X", processor.getInsecureKeyword());
+	public void testGettersSetters() {
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		assertEquals("REQUIRES_INSECURE_CHANNEL", processor.getInsecureKeyword());
+		processor.setInsecureKeyword("X");
+		assertEquals("X", processor.getInsecureKeyword());
 
-        assertTrue(processor.getEntryPoint() != null);
-        processor.setEntryPoint(null);
-        assertTrue(processor.getEntryPoint() == null);
-    }
+		assertTrue(processor.getEntryPoint() != null);
+		processor.setEntryPoint(null);
+		assertTrue(processor.getEntryPoint() == null);
+	}
 
-    public void testMissingEntryPoint() throws Exception {
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        processor.setEntryPoint(null);
+	public void testMissingEntryPoint() throws Exception {
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		processor.setEntryPoint(null);
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("entryPoint required", expected.getMessage());
-        }
-    }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("entryPoint required", expected.getMessage());
+		}
+	}
 
-    public void testMissingSecureChannelKeyword() throws Exception {
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        processor.setInsecureKeyword(null);
+	public void testMissingSecureChannelKeyword() throws Exception {
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		processor.setInsecureKeyword(null);
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("insecureKeyword required", expected.getMessage());
-        }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("insecureKeyword required", expected.getMessage());
+		}
 
-        processor.setInsecureKeyword("");
+		processor.setInsecureKeyword("");
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("insecureKeyword required", expected.getMessage());
-        }
-    }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("insecureKeyword required", expected.getMessage());
+		}
+	}
 
-    public void testSupports() {
-        InsecureChannelProcessor processor = new InsecureChannelProcessor();
-        assertTrue(processor.supports(new SecurityConfig("REQUIRES_INSECURE_CHANNEL")));
-        assertFalse(processor.supports(null));
-        assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED")));
-    }
+	public void testSupports() {
+		InsecureChannelProcessor processor = new InsecureChannelProcessor();
+		assertTrue(processor.supports(new SecurityConfig("REQUIRES_INSECURE_CHANNEL")));
+		assertFalse(processor.supports(null));
+		assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED")));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java
index 9f6fe90b8d..e32c2d1d09 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java
@@ -33,117 +33,126 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
  * Tests {@link RetryWithHttpEntryPoint}.
  *
  * @author Ben Alex
  */
 public class RetryWithHttpEntryPointTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDetectsMissingPortMapper() throws Exception {
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+	public void testDetectsMissingPortMapper() throws Exception {
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
 
-        try {
-            ep.setPortMapper(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			ep.setPortMapper(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    public void testDetectsMissingPortResolver() throws Exception {
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+	public void testDetectsMissingPortResolver() throws Exception {
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
 
-        try {
-            ep.setPortResolver(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			ep.setPortResolver(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    public void testGettersSetters() {
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        PortMapper portMapper = mock(PortMapper.class);
-        PortResolver portResolver = mock(PortResolver.class);
-        RedirectStrategy redirector = mock(RedirectStrategy.class);
-        ep.setPortMapper(portMapper);
-        ep.setPortResolver(portResolver);
-        ep.setRedirectStrategy(redirector);
-        assertSame(portMapper, ep.getPortMapper());
-        assertSame(portResolver, ep.getPortResolver());
-        assertSame(redirector, ep.getRedirectStrategy());
-    }
+	public void testGettersSetters() {
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+		PortMapper portMapper = mock(PortMapper.class);
+		PortResolver portResolver = mock(PortResolver.class);
+		RedirectStrategy redirector = mock(RedirectStrategy.class);
+		ep.setPortMapper(portMapper);
+		ep.setPortResolver(portResolver);
+		ep.setRedirectStrategy(redirector);
+		assertSame(portMapper, ep.getPortMapper());
+		assertSame(portResolver, ep.getPortResolver());
+		assertSame(redirector, ep.getRedirectStrategy());
+	}
 
-    public void testNormalOperation() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello/pathInfo.html");
-        request.setQueryString("open=true");
-        request.setScheme("https");
-        request.setServerName("www.example.com");
-        request.setServerPort(443);
+	public void testNormalOperation() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello/pathInfo.html");
+		request.setQueryString("open=true");
+		request.setScheme("https");
+		request.setServerName("www.example.com");
+		request.setServerPort(443);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
 
-        ep.commence(request, response);
-        assertEquals("http://www.example.com/bigWebApp/hello/pathInfo.html?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("http://www.example.com/bigWebApp/hello/pathInfo.html?open=true",
+				response.getRedirectedUrl());
+	}
 
-    public void testNormalOperationWithNullQueryString() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello");
-        request.setScheme("https");
-        request.setServerName("www.example.com");
-        request.setServerPort(443);
+	public void testNormalOperationWithNullQueryString() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello");
+		request.setScheme("https");
+		request.setServerName("www.example.com");
+		request.setServerPort(443);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
 
-        ep.commence(request, response);
-        assertEquals("http://www.example.com/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("http://www.example.com/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    public void testOperationWhenTargetPortIsUnknown() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp");
-        request.setQueryString("open=true");
-        request.setScheme("https");
-        request.setServerName("www.example.com");
-        request.setServerPort(8768);
+	public void testOperationWhenTargetPortIsUnknown() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp");
+		request.setQueryString("open=true");
+		request.setScheme("https");
+		request.setServerName("www.example.com");
+		request.setServerPort(8768);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(8768, 1234));
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(8768, 1234));
 
-        ep.commence(request, response);
-        assertEquals("/bigWebApp?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("/bigWebApp?open=true", response.getRedirectedUrl());
+	}
 
-    public void testOperationWithNonStandardPort() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello/pathInfo.html");
-        request.setQueryString("open=true");
-        request.setScheme("https");
-        request.setServerName("www.example.com");
-        request.setServerPort(9999);
+	public void testOperationWithNonStandardPort() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello/pathInfo.html");
+		request.setQueryString("open=true");
+		request.setScheme("https");
+		request.setServerName("www.example.com");
+		request.setServerPort(9999);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        PortMapperImpl portMapper = new PortMapperImpl();
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("8888", "9999");
-        portMapper.setPortMappings(map);
+		PortMapperImpl portMapper = new PortMapperImpl();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("8888", "9999");
+		portMapper.setPortMappings(map);
 
-        RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
-        ep.setPortResolver(new MockPortResolver(8888, 9999));
-        ep.setPortMapper(portMapper);
+		RetryWithHttpEntryPoint ep = new RetryWithHttpEntryPoint();
+		ep.setPortResolver(new MockPortResolver(8888, 9999));
+		ep.setPortMapper(portMapper);
 
-        ep.commence(request, response);
-        assertEquals("http://www.example.com:8888/bigWebApp/hello/pathInfo.html?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals(
+				"http://www.example.com:8888/bigWebApp/hello/pathInfo.html?open=true",
+				response.getRedirectedUrl());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java
index 54d8b679d3..5d8de9e37a 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java
@@ -28,112 +28,121 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
-
 /**
  * Tests {@link RetryWithHttpsEntryPoint}.
  *
  * @author Ben Alex
  */
 public class RetryWithHttpsEntryPointTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDetectsMissingPortMapper() throws Exception {
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+	public void testDetectsMissingPortMapper() throws Exception {
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
 
-        try {
-            ep.setPortMapper(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			ep.setPortMapper(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    public void testDetectsMissingPortResolver() throws Exception {
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+	public void testDetectsMissingPortResolver() throws Exception {
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
 
-        try {
-            ep.setPortResolver(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			ep.setPortResolver(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    public void testGettersSetters() {
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(8080, 8443));
-        assertTrue(ep.getPortMapper() != null);
-        assertTrue(ep.getPortResolver() != null);
-    }
+	public void testGettersSetters() {
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(8080, 8443));
+		assertTrue(ep.getPortMapper() != null);
+		assertTrue(ep.getPortResolver() != null);
+	}
 
-    public void testNormalOperation() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello/pathInfo.html");
-        request.setQueryString("open=true");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setServerPort(80);
+	public void testNormalOperation() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello/pathInfo.html");
+		request.setQueryString("open=true");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
 
-        ep.commence(request, response);
-        assertEquals("https://www.example.com/bigWebApp/hello/pathInfo.html?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("https://www.example.com/bigWebApp/hello/pathInfo.html?open=true",
+				response.getRedirectedUrl());
+	}
 
-    public void testNormalOperationWithNullQueryString() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setServerPort(80);
+	public void testNormalOperationWithNullQueryString() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
 
-        ep.commence(request, response);
-        assertEquals("https://www.example.com/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("https://www.example.com/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    public void testOperationWhenTargetPortIsUnknown() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp");
-        request.setQueryString("open=true");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setServerPort(8768);
+	public void testOperationWhenTargetPortIsUnknown() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp");
+		request.setQueryString("open=true");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setServerPort(8768);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(8768, 1234));
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(8768, 1234));
 
-        ep.commence(request, response);
-        assertEquals("/bigWebApp?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals("/bigWebApp?open=true", response.getRedirectedUrl());
+	}
 
-    public void testOperationWithNonStandardPort() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bigWebApp/hello/pathInfo.html");
-        request.setQueryString("open=true");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setServerPort(8888);
+	public void testOperationWithNonStandardPort() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/bigWebApp/hello/pathInfo.html");
+		request.setQueryString("open=true");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setServerPort(8888);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        PortMapperImpl portMapper = new PortMapperImpl();
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("8888", "9999");
-        portMapper.setPortMappings(map);
+		PortMapperImpl portMapper = new PortMapperImpl();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("8888", "9999");
+		portMapper.setPortMappings(map);
 
-        RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
-        ep.setPortResolver(new MockPortResolver(8888, 9999));
-        ep.setPortMapper(portMapper);
+		RetryWithHttpsEntryPoint ep = new RetryWithHttpsEntryPoint();
+		ep.setPortResolver(new MockPortResolver(8888, 9999));
+		ep.setPortMapper(portMapper);
 
-        ep.commence(request, response);
-        assertEquals("https://www.example.com:9999/bigWebApp/hello/pathInfo.html?open=true", response.getRedirectedUrl());
-    }
+		ep.commence(request, response);
+		assertEquals(
+				"https://www.example.com:9999/bigWebApp/hello/pathInfo.html?open=true",
+				response.getRedirectedUrl());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java
index 8f20c8869a..a82dc3a18a 100644
--- a/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/channel/SecureChannelProcessorTests.java
@@ -27,112 +27,122 @@ import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.channel.SecureChannelProcessor;
 
-
 /**
  * Tests {@link SecureChannelProcessor}.
  *
  * @author Ben Alex
  */
 public class SecureChannelProcessorTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testDecideDetectsAcceptableChannel() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=true");
-        request.setServerName("localhost");
-        request.setContextPath("/bigapp");
-        request.setServletPath("/servlet");
-        request.setScheme("https");
-        request.setSecure(true);
-        request.setServerPort(8443);
+	public void testDecideDetectsAcceptableChannel() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=true");
+		request.setServerName("localhost");
+		request.setContextPath("/bigapp");
+		request.setServletPath("/servlet");
+		request.setScheme("https");
+		request.setSecure(true);
+		request.setServerPort(8443);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE", "REQUIRES_SECURE_CHANNEL"));
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		processor.decide(fi, SecurityConfig.createList("SOME_IGNORED_ATTRIBUTE",
+				"REQUIRES_SECURE_CHANNEL"));
 
-        assertFalse(fi.getResponse().isCommitted());
-    }
+		assertFalse(fi.getResponse().isCommitted());
+	}
 
-    public void testDecideDetectsUnacceptableChannel() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("info=true");
-        request.setServerName("localhost");
-        request.setContextPath("/bigapp");
-        request.setServletPath("/servlet");
-        request.setScheme("http");
-        request.setServerPort(8080);
+	public void testDecideDetectsUnacceptableChannel() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("info=true");
+		request.setServerName("localhost");
+		request.setContextPath("/bigapp");
+		request.setServletPath("/servlet");
+		request.setScheme("http");
+		request.setServerPort(8080);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterInvocation fi = new FilterInvocation(request, response, mock(FilterChain.class));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterInvocation fi = new FilterInvocation(request, response,
+				mock(FilterChain.class));
 
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        processor.decide(fi, SecurityConfig.createList(new String[]{"SOME_IGNORED_ATTRIBUTE", "REQUIRES_SECURE_CHANNEL"}));
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		processor.decide(
+				fi,
+				SecurityConfig.createList(new String[] { "SOME_IGNORED_ATTRIBUTE",
+						"REQUIRES_SECURE_CHANNEL" }));
 
-        assertTrue(fi.getResponse().isCommitted());
-    }
+		assertTrue(fi.getResponse().isCommitted());
+	}
 
-    public void testDecideRejectsNulls() throws Exception {
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        processor.afterPropertiesSet();
+	public void testDecideRejectsNulls() throws Exception {
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		processor.afterPropertiesSet();
 
-        try {
-            processor.decide(null, null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			processor.decide(null, null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testGettersSetters() {
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        assertEquals("REQUIRES_SECURE_CHANNEL", processor.getSecureKeyword());
-        processor.setSecureKeyword("X");
-        assertEquals("X", processor.getSecureKeyword());
+	public void testGettersSetters() {
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		assertEquals("REQUIRES_SECURE_CHANNEL", processor.getSecureKeyword());
+		processor.setSecureKeyword("X");
+		assertEquals("X", processor.getSecureKeyword());
 
-        assertTrue(processor.getEntryPoint() != null);
-        processor.setEntryPoint(null);
-        assertTrue(processor.getEntryPoint() == null);
-    }
+		assertTrue(processor.getEntryPoint() != null);
+		processor.setEntryPoint(null);
+		assertTrue(processor.getEntryPoint() == null);
+	}
 
-    public void testMissingEntryPoint() throws Exception {
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        processor.setEntryPoint(null);
+	public void testMissingEntryPoint() throws Exception {
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		processor.setEntryPoint(null);
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("entryPoint required", expected.getMessage());
-        }
-    }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("entryPoint required", expected.getMessage());
+		}
+	}
 
-    public void testMissingSecureChannelKeyword() throws Exception {
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        processor.setSecureKeyword(null);
+	public void testMissingSecureChannelKeyword() throws Exception {
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		processor.setSecureKeyword(null);
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("secureKeyword required", expected.getMessage());
-        }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("secureKeyword required", expected.getMessage());
+		}
 
-        processor.setSecureKeyword("");
+		processor.setSecureKeyword("");
 
-        try {
-            processor.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("secureKeyword required", expected.getMessage());
-        }
-    }
+		try {
+			processor.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("secureKeyword required", expected.getMessage());
+		}
+	}
 
-    public void testSupports() {
-        SecureChannelProcessor processor = new SecureChannelProcessor();
-        assertTrue(processor.supports(new SecurityConfig("REQUIRES_SECURE_CHANNEL")));
-        assertFalse(processor.supports(null));
-        assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED")));
-    }
+	public void testSupports() {
+		SecureChannelProcessor processor = new SecureChannelProcessor();
+		assertTrue(processor.supports(new SecurityConfig("REQUIRES_SECURE_CHANNEL")));
+		assertFalse(processor.supports(null));
+		assertFalse(processor.supports(new SecurityConfig("NOT_SUPPORTED")));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java
index 74e51dbcc7..2ee7cace39 100644
--- a/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandlerTests.java
@@ -39,55 +39,59 @@ import org.springframework.security.web.FilterInvocation;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DefaultWebSecurityExpressionHandlerTests {
-    @Mock
-    private AuthenticationTrustResolver trustResolver;
+	@Mock
+	private AuthenticationTrustResolver trustResolver;
 
-    @Mock
-    private Authentication authentication;
+	@Mock
+	private Authentication authentication;
 
-    @Mock
-    private FilterInvocation invocation;
+	@Mock
+	private FilterInvocation invocation;
 
-    private DefaultWebSecurityExpressionHandler handler;
+	private DefaultWebSecurityExpressionHandler handler;
 
-    @Before
-    public void setup() {
-        handler = new DefaultWebSecurityExpressionHandler();
-    }
+	@Before
+	public void setup() {
+		handler = new DefaultWebSecurityExpressionHandler();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void expressionPropertiesAreResolvedAgainsAppContextBeans() throws Exception {
-        StaticApplicationContext appContext = new StaticApplicationContext();
-        RootBeanDefinition bean = new RootBeanDefinition(SecurityConfig.class);
-        bean.getConstructorArgumentValues().addGenericArgumentValue("ROLE_A");
-        appContext.registerBeanDefinition("role", bean);
-        handler.setApplicationContext(appContext);
+	@Test
+	public void expressionPropertiesAreResolvedAgainsAppContextBeans() throws Exception {
+		StaticApplicationContext appContext = new StaticApplicationContext();
+		RootBeanDefinition bean = new RootBeanDefinition(SecurityConfig.class);
+		bean.getConstructorArgumentValues().addGenericArgumentValue("ROLE_A");
+		appContext.registerBeanDefinition("role", bean);
+		handler.setApplicationContext(appContext);
 
-        EvaluationContext ctx = handler.createEvaluationContext(mock(Authentication.class), mock(FilterInvocation.class));
-        ExpressionParser parser = handler.getExpressionParser();
-        assertTrue(parser.parseExpression("@role.getAttribute() == 'ROLE_A'").getValue(ctx, Boolean.class));
-        assertTrue(parser.parseExpression("@role.attribute == 'ROLE_A'").getValue(ctx, Boolean.class));
-    }
+		EvaluationContext ctx = handler.createEvaluationContext(
+				mock(Authentication.class), mock(FilterInvocation.class));
+		ExpressionParser parser = handler.getExpressionParser();
+		assertTrue(parser.parseExpression("@role.getAttribute() == 'ROLE_A'").getValue(
+				ctx, Boolean.class));
+		assertTrue(parser.parseExpression("@role.attribute == 'ROLE_A'").getValue(ctx,
+				Boolean.class));
+	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void setTrustResolverNull() {
+		handler.setTrustResolver(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setTrustResolverNull() {
-        handler.setTrustResolver(null);
-    }
+	@Test
+	public void createEvaluationContextCustomTrustResolver() {
+		handler.setTrustResolver(trustResolver);
 
-    @Test
-    public void createEvaluationContextCustomTrustResolver() {
-        handler.setTrustResolver(trustResolver);
+		Expression expression = handler.getExpressionParser()
+				.parseExpression("anonymous");
+		EvaluationContext context = handler.createEvaluationContext(authentication,
+				invocation);
+		assertThat(expression.getValue(context, Boolean.class)).isFalse();
 
-        Expression expression = handler.getExpressionParser().parseExpression("anonymous");
-        EvaluationContext context = handler.createEvaluationContext(authentication, invocation);
-        assertThat(expression.getValue(context, Boolean.class)).isFalse();
-
-        verify(trustResolver).isAnonymous(authentication);
-    }
+		verify(trustResolver).isAnonymous(authentication);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java
index 9a80069af2..f839e77cdd 100644
--- a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java
@@ -1,6 +1,5 @@
 package org.springframework.security.web.access.expression;
 
-
 import static org.junit.Assert.*;
 
 import org.junit.Test;
@@ -18,27 +17,30 @@ import java.util.LinkedHashMap;
  */
 public class ExpressionBasedFilterInvocationSecurityMetadataSourceTests {
 
-    @Test
-    public void expectedAttributeIsReturned() {
-        final String expression = "hasRole('X')";
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
-        requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList(expression));
-        ExpressionBasedFilterInvocationSecurityMetadataSource mds =
-                new ExpressionBasedFilterInvocationSecurityMetadataSource(requestMap, new DefaultWebSecurityExpressionHandler());
-        assertEquals(1, mds.getAllConfigAttributes().size());
-        Collection<ConfigAttribute> attrs = mds.getAttributes(new FilterInvocation("/path", "GET"));
-        assertEquals(1, attrs.size());
-        WebExpressionConfigAttribute attribute = (WebExpressionConfigAttribute) attrs.toArray()[0];
-        assertNull(attribute.getAttribute());
-        assertEquals(expression, attribute.getAuthorizeExpression().getExpressionString());
-        assertEquals(expression, attribute.toString());
-    }
+	@Test
+	public void expectedAttributeIsReturned() {
+		final String expression = "hasRole('X')";
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList(expression));
+		ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource(
+				requestMap, new DefaultWebSecurityExpressionHandler());
+		assertEquals(1, mds.getAllConfigAttributes().size());
+		Collection<ConfigAttribute> attrs = mds.getAttributes(new FilterInvocation(
+				"/path", "GET"));
+		assertEquals(1, attrs.size());
+		WebExpressionConfigAttribute attribute = (WebExpressionConfigAttribute) attrs
+				.toArray()[0];
+		assertNull(attribute.getAttribute());
+		assertEquals(expression, attribute.getAuthorizeExpression().getExpressionString());
+		assertEquals(expression, attribute.toString());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void invalidExpressionIsRejected() throws Exception {
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
-        requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList("hasRole('X'"));
-        ExpressionBasedFilterInvocationSecurityMetadataSource mds =
-                new ExpressionBasedFilterInvocationSecurityMetadataSource(requestMap, new DefaultWebSecurityExpressionHandler());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidExpressionIsRejected() throws Exception {
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		requestMap.put(AnyRequestMatcher.INSTANCE,
+				SecurityConfig.createList("hasRole('X'"));
+		ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource(
+				requestMap, new DefaultWebSecurityExpressionHandler());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java
index 1ab2338b29..a9d4be3e09 100644
--- a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java
@@ -27,70 +27,74 @@ import javax.servlet.ServletResponse;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
 public class WebExpressionVoterTests {
-    private Authentication user = new TestingAuthenticationToken("user","pass", "X");
+	private Authentication user = new TestingAuthenticationToken("user", "pass", "X");
 
-    @Test
-    public void supportsWebConfigAttributeAndFilterInvocation() throws Exception {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        assertTrue(voter.supports(new WebExpressionConfigAttribute(mock(Expression.class))));
-        assertTrue(voter.supports(FilterInvocation.class));
-        assertFalse(voter.supports(MethodInvocation.class));
+	@Test
+	public void supportsWebConfigAttributeAndFilterInvocation() throws Exception {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		assertTrue(voter
+				.supports(new WebExpressionConfigAttribute(mock(Expression.class))));
+		assertTrue(voter.supports(FilterInvocation.class));
+		assertFalse(voter.supports(MethodInvocation.class));
 
-    }
+	}
 
-    @Test
-    public void abstainsIfNoAttributeFound() {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        assertEquals(AccessDecisionVoter.ACCESS_ABSTAIN,
-                voter.vote(user, new FilterInvocation("/path", "GET"), SecurityConfig.createList("A", "B", "C")));
-    }
+	@Test
+	public void abstainsIfNoAttributeFound() {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		assertEquals(
+				AccessDecisionVoter.ACCESS_ABSTAIN,
+				voter.vote(user, new FilterInvocation("/path", "GET"),
+						SecurityConfig.createList("A", "B", "C")));
+	}
 
-    @Test
-    public void grantsAccessIfExpressionIsTrueDeniesIfFalse() {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        Expression ex = mock(Expression.class);
-        WebExpressionConfigAttribute weca = new WebExpressionConfigAttribute(ex);
-        EvaluationContext ctx = mock(EvaluationContext.class);
-        SecurityExpressionHandler eh = mock(SecurityExpressionHandler.class);
-        FilterInvocation fi = new FilterInvocation("/path", "GET");
-        voter.setExpressionHandler(eh);
-        when(eh.createEvaluationContext(user, fi)).thenReturn(ctx);
-        when(ex.getValue(ctx, Boolean.class)).thenReturn(Boolean.TRUE).thenReturn(Boolean.FALSE);
-        ArrayList attributes = new ArrayList();
-        attributes.addAll(SecurityConfig.createList("A","B","C"));
-        attributes.add(weca);
+	@Test
+	public void grantsAccessIfExpressionIsTrueDeniesIfFalse() {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		Expression ex = mock(Expression.class);
+		WebExpressionConfigAttribute weca = new WebExpressionConfigAttribute(ex);
+		EvaluationContext ctx = mock(EvaluationContext.class);
+		SecurityExpressionHandler eh = mock(SecurityExpressionHandler.class);
+		FilterInvocation fi = new FilterInvocation("/path", "GET");
+		voter.setExpressionHandler(eh);
+		when(eh.createEvaluationContext(user, fi)).thenReturn(ctx);
+		when(ex.getValue(ctx, Boolean.class)).thenReturn(Boolean.TRUE).thenReturn(
+				Boolean.FALSE);
+		ArrayList attributes = new ArrayList();
+		attributes.addAll(SecurityConfig.createList("A", "B", "C"));
+		attributes.add(weca);
 
-        assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(user, fi, attributes));
+		assertEquals(AccessDecisionVoter.ACCESS_GRANTED, voter.vote(user, fi, attributes));
 
-        // Second time false
-        assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(user, fi, attributes));
-    }
+		// Second time false
+		assertEquals(AccessDecisionVoter.ACCESS_DENIED, voter.vote(user, fi, attributes));
+	}
 
-    // SEC-2507
-    @Test
-    public void supportFilterInvocationSubClass() {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        assertThat(voter.supports(FilterInvocationChild.class)).isTrue();
-    }
+	// SEC-2507
+	@Test
+	public void supportFilterInvocationSubClass() {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		assertThat(voter.supports(FilterInvocationChild.class)).isTrue();
+	}
 
-    private static class FilterInvocationChild extends FilterInvocation {
-        public FilterInvocationChild(ServletRequest request,
-                ServletResponse response, FilterChain chain) {
-            super(request, response, chain);
-        }
-    }
+	private static class FilterInvocationChild extends FilterInvocation {
+		public FilterInvocationChild(ServletRequest request, ServletResponse response,
+				FilterChain chain) {
+			super(request, response, chain);
+		}
+	}
 
-    @Test
-    public void supportFilterInvocation() {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        assertThat(voter.supports(FilterInvocation.class)).isTrue();
-    }
+	@Test
+	public void supportFilterInvocation() {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		assertThat(voter.supports(FilterInvocation.class)).isTrue();
+	}
 
-    @Test
-    public void supportsObjectIsFalse() {
-        WebExpressionVoter voter = new WebExpressionVoter();
-        assertThat(voter.supports(Object.class)).isFalse();
-    }
+	@Test
+	public void supportsObjectIsFalse() {
+		WebExpressionVoter voter = new WebExpressionVoter();
+		assertThat(voter.supports(Object.class)).isFalse();
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java
index bad31dea01..5d78f30790 100644
--- a/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/expression/WebSecurityExpressionRootTests.java
@@ -20,52 +20,54 @@ import org.springframework.security.web.access.expression.WebSecurityExpressionR
  */
 public class WebSecurityExpressionRootTests {
 
-    @Test
-    public void ipAddressMatchesForEqualIpAddresses() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/test");
-        // IPv4
-        request.setRemoteAddr("192.168.1.1");
-        WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(mock(Authentication.class),
-                new FilterInvocation(request, mock(HttpServletResponse.class), mock(FilterChain.class)));
+	@Test
+	public void ipAddressMatchesForEqualIpAddresses() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/test");
+		// IPv4
+		request.setRemoteAddr("192.168.1.1");
+		WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(
+				mock(Authentication.class), new FilterInvocation(request,
+						mock(HttpServletResponse.class), mock(FilterChain.class)));
 
-        assertTrue(root.hasIpAddress("192.168.1.1"));
+		assertTrue(root.hasIpAddress("192.168.1.1"));
 
-        // IPv6 Address
-        request.setRemoteAddr("fa:db8:85a3::8a2e:370:7334");
-        assertTrue(root.hasIpAddress("fa:db8:85a3::8a2e:370:7334"));
-    }
+		// IPv6 Address
+		request.setRemoteAddr("fa:db8:85a3::8a2e:370:7334");
+		assertTrue(root.hasIpAddress("fa:db8:85a3::8a2e:370:7334"));
+	}
 
-    @Test
-    public void addressesInIpRangeMatch() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/test");
-        WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(mock(Authentication.class),
-                new FilterInvocation(request, mock(HttpServletResponse.class), mock(FilterChain.class)));
-        for (int i=0; i < 255; i++) {
-            request.setRemoteAddr("192.168.1." + i);
-            assertTrue(root.hasIpAddress("192.168.1.0/24"));
-        }
+	@Test
+	public void addressesInIpRangeMatch() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/test");
+		WebSecurityExpressionRoot root = new WebSecurityExpressionRoot(
+				mock(Authentication.class), new FilterInvocation(request,
+						mock(HttpServletResponse.class), mock(FilterChain.class)));
+		for (int i = 0; i < 255; i++) {
+			request.setRemoteAddr("192.168.1." + i);
+			assertTrue(root.hasIpAddress("192.168.1.0/24"));
+		}
 
-        request.setRemoteAddr("192.168.1.127");
-        // 25 = FF FF FF 80
-        assertTrue(root.hasIpAddress("192.168.1.0/25"));
-        // encroach on the mask
-        request.setRemoteAddr("192.168.1.128");
-        assertFalse(root.hasIpAddress("192.168.1.0/25"));
-        request.setRemoteAddr("192.168.1.255");
-        assertTrue(root.hasIpAddress("192.168.1.128/25"));
-        assertTrue(root.hasIpAddress("192.168.1.192/26"));
-        assertTrue(root.hasIpAddress("192.168.1.224/27"));
-        assertTrue(root.hasIpAddress("192.168.1.240/27"));
-        assertTrue(root.hasIpAddress("192.168.1.255/32"));
+		request.setRemoteAddr("192.168.1.127");
+		// 25 = FF FF FF 80
+		assertTrue(root.hasIpAddress("192.168.1.0/25"));
+		// encroach on the mask
+		request.setRemoteAddr("192.168.1.128");
+		assertFalse(root.hasIpAddress("192.168.1.0/25"));
+		request.setRemoteAddr("192.168.1.255");
+		assertTrue(root.hasIpAddress("192.168.1.128/25"));
+		assertTrue(root.hasIpAddress("192.168.1.192/26"));
+		assertTrue(root.hasIpAddress("192.168.1.224/27"));
+		assertTrue(root.hasIpAddress("192.168.1.240/27"));
+		assertTrue(root.hasIpAddress("192.168.1.255/32"));
 
-        request.setRemoteAddr("202.24.199.127");
-        assertTrue(root.hasIpAddress("202.24.0.0/14"));
-        request.setRemoteAddr("202.25.179.135");
-        assertTrue(root.hasIpAddress("202.24.0.0/14"));
-        request.setRemoteAddr("202.26.179.135");
-        assertTrue(root.hasIpAddress("202.24.0.0/14"));
-    }
+		request.setRemoteAddr("202.24.199.127");
+		assertTrue(root.hasIpAddress("202.24.0.0/14"));
+		request.setRemoteAddr("202.25.179.135");
+		assertTrue(root.hasIpAddress("202.24.0.0/14"));
+		request.setRemoteAddr("202.26.179.135");
+		assertTrue(root.hasIpAddress("202.24.0.0/14"));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
index 86c92b967f..e6bec774f2 100644
--- a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java
@@ -38,133 +38,141 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  * @author Ben Alex
  */
 public class DefaultFilterInvocationSecurityMetadataSourceTests {
-    private DefaultFilterInvocationSecurityMetadataSource fids;
-    private Collection<ConfigAttribute> def = SecurityConfig.createList("ROLE_ONE");
+	private DefaultFilterInvocationSecurityMetadataSource fids;
+	private Collection<ConfigAttribute> def = SecurityConfig.createList("ROLE_ONE");
 
-    //~ Methods ========================================================================================================
-    private void createFids(String pattern, String method) {
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap =
-            new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
-        requestMap.put(new AntPathRequestMatcher(pattern, method), def);
-        fids = new DefaultFilterInvocationSecurityMetadataSource(requestMap);
-    }
+	// ~ Methods
+	// ========================================================================================================
+	private void createFids(String pattern, String method) {
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		requestMap.put(new AntPathRequestMatcher(pattern, method), def);
+		fids = new DefaultFilterInvocationSecurityMetadataSource(requestMap);
+	}
 
-    @Test
-    public void lookupNotRequiringExactMatchSucceedsIfNotMatching() {
-        createFids("/secure/super/**", null);
+	@Test
+	public void lookupNotRequiringExactMatchSucceedsIfNotMatching() {
+		createFids("/secure/super/**", null);
 
-        FilterInvocation fi = createFilterInvocation("/SeCuRE/super/somefile.html", null, null, null);
+		FilterInvocation fi = createFilterInvocation("/SeCuRE/super/somefile.html", null,
+				null, null);
 
-        assertEquals(def, fids.getAttributes(fi));
-    }
+		assertEquals(def, fids.getAttributes(fi));
+	}
 
-    /**
-     * SEC-501. Note that as of 2.0, lower case comparisons are the default for this class.
-     */
-    @Test
-    public void lookupNotRequiringExactMatchSucceedsIfSecureUrlPathContainsUpperCase() {
-        createFids("/SeCuRE/super/**", null);
+	/**
+	 * SEC-501. Note that as of 2.0, lower case comparisons are the default for this
+	 * class.
+	 */
+	@Test
+	public void lookupNotRequiringExactMatchSucceedsIfSecureUrlPathContainsUpperCase() {
+		createFids("/SeCuRE/super/**", null);
 
-        FilterInvocation fi = createFilterInvocation("/secure", "/super/somefile.html", null, null);
+		FilterInvocation fi = createFilterInvocation("/secure", "/super/somefile.html",
+				null, null);
 
-        Collection<ConfigAttribute> response = fids.getAttributes(fi);
-        assertEquals(def, response);
-    }
+		Collection<ConfigAttribute> response = fids.getAttributes(fi);
+		assertEquals(def, response);
+	}
 
-    @Test
-    public void lookupRequiringExactMatchIsSuccessful() {
-        createFids("/SeCurE/super/**", null);
+	@Test
+	public void lookupRequiringExactMatchIsSuccessful() {
+		createFids("/SeCurE/super/**", null);
 
-        FilterInvocation fi = createFilterInvocation("/SeCurE/super/somefile.html", null, null, null);
+		FilterInvocation fi = createFilterInvocation("/SeCurE/super/somefile.html", null,
+				null, null);
 
-        Collection<ConfigAttribute> response = fids.getAttributes(fi);
-        assertEquals(def, response);
-    }
+		Collection<ConfigAttribute> response = fids.getAttributes(fi);
+		assertEquals(def, response);
+	}
 
-    @Test
-    public void lookupRequiringExactMatchWithAdditionalSlashesIsSuccessful() {
-        createFids("/someAdminPage.html**", null);
+	@Test
+	public void lookupRequiringExactMatchWithAdditionalSlashesIsSuccessful() {
+		createFids("/someAdminPage.html**", null);
 
-        FilterInvocation fi = createFilterInvocation("/someAdminPage.html", null, "a=/test", null);
+		FilterInvocation fi = createFilterInvocation("/someAdminPage.html", null,
+				"a=/test", null);
 
-        Collection<ConfigAttribute> response = fids.getAttributes(fi);
-        assertEquals(def, response); // see SEC-161 (it should truncate after ? sign)
-    }
+		Collection<ConfigAttribute> response = fids.getAttributes(fi);
+		assertEquals(def, response); // see SEC-161 (it should truncate after ? sign)
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void unknownHttpMethodIsRejected() {
-        createFids("/someAdminPage.html**", "UNKNOWN");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void unknownHttpMethodIsRejected() {
+		createFids("/someAdminPage.html**", "UNKNOWN");
+	}
 
-    @Test
-    public void httpMethodLookupSucceeds() {
-        createFids("/somepage**", "GET");
+	@Test
+	public void httpMethodLookupSucceeds() {
+		createFids("/somepage**", "GET");
 
-        FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET");
-        Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
-        assertEquals(def, attrs);
-    }
+		FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET");
+		Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
+		assertEquals(def, attrs);
+	}
 
-    @Test
-    public void generalMatchIsUsedIfNoMethodSpecificMatchExists() {
-        createFids("/somepage**", null);
+	@Test
+	public void generalMatchIsUsedIfNoMethodSpecificMatchExists() {
+		createFids("/somepage**", null);
 
-        FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET");
-        Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
-        assertEquals(def, attrs);
-    }
+		FilterInvocation fi = createFilterInvocation("/somepage", null, null, "GET");
+		Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
+		assertEquals(def, attrs);
+	}
 
-    @Test
-    public void requestWithDifferentHttpMethodDoesntMatch() {
-        createFids("/somepage**", "GET");
+	@Test
+	public void requestWithDifferentHttpMethodDoesntMatch() {
+		createFids("/somepage**", "GET");
 
-        FilterInvocation fi = createFilterInvocation("/somepage", null, null, "POST");
-        Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
-        assertNull(attrs);
-    }
+		FilterInvocation fi = createFilterInvocation("/somepage", null, null, "POST");
+		Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
+		assertNull(attrs);
+	}
 
-    // SEC-1236
-    @Test
-    public void mixingPatternsWithAndWithoutHttpMethodsIsSupported() throws Exception {
-        LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap =
-            new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
-        Collection<ConfigAttribute> userAttrs = SecurityConfig.createList("A");
+	// SEC-1236
+	@Test
+	public void mixingPatternsWithAndWithoutHttpMethodsIsSupported() throws Exception {
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		Collection<ConfigAttribute> userAttrs = SecurityConfig.createList("A");
 
-        requestMap.put(new AntPathRequestMatcher("/user/**", null), userAttrs);
-        requestMap.put(new AntPathRequestMatcher("/teller/**", "GET"),  SecurityConfig.createList("B"));
-        fids = new DefaultFilterInvocationSecurityMetadataSource(requestMap);
+		requestMap.put(new AntPathRequestMatcher("/user/**", null), userAttrs);
+		requestMap.put(new AntPathRequestMatcher("/teller/**", "GET"),
+				SecurityConfig.createList("B"));
+		fids = new DefaultFilterInvocationSecurityMetadataSource(requestMap);
 
-        FilterInvocation fi = createFilterInvocation("/user", null, null, "GET");
-        Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
-        assertEquals(userAttrs, attrs);
-    }
+		FilterInvocation fi = createFilterInvocation("/user", null, null, "GET");
+		Collection<ConfigAttribute> attrs = fids.getAttributes(fi);
+		assertEquals(userAttrs, attrs);
+	}
 
-    /**
-     * Check fixes for SEC-321
-     */
-    @Test
-    public void extraQuestionMarkStillMatches() {
-        createFids("/someAdminPage.html*", null);
+	/**
+	 * Check fixes for SEC-321
+	 */
+	@Test
+	public void extraQuestionMarkStillMatches() {
+		createFids("/someAdminPage.html*", null);
 
-        FilterInvocation fi = createFilterInvocation("/someAdminPage.html", null, null, null);
+		FilterInvocation fi = createFilterInvocation("/someAdminPage.html", null, null,
+				null);
 
-        Collection<ConfigAttribute> response = fids.getAttributes(fi);
-        assertEquals(def, response);
+		Collection<ConfigAttribute> response = fids.getAttributes(fi);
+		assertEquals(def, response);
 
-        fi = createFilterInvocation("/someAdminPage.html", null, "?", null);
+		fi = createFilterInvocation("/someAdminPage.html", null, "?", null);
 
-        response = fids.getAttributes(fi);
-        assertEquals(def, response);
-    }
+		response = fids.getAttributes(fi);
+		assertEquals(def, response);
+	}
 
-    private FilterInvocation createFilterInvocation(String servletPath, String pathInfo, String queryString, String method) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI(null);
-        request.setMethod(method);
-        request.setServletPath(servletPath);
-        request.setPathInfo(pathInfo);
-        request.setQueryString(queryString);
+	private FilterInvocation createFilterInvocation(String servletPath, String pathInfo,
+			String queryString, String method) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI(null);
+		request.setMethod(method);
+		request.setServletPath(servletPath);
+		request.setPathInfo(pathInfo);
+		request.setQueryString(queryString);
 
-        return new FilterInvocation(request, new MockHttpServletResponse(), mock(FilterChain.class));
-    }
+		return new FilterInvocation(request, new MockHttpServletResponse(),
+				mock(FilterChain.class));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java
index 8d7a3aeeaa..e58d9d36da 100644
--- a/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/intercept/FilterSecurityInterceptorTests.java
@@ -40,7 +40,6 @@ import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Tests {@link FilterSecurityInterceptor}.
  *
@@ -49,134 +48,145 @@ import javax.servlet.http.HttpServletResponse;
  * @author Rob Winch
  */
 public class FilterSecurityInterceptorTests {
-    private AuthenticationManager am;
-    private AccessDecisionManager adm;
-    private FilterInvocationSecurityMetadataSource ods;
-    private RunAsManager ram;
-    private FilterSecurityInterceptor interceptor;
-    private ApplicationEventPublisher publisher;
+	private AuthenticationManager am;
+	private AccessDecisionManager adm;
+	private FilterInvocationSecurityMetadataSource ods;
+	private RunAsManager ram;
+	private FilterSecurityInterceptor interceptor;
+	private ApplicationEventPublisher publisher;
 
+	// ~ Methods
+	// ========================================================================================================
 
-    //~ Methods ========================================================================================================
+	@Before
+	public final void setUp() throws Exception {
+		interceptor = new FilterSecurityInterceptor();
+		am = mock(AuthenticationManager.class);
+		ods = mock(FilterInvocationSecurityMetadataSource.class);
+		adm = mock(AccessDecisionManager.class);
+		ram = mock(RunAsManager.class);
+		publisher = mock(ApplicationEventPublisher.class);
+		interceptor.setAuthenticationManager(am);
+		interceptor.setSecurityMetadataSource(ods);
+		interceptor.setAccessDecisionManager(adm);
+		interceptor.setRunAsManager(ram);
+		interceptor.setApplicationEventPublisher(publisher);
+		SecurityContextHolder.clearContext();
+	}
 
-    @Before
-    public final void setUp() throws Exception {
-        interceptor = new FilterSecurityInterceptor();
-        am = mock(AuthenticationManager.class);
-        ods = mock(FilterInvocationSecurityMetadataSource.class);
-        adm = mock(AccessDecisionManager.class);
-        ram = mock(RunAsManager.class);
-        publisher = mock(ApplicationEventPublisher.class);
-        interceptor.setAuthenticationManager(am);
-        interceptor.setSecurityMetadataSource(ods);
-        interceptor.setAccessDecisionManager(adm);
-        interceptor.setRunAsManager(ram);
-        interceptor.setApplicationEventPublisher(publisher);
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testEnsuresAccessDecisionManagerSupportsFilterInvocationClass()
+			throws Exception {
+		when(adm.supports(FilterInvocation.class)).thenReturn(true);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testEnsuresAccessDecisionManagerSupportsFilterInvocationClass() throws Exception {
-        when(adm.supports(FilterInvocation.class)).thenReturn(true);
-        interceptor.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testEnsuresRunAsManagerSupportsFilterInvocationClass() throws Exception {
+		when(adm.supports(FilterInvocation.class)).thenReturn(false);
+		interceptor.afterPropertiesSet();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testEnsuresRunAsManagerSupportsFilterInvocationClass() throws Exception {
-        when(adm.supports(FilterInvocation.class)).thenReturn(false);
-        interceptor.afterPropertiesSet();
-    }
+	/**
+	 * We just test invocation works in a success event. There is no need to test access
+	 * denied events as the abstract parent enforces that logic, which is extensively
+	 * tested separately.
+	 */
+	@Test
+	public void testSuccessfulInvocation() throws Throwable {
+		// Setup a Context
+		Authentication token = new TestingAuthenticationToken("Test", "Password",
+				"NOT_USED");
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-    /**
-     * We just test invocation works in a success event. There is no need to test access denied events as the
-     * abstract parent enforces that logic, which is extensively tested separately.
-     */
-    @Test
-    public void testSuccessfulInvocation() throws Throwable {
-        // Setup a Context
-        Authentication token = new TestingAuthenticationToken("Test", "Password", "NOT_USED");
-        SecurityContextHolder.getContext().setAuthentication(token);
+		FilterInvocation fi = createinvocation();
 
-        FilterInvocation fi = createinvocation();
+		when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
 
-        when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
+		interceptor.invoke(fi);
 
-        interceptor.invoke(fi);
+		// SEC-1697
+		verify(publisher, never()).publishEvent(any(AuthorizedEvent.class));
+	}
 
-        // SEC-1697
-        verify(publisher, never()).publishEvent(any(AuthorizedEvent.class));
-    }
+	@Test
+	public void afterInvocationIsNotInvokedIfExceptionThrown() throws Exception {
+		Authentication token = new TestingAuthenticationToken("Test", "Password",
+				"NOT_USED");
+		SecurityContextHolder.getContext().setAuthentication(token);
 
-    @Test
-    public void afterInvocationIsNotInvokedIfExceptionThrown() throws Exception {
-        Authentication token = new TestingAuthenticationToken("Test", "Password", "NOT_USED");
-        SecurityContextHolder.getContext().setAuthentication(token);
+		FilterInvocation fi = createinvocation();
+		FilterChain chain = fi.getChain();
 
-        FilterInvocation fi = createinvocation();
-        FilterChain chain = fi.getChain();
+		doThrow(new RuntimeException()).when(chain).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+		when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
 
-        doThrow(new RuntimeException()).when(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-        when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
+		AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		interceptor.setAfterInvocationManager(aim);
 
-        AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        interceptor.setAfterInvocationManager(aim);
+		try {
+			interceptor.invoke(fi);
+			fail("Expected exception");
+		}
+		catch (RuntimeException expected) {
+		}
 
-        try {
-            interceptor.invoke(fi);
-            fail("Expected exception");
-        } catch (RuntimeException expected) {
-        }
+		verifyZeroInteractions(aim);
+	}
 
-        verifyZeroInteractions(aim);
-    }
+	// SEC-1967
+	@Test
+	@SuppressWarnings("unchecked")
+	public void finallyInvocationIsInvokedIfExceptionThrown() throws Exception {
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		Authentication token = new TestingAuthenticationToken("Test", "Password",
+				"NOT_USED");
+		token.setAuthenticated(true);
+		ctx.setAuthentication(token);
 
-    // SEC-1967
-    @Test
-    @SuppressWarnings("unchecked")
-    public void finallyInvocationIsInvokedIfExceptionThrown() throws Exception {
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        Authentication token = new TestingAuthenticationToken("Test", "Password", "NOT_USED");
-        token.setAuthenticated(true);
-        ctx.setAuthentication(token);
+		RunAsManager runAsManager = mock(RunAsManager.class);
+		when(runAsManager.buildRunAs(eq(token), any(), anyCollection())).thenReturn(
+				new RunAsUserToken("key", "someone", "creds", token.getAuthorities(),
+						token.getClass()));
+		interceptor.setRunAsManager(runAsManager);
 
-        RunAsManager runAsManager = mock(RunAsManager.class);
-        when(runAsManager.buildRunAs(eq(token), any(), anyCollection())).thenReturn(new RunAsUserToken("key", "someone", "creds", token.getAuthorities(), token.getClass()));
-        interceptor.setRunAsManager(runAsManager);
+		FilterInvocation fi = createinvocation();
+		FilterChain chain = fi.getChain();
 
-        FilterInvocation fi = createinvocation();
-        FilterChain chain = fi.getChain();
+		doThrow(new RuntimeException()).when(chain).doFilter(
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+		when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
 
-        doThrow(new RuntimeException()).when(chain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-        when(ods.getAttributes(fi)).thenReturn(SecurityConfig.createList("MOCK_OK"));
+		AfterInvocationManager aim = mock(AfterInvocationManager.class);
+		interceptor.setAfterInvocationManager(aim);
 
-        AfterInvocationManager aim = mock(AfterInvocationManager.class);
-        interceptor.setAfterInvocationManager(aim);
+		try {
+			interceptor.invoke(fi);
+			fail("Expected exception");
+		}
+		catch (RuntimeException expected) {
+		}
 
-        try {
-            interceptor.invoke(fi);
-            fail("Expected exception");
-        } catch (RuntimeException expected) {
-        }
+		// Check we've changed back
+		assertSame(ctx, SecurityContextHolder.getContext());
+		assertSame(token, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-        // Check we've changed back
-        assertSame(ctx, SecurityContextHolder.getContext());
-        assertSame(token, SecurityContextHolder.getContext().getAuthentication());
-    }
+	private FilterInvocation createinvocation() {
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/secure/page.html");
 
-    private FilterInvocation createinvocation() {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/secure/page.html");
+		FilterChain chain = mock(FilterChain.class);
+		FilterInvocation fi = new FilterInvocation(request, response, chain);
 
-        FilterChain chain = mock(FilterChain.class);
-        FilterInvocation fi = new FilterInvocation(request, response, chain);
-
-        return fi;
-    }
+		return fi;
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java
index 9c5a482225..32218cc2a0 100644
--- a/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java
+++ b/web/src/test/java/org/springframework/security/web/access/intercept/RequestKeyTests.java
@@ -12,40 +12,40 @@ import org.springframework.security.web.access.intercept.RequestKey;
  */
 public class RequestKeyTests {
 
-    @Test
-    public void equalsWorksWithNullHttpMethod() {
-        RequestKey key1 = new RequestKey("/someurl");
-        RequestKey key2 = new RequestKey("/someurl");
+	@Test
+	public void equalsWorksWithNullHttpMethod() {
+		RequestKey key1 = new RequestKey("/someurl");
+		RequestKey key2 = new RequestKey("/someurl");
 
-        assertEquals(key1, key2);
-        key1 = new RequestKey("/someurl","GET");
-        assertFalse(key1.equals(key2));
-        assertFalse(key2.equals(key1));
-    }
+		assertEquals(key1, key2);
+		key1 = new RequestKey("/someurl", "GET");
+		assertFalse(key1.equals(key2));
+		assertFalse(key2.equals(key1));
+	}
 
-    @Test
-    public void keysWithSameUrlAndHttpMethodAreEqual() {
-        RequestKey key1 = new RequestKey("/someurl", "GET");
-        RequestKey key2 = new RequestKey("/someurl", "GET");
+	@Test
+	public void keysWithSameUrlAndHttpMethodAreEqual() {
+		RequestKey key1 = new RequestKey("/someurl", "GET");
+		RequestKey key2 = new RequestKey("/someurl", "GET");
 
-        assertEquals(key1, key2);
-    }
+		assertEquals(key1, key2);
+	}
 
-    @Test
-    public void keysWithSameUrlAndDifferentHttpMethodAreNotEqual() {
-        RequestKey key1 = new RequestKey("/someurl", "GET");
-        RequestKey key2 = new RequestKey("/someurl", "POST");
+	@Test
+	public void keysWithSameUrlAndDifferentHttpMethodAreNotEqual() {
+		RequestKey key1 = new RequestKey("/someurl", "GET");
+		RequestKey key2 = new RequestKey("/someurl", "POST");
 
-        assertFalse(key1.equals(key2));
-        assertFalse(key2.equals(key1));
-    }
+		assertFalse(key1.equals(key2));
+		assertFalse(key2.equals(key1));
+	}
 
-    @Test
-    public void keysWithDifferentUrlsAreNotEquals() {
-        RequestKey key1 = new RequestKey("/someurl", "GET");
-        RequestKey key2 = new RequestKey("/anotherurl", "GET");
+	@Test
+	public void keysWithDifferentUrlsAreNotEquals() {
+		RequestKey key1 = new RequestKey("/someurl", "GET");
+		RequestKey key2 = new RequestKey("/anotherurl", "GET");
 
-        assertFalse(key1.equals(key2));
-        assertFalse(key2.equals(key1));
-    }
+		assertFalse(key1.equals(key2));
+		assertFalse(key2.equals(key1));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java
index 435bcce3cc..e0e6a0105a 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java
@@ -57,7 +57,6 @@ import org.springframework.security.web.authentication.session.SessionAuthentica
 import org.springframework.security.web.firewall.DefaultHttpFirewall;
 import org.springframework.test.util.ReflectionTestUtils;
 
-
 /**
  * Tests {@link AbstractAuthenticationProcessingFilter}.
  *
@@ -67,370 +66,395 @@ import org.springframework.test.util.ReflectionTestUtils;
  */
 @SuppressWarnings("deprecation")
 public class AbstractAuthenticationProcessingFilterTests {
-    SavedRequestAwareAuthenticationSuccessHandler successHandler;
-    SimpleUrlAuthenticationFailureHandler failureHandler;
-    //~ Methods ========================================================================================================
-
-    private MockHttpServletRequest createMockAuthenticationRequest() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-
-        request.setServletPath("/j_mock_post");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setRequestURI("/mycontext/j_mock_post");
-        request.setContextPath("/mycontext");
-
-        return request;
-    }
-
-
-    @Before
-    public void setUp() throws Exception {
-        successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
-        successHandler.setDefaultTargetUrl("/logged_in.jsp");
-        failureHandler = new SimpleUrlAuthenticationFailureHandler();
-        failureHandler.setDefaultFailureUrl("/failed.jsp");
-        SecurityContextHolder.clearContext();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
-
-    @Test
-    public void testDefaultProcessesFilterUrlMatchesWithPathParameter() {
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockAuthenticationFilter filter = new MockAuthenticationFilter();
-        filter.setFilterProcessesUrl("/login");
-
-        DefaultHttpFirewall firewall = new DefaultHttpFirewall();
-        request.setServletPath("/login;jsessionid=I8MIONOSTHOR");
-
-        // the firewall ensures that path parameters are ignored
-        HttpServletRequest firewallRequest = firewall.getFirewalledRequest(request);
-        assertTrue(filter.requiresAuthentication(firewallRequest, response));
-    }
-
-    @Test
-    public void testFilterProcessesUrlVariationsRespected() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-        request.setServletPath("/j_OTHER_LOCATION");
-        request.setRequestURI("/mycontext/j_OTHER_LOCATION");
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will not be invoked, as we redirect to defaultTargetUrl
-        MockFilterChain chain = new MockFilterChain(false);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to grant access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
-        filter.setFilterProcessesUrl("/j_OTHER_LOCATION");
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        // Test
-        filter.doFilter(request, response, chain);
-        assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("test", SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString());
-    }
-
-    @Test
-    public void testGettersSetters() throws Exception {
-        AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
-        filter.setAuthenticationManager(mock(AuthenticationManager.class));
-        filter.setFilterProcessesUrl("/p");
-        filter.afterPropertiesSet();
-
-        assertNotNull(filter.getRememberMeServices());
-        filter.setRememberMeServices(new TokenBasedRememberMeServices("key", new AbstractRememberMeServicesTests.MockUserDetailsService()));
-        assertEquals(TokenBasedRememberMeServices.class, filter.getRememberMeServices().getClass());
-        assertTrue(filter.getAuthenticationManager() != null);
-    }
-
-    @Test
-    public void testIgnoresAnyServletPathOtherThanFilterProcessesUrl() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-        request.setServletPath("/some.file.html");
-        request.setRequestURI("/mycontext/some.file.html");
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will be invoked, as our request is for a page the filter isn't monitoring
-        MockFilterChain chain = new MockFilterChain(true);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to deny access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
-
-        // Test
-        filter.doFilter(request, response, chain);
-    }
-
-    @Test
-    public void testNormalOperationWithDefaultFilterProcessesUrl() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-        HttpSession sessionPreAuth = request.getSession();
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will not be invoked, as we redirect to defaultTargetUrl
-        MockFilterChain chain = new MockFilterChain(false);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to grant access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
-
-        filter.setFilterProcessesUrl("/j_mock_post");
-        filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class));
-        filter.setAuthenticationSuccessHandler(successHandler);
-        filter.setAuthenticationFailureHandler(failureHandler);
-        filter.setAuthenticationManager(mock(AuthenticationManager.class));
-        filter.afterPropertiesSet();
-
-        // Test
-        filter.doFilter(request, response, chain);
-        assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("test", SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString());
-        // Should still have the same session
-        assertEquals(sessionPreAuth, request.getSession());
-    }
-
-    @Test
-    public void testStartupDetectsInvalidAuthenticationManager() throws Exception {
-        AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
-        filter.setAuthenticationFailureHandler(failureHandler);
-        successHandler.setDefaultTargetUrl("/");
-        filter.setAuthenticationSuccessHandler(successHandler);
-        filter.setFilterProcessesUrl("/login");
-
-        try {
-            filter.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("authenticationManager must be specified", expected.getMessage());
-        }
-    }
-
-    @Test
-    public void testStartupDetectsInvalidFilterProcessesUrl() throws Exception {
-        AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
-        filter.setAuthenticationFailureHandler(failureHandler);
-        filter.setAuthenticationManager(mock(AuthenticationManager.class));
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        try {
-            filter.setFilterProcessesUrl(null);
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Pattern cannot be null or empty", expected.getMessage());
-        }
-    }
-
-    @Test
-    public void testSuccessLoginThenFailureLoginResultsInSessionLosingToken() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will not be invoked, as we redirect to defaultTargetUrl
-        MockFilterChain chain = new MockFilterChain(false);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to grant access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
-        filter.setFilterProcessesUrl("/j_mock_post");
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        // Test
-        filter.doFilter(request, response, chain);
-        assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("test", SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString());
-
-        // Now try again but this time have filter deny access
-        // Setup our HTTP request
-        // Setup our expectation that the filter chain will not be invoked, as we redirect to authenticationFailureUrl
-        chain = new MockFilterChain(false);
-        response = new MockHttpServletResponse();
-
-        // Setup our test object, to deny access
-        filter = new MockAuthenticationFilter(false);
-        filter.setFilterProcessesUrl("/j_mock_post");
-        filter.setAuthenticationFailureHandler(failureHandler);
-
-        // Test
-        filter.doFilter(request, response, chain);
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    @Test
-    public void testSuccessfulAuthenticationInvokesSuccessHandlerAndSetsContext() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will be invoked, as we want to go to the location requested in the session
-        MockFilterChain chain = new MockFilterChain(true);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to grant access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
-        filter.setFilterProcessesUrl("/j_mock_post");
-        AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class);
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        // Test
-        filter.doFilter(request, response, chain);
-
-        verify(successHandler).onAuthenticationSuccess(any(HttpServletRequest.class), any(HttpServletResponse.class),
-                any(Authentication.class));
-
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    @Test
-    public void testFailedAuthenticationInvokesFailureHandler() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        // Setup our filter configuration
-        MockFilterConfig config = new MockFilterConfig(null, null);
-
-        // Setup our expectation that the filter chain will not be invoked, as we redirect to authenticationFailureUrl
-        MockFilterChain chain = new MockFilterChain(false);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Setup our test object, to deny access
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
-        AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class);
-        filter.setAuthenticationFailureHandler(failureHandler);
-
-        // Test
-        filter.doFilter(request, response, chain);
-
-        verify(failureHandler).onAuthenticationFailure(any(HttpServletRequest.class), any(HttpServletResponse.class),
-                any(AuthenticationException.class));
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    /**
-     * SEC-571
-     */
-    @Test
-    public void testNoSessionIsCreatedIfAllowSessionCreationIsFalse() throws Exception {
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        MockFilterConfig config = new MockFilterConfig(null, null);
-        MockFilterChain chain = new MockFilterChain(true);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Reject authentication, so exception would normally be stored in session
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
-        failureHandler.setAllowSessionCreation(false);
-        filter.setAuthenticationFailureHandler(failureHandler);
-
-        filter.doFilter(request, response, chain);
-
-        assertNull(request.getSession(false));
-    }
-
-    /**
-     * SEC-462
-     */
-    @Test
-    public void testLoginErrorWithNoFailureUrlSendsUnauthorizedStatus() throws Exception {
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        MockFilterConfig config = new MockFilterConfig(null, null);
-        MockFilterChain chain = new MockFilterChain(true);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
-        successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        filter.doFilter(request, response, chain);
-
-        assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus());
-    }
-
-    /**
-     * SEC-1919
-     */
-    @Test
-    public void loginErrorWithInternAuthenticationServiceExceptionLogsError() throws Exception {
-        MockHttpServletRequest request = createMockAuthenticationRequest();
-
-        MockFilterChain chain = new MockFilterChain(true);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        Log logger = mock(Log.class);
-        MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
-        ReflectionTestUtils.setField(filter, "logger", logger);
-        filter.exceptionToThrow = new InternalAuthenticationServiceException("Mock requested to do so");
-        successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
-        filter.setAuthenticationSuccessHandler(successHandler);
-
-        filter.doFilter(request, response, chain);
-
-        verify(logger).error(anyString(), eq(filter.exceptionToThrow));
-        assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus());
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
-        private AuthenticationException exceptionToThrow;
-        private boolean grantAccess;
-
-        public MockAuthenticationFilter(boolean grantAccess) {
-            this();
-            setRememberMeServices(new NullRememberMeServices());
-            this.grantAccess = grantAccess;
-            this.exceptionToThrow = new BadCredentialsException("Mock requested to do so");
-        }
-
-        private MockAuthenticationFilter() {
-            super("/j_mock_post");
-        }
-
-        public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-            if (grantAccess) {
-                return new UsernamePasswordAuthenticationToken("test", "test", AuthorityUtils.createAuthorityList("TEST"));
-            } else {
-                throw exceptionToThrow;
-            }
-        }
-    }
-
-    private class MockFilterChain implements FilterChain {
-        private boolean expectToProceed;
-
-        public MockFilterChain(boolean expectToProceed) {
-            this.expectToProceed = expectToProceed;
-        }
-
-        public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-            if (expectToProceed) {
-                assertTrue(true);
-            } else {
-                fail("Did not expect filter chain to proceed");
-            }
-        }
-    }
+	SavedRequestAwareAuthenticationSuccessHandler successHandler;
+	SimpleUrlAuthenticationFailureHandler failureHandler;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	private MockHttpServletRequest createMockAuthenticationRequest() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+
+		request.setServletPath("/j_mock_post");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setRequestURI("/mycontext/j_mock_post");
+		request.setContextPath("/mycontext");
+
+		return request;
+	}
+
+	@Before
+	public void setUp() throws Exception {
+		successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+		successHandler.setDefaultTargetUrl("/logged_in.jsp");
+		failureHandler = new SimpleUrlAuthenticationFailureHandler();
+		failureHandler.setDefaultFailureUrl("/failed.jsp");
+		SecurityContextHolder.clearContext();
+	}
+
+	@After
+	public void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
+
+	@Test
+	public void testDefaultProcessesFilterUrlMatchesWithPathParameter() {
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockAuthenticationFilter filter = new MockAuthenticationFilter();
+		filter.setFilterProcessesUrl("/login");
+
+		DefaultHttpFirewall firewall = new DefaultHttpFirewall();
+		request.setServletPath("/login;jsessionid=I8MIONOSTHOR");
+
+		// the firewall ensures that path parameters are ignored
+		HttpServletRequest firewallRequest = firewall.getFirewalledRequest(request);
+		assertTrue(filter.requiresAuthentication(firewallRequest, response));
+	}
+
+	@Test
+	public void testFilterProcessesUrlVariationsRespected() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+		request.setServletPath("/j_OTHER_LOCATION");
+		request.setRequestURI("/mycontext/j_OTHER_LOCATION");
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will not be invoked, as we redirect
+		// to defaultTargetUrl
+		MockFilterChain chain = new MockFilterChain(false);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to grant access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
+		filter.setFilterProcessesUrl("/j_OTHER_LOCATION");
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		// Test
+		filter.doFilter(request, response, chain);
+		assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("test", SecurityContextHolder.getContext().getAuthentication()
+				.getPrincipal().toString());
+	}
+
+	@Test
+	public void testGettersSetters() throws Exception {
+		AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
+		filter.setAuthenticationManager(mock(AuthenticationManager.class));
+		filter.setFilterProcessesUrl("/p");
+		filter.afterPropertiesSet();
+
+		assertNotNull(filter.getRememberMeServices());
+		filter.setRememberMeServices(new TokenBasedRememberMeServices("key",
+				new AbstractRememberMeServicesTests.MockUserDetailsService()));
+		assertEquals(TokenBasedRememberMeServices.class, filter.getRememberMeServices()
+				.getClass());
+		assertTrue(filter.getAuthenticationManager() != null);
+	}
+
+	@Test
+	public void testIgnoresAnyServletPathOtherThanFilterProcessesUrl() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+		request.setServletPath("/some.file.html");
+		request.setRequestURI("/mycontext/some.file.html");
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will be invoked, as our request is
+		// for a page the filter isn't monitoring
+		MockFilterChain chain = new MockFilterChain(true);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to deny access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
+
+		// Test
+		filter.doFilter(request, response, chain);
+	}
+
+	@Test
+	public void testNormalOperationWithDefaultFilterProcessesUrl() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+		HttpSession sessionPreAuth = request.getSession();
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will not be invoked, as we redirect
+		// to defaultTargetUrl
+		MockFilterChain chain = new MockFilterChain(false);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to grant access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
+
+		filter.setFilterProcessesUrl("/j_mock_post");
+		filter.setSessionAuthenticationStrategy(mock(SessionAuthenticationStrategy.class));
+		filter.setAuthenticationSuccessHandler(successHandler);
+		filter.setAuthenticationFailureHandler(failureHandler);
+		filter.setAuthenticationManager(mock(AuthenticationManager.class));
+		filter.afterPropertiesSet();
+
+		// Test
+		filter.doFilter(request, response, chain);
+		assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("test", SecurityContextHolder.getContext().getAuthentication()
+				.getPrincipal().toString());
+		// Should still have the same session
+		assertEquals(sessionPreAuth, request.getSession());
+	}
+
+	@Test
+	public void testStartupDetectsInvalidAuthenticationManager() throws Exception {
+		AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
+		filter.setAuthenticationFailureHandler(failureHandler);
+		successHandler.setDefaultTargetUrl("/");
+		filter.setAuthenticationSuccessHandler(successHandler);
+		filter.setFilterProcessesUrl("/login");
+
+		try {
+			filter.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("authenticationManager must be specified", expected.getMessage());
+		}
+	}
+
+	@Test
+	public void testStartupDetectsInvalidFilterProcessesUrl() throws Exception {
+		AbstractAuthenticationProcessingFilter filter = new MockAuthenticationFilter();
+		filter.setAuthenticationFailureHandler(failureHandler);
+		filter.setAuthenticationManager(mock(AuthenticationManager.class));
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		try {
+			filter.setFilterProcessesUrl(null);
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("Pattern cannot be null or empty", expected.getMessage());
+		}
+	}
+
+	@Test
+	public void testSuccessLoginThenFailureLoginResultsInSessionLosingToken()
+			throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will not be invoked, as we redirect
+		// to defaultTargetUrl
+		MockFilterChain chain = new MockFilterChain(false);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to grant access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
+		filter.setFilterProcessesUrl("/j_mock_post");
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		// Test
+		filter.doFilter(request, response, chain);
+		assertEquals("/mycontext/logged_in.jsp", response.getRedirectedUrl());
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("test", SecurityContextHolder.getContext().getAuthentication()
+				.getPrincipal().toString());
+
+		// Now try again but this time have filter deny access
+		// Setup our HTTP request
+		// Setup our expectation that the filter chain will not be invoked, as we redirect
+		// to authenticationFailureUrl
+		chain = new MockFilterChain(false);
+		response = new MockHttpServletResponse();
+
+		// Setup our test object, to deny access
+		filter = new MockAuthenticationFilter(false);
+		filter.setFilterProcessesUrl("/j_mock_post");
+		filter.setAuthenticationFailureHandler(failureHandler);
+
+		// Test
+		filter.doFilter(request, response, chain);
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	@Test
+	public void testSuccessfulAuthenticationInvokesSuccessHandlerAndSetsContext()
+			throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will be invoked, as we want to go
+		// to the location requested in the session
+		MockFilterChain chain = new MockFilterChain(true);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to grant access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(true);
+		filter.setFilterProcessesUrl("/j_mock_post");
+		AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class);
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		// Test
+		filter.doFilter(request, response, chain);
+
+		verify(successHandler).onAuthenticationSuccess(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(Authentication.class));
+
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	@Test
+	public void testFailedAuthenticationInvokesFailureHandler() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		// Setup our filter configuration
+		MockFilterConfig config = new MockFilterConfig(null, null);
+
+		// Setup our expectation that the filter chain will not be invoked, as we redirect
+		// to authenticationFailureUrl
+		MockFilterChain chain = new MockFilterChain(false);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Setup our test object, to deny access
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
+		AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class);
+		filter.setAuthenticationFailureHandler(failureHandler);
+
+		// Test
+		filter.doFilter(request, response, chain);
+
+		verify(failureHandler).onAuthenticationFailure(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AuthenticationException.class));
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	/**
+	 * SEC-571
+	 */
+	@Test
+	public void testNoSessionIsCreatedIfAllowSessionCreationIsFalse() throws Exception {
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		MockFilterConfig config = new MockFilterConfig(null, null);
+		MockFilterChain chain = new MockFilterChain(true);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// Reject authentication, so exception would normally be stored in session
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
+		failureHandler.setAllowSessionCreation(false);
+		filter.setAuthenticationFailureHandler(failureHandler);
+
+		filter.doFilter(request, response, chain);
+
+		assertNull(request.getSession(false));
+	}
+
+	/**
+	 * SEC-462
+	 */
+	@Test
+	public void testLoginErrorWithNoFailureUrlSendsUnauthorizedStatus() throws Exception {
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		MockFilterConfig config = new MockFilterConfig(null, null);
+		MockFilterChain chain = new MockFilterChain(true);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
+		successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		filter.doFilter(request, response, chain);
+
+		assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus());
+	}
+
+	/**
+	 * SEC-1919
+	 */
+	@Test
+	public void loginErrorWithInternAuthenticationServiceExceptionLogsError()
+			throws Exception {
+		MockHttpServletRequest request = createMockAuthenticationRequest();
+
+		MockFilterChain chain = new MockFilterChain(true);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		Log logger = mock(Log.class);
+		MockAuthenticationFilter filter = new MockAuthenticationFilter(false);
+		ReflectionTestUtils.setField(filter, "logger", logger);
+		filter.exceptionToThrow = new InternalAuthenticationServiceException(
+				"Mock requested to do so");
+		successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
+		filter.setAuthenticationSuccessHandler(successHandler);
+
+		filter.doFilter(request, response, chain);
+
+		verify(logger).error(anyString(), eq(filter.exceptionToThrow));
+		assertEquals(HttpServletResponse.SC_UNAUTHORIZED, response.getStatus());
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class MockAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
+		private AuthenticationException exceptionToThrow;
+		private boolean grantAccess;
+
+		public MockAuthenticationFilter(boolean grantAccess) {
+			this();
+			setRememberMeServices(new NullRememberMeServices());
+			this.grantAccess = grantAccess;
+			this.exceptionToThrow = new BadCredentialsException("Mock requested to do so");
+		}
+
+		private MockAuthenticationFilter() {
+			super("/j_mock_post");
+		}
+
+		public Authentication attemptAuthentication(HttpServletRequest request,
+				HttpServletResponse response) throws AuthenticationException {
+			if (grantAccess) {
+				return new UsernamePasswordAuthenticationToken("test", "test",
+						AuthorityUtils.createAuthorityList("TEST"));
+			}
+			else {
+				throw exceptionToThrow;
+			}
+		}
+	}
+
+	private class MockFilterChain implements FilterChain {
+		private boolean expectToProceed;
+
+		public MockFilterChain(boolean expectToProceed) {
+			this.expectToProceed = expectToProceed;
+		}
+
+		public void doFilter(ServletRequest request, ServletResponse response)
+				throws IOException, ServletException {
+			if (expectToProceed) {
+				assertTrue(true);
+			}
+			else {
+				fail("Did not expect filter chain to proceed");
+			}
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java
index e816515ace..f682a22e95 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java
@@ -34,7 +34,6 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import java.io.IOException;
 
-
 /**
  * Tests {@link AnonymousAuthenticationFilter}.
  *
@@ -42,77 +41,88 @@ import java.io.IOException;
  */
 public class AnonymousAuthenticationFilterTests {
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private void executeFilterInContainerSimulator(FilterConfig filterConfig, Filter filter, ServletRequest request,
-        ServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-        filter.doFilter(request, response, filterChain);
-    }
+	private void executeFilterInContainerSimulator(FilterConfig filterConfig,
+			Filter filter, ServletRequest request, ServletResponse response,
+			FilterChain filterChain) throws ServletException, IOException {
+		filter.doFilter(request, response, filterChain);
+	}
 
-    @Before
-    @After
-    public void clearContext() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	@After
+	public void clearContext() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingKey() throws Exception {
-        new AnonymousAuthenticationFilter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingKey() throws Exception {
+		new AnonymousAuthenticationFilter(null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsUserAttribute() throws Exception {
-        new AnonymousAuthenticationFilter("qwerty", null, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsUserAttribute() throws Exception {
+		new AnonymousAuthenticationFilter("qwerty", null, null);
+	}
 
-    @Test
-    public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception {
-        // Put an Authentication object into the SecurityContextHolder
-        Authentication originalAuth = new TestingAuthenticationToken("user", "password", "ROLE_A");
-        SecurityContextHolder.getContext().setAuthentication(originalAuth);
+	@Test
+	public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception {
+		// Put an Authentication object into the SecurityContextHolder
+		Authentication originalAuth = new TestingAuthenticationToken("user", "password",
+				"ROLE_A");
+		SecurityContextHolder.getContext().setAuthentication(originalAuth);
 
-        AnonymousAuthenticationFilter filter =
-                new AnonymousAuthenticationFilter("qwerty", "anonymousUsername", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+		AnonymousAuthenticationFilter filter = new AnonymousAuthenticationFilter(
+				"qwerty", "anonymousUsername",
+				AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
 
-        // Test
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("x");
-        executeFilterInContainerSimulator(mock(FilterConfig.class), filter, request, new MockHttpServletResponse(),
-            new MockFilterChain(true));
+		// Test
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("x");
+		executeFilterInContainerSimulator(mock(FilterConfig.class), filter, request,
+				new MockHttpServletResponse(), new MockFilterChain(true));
 
-        // Ensure filter didn't change our original object
-        assertEquals(originalAuth, SecurityContextHolder.getContext().getAuthentication());
-    }
+		// Ensure filter didn't change our original object
+		assertEquals(originalAuth, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void testOperationWhenNoAuthenticationInSecurityContextHolder() throws Exception {
-        AnonymousAuthenticationFilter filter = new AnonymousAuthenticationFilter("qwerty", "anonymousUsername", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
-        filter.afterPropertiesSet();
+	@Test
+	public void testOperationWhenNoAuthenticationInSecurityContextHolder()
+			throws Exception {
+		AnonymousAuthenticationFilter filter = new AnonymousAuthenticationFilter(
+				"qwerty", "anonymousUsername",
+				AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"));
+		filter.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("x");
-        executeFilterInContainerSimulator(mock(FilterConfig.class), filter, request, new MockHttpServletResponse(),
-            new MockFilterChain(true));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("x");
+		executeFilterInContainerSimulator(mock(FilterConfig.class), filter, request,
+				new MockHttpServletResponse(), new MockFilterChain(true));
 
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        assertEquals("anonymousUsername", auth.getPrincipal());
-        assertTrue(AuthorityUtils.authorityListToSet(auth.getAuthorities()).contains("ROLE_ANONYMOUS"));
-        SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires again
-    }
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		assertEquals("anonymousUsername", auth.getPrincipal());
+		assertTrue(AuthorityUtils.authorityListToSet(auth.getAuthorities()).contains(
+				"ROLE_ANONYMOUS"));
+		SecurityContextHolder.getContext().setAuthentication(null); // so anonymous fires
+																	// again
+	}
 
-    //~ Inner Classes ==================================================================================================
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    private class MockFilterChain implements FilterChain {
-        private boolean expectToProceed;
+	private class MockFilterChain implements FilterChain {
+		private boolean expectToProceed;
 
-        public MockFilterChain(boolean expectToProceed) {
-            this.expectToProceed = expectToProceed;
-        }
+		public MockFilterChain(boolean expectToProceed) {
+			this.expectToProceed = expectToProceed;
+		}
 
-        public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-            if (!expectToProceed) {
-                fail("Did not expect filter chain to proceed");
-            }
-        }
-    }
+		public void doFilter(ServletRequest request, ServletResponse response)
+				throws IOException, ServletException {
+			if (!expectToProceed) {
+				fail("Did not expect filter chain to proceed");
+			}
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
index 5f0f142477..b79e06bf47 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java
@@ -26,118 +26,136 @@ import org.springframework.security.web.authentication.ui.DefaultLoginPageGenera
  * @since 3.0
  */
 public class DefaultLoginPageGeneratingFilterTests {
-    FilterChain chain = mock(FilterChain.class);
+	FilterChain chain = mock(FilterChain.class);
 
-    @Test
-    public void generatingPageWithAuthenticationProcessingFilterOnlyIsSuccessFul() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), chain);
-        filter.doFilter(new MockHttpServletRequest("GET", "/login;pathparam=unused"), new MockHttpServletResponse(), chain);
-    }
+	@Test
+	public void generatingPageWithAuthenticationProcessingFilterOnlyIsSuccessFul()
+			throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		filter.doFilter(new MockHttpServletRequest("GET", "/login"),
+				new MockHttpServletResponse(), chain);
+		filter.doFilter(new MockHttpServletRequest("GET", "/login;pathparam=unused"),
+				new MockHttpServletResponse(), chain);
+	}
 
-    @Test
-    public void generatesForGetLogin() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForGetLogin() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, chain);
+		filter.doFilter(new MockHttpServletRequest("GET", "/login"), response, chain);
 
-        assertThat(response.getContentAsString()).isNotEmpty();
-    }
+		assertThat(response.getContentAsString()).isNotEmpty();
+	}
 
-    @Test
-    public void generatesForPostLogin() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForPostLogin() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/login");
-        filter.doFilter(request, response, chain);
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/login");
+		filter.doFilter(request, response, chain);
 
-        assertThat(response.getContentAsString()).isEmpty();
-    }
+		assertThat(response.getContentAsString()).isEmpty();
+	}
 
-    @Test
-    public void generatesForNotEmptyContextLogin() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForNotEmptyContextLogin() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/login");
-        request.setContextPath("/context");
-        filter.doFilter(request, response, chain);
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/context/login");
+		request.setContextPath("/context");
+		filter.doFilter(request, response, chain);
 
-        assertThat(response.getContentAsString()).isNotEmpty();
-    }
+		assertThat(response.getContentAsString()).isNotEmpty();
+	}
 
-    @Test
-    public void generatesForGetApiLogin() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForGetApiLogin() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(new MockHttpServletRequest("GET", "/api/login"), response, chain);
+		filter.doFilter(new MockHttpServletRequest("GET", "/api/login"), response, chain);
 
-        assertThat(response.getContentAsString()).isEmpty();
-    }
+		assertThat(response.getContentAsString()).isEmpty();
+	}
 
-    @Test
-    public void generatesForWithQueryMatch() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForWithQueryMatch() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
-        request.setQueryString("error");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
+		request.setQueryString("error");
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        assertThat(response.getContentAsString()).isNotEmpty();
-    }
+		assertThat(response.getContentAsString()).isNotEmpty();
+	}
 
-    @Test
-    public void generatesForWithQueryNoMatch() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void generatesForWithQueryNoMatch() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
-        request.setQueryString("not");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
+		request.setQueryString("not");
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        assertThat(response.getContentAsString()).isEmpty();
-    }
+		assertThat(response.getContentAsString()).isEmpty();
+	}
 
-    @Test
-    public void generatingPageWithOpenIdFilterOnlyIsSuccessFul() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new MockProcessingFilter());
-        filter.doFilter(new MockHttpServletRequest("GET", "/login"), new MockHttpServletResponse(), chain);
-    }
+	@Test
+	public void generatingPageWithOpenIdFilterOnlyIsSuccessFul() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new MockProcessingFilter());
+		filter.doFilter(new MockHttpServletRequest("GET", "/login"),
+				new MockHttpServletResponse(), chain);
+	}
 
-    // Fake OpenID filter (since it's not in this module
-    @SuppressWarnings("unused")
-    private static class MockProcessingFilter extends AbstractAuthenticationProcessingFilter {
-        protected MockProcessingFilter() {
-            super("/someurl");
-        }
+	// Fake OpenID filter (since it's not in this module
+	@SuppressWarnings("unused")
+	private static class MockProcessingFilter extends
+			AbstractAuthenticationProcessingFilter {
+		protected MockProcessingFilter() {
+			super("/someurl");
+		}
 
-        @Override
-        public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
-            return null;
-        }
+		@Override
+		public Authentication attemptAuthentication(HttpServletRequest request,
+				HttpServletResponse response) throws AuthenticationException {
+			return null;
+		}
 
-        public String getClaimedIdentityFieldName() {
-            return "unused";
-        }
-    }
+		public String getClaimedIdentityFieldName() {
+			return "unused";
+		}
+	}
 
-    /* SEC-1111 */
-    @Test
-    public void handlesNonIso8859CharsInErrorMessage() throws Exception {
-        DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(new UsernamePasswordAuthenticationFilter());
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
-        request.addParameter("login_error", "true");
-        MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
-        String message = messages.getMessage(
-                "AbstractUserDetailsAuthenticationProvider.badCredentials", "Bad credentials", Locale.KOREA);
-        request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION, new BadCredentialsException(message));
+	/* SEC-1111 */
+	@Test
+	public void handlesNonIso8859CharsInErrorMessage() throws Exception {
+		DefaultLoginPageGeneratingFilter filter = new DefaultLoginPageGeneratingFilter(
+				new UsernamePasswordAuthenticationFilter());
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/login");
+		request.addParameter("login_error", "true");
+		MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor();
+		String message = messages.getMessage(
+				"AbstractUserDetailsAuthenticationProvider.badCredentials",
+				"Bad credentials", Locale.KOREA);
+		request.getSession().setAttribute(WebAttributes.AUTHENTICATION_EXCEPTION,
+				new BadCredentialsException(message));
 
-        filter.doFilter(request, new MockHttpServletResponse(), chain);
-    }
+		filter.doFilter(request, new MockHttpServletResponse(), chain);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java
index 6dd4870a7a..ca367701a4 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointContextTests.java
@@ -20,42 +20,40 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration(locations = "classpath:org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml")
 public class DelegatingAuthenticationEntryPointContextTests {
 
-    @Autowired
-    private DelegatingAuthenticationEntryPoint daep;
+	@Autowired
+	private DelegatingAuthenticationEntryPoint daep;
 
-    @Autowired
-    @Qualifier("firstAEP")
-    private AuthenticationEntryPoint firstAEP;
+	@Autowired
+	@Qualifier("firstAEP")
+	private AuthenticationEntryPoint firstAEP;
 
-    @Autowired
-    @Qualifier("defaultAEP")
-    private AuthenticationEntryPoint defaultAEP;
+	@Autowired
+	@Qualifier("defaultAEP")
+	private AuthenticationEntryPoint defaultAEP;
 
-    @Test
-    @DirtiesContext
-    public void testFirstAEP() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRemoteAddr("192.168.1.10");
-        request.addHeader("User-Agent", "Mozilla/5.0");
-        daep.commence(request, null, null);
-        verify(firstAEP).commence(request, null, null);
-        verify(defaultAEP, never()).commence(any(HttpServletRequest.class),
-                any(HttpServletResponse.class),
-                any(AuthenticationException.class));
+	@Test
+	@DirtiesContext
+	public void testFirstAEP() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRemoteAddr("192.168.1.10");
+		request.addHeader("User-Agent", "Mozilla/5.0");
+		daep.commence(request, null, null);
+		verify(firstAEP).commence(request, null, null);
+		verify(defaultAEP, never()).commence(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AuthenticationException.class));
 
-    }
+	}
 
-    @Test
-    @DirtiesContext
-    public void testDefaultAEP() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRemoteAddr("192.168.1.10");
-        daep.commence(request, null, null);
-        verify(defaultAEP).commence(request, null, null);
-        verify(firstAEP, never()).commence(any(HttpServletRequest.class),
-                any(HttpServletResponse.class),
-                any(AuthenticationException.class));
+	@Test
+	@DirtiesContext
+	public void testDefaultAEP() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRemoteAddr("192.168.1.10");
+		daep.commence(request, null, null);
+		verify(defaultAEP).commence(request, null, null);
+		verify(firstAEP, never()).commence(any(HttpServletRequest.class),
+				any(HttpServletResponse.class), any(AuthenticationException.class));
 
-    }
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
index c0f2f240e7..55806c1ac5 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java
@@ -36,66 +36,66 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  */
 public class DelegatingAuthenticationEntryPointTests {
 
-    private DelegatingAuthenticationEntryPoint daep;
-    private LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints;
-    private AuthenticationEntryPoint defaultEntryPoint;
-    private HttpServletRequest request = new MockHttpServletRequest();
+	private DelegatingAuthenticationEntryPoint daep;
+	private LinkedHashMap<RequestMatcher, AuthenticationEntryPoint> entryPoints;
+	private AuthenticationEntryPoint defaultEntryPoint;
+	private HttpServletRequest request = new MockHttpServletRequest();
 
-    @Before
-    public void before() {
-        defaultEntryPoint = mock(AuthenticationEntryPoint.class);
-        entryPoints = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
-        daep = new DelegatingAuthenticationEntryPoint(entryPoints);
-        daep.setDefaultEntryPoint(defaultEntryPoint);
-    }
+	@Before
+	public void before() {
+		defaultEntryPoint = mock(AuthenticationEntryPoint.class);
+		entryPoints = new LinkedHashMap<RequestMatcher, AuthenticationEntryPoint>();
+		daep = new DelegatingAuthenticationEntryPoint(entryPoints);
+		daep.setDefaultEntryPoint(defaultEntryPoint);
+	}
 
-    @Test
-    public void testDefaultEntryPoint() throws Exception {
-        AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
-        RequestMatcher firstRM = mock(RequestMatcher.class);
-        when(firstRM.matches(request)).thenReturn(false);
-        entryPoints.put(firstRM, firstAEP);
+	@Test
+	public void testDefaultEntryPoint() throws Exception {
+		AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
+		RequestMatcher firstRM = mock(RequestMatcher.class);
+		when(firstRM.matches(request)).thenReturn(false);
+		entryPoints.put(firstRM, firstAEP);
 
-        daep.commence(request, null, null);
+		daep.commence(request, null, null);
 
-        verify(defaultEntryPoint).commence(request, null, null);
-        verify(firstAEP, never()).commence(request, null, null);
-    }
+		verify(defaultEntryPoint).commence(request, null, null);
+		verify(firstAEP, never()).commence(request, null, null);
+	}
 
-    @Test
-    public void testFirstEntryPoint() throws Exception {
-        AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
-        RequestMatcher firstRM = mock(RequestMatcher.class);
-        AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class);
-        RequestMatcher secondRM = mock(RequestMatcher.class);
-        when(firstRM.matches(request)).thenReturn(true);
-        entryPoints.put(firstRM, firstAEP);
-        entryPoints.put(secondRM, secondAEP);
+	@Test
+	public void testFirstEntryPoint() throws Exception {
+		AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
+		RequestMatcher firstRM = mock(RequestMatcher.class);
+		AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class);
+		RequestMatcher secondRM = mock(RequestMatcher.class);
+		when(firstRM.matches(request)).thenReturn(true);
+		entryPoints.put(firstRM, firstAEP);
+		entryPoints.put(secondRM, secondAEP);
 
-        daep.commence(request, null, null);
+		daep.commence(request, null, null);
 
-        verify(firstAEP).commence(request, null, null);
-        verify(secondAEP, never()).commence(request, null, null);
-        verify(defaultEntryPoint, never()).commence(request, null, null);
-        verify(secondRM, never()).matches(request);
-    }
+		verify(firstAEP).commence(request, null, null);
+		verify(secondAEP, never()).commence(request, null, null);
+		verify(defaultEntryPoint, never()).commence(request, null, null);
+		verify(secondRM, never()).matches(request);
+	}
 
-    @Test
-    public void testSecondEntryPoint() throws Exception {
-        AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
-        RequestMatcher firstRM = mock(RequestMatcher.class);
-        AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class);
-        RequestMatcher secondRM = mock(RequestMatcher.class);
-        when(firstRM.matches(request)).thenReturn(false);
-        when(secondRM.matches(request)).thenReturn(true);
-        entryPoints.put(firstRM, firstAEP);
-        entryPoints.put(secondRM, secondAEP);
+	@Test
+	public void testSecondEntryPoint() throws Exception {
+		AuthenticationEntryPoint firstAEP = mock(AuthenticationEntryPoint.class);
+		RequestMatcher firstRM = mock(RequestMatcher.class);
+		AuthenticationEntryPoint secondAEP = mock(AuthenticationEntryPoint.class);
+		RequestMatcher secondRM = mock(RequestMatcher.class);
+		when(firstRM.matches(request)).thenReturn(false);
+		when(secondRM.matches(request)).thenReturn(true);
+		entryPoints.put(firstRM, firstAEP);
+		entryPoints.put(secondRM, secondAEP);
 
-        daep.commence(request, null, null);
+		daep.commence(request, null, null);
 
-        verify(secondAEP).commence(request, null, null);
-        verify(firstAEP, never()).commence(request, null, null);
-        verify(defaultEntryPoint, never()).commence(request, null, null);
-    }
+		verify(secondAEP).commence(request, null, null);
+		verify(firstAEP, never()).commence(request, null, null);
+		verify(defaultEntryPoint, never()).commence(request, null, null);
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java
index 0d2785703f..87559ccd15 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java
@@ -36,7 +36,8 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
 /**
- * Test class for {@link org.springframework.security.web.authentication.DelegatingAuthenticationFailureHandler}
+ * Test class for
+ * {@link org.springframework.security.web.authentication.DelegatingAuthenticationFailureHandler}
  *
  * @author Kazuki shimizu
  * @since 4.0
@@ -44,100 +45,101 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingAuthenticationFailureHandlerTests {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
 
-    @Mock
-    private AuthenticationFailureHandler handler1;
+	@Mock
+	private AuthenticationFailureHandler handler1;
 
-    @Mock
-    private AuthenticationFailureHandler handler2;
+	@Mock
+	private AuthenticationFailureHandler handler2;
 
-    @Mock
-    private AuthenticationFailureHandler defaultHandler;
+	@Mock
+	private AuthenticationFailureHandler defaultHandler;
 
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    @Mock
-    private HttpServletResponse response;
+	@Mock
+	private HttpServletResponse response;
 
-    private LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers;
+	private LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler> handlers;
 
-    private DelegatingAuthenticationFailureHandler handler;
+	private DelegatingAuthenticationFailureHandler handler;
 
-    @Before
-    public void setup() {
-        handlers = new LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler>();
-    }
+	@Before
+	public void setup() {
+		handlers = new LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler>();
+	}
 
-    @Test
-    public void handleByDefaultHandler() throws Exception {
-        handlers.put(BadCredentialsException.class, handler1);
-        handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
+	@Test
+	public void handleByDefaultHandler() throws Exception {
+		handlers.put(BadCredentialsException.class, handler1);
+		handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
 
-        AuthenticationException exception = new AccountExpiredException("");
-        handler.onAuthenticationFailure(request, response, exception);
+		AuthenticationException exception = new AccountExpiredException("");
+		handler.onAuthenticationFailure(request, response, exception);
 
-        verifyZeroInteractions(handler1, handler2);
-        verify(defaultHandler).onAuthenticationFailure(request, response, exception);
-    }
+		verifyZeroInteractions(handler1, handler2);
+		verify(defaultHandler).onAuthenticationFailure(request, response, exception);
+	}
 
-    @Test
-    public void handleByMappedHandlerWithSameType() throws Exception {
-        handlers.put(BadCredentialsException.class, handler1); // same type
-        handlers.put(AccountStatusException.class, handler2);
-        handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
+	@Test
+	public void handleByMappedHandlerWithSameType() throws Exception {
+		handlers.put(BadCredentialsException.class, handler1); // same type
+		handlers.put(AccountStatusException.class, handler2);
+		handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
 
-        AuthenticationException exception = new BadCredentialsException("");
-        handler.onAuthenticationFailure(request, response, exception);
+		AuthenticationException exception = new BadCredentialsException("");
+		handler.onAuthenticationFailure(request, response, exception);
 
-        verifyZeroInteractions(handler2, defaultHandler);
-        verify(handler1).onAuthenticationFailure(request, response, exception);
-    }
+		verifyZeroInteractions(handler2, defaultHandler);
+		verify(handler1).onAuthenticationFailure(request, response, exception);
+	}
 
-    @Test
-    public void handleByMappedHandlerWithSuperType() throws Exception {
-        handlers.put(BadCredentialsException.class, handler1);
-        handlers.put(AccountStatusException.class, handler2); // super type of CredentialsExpiredException
-        handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
+	@Test
+	public void handleByMappedHandlerWithSuperType() throws Exception {
+		handlers.put(BadCredentialsException.class, handler1);
+		handlers.put(AccountStatusException.class, handler2); // super type of
+																// CredentialsExpiredException
+		handler = new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
 
-        AuthenticationException exception = new CredentialsExpiredException("");
-        handler.onAuthenticationFailure(request, response, exception);
+		AuthenticationException exception = new CredentialsExpiredException("");
+		handler.onAuthenticationFailure(request, response, exception);
 
-        verifyZeroInteractions(handler1, defaultHandler);
-        verify(handler2).onAuthenticationFailure(request, response, exception);
-    }
+		verifyZeroInteractions(handler1, defaultHandler);
+		verify(handler2).onAuthenticationFailure(request, response, exception);
+	}
 
-    @Test
-    public void handlersIsNull() {
+	@Test
+	public void handlersIsNull() {
 
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("handlers cannot be null or empty");
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("handlers cannot be null or empty");
 
-        new DelegatingAuthenticationFailureHandler(null, defaultHandler);
+		new DelegatingAuthenticationFailureHandler(null, defaultHandler);
 
-    }
+	}
 
-    @Test
-    public void handlersIsEmpty() {
+	@Test
+	public void handlersIsEmpty() {
 
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("handlers cannot be null or empty");
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("handlers cannot be null or empty");
 
-        new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
+		new DelegatingAuthenticationFailureHandler(handlers, defaultHandler);
 
-    }
+	}
 
-    @Test
-    public void defaultHandlerIsNull() {
+	@Test
+	public void defaultHandlerIsNull() {
 
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("defaultHandler cannot be null");
+		thrown.expect(IllegalArgumentException.class);
+		thrown.expectMessage("defaultHandler cannot be null");
 
-        handlers.put(BadCredentialsException.class, handler1);
-        new DelegatingAuthenticationFailureHandler(handlers, null);
+		handlers.put(BadCredentialsException.class, handler1);
+		new DelegatingAuthenticationFailureHandler(handlers, null);
 
-    }
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java
index 8d00758960..975e4513fa 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java
@@ -16,27 +16,31 @@ import java.util.HashMap;
  */
 public class ExceptionMappingAuthenticationFailureHandlerTests {
 
-    @Test
-    public void defaultTargetUrlIsUsedIfNoMappingExists() throws Exception {
-        ExceptionMappingAuthenticationFailureHandler fh = new ExceptionMappingAuthenticationFailureHandler();
-        fh.setDefaultFailureUrl("/failed");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fh.onAuthenticationFailure(new MockHttpServletRequest(), response, new BadCredentialsException(""));
+	@Test
+	public void defaultTargetUrlIsUsedIfNoMappingExists() throws Exception {
+		ExceptionMappingAuthenticationFailureHandler fh = new ExceptionMappingAuthenticationFailureHandler();
+		fh.setDefaultFailureUrl("/failed");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fh.onAuthenticationFailure(new MockHttpServletRequest(), response,
+				new BadCredentialsException(""));
 
-        assertEquals("/failed", response.getRedirectedUrl());
-    }
+		assertEquals("/failed", response.getRedirectedUrl());
+	}
 
-    @Test
-    public void exceptionMapIsUsedIfMappingExists() throws Exception {
-        ExceptionMappingAuthenticationFailureHandler fh = new ExceptionMappingAuthenticationFailureHandler();
-        HashMap<String, String> mapping = new HashMap<String, String>();
-        mapping.put("org.springframework.security.authentication.BadCredentialsException", "/badcreds");
-        fh.setExceptionMappings(mapping);
-        fh.setDefaultFailureUrl("/failed");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        fh.onAuthenticationFailure(new MockHttpServletRequest(), response, new BadCredentialsException(""));
+	@Test
+	public void exceptionMapIsUsedIfMappingExists() throws Exception {
+		ExceptionMappingAuthenticationFailureHandler fh = new ExceptionMappingAuthenticationFailureHandler();
+		HashMap<String, String> mapping = new HashMap<String, String>();
+		mapping.put(
+				"org.springframework.security.authentication.BadCredentialsException",
+				"/badcreds");
+		fh.setExceptionMappings(mapping);
+		fh.setDefaultFailureUrl("/failed");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		fh.onAuthenticationFailure(new MockHttpServletRequest(), response,
+				new BadCredentialsException(""));
 
-        assertEquals("/badcreds", response.getRedirectedUrl());
-    }
+		assertEquals("/badcreds", response.getRedirectedUrl());
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java
index c619a8269a..be07255f76 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/HttpStatusEntryPointTests.java
@@ -30,31 +30,32 @@ import org.springframework.security.core.AuthenticationException;
  * @since 4.0
  */
 public class HttpStatusEntryPointTests {
-    MockHttpServletRequest request;
-    MockHttpServletResponse response;
-    AuthenticationException authException;
+	MockHttpServletRequest request;
+	MockHttpServletResponse response;
+	AuthenticationException authException;
 
-    HttpStatusEntryPoint entryPoint;
+	HttpStatusEntryPoint entryPoint;
 
-    @SuppressWarnings("serial")
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        authException = new AuthenticationException("") {};
-        entryPoint = new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED);
-    }
+	@SuppressWarnings("serial")
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		authException = new AuthenticationException("") {
+		};
+		entryPoint = new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullStatus() {
-        new HttpStatusEntryPoint(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullStatus() {
+		new HttpStatusEntryPoint(null);
+	}
 
-    @Test
-    public void unauthorized() throws Exception {
-        entryPoint.commence(request, response, authException);
+	@Test
+	public void unauthorized() throws Exception {
+		entryPoint.commence(request, response, authException);
 
-        assertThat(response.getStatus()).isEqualTo(HttpStatus.UNAUTHORIZED.value());
-    }
+		assertThat(response.getStatus()).isEqualTo(HttpStatus.UNAUTHORIZED.value());
+	}
 
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java
index 9de0ca27ca..59d9cb6792 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java
@@ -25,7 +25,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.MockPortResolver;
 import org.springframework.security.web.PortMapperImpl;
 
-
 /**
  * Tests {@link LoginUrlAuthenticationEntryPoint}.
  *
@@ -33,222 +32,246 @@ import org.springframework.security.web.PortMapperImpl;
  * @author colin sampaleanu
  */
 public class LoginUrlAuthenticationEntryPointTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingLoginFormUrl() throws Exception {
-        new LoginUrlAuthenticationEntryPoint(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingLoginFormUrl() throws Exception {
+		new LoginUrlAuthenticationEntryPoint(null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingPortMapper() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/login");
-        ep.setPortMapper(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingPortMapper() throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/login");
+		ep.setPortMapper(null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testDetectsMissingPortResolver() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/login");
-        ep.setPortResolver(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsMissingPortResolver() throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/login");
+		ep.setPortResolver(null);
+	}
 
-    @Test
-    public void testGettersSetters() {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(8080, 8443));
-        assertEquals("/hello", ep.getLoginFormUrl());
-        assertTrue(ep.getPortMapper() != null);
-        assertTrue(ep.getPortResolver() != null);
+	@Test
+	public void testGettersSetters() {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(8080, 8443));
+		assertEquals("/hello", ep.getLoginFormUrl());
+		assertTrue(ep.getPortMapper() != null);
+		assertTrue(ep.getPortResolver() != null);
 
-        ep.setForceHttps(false);
-        assertFalse(ep.isForceHttps());
-        ep.setForceHttps(true);
-        assertTrue(ep.isForceHttps());
-        assertFalse(ep.isUseForward());
-        ep.setUseForward(true);
-        assertTrue(ep.isUseForward());
-    }
+		ep.setForceHttps(false);
+		assertFalse(ep.isForceHttps());
+		ep.setForceHttps(true);
+		assertTrue(ep.isForceHttps());
+		assertFalse(ep.isUseForward());
+		ep.setUseForward(true);
+		assertTrue(ep.isUseForward());
+	}
 
-    @Test
-    public void testHttpsOperationFromOriginalHttpUrl() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(80);
+	@Test
+	public void testHttpsOperationFromOriginalHttpUrl() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setForceHttps(true);
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
-        ep.afterPropertiesSet();
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setForceHttps(true);
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
+		ep.afterPropertiesSet();
 
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com/bigWebApp/hello", response.getRedirectedUrl());
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com/bigWebApp/hello",
+				response.getRedirectedUrl());
 
-        request.setServerPort(8080);
-        response = new MockHttpServletResponse();
-        ep.setPortResolver(new MockPortResolver(8080, 8443));
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com:8443/bigWebApp/hello", response.getRedirectedUrl());
+		request.setServerPort(8080);
+		response = new MockHttpServletResponse();
+		ep.setPortResolver(new MockPortResolver(8080, 8443));
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com:8443/bigWebApp/hello",
+				response.getRedirectedUrl());
 
-        // Now test an unusual custom HTTP:HTTPS is handled properly
-        request.setServerPort(8888);
-        response = new MockHttpServletResponse();
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com:8443/bigWebApp/hello", response.getRedirectedUrl());
+		// Now test an unusual custom HTTP:HTTPS is handled properly
+		request.setServerPort(8888);
+		response = new MockHttpServletResponse();
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com:8443/bigWebApp/hello",
+				response.getRedirectedUrl());
 
-        PortMapperImpl portMapper = new PortMapperImpl();
-        Map<String,String> map = new HashMap<String,String>();
-        map.put("8888", "9999");
-        portMapper.setPortMappings(map);
-        response = new MockHttpServletResponse();
+		PortMapperImpl portMapper = new PortMapperImpl();
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("8888", "9999");
+		portMapper.setPortMappings(map);
+		response = new MockHttpServletResponse();
 
-        ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setForceHttps(true);
-        ep.setPortMapper(portMapper);
-        ep.setPortResolver(new MockPortResolver(8888, 9999));
-        ep.afterPropertiesSet();
+		ep = new LoginUrlAuthenticationEntryPoint("/hello");
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setForceHttps(true);
+		ep.setPortMapper(portMapper);
+		ep.setPortResolver(new MockPortResolver(8888, 9999));
+		ep.afterPropertiesSet();
 
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com:9999/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com:9999/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    @Test
-    public void testHttpsOperationFromOriginalHttpsUrl() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
-        request.setScheme("https");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(443);
+	@Test
+	public void testHttpsOperationFromOriginalHttpsUrl() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
+		request.setScheme("https");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(443);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setForceHttps(true);
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
-        ep.afterPropertiesSet();
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setForceHttps(true);
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
+		ep.afterPropertiesSet();
 
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com/bigWebApp/hello", response.getRedirectedUrl());
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com/bigWebApp/hello",
+				response.getRedirectedUrl());
 
-        request.setServerPort(8443);
-        response = new MockHttpServletResponse();
-        ep.setPortResolver(new MockPortResolver(8080, 8443));
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com:8443/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		request.setServerPort(8443);
+		response = new MockHttpServletResponse();
+		ep.setPortResolver(new MockPortResolver(8080, 8443));
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com:8443/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    @Test
-    public void testNormalOperation() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortMapper(new PortMapperImpl());
-        ep.setPortResolver(new MockPortResolver(80, 443));
-        ep.afterPropertiesSet();
+	@Test
+	public void testNormalOperation() throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setPortMapper(new PortMapperImpl());
+		ep.setPortResolver(new MockPortResolver(80, 443));
+		ep.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
-        request.setContextPath("/bigWebApp");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(80);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
+		request.setContextPath("/bigWebApp");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.commence(request, response, null);
-        assertEquals("http://www.example.com/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		ep.commence(request, response, null);
+		assertEquals("http://www.example.com/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    @Test
-    public void testOperationWhenHttpsRequestsButHttpsPortUnknown() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setPortResolver(new MockPortResolver(8888, 1234));
-        ep.setForceHttps(true);
-        ep.afterPropertiesSet();
+	@Test
+	public void testOperationWhenHttpsRequestsButHttpsPortUnknown() throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setPortResolver(new MockPortResolver(8888, 1234));
+		ep.setForceHttps(true);
+		ep.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
-        request.setContextPath("/bigWebApp");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(8888); // NB: Port we can't resolve
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
+		request.setContextPath("/bigWebApp");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(8888); // NB: Port we can't resolve
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.commence(request, response, null);
+		ep.commence(request, response, null);
 
-        // Response doesn't switch to HTTPS, as we didn't know HTTP port 8888 to HTTP port mapping
-        assertEquals("http://www.example.com:8888/bigWebApp/hello", response.getRedirectedUrl());
-    }
+		// Response doesn't switch to HTTPS, as we didn't know HTTP port 8888 to HTTP port
+		// mapping
+		assertEquals("http://www.example.com:8888/bigWebApp/hello",
+				response.getRedirectedUrl());
+	}
 
-    @Test
-    public void testServerSideRedirectWithoutForceHttpsForwardsToLoginPage() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setUseForward(true);
-        ep.afterPropertiesSet();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/bigWebApp/some_path");
-        request.setServletPath("/some_path");
-        request.setContextPath("/bigWebApp");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(80);
+	@Test
+	public void testServerSideRedirectWithoutForceHttpsForwardsToLoginPage()
+			throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setUseForward(true);
+		ep.afterPropertiesSet();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/bigWebApp/some_path");
+		request.setServletPath("/some_path");
+		request.setContextPath("/bigWebApp");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.commence(request, response, null);
-        assertEquals("/hello", response.getForwardedUrl());
-    }
+		ep.commence(request, response, null);
+		assertEquals("/hello", response.getForwardedUrl());
+	}
 
-    @Test
-    public void testServerSideRedirectWithForceHttpsRedirectsCurrentRequest() throws Exception {
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("/hello");
-        ep.setUseForward(true);
-        ep.setForceHttps(true);
-        ep.afterPropertiesSet();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/bigWebApp/some_path");
-        request.setServletPath("/some_path");
-        request.setContextPath("/bigWebApp");
-        request.setScheme("http");
-        request.setServerName("www.example.com");
-        request.setContextPath("/bigWebApp");
-        request.setServerPort(80);
+	@Test
+	public void testServerSideRedirectWithForceHttpsRedirectsCurrentRequest()
+			throws Exception {
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"/hello");
+		ep.setUseForward(true);
+		ep.setForceHttps(true);
+		ep.afterPropertiesSet();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/bigWebApp/some_path");
+		request.setServletPath("/some_path");
+		request.setContextPath("/bigWebApp");
+		request.setScheme("http");
+		request.setServerName("www.example.com");
+		request.setContextPath("/bigWebApp");
+		request.setServerPort(80);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.commence(request, response, null);
-        assertEquals("https://www.example.com/bigWebApp/some_path", response.getRedirectedUrl());
-    }
+		ep.commence(request, response, null);
+		assertEquals("https://www.example.com/bigWebApp/some_path",
+				response.getRedirectedUrl());
+	}
 
-    // SEC-1498
-    @Test
-    public void absoluteLoginFormUrlIsSupported() throws Exception {
-        final String loginFormUrl = "http://somesite.com/login";
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(loginFormUrl);
-        ep.afterPropertiesSet();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        ep.commence(new MockHttpServletRequest("GET", "/someUrl"), response, null);
-        assertEquals(loginFormUrl, response.getRedirectedUrl());
-    }
+	// SEC-1498
+	@Test
+	public void absoluteLoginFormUrlIsSupported() throws Exception {
+		final String loginFormUrl = "http://somesite.com/login";
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				loginFormUrl);
+		ep.afterPropertiesSet();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		ep.commence(new MockHttpServletRequest("GET", "/someUrl"), response, null);
+		assertEquals(loginFormUrl, response.getRedirectedUrl());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void absoluteLoginFormUrlCantBeUsedWithForwarding() throws Exception {
-        final String loginFormUrl = "http://somesite.com/login";
-        LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint("http://somesite.com/login");
-        ep.setUseForward(true);
-        ep.afterPropertiesSet();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void absoluteLoginFormUrlCantBeUsedWithForwarding() throws Exception {
+		final String loginFormUrl = "http://somesite.com/login";
+		LoginUrlAuthenticationEntryPoint ep = new LoginUrlAuthenticationEntryPoint(
+				"http://somesite.com/login");
+		ep.setUseForward(true);
+		ep.afterPropertiesSet();
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java
index 628090eda4..395e3ff86f 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandlerTests.java
@@ -13,36 +13,38 @@ import org.springframework.security.web.savedrequest.SavedRequest;
 
 public class SavedRequestAwareAuthenticationSuccessHandlerTests {
 
-    @Test
-    public void defaultUrlMuststartWithSlashOrHttpScheme() {
-        SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
+	@Test
+	public void defaultUrlMuststartWithSlashOrHttpScheme() {
+		SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
 
-        handler.setDefaultTargetUrl("/acceptableRelativeUrl");
-        handler.setDefaultTargetUrl("http://some.site.org/index.html");
-        handler.setDefaultTargetUrl("https://some.site.org/index.html");
+		handler.setDefaultTargetUrl("/acceptableRelativeUrl");
+		handler.setDefaultTargetUrl("http://some.site.org/index.html");
+		handler.setDefaultTargetUrl("https://some.site.org/index.html");
 
-        try {
-            handler.setDefaultTargetUrl("missingSlash");
-            fail("Shouldn't accept default target without leading slash");
-        } catch (IllegalArgumentException expected) {}
-    }
+		try {
+			handler.setDefaultTargetUrl("missingSlash");
+			fail("Shouldn't accept default target without leading slash");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 
-    @Test
-    public void onAuthenticationSuccessHasSavedRequest() throws Exception {
-        String redirectUrl = "http://localhost/appcontext/page";
-        RedirectStrategy redirectStrategy = mock(RedirectStrategy.class);
-        RequestCache requestCache = mock(RequestCache.class);
-        SavedRequest savedRequest = mock(SavedRequest.class);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        when(savedRequest.getRedirectUrl()).thenReturn(redirectUrl);
-        when(requestCache.getRequest(request, response)).thenReturn(savedRequest);
+	@Test
+	public void onAuthenticationSuccessHasSavedRequest() throws Exception {
+		String redirectUrl = "http://localhost/appcontext/page";
+		RedirectStrategy redirectStrategy = mock(RedirectStrategy.class);
+		RequestCache requestCache = mock(RequestCache.class);
+		SavedRequest savedRequest = mock(SavedRequest.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		when(savedRequest.getRedirectUrl()).thenReturn(redirectUrl);
+		when(requestCache.getRequest(request, response)).thenReturn(savedRequest);
 
-        SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
-        handler.setRequestCache(requestCache);
-        handler.setRedirectStrategy(redirectStrategy);
-        handler.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		SavedRequestAwareAuthenticationSuccessHandler handler = new SavedRequestAwareAuthenticationSuccessHandler();
+		handler.setRequestCache(requestCache);
+		handler.setRedirectStrategy(redirectStrategy);
+		handler.onAuthenticationSuccess(request, response, mock(Authentication.class));
 
-        verify(redirectStrategy).sendRedirect(request, response, redirectUrl);
-    }
+		verify(redirectStrategy).sendRedirect(request, response, redirectUrl);
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java
index d46ddc19b2..4d187b2cdd 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationFailureHandlerTests.java
@@ -16,62 +16,67 @@ import org.springframework.security.web.WebAttributes;
  */
 public class SimpleUrlAuthenticationFailureHandlerTests {
 
-    @Test
-    public void error401IsReturnedIfNoUrlIsSet() throws Exception {
-        SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler();
-        RedirectStrategy rs = mock(RedirectStrategy.class);
-        afh.setRedirectStrategy(rs);
-        assertSame(rs, afh.getRedirectStrategy());
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void error401IsReturnedIfNoUrlIsSet() throws Exception {
+		SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler();
+		RedirectStrategy rs = mock(RedirectStrategy.class);
+		afh.setRedirectStrategy(rs);
+		assertSame(rs, afh.getRedirectStrategy());
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        afh.onAuthenticationFailure(request, response, mock(AuthenticationException.class));
-        assertEquals(401, response.getStatus());
-    }
+		afh.onAuthenticationFailure(request, response,
+				mock(AuthenticationException.class));
+		assertEquals(401, response.getStatus());
+	}
 
-    @Test
-    public void exceptionIsSavedToSessionOnRedirect() throws Exception {
-        SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler();
-        afh.setDefaultFailureUrl("/target");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void exceptionIsSavedToSessionOnRedirect() throws Exception {
+		SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler();
+		afh.setDefaultFailureUrl("/target");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        AuthenticationException e = mock(AuthenticationException.class);
+		AuthenticationException e = mock(AuthenticationException.class);
 
-        afh.onAuthenticationFailure(request, response, e);
-        assertSame(e, request.getSession().getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION));
-        assertEquals("/target", response.getRedirectedUrl());
-    }
+		afh.onAuthenticationFailure(request, response, e);
+		assertSame(e,
+				request.getSession().getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION));
+		assertEquals("/target", response.getRedirectedUrl());
+	}
 
-    @Test
-    public void exceptionIsNotSavedIfAllowSessionCreationIsFalse() throws Exception {
-        SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler("/target");
-        afh.setAllowSessionCreation(false);
-        assertFalse(afh.isAllowSessionCreation());
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void exceptionIsNotSavedIfAllowSessionCreationIsFalse() throws Exception {
+		SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler(
+				"/target");
+		afh.setAllowSessionCreation(false);
+		assertFalse(afh.isAllowSessionCreation());
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        afh.onAuthenticationFailure(request, response, mock(AuthenticationException.class));
-        assertNull(request.getSession(false));
-    }
+		afh.onAuthenticationFailure(request, response,
+				mock(AuthenticationException.class));
+		assertNull(request.getSession(false));
+	}
 
-    // SEC-462
-    @Test
-    public void responseIsForwardedIfUseForwardIsTrue() throws Exception {
-        SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler("/target");
-        afh.setUseForward(true);
-        assertTrue(afh.isUseForward());
+	// SEC-462
+	@Test
+	public void responseIsForwardedIfUseForwardIsTrue() throws Exception {
+		SimpleUrlAuthenticationFailureHandler afh = new SimpleUrlAuthenticationFailureHandler(
+				"/target");
+		afh.setUseForward(true);
+		assertTrue(afh.isUseForward());
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        AuthenticationException e = mock(AuthenticationException.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		AuthenticationException e = mock(AuthenticationException.class);
 
-        afh.onAuthenticationFailure(request, response, e);
-        assertNull(request.getSession(false));
-        assertNull(response.getRedirectedUrl());
-        assertEquals("/target", response.getForwardedUrl());
-        // Request scope should be used for forward
-        assertSame(e, request.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION));
-    }
+		afh.onAuthenticationFailure(request, response, e);
+		assertNull(request.getSession(false));
+		assertNull(response.getRedirectedUrl());
+		assertEquals("/target", response.getForwardedUrl());
+		// Request scope should be used for forward
+		assertSame(e, request.getAttribute(WebAttributes.AUTHENTICATION_EXCEPTION));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java
index fc1b2ccbfd..cbdf0a806f 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/SimpleUrlAuthenticationSuccessHandlerTests.java
@@ -13,97 +13,105 @@ import org.springframework.security.core.Authentication;
  * @author Luke Taylor
  */
 public class SimpleUrlAuthenticationSuccessHandlerTests {
-    @Test
-    public void defaultTargetUrlIsUsedIfNoOtherInformationSet() throws Exception {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
+	@Test
+	public void defaultTargetUrlIsUsedIfNoOtherInformationSet() throws Exception {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
 
-        assertEquals("/", response.getRedirectedUrl());
-    }
+		assertEquals("/", response.getRedirectedUrl());
+	}
 
-    // SEC-1428
-    @Test
-    public void redirectIsNotPerformedIfResponseIsCommitted() throws Exception {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler("/target");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        response.setCommitted(true);
+	// SEC-1428
+	@Test
+	public void redirectIsNotPerformedIfResponseIsCommitted() throws Exception {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler(
+				"/target");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		response.setCommitted(true);
 
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
-        assertNull(response.getRedirectedUrl());
-    }
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		assertNull(response.getRedirectedUrl());
+	}
 
-    /**
-     * SEC-213
-     */
-    @Test
-    public void targetUrlParameterIsUsedIfPresentAndParameterNameIsSet() throws Exception {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler("/defaultTarget");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        request.setParameter("targetUrl", "/target");
+	/**
+	 * SEC-213
+	 */
+	@Test
+	public void targetUrlParameterIsUsedIfPresentAndParameterNameIsSet() throws Exception {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler(
+				"/defaultTarget");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		request.setParameter("targetUrl", "/target");
 
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
-        assertEquals("/defaultTarget", response.getRedirectedUrl());
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		assertEquals("/defaultTarget", response.getRedirectedUrl());
 
-        // Try with parameter set
-        ash.setTargetUrlParameter("targetUrl");
-        response = new MockHttpServletResponse();
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
-        assertEquals("/target", response.getRedirectedUrl());
-    }
+		// Try with parameter set
+		ash.setTargetUrlParameter("targetUrl");
+		response = new MockHttpServletResponse();
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		assertEquals("/target", response.getRedirectedUrl());
+	}
 
-    @Test
-    public void refererIsUsedIfUseRefererIsSet() throws Exception {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler("/defaultTarget");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        ash.setUseReferer(true);
-        request.addHeader("Referer", "http://www.springsource.com/");
+	@Test
+	public void refererIsUsedIfUseRefererIsSet() throws Exception {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler(
+				"/defaultTarget");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		ash.setUseReferer(true);
+		request.addHeader("Referer", "http://www.springsource.com/");
 
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
-        assertEquals("http://www.springsource.com/", response.getRedirectedUrl());
-    }
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		assertEquals("http://www.springsource.com/", response.getRedirectedUrl());
+	}
 
-    /**
-     * SEC-297 fix.
-     */
-    @Test
-    public void absoluteDefaultTargetUrlDoesNotHaveContextPathPrepended() throws Exception {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
-        ash.setDefaultTargetUrl("https://monkeymachine.co.uk/");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	/**
+	 * SEC-297 fix.
+	 */
+	@Test
+	public void absoluteDefaultTargetUrlDoesNotHaveContextPathPrepended()
+			throws Exception {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
+		ash.setDefaultTargetUrl("https://monkeymachine.co.uk/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
+		ash.onAuthenticationSuccess(request, response, mock(Authentication.class));
 
-        assertEquals("https://monkeymachine.co.uk/", response.getRedirectedUrl());
-    }
+		assertEquals("https://monkeymachine.co.uk/", response.getRedirectedUrl());
+	}
 
-    @Test
-    public void setTargetUrlParameterNullTargetUrlParameter() {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
-        ash.setTargetUrlParameter("targetUrl");
-        ash.setTargetUrlParameter(null);
-        assertEquals(null,ash.getTargetUrlParameter());
-    }
+	@Test
+	public void setTargetUrlParameterNullTargetUrlParameter() {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
+		ash.setTargetUrlParameter("targetUrl");
+		ash.setTargetUrlParameter(null);
+		assertEquals(null, ash.getTargetUrlParameter());
+	}
 
-    @Test
-    public void setTargetUrlParameterEmptyTargetUrlParameter() {
-        SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
+	@Test
+	public void setTargetUrlParameterEmptyTargetUrlParameter() {
+		SimpleUrlAuthenticationSuccessHandler ash = new SimpleUrlAuthenticationSuccessHandler();
 
-        try {
-            ash.setTargetUrlParameter("");
-            fail("Expected Exception");
-        }catch(IllegalArgumentException success) {}
+		try {
+			ash.setTargetUrlParameter("");
+			fail("Expected Exception");
+		}
+		catch (IllegalArgumentException success) {
+		}
 
-        try {
-            ash.setTargetUrlParameter("   ");
-            fail("Expected Exception");
-        }catch(IllegalArgumentException success) {}
-    }
+		try {
+			ash.setTargetUrlParameter("   ");
+			fail("Expected Exception");
+		}
+		catch (IllegalArgumentException success) {
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java
index 81c407fc1a..ac91b24640 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/UsernamePasswordAuthenticationFilterTests.java
@@ -15,7 +15,6 @@
 
 package org.springframework.security.web.authentication;
 
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
@@ -33,120 +32,145 @@ import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
-
 /**
  * Tests {@link UsernamePasswordAuthenticationFilter}.
  *
  * @author Ben Alex
  */
 public class UsernamePasswordAuthenticationFilterTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void testNormalOperation() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY, "rod");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY, "koala");
+	@Test
+	public void testNormalOperation() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY,
+				"rod");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY,
+				"koala");
 
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-//        filter.init(null);
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		// filter.init(null);
 
-        Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
-        assertTrue(result != null);
-        assertEquals("127.0.0.1", ((WebAuthenticationDetails) result.getDetails()).getRemoteAddress());
-    }
+		Authentication result = filter.attemptAuthentication(request,
+				new MockHttpServletResponse());
+		assertTrue(result != null);
+		assertEquals("127.0.0.1",
+				((WebAuthenticationDetails) result.getDetails()).getRemoteAddress());
+	}
 
-    @Test
-    public void testNullPasswordHandledGracefully() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY, "rod");
+	@Test
+	public void testNullPasswordHandledGracefully() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY,
+				"rod");
 
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        assertNotNull(filter.attemptAuthentication(request, new MockHttpServletResponse()));
-    }
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		assertNotNull(filter
+				.attemptAuthentication(request, new MockHttpServletResponse()));
+	}
 
-    @Test
-    public void testNullUsernameHandledGracefully() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY, "koala");
+	@Test
+	public void testNullUsernameHandledGracefully() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY,
+				"koala");
 
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        assertNotNull(filter.attemptAuthentication(request, new MockHttpServletResponse()));
-    }
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		assertNotNull(filter
+				.attemptAuthentication(request, new MockHttpServletResponse()));
+	}
 
-    @Test
-    public void testUsingDifferentParameterNamesWorksAsExpected() throws ServletException {
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        filter.setUsernameParameter("x");
-        filter.setPasswordParameter("y");
+	@Test
+	public void testUsingDifferentParameterNamesWorksAsExpected() throws ServletException {
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		filter.setUsernameParameter("x");
+		filter.setPasswordParameter("y");
 
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter("x", "rod");
-        request.addParameter("y", "koala");
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter("x", "rod");
+		request.addParameter("y", "koala");
 
-        Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
-        assertNotNull(result);
-        assertEquals("127.0.0.1", ((WebAuthenticationDetails) result.getDetails()).getRemoteAddress());
-    }
+		Authentication result = filter.attemptAuthentication(request,
+				new MockHttpServletResponse());
+		assertNotNull(result);
+		assertEquals("127.0.0.1",
+				((WebAuthenticationDetails) result.getDetails()).getRemoteAddress());
+	}
 
-    @Test
-    public void testSpacesAreTrimmedCorrectlyFromUsername() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY, " rod ");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY, "koala");
+	@Test
+	public void testSpacesAreTrimmedCorrectlyFromUsername() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY,
+				" rod ");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_PASSWORD_KEY,
+				"koala");
 
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
 
-        Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
-        assertEquals("rod", result.getName());
-    }
+		Authentication result = filter.attemptAuthentication(request,
+				new MockHttpServletResponse());
+		assertEquals("rod", result.getName());
+	}
 
-    @Test
-    public void testFailedAuthenticationThrowsException() {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
-        request.addParameter(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY, "rod");
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
-        filter.setAuthenticationManager(am);
+	@Test
+	public void testFailedAuthenticationThrowsException() {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
+		request.addParameter(
+				UsernamePasswordAuthenticationFilter.SPRING_SECURITY_FORM_USERNAME_KEY,
+				"rod");
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
+		filter.setAuthenticationManager(am);
 
-        try {
-            filter.attemptAuthentication(request, new MockHttpServletResponse());
-            fail("Expected AuthenticationException");
-        } catch (AuthenticationException e) {
-        }
-    }
+		try {
+			filter.attemptAuthentication(request, new MockHttpServletResponse());
+			fail("Expected AuthenticationException");
+		}
+		catch (AuthenticationException e) {
+		}
+	}
 
-    /**
-     * SEC-571
-     */
-    @Test
-    public void noSessionIsCreatedIfAllowSessionCreationIsFalse() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	/**
+	 * SEC-571
+	 */
+	@Test
+	public void noSessionIsCreatedIfAllowSessionCreationIsFalse() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
-        filter.setAllowSessionCreation(false);
-        filter.setAuthenticationManager(createAuthenticationManager());
+		UsernamePasswordAuthenticationFilter filter = new UsernamePasswordAuthenticationFilter();
+		filter.setAllowSessionCreation(false);
+		filter.setAuthenticationManager(createAuthenticationManager());
 
-        filter.attemptAuthentication(request, new MockHttpServletResponse());
+		filter.attemptAuthentication(request, new MockHttpServletResponse());
 
-        assertNull(request.getSession(false));
-    }
+		assertNull(request.getSession(false));
+	}
 
-    private AuthenticationManager createAuthenticationManager() {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenAnswer(new Answer<Authentication>() {
-            public Authentication answer(InvocationOnMock invocation) throws Throwable {
-                return (Authentication) invocation.getArguments()[0];
-            }
-        });
+	private AuthenticationManager createAuthenticationManager() {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenAnswer(
+				new Answer<Authentication>() {
+					public Authentication answer(InvocationOnMock invocation)
+							throws Throwable {
+						return (Authentication) invocation.getArguments()[0];
+					}
+				});
 
-        return am;
-    }
+		return am;
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
index 5cdd6520d4..427e45f8cb 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/logout/CookieClearingLogoutHandlerTests.java
@@ -15,32 +15,33 @@ import org.springframework.security.core.Authentication;
  */
 public class CookieClearingLogoutHandlerTests {
 
-    // SEC-2036
-    @Test
-    public void emptyContextRootIsConverted() {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("");
-        CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler("my_cookie");
-        handler.logout(request, response, mock(Authentication.class));
-        assertEquals(1, response.getCookies().length);
-        for (Cookie c : response.getCookies()) {
-            assertEquals("/", c.getPath());
-            assertEquals(0, c.getMaxAge());
-        }
-    }
+	// SEC-2036
+	@Test
+	public void emptyContextRootIsConverted() {
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("");
+		CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler("my_cookie");
+		handler.logout(request, response, mock(Authentication.class));
+		assertEquals(1, response.getCookies().length);
+		for (Cookie c : response.getCookies()) {
+			assertEquals("/", c.getPath());
+			assertEquals(0, c.getMaxAge());
+		}
+	}
 
-    @Test
-    public void configuredCookiesAreCleared() {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("/app");
-        CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler("my_cookie", "my_cookie_too");
-        handler.logout(request, response, mock(Authentication.class));
-        assertEquals(2, response.getCookies().length);
-        for (Cookie c : response.getCookies()) {
-            assertEquals("/app", c.getPath());
-            assertEquals(0, c.getMaxAge());
-        }
-    }
+	@Test
+	public void configuredCookiesAreCleared() {
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("/app");
+		CookieClearingLogoutHandler handler = new CookieClearingLogoutHandler(
+				"my_cookie", "my_cookie_too");
+		handler.logout(request, response, mock(Authentication.class));
+		assertEquals(2, response.getCookies().length);
+		for (Cookie c : response.getCookies()) {
+			assertEquals("/app", c.getPath());
+			assertEquals(0, c.getMaxAge());
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java
index 17a226058a..c97b6370c2 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/logout/LogoutHandlerTests.java
@@ -12,34 +12,34 @@ import org.springframework.security.web.firewall.DefaultHttpFirewall;
  * @author Luke Taylor
  */
 public class LogoutHandlerTests extends TestCase {
-    LogoutFilter filter;
+	LogoutFilter filter;
 
-    protected void setUp() throws Exception {
-        filter = new LogoutFilter("/success", new SecurityContextLogoutHandler());
-    }
+	protected void setUp() throws Exception {
+		filter = new LogoutFilter("/success", new SecurityContextLogoutHandler());
+	}
 
-    public void testRequiresLogoutUrlWorksWithPathParams() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	public void testRequiresLogoutUrlWorksWithPathParams() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setRequestURI("/context/logout;someparam=blah?param=blah");
-        request.setServletPath("/logout;someparam=blah");
-        request.setQueryString("otherparam=blah");
+		request.setRequestURI("/context/logout;someparam=blah?param=blah");
+		request.setServletPath("/logout;someparam=blah");
+		request.setQueryString("otherparam=blah");
 
-        DefaultHttpFirewall fw = new DefaultHttpFirewall();
-        assertTrue(filter.requiresLogout(fw.getFirewalledRequest(request), response));
-    }
+		DefaultHttpFirewall fw = new DefaultHttpFirewall();
+		assertTrue(filter.requiresLogout(fw.getFirewalledRequest(request), response));
+	}
 
-    public void testRequiresLogoutUrlWorksWithQueryParams() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("/context");
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	public void testRequiresLogoutUrlWorksWithQueryParams() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("/context");
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        request.setServletPath("/logout");
-        request.setRequestURI("/context/logout?param=blah");
-        request.setQueryString("otherparam=blah");
+		request.setServletPath("/logout");
+		request.setRequestURI("/context/logout?param=blah");
+		request.setQueryString("otherparam=blah");
 
-        assertTrue(filter.requiresLogout(request, response));
-    }
+		assertTrue(filter.requiresLogout(request, response));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java
index be61a4686f..6f4ec6568b 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/logout/SecurityContextLogoutHandlerTests.java
@@ -31,43 +31,46 @@ import org.springframework.security.core.context.SecurityContextHolder;
  *
  */
 public class SecurityContextLogoutHandlerTests {
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private SecurityContextLogoutHandler handler;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private SecurityContextLogoutHandler handler;
 
-    @Before
-    public void setUp() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
+	@Before
+	public void setUp() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
 
-        handler = new SecurityContextLogoutHandler();
+		handler = new SecurityContextLogoutHandler();
 
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(new TestingAuthenticationToken("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")));
-        SecurityContextHolder.setContext(context);
-    }
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(new TestingAuthenticationToken("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
+		SecurityContextHolder.setContext(context);
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    // SEC-2025
-    @Test
-    public void clearsAuthentication() {
-        SecurityContext beforeContext = SecurityContextHolder.getContext();
-        handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication());
-        assertNull(beforeContext.getAuthentication());
-    }
+	// SEC-2025
+	@Test
+	public void clearsAuthentication() {
+		SecurityContext beforeContext = SecurityContextHolder.getContext();
+		handler.logout(request, response, SecurityContextHolder.getContext()
+				.getAuthentication());
+		assertNull(beforeContext.getAuthentication());
+	}
 
-    @Test
-    public void disableClearsAuthentication() {
-        handler.setClearAuthentication(false);
-        SecurityContext beforeContext = SecurityContextHolder.getContext();
-        Authentication beforeAuthentication = beforeContext.getAuthentication();
-        handler.logout(request, response, SecurityContextHolder.getContext().getAuthentication());
+	@Test
+	public void disableClearsAuthentication() {
+		handler.setClearAuthentication(false);
+		SecurityContext beforeContext = SecurityContextHolder.getContext();
+		Authentication beforeAuthentication = beforeContext.getAuthentication();
+		handler.logout(request, response, SecurityContextHolder.getContext()
+				.getAuthentication());
 
-        assertNotNull(beforeContext.getAuthentication());
-        assertSame(beforeAuthentication, beforeContext.getAuthentication());
-    }
+		assertNotNull(beforeContext.getAuthentication());
+		assertSame(beforeAuthentication, beforeContext.getAuthentication());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java
index 422785eb69..8c15558698 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/logout/SimpleUrlLogoutSuccessHandlerTests.java
@@ -14,27 +14,27 @@ import org.springframework.security.core.Authentication;
  */
 public class SimpleUrlLogoutSuccessHandlerTests {
 
-    @Test
-    public void doesntRedirectIfResponseIsCommitted() throws Exception {
-        SimpleUrlLogoutSuccessHandler lsh = new SimpleUrlLogoutSuccessHandler();
-        lsh.setDefaultTargetUrl("/target");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        response.setCommitted(true);
-        lsh.onLogoutSuccess(request, response, mock(Authentication.class));
-        assertNull(request.getSession(false));
-        assertNull(response.getRedirectedUrl());
-        assertNull(response.getForwardedUrl());
-    }
+	@Test
+	public void doesntRedirectIfResponseIsCommitted() throws Exception {
+		SimpleUrlLogoutSuccessHandler lsh = new SimpleUrlLogoutSuccessHandler();
+		lsh.setDefaultTargetUrl("/target");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		response.setCommitted(true);
+		lsh.onLogoutSuccess(request, response, mock(Authentication.class));
+		assertNull(request.getSession(false));
+		assertNull(response.getRedirectedUrl());
+		assertNull(response.getForwardedUrl());
+	}
 
-    @Test
-    public void absoluteUrlIsSupported() throws Exception {
-        SimpleUrlLogoutSuccessHandler lsh = new SimpleUrlLogoutSuccessHandler();
-        lsh.setDefaultTargetUrl("http://someurl.com/");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        lsh.onLogoutSuccess(request, response, mock(Authentication.class));
-        assertEquals("http://someurl.com/", response.getRedirectedUrl());
-    }
+	@Test
+	public void absoluteUrlIsSupported() throws Exception {
+		SimpleUrlLogoutSuccessHandler lsh = new SimpleUrlLogoutSuccessHandler();
+		lsh.setDefaultTargetUrl("http://someurl.com/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		lsh.onLogoutSuccess(request, response, mock(Authentication.class));
+		assertEquals("http://someurl.com/", response.getRedirectedUrl());
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
index bb8ebf7b32..3f70aff3dc 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/AbstractPreAuthenticatedProcessingFilterTests.java
@@ -49,251 +49,281 @@ import org.springframework.security.core.userdetails.User;
  *
  */
 public class AbstractPreAuthenticatedProcessingFilterTests {
-    private AbstractPreAuthenticatedProcessingFilter filter;
+	private AbstractPreAuthenticatedProcessingFilter filter;
 
-    @Before
-    public void createFilter() {
-        filter = new AbstractPreAuthenticatedProcessingFilter() {
-            protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
-                return "n/a";
-            }
+	@Before
+	public void createFilter() {
+		filter = new AbstractPreAuthenticatedProcessingFilter() {
+			protected Object getPreAuthenticatedCredentials(HttpServletRequest request) {
+				return "n/a";
+			}
 
-            protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
-                return "doesntmatter";
-            }
-        };
-        SecurityContextHolder.clearContext();
-    }
+			protected Object getPreAuthenticatedPrincipal(HttpServletRequest request) {
+				return "doesntmatter";
+			}
+		};
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void filterChainProceedsOnFailedAuthenticationByDefault() throws Exception {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class));
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+	@Test
+	public void filterChainProceedsOnFailedAuthenticationByDefault() throws Exception {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				mock(FilterChain.class));
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    /* SEC-881 */
-    @Test(expected=BadCredentialsException.class)
-    public void exceptionIsThrownOnFailedAuthenticationIfContinueFilterChainOnUnsuccessfulAuthenticationSetToFalse() throws Exception {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
-        filter.setContinueFilterChainOnUnsuccessfulAuthentication(false);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class));
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+	/* SEC-881 */
+	@Test(expected = BadCredentialsException.class)
+	public void exceptionIsThrownOnFailedAuthenticationIfContinueFilterChainOnUnsuccessfulAuthenticationSetToFalse()
+			throws Exception {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
+		filter.setContinueFilterChainOnUnsuccessfulAuthentication(false);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				mock(FilterChain.class));
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void testAfterPropertiesSet() {
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        try {
-            filter.afterPropertiesSet();
-            fail("AfterPropertiesSet didn't throw expected exception");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception unexpected) {
-            fail("AfterPropertiesSet throws unexpected exception");
-        }
-    }
+	@Test
+	public void testAfterPropertiesSet() {
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		try {
+			filter.afterPropertiesSet();
+			fail("AfterPropertiesSet didn't throw expected exception");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		catch (Exception unexpected) {
+			fail("AfterPropertiesSet throws unexpected exception");
+		}
+	}
 
-    // SEC-2045
-    @Test
-    public void testAfterPropertiesSetInvokesSuper() throws Exception {
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
-        assertTrue(filter.initFilterBeanInvoked);
-    }
+	// SEC-2045
+	@Test
+	public void testAfterPropertiesSetInvokesSuper() throws Exception {
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
+		assertTrue(filter.initFilterBeanInvoked);
+	}
 
-    @Test
-    public void testDoFilterAuthenticated() throws Exception {
-        testDoFilter(true);
-    }
+	@Test
+	public void testDoFilterAuthenticated() throws Exception {
+		testDoFilter(true);
+	}
 
-    @Test
-    public void testDoFilterUnauthenticated() throws Exception {
-        testDoFilter(false);
-    }
+	@Test
+	public void testDoFilterUnauthenticated() throws Exception {
+		testDoFilter(false);
+	}
 
-    // SEC-1968
-    @Test
-    public void nullPreAuthenticationClearsPreviousUser() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("oldUser", "pass","ROLE_USER"));
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.principal = null;
-        filter.setCheckForPrincipalChanges(true);
+	// SEC-1968
+	@Test
+	public void nullPreAuthenticationClearsPreviousUser() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("oldUser", "pass", "ROLE_USER"));
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.principal = null;
+		filter.setCheckForPrincipalChanges(true);
 
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				new MockFilterChain());
 
-        assertEquals(null, SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertEquals(null, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void nullPreAuthenticationPerservesPreviousUserCheckPrincipalChangesFalse() throws Exception {
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken("oldUser", "pass","ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.principal = null;
+	@Test
+	public void nullPreAuthenticationPerservesPreviousUserCheckPrincipalChangesFalse()
+			throws Exception {
+		TestingAuthenticationToken authentication = new TestingAuthenticationToken(
+				"oldUser", "pass", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.principal = null;
 
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				new MockFilterChain());
 
-        assertEquals(authentication, SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertEquals(authentication, SecurityContextHolder.getContext()
+				.getAuthentication());
+	}
 
-    @Test
-    public void requiresAuthenticationFalsePrincipalString() throws Exception {
-        Object principal = "sameprincipal";
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(principal, "something", "ROLE_USER"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
+	@Test
+	public void requiresAuthenticationFalsePrincipalString() throws Exception {
+		Object principal = "sameprincipal";
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(principal, "something", "ROLE_USER"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
 
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.setCheckForPrincipalChanges(true);
-        filter.principal = principal;
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.setCheckForPrincipalChanges(true);
+		filter.principal = principal;
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verifyZeroInteractions(am);
-    }
+		verifyZeroInteractions(am);
+	}
 
-    @Test
-    public void requiresAuthenticationTruePrincipalString() throws Exception {
-        Object currentPrincipal = "currentUser";
-        TestingAuthenticationToken authRequest = new TestingAuthenticationToken(currentPrincipal, "something", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authRequest);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
+	@Test
+	public void requiresAuthenticationTruePrincipalString() throws Exception {
+		Object currentPrincipal = "currentUser";
+		TestingAuthenticationToken authRequest = new TestingAuthenticationToken(
+				currentPrincipal, "something", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authRequest);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
 
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.setCheckForPrincipalChanges(true);
-        filter.principal = "newUser";
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.setCheckForPrincipalChanges(true);
+		filter.principal = "newUser";
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verify(am).authenticate(any(PreAuthenticatedAuthenticationToken.class));
-    }
+		verify(am).authenticate(any(PreAuthenticatedAuthenticationToken.class));
+	}
 
-    // SEC-2078
-    @Test
-    public void requiresAuthenticationFalsePrincipalNotString() throws Exception {
-        Object principal = new Object();
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(principal, "something", "ROLE_USER"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
+	// SEC-2078
+	@Test
+	public void requiresAuthenticationFalsePrincipalNotString() throws Exception {
+		Object principal = new Object();
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken(principal, "something", "ROLE_USER"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
 
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.setCheckForPrincipalChanges(true);
-        filter.principal = principal;
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.setCheckForPrincipalChanges(true);
+		filter.principal = principal;
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verifyZeroInteractions(am);
-    }
+		verifyZeroInteractions(am);
+	}
 
-    @Test
-    public void requiresAuthenticationFalsePrincipalUser() throws Exception {
-        User currentPrincipal = new User("user","password", AuthorityUtils.createAuthorityList("ROLE_USER"));
-        UsernamePasswordAuthenticationToken currentAuthentication = new UsernamePasswordAuthenticationToken(
-                currentPrincipal, currentPrincipal.getPassword(), currentPrincipal.getAuthorities());
-        SecurityContextHolder.getContext().setAuthentication(currentAuthentication);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
+	@Test
+	public void requiresAuthenticationFalsePrincipalUser() throws Exception {
+		User currentPrincipal = new User("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER"));
+		UsernamePasswordAuthenticationToken currentAuthentication = new UsernamePasswordAuthenticationToken(
+				currentPrincipal, currentPrincipal.getPassword(),
+				currentPrincipal.getAuthorities());
+		SecurityContextHolder.getContext().setAuthentication(currentAuthentication);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
 
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.setCheckForPrincipalChanges(true);
-        filter.principal = new User(currentPrincipal.getUsername(), currentPrincipal.getPassword(), AuthorityUtils.NO_AUTHORITIES);
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.setCheckForPrincipalChanges(true);
+		filter.principal = new User(currentPrincipal.getUsername(),
+				currentPrincipal.getPassword(), AuthorityUtils.NO_AUTHORITIES);
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verifyZeroInteractions(am);
-    }
+		verifyZeroInteractions(am);
+	}
 
-    @Test
-    public void requiresAuthenticationTruePrincipalNotString() throws Exception {
-        Object currentPrincipal = new Object();
-        TestingAuthenticationToken authRequest = new TestingAuthenticationToken(currentPrincipal, "something", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authRequest);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
+	@Test
+	public void requiresAuthenticationTruePrincipalNotString() throws Exception {
+		Object currentPrincipal = new Object();
+		TestingAuthenticationToken authRequest = new TestingAuthenticationToken(
+				currentPrincipal, "something", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authRequest);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
 
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        filter.setCheckForPrincipalChanges(true);
-        filter.principal = new Object();
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		filter.setCheckForPrincipalChanges(true);
+		filter.principal = new Object();
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verify(am).authenticate(any(PreAuthenticatedAuthenticationToken.class));
-    }
+		verify(am).authenticate(any(PreAuthenticatedAuthenticationToken.class));
+	}
 
-    private void testDoFilter(boolean grantAccess) throws Exception {
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        MockHttpServletResponse res = new MockHttpServletResponse();
-        getFilter(grantAccess).doFilter(req,res,new MockFilterChain());
-        assertEquals(grantAccess, null != SecurityContextHolder.getContext().getAuthentication());
-    }
+	private void testDoFilter(boolean grantAccess) throws Exception {
+		MockHttpServletRequest req = new MockHttpServletRequest();
+		MockHttpServletResponse res = new MockHttpServletResponse();
+		getFilter(grantAccess).doFilter(req, res, new MockFilterChain());
+		assertEquals(grantAccess, null != SecurityContextHolder.getContext()
+				.getAuthentication());
+	}
 
-    private static ConcretePreAuthenticatedProcessingFilter getFilter(boolean grantAccess) throws Exception {
-        ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
-        AuthenticationManager am = mock(AuthenticationManager.class);
+	private static ConcretePreAuthenticatedProcessingFilter getFilter(boolean grantAccess)
+			throws Exception {
+		ConcretePreAuthenticatedProcessingFilter filter = new ConcretePreAuthenticatedProcessingFilter();
+		AuthenticationManager am = mock(AuthenticationManager.class);
 
-        if (!grantAccess) {
-            when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
-        } else {
-            when(am.authenticate(any(Authentication.class))).thenAnswer(new Answer<Authentication>() {
-                public Authentication answer(InvocationOnMock invocation) throws Throwable {
-                    return (Authentication) invocation.getArguments()[0];
-                }
-            });
-        }
+		if (!grantAccess) {
+			when(am.authenticate(any(Authentication.class))).thenThrow(
+					new BadCredentialsException(""));
+		}
+		else {
+			when(am.authenticate(any(Authentication.class))).thenAnswer(
+					new Answer<Authentication>() {
+						public Authentication answer(InvocationOnMock invocation)
+								throws Throwable {
+							return (Authentication) invocation.getArguments()[0];
+						}
+					});
+		}
 
-        filter.setAuthenticationManager(am);
-        filter.afterPropertiesSet();
-        return filter;
-    }
+		filter.setAuthenticationManager(am);
+		filter.afterPropertiesSet();
+		return filter;
+	}
 
-    private static class ConcretePreAuthenticatedProcessingFilter extends AbstractPreAuthenticatedProcessingFilter {
-        private Object principal = "testPrincipal";
-        private boolean initFilterBeanInvoked;
-        protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
-            return principal;
-        }
-        protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
-            return "testCredentials";
-        }
-        @Override
-        protected void initFilterBean() throws ServletException {
-            super.initFilterBean();
-            initFilterBeanInvoked = true;
-        }
-    }
+	private static class ConcretePreAuthenticatedProcessingFilter extends
+			AbstractPreAuthenticatedProcessingFilter {
+		private Object principal = "testPrincipal";
+		private boolean initFilterBeanInvoked;
+
+		protected Object getPreAuthenticatedPrincipal(HttpServletRequest httpRequest) {
+			return principal;
+		}
+
+		protected Object getPreAuthenticatedCredentials(HttpServletRequest httpRequest) {
+			return "testCredentials";
+		}
+
+		@Override
+		protected void initFilterBean() throws ServletException {
+			super.initFilterBean();
+			initFilterBeanInvoked = true;
+		}
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java
index 17edd579e5..89a00a0565 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/Http403ForbiddenEntryPointTests.java
@@ -15,17 +15,21 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 public class Http403ForbiddenEntryPointTests extends TestCase {
 
-    public void testCommence() {
-        MockHttpServletRequest req = new MockHttpServletRequest();
-        MockHttpServletResponse resp = new MockHttpServletResponse();
-        Http403ForbiddenEntryPoint fep = new Http403ForbiddenEntryPoint();
-        try {
-            fep.commence(req,resp,new AuthenticationCredentialsNotFoundException("test"));
-            assertEquals("Incorrect status",resp.getStatus(),HttpServletResponse.SC_FORBIDDEN);
-        } catch (IOException e) {
-            fail("Unexpected exception thrown: "+e);
-        } catch (ServletException e) {
-            fail("Unexpected exception thrown: "+e);
-        }
-    }
+	public void testCommence() {
+		MockHttpServletRequest req = new MockHttpServletRequest();
+		MockHttpServletResponse resp = new MockHttpServletResponse();
+		Http403ForbiddenEntryPoint fep = new Http403ForbiddenEntryPoint();
+		try {
+			fep.commence(req, resp,
+					new AuthenticationCredentialsNotFoundException("test"));
+			assertEquals("Incorrect status", resp.getStatus(),
+					HttpServletResponse.SC_FORBIDDEN);
+		}
+		catch (IOException e) {
+			fail("Unexpected exception thrown: " + e);
+		}
+		catch (ServletException e) {
+			fail("Unexpected exception thrown: " + e);
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java
index 8b66359045..efde222d30 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationProviderTests.java
@@ -24,97 +24,108 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedA
  */
 public class PreAuthenticatedAuthenticationProviderTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public final void afterPropertiesSet() {
-        PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider();
+	@Test(expected = IllegalArgumentException.class)
+	public final void afterPropertiesSet() {
+		PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider();
 
-        provider.afterPropertiesSet();
-    }
+		provider.afterPropertiesSet();
+	}
 
-    @Test
-    public final void authenticateInvalidToken() throws Exception {
-        UserDetails ud = new User("dummyUser", "dummyPwd", true, true, true, true, AuthorityUtils.NO_AUTHORITIES );
-        PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
-        Authentication request = new UsernamePasswordAuthenticationToken("dummyUser", "dummyPwd");
-        Authentication result = provider.authenticate(request);
-        assertNull(result);
-    }
+	@Test
+	public final void authenticateInvalidToken() throws Exception {
+		UserDetails ud = new User("dummyUser", "dummyPwd", true, true, true, true,
+				AuthorityUtils.NO_AUTHORITIES);
+		PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
+		Authentication request = new UsernamePasswordAuthenticationToken("dummyUser",
+				"dummyPwd");
+		Authentication result = provider.authenticate(request);
+		assertNull(result);
+	}
 
-    @Test
-    public final void nullPrincipalReturnsNullAuthentication() throws Exception {
-        PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider();
-        Authentication request = new PreAuthenticatedAuthenticationToken(null, "dummyPwd");
-        Authentication result = provider.authenticate(request);
-        assertNull(result);
-    }
+	@Test
+	public final void nullPrincipalReturnsNullAuthentication() throws Exception {
+		PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider();
+		Authentication request = new PreAuthenticatedAuthenticationToken(null, "dummyPwd");
+		Authentication result = provider.authenticate(request);
+		assertNull(result);
+	}
 
-    @Test
-    public final void authenticateKnownUser() throws Exception {
-        UserDetails ud = new User("dummyUser", "dummyPwd", true, true, true, true, AuthorityUtils.NO_AUTHORITIES );
-        PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
-        Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser", "dummyPwd");
-        Authentication result = provider.authenticate(request);
-        assertNotNull(result);
-        assertEquals(result.getPrincipal(), ud);
-        // @TODO: Add more asserts?
-    }
+	@Test
+	public final void authenticateKnownUser() throws Exception {
+		UserDetails ud = new User("dummyUser", "dummyPwd", true, true, true, true,
+				AuthorityUtils.NO_AUTHORITIES);
+		PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
+		Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser",
+				"dummyPwd");
+		Authentication result = provider.authenticate(request);
+		assertNotNull(result);
+		assertEquals(result.getPrincipal(), ud);
+		// @TODO: Add more asserts?
+	}
 
-    @Test
-    public final void authenticateIgnoreCredentials() throws Exception {
-        UserDetails ud = new User("dummyUser1", "dummyPwd1", true, true, true, true, AuthorityUtils.NO_AUTHORITIES );
-        PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
-        Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser1", "dummyPwd2");
-        Authentication result = provider.authenticate(request);
-        assertNotNull(result);
-        assertEquals(result.getPrincipal(), ud);
-        // @TODO: Add more asserts?
-    }
+	@Test
+	public final void authenticateIgnoreCredentials() throws Exception {
+		UserDetails ud = new User("dummyUser1", "dummyPwd1", true, true, true, true,
+				AuthorityUtils.NO_AUTHORITIES);
+		PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
+		Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser1",
+				"dummyPwd2");
+		Authentication result = provider.authenticate(request);
+		assertNotNull(result);
+		assertEquals(result.getPrincipal(), ud);
+		// @TODO: Add more asserts?
+	}
 
-    @Test(expected=UsernameNotFoundException.class)
-    public final void authenticateUnknownUserThrowsException() throws Exception {
-        UserDetails ud = new User("dummyUser1", "dummyPwd", true, true, true, true, AuthorityUtils.NO_AUTHORITIES );
-        PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
-        Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser2", "dummyPwd");
-        provider.authenticate(request);
-    }
+	@Test(expected = UsernameNotFoundException.class)
+	public final void authenticateUnknownUserThrowsException() throws Exception {
+		UserDetails ud = new User("dummyUser1", "dummyPwd", true, true, true, true,
+				AuthorityUtils.NO_AUTHORITIES);
+		PreAuthenticatedAuthenticationProvider provider = getProvider(ud);
+		Authentication request = new PreAuthenticatedAuthenticationToken("dummyUser2",
+				"dummyPwd");
+		provider.authenticate(request);
+	}
 
-    @Test
-    public final void supportsArbitraryObject() throws Exception {
-        PreAuthenticatedAuthenticationProvider provider = getProvider(null);
-        assertFalse(provider.supports(Authentication.class));
-    }
+	@Test
+	public final void supportsArbitraryObject() throws Exception {
+		PreAuthenticatedAuthenticationProvider provider = getProvider(null);
+		assertFalse(provider.supports(Authentication.class));
+	}
 
-    @Test
-    public final void supportsPreAuthenticatedAuthenticationToken() throws Exception {
-        PreAuthenticatedAuthenticationProvider provider = getProvider(null);
-        assertTrue(provider.supports(PreAuthenticatedAuthenticationToken.class));
-    }
+	@Test
+	public final void supportsPreAuthenticatedAuthenticationToken() throws Exception {
+		PreAuthenticatedAuthenticationProvider provider = getProvider(null);
+		assertTrue(provider.supports(PreAuthenticatedAuthenticationToken.class));
+	}
 
-    @Test
-    public void getSetOrder() throws Exception {
-        PreAuthenticatedAuthenticationProvider provider = getProvider(null);
-        provider.setOrder(333);
-        assertEquals(provider.getOrder(), 333);
-    }
+	@Test
+	public void getSetOrder() throws Exception {
+		PreAuthenticatedAuthenticationProvider provider = getProvider(null);
+		provider.setOrder(333);
+		assertEquals(provider.getOrder(), 333);
+	}
 
-    private PreAuthenticatedAuthenticationProvider getProvider(UserDetails aUserDetails) throws Exception {
-        PreAuthenticatedAuthenticationProvider result = new PreAuthenticatedAuthenticationProvider();
-        result.setPreAuthenticatedUserDetailsService(getPreAuthenticatedUserDetailsService(aUserDetails));
-        result.afterPropertiesSet();
-        return result;
-    }
+	private PreAuthenticatedAuthenticationProvider getProvider(UserDetails aUserDetails)
+			throws Exception {
+		PreAuthenticatedAuthenticationProvider result = new PreAuthenticatedAuthenticationProvider();
+		result.setPreAuthenticatedUserDetailsService(getPreAuthenticatedUserDetailsService(aUserDetails));
+		result.afterPropertiesSet();
+		return result;
+	}
 
-    private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken>
-            getPreAuthenticatedUserDetailsService(final UserDetails aUserDetails) {
-        return new AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken>() {
-            public UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token) throws UsernameNotFoundException {
-                if (aUserDetails != null && aUserDetails.getUsername().equals(token.getName())) {
-                    return aUserDetails;
-                }
+	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getPreAuthenticatedUserDetailsService(
+			final UserDetails aUserDetails) {
+		return new AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken>() {
+			public UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token)
+					throws UsernameNotFoundException {
+				if (aUserDetails != null
+						&& aUserDetails.getUsername().equals(token.getName())) {
+					return aUserDetails;
+				}
 
-                throw new UsernameNotFoundException("notfound");
-            }
-        };
-    }
+				throw new UsernameNotFoundException("notfound");
+			}
+		};
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java
index 6592e727e7..da67325edd 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedAuthenticationTokenTests.java
@@ -16,42 +16,45 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedA
  */
 public class PreAuthenticatedAuthenticationTokenTests extends TestCase {
 
-    public void testPreAuthenticatedAuthenticationTokenRequestWithDetails() {
-        Object principal = "dummyUser";
-        Object credentials = "dummyCredentials";
-        Object details = "dummyDetails";
-        PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal, credentials);
-        token.setDetails(details);
-        assertEquals(principal, token.getPrincipal());
-        assertEquals(credentials, token.getCredentials());
-        assertEquals(details, token.getDetails());
-        assertTrue(token.getAuthorities().isEmpty());
-    }
+	public void testPreAuthenticatedAuthenticationTokenRequestWithDetails() {
+		Object principal = "dummyUser";
+		Object credentials = "dummyCredentials";
+		Object details = "dummyDetails";
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				principal, credentials);
+		token.setDetails(details);
+		assertEquals(principal, token.getPrincipal());
+		assertEquals(credentials, token.getCredentials());
+		assertEquals(details, token.getDetails());
+		assertTrue(token.getAuthorities().isEmpty());
+	}
 
-    public void testPreAuthenticatedAuthenticationTokenRequestWithoutDetails() {
-        Object principal = "dummyUser";
-        Object credentials = "dummyCredentials";
-        PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(principal, credentials);
-        assertEquals(principal, token.getPrincipal());
-        assertEquals(credentials, token.getCredentials());
-        assertNull(token.getDetails());
-        assertTrue(token.getAuthorities().isEmpty());
-    }
+	public void testPreAuthenticatedAuthenticationTokenRequestWithoutDetails() {
+		Object principal = "dummyUser";
+		Object credentials = "dummyCredentials";
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				principal, credentials);
+		assertEquals(principal, token.getPrincipal());
+		assertEquals(credentials, token.getCredentials());
+		assertNull(token.getDetails());
+		assertTrue(token.getAuthorities().isEmpty());
+	}
 
-    public void testPreAuthenticatedAuthenticationTokenResponse() {
-        Object principal = "dummyUser";
-        Object credentials = "dummyCredentials";
-        List<GrantedAuthority> gas = AuthorityUtils.createAuthorityList("Role1");
-        PreAuthenticatedAuthenticationToken token =
-            new PreAuthenticatedAuthenticationToken(principal, credentials, gas);
-        assertEquals(principal, token.getPrincipal());
-        assertEquals(credentials, token.getCredentials());
-        assertNull(token.getDetails());
-        assertNotNull(token.getAuthorities());
-        Collection<GrantedAuthority> resultColl = token.getAuthorities();
-        assertTrue("GrantedAuthority collections do not match; result: " + resultColl + ", expected: " + gas,
-                gas.containsAll(resultColl) && resultColl.containsAll(gas));
+	public void testPreAuthenticatedAuthenticationTokenResponse() {
+		Object principal = "dummyUser";
+		Object credentials = "dummyCredentials";
+		List<GrantedAuthority> gas = AuthorityUtils.createAuthorityList("Role1");
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				principal, credentials, gas);
+		assertEquals(principal, token.getPrincipal());
+		assertEquals(credentials, token.getCredentials());
+		assertNull(token.getDetails());
+		assertNotNull(token.getAuthorities());
+		Collection<GrantedAuthority> resultColl = token.getAuthorities();
+		assertTrue("GrantedAuthority collections do not match; result: " + resultColl
+				+ ", expected: " + gas,
+				gas.containsAll(resultColl) && resultColl.containsAll(gas));
 
-    }
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java
index f745cadffe..047a3304b6 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests.java
@@ -17,55 +17,62 @@ import org.springframework.security.core.userdetails.UserDetails;
  */
 public class PreAuthenticatedGrantedAuthoritiesUserDetailsServiceTests {
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testGetUserDetailsInvalidType() {
-        PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
-        PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken("dummy", "dummy");
-        token.setDetails(new Object());
-        svc.loadUserDetails(token);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testGetUserDetailsInvalidType() {
+		PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				"dummy", "dummy");
+		token.setDetails(new Object());
+		svc.loadUserDetails(token);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testGetUserDetailsNoDetails() {
-        PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
-        PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken("dummy", "dummy");
-        token.setDetails(null);
-        svc.loadUserDetails(token);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testGetUserDetailsNoDetails() {
+		PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				"dummy", "dummy");
+		token.setDetails(null);
+		svc.loadUserDetails(token);
+	}
 
-    @Test
-    public void testGetUserDetailsEmptyAuthorities() {
-        final String userName = "dummyUser";
-        testGetUserDetails(userName, AuthorityUtils.NO_AUTHORITIES);
-    }
+	@Test
+	public void testGetUserDetailsEmptyAuthorities() {
+		final String userName = "dummyUser";
+		testGetUserDetails(userName, AuthorityUtils.NO_AUTHORITIES);
+	}
 
-    @Test
-    public void testGetUserDetailsWithAuthorities() {
-        final String userName = "dummyUser";
-        testGetUserDetails(userName, AuthorityUtils.createAuthorityList("Role1", "Role2"));
-    }
+	@Test
+	public void testGetUserDetailsWithAuthorities() {
+		final String userName = "dummyUser";
+		testGetUserDetails(userName, AuthorityUtils.createAuthorityList("Role1", "Role2"));
+	}
 
-    private void testGetUserDetails(final String userName, final List<GrantedAuthority> gas) {
-        PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
-        PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(userName, "dummy");
-        token.setDetails(new GrantedAuthoritiesContainer() {
-            public Collection<? extends GrantedAuthority> getGrantedAuthorities() {
-                return gas;
-            }
-        });
-        UserDetails ud = svc.loadUserDetails(token);
-        assertTrue(ud.isAccountNonExpired());
-        assertTrue(ud.isAccountNonLocked());
-        assertTrue(ud.isCredentialsNonExpired());
-        assertTrue(ud.isEnabled());
-        assertEquals(ud.getUsername(), userName);
+	private void testGetUserDetails(final String userName,
+			final List<GrantedAuthority> gas) {
+		PreAuthenticatedGrantedAuthoritiesUserDetailsService svc = new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
+		PreAuthenticatedAuthenticationToken token = new PreAuthenticatedAuthenticationToken(
+				userName, "dummy");
+		token.setDetails(new GrantedAuthoritiesContainer() {
+			public Collection<? extends GrantedAuthority> getGrantedAuthorities() {
+				return gas;
+			}
+		});
+		UserDetails ud = svc.loadUserDetails(token);
+		assertTrue(ud.isAccountNonExpired());
+		assertTrue(ud.isAccountNonLocked());
+		assertTrue(ud.isCredentialsNonExpired());
+		assertTrue(ud.isEnabled());
+		assertEquals(ud.getUsername(), userName);
 
-        //Password is not saved by
-        // PreAuthenticatedGrantedAuthoritiesUserDetailsService
-        //assertEquals(ud.getPassword(),password);
+		// Password is not saved by
+		// PreAuthenticatedGrantedAuthoritiesUserDetailsService
+		// assertEquals(ud.getPassword(),password);
 
-        assertTrue("GrantedAuthority collections do not match; result: " + ud.getAuthorities() + ", expected: " + gas,
-                gas.containsAll(ud.getAuthorities()) && ud.getAuthorities().containsAll(gas));
-    }
+		assertTrue(
+				"GrantedAuthority collections do not match; result: "
+						+ ud.getAuthorities() + ", expected: " + gas,
+				gas.containsAll(ud.getAuthorities())
+						&& ud.getAuthorities().containsAll(gas));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java
index 8b4fa7a870..3942f97b92 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java
@@ -17,35 +17,37 @@ import java.util.Set;
  * @author TSARDD
  */
 public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests {
-    List<GrantedAuthority> gas = AuthorityUtils.createAuthorityList("Role1", "Role2");
+	List<GrantedAuthority> gas = AuthorityUtils.createAuthorityList("Role1", "Role2");
 
-    @Test
-    public void testToString() {
-        PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
-                getRequest("testUser", new String[] {}), gas);
-        String toString = details.toString();
-        assertTrue("toString should contain Role1", toString.contains("Role1"));
-        assertTrue("toString should contain Role2", toString.contains("Role2"));
-    }
+	@Test
+	public void testToString() {
+		PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
+				getRequest("testUser", new String[] {}), gas);
+		String toString = details.toString();
+		assertTrue("toString should contain Role1", toString.contains("Role1"));
+		assertTrue("toString should contain Role2", toString.contains("Role2"));
+	}
 
-    @Test
-    public void testGetSetPreAuthenticatedGrantedAuthorities() {
-        PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
-                getRequest("testUser", new String[] {}), gas);
-        List<GrantedAuthority> returnedGas = details.getGrantedAuthorities();
-        assertTrue("Collections do not contain same elements; expected: " + gas + ", returned: " + returnedGas,
-                gas.containsAll(returnedGas) && returnedGas.containsAll(gas));
-    }
+	@Test
+	public void testGetSetPreAuthenticatedGrantedAuthorities() {
+		PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = new PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails(
+				getRequest("testUser", new String[] {}), gas);
+		List<GrantedAuthority> returnedGas = details.getGrantedAuthorities();
+		assertTrue("Collections do not contain same elements; expected: " + gas
+				+ ", returned: " + returnedGas, gas.containsAll(returnedGas)
+				&& returnedGas.containsAll(gas));
+	}
 
-    private HttpServletRequest getRequest(final String userName,final String[] aRoles) {
-        MockHttpServletRequest req = new MockHttpServletRequest() {
-            private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
-            public boolean isUserInRole(String arg0) {
-                return roles.contains(arg0);
-            }
-        };
-        req.setRemoteUser(userName);
-        return req;
-    }
+	private HttpServletRequest getRequest(final String userName, final String[] aRoles) {
+		MockHttpServletRequest req = new MockHttpServletRequest() {
+			private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
+
+			public boolean isUserInRole(String arg0) {
+				return roles.contains(arg0);
+			}
+		};
+		req.setRemoteUser(userName);
+		return req;
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java
index 722f268a5a..136ebf72b6 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderAuthenticationFilterTests.java
@@ -24,122 +24,131 @@ import org.springframework.security.web.authentication.preauth.RequestHeaderAuth
  */
 public class RequestHeaderAuthenticationFilterTests {
 
-    @After
-    @Before
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	@Before
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = PreAuthenticatedCredentialsNotFoundException.class)
-    public void rejectsMissingHeader() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+	@Test(expected = PreAuthenticatedCredentialsNotFoundException.class)
+	public void rejectsMissingHeader() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
 
-        filter.doFilter(request, response, chain);
-    }
+		filter.doFilter(request, response, chain);
+	}
 
-    @Test
-    public void defaultsToUsingSiteminderHeader() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("SM_USER", "cat");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
+	@Test
+	public void defaultsToUsingSiteminderHeader() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("SM_USER", "cat");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
 
-        filter.doFilter(request, response, chain);
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("cat", SecurityContextHolder.getContext().getAuthentication().getName());
-        assertEquals("N/A", SecurityContextHolder.getContext().getAuthentication().getCredentials());
-    }
+		filter.doFilter(request, response, chain);
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("cat", SecurityContextHolder.getContext().getAuthentication()
+				.getName());
+		assertEquals("N/A", SecurityContextHolder.getContext().getAuthentication()
+				.getCredentials());
+	}
 
-    @Test
-    public void alternativeHeaderNameIsSupported() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("myUsernameHeader", "wolfman");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        filter.setPrincipalRequestHeader("myUsernameHeader");
+	@Test
+	public void alternativeHeaderNameIsSupported() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("myUsernameHeader", "wolfman");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		filter.setPrincipalRequestHeader("myUsernameHeader");
 
-        filter.doFilter(request, response, chain);
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("wolfman", SecurityContextHolder.getContext().getAuthentication().getName());
-    }
+		filter.doFilter(request, response, chain);
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("wolfman", SecurityContextHolder.getContext().getAuthentication()
+				.getName());
+	}
 
-    @Test
-    public void credentialsAreRetrievedIfHeaderNameIsSet() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        filter.setCredentialsRequestHeader("myCredentialsHeader");
-        request.addHeader("SM_USER", "cat");
-        request.addHeader("myCredentialsHeader", "catspassword");
+	@Test
+	public void credentialsAreRetrievedIfHeaderNameIsSet() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		filter.setCredentialsRequestHeader("myCredentialsHeader");
+		request.addHeader("SM_USER", "cat");
+		request.addHeader("myCredentialsHeader", "catspassword");
 
-        filter.doFilter(request, response, chain);
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals("catspassword", SecurityContextHolder.getContext().getAuthentication().getCredentials());
-    }
+		filter.doFilter(request, response, chain);
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals("catspassword", SecurityContextHolder.getContext()
+				.getAuthentication().getCredentials());
+	}
 
-    @Test
-    public void userIsReauthenticatedIfPrincipalChangesAndCheckForPrincipalChangesIsSet() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
-        filter.setCheckForPrincipalChanges(true);
-        request.addHeader("SM_USER", "cat");
-        filter.doFilter(request, response, new MockFilterChain());
-        request = new MockHttpServletRequest();
-        request.addHeader("SM_USER", "dog");
-        filter.doFilter(request, response, new MockFilterChain());
-        Authentication dog = SecurityContextHolder.getContext().getAuthentication();
-        assertNotNull(dog);
-        assertEquals("dog", dog.getName());
-        // Make sure authentication doesn't occur every time (i.e. if the header *doesn't change)
-        filter.setAuthenticationManager(mock(AuthenticationManager.class));
-        filter.doFilter(request, response, new MockFilterChain());
-        assertSame(dog, SecurityContextHolder.getContext().getAuthentication());
-    }
+	@Test
+	public void userIsReauthenticatedIfPrincipalChangesAndCheckForPrincipalChangesIsSet()
+			throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
+		filter.setCheckForPrincipalChanges(true);
+		request.addHeader("SM_USER", "cat");
+		filter.doFilter(request, response, new MockFilterChain());
+		request = new MockHttpServletRequest();
+		request.addHeader("SM_USER", "dog");
+		filter.doFilter(request, response, new MockFilterChain());
+		Authentication dog = SecurityContextHolder.getContext().getAuthentication();
+		assertNotNull(dog);
+		assertEquals("dog", dog.getName());
+		// Make sure authentication doesn't occur every time (i.e. if the header *doesn't
+		// change)
+		filter.setAuthenticationManager(mock(AuthenticationManager.class));
+		filter.doFilter(request, response, new MockFilterChain());
+		assertSame(dog, SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test(expected=PreAuthenticatedCredentialsNotFoundException.class)
-    public void missingHeaderCausesException() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setAuthenticationManager(createAuthenticationManager());
+	@Test(expected = PreAuthenticatedCredentialsNotFoundException.class)
+	public void missingHeaderCausesException() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setAuthenticationManager(createAuthenticationManager());
 
-        filter.doFilter(request, response, chain);
-    }
+		filter.doFilter(request, response, chain);
+	}
 
-    @Test
-    public void missingHeaderIsIgnoredIfExceptionIfHeaderMissingIsFalse() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain chain = new MockFilterChain();
-        RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
-        filter.setExceptionIfHeaderMissing(false);
-        filter.setAuthenticationManager(createAuthenticationManager());
-        filter.doFilter(request, response, chain);
-    }
+	@Test
+	public void missingHeaderIsIgnoredIfExceptionIfHeaderMissingIsFalse()
+			throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain chain = new MockFilterChain();
+		RequestHeaderAuthenticationFilter filter = new RequestHeaderAuthenticationFilter();
+		filter.setExceptionIfHeaderMissing(false);
+		filter.setAuthenticationManager(createAuthenticationManager());
+		filter.doFilter(request, response, chain);
+	}
 
-    /**
-     * Create an authentication manager which returns the passed in object.
-     */
-    private AuthenticationManager createAuthenticationManager() {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenAnswer(new Answer<Authentication>() {
-            public Authentication answer(InvocationOnMock invocation) throws Throwable {
-                return (Authentication) invocation.getArguments()[0];
-            }
-        });
+	/**
+	 * Create an authentication manager which returns the passed in object.
+	 */
+	private AuthenticationManager createAuthenticationManager() {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenAnswer(
+				new Answer<Authentication>() {
+					public Authentication answer(InvocationOnMock invocation)
+							throws Throwable {
+						return (Authentication) invocation.getArguments()[0];
+					}
+				});
 
-        return am;
-    }
+		return am;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
index ed57ac4d0f..c4daf00b11 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java
@@ -22,126 +22,135 @@ import org.springframework.security.web.authentication.preauth.PreAuthenticatedG
  *
  * @author TSARDD
  */
-public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests extends TestCase {
+public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests extends
+		TestCase {
 
-    public final void testAfterPropertiesSetException() {
-        J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource t = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
-        try {
-            t.afterPropertiesSet();
-            fail("AfterPropertiesSet didn't throw expected exception");
-        } catch (IllegalArgumentException expected) {
-        } catch (Exception unexpected) {
-            fail("AfterPropertiesSet throws unexpected exception");
-        }
-    }
+	public final void testAfterPropertiesSetException() {
+		J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource t = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
+		try {
+			t.afterPropertiesSet();
+			fail("AfterPropertiesSet didn't throw expected exception");
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		catch (Exception unexpected) {
+			fail("AfterPropertiesSet throws unexpected exception");
+		}
+	}
 
-    public final void testBuildDetailsHttpServletRequestNoMappedNoUserRoles() {
-        String[] mappedRoles = new String[] {};
-        String[] roles = new String[] {};
-        String[] expectedRoles = new String[] {};
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestNoMappedNoUserRoles() {
+		String[] mappedRoles = new String[] {};
+		String[] roles = new String[] {};
+		String[] expectedRoles = new String[] {};
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestNoMappedUnmappedUserRoles() {
-        String[] mappedRoles = new String[] {};
-        String[] roles = new String[] { "Role1", "Role2" };
-        String[] expectedRoles = new String[] {};
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestNoMappedUnmappedUserRoles() {
+		String[] mappedRoles = new String[] {};
+		String[] roles = new String[] { "Role1", "Role2" };
+		String[] expectedRoles = new String[] {};
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestNoUserRoles() {
-        String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] roles = new String[] {};
-        String[] expectedRoles = new String[] {};
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestNoUserRoles() {
+		String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] roles = new String[] {};
+		String[] expectedRoles = new String[] {};
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestAllUserRoles() {
-        String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] roles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] expectedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestAllUserRoles() {
+		String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] roles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] expectedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestUnmappedUserRoles() {
-        String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] roles = new String[] { "Role1", "Role2", "Role3", "Role4", "Role5" };
-        String[] expectedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestUnmappedUserRoles() {
+		String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] roles = new String[] { "Role1", "Role2", "Role3", "Role4", "Role5" };
+		String[] expectedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestPartialUserRoles() {
-        String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] roles = new String[] { "Role2", "Role3" };
-        String[] expectedRoles = new String[] { "Role2", "Role3" };
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestPartialUserRoles() {
+		String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] roles = new String[] { "Role2", "Role3" };
+		String[] expectedRoles = new String[] { "Role2", "Role3" };
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    public final void testBuildDetailsHttpServletRequestPartialAndUnmappedUserRoles() {
-        String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
-        String[] roles = new String[] { "Role2", "Role3", "Role5" };
-        String[] expectedRoles = new String[] { "Role2", "Role3" };
-        testDetails(mappedRoles, roles, expectedRoles);
-    }
+	public final void testBuildDetailsHttpServletRequestPartialAndUnmappedUserRoles() {
+		String[] mappedRoles = new String[] { "Role1", "Role2", "Role3", "Role4" };
+		String[] roles = new String[] { "Role2", "Role3", "Role5" };
+		String[] expectedRoles = new String[] { "Role2", "Role3" };
+		testDetails(mappedRoles, roles, expectedRoles);
+	}
 
-    private void testDetails(String[] mappedRoles, String[] userRoles, String[] expectedRoles) {
-        J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource src = getJ2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(mappedRoles);
-        Object o = src.buildDetails(getRequest("testUser", userRoles));
-        assertNotNull(o);
-        assertTrue("Returned object not of type PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails, actual type: " + o.getClass(),
-                o instanceof PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails);
-        PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = (PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails) o;
-        List<GrantedAuthority> gas = details.getGrantedAuthorities();
-        assertNotNull("Granted authorities should not be null", gas);
-        assertEquals(expectedRoles.length, gas.size());
+	private void testDetails(String[] mappedRoles, String[] userRoles,
+			String[] expectedRoles) {
+		J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource src = getJ2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(mappedRoles);
+		Object o = src.buildDetails(getRequest("testUser", userRoles));
+		assertNotNull(o);
+		assertTrue(
+				"Returned object not of type PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails, actual type: "
+						+ o.getClass(),
+				o instanceof PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails);
+		PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails details = (PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails) o;
+		List<GrantedAuthority> gas = details.getGrantedAuthorities();
+		assertNotNull("Granted authorities should not be null", gas);
+		assertEquals(expectedRoles.length, gas.size());
 
-        Collection<String> expectedRolesColl = Arrays.asList(expectedRoles);
-        Collection<String> gasRolesSet = new HashSet<String>();
-        for (int i = 0; i < gas.size(); i++) {
-            gasRolesSet.add(gas.get(i).getAuthority());
-        }
-        assertTrue("Granted Authorities do not match expected roles", expectedRolesColl.containsAll(gasRolesSet)
-                && gasRolesSet.containsAll(expectedRolesColl));
-    }
+		Collection<String> expectedRolesColl = Arrays.asList(expectedRoles);
+		Collection<String> gasRolesSet = new HashSet<String>();
+		for (int i = 0; i < gas.size(); i++) {
+			gasRolesSet.add(gas.get(i).getAuthority());
+		}
+		assertTrue(
+				"Granted Authorities do not match expected roles",
+				expectedRolesColl.containsAll(gasRolesSet)
+						&& gasRolesSet.containsAll(expectedRolesColl));
+	}
 
-    private J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource getJ2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(
-            String[] mappedRoles) {
-        J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource result = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
-        result.setMappableRolesRetriever(getMappableRolesRetriever(mappedRoles));
-        result.setUserRoles2GrantedAuthoritiesMapper(getJ2eeUserRoles2GrantedAuthoritiesMapper());
+	private J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource getJ2eeBasedPreAuthenticatedWebAuthenticationDetailsSource(
+			String[] mappedRoles) {
+		J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource result = new J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource();
+		result.setMappableRolesRetriever(getMappableRolesRetriever(mappedRoles));
+		result.setUserRoles2GrantedAuthoritiesMapper(getJ2eeUserRoles2GrantedAuthoritiesMapper());
 
-        try {
-            result.afterPropertiesSet();
-        } catch (Exception expected) {
-            fail("AfterPropertiesSet throws unexpected exception");
-        }
-        return result;
-    }
+		try {
+			result.afterPropertiesSet();
+		}
+		catch (Exception expected) {
+			fail("AfterPropertiesSet throws unexpected exception");
+		}
+		return result;
+	}
 
-    private MappableAttributesRetriever getMappableRolesRetriever(String[] mappedRoles) {
-        SimpleMappableAttributesRetriever result = new SimpleMappableAttributesRetriever();
-        result.setMappableAttributes(new HashSet<String>(Arrays.asList(mappedRoles)));
-        return result;
-    }
+	private MappableAttributesRetriever getMappableRolesRetriever(String[] mappedRoles) {
+		SimpleMappableAttributesRetriever result = new SimpleMappableAttributesRetriever();
+		result.setMappableAttributes(new HashSet<String>(Arrays.asList(mappedRoles)));
+		return result;
+	}
 
-    private Attributes2GrantedAuthoritiesMapper getJ2eeUserRoles2GrantedAuthoritiesMapper() {
-        SimpleAttributes2GrantedAuthoritiesMapper result = new SimpleAttributes2GrantedAuthoritiesMapper();
-        result.setAddPrefixIfAlreadyExisting(false);
-        result.setConvertAttributeToLowerCase(false);
-        result.setConvertAttributeToUpperCase(false);
-        result.setAttributePrefix("");
-        return result;
-    }
+	private Attributes2GrantedAuthoritiesMapper getJ2eeUserRoles2GrantedAuthoritiesMapper() {
+		SimpleAttributes2GrantedAuthoritiesMapper result = new SimpleAttributes2GrantedAuthoritiesMapper();
+		result.setAddPrefixIfAlreadyExisting(false);
+		result.setConvertAttributeToLowerCase(false);
+		result.setConvertAttributeToUpperCase(false);
+		result.setAttributePrefix("");
+		return result;
+	}
 
-    private HttpServletRequest getRequest(final String userName,final String[] aRoles)
-    {
-        MockHttpServletRequest req = new MockHttpServletRequest() {
-            private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
-            public boolean isUserInRole(String arg0) {
-                return roles.contains(arg0);
-            }
-        };
-        req.setRemoteUser(userName);
-        return req;
-    }
+	private HttpServletRequest getRequest(final String userName, final String[] aRoles) {
+		MockHttpServletRequest req = new MockHttpServletRequest() {
+			private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
+
+			public boolean isUserInRole(String arg0) {
+				return roles.contains(arg0);
+			}
+		};
+		req.setRemoteUser(userName);
+		return req;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java
index a7d1bcb9fe..ed73479c0b 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java
@@ -19,32 +19,36 @@ import org.springframework.security.web.authentication.preauth.j2ee.J2eePreAuthe
  */
 public class J2eePreAuthenticatedProcessingFilterTests extends TestCase {
 
-    public final void testGetPreAuthenticatedPrincipal() {
-        String user = "testUser";
-        assertEquals(user, new J2eePreAuthenticatedProcessingFilter().getPreAuthenticatedPrincipal(
-            getRequest(user,new String[] {})));
-    }
+	public final void testGetPreAuthenticatedPrincipal() {
+		String user = "testUser";
+		assertEquals(user,
+				new J2eePreAuthenticatedProcessingFilter()
+						.getPreAuthenticatedPrincipal(getRequest(user, new String[] {})));
+	}
 
-    public final void testGetPreAuthenticatedCredentials() {
-        assertEquals("N/A", new J2eePreAuthenticatedProcessingFilter().getPreAuthenticatedCredentials(
-            getRequest("testUser", new String[] {})));
-    }
+	public final void testGetPreAuthenticatedCredentials() {
+		assertEquals("N/A",
+				new J2eePreAuthenticatedProcessingFilter()
+						.getPreAuthenticatedCredentials(getRequest("testUser",
+								new String[] {})));
+	}
 
-    private final HttpServletRequest getRequest(final String aUserName,final String[] aRoles)
-    {
-        MockHttpServletRequest req = new MockHttpServletRequest() {
-            private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
-            public boolean isUserInRole(String arg0) {
-                return roles.contains(arg0);
-            }
-        };
-        req.setRemoteUser(aUserName);
-        req.setUserPrincipal(new Principal() {
-            public String getName() {
-                return aUserName;
-            }
-        });
-        return req;
-    }
+	private final HttpServletRequest getRequest(final String aUserName,
+			final String[] aRoles) {
+		MockHttpServletRequest req = new MockHttpServletRequest() {
+			private Set<String> roles = new HashSet<String>(Arrays.asList(aRoles));
+
+			public boolean isUserInRole(String arg0) {
+				return roles.contains(arg0);
+			}
+		};
+		req.setRemoteUser(aUserName);
+		req.setUserPrincipal(new Principal() {
+			public String getName() {
+				return aUserName;
+			}
+		});
+		return req;
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java
index c97813aeef..4f0658cdd6 100755
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlJ2eeDefinedRolesRetrieverTests.java
@@ -13,46 +13,50 @@ import org.springframework.core.io.ResourceLoader;
 
 public class WebXmlJ2eeDefinedRolesRetrieverTests {
 
-    @Test
-    public void testRole1To4Roles() throws Exception {
-        List<String> ROLE1TO4_EXPECTED_ROLES = Arrays.asList(new String[] { "Role1", "Role2", "Role3", "Role4" });
-        final Resource webXml = new ClassPathResource("webxml/Role1-4.web.xml");
-        WebXmlMappableAttributesRetriever rolesRetriever = new WebXmlMappableAttributesRetriever();
+	@Test
+	public void testRole1To4Roles() throws Exception {
+		List<String> ROLE1TO4_EXPECTED_ROLES = Arrays.asList(new String[] { "Role1",
+				"Role2", "Role3", "Role4" });
+		final Resource webXml = new ClassPathResource("webxml/Role1-4.web.xml");
+		WebXmlMappableAttributesRetriever rolesRetriever = new WebXmlMappableAttributesRetriever();
 
-        rolesRetriever.setResourceLoader(new ResourceLoader() {
-            public ClassLoader getClassLoader() {
-                return Thread.currentThread().getContextClassLoader();
-            }
+		rolesRetriever.setResourceLoader(new ResourceLoader() {
+			public ClassLoader getClassLoader() {
+				return Thread.currentThread().getContextClassLoader();
+			}
 
-            public Resource getResource(String location) {
-                return webXml;
-            }
-        });
+			public Resource getResource(String location) {
+				return webXml;
+			}
+		});
 
-        rolesRetriever.afterPropertiesSet();
-        Set<String> j2eeRoles = rolesRetriever.getMappableAttributes();
-        assertNotNull(j2eeRoles);
-        assertTrue("J2eeRoles expected size: " + ROLE1TO4_EXPECTED_ROLES.size() + ", actual size: " + j2eeRoles.size(),
-                j2eeRoles.size() == ROLE1TO4_EXPECTED_ROLES.size());
-        assertTrue("J2eeRoles expected contents (arbitrary order): " + ROLE1TO4_EXPECTED_ROLES + ", actual content: " + j2eeRoles,
-                j2eeRoles.containsAll(ROLE1TO4_EXPECTED_ROLES));
-    }
+		rolesRetriever.afterPropertiesSet();
+		Set<String> j2eeRoles = rolesRetriever.getMappableAttributes();
+		assertNotNull(j2eeRoles);
+		assertTrue("J2eeRoles expected size: " + ROLE1TO4_EXPECTED_ROLES.size()
+				+ ", actual size: " + j2eeRoles.size(),
+				j2eeRoles.size() == ROLE1TO4_EXPECTED_ROLES.size());
+		assertTrue("J2eeRoles expected contents (arbitrary order): "
+				+ ROLE1TO4_EXPECTED_ROLES + ", actual content: " + j2eeRoles,
+				j2eeRoles.containsAll(ROLE1TO4_EXPECTED_ROLES));
+	}
 
-    @Test
-    public void testGetZeroJ2eeRoles() throws Exception {
-        final Resource webXml = new ClassPathResource("webxml/NoRoles.web.xml");
-        WebXmlMappableAttributesRetriever rolesRetriever = new WebXmlMappableAttributesRetriever();
-        rolesRetriever.setResourceLoader(new ResourceLoader() {
-            public ClassLoader getClassLoader() {
-                return Thread.currentThread().getContextClassLoader();
-            }
+	@Test
+	public void testGetZeroJ2eeRoles() throws Exception {
+		final Resource webXml = new ClassPathResource("webxml/NoRoles.web.xml");
+		WebXmlMappableAttributesRetriever rolesRetriever = new WebXmlMappableAttributesRetriever();
+		rolesRetriever.setResourceLoader(new ResourceLoader() {
+			public ClassLoader getClassLoader() {
+				return Thread.currentThread().getContextClassLoader();
+			}
 
-            public Resource getResource(String location) {
-                return webXml;
-            }
-        });
-        rolesRetriever.afterPropertiesSet();
-        Set<String> j2eeRoles = rolesRetriever.getMappableAttributes();
-        assertEquals("J2eeRoles expected size: 0, actual size: " + j2eeRoles.size(), 0, j2eeRoles.size());
-    }
+			public Resource getResource(String location) {
+				return webXml;
+			}
+		});
+		rolesRetriever.afterPropertiesSet();
+		Set<String> j2eeRoles = rolesRetriever.getMappableAttributes();
+		assertEquals("J2eeRoles expected size: 0, actual size: " + j2eeRoles.size(), 0,
+				j2eeRoles.size());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java
index 9d72d6c678..58d0000f51 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/websphere/WebSpherePreAuthenticatedProcessingFilterTests.java
@@ -22,35 +22,40 @@ import javax.servlet.FilterChain;
  */
 public class WebSpherePreAuthenticatedProcessingFilterTests {
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void principalsAndCredentialsAreExtractedCorrectly() throws Exception {
-        new WebSpherePreAuthenticatedProcessingFilter();
-        WASUsernameAndGroupsExtractor helper = mock(WASUsernameAndGroupsExtractor.class);
-        when(helper.getCurrentUserName()).thenReturn("jerry");
-        WebSpherePreAuthenticatedProcessingFilter filter = new WebSpherePreAuthenticatedProcessingFilter(helper);
-        assertEquals("jerry", filter.getPreAuthenticatedPrincipal(new MockHttpServletRequest()));
-        assertEquals("N/A", filter.getPreAuthenticatedCredentials(new MockHttpServletRequest()));
+	@Test
+	public void principalsAndCredentialsAreExtractedCorrectly() throws Exception {
+		new WebSpherePreAuthenticatedProcessingFilter();
+		WASUsernameAndGroupsExtractor helper = mock(WASUsernameAndGroupsExtractor.class);
+		when(helper.getCurrentUserName()).thenReturn("jerry");
+		WebSpherePreAuthenticatedProcessingFilter filter = new WebSpherePreAuthenticatedProcessingFilter(
+				helper);
+		assertEquals("jerry",
+				filter.getPreAuthenticatedPrincipal(new MockHttpServletRequest()));
+		assertEquals("N/A",
+				filter.getPreAuthenticatedCredentials(new MockHttpServletRequest()));
 
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenAnswer(new Answer<Authentication>() {
-            public Authentication answer(InvocationOnMock invocation) throws Throwable {
-                return (Authentication) invocation.getArguments()[0];
-            }
-        });
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenAnswer(
+				new Answer<Authentication>() {
+					public Authentication answer(InvocationOnMock invocation)
+							throws Throwable {
+						return (Authentication) invocation.getArguments()[0];
+					}
+				});
 
-        filter.setAuthenticationManager(am);
-        WebSpherePreAuthenticatedWebAuthenticationDetailsSource ads =
-                new WebSpherePreAuthenticatedWebAuthenticationDetailsSource(helper);
-        ads.setWebSphereGroups2GrantedAuthoritiesMapper(new SimpleAttributes2GrantedAuthoritiesMapper());
-        filter.setAuthenticationDetailsSource(ads);
-
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), mock(FilterChain.class));
-    }
+		filter.setAuthenticationManager(am);
+		WebSpherePreAuthenticatedWebAuthenticationDetailsSource ads = new WebSpherePreAuthenticatedWebAuthenticationDetailsSource(
+				helper);
+		ads.setWebSphereGroups2GrantedAuthoritiesMapper(new SimpleAttributes2GrantedAuthoritiesMapper());
+		filter.setAuthenticationDetailsSource(ads);
 
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				mock(FilterChain.class));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java
index 2a444885ae..bdc832a6c1 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/SubjectDnX509PrincipalExtractorTests.java
@@ -13,41 +13,44 @@ import static junit.framework.Assert.*;
  * @author Luke Taylor
  */
 public class SubjectDnX509PrincipalExtractorTests {
-    SubjectDnX509PrincipalExtractor extractor;
+	SubjectDnX509PrincipalExtractor extractor;
 
-    @Before
-    public void setUp() {
-        extractor = new SubjectDnX509PrincipalExtractor();
-        extractor.setMessageSource(new SpringSecurityMessageSource());
-    }
+	@Before
+	public void setUp() {
+		extractor = new SubjectDnX509PrincipalExtractor();
+		extractor.setMessageSource(new SpringSecurityMessageSource());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void invalidRegexFails() throws Exception {
-        extractor.setSubjectDnRegex("CN=(.*?,"); // missing closing bracket on group
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidRegexFails() throws Exception {
+		extractor.setSubjectDnRegex("CN=(.*?,"); // missing closing bracket on group
+	}
 
-    @Test
-    public void defaultCNPatternReturnsExcpectedPrincipal() throws Exception {
-        Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificate());
-        assertEquals("Luke Taylor", principal);
-    }
+	@Test
+	public void defaultCNPatternReturnsExcpectedPrincipal() throws Exception {
+		Object principal = extractor.extractPrincipal(X509TestUtils
+				.buildTestCertificate());
+		assertEquals("Luke Taylor", principal);
+	}
 
-    @Test
-    public void matchOnEmailReturnsExpectedPrincipal() throws Exception {
-        extractor.setSubjectDnRegex("emailAddress=(.*?),");
-        Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificate());
-        assertEquals("luke@monkeymachine", principal);
-    }
+	@Test
+	public void matchOnEmailReturnsExpectedPrincipal() throws Exception {
+		extractor.setSubjectDnRegex("emailAddress=(.*?),");
+		Object principal = extractor.extractPrincipal(X509TestUtils
+				.buildTestCertificate());
+		assertEquals("luke@monkeymachine", principal);
+	}
 
-    @Test(expected = BadCredentialsException.class)
-    public void matchOnShoeSizeThrowsBadCredentials() throws Exception {
-        extractor.setSubjectDnRegex("shoeSize=(.*?),");
-        extractor.extractPrincipal(X509TestUtils.buildTestCertificate());
-    }
+	@Test(expected = BadCredentialsException.class)
+	public void matchOnShoeSizeThrowsBadCredentials() throws Exception {
+		extractor.setSubjectDnRegex("shoeSize=(.*?),");
+		extractor.extractPrincipal(X509TestUtils.buildTestCertificate());
+	}
 
-    @Test
-    public void defaultCNPatternReturnsPrincipalAtEndOfDNString() throws Exception {
-        Object principal = extractor.extractPrincipal(X509TestUtils.buildTestCertificateWithCnAtEnd());
-        assertEquals("Duke", principal);
-    }
+	@Test
+	public void defaultCNPatternReturnsPrincipalAtEndOfDNString() throws Exception {
+		Object principal = extractor.extractPrincipal(X509TestUtils
+				.buildTestCertificateWithCnAtEnd());
+		assertEquals("Duke", principal);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java
index 18a2472d76..e5b6e4782e 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/x509/X509TestUtils.java
@@ -20,119 +20,121 @@ import java.io.ByteArrayInputStream;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
-
 /**
  * Certificate creation utility for use in X.509 tests.
  *
  * @author Luke Taylor
  */
 public class X509TestUtils {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * Builds an X.509 certificate. In human-readable form it is:
-     * <pre>
-     * Certificate:
-     *  Data:
-     *    Version: 3 (0x2)
-     *    Serial Number: 1 (0x1)
-     *    Signature Algorithm: sha1WithRSAEncryption
-     *    Issuer: CN=Monkey Machine CA, C=UK, ST=Scotland, L=Glasgow,
-     *      O=monkeymachine.co.uk/emailAddress=ca@monkeymachine
-     *    Validity
-     *      Not Before: Mar  6 23:28:22 2005 GMT
-     *      Not After : Mar  6 23:28:22 2006 GMT
-     *    Subject: C=UK, ST=Scotland, L=Glasgow, O=Monkey Machine Ltd,
-     *      OU=Open Source Development Lab., CN=Luke Taylor/emailAddress=luke@monkeymachine
-     *    Subject Public Key Info:
-     *      Public Key Algorithm: rsaEncryption
-     *      RSA Public Key: (512 bit)
-     *          [omitted]
-     *    X509v3 extensions:
-     *      X509v3 Basic Constraints:
-     *      CA:FALSE
-     *      Netscape Cert Type:
-     *      SSL Client
-     *      X509v3 Key Usage:
-     *      Digital Signature, Non Repudiation, Key Encipherment
-     *      X509v3 Subject Key Identifier:
-     *      6E:E6:5B:57:33:CF:0E:2F:15:C2:F4:DF:EC:14:BE:FB:CF:54:56:3C
-     *      X509v3 Authority Key Identifier:
-     *      keyid:AB:78:EC:AF:10:1B:8A:9B:1F:C7:B1:25:8F:16:28:F2:17:9A:AD:36
-     *      DirName:/CN=Monkey Machine CA/C=UK/ST=Scotland/L=Glasgow/O=monkeymachine.co.uk/emailAddress=ca@monkeymachine
-     *      serial:00
-     *      Netscape CA Revocation Url:
-     *      https://monkeymachine.co.uk/ca-crl.pem
-     *  Signature Algorithm: sha1WithRSAEncryption
-     *             [signature omitted]
-     * </pre>
-     */
-    public static X509Certificate buildTestCertificate() throws Exception {
-        String cert = "-----BEGIN CERTIFICATE-----\n"
-            + "MIIEQTCCAymgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBkzEaMBgGA1UEAxMRTW9u\n"
-            + "a2V5IE1hY2hpbmUgQ0ExCzAJBgNVBAYTAlVLMREwDwYDVQQIEwhTY290bGFuZDEQ\n"
-            + "MA4GA1UEBxMHR2xhc2dvdzEcMBoGA1UEChMTbW9ua2V5bWFjaGluZS5jby51azEl\n"
-            + "MCMGCSqGSIb3DQEJARYWY2FAbW9ua2V5bWFjaGluZS5jby51azAeFw0wNTAzMDYy\n"
-            + "MzI4MjJaFw0wNjAzMDYyMzI4MjJaMIGvMQswCQYDVQQGEwJVSzERMA8GA1UECBMI\n"
-            + "U2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxGzAZBgNVBAoTEk1vbmtleSBNYWNo\n"
-            + "aW5lIEx0ZDElMCMGA1UECxMcT3BlbiBTb3VyY2UgRGV2ZWxvcG1lbnQgTGFiLjEU\n"
-            + "MBIGA1UEAxMLTHVrZSBUYXlsb3IxITAfBgkqhkiG9w0BCQEWEmx1a2VAbW9ua2V5\n"
-            + "bWFjaGluZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDItxZr07mm65ttYH7RMaVo\n"
-            + "VeMCq4ptfn+GFFEk4+54OkDuh1CHlk87gEc1jx3ZpQPJRTJx31z3YkiAcP+RDzxr\n"
-            + "AgMBAAGjggFIMIIBRDAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIHgDALBgNV\n"
-            + "HQ8EBAMCBeAwHQYDVR0OBBYEFG7mW1czzw4vFcL03+wUvvvPVFY8MIHABgNVHSME\n"
-            + "gbgwgbWAFKt47K8QG4qbH8exJY8WKPIXmq02oYGZpIGWMIGTMRowGAYDVQQDExFN\n"
-            + "b25rZXkgTWFjaGluZSBDQTELMAkGA1UEBhMCVUsxETAPBgNVBAgTCFNjb3RsYW5k\n"
-            + "MRAwDgYDVQQHEwdHbGFzZ293MRwwGgYDVQQKExNtb25rZXltYWNoaW5lLmNvLnVr\n"
-            + "MSUwIwYJKoZIhvcNAQkBFhZjYUBtb25rZXltYWNoaW5lLmNvLnVrggEAMDUGCWCG\n"
-            + "SAGG+EIBBAQoFiZodHRwczovL21vbmtleW1hY2hpbmUuY28udWsvY2EtY3JsLnBl\n"
-            + "bTANBgkqhkiG9w0BAQUFAAOCAQEAZ961bEgm2rOq6QajRLeoljwXDnt0S9BGEWL4\n"
-            + "PMU2FXDog9aaPwfmZ5fwKaSebwH4HckTp11xwe/D9uBZJQ74Uf80UL9z2eo0GaSR\n"
-            + "nRB3QPZfRvop0I4oPvwViKt3puLsi9XSSJ1w9yswnIf89iONT7ZyssPg48Bojo8q\n"
-            + "lcKwXuDRBWciODK/xWhvQbaegGJ1BtXcEHtvNjrUJLwSMDSr+U5oUYdMohG0h1iJ\n"
-            + "R+JQc49I33o2cTc77wfEWLtVdXAyYY4GSJR6VfgvV40x85ItaNS3HHfT/aXU1x4m\n"
-            + "W9YQkWlA6t0blGlC+ghTOY1JbgWnEfXMmVgg9a9cWaYQ+NQwqA==\n" + "-----END CERTIFICATE-----";
+	/**
+	 * Builds an X.509 certificate. In human-readable form it is:
+	 * 
+	 * <pre>
+	 * Certificate:
+	 *  Data:
+	 *    Version: 3 (0x2)
+	 *    Serial Number: 1 (0x1)
+	 *    Signature Algorithm: sha1WithRSAEncryption
+	 *    Issuer: CN=Monkey Machine CA, C=UK, ST=Scotland, L=Glasgow,
+	 *      O=monkeymachine.co.uk/emailAddress=ca@monkeymachine
+	 *    Validity
+	 *      Not Before: Mar  6 23:28:22 2005 GMT
+	 *      Not After : Mar  6 23:28:22 2006 GMT
+	 *    Subject: C=UK, ST=Scotland, L=Glasgow, O=Monkey Machine Ltd,
+	 *      OU=Open Source Development Lab., CN=Luke Taylor/emailAddress=luke@monkeymachine
+	 *    Subject Public Key Info:
+	 *      Public Key Algorithm: rsaEncryption
+	 *      RSA Public Key: (512 bit)
+	 *          [omitted]
+	 *    X509v3 extensions:
+	 *      X509v3 Basic Constraints:
+	 *      CA:FALSE
+	 *      Netscape Cert Type:
+	 *      SSL Client
+	 *      X509v3 Key Usage:
+	 *      Digital Signature, Non Repudiation, Key Encipherment
+	 *      X509v3 Subject Key Identifier:
+	 *      6E:E6:5B:57:33:CF:0E:2F:15:C2:F4:DF:EC:14:BE:FB:CF:54:56:3C
+	 *      X509v3 Authority Key Identifier:
+	 *      keyid:AB:78:EC:AF:10:1B:8A:9B:1F:C7:B1:25:8F:16:28:F2:17:9A:AD:36
+	 *      DirName:/CN=Monkey Machine CA/C=UK/ST=Scotland/L=Glasgow/O=monkeymachine.co.uk/emailAddress=ca@monkeymachine
+	 *      serial:00
+	 *      Netscape CA Revocation Url:
+	 *      https://monkeymachine.co.uk/ca-crl.pem
+	 *  Signature Algorithm: sha1WithRSAEncryption
+	 *             [signature omitted]
+	 * </pre>
+	 */
+	public static X509Certificate buildTestCertificate() throws Exception {
+		String cert = "-----BEGIN CERTIFICATE-----\n"
+				+ "MIIEQTCCAymgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBkzEaMBgGA1UEAxMRTW9u\n"
+				+ "a2V5IE1hY2hpbmUgQ0ExCzAJBgNVBAYTAlVLMREwDwYDVQQIEwhTY290bGFuZDEQ\n"
+				+ "MA4GA1UEBxMHR2xhc2dvdzEcMBoGA1UEChMTbW9ua2V5bWFjaGluZS5jby51azEl\n"
+				+ "MCMGCSqGSIb3DQEJARYWY2FAbW9ua2V5bWFjaGluZS5jby51azAeFw0wNTAzMDYy\n"
+				+ "MzI4MjJaFw0wNjAzMDYyMzI4MjJaMIGvMQswCQYDVQQGEwJVSzERMA8GA1UECBMI\n"
+				+ "U2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxGzAZBgNVBAoTEk1vbmtleSBNYWNo\n"
+				+ "aW5lIEx0ZDElMCMGA1UECxMcT3BlbiBTb3VyY2UgRGV2ZWxvcG1lbnQgTGFiLjEU\n"
+				+ "MBIGA1UEAxMLTHVrZSBUYXlsb3IxITAfBgkqhkiG9w0BCQEWEmx1a2VAbW9ua2V5\n"
+				+ "bWFjaGluZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDItxZr07mm65ttYH7RMaVo\n"
+				+ "VeMCq4ptfn+GFFEk4+54OkDuh1CHlk87gEc1jx3ZpQPJRTJx31z3YkiAcP+RDzxr\n"
+				+ "AgMBAAGjggFIMIIBRDAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIHgDALBgNV\n"
+				+ "HQ8EBAMCBeAwHQYDVR0OBBYEFG7mW1czzw4vFcL03+wUvvvPVFY8MIHABgNVHSME\n"
+				+ "gbgwgbWAFKt47K8QG4qbH8exJY8WKPIXmq02oYGZpIGWMIGTMRowGAYDVQQDExFN\n"
+				+ "b25rZXkgTWFjaGluZSBDQTELMAkGA1UEBhMCVUsxETAPBgNVBAgTCFNjb3RsYW5k\n"
+				+ "MRAwDgYDVQQHEwdHbGFzZ293MRwwGgYDVQQKExNtb25rZXltYWNoaW5lLmNvLnVr\n"
+				+ "MSUwIwYJKoZIhvcNAQkBFhZjYUBtb25rZXltYWNoaW5lLmNvLnVrggEAMDUGCWCG\n"
+				+ "SAGG+EIBBAQoFiZodHRwczovL21vbmtleW1hY2hpbmUuY28udWsvY2EtY3JsLnBl\n"
+				+ "bTANBgkqhkiG9w0BAQUFAAOCAQEAZ961bEgm2rOq6QajRLeoljwXDnt0S9BGEWL4\n"
+				+ "PMU2FXDog9aaPwfmZ5fwKaSebwH4HckTp11xwe/D9uBZJQ74Uf80UL9z2eo0GaSR\n"
+				+ "nRB3QPZfRvop0I4oPvwViKt3puLsi9XSSJ1w9yswnIf89iONT7ZyssPg48Bojo8q\n"
+				+ "lcKwXuDRBWciODK/xWhvQbaegGJ1BtXcEHtvNjrUJLwSMDSr+U5oUYdMohG0h1iJ\n"
+				+ "R+JQc49I33o2cTc77wfEWLtVdXAyYY4GSJR6VfgvV40x85ItaNS3HHfT/aXU1x4m\n"
+				+ "W9YQkWlA6t0blGlC+ghTOY1JbgWnEfXMmVgg9a9cWaYQ+NQwqA==\n"
+				+ "-----END CERTIFICATE-----";
 
-        ByteArrayInputStream in = new ByteArrayInputStream(cert.getBytes());
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+		ByteArrayInputStream in = new ByteArrayInputStream(cert.getBytes());
+		CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        return (X509Certificate) cf.generateCertificate(in);
-    }
+		return (X509Certificate) cf.generateCertificate(in);
+	}
 
-    /**
-     * Builds an X.509 certificate with a subject DN where the CN field is at the end of the line.
-     * The actual DN line is:
-     * <pre>
-     *  L=Cupertino,C=US,ST=CA,OU=Java Software,O=Sun Microsystems\, Inc,CN=Duke
-     * </pre>
-     *
-     */
-    public static X509Certificate buildTestCertificateWithCnAtEnd() throws Exception {
-        String cert = "-----BEGIN CERTIFICATE-----\n" +
-                "MIIDjTCCAnWgAwIBAgIBATALBgkqhkiG9w0BAQswdTENMAsGA1UEAwwERHVrZTEe\n" +
-                "MBwGA1UECgwVU3VuIE1pY3Jvc3lzdGVtcywgSW5jMRYwFAYDVQQLDA1KYXZhIFNv\n" +
-                "ZnR3YXJlMQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxEjAQBgNVBAcMCUN1cGVy\n" +
-                "dGlubzAeFw0xMjA1MTgxNDQ4MzBaFw0xMzA1MTgxNDQ4MzBaMHUxDTALBgNVBAMM\n" +
-                "BER1a2UxHjAcBgNVBAoMFVN1biBNaWNyb3N5c3RlbXMsIEluYzEWMBQGA1UECwwN\n" +
-                "SmF2YSBTb2Z0d2FyZTELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRIwEAYDVQQH\n" +
-                "DAlDdXBlcnRpbm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGLaCx\n" +
-                "Dy5oRJ/FelcoO/lAEApAhR4wxmUIu0guzN0Tx/cuWfyo4349NOxf5XfRcje37B//\n" +
-                "hyMwK1Q/pRhRYtZlK+O+9tNCAupekmSxEw9wNsRXNJ18QTTvQRPReXhG8gOiGmU2\n" +
-                "kpTVjpZURo/0WGuEyAWYzH99cQfUM92vIaGKq2fApNfwCULtFnAY9WPDZtwSZYhC\n" +
-                "qSAoy6B1I2A3i+G5Ep++eCa9PZKCZIPWJiC5+nMmzwCOnQqcZlorsrQ+M+I4GgE2\n" +
-                "Rryb/AeKoSPsrm4t0aWhFhKcuHpk3jfKhJhi5e+5bnY17pCoY9hx5EK3WqfKL/x1\n" +
-                "3HKsPpf/MieRWiAdAgMBAAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8E\n" +
-                "DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAdAtXZYCdb7JKzfwY7vEO\n" +
-                "9TOMyxxwxhxs+26urL2wQWqtRgHXopoi/GGSuZG5aPQcHWLoqZ1f7nZoWfKzJMKw\n" +
-                "MOvaw6wSSkmEoEvdek3s/bH6Gp0spnykqtb+kunGr/XFxyBhHmfdSroEgzspslFh\n" +
-                "Glqe/XfrQmFgPWd13GH8mqzSU1zc+0Ka7s68jcuNfz9ble5rT0IrdjRm5E64mVGk\n" +
-                "aJTAO5N87ks5JjkDHDJzcyYRcIpqBGotJtyZTjGpIeAG8xLGlkSsUg88iUOchI7s\n" +
-                "dOmse9mpgEjCb4kdZ0PnoxMFjsPR8AoGOz4A5vA19nKqWM8bxK9hqLGKsaiQpQg7\n" +
-                "bA==\n" +
-                "-----END CERTIFICATE-----\n";
-        ByteArrayInputStream in = new ByteArrayInputStream(cert.getBytes());
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+	/**
+	 * Builds an X.509 certificate with a subject DN where the CN field is at the end of
+	 * the line. The actual DN line is:
+	 * 
+	 * <pre>
+	 *  L=Cupertino,C=US,ST=CA,OU=Java Software,O=Sun Microsystems\, Inc,CN=Duke
+	 * </pre>
+	 *
+	 */
+	public static X509Certificate buildTestCertificateWithCnAtEnd() throws Exception {
+		String cert = "-----BEGIN CERTIFICATE-----\n"
+				+ "MIIDjTCCAnWgAwIBAgIBATALBgkqhkiG9w0BAQswdTENMAsGA1UEAwwERHVrZTEe\n"
+				+ "MBwGA1UECgwVU3VuIE1pY3Jvc3lzdGVtcywgSW5jMRYwFAYDVQQLDA1KYXZhIFNv\n"
+				+ "ZnR3YXJlMQswCQYDVQQIDAJDQTELMAkGA1UEBhMCVVMxEjAQBgNVBAcMCUN1cGVy\n"
+				+ "dGlubzAeFw0xMjA1MTgxNDQ4MzBaFw0xMzA1MTgxNDQ4MzBaMHUxDTALBgNVBAMM\n"
+				+ "BER1a2UxHjAcBgNVBAoMFVN1biBNaWNyb3N5c3RlbXMsIEluYzEWMBQGA1UECwwN\n"
+				+ "SmF2YSBTb2Z0d2FyZTELMAkGA1UECAwCQ0ExCzAJBgNVBAYTAlVTMRIwEAYDVQQH\n"
+				+ "DAlDdXBlcnRpbm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGLaCx\n"
+				+ "Dy5oRJ/FelcoO/lAEApAhR4wxmUIu0guzN0Tx/cuWfyo4349NOxf5XfRcje37B//\n"
+				+ "hyMwK1Q/pRhRYtZlK+O+9tNCAupekmSxEw9wNsRXNJ18QTTvQRPReXhG8gOiGmU2\n"
+				+ "kpTVjpZURo/0WGuEyAWYzH99cQfUM92vIaGKq2fApNfwCULtFnAY9WPDZtwSZYhC\n"
+				+ "qSAoy6B1I2A3i+G5Ep++eCa9PZKCZIPWJiC5+nMmzwCOnQqcZlorsrQ+M+I4GgE2\n"
+				+ "Rryb/AeKoSPsrm4t0aWhFhKcuHpk3jfKhJhi5e+5bnY17pCoY9hx5EK3WqfKL/x1\n"
+				+ "3HKsPpf/MieRWiAdAgMBAAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8E\n"
+				+ "DDAKBggrBgEFBQcDAjANBgkqhkiG9w0BAQsFAAOCAQEAdAtXZYCdb7JKzfwY7vEO\n"
+				+ "9TOMyxxwxhxs+26urL2wQWqtRgHXopoi/GGSuZG5aPQcHWLoqZ1f7nZoWfKzJMKw\n"
+				+ "MOvaw6wSSkmEoEvdek3s/bH6Gp0spnykqtb+kunGr/XFxyBhHmfdSroEgzspslFh\n"
+				+ "Glqe/XfrQmFgPWd13GH8mqzSU1zc+0Ka7s68jcuNfz9ble5rT0IrdjRm5E64mVGk\n"
+				+ "aJTAO5N87ks5JjkDHDJzcyYRcIpqBGotJtyZTjGpIeAG8xLGlkSsUg88iUOchI7s\n"
+				+ "dOmse9mpgEjCb4kdZ0PnoxMFjsPR8AoGOz4A5vA19nKqWM8bxK9hqLGKsaiQpQg7\n"
+				+ "bA==\n" + "-----END CERTIFICATE-----\n";
+		ByteArrayInputStream in = new ByteArrayInputStream(cert.getBytes());
+		CertificateFactory cf = CertificateFactory.getInstance("X.509");
 
-        return (X509Certificate) cf.generateCertificate(in);
-    }
+		return (X509Certificate) cf.generateCertificate(in);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesServlet3Tests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesServlet3Tests.java
index c2e626f0f2..4a781386f7 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesServlet3Tests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesServlet3Tests.java
@@ -30,41 +30,43 @@ import org.springframework.util.ReflectionUtils;
  * @author Rob Winch
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Method.class, ReflectionUtils.class})
+@PrepareForTest({ Method.class, ReflectionUtils.class })
 public class AbstractRememberMeServicesServlet3Tests {
-    @Mock
-    private Method method;
+	@Mock
+	private Method method;
 
-    @Before
-    public void setUp() throws Exception {
-        spy(ReflectionUtils.class);
+	@Before
+	public void setUp() throws Exception {
+		spy(ReflectionUtils.class);
 
-        when(ReflectionUtils.findMethod(Cookie.class, "setHttpOnly", boolean.class)).thenReturn(method);
-    }
+		when(ReflectionUtils.findMethod(Cookie.class, "setHttpOnly", boolean.class))
+				.thenReturn(method);
+	}
 
-    @Test
-    public void httpOnlySetInServlet30DefaultConstructor() throws Exception {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getContextPath()).thenReturn("/contextpath");
-        HttpServletResponse response = mock(HttpServletResponse.class);
-        ArgumentCaptor<Cookie> cookie = ArgumentCaptor.forClass(Cookie.class);
-        MockRememberMeServices services = new MockRememberMeServices();
-        services.setCookie(new String[] {"mycookie"}, 1000, request, response);
-        verify(response).addCookie(cookie.capture());
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), eq(cookie.getValue()), eq(true));
-    }
+	@Test
+	public void httpOnlySetInServlet30DefaultConstructor() throws Exception {
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		when(request.getContextPath()).thenReturn("/contextpath");
+		HttpServletResponse response = mock(HttpServletResponse.class);
+		ArgumentCaptor<Cookie> cookie = ArgumentCaptor.forClass(Cookie.class);
+		MockRememberMeServices services = new MockRememberMeServices();
+		services.setCookie(new String[] { "mycookie" }, 1000, request, response);
+		verify(response).addCookie(cookie.capture());
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), eq(cookie.getValue()), eq(true));
+	}
 
-    @Test
-    public void httpOnlySetInServlet30() throws Exception {
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        when(request.getContextPath()).thenReturn("/contextpath");
-        HttpServletResponse response = mock(HttpServletResponse.class);
-        ArgumentCaptor<Cookie> cookie = ArgumentCaptor.forClass(Cookie.class);
-        MockRememberMeServices services = new MockRememberMeServices("key",mock(UserDetailsService.class));
-        services.setCookie(new String[] {"mycookie"}, 1000, request, response);
-        verify(response).addCookie(cookie.capture());
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), eq(cookie.getValue()), eq(true));
-    }
+	@Test
+	public void httpOnlySetInServlet30() throws Exception {
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		when(request.getContextPath()).thenReturn("/contextpath");
+		HttpServletResponse response = mock(HttpServletResponse.class);
+		ArgumentCaptor<Cookie> cookie = ArgumentCaptor.forClass(Cookie.class);
+		MockRememberMeServices services = new MockRememberMeServices("key",
+				mock(UserDetailsService.class));
+		services.setCookie(new String[] { "mycookie" }, 1000, request, response);
+		verify(response).addCookie(cookie.capture());
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), eq(cookie.getValue()), eq(true));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
index 0b53b4ce13..4819b46403 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
@@ -43,425 +43,446 @@ import org.springframework.util.StringUtils;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(ReflectionUtils.class)
 public class AbstractRememberMeServicesTests {
-    static User joe = new User("joe", "password", true, true,true,true, AuthorityUtils.createAuthorityList("ROLE_A"));
-
-    MockUserDetailsService uds;
-
-    @Before
-    public void setup() {
-        uds = new MockUserDetailsService(joe, false);
-    }
-
-    @Test(expected = InvalidCookieException.class)
-    public void nonBase64CookieShouldBeDetected() {
-        new MockRememberMeServices(uds).decodeCookie("nonBase64CookieValue%");
-    }
-
-    @Test
-    public void setAndGetAreConsistent() throws Exception {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        assertNotNull(services.getCookieName());
-        assertNotNull(services.getParameter());
-        assertEquals("xxxx", services.getKey());
-        services.setParameter("rm");
-        assertEquals("rm", services.getParameter());
-        services.setCookieName("kookie");
-        assertEquals("kookie", services.getCookieName());
-        services.setTokenValiditySeconds(600);
-        assertEquals(600, services.getTokenValiditySeconds());
-        assertSame(uds, services.getUserDetailsService());
-        AuthenticationDetailsSource ads = mock(AuthenticationDetailsSource.class);
-        services.setAuthenticationDetailsSource(ads);
-        assertSame(ads, services.getAuthenticationDetailsSource());
-        services.afterPropertiesSet();
-    }
-
-    @Test
-    public void cookieShouldBeCorrectlyEncodedAndDecoded() throws Exception {
-        String[] cookie = new String[] {"name", "cookie", "tokens", "blah"};
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-
-        String encoded = services.encodeCookie(cookie);
-        // '=' aren't allowed in version 0 cookies.
-        assertFalse(encoded.endsWith("="));
-        String[] decoded = services.decodeCookie(encoded);
-
-        assertEquals(4, decoded.length);
-        assertEquals("name", decoded[0]);
-        assertEquals("cookie", decoded[1]);
-        assertEquals("tokens", decoded[2]);
-        assertEquals("blah", decoded[3]);
-    }
-
-    @Test
-    public void cookieWithOpenIDidentifierAsNameIsEncodedAndDecoded() throws Exception {
-        String[] cookie = new String[] {"http://id.openid.zz", "cookie", "tokens", "blah"};
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-
-        String[] decoded = services.decodeCookie(services.encodeCookie(cookie));
-        assertEquals(4, decoded.length);
-        assertEquals("http://id.openid.zz", decoded[0]);
-
-        // Check https (SEC-1410)
-        cookie[0] = "https://id.openid.zz";
-        decoded = services.decodeCookie(services.encodeCookie(cookie));
-        assertEquals(4, decoded.length);
-        assertEquals("https://id.openid.zz", decoded[0]);
-    }
-
-    @Test
-    public void autoLoginShouldReturnNullIfNoLoginCookieIsPresented() {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        assertNull(services.autoLogin(request, response));
-
-        // shouldn't try to invalidate our cookie
-        assertNull(response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
-
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        // set non-login cookie
-        request.setCookies(new Cookie("mycookie", "cookie"));
-        assertNull(services.autoLogin(request, response));
-        assertNull(response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
-    }
-
-    @Test
-    public void successfulAutoLoginReturnsExpectedAuthentication() throws Exception {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        services.afterPropertiesSet();
-        assertNotNull(services.getUserDetailsService());
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        Authentication result = services.autoLogin(request, response);
-
-        assertNotNull(result);
-    }
-
-    @Test
-    public void autoLoginShouldFailIfCookieIsNotBase64() throws Exception {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        request.setCookies(new Cookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, "ZZZ"));
-        Authentication result = services.autoLogin(request, response);
-        assertNull(result);
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void autoLoginShouldFailIfCookieIsEmpty() throws Exception {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        request.setCookies(new Cookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, ""));
-        Authentication result = services.autoLogin(request, response);
-        assertNull(result);
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void autoLoginShouldFailIfInvalidCookieExceptionIsRaised() {
-        MockRememberMeServices services = new MockRememberMeServices(new MockUserDetailsService(joe, true));
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        // Wrong number of tokens
-        request.setCookies(createLoginCookie("cookie:1"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        Authentication result = services.autoLogin(request, response);
-
-        assertNull(result);
-
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void autoLoginShouldFailIfUserNotFound() {
-        uds.setThrowException(true);
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        Authentication result = services.autoLogin(request, response);
-
-        assertNull(result);
-
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void autoLoginShouldFailIfUserAccountIsLocked() {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        services.setUserDetailsChecker(new AccountStatusUserDetailsChecker());
-        uds.toReturn = new User("joe", "password",false,true,true,true,joe.getAuthorities());
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        Authentication result = services.autoLogin(request, response);
-
-        assertNull(result);
-
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void loginFailShouldCancelCookie() {
-        uds.setThrowException(true);
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("contextpath");
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.loginFail(request, response);
-
-        assertCookieCancelled(response);
-    }
-
-    @Test
-    public void logoutShouldCancelCookie() throws Exception {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setContextPath("contextpath");
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.logout(request, response, mock(Authentication.class));
-        // Try again with null  Authentication
-        response = new MockHttpServletResponse();
-
-        services.logout(request, response, null);
-
-        assertCookieCancelled(response);
-    }
-
-    @Test(expected = CookieTheftException.class)
-    public void cookieTheftExceptionShouldBeRethrown() {
-        MockRememberMeServices services = new MockRememberMeServices(uds) {
-            protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) {
-                throw new CookieTheftException("Pretending cookie was stolen");
-            }
-        };
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-
-        request.setCookies(createLoginCookie("cookie:1:2"));
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.autoLogin(request, response);
-    }
-
-    @Test
-    public void loginSuccessCallsOnLoginSuccessCorrectly() {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        Authentication auth = new UsernamePasswordAuthenticationToken("joe","password");
-
-        // No parameter set
-        services.loginSuccess(request, response, auth);
-        assertFalse(services.loginSuccessCalled);
-
-        // Parameter set to true
-        services = new MockRememberMeServices(uds);
-        request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "true");
-        services.loginSuccess(request, response, auth);
-        assertTrue(services.loginSuccessCalled);
-
-        // Different parameter name, set to true
-        services = new MockRememberMeServices(uds);
-        services.setParameter("my_parameter");
-        request.setParameter("my_parameter", "true");
-        services.loginSuccess(request, response, auth);
-        assertTrue(services.loginSuccessCalled);
-
-
-        // Parameter set to false
-        services = new MockRememberMeServices(uds);
-        request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "false");
-        services.loginSuccess(request, response, auth);
-        assertFalse(services.loginSuccessCalled);
-
-        // alwaysRemember set to true
-        services = new MockRememberMeServices(uds);
-        services.setAlwaysRemember(true);
-        services.loginSuccess(request, response, auth);
-        assertTrue(services.loginSuccessCalled);
-    }
-
-    @Test
-    public void setCookieUsesCorrectNamePathAndValue() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        request.setContextPath("contextpath");
-        MockRememberMeServices services = new MockRememberMeServices(uds) {
-            protected String encodeCookie(String[] cookieTokens) {
-                return cookieTokens[0];
-            }
-        };
-        services.setCookieName("mycookiename");
-        services.setCookie(new String[] {"mycookie"}, 1000, request, response);
-        Cookie cookie = response.getCookie("mycookiename");
-
-        assertNotNull(cookie);
-        assertEquals("mycookie", cookie.getValue());
-        assertEquals("mycookiename", cookie.getName());
-        assertEquals("contextpath", cookie.getPath());
-        assertFalse(cookie.getSecure());
-    }
-
-    @Test
-    public void setCookieSetsSecureFlagIfConfigured() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        request.setContextPath("contextpath");
-
-        MockRememberMeServices services = new MockRememberMeServices(uds) {
-            protected String encodeCookie(String[] cookieTokens) {
-                return cookieTokens[0];
-            }
-        };
-        services.setUseSecureCookie(true);
-        services.setCookie(new String[] {"mycookie"}, 1000, request, response);
-        Cookie cookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertTrue(cookie.getSecure());
-    }
-
-    @Test
-    public void setHttpOnlyIgnoredForServlet25() throws Exception {
-        spy(ReflectionUtils.class);
-        when(ReflectionUtils.findMethod(Cookie.class,"setHttpOnly", boolean.class)).thenReturn(null);
-
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod"));
-
-        services = new MockRememberMeServices("key",new MockUserDetailsService(joe, false));
-        assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod"));
-    }
-
-    // SEC-2791
-    @Test
-    public void setCookieMaxAge0VersionSet() {
-        MockRememberMeServices services = new MockRememberMeServices();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.setCookie(new String[] {"value"}, 0, request, response);
-
-        Cookie cookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertThat(cookie.getVersion()).isEqualTo(1);
-    }
-
-    // SEC-2791
-    @Test
-    public void setCookieMaxAgeNegativeVersionSet() {
-        MockRememberMeServices services = new MockRememberMeServices();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.setCookie(new String[] {"value"}, -1, request, response);
-
-        Cookie cookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertThat(cookie.getVersion()).isEqualTo(1);
-    }
-
-    // SEC-2791
-    @Test
-    public void setCookieMaxAge1VersionSet() {
-        MockRememberMeServices services = new MockRememberMeServices();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        services.setCookie(new String[] {"value"}, 1, request, response);
-
-        Cookie cookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertThat(cookie.getVersion()).isEqualTo(0);
-    }
-
-    private Cookie[] createLoginCookie(String cookieToken) {
-        MockRememberMeServices services = new MockRememberMeServices(uds);
-        Cookie cookie = new Cookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                services.encodeCookie(StringUtils.delimitedListToStringArray(cookieToken, ":")));
-
-        return new Cookie[] {cookie};
-    }
-
-    private void assertCookieCancelled(MockHttpServletResponse response) {
-        Cookie returnedCookie = response.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    static class MockRememberMeServices extends AbstractRememberMeServices {
-        boolean loginSuccessCalled;
-
-        MockRememberMeServices(String key, UserDetailsService userDetailsService) {
-            super(key, userDetailsService);
-        }
-
-        MockRememberMeServices(UserDetailsService userDetailsService) {
-            super("xxxx", userDetailsService);
-        }
-
-        MockRememberMeServices() {
-            this(new MockUserDetailsService(null,false));
-        }
-
-        protected void onLoginSuccess(HttpServletRequest request, HttpServletResponse response, Authentication successfulAuthentication) {
-            loginSuccessCalled = true;
-        }
-
-        protected UserDetails processAutoLoginCookie(String[] cookieTokens, HttpServletRequest request, HttpServletResponse response) throws RememberMeAuthenticationException {
-            if(cookieTokens.length != 3) {
-                throw new InvalidCookieException("deliberate exception");
-            }
-
-            UserDetails user = getUserDetailsService().loadUserByUsername("joe");
-
-            return user;
-        }
-    }
-
-    public static class MockUserDetailsService implements UserDetailsService {
-        private UserDetails toReturn;
-        private boolean throwException;
-
-        public MockUserDetailsService() {
-            this(null, false);
-        }
-
-        public MockUserDetailsService(UserDetails toReturn, boolean throwException) {
-            this.toReturn = toReturn;
-            this.throwException = throwException;
-        }
-
-        public UserDetails loadUserByUsername(String username) {
-            if (throwException) {
-                throw new UsernameNotFoundException("as requested by mock");
-            }
-
-            return toReturn;
-        }
-
-        public void setThrowException(boolean value) {
-            this.throwException = value;
-        }
-    }
+	static User joe = new User("joe", "password", true, true, true, true,
+			AuthorityUtils.createAuthorityList("ROLE_A"));
+
+	MockUserDetailsService uds;
+
+	@Before
+	public void setup() {
+		uds = new MockUserDetailsService(joe, false);
+	}
+
+	@Test(expected = InvalidCookieException.class)
+	public void nonBase64CookieShouldBeDetected() {
+		new MockRememberMeServices(uds).decodeCookie("nonBase64CookieValue%");
+	}
+
+	@Test
+	public void setAndGetAreConsistent() throws Exception {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		assertNotNull(services.getCookieName());
+		assertNotNull(services.getParameter());
+		assertEquals("xxxx", services.getKey());
+		services.setParameter("rm");
+		assertEquals("rm", services.getParameter());
+		services.setCookieName("kookie");
+		assertEquals("kookie", services.getCookieName());
+		services.setTokenValiditySeconds(600);
+		assertEquals(600, services.getTokenValiditySeconds());
+		assertSame(uds, services.getUserDetailsService());
+		AuthenticationDetailsSource ads = mock(AuthenticationDetailsSource.class);
+		services.setAuthenticationDetailsSource(ads);
+		assertSame(ads, services.getAuthenticationDetailsSource());
+		services.afterPropertiesSet();
+	}
+
+	@Test
+	public void cookieShouldBeCorrectlyEncodedAndDecoded() throws Exception {
+		String[] cookie = new String[] { "name", "cookie", "tokens", "blah" };
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+
+		String encoded = services.encodeCookie(cookie);
+		// '=' aren't allowed in version 0 cookies.
+		assertFalse(encoded.endsWith("="));
+		String[] decoded = services.decodeCookie(encoded);
+
+		assertEquals(4, decoded.length);
+		assertEquals("name", decoded[0]);
+		assertEquals("cookie", decoded[1]);
+		assertEquals("tokens", decoded[2]);
+		assertEquals("blah", decoded[3]);
+	}
+
+	@Test
+	public void cookieWithOpenIDidentifierAsNameIsEncodedAndDecoded() throws Exception {
+		String[] cookie = new String[] { "http://id.openid.zz", "cookie", "tokens",
+				"blah" };
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+
+		String[] decoded = services.decodeCookie(services.encodeCookie(cookie));
+		assertEquals(4, decoded.length);
+		assertEquals("http://id.openid.zz", decoded[0]);
+
+		// Check https (SEC-1410)
+		cookie[0] = "https://id.openid.zz";
+		decoded = services.decodeCookie(services.encodeCookie(cookie));
+		assertEquals(4, decoded.length);
+		assertEquals("https://id.openid.zz", decoded[0]);
+	}
+
+	@Test
+	public void autoLoginShouldReturnNullIfNoLoginCookieIsPresented() {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		assertNull(services.autoLogin(request, response));
+
+		// shouldn't try to invalidate our cookie
+		assertNull(response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
+
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		// set non-login cookie
+		request.setCookies(new Cookie("mycookie", "cookie"));
+		assertNull(services.autoLogin(request, response));
+		assertNull(response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
+	}
+
+	@Test
+	public void successfulAutoLoginReturnsExpectedAuthentication() throws Exception {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		services.afterPropertiesSet();
+		assertNotNull(services.getUserDetailsService());
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		Authentication result = services.autoLogin(request, response);
+
+		assertNotNull(result);
+	}
+
+	@Test
+	public void autoLoginShouldFailIfCookieIsNotBase64() throws Exception {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		request.setCookies(new Cookie(
+				AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, "ZZZ"));
+		Authentication result = services.autoLogin(request, response);
+		assertNull(result);
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void autoLoginShouldFailIfCookieIsEmpty() throws Exception {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		request.setCookies(new Cookie(
+				AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, ""));
+		Authentication result = services.autoLogin(request, response);
+		assertNull(result);
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void autoLoginShouldFailIfInvalidCookieExceptionIsRaised() {
+		MockRememberMeServices services = new MockRememberMeServices(
+				new MockUserDetailsService(joe, true));
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		// Wrong number of tokens
+		request.setCookies(createLoginCookie("cookie:1"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		Authentication result = services.autoLogin(request, response);
+
+		assertNull(result);
+
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void autoLoginShouldFailIfUserNotFound() {
+		uds.setThrowException(true);
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		Authentication result = services.autoLogin(request, response);
+
+		assertNull(result);
+
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void autoLoginShouldFailIfUserAccountIsLocked() {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		services.setUserDetailsChecker(new AccountStatusUserDetailsChecker());
+		uds.toReturn = new User("joe", "password", false, true, true, true,
+				joe.getAuthorities());
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		Authentication result = services.autoLogin(request, response);
+
+		assertNull(result);
+
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void loginFailShouldCancelCookie() {
+		uds.setThrowException(true);
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("contextpath");
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.loginFail(request, response);
+
+		assertCookieCancelled(response);
+	}
+
+	@Test
+	public void logoutShouldCancelCookie() throws Exception {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setContextPath("contextpath");
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.logout(request, response, mock(Authentication.class));
+		// Try again with null Authentication
+		response = new MockHttpServletResponse();
+
+		services.logout(request, response, null);
+
+		assertCookieCancelled(response);
+	}
+
+	@Test(expected = CookieTheftException.class)
+	public void cookieTheftExceptionShouldBeRethrown() {
+		MockRememberMeServices services = new MockRememberMeServices(uds) {
+			protected UserDetails processAutoLoginCookie(String[] cookieTokens,
+					HttpServletRequest request, HttpServletResponse response) {
+				throw new CookieTheftException("Pretending cookie was stolen");
+			}
+		};
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+
+		request.setCookies(createLoginCookie("cookie:1:2"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.autoLogin(request, response);
+	}
+
+	@Test
+	public void loginSuccessCallsOnLoginSuccessCorrectly() {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		Authentication auth = new UsernamePasswordAuthenticationToken("joe", "password");
+
+		// No parameter set
+		services.loginSuccess(request, response, auth);
+		assertFalse(services.loginSuccessCalled);
+
+		// Parameter set to true
+		services = new MockRememberMeServices(uds);
+		request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "true");
+		services.loginSuccess(request, response, auth);
+		assertTrue(services.loginSuccessCalled);
+
+		// Different parameter name, set to true
+		services = new MockRememberMeServices(uds);
+		services.setParameter("my_parameter");
+		request.setParameter("my_parameter", "true");
+		services.loginSuccess(request, response, auth);
+		assertTrue(services.loginSuccessCalled);
+
+		// Parameter set to false
+		services = new MockRememberMeServices(uds);
+		request.setParameter(MockRememberMeServices.DEFAULT_PARAMETER, "false");
+		services.loginSuccess(request, response, auth);
+		assertFalse(services.loginSuccessCalled);
+
+		// alwaysRemember set to true
+		services = new MockRememberMeServices(uds);
+		services.setAlwaysRemember(true);
+		services.loginSuccess(request, response, auth);
+		assertTrue(services.loginSuccessCalled);
+	}
+
+	@Test
+	public void setCookieUsesCorrectNamePathAndValue() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		request.setContextPath("contextpath");
+		MockRememberMeServices services = new MockRememberMeServices(uds) {
+			protected String encodeCookie(String[] cookieTokens) {
+				return cookieTokens[0];
+			}
+		};
+		services.setCookieName("mycookiename");
+		services.setCookie(new String[] { "mycookie" }, 1000, request, response);
+		Cookie cookie = response.getCookie("mycookiename");
+
+		assertNotNull(cookie);
+		assertEquals("mycookie", cookie.getValue());
+		assertEquals("mycookiename", cookie.getName());
+		assertEquals("contextpath", cookie.getPath());
+		assertFalse(cookie.getSecure());
+	}
+
+	@Test
+	public void setCookieSetsSecureFlagIfConfigured() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		request.setContextPath("contextpath");
+
+		MockRememberMeServices services = new MockRememberMeServices(uds) {
+			protected String encodeCookie(String[] cookieTokens) {
+				return cookieTokens[0];
+			}
+		};
+		services.setUseSecureCookie(true);
+		services.setCookie(new String[] { "mycookie" }, 1000, request, response);
+		Cookie cookie = response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertTrue(cookie.getSecure());
+	}
+
+	@Test
+	public void setHttpOnlyIgnoredForServlet25() throws Exception {
+		spy(ReflectionUtils.class);
+		when(ReflectionUtils.findMethod(Cookie.class, "setHttpOnly", boolean.class))
+				.thenReturn(null);
+
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod"));
+
+		services = new MockRememberMeServices("key", new MockUserDetailsService(joe,
+				false));
+		assertNull(ReflectionTestUtils.getField(services, "setHttpOnlyMethod"));
+	}
+
+	// SEC-2791
+	@Test
+	public void setCookieMaxAge0VersionSet() {
+		MockRememberMeServices services = new MockRememberMeServices();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.setCookie(new String[] { "value" }, 0, request, response);
+
+		Cookie cookie = response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertThat(cookie.getVersion()).isEqualTo(1);
+	}
+
+	// SEC-2791
+	@Test
+	public void setCookieMaxAgeNegativeVersionSet() {
+		MockRememberMeServices services = new MockRememberMeServices();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.setCookie(new String[] { "value" }, -1, request, response);
+
+		Cookie cookie = response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertThat(cookie.getVersion()).isEqualTo(1);
+	}
+
+	// SEC-2791
+	@Test
+	public void setCookieMaxAge1VersionSet() {
+		MockRememberMeServices services = new MockRememberMeServices();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		services.setCookie(new String[] { "value" }, 1, request, response);
+
+		Cookie cookie = response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertThat(cookie.getVersion()).isEqualTo(0);
+	}
+
+	private Cookie[] createLoginCookie(String cookieToken) {
+		MockRememberMeServices services = new MockRememberMeServices(uds);
+		Cookie cookie = new Cookie(
+				AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				services.encodeCookie(StringUtils.delimitedListToStringArray(cookieToken,
+						":")));
+
+		return new Cookie[] { cookie };
+	}
+
+	private void assertCookieCancelled(MockHttpServletResponse response) {
+		Cookie returnedCookie = response
+				.getCookie(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	static class MockRememberMeServices extends AbstractRememberMeServices {
+		boolean loginSuccessCalled;
+
+		MockRememberMeServices(String key, UserDetailsService userDetailsService) {
+			super(key, userDetailsService);
+		}
+
+		MockRememberMeServices(UserDetailsService userDetailsService) {
+			super("xxxx", userDetailsService);
+		}
+
+		MockRememberMeServices() {
+			this(new MockUserDetailsService(null, false));
+		}
+
+		protected void onLoginSuccess(HttpServletRequest request,
+				HttpServletResponse response, Authentication successfulAuthentication) {
+			loginSuccessCalled = true;
+		}
+
+		protected UserDetails processAutoLoginCookie(String[] cookieTokens,
+				HttpServletRequest request, HttpServletResponse response)
+				throws RememberMeAuthenticationException {
+			if (cookieTokens.length != 3) {
+				throw new InvalidCookieException("deliberate exception");
+			}
+
+			UserDetails user = getUserDetailsService().loadUserByUsername("joe");
+
+			return user;
+		}
+	}
+
+	public static class MockUserDetailsService implements UserDetailsService {
+		private UserDetails toReturn;
+		private boolean throwException;
+
+		public MockUserDetailsService() {
+			this(null, false);
+		}
+
+		public MockUserDetailsService(UserDetails toReturn, boolean throwException) {
+			this.toReturn = toReturn;
+			this.throwException = throwException;
+		}
+
+		public UserDetails loadUserByUsername(String username) {
+			if (throwException) {
+				throw new UsernameNotFoundException("as requested by mock");
+			}
+
+			return toReturn;
+		}
+
+		public void setThrowException(boolean value) {
+			this.throwException = value;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
index 1df2425590..9020bd189d 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
@@ -44,148 +44,155 @@ import org.springframework.test.util.ReflectionTestUtils;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class JdbcTokenRepositoryImplTests {
-    @Mock
-    private Log logger;
+	@Mock
+	private Log logger;
 
-    private static SingleConnectionDataSource dataSource;
-    private JdbcTokenRepositoryImpl repo;
-    private JdbcTemplate template;
+	private static SingleConnectionDataSource dataSource;
+	private JdbcTokenRepositoryImpl repo;
+	private JdbcTemplate template;
 
-    @BeforeClass
-    public static void createDataSource() {
-        dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:tokenrepotest", "sa", "", true);
-        dataSource.setDriverClassName("org.hsqldb.jdbc.JDBCDriver");
-    }
+	@BeforeClass
+	public static void createDataSource() {
+		dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:tokenrepotest",
+				"sa", "", true);
+		dataSource.setDriverClassName("org.hsqldb.jdbc.JDBCDriver");
+	}
 
-    @AfterClass
-    public static void clearDataSource() throws Exception {
-        dataSource.destroy();
-        dataSource = null;
-    }
+	@AfterClass
+	public static void clearDataSource() throws Exception {
+		dataSource.destroy();
+		dataSource = null;
+	}
 
-    @Before
-    public void populateDatabase() {
-        repo = new JdbcTokenRepositoryImpl();
-        ReflectionTestUtils.setField(repo, "logger", logger);
-        repo.setDataSource(dataSource);
-        repo.initDao();
-        template = repo.getJdbcTemplate();
-        template.execute("create table persistent_logins (username varchar(100) not null, " +
-                "series varchar(100) not null, token varchar(500) not null, last_used timestamp not null)");
-    }
+	@Before
+	public void populateDatabase() {
+		repo = new JdbcTokenRepositoryImpl();
+		ReflectionTestUtils.setField(repo, "logger", logger);
+		repo.setDataSource(dataSource);
+		repo.initDao();
+		template = repo.getJdbcTemplate();
+		template.execute("create table persistent_logins (username varchar(100) not null, "
+				+ "series varchar(100) not null, token varchar(500) not null, last_used timestamp not null)");
+	}
 
-    @After
-    public void clearData() {
-        template.execute("drop table persistent_logins");
-    }
+	@After
+	public void clearData() {
+		template.execute("drop table persistent_logins");
+	}
 
-    @Test
-    public void createNewTokenInsertsCorrectData() {
-        Date currentDate = new Date();
-        PersistentRememberMeToken token = new PersistentRememberMeToken("joeuser", "joesseries", "atoken", currentDate);
-        repo.createNewToken(token);
+	@Test
+	public void createNewTokenInsertsCorrectData() {
+		Date currentDate = new Date();
+		PersistentRememberMeToken token = new PersistentRememberMeToken("joeuser",
+				"joesseries", "atoken", currentDate);
+		repo.createNewToken(token);
 
-        Map<String,Object> results = template.queryForMap("select * from persistent_logins");
+		Map<String, Object> results = template
+				.queryForMap("select * from persistent_logins");
 
-        assertEquals(currentDate, results.get("last_used"));
-        assertEquals("joeuser", results.get("username"));
-        assertEquals("joesseries", results.get("series"));
-        assertEquals("atoken", results.get("token"));
-    }
+		assertEquals(currentDate, results.get("last_used"));
+		assertEquals("joeuser", results.get("username"));
+		assertEquals("joesseries", results.get("series"));
+		assertEquals("atoken", results.get("token"));
+	}
 
-    @Test
-    public void retrievingTokenReturnsCorrectData() {
+	@Test
+	public void retrievingTokenReturnsCorrectData() {
 
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
-        PersistentRememberMeToken token = repo.getTokenForSeries("joesseries");
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
+		PersistentRememberMeToken token = repo.getTokenForSeries("joesseries");
 
-        assertEquals("joeuser", token.getUsername());
-        assertEquals("joesseries", token.getSeries());
-        assertEquals("atoken", token.getTokenValue());
-        assertEquals(Timestamp.valueOf("2007-10-09 18:19:25.000000000"), token.getDate());
-    }
+		assertEquals("joeuser", token.getUsername());
+		assertEquals("joesseries", token.getSeries());
+		assertEquals("atoken", token.getTokenValue());
+		assertEquals(Timestamp.valueOf("2007-10-09 18:19:25.000000000"), token.getDate());
+	}
 
-    @Test
-    public void retrievingTokenWithDuplicateSeriesReturnsNull() {
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')");
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
+	@Test
+	public void retrievingTokenWithDuplicateSeriesReturnsNull() {
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')");
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
 
-//        List results = template.queryForList("select * from persistent_logins where series = 'joesseries'");
+		// List results =
+		// template.queryForList("select * from persistent_logins where series = 'joesseries'");
 
-        assertNull(repo.getTokenForSeries("joesseries"));
-    }
+		assertNull(repo.getTokenForSeries("joesseries"));
+	}
 
-    // SEC-1964
-    @Test
-    public void retrievingTokenWithNoSeriesReturnsNull() {
-        when(logger.isDebugEnabled()).thenReturn(true);
+	// SEC-1964
+	@Test
+	public void retrievingTokenWithNoSeriesReturnsNull() {
+		when(logger.isDebugEnabled()).thenReturn(true);
 
-        assertNull(repo.getTokenForSeries("missingSeries"));
+		assertNull(repo.getTokenForSeries("missingSeries"));
 
-        verify(logger).isDebugEnabled();
-        verify(logger).debug(eq("Querying token for series 'missingSeries' returned no results."),
-                any(EmptyResultDataAccessException.class));
-        verifyNoMoreInteractions(logger);
-    }
+		verify(logger).isDebugEnabled();
+		verify(logger).debug(
+				eq("Querying token for series 'missingSeries' returned no results."),
+				any(EmptyResultDataAccessException.class));
+		verifyNoMoreInteractions(logger);
+	}
 
-    @Test
-    public void removingUserTokensDeletesData() {
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries2', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')");
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
+	@Test
+	public void removingUserTokensDeletesData() {
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries2', 'joeuser', 'atoken2', '2007-10-19 18:19:25.000000000')");
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries', 'joeuser', 'atoken', '2007-10-09 18:19:25.000000000')");
 
-       // List results = template.queryForList("select * from persistent_logins where series = 'joesseries'");
+		// List results =
+		// template.queryForList("select * from persistent_logins where series = 'joesseries'");
 
-        repo.removeUserTokens("joeuser");
+		repo.removeUserTokens("joeuser");
 
-        List<Map<String,Object>> results = template.queryForList("select * from persistent_logins where username = 'joeuser'");
+		List<Map<String, Object>> results = template
+				.queryForList("select * from persistent_logins where username = 'joeuser'");
 
-        assertEquals(0, results.size());
-    }
+		assertEquals(0, results.size());
+	}
 
-    @Test
-    public void updatingTokenModifiesTokenValueAndLastUsed() {
-        Timestamp ts = new Timestamp(System.currentTimeMillis() - 1);
-        template.execute("insert into persistent_logins (series, username, token, last_used) values " +
-                "('joesseries', 'joeuser', 'atoken', '" + ts.toString() + "')");
-        repo.updateToken("joesseries", "newtoken", new Date());
+	@Test
+	public void updatingTokenModifiesTokenValueAndLastUsed() {
+		Timestamp ts = new Timestamp(System.currentTimeMillis() - 1);
+		template.execute("insert into persistent_logins (series, username, token, last_used) values "
+				+ "('joesseries', 'joeuser', 'atoken', '" + ts.toString() + "')");
+		repo.updateToken("joesseries", "newtoken", new Date());
 
-        Map<String,Object> results = template.queryForMap("select * from persistent_logins where series = 'joesseries'");
+		Map<String, Object> results = template
+				.queryForMap("select * from persistent_logins where series = 'joesseries'");
 
-        assertEquals("joeuser", results.get("username"));
-        assertEquals("joesseries", results.get("series"));
-        assertEquals("newtoken", results.get("token"));
-        Date lastUsed = (Date) results.get("last_used");
-        assertTrue(lastUsed.getTime() > ts.getTime());
-    }
+		assertEquals("joeuser", results.get("username"));
+		assertEquals("joesseries", results.get("series"));
+		assertEquals("newtoken", results.get("token"));
+		Date lastUsed = (Date) results.get("last_used");
+		assertTrue(lastUsed.getTime() > ts.getTime());
+	}
 
-    @Test
-    public void createTableOnStartupCreatesCorrectTable() {
-        template.execute("drop table persistent_logins");
-        repo = new JdbcTokenRepositoryImpl();
-        repo.setDataSource(dataSource);
-        repo.setCreateTableOnStartup(true);
-        repo.initDao();
+	@Test
+	public void createTableOnStartupCreatesCorrectTable() {
+		template.execute("drop table persistent_logins");
+		repo = new JdbcTokenRepositoryImpl();
+		repo.setDataSource(dataSource);
+		repo.setCreateTableOnStartup(true);
+		repo.initDao();
 
-        template.queryForList("select username,series,token,last_used from persistent_logins");
-    }
+		template.queryForList("select username,series,token,last_used from persistent_logins");
+	}
 
+	// SEC-2879
+	@Test
+	public void updateUsesLastUsed() {
+		JdbcTemplate template = mock(JdbcTemplate.class);
+		Date lastUsed = new Date(1424841314059L);
+		JdbcTokenRepositoryImpl repository = new JdbcTokenRepositoryImpl();
+		repository.setJdbcTemplate(template);
 
-    // SEC-2879
-    @Test
-    public void updateUsesLastUsed() {
-        JdbcTemplate template = mock(JdbcTemplate.class);
-        Date lastUsed = new Date(1424841314059L);
-        JdbcTokenRepositoryImpl repository = new JdbcTokenRepositoryImpl();
-        repository.setJdbcTemplate(template);
+		repository.updateToken("series", "token", lastUsed);
 
-        repository.updateToken("series", "token", lastUsed);
-
-        verify(template).update(anyString(), anyString(), eq(lastUsed), anyString());
-    }
+		verify(template).update(anyString(), anyString(), eq(lastUsed), anyString());
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java
index 55b96dc793..c44c616e5d 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/NullRememberMeServicesTests.java
@@ -19,20 +19,20 @@ import org.springframework.security.web.authentication.NullRememberMeServices;
 
 import junit.framework.TestCase;
 
-
 /**
  * Tests {@link org.springframework.security.web.authentication.NullRememberMeServices}.
  *
  * @author Ben Alex
  */
 public class NullRememberMeServicesTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testAlwaysReturnsNull() {
-        NullRememberMeServices services = new NullRememberMeServices();
-        assertNull(services.autoLogin(null, null));
-        services.loginFail(null, null);
-        services.loginSuccess(null, null, null);
-        assertTrue(true);
-    }
+	public void testAlwaysReturnsNull() {
+		NullRememberMeServices services = new NullRememberMeServices();
+		assertNull(services.autoLogin(null, null));
+		services.loginFail(null, null);
+		services.loginSuccess(null, null, null);
+		assertTrue(true);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java
index 572355ec12..6f3dce54d3 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/PersistentTokenBasedRememberMeServicesTests.java
@@ -25,133 +25,142 @@ import org.springframework.security.web.authentication.rememberme.AbstractRememb
  * @author Luke Taylor
  */
 public class PersistentTokenBasedRememberMeServicesTests {
-    private PersistentTokenBasedRememberMeServices services;
+	private PersistentTokenBasedRememberMeServices services;
 
-    private MockTokenRepository repo;
+	private MockTokenRepository repo;
 
-    @Before
-    public void setUpData() throws Exception {
-        services = new PersistentTokenBasedRememberMeServices("key",
-                new AbstractRememberMeServicesTests.MockUserDetailsService(AbstractRememberMeServicesTests.joe, false),
-                new InMemoryTokenRepositoryImpl());
-        services.setCookieName("mycookiename");
-        // Default to 100 days (see SEC-1081).
-        services.setTokenValiditySeconds(100 * 24 * 60 * 60);
-        services.afterPropertiesSet();
-    }
+	@Before
+	public void setUpData() throws Exception {
+		services = new PersistentTokenBasedRememberMeServices("key",
+				new AbstractRememberMeServicesTests.MockUserDetailsService(
+						AbstractRememberMeServicesTests.joe, false),
+				new InMemoryTokenRepositoryImpl());
+		services.setCookieName("mycookiename");
+		// Default to 100 days (see SEC-1081).
+		services.setTokenValiditySeconds(100 * 24 * 60 * 60);
+		services.afterPropertiesSet();
+	}
 
-    @Test(expected = InvalidCookieException.class)
-    public void loginIsRejectedWithWrongNumberOfCookieTokens() {
-        services.processAutoLoginCookie(new String[] {"series", "token", "extra"}, new MockHttpServletRequest(),
-                new MockHttpServletResponse());
-    }
+	@Test(expected = InvalidCookieException.class)
+	public void loginIsRejectedWithWrongNumberOfCookieTokens() {
+		services.processAutoLoginCookie(new String[] { "series", "token", "extra" },
+				new MockHttpServletRequest(), new MockHttpServletResponse());
+	}
 
-    @Test(expected = RememberMeAuthenticationException.class)
-    public void loginIsRejectedWhenNoTokenMatchingSeriesIsFound() {
-        services = create(null);
-        services.processAutoLoginCookie(new String[] {"series", "token"}, new MockHttpServletRequest(),
-                new MockHttpServletResponse());
-    }
+	@Test(expected = RememberMeAuthenticationException.class)
+	public void loginIsRejectedWhenNoTokenMatchingSeriesIsFound() {
+		services = create(null);
+		services.processAutoLoginCookie(new String[] { "series", "token" },
+				new MockHttpServletRequest(), new MockHttpServletResponse());
+	}
 
-    @Test(expected = RememberMeAuthenticationException.class)
-    public void loginIsRejectedWhenTokenIsExpired() {
-        services = create(new PersistentRememberMeToken("joe", "series","token", new Date(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(1) - 100)));
-        services.setTokenValiditySeconds(1);
+	@Test(expected = RememberMeAuthenticationException.class)
+	public void loginIsRejectedWhenTokenIsExpired() {
+		services = create(new PersistentRememberMeToken("joe", "series", "token",
+				new Date(System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(1) - 100)));
+		services.setTokenValiditySeconds(1);
 
-        services.processAutoLoginCookie(new String[] {"series", "token"}, new MockHttpServletRequest(),
-                new MockHttpServletResponse());
-    }
+		services.processAutoLoginCookie(new String[] { "series", "token" },
+				new MockHttpServletRequest(), new MockHttpServletResponse());
+	}
 
-    @Test(expected = CookieTheftException.class)
-    public void cookieTheftIsDetectedWhenSeriesAndTokenDontMatch() {
-        services = create(new PersistentRememberMeToken("joe", "series","wrongtoken", new Date()));
-        services.processAutoLoginCookie(new String[] {"series", "token"}, new MockHttpServletRequest(),
-                new MockHttpServletResponse());
-    }
+	@Test(expected = CookieTheftException.class)
+	public void cookieTheftIsDetectedWhenSeriesAndTokenDontMatch() {
+		services = create(new PersistentRememberMeToken("joe", "series", "wrongtoken",
+				new Date()));
+		services.processAutoLoginCookie(new String[] { "series", "token" },
+				new MockHttpServletRequest(), new MockHttpServletResponse());
+	}
 
-    @Test
-    public void successfulAutoLoginCreatesNewTokenAndCookieWithSameSeries() {
-        services = create(new PersistentRememberMeToken("joe", "series","token", new Date()));
-        // 12 => b64 length will be 16
-        services.setTokenLength(12);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.processAutoLoginCookie(new String[] {"series", "token"}, new MockHttpServletRequest(), response);
-        assertEquals("series",repo.getStoredToken().getSeries());
-        assertEquals(16, repo.getStoredToken().getTokenValue().length());
-        String[] cookie = services.decodeCookie(response.getCookie("mycookiename").getValue());
-        assertEquals("series", cookie[0]);
-        assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]);
-    }
+	@Test
+	public void successfulAutoLoginCreatesNewTokenAndCookieWithSameSeries() {
+		services = create(new PersistentRememberMeToken("joe", "series", "token",
+				new Date()));
+		// 12 => b64 length will be 16
+		services.setTokenLength(12);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.processAutoLoginCookie(new String[] { "series", "token" },
+				new MockHttpServletRequest(), response);
+		assertEquals("series", repo.getStoredToken().getSeries());
+		assertEquals(16, repo.getStoredToken().getTokenValue().length());
+		String[] cookie = services.decodeCookie(response.getCookie("mycookiename")
+				.getValue());
+		assertEquals("series", cookie[0]);
+		assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]);
+	}
 
-    @Test
-    public void loginSuccessCreatesNewTokenAndCookieWithNewSeries() {
-        services = create(null);
-        services.setAlwaysRemember(true);
-        services.setTokenLength(12);
-        services.setSeriesLength(12);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.loginSuccess(new MockHttpServletRequest(),
-                response, new UsernamePasswordAuthenticationToken("joe","password"));
-        assertEquals(16, repo.getStoredToken().getSeries().length());
-        assertEquals(16, repo.getStoredToken().getTokenValue().length());
+	@Test
+	public void loginSuccessCreatesNewTokenAndCookieWithNewSeries() {
+		services = create(null);
+		services.setAlwaysRemember(true);
+		services.setTokenLength(12);
+		services.setSeriesLength(12);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.loginSuccess(new MockHttpServletRequest(), response,
+				new UsernamePasswordAuthenticationToken("joe", "password"));
+		assertEquals(16, repo.getStoredToken().getSeries().length());
+		assertEquals(16, repo.getStoredToken().getTokenValue().length());
 
-        String[] cookie = services.decodeCookie(response.getCookie("mycookiename").getValue());
+		String[] cookie = services.decodeCookie(response.getCookie("mycookiename")
+				.getValue());
 
-        assertEquals(repo.getStoredToken().getSeries(), cookie[0]);
-        assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]);
-    }
+		assertEquals(repo.getStoredToken().getSeries(), cookie[0]);
+		assertEquals(repo.getStoredToken().getTokenValue(), cookie[1]);
+	}
 
-    @Test
-    public void logoutClearsUsersTokenAndCookie() throws Exception {
-        Cookie cookie = new Cookie("mycookiename", "somevalue");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services = create(new PersistentRememberMeToken("joe", "series","token", new Date()));
-        services.logout(request, response, new TestingAuthenticationToken("joe","somepass","SOME_AUTH"));
-        Cookie returnedCookie = response.getCookie("mycookiename");
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
+	@Test
+	public void logoutClearsUsersTokenAndCookie() throws Exception {
+		Cookie cookie = new Cookie("mycookiename", "somevalue");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services = create(new PersistentRememberMeToken("joe", "series", "token",
+				new Date()));
+		services.logout(request, response, new TestingAuthenticationToken("joe",
+				"somepass", "SOME_AUTH"));
+		Cookie returnedCookie = response.getCookie("mycookiename");
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
 
-        // SEC-1280
-        services.logout(request, response, null);
-    }
+		// SEC-1280
+		services.logout(request, response, null);
+	}
 
-    private PersistentTokenBasedRememberMeServices create(PersistentRememberMeToken token) {
-        repo = new MockTokenRepository(token);
-        PersistentTokenBasedRememberMeServices services =  new PersistentTokenBasedRememberMeServices("key",
-                new AbstractRememberMeServicesTests.MockUserDetailsService(AbstractRememberMeServicesTests.joe, false),
-                repo);
+	private PersistentTokenBasedRememberMeServices create(PersistentRememberMeToken token) {
+		repo = new MockTokenRepository(token);
+		PersistentTokenBasedRememberMeServices services = new PersistentTokenBasedRememberMeServices(
+				"key", new AbstractRememberMeServicesTests.MockUserDetailsService(
+						AbstractRememberMeServicesTests.joe, false), repo);
 
-        services.setCookieName("mycookiename");
-        return services;
-    }
+		services.setCookieName("mycookiename");
+		return services;
+	}
 
-    private class MockTokenRepository implements PersistentTokenRepository {
-        private PersistentRememberMeToken storedToken;
+	private class MockTokenRepository implements PersistentTokenRepository {
+		private PersistentRememberMeToken storedToken;
 
-        private MockTokenRepository(PersistentRememberMeToken token) {
-            storedToken = token;
-        }
+		private MockTokenRepository(PersistentRememberMeToken token) {
+			storedToken = token;
+		}
 
-        public void createNewToken(PersistentRememberMeToken token) {
-            storedToken = token;
-        }
+		public void createNewToken(PersistentRememberMeToken token) {
+			storedToken = token;
+		}
 
-        public void updateToken(String series, String tokenValue, Date lastUsed) {
-            storedToken = new PersistentRememberMeToken(storedToken.getUsername(), storedToken.getSeries(),
-                    tokenValue, lastUsed);
-        }
+		public void updateToken(String series, String tokenValue, Date lastUsed) {
+			storedToken = new PersistentRememberMeToken(storedToken.getUsername(),
+					storedToken.getSeries(), tokenValue, lastUsed);
+		}
 
-        public PersistentRememberMeToken getTokenForSeries(String seriesId) {
-            return storedToken;
-        }
+		public PersistentRememberMeToken getTokenForSeries(String seriesId) {
+			return storedToken;
+		}
 
-        public void removeUserTokens(String username) {
-        }
+		public void removeUserTokens(String username) {
+		}
 
-        PersistentRememberMeToken getStoredToken() {
-            return storedToken;
-        }
-    }
+		PersistentRememberMeToken getStoredToken() {
+			return storedToken;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java
index a32d189daa..afc35331ab 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java
@@ -37,135 +37,151 @@ import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Tests {@link RememberMeAuthenticationFilter}.
  *
  * @author Ben Alex
  */
 public class RememberMeAuthenticationFilterTests {
-    Authentication remembered = new TestingAuthenticationToken("remembered", "password","ROLE_REMEMBERED");
+	Authentication remembered = new TestingAuthenticationToken("remembered", "password",
+			"ROLE_REMEMBERED");
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() {
-        SecurityContextHolder.clearContext();
-    }
+	@Before
+	public void setUp() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testDetectsAuthenticationManagerProperty() {
-        new RememberMeAuthenticationFilter(null, new NullRememberMeServices());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsAuthenticationManagerProperty() {
+		new RememberMeAuthenticationFilter(null, new NullRememberMeServices());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testDetectsRememberMeServicesProperty() {
-        new RememberMeAuthenticationFilter(mock(AuthenticationManager.class), null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testDetectsRememberMeServicesProperty() {
+		new RememberMeAuthenticationFilter(mock(AuthenticationManager.class), null);
+	}
 
-    @Test
-    public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception {
-        // Put an Authentication object into the SecurityContextHolder
-        Authentication originalAuth = new TestingAuthenticationToken("user", "password","ROLE_A");
-        SecurityContextHolder.getContext().setAuthentication(originalAuth);
+	@Test
+	public void testOperationWhenAuthenticationExistsInContextHolder() throws Exception {
+		// Put an Authentication object into the SecurityContextHolder
+		Authentication originalAuth = new TestingAuthenticationToken("user", "password",
+				"ROLE_A");
+		SecurityContextHolder.getContext().setAuthentication(originalAuth);
 
-        // Setup our filter correctly
-        RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(mock(AuthenticationManager.class), new MockRememberMeServices(remembered));
-        filter.afterPropertiesSet();
+		// Setup our filter correctly
+		RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(
+				mock(AuthenticationManager.class), new MockRememberMeServices(remembered));
+		filter.afterPropertiesSet();
 
-        // Test
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        FilterChain fc = mock(FilterChain.class);
-        request.setRequestURI("x");
-        filter.doFilter(request, new MockHttpServletResponse(), fc);
+		// Test
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		FilterChain fc = mock(FilterChain.class);
+		request.setRequestURI("x");
+		filter.doFilter(request, new MockHttpServletResponse(), fc);
 
-        // Ensure filter didn't change our original object
-        assertSame(originalAuth, SecurityContextHolder.getContext().getAuthentication());
-        verify(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		// Ensure filter didn't change our original object
+		assertSame(originalAuth, SecurityContextHolder.getContext().getAuthentication());
+		verify(fc)
+				.doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void testOperationWhenNoAuthenticationInContextHolder() throws Exception {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(remembered)).thenReturn(remembered);
+	@Test
+	public void testOperationWhenNoAuthenticationInContextHolder() throws Exception {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(remembered)).thenReturn(remembered);
 
-        RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, new MockRememberMeServices(remembered));
-        filter.afterPropertiesSet();
+		RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am,
+				new MockRememberMeServices(remembered));
+		filter.afterPropertiesSet();
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        FilterChain fc = mock(FilterChain.class);
-        request.setRequestURI("x");
-        filter.doFilter(request, new MockHttpServletResponse(), fc);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		FilterChain fc = mock(FilterChain.class);
+		request.setRequestURI("x");
+		filter.doFilter(request, new MockHttpServletResponse(), fc);
 
-        // Ensure filter setup with our remembered authentication object
-        assertSame(remembered, SecurityContextHolder.getContext().getAuthentication());
-        verify(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		// Ensure filter setup with our remembered authentication object
+		assertSame(remembered, SecurityContextHolder.getContext().getAuthentication());
+		verify(fc)
+				.doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void onUnsuccessfulLoginIsCalledWhenProviderRejectsAuth() throws Exception {
-        final Authentication failedAuth = new TestingAuthenticationToken("failed", "");
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(any(Authentication.class))).thenThrow(new BadCredentialsException(""));
+	@Test
+	public void onUnsuccessfulLoginIsCalledWhenProviderRejectsAuth() throws Exception {
+		final Authentication failedAuth = new TestingAuthenticationToken("failed", "");
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(any(Authentication.class))).thenThrow(
+				new BadCredentialsException(""));
 
+		RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am,
+				new MockRememberMeServices(remembered)) {
+			protected void onUnsuccessfulAuthentication(HttpServletRequest request,
+					HttpServletResponse response, AuthenticationException failed) {
+				super.onUnsuccessfulAuthentication(request, response, failed);
+				SecurityContextHolder.getContext().setAuthentication(failedAuth);
+			}
+		};
+		filter.setApplicationEventPublisher(mock(ApplicationEventPublisher.class));
+		filter.afterPropertiesSet();
 
-        RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, new MockRememberMeServices(remembered)) {
-            protected void onUnsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, AuthenticationException failed) {
-                super.onUnsuccessfulAuthentication(request, response, failed);
-                SecurityContextHolder.getContext().setAuthentication(failedAuth);
-            }
-        };
-        filter.setApplicationEventPublisher(mock(ApplicationEventPublisher.class));
-        filter.afterPropertiesSet();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		FilterChain fc = mock(FilterChain.class);
+		request.setRequestURI("x");
+		filter.doFilter(request, new MockHttpServletResponse(), fc);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        FilterChain fc = mock(FilterChain.class);
-        request.setRequestURI("x");
-        filter.doFilter(request, new MockHttpServletResponse(), fc);
+		assertSame(failedAuth, SecurityContextHolder.getContext().getAuthentication());
+		verify(fc)
+				.doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
+	}
 
-        assertSame(failedAuth, SecurityContextHolder.getContext().getAuthentication());
-        verify(fc).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+	@Test
+	public void authenticationSuccessHandlerIsInvokedOnSuccessfulAuthenticationIfSet()
+			throws Exception {
+		AuthenticationManager am = mock(AuthenticationManager.class);
+		when(am.authenticate(remembered)).thenReturn(remembered);
+		RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am,
+				new MockRememberMeServices(remembered));
+		filter.setAuthenticationSuccessHandler(new SimpleUrlAuthenticationSuccessHandler(
+				"/target"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain fc = mock(FilterChain.class);
+		request.setRequestURI("x");
+		filter.doFilter(request, response, fc);
 
-    @Test
-    public void authenticationSuccessHandlerIsInvokedOnSuccessfulAuthenticationIfSet() throws Exception {
-        AuthenticationManager am = mock(AuthenticationManager.class);
-        when(am.authenticate(remembered)).thenReturn(remembered);
-        RememberMeAuthenticationFilter filter = new RememberMeAuthenticationFilter(am, new MockRememberMeServices(remembered));
-        filter.setAuthenticationSuccessHandler(new SimpleUrlAuthenticationSuccessHandler("/target"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain fc = mock(FilterChain.class);
-        request.setRequestURI("x");
-        filter.doFilter(request, response, fc);
+		assertEquals("/target", response.getRedirectedUrl());
 
-        assertEquals("/target", response.getRedirectedUrl());
+		// Should return after success handler is invoked, so chain should not proceed
+		verifyZeroInteractions(fc);
+	}
 
-        // Should return after success handler is invoked, so chain should not proceed
-        verifyZeroInteractions(fc);
-    }
+	// ~ Inner Classes
+	// ==================================================================================================
 
-    //~ Inner Classes ==================================================================================================
+	private class MockRememberMeServices implements RememberMeServices {
+		private Authentication authToReturn;
 
-    private class MockRememberMeServices implements RememberMeServices {
-        private Authentication authToReturn;
+		public MockRememberMeServices(Authentication authToReturn) {
+			this.authToReturn = authToReturn;
+		}
 
-        public MockRememberMeServices(Authentication authToReturn) {
-            this.authToReturn = authToReturn;
-        }
+		public Authentication autoLogin(HttpServletRequest request,
+				HttpServletResponse response) {
+			return authToReturn;
+		}
 
-        public Authentication autoLogin(HttpServletRequest request, HttpServletResponse response) {
-            return authToReturn;
-        }
+		public void loginFail(HttpServletRequest request, HttpServletResponse response) {
+		}
 
-        public void loginFail(HttpServletRequest request, HttpServletResponse response) {}
-
-        public void loginSuccess(HttpServletRequest request, HttpServletResponse response,
-            Authentication successfulAuthentication) {}
-    }
+		public void loginSuccess(HttpServletRequest request,
+				HttpServletResponse response, Authentication successfulAuthentication) {
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java
index 2267ea5785..f714cc418c 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/TokenBasedRememberMeServicesTests.java
@@ -39,285 +39,321 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.util.StringUtils;
 
 /**
- * Tests {@link org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices}.
+ * Tests
+ * {@link org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices}
+ * .
  *
  * @author Ben Alex
  */
 public class TokenBasedRememberMeServicesTests {
-    private UserDetailsService uds;
-    private UserDetails user = new User("someone", "password", true, true, true, true,
-            AuthorityUtils.createAuthorityList("ROLE_ABC"));
-    private TokenBasedRememberMeServices services;
+	private UserDetailsService uds;
+	private UserDetails user = new User("someone", "password", true, true, true, true,
+			AuthorityUtils.createAuthorityList("ROLE_ABC"));
+	private TokenBasedRememberMeServices services;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void createTokenBasedRememberMeServices() {
-        uds = mock(UserDetailsService.class);
-        services = new TokenBasedRememberMeServices("key",uds);
-    }
+	@Before
+	public void createTokenBasedRememberMeServices() {
+		uds = mock(UserDetailsService.class);
+		services = new TokenBasedRememberMeServices("key", uds);
+	}
 
-    void udsWillReturnUser() {
-        when(uds.loadUserByUsername(any(String.class))).thenReturn(user);
-    }
+	void udsWillReturnUser() {
+		when(uds.loadUserByUsername(any(String.class))).thenReturn(user);
+	}
 
-    void udsWillThrowNotFound() {
-        when(uds.loadUserByUsername(any(String.class))).thenThrow(new UsernameNotFoundException(""));
-    }
+	void udsWillThrowNotFound() {
+		when(uds.loadUserByUsername(any(String.class))).thenThrow(
+				new UsernameNotFoundException(""));
+	}
 
-    private long determineExpiryTimeFromBased64EncodedToken(String validToken) {
-        String cookieAsPlainText = new String(Base64.decodeBase64(validToken.getBytes()));
-        String[] cookieTokens = StringUtils.delimitedListToStringArray(cookieAsPlainText, ":");
+	private long determineExpiryTimeFromBased64EncodedToken(String validToken) {
+		String cookieAsPlainText = new String(Base64.decodeBase64(validToken.getBytes()));
+		String[] cookieTokens = StringUtils.delimitedListToStringArray(cookieAsPlainText,
+				":");
 
-        if (cookieTokens.length == 3) {
-            try {
-                return Long.parseLong(cookieTokens[1]);
-            } catch (NumberFormatException ignored) {}
-        }
+		if (cookieTokens.length == 3) {
+			try {
+				return Long.parseLong(cookieTokens[1]);
+			}
+			catch (NumberFormatException ignored) {
+			}
+		}
 
-        return -1;
-    }
+		return -1;
+	}
 
-    private String generateCorrectCookieContentForToken(long expiryTime, String username, String password, String key) {
-        // format is:
-        //     username + ":" + expiryTime + ":" + Md5Hex(username + ":" + expiryTime + ":" + password + ":" + key)
-        String signatureValue = DigestUtils.md5Hex(username + ":" + expiryTime + ":" + password + ":" + key);
-        String tokenValue = username + ":" + expiryTime + ":" + signatureValue;
+	private String generateCorrectCookieContentForToken(long expiryTime, String username,
+			String password, String key) {
+		// format is:
+		// username + ":" + expiryTime + ":" + Md5Hex(username + ":" + expiryTime + ":" +
+		// password + ":" + key)
+		String signatureValue = DigestUtils.md5Hex(username + ":" + expiryTime + ":"
+				+ password + ":" + key);
+		String tokenValue = username + ":" + expiryTime + ":" + signatureValue;
 
-        return new String(Base64.encodeBase64(tokenValue.getBytes()));
-    }
+		return new String(Base64.encodeBase64(tokenValue.getBytes()));
+	}
 
-    @Test
-    public void autoLoginReturnsNullIfNoCookiePresented() throws Exception {
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void autoLoginReturnsNullIfNoCookiePresented() throws Exception {
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        Authentication result = services.autoLogin(new MockHttpServletRequest(), response);
-        assertNull(result);
-        // No cookie set
-        assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
-    }
+		Authentication result = services
+				.autoLogin(new MockHttpServletRequest(), response);
+		assertNull(result);
+		// No cookie set
+		assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
+	}
 
-    @Test
-    public void autoLoginIgnoresUnrelatedCookie() throws Exception {
-        Cookie cookie = new Cookie("unrelated_cookie", "foobar");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void autoLoginIgnoresUnrelatedCookie() throws Exception {
+		Cookie cookie = new Cookie("unrelated_cookie", "foobar");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        Authentication result = services.autoLogin(request, response);
+		Authentication result = services.autoLogin(request, response);
 
-        assertNull(result);
-        assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
-    }
+		assertNull(result);
+		assertNull(response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY));
+	}
 
-    @Test
-    public void autoLoginReturnsNullForExpiredCookieAndClearsCookie() throws Exception {
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                generateCorrectCookieContentForToken(System.currentTimeMillis() - 1000000, "someone", "password", "key"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginReturnsNullForExpiredCookieAndClearsCookie() throws Exception {
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				generateCorrectCookieContentForToken(
+						System.currentTimeMillis() - 1000000, "someone", "password",
+						"key"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        assertNull(services.autoLogin(request, response));
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		assertNull(services.autoLogin(request, response));
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginReturnsNullAndClearsCookieIfMissingThreeTokensInCookieValue() throws Exception {
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                new String(Base64.encodeBase64("x".getBytes())));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginReturnsNullAndClearsCookieIfMissingThreeTokensInCookieValue()
+			throws Exception {
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, new String(
+				Base64.encodeBase64("x".getBytes())));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        assertNull(services.autoLogin(request, response));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		assertNull(services.autoLogin(request, response));
 
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginClearsNonBase64EncodedCookie() throws Exception {
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                "NOT_BASE_64_ENCODED");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginClearsNonBase64EncodedCookie() throws Exception {
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				"NOT_BASE_64_ENCODED");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        assertNull(services.autoLogin(request, response));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		assertNull(services.autoLogin(request, response));
 
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginClearsCookieIfSignatureBlocksDoesNotMatchExpectedValue() throws Exception {
-        udsWillReturnUser();
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                generateCorrectCookieContentForToken(System.currentTimeMillis() + 1000000, "someone", "password",
-                    "WRONG_KEY"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginClearsCookieIfSignatureBlocksDoesNotMatchExpectedValue()
+			throws Exception {
+		udsWillReturnUser();
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				generateCorrectCookieContentForToken(
+						System.currentTimeMillis() + 1000000, "someone", "password",
+						"WRONG_KEY"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        assertNull(services.autoLogin(request, response));
+		assertNull(services.autoLogin(request, response));
 
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginClearsCookieIfTokenDoesNotContainANumberInCookieValue() throws Exception {
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                new String(Base64.encodeBase64("username:NOT_A_NUMBER:signature".getBytes())));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginClearsCookieIfTokenDoesNotContainANumberInCookieValue()
+			throws Exception {
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY, new String(
+				Base64.encodeBase64("username:NOT_A_NUMBER:signature".getBytes())));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        assertNull(services.autoLogin(request, response));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		assertNull(services.autoLogin(request, response));
 
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginClearsCookieIfUserNotFound() throws Exception {
-        udsWillThrowNotFound();
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                generateCorrectCookieContentForToken(System.currentTimeMillis() + 1000000, "someone", "password", "key"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginClearsCookieIfUserNotFound() throws Exception {
+		udsWillThrowNotFound();
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				generateCorrectCookieContentForToken(
+						System.currentTimeMillis() + 1000000, "someone", "password",
+						"key"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        assertNull(services.autoLogin(request, response));
+		assertNull(services.autoLogin(request, response));
 
-        Cookie returnedCookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(returnedCookie);
-        assertEquals(0, returnedCookie.getMaxAge());
-    }
+		Cookie returnedCookie = response
+				.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(returnedCookie);
+		assertEquals(0, returnedCookie.getMaxAge());
+	}
 
-    @Test
-    public void autoLoginWithValidTokenAndUserSucceeds() throws Exception {
-        udsWillReturnUser();
-        Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
-                generateCorrectCookieContentForToken(System.currentTimeMillis() + 1000000, "someone", "password", "key"));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setCookies(cookie);
+	@Test
+	public void autoLoginWithValidTokenAndUserSucceeds() throws Exception {
+		udsWillReturnUser();
+		Cookie cookie = new Cookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY,
+				generateCorrectCookieContentForToken(
+						System.currentTimeMillis() + 1000000, "someone", "password",
+						"key"));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setCookies(cookie);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        Authentication result = services.autoLogin(request, response);
+		Authentication result = services.autoLogin(request, response);
 
-        assertNotNull(result);
-        assertEquals(user, result.getPrincipal());
-    }
+		assertNotNull(result);
+		assertEquals(user, result.getPrincipal());
+	}
 
-    @Test
-    public void testGettersSetters() {
-        assertEquals(uds, services.getUserDetailsService());
+	@Test
+	public void testGettersSetters() {
+		assertEquals(uds, services.getUserDetailsService());
 
-        assertEquals("key", services.getKey());
+		assertEquals("key", services.getKey());
 
-        assertEquals(DEFAULT_PARAMETER, services.getParameter());
-        services.setParameter("some_param");
-        assertEquals("some_param", services.getParameter());
+		assertEquals(DEFAULT_PARAMETER, services.getParameter());
+		services.setParameter("some_param");
+		assertEquals("some_param", services.getParameter());
 
-        services.setTokenValiditySeconds(12);
-        assertEquals(12, services.getTokenValiditySeconds());
-    }
+		services.setTokenValiditySeconds(12);
+		assertEquals(12, services.getTokenValiditySeconds());
+	}
 
-    @Test
-    public void loginFailClearsCookie() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.loginFail(request, response);
+	@Test
+	public void loginFailClearsCookie() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.loginFail(request, response);
 
-        Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(cookie);
-        assertEquals(0, cookie.getMaxAge());
-    }
+		Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(cookie);
+		assertEquals(0, cookie.getMaxAge());
+	}
 
-    @Test
-    public void loginSuccessIgnoredIfParameterNotSetOrFalse() {
-        TokenBasedRememberMeServices services = new TokenBasedRememberMeServices("key",new AbstractRememberMeServicesTests.MockUserDetailsService(null, false));
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(DEFAULT_PARAMETER, "false");
+	@Test
+	public void loginSuccessIgnoredIfParameterNotSetOrFalse() {
+		TokenBasedRememberMeServices services = new TokenBasedRememberMeServices("key",
+				new AbstractRememberMeServicesTests.MockUserDetailsService(null, false));
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(DEFAULT_PARAMETER, "false");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password","ROLE_ABC"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.loginSuccess(request, response, new TestingAuthenticationToken(
+				"someone", "password", "ROLE_ABC"));
 
-        Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNull(cookie);
-    }
+		Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNull(cookie);
+	}
 
-    @Test
-    public void loginSuccessNormalWithNonUserDetailsBasedPrincipalSetsExpectedCookie() {
-        // SEC-822
-        services.setTokenValiditySeconds(500000000);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true");
+	@Test
+	public void loginSuccessNormalWithNonUserDetailsBasedPrincipalSetsExpectedCookie() {
+		// SEC-822
+		services.setTokenValiditySeconds(500000000);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password","ROLE_ABC"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.loginSuccess(request, response, new TestingAuthenticationToken(
+				"someone", "password", "ROLE_ABC"));
 
-        Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        String expiryTime = services.decodeCookie(cookie.getValue())[1];
-        long expectedExpiryTime = 1000L * 500000000;
-        expectedExpiryTime += System.currentTimeMillis();
-        assertTrue(Long.parseLong(expiryTime) > expectedExpiryTime - 10000);
-        assertNotNull(cookie);
-        assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge());
-        assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
-        assertTrue(new Date().before(new Date(determineExpiryTimeFromBased64EncodedToken(cookie.getValue()))));
-    }
+		Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		String expiryTime = services.decodeCookie(cookie.getValue())[1];
+		long expectedExpiryTime = 1000L * 500000000;
+		expectedExpiryTime += System.currentTimeMillis();
+		assertTrue(Long.parseLong(expiryTime) > expectedExpiryTime - 10000);
+		assertNotNull(cookie);
+		assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge());
+		assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
+		assertTrue(new Date().before(new Date(
+				determineExpiryTimeFromBased64EncodedToken(cookie.getValue()))));
+	}
 
-    @Test
-    public void loginSuccessNormalWithUserDetailsBasedPrincipalSetsExpectedCookie() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true");
+	@Test
+	public void loginSuccessNormalWithUserDetailsBasedPrincipalSetsExpectedCookie() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(TokenBasedRememberMeServices.DEFAULT_PARAMETER, "true");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password","ROLE_ABC"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.loginSuccess(request, response, new TestingAuthenticationToken(
+				"someone", "password", "ROLE_ABC"));
 
-        Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(cookie);
-        assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge());
-        assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
-        assertTrue(new Date().before(new Date(determineExpiryTimeFromBased64EncodedToken(cookie.getValue()))));
-    }
+		Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(cookie);
+		assertEquals(services.getTokenValiditySeconds(), cookie.getMaxAge());
+		assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
+		assertTrue(new Date().before(new Date(
+				determineExpiryTimeFromBased64EncodedToken(cookie.getValue()))));
+	}
 
-    // SEC-933
-    @Test
-    public void obtainPasswordReturnsNullForTokenWithNullCredentials() throws Exception {
-        TestingAuthenticationToken token = new TestingAuthenticationToken("username", null);
-        assertNull(services.retrievePassword(token));
-    }
+	// SEC-933
+	@Test
+	public void obtainPasswordReturnsNullForTokenWithNullCredentials() throws Exception {
+		TestingAuthenticationToken token = new TestingAuthenticationToken("username",
+				null);
+		assertNull(services.retrievePassword(token));
+	}
 
-    // SEC-949
-    @Test
-    public void negativeValidityPeriodIsSetOnCookieButExpiryTimeRemainsAtTwoWeeks() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(DEFAULT_PARAMETER, "true");
+	// SEC-949
+	@Test
+	public void negativeValidityPeriodIsSetOnCookieButExpiryTimeRemainsAtTwoWeeks()
+			throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(DEFAULT_PARAMETER, "true");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        services.setTokenValiditySeconds(-1);
-        services.loginSuccess(request, response, new TestingAuthenticationToken("someone", "password","ROLE_ABC"));
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		services.setTokenValiditySeconds(-1);
+		services.loginSuccess(request, response, new TestingAuthenticationToken(
+				"someone", "password", "ROLE_ABC"));
 
-        Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
-        assertNotNull(cookie);
-        // Check the expiry time is within 50ms of two weeks from current time
-        assertTrue(determineExpiryTimeFromBased64EncodedToken(cookie.getValue()) - System.currentTimeMillis() >
-                TWO_WEEKS_S - 50);
-        assertEquals(-1, cookie.getMaxAge());
-        assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
-    }
+		Cookie cookie = response.getCookie(SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY);
+		assertNotNull(cookie);
+		// Check the expiry time is within 50ms of two weeks from current time
+		assertTrue(determineExpiryTimeFromBased64EncodedToken(cookie.getValue())
+				- System.currentTimeMillis() > TWO_WEEKS_S - 50);
+		assertEquals(-1, cookie.getMaxAge());
+		assertTrue(Base64.isArrayByteBase64(cookie.getValue().getBytes()));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategyTests.java
index 2c155dbc37..5309100cba 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategyTests.java
@@ -35,28 +35,29 @@ import org.springframework.util.ReflectionUtils;
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ReflectionUtils.class, Method.class})
+@PrepareForTest({ ReflectionUtils.class, Method.class })
 public class ChangeSessionIdAuthenticationStrategyTests {
-    @Mock
-    private Method method;
+	@Mock
+	private Method method;
 
-    @Test(expected = IllegalStateException.class)
-    public void constructChangeIdMethodNotFound() {
-        new ChangeSessionIdAuthenticationStrategy();
-    }
+	@Test(expected = IllegalStateException.class)
+	public void constructChangeIdMethodNotFound() {
+		new ChangeSessionIdAuthenticationStrategy();
+	}
 
-    @Test
-    public void applySessionFixation() throws Exception {
-        spy(ReflectionUtils.class);
-        Method method = mock(Method.class);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession();
-        when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId")).thenReturn(method);
+	@Test
+	public void applySessionFixation() throws Exception {
+		spy(ReflectionUtils.class);
+		Method method = mock(Method.class);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.getSession();
+		when(ReflectionUtils.findMethod(HttpServletRequest.class, "changeSessionId"))
+				.thenReturn(method);
 
-        new ChangeSessionIdAuthenticationStrategy().applySessionFixation(request);
+		new ChangeSessionIdAuthenticationStrategy().applySessionFixation(request);
 
-        verifyStatic();
-        ReflectionUtils.invokeMethod(same(method), eq(request));
-    }
+		verifyStatic();
+		ReflectionUtils.invokeMethod(same(method), eq(request));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java
index 5ab9c06a64..0767e184f1 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategyTests.java
@@ -38,55 +38,60 @@ import org.springframework.security.core.Authentication;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class CompositeSessionAuthenticationStrategyTests {
-    @Mock
-    private SessionAuthenticationStrategy strategy1;
-    @Mock
-    private SessionAuthenticationStrategy strategy2;
-    @Mock
-    private Authentication authentication;
-    @Mock
-    private HttpServletRequest request;
-    @Mock
-    private HttpServletResponse response;
+	@Mock
+	private SessionAuthenticationStrategy strategy1;
+	@Mock
+	private SessionAuthenticationStrategy strategy2;
+	@Mock
+	private Authentication authentication;
+	@Mock
+	private HttpServletRequest request;
+	@Mock
+	private HttpServletResponse response;
 
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegates() {
+		new CompositeSessionAuthenticationStrategy(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegates() {
-        new CompositeSessionAuthenticationStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyDelegates() {
+		new CompositeSessionAuthenticationStrategy(
+				Collections.<SessionAuthenticationStrategy> emptyList());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyDelegates() {
-        new CompositeSessionAuthenticationStrategy(Collections.<SessionAuthenticationStrategy>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorDelegatesContainNull() {
+		new CompositeSessionAuthenticationStrategy(
+				Collections.<SessionAuthenticationStrategy> singletonList(null));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorDelegatesContainNull() {
-        new CompositeSessionAuthenticationStrategy(Collections.<SessionAuthenticationStrategy>singletonList(null));
-    }
+	@Test
+	public void delegatesToAll() {
+		CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy(
+				Arrays.asList(strategy1, strategy2));
+		strategy.onAuthentication(authentication, request, response);
 
-    @Test
-    public void delegatesToAll() {
-        CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy(Arrays.asList(strategy1,strategy2));
-        strategy.onAuthentication(authentication, request, response);
+		verify(strategy1).onAuthentication(authentication, request, response);
+		verify(strategy2).onAuthentication(authentication, request, response);
+	}
 
-        verify(strategy1).onAuthentication(authentication, request, response);
-        verify(strategy2).onAuthentication(authentication, request, response);
-    }
+	@Test
+	public void delegateShortCircuits() {
+		doThrow(new SessionAuthenticationException("oops")).when(strategy1)
+				.onAuthentication(authentication, request, response);
 
+		CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy(
+				Arrays.asList(strategy1, strategy2));
 
-    @Test
-    public void delegateShortCircuits() {
-        doThrow(new SessionAuthenticationException("oops")).when(strategy1).onAuthentication(authentication, request, response);
+		try {
+			strategy.onAuthentication(authentication, request, response);
+			fail("Expected Exception");
+		}
+		catch (SessionAuthenticationException success) {
+		}
 
-        CompositeSessionAuthenticationStrategy strategy = new CompositeSessionAuthenticationStrategy(Arrays.asList(strategy1,strategy2));
-
-        try {
-            strategy.onAuthentication(authentication, request, response);
-            fail("Expected Exception");
-        } catch (SessionAuthenticationException success) {}
-
-        verify(strategy1).onAuthentication(authentication, request, response);
-        verify(strategy2,times(0)).onAuthentication(authentication, request, response);
-    }
+		verify(strategy1).onAuthentication(authentication, request, response);
+		verify(strategy2, times(0)).onAuthentication(authentication, request, response);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java
index 76f5c4fec4..892abe5875 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/session/ConcurrentSessionControlAuthenticationStrategyTests.java
@@ -46,87 +46,96 @@ import org.springframework.security.core.session.SessionRegistry;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class ConcurrentSessionControlAuthenticationStrategyTests {
-    @Mock
-    private SessionRegistry sessionRegistry;
+	@Mock
+	private SessionRegistry sessionRegistry;
 
-    private Authentication authentication;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private SessionInformation sessionInformation;
+	private Authentication authentication;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private SessionInformation sessionInformation;
 
-    private ConcurrentSessionControlAuthenticationStrategy strategy;
+	private ConcurrentSessionControlAuthenticationStrategy strategy;
 
-    @Before
-    public void setup() throws Exception {
-        authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        sessionInformation = new SessionInformation(authentication.getPrincipal(), "unique", new Date(1374766134216L));
+	@Before
+	public void setup() throws Exception {
+		authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		sessionInformation = new SessionInformation(authentication.getPrincipal(),
+				"unique", new Date(1374766134216L));
 
-        strategy = new ConcurrentSessionControlAuthenticationStrategy(sessionRegistry);
-    }
+		strategy = new ConcurrentSessionControlAuthenticationStrategy(sessionRegistry);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullRegistry() {
-        new ConcurrentSessionControlAuthenticationStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullRegistry() {
+		new ConcurrentSessionControlAuthenticationStrategy(null);
+	}
 
-    @Test
-    public void noRegisteredSession() {
-        when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(Collections.<SessionInformation>emptyList());
-        strategy.setMaximumSessions(1);
-        strategy.setExceptionIfMaximumExceeded(true);
+	@Test
+	public void noRegisteredSession() {
+		when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(
+				Collections.<SessionInformation> emptyList());
+		strategy.setMaximumSessions(1);
+		strategy.setExceptionIfMaximumExceeded(true);
 
-        strategy.onAuthentication(authentication, request, response);
+		strategy.onAuthentication(authentication, request, response);
 
-        // no exception
-    }
+		// no exception
+	}
 
-    @Test
-    public void maxSessionsSameSessionId() {
-        MockHttpSession session = new MockHttpSession(new MockServletContext(), sessionInformation.getSessionId());
-        request.setSession(session);
-        when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(Collections.<SessionInformation>singletonList(sessionInformation));
-        strategy.setMaximumSessions(1);
-        strategy.setExceptionIfMaximumExceeded(true);
+	@Test
+	public void maxSessionsSameSessionId() {
+		MockHttpSession session = new MockHttpSession(new MockServletContext(),
+				sessionInformation.getSessionId());
+		request.setSession(session);
+		when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(
+				Collections.<SessionInformation> singletonList(sessionInformation));
+		strategy.setMaximumSessions(1);
+		strategy.setExceptionIfMaximumExceeded(true);
 
-        strategy.onAuthentication(authentication, request, response);
+		strategy.onAuthentication(authentication, request, response);
 
-        // no exception
-    }
+		// no exception
+	}
 
-    @Test(expected = SessionAuthenticationException.class)
-    public void maxSessionsWithException() {
-        when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(Collections.<SessionInformation>singletonList(sessionInformation));
-        strategy.setMaximumSessions(1);
-        strategy.setExceptionIfMaximumExceeded(true);
+	@Test(expected = SessionAuthenticationException.class)
+	public void maxSessionsWithException() {
+		when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(
+				Collections.<SessionInformation> singletonList(sessionInformation));
+		strategy.setMaximumSessions(1);
+		strategy.setExceptionIfMaximumExceeded(true);
 
-        strategy.onAuthentication(authentication, request, response);
-    }
+		strategy.onAuthentication(authentication, request, response);
+	}
 
-    @Test
-    public void maxSessionsExpireExistingUser() {
-        when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(Collections.<SessionInformation>singletonList(sessionInformation));
-        strategy.setMaximumSessions(1);
+	@Test
+	public void maxSessionsExpireExistingUser() {
+		when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(
+				Collections.<SessionInformation> singletonList(sessionInformation));
+		strategy.setMaximumSessions(1);
 
-        strategy.onAuthentication(authentication, request, response);
+		strategy.onAuthentication(authentication, request, response);
 
-        assertThat(sessionInformation.isExpired()).isTrue();
-    }
+		assertThat(sessionInformation.isExpired()).isTrue();
+	}
 
-    @Test
-    public void maxSessionsExpireLeastRecentExistingUser() {
-        SessionInformation moreRecentSessionInfo = new SessionInformation(authentication.getPrincipal(), "unique", new Date(1374766999999L));
-        when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(Arrays.<SessionInformation>asList(moreRecentSessionInfo,sessionInformation));
-        strategy.setMaximumSessions(2);
+	@Test
+	public void maxSessionsExpireLeastRecentExistingUser() {
+		SessionInformation moreRecentSessionInfo = new SessionInformation(
+				authentication.getPrincipal(), "unique", new Date(1374766999999L));
+		when(sessionRegistry.getAllSessions(any(), anyBoolean())).thenReturn(
+				Arrays.<SessionInformation> asList(moreRecentSessionInfo,
+						sessionInformation));
+		strategy.setMaximumSessions(2);
 
-        strategy.onAuthentication(authentication, request, response);
+		strategy.onAuthentication(authentication, request, response);
 
-        assertThat(sessionInformation.isExpired()).isTrue();
-    }
+		assertThat(sessionInformation.isExpired()).isTrue();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setMessageSourceNull() {
-        strategy.setMessageSource(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setMessageSourceNull() {
+		strategy.setMessageSource(null);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java
index 75b2002720..903ca5d272 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategyTests.java
@@ -35,33 +35,34 @@ import org.springframework.security.core.session.SessionRegistry;
 @RunWith(MockitoJUnitRunner.class)
 public class RegisterSessionAuthenticationStrategyTests {
 
-    @Mock
-    private SessionRegistry registry;
+	@Mock
+	private SessionRegistry registry;
 
-    private RegisterSessionAuthenticationStrategy authenticationStrategy;
+	private RegisterSessionAuthenticationStrategy authenticationStrategy;
 
-    private Authentication authentication;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
+	private Authentication authentication;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
 
-    @Before
-    public void setup() {
-        authenticationStrategy = new RegisterSessionAuthenticationStrategy(registry);
-        authentication = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-    }
+	@Before
+	public void setup() {
+		authenticationStrategy = new RegisterSessionAuthenticationStrategy(registry);
+		authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullRegistry() {
-        new RegisterSessionAuthenticationStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullRegistry() {
+		new RegisterSessionAuthenticationStrategy(null);
+	}
 
-    @Test
-    public void onAuthenticationRegistersSession() {
-        authenticationStrategy.onAuthentication(authentication, request, response);
+	@Test
+	public void onAuthenticationRegistersSession() {
+		authenticationStrategy.onAuthentication(authentication, request, response);
 
-        verify(registry).registerNewSession(request.getSession().getId(), authentication.getPrincipal());
-    }
+		verify(registry).registerNewSession(request.getSession().getId(),
+				authentication.getPrincipal());
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java
index 54c68e1642..ebee64f07e 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java
@@ -42,380 +42,406 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationSu
 import javax.servlet.FilterChain;
 import java.util.*;
 
-
 /**
- * Tests {@link org.springframework.security.web.authentication.switchuser.SwitchUserFilter}.
+ * Tests
+ * {@link org.springframework.security.web.authentication.switchuser.SwitchUserFilter}.
  *
  * @author Mark St.Godard
  * @author Luke Taylor
  */
 public class SwitchUserFilterTests {
-    private final static List<GrantedAuthority> ROLES_12 = AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO");
-
-    @Before
-    public void authenticateCurrentUser() {
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("dano", "hawaii50");
-        SecurityContextHolder.getContext().setAuthentication(auth);
-    }
-
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
-
-    private MockHttpServletRequest createMockSwitchRequest() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setScheme("http");
-        request.setServerName("localhost");
-        request.setRequestURI("/login/impersonate");
-
-        return request;
-    }
-
-    private Authentication switchToUser(String name) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter("myUsernameParameter", name);
-
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUsernameParameter("myUsernameParameter");
-        filter.setUserDetailsService(new MockUserDetailsService());
-
-        return filter.attemptSwitchUser(request);
-
-    }
-
-    @Test
-    public void requiresExitUserMatchesCorrectly() {
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setExitUserUrl("/j_spring_security_my_exit_user");
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/j_spring_security_my_exit_user");
-
-        assertTrue(filter.requiresExitUser(request));
-    }
-
-    @Test
-    public void requiresSwitchMatchesCorrectly() {
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setSwitchUserUrl("/j_spring_security_my_switch_user");
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/j_spring_security_my_switch_user");
-
-        assertTrue(filter.requiresSwitchUser(request));
-    }
-
-    @Test(expected=UsernameNotFoundException.class)
-    public void attemptSwitchToUnknownUserFails() throws Exception {
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "user-that-doesnt-exist");
-
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.attemptSwitchUser(request);
-    }
-
-    @Test(expected=DisabledException.class)
-    public void attemptSwitchToUserThatIsDisabledFails() throws Exception {
-        switchToUser("mcgarrett");
-    }
-
-    @Test(expected=AccountExpiredException.class)
-    public void attemptSwitchToUserWithAccountExpiredFails() throws Exception {
-        switchToUser("wofat");
-    }
-
-    @Test(expected=CredentialsExpiredException.class)
-    public void attemptSwitchToUserWithExpiredCredentialsFails() throws Exception {
-        switchToUser("steve");
-    }
-
-    @Test(expected=UsernameNotFoundException.class)
-    public void switchUserWithNullUsernameThrowsException() throws Exception {
-        switchToUser(null);
-    }
-
-    @Test
-    public void attemptSwitchUserIsSuccessfulWithValidUser() throws Exception {
-        assertNotNull(switchToUser("jacklord"));
-    }
-
-    @Test
-    public void switchToLockedAccountCausesRedirectToSwitchFailureUrl() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/login/impersonate");
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "mcgarrett");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setTargetUrl("/target");
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.afterPropertiesSet();
-
-        // Check it with no url set (should get a text response)
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
-        verify(chain, never()).doFilter(request, response);
-
-        assertNotNull(response.getErrorMessage());
-
-        // Now check for the redirect
-        request.setContextPath("/mywebapp");
-        request.setRequestURI("/mywebapp/login/impersonate");
-        filter = new SwitchUserFilter();
-        filter.setTargetUrl("/target");
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setSwitchFailureUrl("/switchfailed");
-        filter.afterPropertiesSet();
-        response = new MockHttpServletResponse();
-
-        chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
-        verify(chain, never()).doFilter(request, response);
-
-        assertEquals("/mywebapp/switchfailed", response.getRedirectedUrl());
-        assertEquals("/switchfailed", FieldUtils.getFieldValue(filter, "switchFailureUrl"));
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void configMissingUserDetailsServiceFails() throws Exception {
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setSwitchUserUrl("/login/impersonate");
-        filter.setExitUserUrl("/logout/impersonate");
-        filter.setTargetUrl("/main.jsp");
-        filter.afterPropertiesSet();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void testBadConfigMissingTargetUrl() throws Exception {
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setSwitchUserUrl("/login/impersonate");
-        filter.setExitUserUrl("/logout/impersonate");
-        filter.afterPropertiesSet();
-    }
-
-    @Test
-    public void defaultProcessesFilterUrlMatchesUrlWithPathParameter() {
-        MockHttpServletRequest request = createMockSwitchRequest();
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setSwitchUserUrl("/login/impersonate");
-
-        request.setRequestURI("/webapp/login/impersonate;jsessionid=8JHDUD723J8");
-        assertTrue(filter.requiresSwitchUser(request));
-    }
-
-    @Test
-    public void exitUserJackLordToDanoSucceeds() throws Exception {
-        // original user
-        UsernamePasswordAuthenticationToken source = new UsernamePasswordAuthenticationToken("dano", "hawaii50", ROLES_12);
-
-        // set current user (Admin)
-        List<GrantedAuthority> adminAuths = new ArrayList<GrantedAuthority>();
-        adminAuths.addAll(ROLES_12);
-        adminAuths.add(new SwitchUserGrantedAuthority("PREVIOUS_ADMINISTRATOR", source));
-        UsernamePasswordAuthenticationToken admin =
-            new UsernamePasswordAuthenticationToken("jacklord", "hawaii50", adminAuths);
-
-        SecurityContextHolder.getContext().setAuthentication(admin);
-
-        MockHttpServletRequest request = createMockSwitchRequest();
-        request.setRequestURI("/logout/impersonate");
-
-        // setup filter
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setExitUserUrl("/logout/impersonate");
-        filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler("/webapp/someOtherUrl"));
-
-        // run 'exit'
-        FilterChain chain = mock(FilterChain.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, chain);
-
-        verify(chain, never()).doFilter(request, response);
-
-        // check current user, should be back to original user (dano)
-        Authentication targetAuth = SecurityContextHolder.getContext().getAuthentication();
-        assertNotNull(targetAuth);
-        assertEquals("dano", targetAuth.getPrincipal());
-    }
-
-    @Test(expected=AuthenticationException.class)
-    public void exitUserWithNoCurrentUserFails() throws Exception {
-        // no current user in secure context
-        SecurityContextHolder.clearContext();
-
-        MockHttpServletRequest request = createMockSwitchRequest();
-        request.setRequestURI("/logout/impersonate");
-
-        // setup filter
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setExitUserUrl("/logout/impersonate");
-
-        // run 'exit', expect fail due to no current user
-        FilterChain chain = mock(FilterChain.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, chain);
-
-        verify(chain, never()).doFilter(request, response);
-    }
-
-    @Test
-    public void redirectToTargetUrlIsCorrect() throws Exception {
-        MockHttpServletRequest request = createMockSwitchRequest();
-        request.setContextPath("/webapp");
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "jacklord");
-        request.setRequestURI("/webapp/login/impersonate");
-
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setSwitchUserUrl("/login/impersonate");
-        filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler("/someOtherUrl"));
-        filter.setUserDetailsService(new MockUserDetailsService());
-
-        FilterChain chain = mock(FilterChain.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        filter.doFilter(request, response, chain);
-
-        verify(chain, never()).doFilter(request, response);
-
-
-        assertEquals("/webapp/someOtherUrl", response.getRedirectedUrl());
-    }
-
-    @Test
-    public void redirectOmitsContextPathIfUseRelativeContextSet() throws Exception {
-        // set current user
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("dano", "hawaii50");
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        MockHttpServletRequest request = createMockSwitchRequest();
-        request.setContextPath("/webapp");
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "jacklord");
-        request.setRequestURI("/webapp/login/impersonate");
-
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setSwitchUserUrl("/login/impersonate");
-        SimpleUrlAuthenticationSuccessHandler switchSuccessHandler =
-            new SimpleUrlAuthenticationSuccessHandler("/someOtherUrl");
-        DefaultRedirectStrategy contextRelativeRedirector = new DefaultRedirectStrategy();
-        contextRelativeRedirector.setContextRelative(true);
-        switchSuccessHandler.setRedirectStrategy(contextRelativeRedirector);
-        filter.setSuccessHandler(switchSuccessHandler);
-        filter.setUserDetailsService(new MockUserDetailsService());
-
-        FilterChain chain = mock(FilterChain.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        filter.doFilter(request, response, chain);
-
-        verify(chain, never()).doFilter(request, response);
-
-
-        assertEquals("/someOtherUrl", response.getRedirectedUrl());
-    }
-
-    @Test
-    public void testSwitchRequestFromDanoToJackLord() throws Exception {
-        // set current user
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("dano", "hawaii50");
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        // http request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/webapp/login/impersonate");
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "jacklord");
-
-        // http response
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // setup filter
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setSwitchUserUrl("/login/impersonate");
-        filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler("/webapp/someOtherUrl"));
-
-        FilterChain chain = mock(FilterChain.class);
-
-        // test updates user token and context
-        filter.doFilter(request, response, chain);
-        verify(chain, never()).doFilter(request, response);
-
-        // check current user
-        Authentication targetAuth = SecurityContextHolder.getContext().getAuthentication();
-        assertNotNull(targetAuth);
-        assertTrue(targetAuth.getPrincipal() instanceof UserDetails);
-        assertEquals("jacklord", ((User) targetAuth.getPrincipal()).getUsername());
-    }
-
-    @Test
-    public void modificationOfAuthoritiesWorks() {
-        UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken("dano", "hawaii50");
-        SecurityContextHolder.getContext().setAuthentication(auth);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY, "jacklord");
-
-        SwitchUserFilter filter = new SwitchUserFilter();
-        filter.setUserDetailsService(new MockUserDetailsService());
-        filter.setSwitchUserAuthorityChanger(new SwitchUserAuthorityChanger() {
-            public Collection<GrantedAuthority> modifyGrantedAuthorities(UserDetails targetUser, Authentication currentAuthentication, Collection<? extends GrantedAuthority> authoritiesToBeGranted) {
-                List <GrantedAuthority>auths = new ArrayList<GrantedAuthority>();
-                auths.add(new SimpleGrantedAuthority("ROLE_NEW"));
-                return auths;
-            }
-        });
-
-        Authentication result = filter.attemptSwitchUser(request);
-        assertTrue(result != null);
-        assertEquals(2, result.getAuthorities().size());
-        assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains("ROLE_NEW"));
-    }
-
-    // SEC-1763
-    @Test
-    public void nestedSwitchesAreNotAllowed() throws Exception {
-        // original user
-        UsernamePasswordAuthenticationToken source = new UsernamePasswordAuthenticationToken("orig", "hawaii50", ROLES_12);
-        SecurityContextHolder.getContext().setAuthentication(source);
-        SecurityContextHolder.getContext().setAuthentication(switchToUser("jacklord"));
-        Authentication switched = switchToUser("dano");
-
-        SwitchUserGrantedAuthority switchedFrom = null;
-
-        for (GrantedAuthority ga: switched.getAuthorities()) {
-            if (ga instanceof SwitchUserGrantedAuthority) {
-                switchedFrom = (SwitchUserGrantedAuthority)ga;
-                break;
-            }
-        }
-
-        assertSame(source, switchedFrom.getSource());
-    }
-
-    //~ Inner Classes ==================================================================================================
-
-    private class MockUserDetailsService implements UserDetailsService {
-        private String password = "hawaii50";
-
-        public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-            // jacklord, dano  (active)
-            // mcgarrett (disabled)
-            // wofat (account expired)
-            // steve (credentials expired)
-            if ("jacklord".equals(username) || "dano".equals(username)) {
-                return new User(username, password, true, true, true, true, ROLES_12);
-            } else if ("mcgarrett".equals(username)) {
-                return new User(username, password, false, true, true, true, ROLES_12);
-            } else if ("wofat".equals(username)) {
-                return new User(username, password, true, false, true, true, ROLES_12);
-            } else if ("steve".equals(username)) {
-                return new User(username, password, true, true, false, true, ROLES_12);
-            } else {
-                throw new UsernameNotFoundException("Could not find: " + username);
-            }
-        }
-    }
+	private final static List<GrantedAuthority> ROLES_12 = AuthorityUtils
+			.createAuthorityList("ROLE_ONE", "ROLE_TWO");
+
+	@Before
+	public void authenticateCurrentUser() {
+		UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+				"dano", "hawaii50");
+		SecurityContextHolder.getContext().setAuthentication(auth);
+	}
+
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
+
+	private MockHttpServletRequest createMockSwitchRequest() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setScheme("http");
+		request.setServerName("localhost");
+		request.setRequestURI("/login/impersonate");
+
+		return request;
+	}
+
+	private Authentication switchToUser(String name) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("myUsernameParameter", name);
+
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUsernameParameter("myUsernameParameter");
+		filter.setUserDetailsService(new MockUserDetailsService());
+
+		return filter.attemptSwitchUser(request);
+
+	}
+
+	@Test
+	public void requiresExitUserMatchesCorrectly() {
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setExitUserUrl("/j_spring_security_my_exit_user");
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/j_spring_security_my_exit_user");
+
+		assertTrue(filter.requiresExitUser(request));
+	}
+
+	@Test
+	public void requiresSwitchMatchesCorrectly() {
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setSwitchUserUrl("/j_spring_security_my_switch_user");
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/j_spring_security_my_switch_user");
+
+		assertTrue(filter.requiresSwitchUser(request));
+	}
+
+	@Test(expected = UsernameNotFoundException.class)
+	public void attemptSwitchToUnknownUserFails() throws Exception {
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"user-that-doesnt-exist");
+
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.attemptSwitchUser(request);
+	}
+
+	@Test(expected = DisabledException.class)
+	public void attemptSwitchToUserThatIsDisabledFails() throws Exception {
+		switchToUser("mcgarrett");
+	}
+
+	@Test(expected = AccountExpiredException.class)
+	public void attemptSwitchToUserWithAccountExpiredFails() throws Exception {
+		switchToUser("wofat");
+	}
+
+	@Test(expected = CredentialsExpiredException.class)
+	public void attemptSwitchToUserWithExpiredCredentialsFails() throws Exception {
+		switchToUser("steve");
+	}
+
+	@Test(expected = UsernameNotFoundException.class)
+	public void switchUserWithNullUsernameThrowsException() throws Exception {
+		switchToUser(null);
+	}
+
+	@Test
+	public void attemptSwitchUserIsSuccessfulWithValidUser() throws Exception {
+		assertNotNull(switchToUser("jacklord"));
+	}
+
+	@Test
+	public void switchToLockedAccountCausesRedirectToSwitchFailureUrl() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/login/impersonate");
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"mcgarrett");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setTargetUrl("/target");
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.afterPropertiesSet();
+
+		// Check it with no url set (should get a text response)
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
+		verify(chain, never()).doFilter(request, response);
+
+		assertNotNull(response.getErrorMessage());
+
+		// Now check for the redirect
+		request.setContextPath("/mywebapp");
+		request.setRequestURI("/mywebapp/login/impersonate");
+		filter = new SwitchUserFilter();
+		filter.setTargetUrl("/target");
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setSwitchFailureUrl("/switchfailed");
+		filter.afterPropertiesSet();
+		response = new MockHttpServletResponse();
+
+		chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
+		verify(chain, never()).doFilter(request, response);
+
+		assertEquals("/mywebapp/switchfailed", response.getRedirectedUrl());
+		assertEquals("/switchfailed",
+				FieldUtils.getFieldValue(filter, "switchFailureUrl"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void configMissingUserDetailsServiceFails() throws Exception {
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setSwitchUserUrl("/login/impersonate");
+		filter.setExitUserUrl("/logout/impersonate");
+		filter.setTargetUrl("/main.jsp");
+		filter.afterPropertiesSet();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testBadConfigMissingTargetUrl() throws Exception {
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setSwitchUserUrl("/login/impersonate");
+		filter.setExitUserUrl("/logout/impersonate");
+		filter.afterPropertiesSet();
+	}
+
+	@Test
+	public void defaultProcessesFilterUrlMatchesUrlWithPathParameter() {
+		MockHttpServletRequest request = createMockSwitchRequest();
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setSwitchUserUrl("/login/impersonate");
+
+		request.setRequestURI("/webapp/login/impersonate;jsessionid=8JHDUD723J8");
+		assertTrue(filter.requiresSwitchUser(request));
+	}
+
+	@Test
+	public void exitUserJackLordToDanoSucceeds() throws Exception {
+		// original user
+		UsernamePasswordAuthenticationToken source = new UsernamePasswordAuthenticationToken(
+				"dano", "hawaii50", ROLES_12);
+
+		// set current user (Admin)
+		List<GrantedAuthority> adminAuths = new ArrayList<GrantedAuthority>();
+		adminAuths.addAll(ROLES_12);
+		adminAuths.add(new SwitchUserGrantedAuthority("PREVIOUS_ADMINISTRATOR", source));
+		UsernamePasswordAuthenticationToken admin = new UsernamePasswordAuthenticationToken(
+				"jacklord", "hawaii50", adminAuths);
+
+		SecurityContextHolder.getContext().setAuthentication(admin);
+
+		MockHttpServletRequest request = createMockSwitchRequest();
+		request.setRequestURI("/logout/impersonate");
+
+		// setup filter
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setExitUserUrl("/logout/impersonate");
+		filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler(
+				"/webapp/someOtherUrl"));
+
+		// run 'exit'
+		FilterChain chain = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, chain);
+
+		verify(chain, never()).doFilter(request, response);
+
+		// check current user, should be back to original user (dano)
+		Authentication targetAuth = SecurityContextHolder.getContext()
+				.getAuthentication();
+		assertNotNull(targetAuth);
+		assertEquals("dano", targetAuth.getPrincipal());
+	}
+
+	@Test(expected = AuthenticationException.class)
+	public void exitUserWithNoCurrentUserFails() throws Exception {
+		// no current user in secure context
+		SecurityContextHolder.clearContext();
+
+		MockHttpServletRequest request = createMockSwitchRequest();
+		request.setRequestURI("/logout/impersonate");
+
+		// setup filter
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setExitUserUrl("/logout/impersonate");
+
+		// run 'exit', expect fail due to no current user
+		FilterChain chain = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, chain);
+
+		verify(chain, never()).doFilter(request, response);
+	}
+
+	@Test
+	public void redirectToTargetUrlIsCorrect() throws Exception {
+		MockHttpServletRequest request = createMockSwitchRequest();
+		request.setContextPath("/webapp");
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"jacklord");
+		request.setRequestURI("/webapp/login/impersonate");
+
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setSwitchUserUrl("/login/impersonate");
+		filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler(
+				"/someOtherUrl"));
+		filter.setUserDetailsService(new MockUserDetailsService());
+
+		FilterChain chain = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		filter.doFilter(request, response, chain);
+
+		verify(chain, never()).doFilter(request, response);
+
+		assertEquals("/webapp/someOtherUrl", response.getRedirectedUrl());
+	}
+
+	@Test
+	public void redirectOmitsContextPathIfUseRelativeContextSet() throws Exception {
+		// set current user
+		UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+				"dano", "hawaii50");
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		MockHttpServletRequest request = createMockSwitchRequest();
+		request.setContextPath("/webapp");
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"jacklord");
+		request.setRequestURI("/webapp/login/impersonate");
+
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setSwitchUserUrl("/login/impersonate");
+		SimpleUrlAuthenticationSuccessHandler switchSuccessHandler = new SimpleUrlAuthenticationSuccessHandler(
+				"/someOtherUrl");
+		DefaultRedirectStrategy contextRelativeRedirector = new DefaultRedirectStrategy();
+		contextRelativeRedirector.setContextRelative(true);
+		switchSuccessHandler.setRedirectStrategy(contextRelativeRedirector);
+		filter.setSuccessHandler(switchSuccessHandler);
+		filter.setUserDetailsService(new MockUserDetailsService());
+
+		FilterChain chain = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		filter.doFilter(request, response, chain);
+
+		verify(chain, never()).doFilter(request, response);
+
+		assertEquals("/someOtherUrl", response.getRedirectedUrl());
+	}
+
+	@Test
+	public void testSwitchRequestFromDanoToJackLord() throws Exception {
+		// set current user
+		UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+				"dano", "hawaii50");
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		// http request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/webapp/login/impersonate");
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"jacklord");
+
+		// http response
+		MockHttpServletResponse response = new MockHttpServletResponse();
+
+		// setup filter
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setSwitchUserUrl("/login/impersonate");
+		filter.setSuccessHandler(new SimpleUrlAuthenticationSuccessHandler(
+				"/webapp/someOtherUrl"));
+
+		FilterChain chain = mock(FilterChain.class);
+
+		// test updates user token and context
+		filter.doFilter(request, response, chain);
+		verify(chain, never()).doFilter(request, response);
+
+		// check current user
+		Authentication targetAuth = SecurityContextHolder.getContext()
+				.getAuthentication();
+		assertNotNull(targetAuth);
+		assertTrue(targetAuth.getPrincipal() instanceof UserDetails);
+		assertEquals("jacklord", ((User) targetAuth.getPrincipal()).getUsername());
+	}
+
+	@Test
+	public void modificationOfAuthoritiesWorks() {
+		UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(
+				"dano", "hawaii50");
+		SecurityContextHolder.getContext().setAuthentication(auth);
+
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter(SwitchUserFilter.SPRING_SECURITY_SWITCH_USERNAME_KEY,
+				"jacklord");
+
+		SwitchUserFilter filter = new SwitchUserFilter();
+		filter.setUserDetailsService(new MockUserDetailsService());
+		filter.setSwitchUserAuthorityChanger(new SwitchUserAuthorityChanger() {
+			public Collection<GrantedAuthority> modifyGrantedAuthorities(
+					UserDetails targetUser, Authentication currentAuthentication,
+					Collection<? extends GrantedAuthority> authoritiesToBeGranted) {
+				List<GrantedAuthority> auths = new ArrayList<GrantedAuthority>();
+				auths.add(new SimpleGrantedAuthority("ROLE_NEW"));
+				return auths;
+			}
+		});
+
+		Authentication result = filter.attemptSwitchUser(request);
+		assertTrue(result != null);
+		assertEquals(2, result.getAuthorities().size());
+		assertTrue(AuthorityUtils.authorityListToSet(result.getAuthorities()).contains(
+				"ROLE_NEW"));
+	}
+
+	// SEC-1763
+	@Test
+	public void nestedSwitchesAreNotAllowed() throws Exception {
+		// original user
+		UsernamePasswordAuthenticationToken source = new UsernamePasswordAuthenticationToken(
+				"orig", "hawaii50", ROLES_12);
+		SecurityContextHolder.getContext().setAuthentication(source);
+		SecurityContextHolder.getContext().setAuthentication(switchToUser("jacklord"));
+		Authentication switched = switchToUser("dano");
+
+		SwitchUserGrantedAuthority switchedFrom = null;
+
+		for (GrantedAuthority ga : switched.getAuthorities()) {
+			if (ga instanceof SwitchUserGrantedAuthority) {
+				switchedFrom = (SwitchUserGrantedAuthority) ga;
+				break;
+			}
+		}
+
+		assertSame(source, switchedFrom.getSource());
+	}
+
+	// ~ Inner Classes
+	// ==================================================================================================
+
+	private class MockUserDetailsService implements UserDetailsService {
+		private String password = "hawaii50";
+
+		public UserDetails loadUserByUsername(String username)
+				throws UsernameNotFoundException {
+			// jacklord, dano (active)
+			// mcgarrett (disabled)
+			// wofat (account expired)
+			// steve (credentials expired)
+			if ("jacklord".equals(username) || "dano".equals(username)) {
+				return new User(username, password, true, true, true, true, ROLES_12);
+			}
+			else if ("mcgarrett".equals(username)) {
+				return new User(username, password, false, true, true, true, ROLES_12);
+			}
+			else if ("wofat".equals(username)) {
+				return new User(username, password, true, false, true, true, ROLES_12);
+			}
+			else if ("steve".equals(username)) {
+				return new User(username, password, true, true, false, true, ROLES_12);
+			}
+			else {
+				throw new UsernameNotFoundException("Could not find: " + username);
+			}
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java
index 851996cea8..64dd0ed76d 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationEntryPointTests.java
@@ -22,68 +22,70 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-
 /**
  * Tests {@link BasicAuthenticationEntryPoint}.
  *
  * @author Ben Alex
  */
 public class BasicAuthenticationEntryPointTests extends TestCase {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    public BasicAuthenticationEntryPointTests() {
-        super();
-    }
+	public BasicAuthenticationEntryPointTests() {
+		super();
+	}
 
-    public BasicAuthenticationEntryPointTests(String arg0) {
-        super(arg0);
-    }
+	public BasicAuthenticationEntryPointTests(String arg0) {
+		super(arg0);
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(BasicAuthenticationEntryPointTests.class);
-    }
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(BasicAuthenticationEntryPointTests.class);
+	}
 
-    public final void setUp() throws Exception {
-        super.setUp();
-    }
+	public final void setUp() throws Exception {
+		super.setUp();
+	}
 
-    public void testDetectsMissingRealmName() throws Exception {
-        BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
+	public void testDetectsMissingRealmName() throws Exception {
+		BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
 
-        try {
-            ep.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("realmName must be specified", expected.getMessage());
-        }
-    }
+		try {
+			ep.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("realmName must be specified", expected.getMessage());
+		}
+	}
 
-    public void testGettersSetters() {
-        BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
-        ep.setRealmName("realm");
-        assertEquals("realm", ep.getRealmName());
-    }
+	public void testGettersSetters() {
+		BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
+		ep.setRealmName("realm");
+		assertEquals("realm", ep.getRealmName());
+	}
 
-    public void testNormalOperation() throws Exception {
-        BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
+	public void testNormalOperation() throws Exception {
+		BasicAuthenticationEntryPoint ep = new BasicAuthenticationEntryPoint();
 
-        ep.setRealmName("hello");
+		ep.setRealmName("hello");
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        //ep.afterPropertiesSet();
+		// ep.afterPropertiesSet();
 
-        String msg = "These are the jokes kid";
-        ep.commence(request, response, new DisabledException(msg));
+		String msg = "These are the jokes kid";
+		ep.commence(request, response, new DisabledException(msg));
 
-        assertEquals(401, response.getStatus());
-        assertEquals(msg, response.getErrorMessage());
+		assertEquals(401, response.getStatus());
+		assertEquals(msg, response.getErrorMessage());
 
-        assertEquals("Basic realm=\"hello\"", response.getHeader("WWW-Authenticate"));
-    }
+		assertEquals("Basic realm=\"hello\"", response.getHeader("WWW-Authenticate"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java
index 63fcb6688a..d538c02f9e 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/BasicAuthenticationFilterTests.java
@@ -41,225 +41,246 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.WebAuthenticationDetails;
 import org.springframework.web.util.WebUtils;
 
-
 /**
  * Tests {@link BasicAuthenticationFilter}.
  *
  * @author Ben Alex
  */
 public class BasicAuthenticationFilterTests {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private BasicAuthenticationFilter filter;
-    private AuthenticationManager manager;
+	private BasicAuthenticationFilter filter;
+	private AuthenticationManager manager;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Before
-    public void setUp() throws Exception {
-        SecurityContextHolder.clearContext();
-        UsernamePasswordAuthenticationToken rodRequest = new UsernamePasswordAuthenticationToken("rod", "koala");
-        rodRequest.setDetails(new WebAuthenticationDetails(new MockHttpServletRequest()));
-        Authentication rod =
-            new UsernamePasswordAuthenticationToken("rod", "koala", AuthorityUtils.createAuthorityList("ROLE_1"));
+	@Before
+	public void setUp() throws Exception {
+		SecurityContextHolder.clearContext();
+		UsernamePasswordAuthenticationToken rodRequest = new UsernamePasswordAuthenticationToken(
+				"rod", "koala");
+		rodRequest.setDetails(new WebAuthenticationDetails(new MockHttpServletRequest()));
+		Authentication rod = new UsernamePasswordAuthenticationToken("rod", "koala",
+				AuthorityUtils.createAuthorityList("ROLE_1"));
 
-        manager = mock(AuthenticationManager.class);
-        when(manager.authenticate(rodRequest)).thenReturn(rod);
-        when(manager.authenticate(not(eq(rodRequest)))).thenThrow(new BadCredentialsException(""));
+		manager = mock(AuthenticationManager.class);
+		when(manager.authenticate(rodRequest)).thenReturn(rod);
+		when(manager.authenticate(not(eq(rodRequest)))).thenThrow(
+				new BadCredentialsException(""));
 
-        filter = new BasicAuthenticationFilter(manager,new BasicAuthenticationEntryPoint());
-    }
+		filter = new BasicAuthenticationFilter(manager,
+				new BasicAuthenticationEntryPoint());
+	}
 
-    @After
-    public void clearContext() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void testFilterIgnoresRequestsContainingNoAuthorizationHeader() throws Exception {
+	@Test
+	public void testFilterIgnoresRequestsContainingNoAuthorizationHeader()
+			throws Exception {
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setServletPath("/some_file.html");
-        final MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setServletPath("/some_file.html");
+		final MockHttpServletResponse response = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
 
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
 
-        // Test
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+		// Test
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-    @Test
-    public void testGettersSetters() {
-        assertThat(filter.getAuthenticationManager()).isNotNull();
-        assertThat(filter.getAuthenticationEntryPoint()).isNotNull();
-    }
+	@Test
+	public void testGettersSetters() {
+		assertThat(filter.getAuthenticationManager()).isNotNull();
+		assertThat(filter.getAuthenticationEntryPoint()).isNotNull();
+	}
 
-    @Test
-    public void testInvalidBasicAuthorizationTokenIsIgnored() throws Exception {
-        String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
-        request.setSession(new MockHttpSession());
-        final MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testInvalidBasicAuthorizationTokenIsIgnored() throws Exception {
+		String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
+		request.setSession(new MockHttpSession());
+		final MockHttpServletResponse response = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
 
-        verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-        assertThat(response.getStatus()).isEqualTo(401);
-    }
+		verify(chain, never()).doFilter(any(ServletRequest.class),
+				any(ServletResponse.class));
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		assertThat(response.getStatus()).isEqualTo(401);
+	}
 
-    @Test
-    public void invalidBase64IsIgnored() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic NOT_VALID_BASE64");
-        request.setServletPath("/some_file.html");
-        request.setSession(new MockHttpSession());
-        final MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void invalidBase64IsIgnored() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization", "Basic NOT_VALID_BASE64");
+		request.setServletPath("/some_file.html");
+		request.setSession(new MockHttpSession());
+		final MockHttpServletResponse response = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
-        // The filter chain shouldn't proceed
-        verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-        assertThat(response.getStatus()).isEqualTo(401);
-    }
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
+		// The filter chain shouldn't proceed
+		verify(chain, never()).doFilter(any(ServletRequest.class),
+				any(ServletResponse.class));
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		assertThat(response.getStatus()).isEqualTo(401);
+	}
 
-    @Test
-    public void testNormalOperation() throws Exception {
-        String token = "rod:koala";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
+	@Test
+	public void testNormalOperation() throws Exception {
+		String token = "rod:koala";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
 
-        // Test
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, new MockHttpServletResponse(), chain);
+		// Test
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, new MockHttpServletResponse(), chain);
 
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull();
-        assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo("rod");
-    }
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull();
+		assertThat(SecurityContextHolder.getContext().getAuthentication().getName())
+				.isEqualTo("rod");
+	}
 
-    @Test
-    public void testOtherAuthorizationSchemeIsIgnored() throws Exception {
+	@Test
+	public void testOtherAuthorizationSchemeIsIgnored() throws Exception {
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME");
-        request.setServletPath("/some_file.html");
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, new MockHttpServletResponse(), chain);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME");
+		request.setServletPath("/some_file.html");
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, new MockHttpServletResponse(), chain);
 
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testStartupDetectsMissingAuthenticationEntryPoint() throws Exception {
-        new BasicAuthenticationFilter(manager, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testStartupDetectsMissingAuthenticationEntryPoint() throws Exception {
+		new BasicAuthenticationFilter(manager, null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testStartupDetectsMissingAuthenticationManager() throws Exception {
-        BasicAuthenticationFilter filter = new BasicAuthenticationFilter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void testStartupDetectsMissingAuthenticationManager() throws Exception {
+		BasicAuthenticationFilter filter = new BasicAuthenticationFilter(null);
+	}
 
-    @Test
-    public void testSuccessLoginThenFailureLoginResultsInSessionLosingToken() throws Exception {
-        String token = "rod:koala";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
-        final MockHttpServletResponse response1 = new MockHttpServletResponse();
+	@Test
+	public void testSuccessLoginThenFailureLoginResultsInSessionLosingToken()
+			throws Exception {
+		String token = "rod:koala";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
+		final MockHttpServletResponse response1 = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response1, chain);
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response1, chain);
 
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
 
-        // Test
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull();
-        assertThat(SecurityContextHolder.getContext().getAuthentication().getName()).isEqualTo("rod");
+		// Test
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNotNull();
+		assertThat(SecurityContextHolder.getContext().getAuthentication().getName())
+				.isEqualTo("rod");
 
-        // NOW PERFORM FAILED AUTHENTICATION
+		// NOW PERFORM FAILED AUTHENTICATION
 
-        token = "otherUser:WRONG_PASSWORD";
-        request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        final MockHttpServletResponse response2 = new MockHttpServletResponse();
+		token = "otherUser:WRONG_PASSWORD";
+		request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		final MockHttpServletResponse response2 = new MockHttpServletResponse();
 
-        chain = mock(FilterChain.class);
-        filter.doFilter(request, response2, chain);
+		chain = mock(FilterChain.class);
+		filter.doFilter(request, response2, chain);
 
-        verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        request.setServletPath("/some_file.html");
+		verify(chain, never()).doFilter(any(ServletRequest.class),
+				any(ServletResponse.class));
+		request.setServletPath("/some_file.html");
 
-        // Test - the filter chain will not be invoked, as we get a 401 forbidden response
-        MockHttpServletResponse response = response2;
+		// Test - the filter chain will not be invoked, as we get a 401 forbidden response
+		MockHttpServletResponse response = response2;
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-        assertThat(response.getStatus()).isEqualTo(401);
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		assertThat(response.getStatus()).isEqualTo(401);
+	}
 
-    @Test
-    public void testWrongPasswordContinuesFilterChainIfIgnoreFailureIsTrue() throws Exception {
-        String token = "rod:WRONG_PASSWORD";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
-        request.setSession(new MockHttpSession());
+	@Test
+	public void testWrongPasswordContinuesFilterChainIfIgnoreFailureIsTrue()
+			throws Exception {
+		String token = "rod:WRONG_PASSWORD";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
+		request.setSession(new MockHttpSession());
 
-        filter = new BasicAuthenticationFilter(manager);
-        assertThat(filter.isIgnoreFailure()).isTrue();
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, new MockHttpServletResponse(), chain);
+		filter = new BasicAuthenticationFilter(manager);
+		assertThat(filter.isIgnoreFailure()).isTrue();
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, new MockHttpServletResponse(), chain);
 
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
 
-        // Test - the filter chain will be invoked, as we've set ignoreFailure = true
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-    }
+		// Test - the filter chain will be invoked, as we've set ignoreFailure = true
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+	}
 
-    @Test
-    public void testWrongPasswordReturnsForbiddenIfIgnoreFailureIsFalse() throws Exception {
-        String token = "rod:WRONG_PASSWORD";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
-        request.setSession(new MockHttpSession());
-        assertThat(filter.isIgnoreFailure()).isFalse();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void testWrongPasswordReturnsForbiddenIfIgnoreFailureIsFalse()
+			throws Exception {
+		String token = "rod:WRONG_PASSWORD";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
+		request.setSession(new MockHttpSession());
+		assertThat(filter.isIgnoreFailure()).isFalse();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
-        filter.doFilter(request, response, chain);
+		FilterChain chain = mock(FilterChain.class);
+		filter.doFilter(request, response, chain);
 
-        // Test - the filter chain will not be invoked, as we get a 401 forbidden response
-        verify(chain, never()).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
-        assertThat(response.getStatus()).isEqualTo(401);
-    }
+		// Test - the filter chain will not be invoked, as we get a 401 forbidden response
+		verify(chain, never()).doFilter(any(ServletRequest.class),
+				any(ServletResponse.class));
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		assertThat(response.getStatus()).isEqualTo(401);
+	}
 
-    // SEC-2054
-    @Test
-    public void skippedOnErrorDispatch() throws Exception {
+	// SEC-2054
+	@Test
+	public void skippedOnErrorDispatch() throws Exception {
 
-        String token = "bad:credentials";
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(token.getBytes())));
-        request.setServletPath("/some_file.html");
-        request.setAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE, "/error");
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		String token = "bad:credentials";
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("Authorization",
+				"Basic " + new String(Base64.encodeBase64(token.getBytes())));
+		request.setServletPath("/some_file.html");
+		request.setAttribute(WebUtils.ERROR_REQUEST_URI_ATTRIBUTE, "/error");
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        FilterChain chain = mock(FilterChain.class);
+		FilterChain chain = mock(FilterChain.class);
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        assertThat(response.getStatus()).isEqualTo(200);
-    }
+		assertThat(response.getStatus()).isEqualTo(200);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java
index 0f0667dcc9..aa61d6e8f9 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthUtilsTests.java
@@ -21,115 +21,132 @@ import org.springframework.util.StringUtils;
 
 import java.util.Map;
 
-
 /**
  * Tests {@link org.springframework.security.util.StringSplitUtils}.
  *
  * @author Ben Alex
  */
 public class DigestAuthUtilsTests extends TestCase {
-    //~ Constructors ===================================================================================================
+	// ~ Constructors
+	// ===================================================================================================
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public void testSplitEachArrayElementAndCreateMapNormalOperation() {
-        // note it ignores malformed entries (ie those without an equals sign)
-        String unsplit = "username=\"rod\", invalidEntryThatHasNoEqualsSign, realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\"";
-        String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit);
-        Map<String, String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
+	public void testSplitEachArrayElementAndCreateMapNormalOperation() {
+		// note it ignores malformed entries (ie those without an equals sign)
+		String unsplit = "username=\"rod\", invalidEntryThatHasNoEqualsSign, realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\"";
+		String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit);
+		Map<String, String> headerMap = DigestAuthUtils
+				.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
 
-        assertEquals("rod", headerMap.get("username"));
-        assertEquals("Contacts Realm", headerMap.get("realm"));
-        assertEquals("MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==", headerMap.get("nonce"));
-        assertEquals("/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4",
-                headerMap.get("uri"));
-        assertEquals("38644211cf9ac3da63ab639807e2baff", headerMap.get("response"));
-        assertEquals("auth", headerMap.get("qop"));
-        assertEquals("00000004", headerMap.get("nc"));
-        assertEquals("2b8d329a8571b99a", headerMap.get("cnonce"));
-        assertEquals(8, headerMap.size());
-    }
+		assertEquals("rod", headerMap.get("username"));
+		assertEquals("Contacts Realm", headerMap.get("realm"));
+		assertEquals("MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==",
+				headerMap.get("nonce"));
+		assertEquals(
+				"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4",
+				headerMap.get("uri"));
+		assertEquals("38644211cf9ac3da63ab639807e2baff", headerMap.get("response"));
+		assertEquals("auth", headerMap.get("qop"));
+		assertEquals("00000004", headerMap.get("nc"));
+		assertEquals("2b8d329a8571b99a", headerMap.get("cnonce"));
+		assertEquals(8, headerMap.size());
+	}
 
-    public void testSplitEachArrayElementAndCreateMapRespectsInstructionNotToRemoveCharacters() {
-        String unsplit = "username=\"rod\", realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\"";
-        String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit);
-        Map<String, String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", null);
+	public void testSplitEachArrayElementAndCreateMapRespectsInstructionNotToRemoveCharacters() {
+		String unsplit = "username=\"rod\", realm=\"Contacts Realm\", nonce=\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\", uri=\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\", response=\"38644211cf9ac3da63ab639807e2baff\", qop=auth, nc=00000004, cnonce=\"2b8d329a8571b99a\"";
+		String[] headerEntries = StringUtils.commaDelimitedListToStringArray(unsplit);
+		Map<String, String> headerMap = DigestAuthUtils
+				.splitEachArrayElementAndCreateMap(headerEntries, "=", null);
 
-        assertEquals("\"rod\"", headerMap.get("username"));
-        assertEquals("\"Contacts Realm\"", headerMap.get("realm"));
-        assertEquals("\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\"", headerMap.get("nonce"));
-        assertEquals("\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\"",
-                headerMap.get("uri"));
-        assertEquals("\"38644211cf9ac3da63ab639807e2baff\"", headerMap.get("response"));
-        assertEquals("auth", headerMap.get("qop"));
-        assertEquals("00000004", headerMap.get("nc"));
-        assertEquals("\"2b8d329a8571b99a\"", headerMap.get("cnonce"));
-        assertEquals(8, headerMap.size());
-    }
+		assertEquals("\"rod\"", headerMap.get("username"));
+		assertEquals("\"Contacts Realm\"", headerMap.get("realm"));
+		assertEquals(
+				"\"MTEwOTAyMzU1MTQ4NDo1YzY3OWViYWM5NDNmZWUwM2UwY2NmMDBiNDQzMTQ0OQ==\"",
+				headerMap.get("nonce"));
+		assertEquals(
+				"\"/spring-security-sample-contacts-filter/secure/adminPermission.htm?contactId=4\"",
+				headerMap.get("uri"));
+		assertEquals("\"38644211cf9ac3da63ab639807e2baff\"", headerMap.get("response"));
+		assertEquals("auth", headerMap.get("qop"));
+		assertEquals("00000004", headerMap.get("nc"));
+		assertEquals("\"2b8d329a8571b99a\"", headerMap.get("cnonce"));
+		assertEquals(8, headerMap.size());
+	}
 
-    public void testSplitEachArrayElementAndCreateMapReturnsNullIfArrayEmptyOrNull() {
-        assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(null, "=", "\""));
-        assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(new String[]{}, "=", "\""));
-    }
+	public void testSplitEachArrayElementAndCreateMapReturnsNullIfArrayEmptyOrNull() {
+		assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(null, "=", "\""));
+		assertNull(DigestAuthUtils.splitEachArrayElementAndCreateMap(new String[] {},
+				"=", "\""));
+	}
 
-    public void testSplitNormalOperation() {
-        String unsplit = "username=\"rod==\"";
-        assertEquals("username", DigestAuthUtils.split(unsplit, "=")[0]);
-        assertEquals("\"rod==\"", DigestAuthUtils.split(unsplit, "=")[1]); // should not remove quotes or extra equals
-    }
+	public void testSplitNormalOperation() {
+		String unsplit = "username=\"rod==\"";
+		assertEquals("username", DigestAuthUtils.split(unsplit, "=")[0]);
+		assertEquals("\"rod==\"", DigestAuthUtils.split(unsplit, "=")[1]); // should not
+																			// remove
+																			// quotes or
+																			// extra
+																			// equals
+	}
 
-    public void testSplitRejectsNullsAndIncorrectLengthStrings() {
-        try {
-            DigestAuthUtils.split(null, "="); // null
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+	public void testSplitRejectsNullsAndIncorrectLengthStrings() {
+		try {
+			DigestAuthUtils.split(null, "="); // null
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            DigestAuthUtils.split("", "="); // empty string
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			DigestAuthUtils.split("", "="); // empty string
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            DigestAuthUtils.split("sdch=dfgf", null); // null
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			DigestAuthUtils.split("sdch=dfgf", null); // null
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            DigestAuthUtils.split("fvfv=dcdc", ""); // empty string
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
+		try {
+			DigestAuthUtils.split("fvfv=dcdc", ""); // empty string
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
 
-        try {
-            DigestAuthUtils.split("dfdc=dcdc", "BIGGER_THAN_ONE_CHARACTER");
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertTrue(true);
-        }
-    }
+		try {
+			DigestAuthUtils.split("dfdc=dcdc", "BIGGER_THAN_ONE_CHARACTER");
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertTrue(true);
+		}
+	}
 
-    public void testSplitWorksWithDifferentDelimiters() {
-        assertEquals(2, DigestAuthUtils.split("18/rod", "/").length);
-        assertNull(DigestAuthUtils.split("18/rod", "!"));
+	public void testSplitWorksWithDifferentDelimiters() {
+		assertEquals(2, DigestAuthUtils.split("18/rod", "/").length);
+		assertNull(DigestAuthUtils.split("18/rod", "!"));
 
-        // only guarantees to split at FIRST delimiter, not EACH delimiter
-        assertEquals(2, DigestAuthUtils.split("18|rod|foo|bar", "|").length);
-    }
+		// only guarantees to split at FIRST delimiter, not EACH delimiter
+		assertEquals(2, DigestAuthUtils.split("18|rod|foo|bar", "|").length);
+	}
 
+	public void testAuthorizationHeaderWithCommasIsSplitCorrectly() {
+		String header = "Digest username=\"hamilton,bob\", realm=\"bobs,ok,realm\", nonce=\"the,nonce\", "
+				+ "uri=\"the,Uri\", response=\"the,response,Digest\", qop=theqop, nc=thenc, cnonce=\"the,cnonce\"";
 
-    public void testAuthorizationHeaderWithCommasIsSplitCorrectly() {
-        String header = "Digest username=\"hamilton,bob\", realm=\"bobs,ok,realm\", nonce=\"the,nonce\", " +
-                "uri=\"the,Uri\", response=\"the,response,Digest\", qop=theqop, nc=thenc, cnonce=\"the,cnonce\"";
+		String[] parts = DigestAuthUtils.splitIgnoringQuotes(header, ',');
 
-        String[] parts = DigestAuthUtils.splitIgnoringQuotes(header, ',');
-
-        assertEquals(8, parts.length);
-    }
+		assertEquals(8, parts.length);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java
index 7124f6db30..a35ae27d2c 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationEntryPointTests.java
@@ -26,122 +26,128 @@ import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.util.StringUtils;
 
-
 /**
  * Tests {@link DigestAuthenticationEntryPoint}.
  *
  * @author Ben Alex
  */
 public class DigestAuthenticationEntryPointTests extends TestCase {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    private void checkNonceValid(String nonce) {
-        // Check the nonce seems to be generated correctly
-        // format of nonce is:
-        //   base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
-        assertTrue(Base64.isArrayByteBase64(nonce.getBytes()));
+	private void checkNonceValid(String nonce) {
+		// Check the nonce seems to be generated correctly
+		// format of nonce is:
+		// base64(expirationTime + ":" + md5Hex(expirationTime + ":" + key))
+		assertTrue(Base64.isArrayByteBase64(nonce.getBytes()));
 
-        String decodedNonce = new String(Base64.decodeBase64(nonce.getBytes()));
-        String[] nonceTokens = StringUtils.delimitedListToStringArray(decodedNonce, ":");
-        assertEquals(2, nonceTokens.length);
+		String decodedNonce = new String(Base64.decodeBase64(nonce.getBytes()));
+		String[] nonceTokens = StringUtils.delimitedListToStringArray(decodedNonce, ":");
+		assertEquals(2, nonceTokens.length);
 
-        String expectedNonceSignature = DigestUtils.md5Hex(nonceTokens[0] + ":" + "key");
-        assertEquals(expectedNonceSignature, nonceTokens[1]);
-    }
+		String expectedNonceSignature = DigestUtils.md5Hex(nonceTokens[0] + ":" + "key");
+		assertEquals(expectedNonceSignature, nonceTokens[1]);
+	}
 
-    public void testDetectsMissingKey() throws Exception {
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        ep.setRealmName("realm");
+	public void testDetectsMissingKey() throws Exception {
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		ep.setRealmName("realm");
 
-        try {
-            ep.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("key must be specified", expected.getMessage());
-        }
-    }
+		try {
+			ep.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("key must be specified", expected.getMessage());
+		}
+	}
 
-    public void testDetectsMissingRealmName() throws Exception {
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        ep.setKey("dcdc");
-        ep.setNonceValiditySeconds(12);
+	public void testDetectsMissingRealmName() throws Exception {
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		ep.setKey("dcdc");
+		ep.setNonceValiditySeconds(12);
 
-        try {
-            ep.afterPropertiesSet();
-            fail("Should have thrown IllegalArgumentException");
-        } catch (IllegalArgumentException expected) {
-            assertEquals("realmName must be specified", expected.getMessage());
-        }
-    }
+		try {
+			ep.afterPropertiesSet();
+			fail("Should have thrown IllegalArgumentException");
+		}
+		catch (IllegalArgumentException expected) {
+			assertEquals("realmName must be specified", expected.getMessage());
+		}
+	}
 
-    public void testGettersSetters() {
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        assertEquals(300, ep.getNonceValiditySeconds()); // 5 mins default
-        ep.setRealmName("realm");
-        assertEquals("realm", ep.getRealmName());
-        ep.setKey("dcdc");
-        assertEquals("dcdc", ep.getKey());
-        ep.setNonceValiditySeconds(12);
-        assertEquals(12, ep.getNonceValiditySeconds());
-    }
+	public void testGettersSetters() {
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		assertEquals(300, ep.getNonceValiditySeconds()); // 5 mins default
+		ep.setRealmName("realm");
+		assertEquals("realm", ep.getRealmName());
+		ep.setKey("dcdc");
+		assertEquals("dcdc", ep.getKey());
+		ep.setNonceValiditySeconds(12);
+		assertEquals(12, ep.getNonceValiditySeconds());
+	}
 
-    public void testNormalOperation() throws Exception {
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        ep.setRealmName("hello");
-        ep.setKey("key");
+	public void testNormalOperation() throws Exception {
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		ep.setRealmName("hello");
+		ep.setKey("key");
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.afterPropertiesSet();
+		ep.afterPropertiesSet();
 
-        ep.commence(request, response, new DisabledException("foobar"));
+		ep.commence(request, response, new DisabledException("foobar"));
 
-        // Check response is properly formed
-        assertEquals(401, response.getStatus());
-        assertEquals(true, response.getHeader("WWW-Authenticate").toString().startsWith("Digest "));
+		// Check response is properly formed
+		assertEquals(401, response.getStatus());
+		assertEquals(true,
+				response.getHeader("WWW-Authenticate").toString().startsWith("Digest "));
 
-        // Break up response header
-        String header = response.getHeader("WWW-Authenticate").toString().substring(7);
-        String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
-        Map<String,String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
+		// Break up response header
+		String header = response.getHeader("WWW-Authenticate").toString().substring(7);
+		String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
+		Map<String, String> headerMap = DigestAuthUtils
+				.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
 
-        assertEquals("hello", headerMap.get("realm"));
-        assertEquals("auth", headerMap.get("qop"));
-        assertNull(headerMap.get("stale"));
+		assertEquals("hello", headerMap.get("realm"));
+		assertEquals("auth", headerMap.get("qop"));
+		assertNull(headerMap.get("stale"));
 
-        checkNonceValid((String) headerMap.get("nonce"));
-    }
+		checkNonceValid((String) headerMap.get("nonce"));
+	}
 
-    public void testOperationIfDueToStaleNonce() throws Exception {
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        ep.setRealmName("hello");
-        ep.setKey("key");
+	public void testOperationIfDueToStaleNonce() throws Exception {
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		ep.setRealmName("hello");
+		ep.setKey("key");
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/some_path");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/some_path");
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        ep.afterPropertiesSet();
+		ep.afterPropertiesSet();
 
-        ep.commence(request, response, new NonceExpiredException("expired nonce"));
+		ep.commence(request, response, new NonceExpiredException("expired nonce"));
 
-        // Check response is properly formed
-        assertEquals(401, response.getStatus());
-        assertTrue(response.getHeader("WWW-Authenticate").toString().startsWith("Digest "));
+		// Check response is properly formed
+		assertEquals(401, response.getStatus());
+		assertTrue(response.getHeader("WWW-Authenticate").toString()
+				.startsWith("Digest "));
 
-        // Break up response header
-        String header = response.getHeader("WWW-Authenticate").toString().substring(7);
-        String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
-        Map<String,String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
+		// Break up response header
+		String header = response.getHeader("WWW-Authenticate").toString().substring(7);
+		String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
+		Map<String, String> headerMap = DigestAuthUtils
+				.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
 
-        assertEquals("hello", headerMap.get("realm"));
-        assertEquals("auth", headerMap.get("qop"));
-        assertEquals("true", headerMap.get("stale"));
+		assertEquals("hello", headerMap.get("realm"));
+		assertEquals("auth", headerMap.get("qop"));
+		assertEquals("true", headerMap.get("stale"));
 
-        checkNonceValid((String) headerMap.get("nonce"));
-    }
+		checkNonceValid((String) headerMap.get("nonce"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
index 1d79c11f8b..04659b40b7 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/www/DigestAuthenticationFilterTests.java
@@ -41,7 +41,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.cache.NullUserCache;
 import org.springframework.util.StringUtils;
 
-
 /**
  * Tests {@link DigestAuthenticationFilter}.
  *
@@ -49,374 +48,429 @@ import org.springframework.util.StringUtils;
  * @author Luke Taylor
  */
 public class DigestAuthenticationFilterTests {
-    //~ Static fields/initializers =====================================================================================
-
-    private static final String NC = "00000002";
-    private static final String CNONCE = "c822c727a648aba7";
-    private static final String REALM = "The Actual, Correct Realm Name";
-    private static final String KEY = "springsecurity";
-    private static final String QOP = "auth";
-    private static final String USERNAME = "rod,ok";
-    private static final String PASSWORD = "koala";
-    private static final String REQUEST_URI = "/some_file.html";
-
-    /**
-     * A standard valid nonce with a validity period of 60 seconds
-     */
-    private static final String NONCE = generateNonce(60);
-
-    //~ Instance fields ================================================================================================
-
-    //    private ApplicationContext ctx;
-    private DigestAuthenticationFilter filter;
-    private MockHttpServletRequest request;
-
-
-    //~ Methods ========================================================================================================
-
-    private String createAuthorizationHeader(String username, String realm, String nonce, String uri,
-                                             String responseDigest, String qop, String nc, String cnonce) {
-        return "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\"" + nonce + "\", uri=\"" + uri
-                + "\", response=\"" + responseDigest + "\", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + cnonce + "\"";
-    }
-
-    private MockHttpServletResponse executeFilterInContainerSimulator(Filter filter, final ServletRequest request,
-                                                                      final boolean expectChainToProceed) throws ServletException, IOException {
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-
-        final FilterChain chain = mock(FilterChain.class);
-
-        filter.doFilter(request, response, chain);
-
-        verify(chain, times(expectChainToProceed ? 1 : 0)).doFilter(request, response);
-        return response;
-    }
-
-    private static String generateNonce(int validitySeconds) {
-        long expiryTime = System.currentTimeMillis() + (validitySeconds * 1000);
-        String signatureValue = DigestUtils.md5Hex(expiryTime + ":" + KEY);
-        String nonceValue = expiryTime + ":" + signatureValue;
-
-        return new String(Base64.encodeBase64(nonceValue.getBytes()));
-    }
-
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
-
-    @Before
-    public void setUp() {
-        SecurityContextHolder.clearContext();
-
-        // Create User Details Service
-        UserDetailsService uds = new UserDetailsService() {
-            public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-                return new User("rod,ok", "koala", AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO"));
-            }
-        };
-
-        DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
-        ep.setRealmName(REALM);
-        ep.setKey(KEY);
-
-        filter = new DigestAuthenticationFilter();
-        filter.setUserDetailsService(uds);
-        filter.setAuthenticationEntryPoint(ep);
-
-        request = new MockHttpServletRequest("GET", REQUEST_URI);
-        request.setServletPath(REQUEST_URI);
-    }
-
-    @Test
-    public void testExpiredNonceReturnsForbiddenWithStaleHeader()
-            throws Exception {
-        String nonce = generateNonce(0);
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, nonce, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        Thread.sleep(1000); // ensures token expired
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-
-        String header = response.getHeader("WWW-Authenticate").toString().substring(7);
-        String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
-        Map<String,String> headerMap = DigestAuthUtils.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
-        assertEquals("true", headerMap.get("stale"));
-    }
-
-    @Test
-    public void testFilterIgnoresRequestsContainingNoAuthorizationHeader()
-            throws Exception {
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    @Test
-    public void testGettersSetters() {
-        DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
-        filter.setUserDetailsService(mock(UserDetailsService.class));
-        assertTrue(filter.getUserDetailsService() != null);
-
-        filter.setAuthenticationEntryPoint(new DigestAuthenticationEntryPoint());
-        assertTrue(filter.getAuthenticationEntryPoint() != null);
-
-        filter.setUserCache(null);
-        assertNull(filter.getUserCache());
-        filter.setUserCache(new NullUserCache());
-        assertNotNull(filter.getUserCache());
-    }
-
-    @Test
-    public void testInvalidDigestAuthorizationTokenGeneratesError()
-            throws Exception {
-        String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON";
-
-        request.addHeader("Authorization", "Digest " + new String(Base64.encodeBase64(token.getBytes())));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertEquals(401, response.getStatus());
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    @Test
-    public void testMalformedHeaderReturnsForbidden() throws Exception {
-        request.addHeader("Authorization", "Digest scsdcsdc");
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void testNonBase64EncodedNonceReturnsForbidden() throws Exception {
-        String nonce = "NOT_BASE_64_ENCODED";
-
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, nonce, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void testNonceWithIncorrectSignatureForNumericFieldReturnsForbidden() throws Exception {
-        String nonce = new String(Base64.encodeBase64("123456:incorrectStringPassword".getBytes()));
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, nonce, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void testNonceWithNonNumericFirstElementReturnsForbidden() throws Exception {
-        String nonce = new String(Base64.encodeBase64("hello:ignoredSecondElement".getBytes()));
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, nonce, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void testNonceWithoutTwoColonSeparatedElementsReturnsForbidden() throws Exception {
-        String nonce = new String(Base64.encodeBase64("a base 64 string without a colon".getBytes()));
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, nonce, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void testNormalOperationWhenPasswordIsAlreadyEncoded() throws Exception {
-        String encodedPassword = DigestAuthUtils.encodePasswordInA1Format(USERNAME, REALM, PASSWORD);
-        String responseDigest = DigestAuthUtils.generateDigest(true, USERNAME, REALM, encodedPassword, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(USERNAME,
-                ((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
-    }
-
-    @Test
-    public void testNormalOperationWhenPasswordNotAlreadyEncoded() throws Exception {
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(USERNAME,
-                ((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
-        assertFalse(SecurityContextHolder.getContext().getAuthentication().isAuthenticated());
-    }
-
-    @Test
-    public void testNormalOperationWhenPasswordNotAlreadyEncodedAndWithoutReAuthentication() throws Exception {
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        filter.setCreateAuthenticatedToken(true);
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(USERNAME,
-                ((UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getUsername());
-        assertTrue(SecurityContextHolder.getContext().getAuthentication().isAuthenticated());
-        assertEquals(AuthorityUtils.createAuthorityList("ROLE_ONE","ROLE_TWO"),
-                SecurityContextHolder.getContext().getAuthentication().getAuthorities());
-    }
-
-    @Test
-    public void otherAuthorizationSchemeIsIgnored()
-            throws Exception {
-        request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME");
-
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void startupDetectsMissingAuthenticationEntryPoint() throws Exception {
-        DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
-        filter.setUserDetailsService(mock(UserDetailsService.class));
-        filter.afterPropertiesSet();
-    }
-
-    @Test(expected=IllegalArgumentException.class)
-    public void startupDetectsMissingUserDetailsService() throws Exception {
-        DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
-        filter.setAuthenticationEntryPoint(new DigestAuthenticationEntryPoint());
-        filter.afterPropertiesSet();
-    }
-
-    @Test
-    public void successfulLoginThenFailedLoginResultsInSessionLosingToken() throws Exception {
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        executeFilterInContainerSimulator(filter, request, true);
-
-        assertNotNull(SecurityContextHolder.getContext().getAuthentication());
-
-        // Now retry, giving an invalid nonce
-        responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, "WRONG_PASSWORD", "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request = new MockHttpServletRequest();
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        // Check we lost our previous authentication
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void wrongCnonceBasedOnDigestReturnsForbidden() throws Exception {
-        String cnonce = "NOT_SAME_AS_USED_FOR_DIGEST_COMPUTATION";
-
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, PASSWORD, "GET",
-                REQUEST_URI, QOP, NONCE, NC, "DIFFERENT_CNONCE");
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, cnonce));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void wrongDigestReturnsForbidden() throws Exception {
-        String password = "WRONG_PASSWORD";
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM, password, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void wrongRealmReturnsForbidden() throws Exception {
-        String realm = "WRONG_REALM";
-        String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, realm, PASSWORD, "GET",
-                REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, realm, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
-
-    @Test
-    public void wrongUsernameReturnsForbidden() throws Exception {
-        String responseDigest = DigestAuthUtils.generateDigest(false, "NOT_A_KNOWN_USER", REALM, PASSWORD,
-                "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
-
-        request.addHeader("Authorization",
-                createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI, responseDigest, QOP, NC, CNONCE));
-
-        MockHttpServletResponse response = executeFilterInContainerSimulator(filter, request, false);
-
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-        assertEquals(401, response.getStatus());
-    }
+	// ~ Static fields/initializers
+	// =====================================================================================
+
+	private static final String NC = "00000002";
+	private static final String CNONCE = "c822c727a648aba7";
+	private static final String REALM = "The Actual, Correct Realm Name";
+	private static final String KEY = "springsecurity";
+	private static final String QOP = "auth";
+	private static final String USERNAME = "rod,ok";
+	private static final String PASSWORD = "koala";
+	private static final String REQUEST_URI = "/some_file.html";
+
+	/**
+	 * A standard valid nonce with a validity period of 60 seconds
+	 */
+	private static final String NONCE = generateNonce(60);
+
+	// ~ Instance fields
+	// ================================================================================================
+
+	// private ApplicationContext ctx;
+	private DigestAuthenticationFilter filter;
+	private MockHttpServletRequest request;
+
+	// ~ Methods
+	// ========================================================================================================
+
+	private String createAuthorizationHeader(String username, String realm, String nonce,
+			String uri, String responseDigest, String qop, String nc, String cnonce) {
+		return "Digest username=\"" + username + "\", realm=\"" + realm + "\", nonce=\""
+				+ nonce + "\", uri=\"" + uri + "\", response=\"" + responseDigest
+				+ "\", qop=" + qop + ", nc=" + nc + ", cnonce=\"" + cnonce + "\"";
+	}
+
+	private MockHttpServletResponse executeFilterInContainerSimulator(Filter filter,
+			final ServletRequest request, final boolean expectChainToProceed)
+			throws ServletException, IOException {
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+
+		final FilterChain chain = mock(FilterChain.class);
+
+		filter.doFilter(request, response, chain);
+
+		verify(chain, times(expectChainToProceed ? 1 : 0)).doFilter(request, response);
+		return response;
+	}
+
+	private static String generateNonce(int validitySeconds) {
+		long expiryTime = System.currentTimeMillis() + (validitySeconds * 1000);
+		String signatureValue = DigestUtils.md5Hex(expiryTime + ":" + KEY);
+		String nonceValue = expiryTime + ":" + signatureValue;
+
+		return new String(Base64.encodeBase64(nonceValue.getBytes()));
+	}
+
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
+
+	@Before
+	public void setUp() {
+		SecurityContextHolder.clearContext();
+
+		// Create User Details Service
+		UserDetailsService uds = new UserDetailsService() {
+			public UserDetails loadUserByUsername(String username)
+					throws UsernameNotFoundException {
+				return new User("rod,ok", "koala", AuthorityUtils.createAuthorityList(
+						"ROLE_ONE", "ROLE_TWO"));
+			}
+		};
+
+		DigestAuthenticationEntryPoint ep = new DigestAuthenticationEntryPoint();
+		ep.setRealmName(REALM);
+		ep.setKey(KEY);
+
+		filter = new DigestAuthenticationFilter();
+		filter.setUserDetailsService(uds);
+		filter.setAuthenticationEntryPoint(ep);
+
+		request = new MockHttpServletRequest("GET", REQUEST_URI);
+		request.setServletPath(REQUEST_URI);
+	}
+
+	@Test
+	public void testExpiredNonceReturnsForbiddenWithStaleHeader() throws Exception {
+		String nonce = generateNonce(0);
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		Thread.sleep(1000); // ensures token expired
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+
+		String header = response.getHeader("WWW-Authenticate").toString().substring(7);
+		String[] headerEntries = StringUtils.commaDelimitedListToStringArray(header);
+		Map<String, String> headerMap = DigestAuthUtils
+				.splitEachArrayElementAndCreateMap(headerEntries, "=", "\"");
+		assertEquals("true", headerMap.get("stale"));
+	}
+
+	@Test
+	public void testFilterIgnoresRequestsContainingNoAuthorizationHeader()
+			throws Exception {
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	@Test
+	public void testGettersSetters() {
+		DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
+		filter.setUserDetailsService(mock(UserDetailsService.class));
+		assertTrue(filter.getUserDetailsService() != null);
+
+		filter.setAuthenticationEntryPoint(new DigestAuthenticationEntryPoint());
+		assertTrue(filter.getAuthenticationEntryPoint() != null);
+
+		filter.setUserCache(null);
+		assertNull(filter.getUserCache());
+		filter.setUserCache(new NullUserCache());
+		assertNotNull(filter.getUserCache());
+	}
+
+	@Test
+	public void testInvalidDigestAuthorizationTokenGeneratesError() throws Exception {
+		String token = "NOT_A_VALID_TOKEN_AS_MISSING_COLON";
+
+		request.addHeader("Authorization",
+				"Digest " + new String(Base64.encodeBase64(token.getBytes())));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertEquals(401, response.getStatus());
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	@Test
+	public void testMalformedHeaderReturnsForbidden() throws Exception {
+		request.addHeader("Authorization", "Digest scsdcsdc");
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void testNonBase64EncodedNonceReturnsForbidden() throws Exception {
+		String nonce = "NOT_BASE_64_ENCODED";
+
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void testNonceWithIncorrectSignatureForNumericFieldReturnsForbidden()
+			throws Exception {
+		String nonce = new String(Base64.encodeBase64("123456:incorrectStringPassword"
+				.getBytes()));
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void testNonceWithNonNumericFirstElementReturnsForbidden() throws Exception {
+		String nonce = new String(Base64.encodeBase64("hello:ignoredSecondElement"
+				.getBytes()));
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void testNonceWithoutTwoColonSeparatedElementsReturnsForbidden()
+			throws Exception {
+		String nonce = new String(Base64.encodeBase64("a base 64 string without a colon"
+				.getBytes()));
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, nonce, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, nonce, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void testNormalOperationWhenPasswordIsAlreadyEncoded() throws Exception {
+		String encodedPassword = DigestAuthUtils.encodePasswordInA1Format(USERNAME,
+				REALM, PASSWORD);
+		String responseDigest = DigestAuthUtils.generateDigest(true, USERNAME, REALM,
+				encodedPassword, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext()
+				.getAuthentication().getPrincipal()).getUsername());
+	}
+
+	@Test
+	public void testNormalOperationWhenPasswordNotAlreadyEncoded() throws Exception {
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext()
+				.getAuthentication().getPrincipal()).getUsername());
+		assertFalse(SecurityContextHolder.getContext().getAuthentication()
+				.isAuthenticated());
+	}
+
+	@Test
+	public void testNormalOperationWhenPasswordNotAlreadyEncodedAndWithoutReAuthentication()
+			throws Exception {
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		filter.setCreateAuthenticatedToken(true);
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(USERNAME, ((UserDetails) SecurityContextHolder.getContext()
+				.getAuthentication().getPrincipal()).getUsername());
+		assertTrue(SecurityContextHolder.getContext().getAuthentication()
+				.isAuthenticated());
+		assertEquals(AuthorityUtils.createAuthorityList("ROLE_ONE", "ROLE_TWO"),
+				SecurityContextHolder.getContext().getAuthentication().getAuthorities());
+	}
+
+	@Test
+	public void otherAuthorizationSchemeIsIgnored() throws Exception {
+		request.addHeader("Authorization", "SOME_OTHER_AUTHENTICATION_SCHEME");
+
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingAuthenticationEntryPoint() throws Exception {
+		DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
+		filter.setUserDetailsService(mock(UserDetailsService.class));
+		filter.afterPropertiesSet();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void startupDetectsMissingUserDetailsService() throws Exception {
+		DigestAuthenticationFilter filter = new DigestAuthenticationFilter();
+		filter.setAuthenticationEntryPoint(new DigestAuthenticationEntryPoint());
+		filter.afterPropertiesSet();
+	}
+
+	@Test
+	public void successfulLoginThenFailedLoginResultsInSessionLosingToken()
+			throws Exception {
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		executeFilterInContainerSimulator(filter, request, true);
+
+		assertNotNull(SecurityContextHolder.getContext().getAuthentication());
+
+		// Now retry, giving an invalid nonce
+		responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				"WRONG_PASSWORD", "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request = new MockHttpServletRequest();
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		// Check we lost our previous authentication
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void wrongCnonceBasedOnDigestReturnsForbidden() throws Exception {
+		String cnonce = "NOT_SAME_AS_USED_FOR_DIGEST_COMPUTATION";
+
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, "DIFFERENT_CNONCE");
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, cnonce));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void wrongDigestReturnsForbidden() throws Exception {
+		String password = "WRONG_PASSWORD";
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, REALM,
+				password, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void wrongRealmReturnsForbidden() throws Exception {
+		String realm = "WRONG_REALM";
+		String responseDigest = DigestAuthUtils.generateDigest(false, USERNAME, realm,
+				PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, realm, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
+
+	@Test
+	public void wrongUsernameReturnsForbidden() throws Exception {
+		String responseDigest = DigestAuthUtils.generateDigest(false, "NOT_A_KNOWN_USER",
+				REALM, PASSWORD, "GET", REQUEST_URI, QOP, NONCE, NC, CNONCE);
+
+		request.addHeader(
+				"Authorization",
+				createAuthorizationHeader(USERNAME, REALM, NONCE, REQUEST_URI,
+						responseDigest, QOP, NC, CNONCE));
+
+		MockHttpServletResponse response = executeFilterInContainerSimulator(filter,
+				request, false);
+
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+		assertEquals(401, response.getStatus());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java
index 46a0dcfaa7..3e32d12c74 100644
--- a/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java
+++ b/web/src/test/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolverTests.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.web.bind.support;
 
-
 import static org.fest.assertions.Assertions.assertThat;
 
 import java.lang.annotation.ElementType;
@@ -42,162 +41,199 @@ import org.springframework.util.ReflectionUtils;
  */
 @SuppressWarnings("deprecation")
 public class AuthenticationPrincipalArgumentResolverTests {
-    private Object expectedPrincipal;
-    private AuthenticationPrincipalArgumentResolver resolver;
+	private Object expectedPrincipal;
+	private AuthenticationPrincipalArgumentResolver resolver;
 
-    @Before
-    public void setup() {
-        resolver = new AuthenticationPrincipalArgumentResolver();
-    }
+	@Before
+	public void setup() {
+		resolver = new AuthenticationPrincipalArgumentResolver();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void supportsParameterNoAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
-    }
+	@Test
+	public void supportsParameterNoAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
+	}
 
-    @Test
-    public void supportsParameterAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
-    }
+	@Test
+	public void supportsParameterAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
+	}
 
-    @Test
-    public void supportsParameterCustomAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
-    }
+	@Test
+	public void supportsParameterCustomAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
+	}
 
-    @Test
-    public void resolveArgumentNullAuthentication() throws Exception {
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullAuthentication() throws Exception {
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test
-    public void resolveArgumentNullPrincipal() throws Exception {
-        setAuthenticationPrincipal(null);
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullPrincipal() throws Exception {
+		setAuthenticationPrincipal(null);
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test
-    public void resolveArgumentString() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentString() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentPrincipalStringOnObject() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentPrincipalStringOnObject() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentUserDetails() throws Exception {
-        setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")));
-        assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentUserDetails() throws Exception {
+		setAuthenticationPrincipal(new User("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
+		assertThat(
+				resolver.resolveArgument(showUserAnnotationUserDetails(), null, null,
+						null)).isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomUserPrincipal() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomUserPrincipal() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(
+				resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null,
+						null, null)).isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomAnnotation() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomAnnotation() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentNullOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null);
-    }
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null);
+	}
 
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null,
+				null, null);
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null);
-    }
+	@Test
+	public void resolveArgumentObject() throws Exception {
+		setAuthenticationPrincipal(new Object());
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentObject() throws Exception {
-        setAuthenticationPrincipal(new Object());
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	private MethodParameter showUserNoAnnotation() {
+		return getMethodParameter("showUserNoAnnotation", String.class);
+	}
 
-    private MethodParameter showUserNoAnnotation() {
-        return getMethodParameter("showUserNoAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationString() {
+		return getMethodParameter("showUserAnnotation", String.class);
+	}
 
-    private MethodParameter showUserAnnotationString() {
-        return getMethodParameter("showUserAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
+	}
 
-    private MethodParameter showUserAnnotationErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType",
+				String.class);
+	}
 
-    private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationUserDetails() {
+		return getMethodParameter("showUserAnnotation", UserDetails.class);
+	}
 
-    private MethodParameter showUserAnnotationUserDetails() {
-        return getMethodParameter("showUserAnnotation", UserDetails.class);
-    }
+	private MethodParameter showUserAnnotationCustomUserPrincipal() {
+		return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserAnnotationCustomUserPrincipal() {
-        return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserCustomAnnotation() {
+		return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserCustomAnnotation() {
-        return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserAnnotationObject() {
+		return getMethodParameter("showUserAnnotation", Object.class);
+	}
 
-    private MethodParameter showUserAnnotationObject() {
-        return getMethodParameter("showUserAnnotation", Object.class);
-    }
+	private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
+		Method method = ReflectionUtils.findMethod(TestController.class, methodName,
+				paramTypes);
+		return new MethodParameter(method, 0);
+	}
 
-    private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
-        Method method = ReflectionUtils.findMethod(TestController.class, methodName,paramTypes);
-        return new MethodParameter(method,0);
-    }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal
+	static @interface CurrentUser {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal
-    static @interface CurrentUser { }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal(errorOnInvalidType = true)
+	static @interface CurrentUserErrorOnInvalidType {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal(errorOnInvalidType = true)
-    static @interface CurrentUserErrorOnInvalidType { }
+	public static class TestController {
+		public void showUserNoAnnotation(String user) {
+		}
 
-    public static class TestController {
-        public void showUserNoAnnotation(String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal String user) {}
-        public void showUserAnnotationErrorOnInvalidType(@AuthenticationPrincipal(errorOnInvalidType=true) String user) {}
-        public void showUserAnnotationCurrentUserErrorOnInvalidType(@CurrentUserErrorOnInvalidType String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {}
-        public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal Object user) {}
-    }
+		public void showUserAnnotation(@AuthenticationPrincipal String user) {
+		}
 
-    private static class CustomUserPrincipal {}
+		public void showUserAnnotationErrorOnInvalidType(
+				@AuthenticationPrincipal(errorOnInvalidType = true) String user) {
+		}
 
-    private void setAuthenticationPrincipal(Object principal) {
-        this.expectedPrincipal = principal;
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER"));
-    }
+		public void showUserAnnotationCurrentUserErrorOnInvalidType(
+				@CurrentUserErrorOnInvalidType String user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {
+		}
+
+		public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal Object user) {
+		}
+	}
+
+	private static class CustomUserPrincipal {
+	}
+
+	private void setAuthenticationPrincipal(Object principal) {
+		this.expectedPrincipal = principal;
+		SecurityContextHolder.getContext()
+				.setAuthentication(
+						new TestingAuthenticationToken(expectedPrincipal, "password",
+								"ROLE_USER"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java
index f05ea1a7dd..f396da20f3 100644
--- a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java
@@ -33,7 +33,6 @@ import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.security.web.session.ConcurrentSessionFilter;
 
-
 /**
  * Tests {@link ConcurrentSessionFilter}.
  *
@@ -42,87 +41,92 @@ import org.springframework.security.web.session.ConcurrentSessionFilter;
  */
 public class ConcurrentSessionFilterTests {
 
-    @Test
-    public void detectsExpiredSessions() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpSession session = new MockHttpSession();
-        request.setSession(session);
+	@Test
+	public void detectsExpiredSessions() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpSession session = new MockHttpSession();
+		request.setSession(session);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        SessionRegistry registry = new SessionRegistryImpl();
-        registry.registerNewSession(session.getId(), "principal");
-        registry.getSessionInformation(session.getId()).expireNow();
+		SessionRegistry registry = new SessionRegistryImpl();
+		registry.registerNewSession(session.getId(), "principal");
+		registry.getSessionInformation(session.getId()).expireNow();
 
-        // Setup our test fixture and registry to want this session to be expired
-        ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry,"/expired.jsp");
-        filter.setRedirectStrategy(new DefaultRedirectStrategy());
-        filter.setLogoutHandlers(new LogoutHandler[]{new SecurityContextLogoutHandler()});
-        filter.afterPropertiesSet();
+		// Setup our test fixture and registry to want this session to be expired
+		ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry,
+				"/expired.jsp");
+		filter.setRedirectStrategy(new DefaultRedirectStrategy());
+		filter.setLogoutHandlers(new LogoutHandler[] { new SecurityContextLogoutHandler() });
+		filter.afterPropertiesSet();
 
-        FilterChain fc = mock(FilterChain.class);
-        filter.doFilter(request, response, fc);
-        // Expect that the filter chain will not be invoked, as we redirect to expiredUrl
-        verifyZeroInteractions(fc);
+		FilterChain fc = mock(FilterChain.class);
+		filter.doFilter(request, response, fc);
+		// Expect that the filter chain will not be invoked, as we redirect to expiredUrl
+		verifyZeroInteractions(fc);
 
-        assertEquals("/expired.jsp", response.getRedirectedUrl());
-    }
+		assertEquals("/expired.jsp", response.getRedirectedUrl());
+	}
 
-    // As above, but with no expiredUrl set.
-    @Test
-    public void returnsExpectedMessageWhenNoExpiredUrlSet() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpSession session = new MockHttpSession();
-        request.setSession(session);
+	// As above, but with no expiredUrl set.
+	@Test
+	public void returnsExpectedMessageWhenNoExpiredUrlSet() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpSession session = new MockHttpSession();
+		request.setSession(session);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        SessionRegistry registry = new SessionRegistryImpl();
-        registry.registerNewSession(session.getId(), "principal");
-        registry.getSessionInformation(session.getId()).expireNow();
-        ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry);
+		SessionRegistry registry = new SessionRegistryImpl();
+		registry.registerNewSession(session.getId(), "principal");
+		registry.getSessionInformation(session.getId()).expireNow();
+		ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry);
 
-        FilterChain fc = mock(FilterChain.class);
-        filter.doFilter(request, response, fc);
-        verifyZeroInteractions(fc);
+		FilterChain fc = mock(FilterChain.class);
+		filter.doFilter(request, response, fc);
+		verifyZeroInteractions(fc);
 
-        assertEquals("This session has been expired (possibly due to multiple concurrent logins being " +
-                "attempted as the same user).", response.getContentAsString());
-    }
+		assertEquals(
+				"This session has been expired (possibly due to multiple concurrent logins being "
+						+ "attempted as the same user).", response.getContentAsString());
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsMissingSessionRegistry() throws Exception {
-        new ConcurrentSessionFilter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsMissingSessionRegistry() throws Exception {
+		new ConcurrentSessionFilter(null);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void detectsInvalidUrl() throws Exception {
-        new ConcurrentSessionFilter(new SessionRegistryImpl(), "ImNotValid");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void detectsInvalidUrl() throws Exception {
+		new ConcurrentSessionFilter(new SessionRegistryImpl(), "ImNotValid");
+	}
 
-    @Test
-    public void lastRequestTimeUpdatesCorrectly() throws Exception {
-        // Setup our HTTP request
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpSession session = new MockHttpSession();
-        request.setSession(session);
+	@Test
+	public void lastRequestTimeUpdatesCorrectly() throws Exception {
+		// Setup our HTTP request
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpSession session = new MockHttpSession();
+		request.setSession(session);
 
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FilterChain fc = mock(FilterChain.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FilterChain fc = mock(FilterChain.class);
 
-        // Setup our test fixture
-        SessionRegistry registry = new SessionRegistryImpl();
-        registry.registerNewSession(session.getId(), "principal");
-        ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry, "/expired.jsp");
+		// Setup our test fixture
+		SessionRegistry registry = new SessionRegistryImpl();
+		registry.registerNewSession(session.getId(), "principal");
+		ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry,
+				"/expired.jsp");
 
-        Date lastRequest = registry.getSessionInformation(session.getId()).getLastRequest();
+		Date lastRequest = registry.getSessionInformation(session.getId())
+				.getLastRequest();
 
-        Thread.sleep(1000);
+		Thread.sleep(1000);
 
-        filter.doFilter(request, response, fc);
+		filter.doFilter(request, response, fc);
 
-        verify(fc).doFilter(request, response);
-        assertTrue(registry.getSessionInformation(session.getId()).getLastRequest().after(lastRequest));
-    }
+		verify(fc).doFilter(request, response);
+		assertTrue(registry.getSessionInformation(session.getId()).getLastRequest()
+				.after(lastRequest));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java
index 4f9c7e3610..ba82d6c199 100644
--- a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java
@@ -51,475 +51,553 @@ import org.springframework.util.ClassUtils;
  * @author Rob Winch
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ClassUtils.class})
+@PrepareForTest({ ClassUtils.class })
 public class HttpSessionSecurityContextRepositoryTests {
-    private final TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone", "passwd", "ROLE_A");
+	private final TestingAuthenticationToken testToken = new TestingAuthenticationToken(
+			"someone", "passwd", "ROLE_A");
 
-    @After
-    public void tearDown() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void tearDown() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void servlet25Compatability() throws Exception {
-        spy(ClassUtils.class);
-        when(ClassUtils.class,"hasMethod", ServletRequest.class, "startAsync", new Class[] {}).thenReturn(false);
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(holder);
-        assertThat(holder.getRequest()).isSameAs(request);
-    }
+	@Test
+	public void servlet25Compatability() throws Exception {
+		spy(ClassUtils.class);
+		when(ClassUtils.class, "hasMethod", ServletRequest.class, "startAsync",
+				new Class[] {}).thenReturn(false);
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		repo.loadContext(holder);
+		assertThat(holder.getRequest()).isSameAs(request);
+	}
 
-    @Test
-    public void startAsyncDisablesSaveOnCommit() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(holder);
+	@Test
+	public void startAsyncDisablesSaveOnCommit() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		repo.loadContext(holder);
 
-        reset(request);
-        holder.getRequest().startAsync();
-        holder.getResponse().sendError(HttpServletResponse.SC_BAD_REQUEST);
+		reset(request);
+		holder.getRequest().startAsync();
+		holder.getResponse().sendError(HttpServletResponse.SC_BAD_REQUEST);
 
-        // ensure that sendError did cause interaction with the HttpSession
-        verify(request, never()).getSession(anyBoolean());
-        verify(request, never()).getSession();
-    }
+		// ensure that sendError did cause interaction with the HttpSession
+		verify(request, never()).getSession(anyBoolean());
+		verify(request, never()).getSession();
+	}
 
+	@Test
+	public void startAsyncRequestResponseDisablesSaveOnCommit() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		repo.loadContext(holder);
 
-    @Test
-    public void startAsyncRequestResponseDisablesSaveOnCommit() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(holder);
+		reset(request);
+		holder.getRequest().startAsync(request, response);
+		holder.getResponse().sendError(HttpServletResponse.SC_BAD_REQUEST);
 
-        reset(request);
-        holder.getRequest().startAsync(request,response);
-        holder.getResponse().sendError(HttpServletResponse.SC_BAD_REQUEST);
+		// ensure that sendError did cause interaction with the HttpSession
+		verify(request, never()).getSession(anyBoolean());
+		verify(request, never()).getSession();
+	}
 
-        // ensure that sendError did cause interaction with the HttpSession
-        verify(request, never()).getSession(anyBoolean());
-        verify(request, never()).getSession();
-    }
+	@Test
+	public void sessionIsntCreatedIfContextDoesntChange() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		assertNull(request.getSession(false));
+		repo.saveContext(context, holder.getRequest(), holder.getResponse());
+		assertNull(request.getSession(false));
+	}
 
-    @Test
-    public void sessionIsntCreatedIfContextDoesntChange() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        assertNull(request.getSession(false));
-        repo.saveContext(context, holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession(false));
-    }
+	@Test
+	public void sessionIsntCreatedIfAllowSessionCreationIsFalse() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setAllowSessionCreation(false);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		// Change context
+		context.setAuthentication(testToken);
+		repo.saveContext(context, holder.getRequest(), holder.getResponse());
+		assertNull(request.getSession(false));
+	}
 
-    @Test
-    public void sessionIsntCreatedIfAllowSessionCreationIsFalse() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setAllowSessionCreation(false);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        // Change context
-        context.setAuthentication(testToken);
-        repo.saveContext(context, holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession(false));
-    }
+	@Test
+	public void existingContextIsSuccessFullyLoadedFromSessionAndSavedBack()
+			throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		request.getSession().setAttribute("imTheContext",
+				SecurityContextHolder.getContext());
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		assertNotNull(context);
+		assertEquals(testToken, context.getAuthentication());
+		// Won't actually be saved as it hasn't changed, but go through the use case
+		// anyway
+		repo.saveContext(context, holder.getRequest(), holder.getResponse());
+		assertEquals(context, request.getSession().getAttribute("imTheContext"));
+	}
 
-    @Test
-    public void existingContextIsSuccessFullyLoadedFromSessionAndSavedBack() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        request.getSession().setAttribute("imTheContext", SecurityContextHolder.getContext());
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        assertNotNull(context);
-        assertEquals(testToken, context.getAuthentication());
-        // Won't actually be saved as it hasn't changed, but go through the use case anyway
-        repo.saveContext(context, holder.getRequest(), holder.getResponse());
-        assertEquals(context, request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-1528
+	@Test
+	public void saveContextCallsSetAttributeIfContextIsModifiedDirectlyDuringRequest()
+			throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		// Set up an existing authenticated context, mocking that it is in the session
+		// already
+		SecurityContext ctx = SecurityContextHolder.getContext();
+		ctx.setAuthentication(testToken);
+		HttpSession session = mock(HttpSession.class);
+		when(session.getAttribute(SPRING_SECURITY_CONTEXT_KEY)).thenReturn(ctx);
+		request.setSession(session);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				new MockHttpServletResponse());
+		assertSame(ctx, repo.loadContext(holder));
 
-    // SEC-1528
-    @Test
-    public void saveContextCallsSetAttributeIfContextIsModifiedDirectlyDuringRequest() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        // Set up an existing authenticated context, mocking that it is in the session already
-        SecurityContext ctx = SecurityContextHolder.getContext();
-        ctx.setAuthentication(testToken);
-        HttpSession session = mock(HttpSession.class);
-        when(session.getAttribute(SPRING_SECURITY_CONTEXT_KEY)).thenReturn(ctx);
-        request.setSession(session);
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse());
-        assertSame(ctx, repo.loadContext(holder));
+		// Modify context contents. Same user, different role
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("someone", "passwd", "ROLE_B"));
+		repo.saveContext(ctx, holder.getRequest(), holder.getResponse());
 
-        // Modify context contents. Same user, different role
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("someone", "passwd", "ROLE_B"));
-        repo.saveContext(ctx, holder.getRequest(), holder.getResponse());
+		// Must be called even though the value in the local VM is already the same
+		verify(session).setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctx);
+	}
 
-        // Must be called even though the value in the local VM is already the same
-        verify(session).setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctx);
-    }
+	@Test
+	public void nonSecurityContextInSessionIsIgnored() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY,
+				"NotASecurityContextInstance");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		assertNotNull(context);
+		assertNull(context.getAuthentication());
+	}
 
-    @Test
-    public void nonSecurityContextInSessionIsIgnored() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, "NotASecurityContextInstance");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        assertNotNull(context);
-        assertNull(context.getAuthentication());
-    }
+	@Test
+	public void sessionIsCreatedAndContextStoredWhenContextChanges() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		assertNull(request.getSession(false));
+		// Simulate authentication during the request
+		context.setAuthentication(testToken);
+		repo.saveContext(context, holder.getRequest(), holder.getResponse());
+		assertNotNull(request.getSession(false));
+		assertEquals(context,
+				request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
+	}
 
-    @Test
-    public void sessionIsCreatedAndContextStoredWhenContextChanges() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        assertNull(request.getSession(false));
-        // Simulate authentication during the request
-        context.setAuthentication(testToken);
-        repo.saveContext(context, holder.getRequest(), holder.getResponse());
-        assertNotNull(request.getSession(false));
-        assertEquals(context, request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
-    }
+	@Test
+	public void redirectCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().sendRedirect("/doesntmatter");
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    @Test
-    public void redirectCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().sendRedirect("/doesntmatter");
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	@Test
+	public void sendErrorCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().sendError(404);
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    @Test
-    public void sendErrorCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().sendError(404);
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-2005
+	@Test
+	public void flushBufferCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().flushBuffer();
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    // SEC-2005
-    @Test
-    public void flushBufferCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().flushBuffer();
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-2005
+	@Test
+	public void writerFlushCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getWriter().flush();
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    // SEC-2005
-    @Test
-    public void writerFlushCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getWriter().flush();
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-2005
+	@Test
+	public void writerCloseCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getWriter().close();
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    // SEC-2005
-    @Test
-    public void writerCloseCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getWriter().close();
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-2005
+	@Test
+	public void outputStreamFlushCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getOutputStream().flush();
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    // SEC-2005
-    @Test
-    public void outputStreamFlushCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getOutputStream().flush();
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-2005
+	@Test
+	public void outputStreamCloseCausesEarlySaveOfContext() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getOutputStream().close();
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+		assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper) holder.getResponse())
+				.isContextSaved());
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		// Check it's still the same
+		assertEquals(SecurityContextHolder.getContext(), request.getSession()
+				.getAttribute("imTheContext"));
+	}
 
-    // SEC-2005
-    @Test
-    public void outputStreamCloseCausesEarlySaveOfContext() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getOutputStream().close();
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-        assertTrue(((SaveContextOnUpdateOrErrorResponseWrapper)holder.getResponse()).isContextSaved());
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        // Check it's still the same
-        assertEquals(SecurityContextHolder.getContext(), request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-SEC-2055
+	@Test
+	public void outputStreamCloseDelegate() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		HttpServletResponse response = mock(HttpServletResponse.class);
+		ServletOutputStream outputstream = mock(ServletOutputStream.class);
+		when(response.getOutputStream()).thenReturn(outputstream);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getOutputStream().close();
+		verify(outputstream).close();
+	}
 
-    // SEC-SEC-2055
-    @Test
-    public void outputStreamCloseDelegate() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        HttpServletResponse response = mock(HttpServletResponse.class);
-        ServletOutputStream outputstream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outputstream);
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getOutputStream().close();
-        verify(outputstream).close();
-    }
+	// SEC-SEC-2055
+	@Test
+	public void outputStreamFlushesDelegate() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		HttpServletResponse response = mock(HttpServletResponse.class);
+		ServletOutputStream outputstream = mock(ServletOutputStream.class);
+		when(response.getOutputStream()).thenReturn(outputstream);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		holder.getResponse().getOutputStream().flush();
+		verify(outputstream).flush();
+	}
 
-    // SEC-SEC-2055
-    @Test
-    public void outputStreamFlushesDelegate() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        HttpServletResponse response = mock(HttpServletResponse.class);
-        ServletOutputStream outputstream = mock(ServletOutputStream.class);
-        when(response.getOutputStream()).thenReturn(outputstream);
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        holder.getResponse().getOutputStream().flush();
-        verify(outputstream).flush();
-    }
+	@Test
+	public void noSessionIsCreatedIfSessionWasInvalidatedDuringTheRequest()
+			throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.getSession();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		request.getSession().invalidate();
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		assertNull(request.getSession(false));
+	}
 
-    @Test
-    public void noSessionIsCreatedIfSessionWasInvalidatedDuringTheRequest() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        request.getSession().invalidate();
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession(false));
-    }
+	// SEC-1315
+	@Test
+	public void noSessionIsCreatedIfAnonymousTokenIsUsed() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContextHolder.setContext(repo.loadContext(holder));
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("key", "anon", AuthorityUtils
+						.createAuthorityList("ANON")));
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		assertNull(request.getSession(false));
+	}
 
-    // SEC-1315
-    @Test
-    public void noSessionIsCreatedIfAnonymousTokenIsUsed() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContextHolder.setContext(repo.loadContext(holder));
-        SecurityContextHolder.getContext().setAuthentication(
-                new AnonymousAuthenticationToken("key", "anon", AuthorityUtils.createAuthorityList("ANON")));
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession(false));
-    }
+	// SEC-1587
+	@Test
+	public void contextIsRemovedFromSessionIfCurrentContextIsAnonymous() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
+		ctxInSession.setAuthentication(testToken);
+		request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				new MockHttpServletResponse());
+		repo.loadContext(holder);
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("x", "x", testToken.getAuthorities()));
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		assertNull(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
+	}
 
-    // SEC-1587
-    @Test
-    public void contextIsRemovedFromSessionIfCurrentContextIsAnonymous() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
-        ctxInSession.setAuthentication(testToken);
-        request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession);
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse());
-        repo.loadContext(holder);
-        SecurityContextHolder.getContext().setAuthentication(new AnonymousAuthenticationToken("x","x", testToken.getAuthorities()));
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
-    }
+	@Test
+	public void contextIsRemovedFromSessionIfCurrentContextIsEmpty() throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setSpringSecurityContextKey("imTheContext");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
+		ctxInSession.setAuthentication(testToken);
+		request.getSession().setAttribute("imTheContext", ctxInSession);
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				new MockHttpServletResponse());
+		repo.loadContext(holder);
+		// Save an empty context
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		assertNull(request.getSession().getAttribute("imTheContext"));
+	}
 
-    @Test
-    public void contextIsRemovedFromSessionIfCurrentContextIsEmpty() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setSpringSecurityContextKey("imTheContext");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
-        ctxInSession.setAuthentication(testToken);
-        request.getSession().setAttribute("imTheContext", ctxInSession);
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse());
-        repo.loadContext(holder);
-        // Save an empty context
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        assertNull(request.getSession().getAttribute("imTheContext"));
-    }
+	// SEC-1735
+	@Test
+	public void contextIsNotRemovedFromSessionIfContextBeforeExecutionDefault()
+			throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				new MockHttpServletResponse());
+		repo.loadContext(holder);
+		SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
+		ctxInSession.setAuthentication(testToken);
+		request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession);
+		SecurityContextHolder.getContext().setAuthentication(
+				new AnonymousAuthenticationToken("x", "x", AuthorityUtils
+						.createAuthorityList("ROLE_ANONYMOUS")));
+		repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(),
+				holder.getResponse());
+		assertSame(ctxInSession,
+				request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
+	}
 
-    // SEC-1735
-    @Test
-    public void contextIsNotRemovedFromSessionIfContextBeforeExecutionDefault() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse());
-        repo.loadContext(holder);
-        SecurityContext ctxInSession = SecurityContextHolder.createEmptyContext();
-        ctxInSession.setAuthentication(testToken);
-        request.getSession().setAttribute(SPRING_SECURITY_CONTEXT_KEY, ctxInSession);
-        SecurityContextHolder.getContext().setAuthentication(new AnonymousAuthenticationToken("x","x", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")));
-        repo.saveContext(SecurityContextHolder.getContext(), holder.getRequest(), holder.getResponse());
-        assertSame(ctxInSession,request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
-    }
+	@Test
+	@SuppressWarnings("deprecation")
+	public void sessionDisableUrlRewritingPreventsSessionIdBeingWrittenToUrl()
+			throws Exception {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		final String sessionId = ";jsessionid=id";
+		MockHttpServletResponse response = new MockHttpServletResponse() {
+			@Override
+			public String encodeRedirectUrl(String url) {
+				return url + sessionId;
+			}
 
-    @Test
-    @SuppressWarnings("deprecation")
-    public void sessionDisableUrlRewritingPreventsSessionIdBeingWrittenToUrl() throws Exception {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        final String sessionId = ";jsessionid=id";
-        MockHttpServletResponse response = new MockHttpServletResponse() {
-            @Override
-            public String encodeRedirectUrl(String url) {
-                return url + sessionId;
-            }
+			@Override
+			public String encodeRedirectURL(String url) {
+				return url + sessionId;
+			}
 
-            @Override
-            public String encodeRedirectURL(String url) {
-                return url + sessionId;
-            }
+			@Override
+			public String encodeUrl(String url) {
+				return url + sessionId;
+			}
 
-            @Override
-            public String encodeUrl(String url) {
-                return url + sessionId;
-            }
+			@Override
+			public String encodeURL(String url) {
+				return url + sessionId;
+			}
+		};
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		repo.loadContext(holder);
+		String url = "/aUrl";
+		assertEquals(url + sessionId, holder.getResponse().encodeRedirectUrl(url));
+		assertEquals(url + sessionId, holder.getResponse().encodeRedirectURL(url));
+		assertEquals(url + sessionId, holder.getResponse().encodeUrl(url));
+		assertEquals(url + sessionId, holder.getResponse().encodeURL(url));
+		repo.setDisableUrlRewriting(true);
+		holder = new HttpRequestResponseHolder(request, response);
+		repo.loadContext(holder);
+		assertEquals(url, holder.getResponse().encodeRedirectUrl(url));
+		assertEquals(url, holder.getResponse().encodeRedirectURL(url));
+		assertEquals(url, holder.getResponse().encodeUrl(url));
+		assertEquals(url, holder.getResponse().encodeURL(url));
+	}
 
-            @Override
-            public String encodeURL(String url) {
-                return url + sessionId;
-            }
-        };
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(holder);
-        String url = "/aUrl";
-        assertEquals(url + sessionId, holder.getResponse().encodeRedirectUrl(url));
-        assertEquals(url + sessionId, holder.getResponse().encodeRedirectURL(url));
-        assertEquals(url + sessionId, holder.getResponse().encodeUrl(url));
-        assertEquals(url + sessionId, holder.getResponse().encodeURL(url));
-        repo.setDisableUrlRewriting(true);
-        holder = new HttpRequestResponseHolder(request, response);
-        repo.loadContext(holder);
-        assertEquals(url, holder.getResponse().encodeRedirectUrl(url));
-        assertEquals(url, holder.getResponse().encodeRedirectURL(url));
-        assertEquals(url, holder.getResponse().encodeUrl(url));
-        assertEquals(url, holder.getResponse().encodeURL(url));
-    }
+	@Test
+	public void saveContextCustomTrustResolver() {
+		SecurityContext contextToSave = SecurityContextHolder.createEmptyContext();
+		contextToSave.setAuthentication(testToken);
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				new MockHttpServletResponse());
+		repo.loadContext(holder);
+		AuthenticationTrustResolver trustResolver = mock(AuthenticationTrustResolver.class);
+		repo.setTrustResolver(trustResolver);
 
-    @Test
-    public void saveContextCustomTrustResolver() {
-        SecurityContext contextToSave = SecurityContextHolder.createEmptyContext();
-        contextToSave.setAuthentication(testToken);
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, new MockHttpServletResponse());
-        repo.loadContext(holder);
-        AuthenticationTrustResolver trustResolver = mock(AuthenticationTrustResolver.class);
-        repo.setTrustResolver(trustResolver);
+		repo.saveContext(contextToSave, holder.getRequest(), holder.getResponse());
 
-        repo.saveContext(contextToSave, holder.getRequest(), holder.getResponse());
+		verify(trustResolver).isAnonymous(contextToSave.getAuthentication());
+	}
 
-        verify(trustResolver).isAnonymous(contextToSave.getAuthentication());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setTrustResolverNull() {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		repo.setTrustResolver(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setTrustResolverNull() {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        repo.setTrustResolver(null);
-    }
+	// SEC-2578
+	@Test
+	public void traverseWrappedRequests() {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request,
+				response);
+		SecurityContext context = repo.loadContext(holder);
+		assertNull(request.getSession(false));
+		// Simulate authentication during the request
+		context.setAuthentication(testToken);
 
-    // SEC-2578
-    @Test
-    public void traverseWrappedRequests() {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpRequestResponseHolder holder = new HttpRequestResponseHolder(request, response);
-        SecurityContext context = repo.loadContext(holder);
-        assertNull(request.getSession(false));
-        // Simulate authentication during the request
-        context.setAuthentication(testToken);
+		repo.saveContext(context, new HttpServletRequestWrapper(holder.getRequest()),
+				new HttpServletResponseWrapper(holder.getResponse()));
 
-        repo.saveContext(context, new HttpServletRequestWrapper(holder.getRequest()), new HttpServletResponseWrapper(holder.getResponse()));
+		assertNotNull(request.getSession(false));
+		assertEquals(context,
+				request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
+	}
 
-        assertNotNull(request.getSession(false));
-        assertEquals(context, request.getSession().getAttribute(SPRING_SECURITY_CONTEXT_KEY));
-    }
+	@Test(expected = IllegalStateException.class)
+	public void failsWithStandardResponse() {
+		HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		context.setAuthentication(testToken);
 
-    @Test(expected = IllegalStateException.class)
-    public void failsWithStandardResponse() {
-        HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository();
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        context.setAuthentication(testToken);
-
-        repo.saveContext(context,request,response);
-    }
+		repo.saveContext(context, request, response);
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java
index f41da7bedd..0a23f9d7d4 100644
--- a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java
@@ -34,154 +34,157 @@ import org.springframework.security.core.context.SecurityContextHolder;
 
 @RunWith(MockitoJUnitRunner.class)
 public class SaveContextOnUpdateOrErrorResponseWrapperTests {
-    @Mock
-    private SecurityContext securityContext;
+	@Mock
+	private SecurityContext securityContext;
 
-    private MockHttpServletResponse response;
-    private SaveContextOnUpdateOrErrorResponseWrapperStub wrappedResponse;
+	private MockHttpServletResponse response;
+	private SaveContextOnUpdateOrErrorResponseWrapperStub wrappedResponse;
 
-    @Before
-    public void setUp() {
-        response = new MockHttpServletResponse();
-        wrappedResponse = new SaveContextOnUpdateOrErrorResponseWrapperStub(response, true);
-        SecurityContextHolder.setContext(securityContext);
-    }
+	@Before
+	public void setUp() {
+		response = new MockHttpServletResponse();
+		wrappedResponse = new SaveContextOnUpdateOrErrorResponseWrapperStub(response,
+				true);
+		SecurityContextHolder.setContext(securityContext);
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void sendErrorSavesSecurityContext() throws Exception {
-        int error = HttpServletResponse.SC_FORBIDDEN;
-        wrappedResponse.sendError(error);
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-        assertThat(response.getStatus()).isEqualTo(error);
-    }
+	@Test
+	public void sendErrorSavesSecurityContext() throws Exception {
+		int error = HttpServletResponse.SC_FORBIDDEN;
+		wrappedResponse.sendError(error);
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+		assertThat(response.getStatus()).isEqualTo(error);
+	}
 
-    @Test
-    public void sendErrorSkipsSaveSecurityContextDisables() throws Exception {
-        final int error = HttpServletResponse.SC_FORBIDDEN;
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.sendError(error);
-        assertThat(wrappedResponse.securityContext).isNull();
-        assertThat(response.getStatus()).isEqualTo(error);
-    }
+	@Test
+	public void sendErrorSkipsSaveSecurityContextDisables() throws Exception {
+		final int error = HttpServletResponse.SC_FORBIDDEN;
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.sendError(error);
+		assertThat(wrappedResponse.securityContext).isNull();
+		assertThat(response.getStatus()).isEqualTo(error);
+	}
 
-    @Test
-    public void sendErrorWithMessageSavesSecurityContext() throws Exception {
-        int error = HttpServletResponse.SC_FORBIDDEN;
-        String message = "Forbidden";
-        wrappedResponse.sendError(error, message);
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-        assertThat(response.getStatus()).isEqualTo(error);
-        assertThat(response.getErrorMessage()).isEqualTo(message);
-    }
+	@Test
+	public void sendErrorWithMessageSavesSecurityContext() throws Exception {
+		int error = HttpServletResponse.SC_FORBIDDEN;
+		String message = "Forbidden";
+		wrappedResponse.sendError(error, message);
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+		assertThat(response.getStatus()).isEqualTo(error);
+		assertThat(response.getErrorMessage()).isEqualTo(message);
+	}
 
-    @Test
-    public void sendErrorWithMessageSkipsSaveSecurityContextDisables() throws Exception {
-        final int error = HttpServletResponse.SC_FORBIDDEN;
-        final String message = "Forbidden";
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.sendError(error, message);
-        assertThat(wrappedResponse.securityContext).isNull();
-        assertThat(response.getStatus()).isEqualTo(error);
-        assertThat(response.getErrorMessage()).isEqualTo(message);
-    }
+	@Test
+	public void sendErrorWithMessageSkipsSaveSecurityContextDisables() throws Exception {
+		final int error = HttpServletResponse.SC_FORBIDDEN;
+		final String message = "Forbidden";
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.sendError(error, message);
+		assertThat(wrappedResponse.securityContext).isNull();
+		assertThat(response.getStatus()).isEqualTo(error);
+		assertThat(response.getErrorMessage()).isEqualTo(message);
+	}
 
-    @Test
-    public void sendRedirectSavesSecurityContext() throws Exception {
-        String url = "/location";
-        wrappedResponse.sendRedirect(url);
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-        assertThat(response.getRedirectedUrl()).isEqualTo(url);
-    }
+	@Test
+	public void sendRedirectSavesSecurityContext() throws Exception {
+		String url = "/location";
+		wrappedResponse.sendRedirect(url);
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+		assertThat(response.getRedirectedUrl()).isEqualTo(url);
+	}
 
-    @Test
-    public void sendRedirectSkipsSaveSecurityContextDisables() throws Exception {
-        final String url = "/location";
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.sendRedirect(url);
-        assertThat(wrappedResponse.securityContext).isNull();
-        assertThat(response.getRedirectedUrl()).isEqualTo(url);
-    }
+	@Test
+	public void sendRedirectSkipsSaveSecurityContextDisables() throws Exception {
+		final String url = "/location";
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.sendRedirect(url);
+		assertThat(wrappedResponse.securityContext).isNull();
+		assertThat(response.getRedirectedUrl()).isEqualTo(url);
+	}
 
-    @Test
-    public void outputFlushSavesSecurityContext() throws Exception {
-        wrappedResponse.getOutputStream().flush();
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-    }
+	@Test
+	public void outputFlushSavesSecurityContext() throws Exception {
+		wrappedResponse.getOutputStream().flush();
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+	}
 
-    @Test
-    public void outputFlushSkipsSaveSecurityContextDisables() throws Exception {
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.getOutputStream().flush();
-        assertThat(wrappedResponse.securityContext).isNull();
-    }
+	@Test
+	public void outputFlushSkipsSaveSecurityContextDisables() throws Exception {
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.getOutputStream().flush();
+		assertThat(wrappedResponse.securityContext).isNull();
+	}
 
-    @Test
-    public void outputCloseSavesSecurityContext() throws Exception {
-        wrappedResponse.getOutputStream().close();
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-    }
+	@Test
+	public void outputCloseSavesSecurityContext() throws Exception {
+		wrappedResponse.getOutputStream().close();
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+	}
 
-    @Test
-    public void outputCloseSkipsSaveSecurityContextDisables() throws Exception {
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.getOutputStream().close();
-        assertThat(wrappedResponse.securityContext).isNull();
-    }
+	@Test
+	public void outputCloseSkipsSaveSecurityContextDisables() throws Exception {
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.getOutputStream().close();
+		assertThat(wrappedResponse.securityContext).isNull();
+	}
 
-    @Test
-    public void writerFlushSavesSecurityContext() throws Exception {
-        wrappedResponse.getWriter().flush();
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-    }
+	@Test
+	public void writerFlushSavesSecurityContext() throws Exception {
+		wrappedResponse.getWriter().flush();
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+	}
 
-    @Test
-    public void writerFlushSkipsSaveSecurityContextDisables() throws Exception {
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.getWriter().flush();
-        assertThat(wrappedResponse.securityContext).isNull();
-    }
+	@Test
+	public void writerFlushSkipsSaveSecurityContextDisables() throws Exception {
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.getWriter().flush();
+		assertThat(wrappedResponse.securityContext).isNull();
+	}
 
-    @Test
-    public void writerCloseSavesSecurityContext() throws Exception {
-        wrappedResponse.getWriter().close();
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-    }
+	@Test
+	public void writerCloseSavesSecurityContext() throws Exception {
+		wrappedResponse.getWriter().close();
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+	}
 
-    @Test
-    public void writerCloseSkipsSaveSecurityContextDisables() throws Exception {
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.getWriter().close();
-        assertThat(wrappedResponse.securityContext).isNull();
-    }
+	@Test
+	public void writerCloseSkipsSaveSecurityContextDisables() throws Exception {
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.getWriter().close();
+		assertThat(wrappedResponse.securityContext).isNull();
+	}
 
-    @Test
-    public void flushBufferSavesSecurityContext() throws Exception {
-        wrappedResponse.flushBuffer();
-        assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
-    }
+	@Test
+	public void flushBufferSavesSecurityContext() throws Exception {
+		wrappedResponse.flushBuffer();
+		assertThat(wrappedResponse.securityContext).isEqualTo(securityContext);
+	}
 
-    @Test
-    public void flushBufferSkipsSaveSecurityContextDisables() throws Exception {
-        wrappedResponse.disableSaveOnResponseCommitted();
-        wrappedResponse.flushBuffer();
-        assertThat(wrappedResponse.securityContext).isNull();
-    }
+	@Test
+	public void flushBufferSkipsSaveSecurityContextDisables() throws Exception {
+		wrappedResponse.disableSaveOnResponseCommitted();
+		wrappedResponse.flushBuffer();
+		assertThat(wrappedResponse.securityContext).isNull();
+	}
 
-    private static class SaveContextOnUpdateOrErrorResponseWrapperStub extends SaveContextOnUpdateOrErrorResponseWrapper {
-        private SecurityContext securityContext;
+	private static class SaveContextOnUpdateOrErrorResponseWrapperStub extends
+			SaveContextOnUpdateOrErrorResponseWrapper {
+		private SecurityContext securityContext;
 
-        public SaveContextOnUpdateOrErrorResponseWrapperStub(HttpServletResponse response, boolean disableUrlRewriting) {
-            super(response, disableUrlRewriting);
-        }
+		public SaveContextOnUpdateOrErrorResponseWrapperStub(
+				HttpServletResponse response, boolean disableUrlRewriting) {
+			super(response, disableUrlRewriting);
+		}
 
-        @Override
-        protected void saveContext(SecurityContext context) {
-            securityContext = context;
-        }
-    }
+		@Override
+		protected void saveContext(SecurityContext context) {
+			securityContext = context;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
index 64a2ff0621..d0ec0c31b3 100644
--- a/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/SecurityContextPersistenceFilterTests.java
@@ -20,102 +20,114 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
 
 public class SecurityContextPersistenceFilterTests {
-    TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone", "passwd", "ROLE_A");
+	TestingAuthenticationToken testToken = new TestingAuthenticationToken("someone",
+			"passwd", "ROLE_A");
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void contextIsClearedAfterChainProceeds() throws Exception {
-        final FilterChain chain = mock(FilterChain.class);
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
-        SecurityContextHolder.getContext().setAuthentication(testToken);
+	@Test
+	public void contextIsClearedAfterChainProceeds() throws Exception {
+		final FilterChain chain = mock(FilterChain.class);
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
+		SecurityContextHolder.getContext().setAuthentication(testToken);
 
-        filter.doFilter(request, response, chain);
-        verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+		filter.doFilter(request, response, chain);
+		verify(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void contextIsStillClearedIfExceptionIsThrowByFilterChain() throws Exception {
-        final FilterChain chain = mock(FilterChain.class);
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
-        SecurityContextHolder.getContext().setAuthentication(testToken);
-        doThrow(new IOException()).when(chain).doFilter(any(ServletRequest.class), any(ServletResponse.class));
-        try {
-            filter.doFilter(request, response, chain);
-            fail();
-        } catch(IOException expected) {
-        }
+	@Test
+	public void contextIsStillClearedIfExceptionIsThrowByFilterChain() throws Exception {
+		final FilterChain chain = mock(FilterChain.class);
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
+		SecurityContextHolder.getContext().setAuthentication(testToken);
+		doThrow(new IOException()).when(chain).doFilter(any(ServletRequest.class),
+				any(ServletResponse.class));
+		try {
+			filter.doFilter(request, response, chain);
+			fail();
+		}
+		catch (IOException expected) {
+		}
 
-        assertNull(SecurityContextHolder.getContext().getAuthentication());
-    }
+		assertNull(SecurityContextHolder.getContext().getAuthentication());
+	}
 
-    @Test
-    public void loadedContextContextIsCopiedToSecurityContextHolderAndUpdatedContextIsStored() throws Exception {
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        final TestingAuthenticationToken beforeAuth = new TestingAuthenticationToken("someoneelse", "passwd", "ROLE_B");
-        final SecurityContext scBefore = new SecurityContextImpl();
-        final SecurityContext scExpectedAfter = new SecurityContextImpl();
-        scExpectedAfter.setAuthentication(testToken);
-        scBefore.setAuthentication(beforeAuth);
-        final SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(repo);
+	@Test
+	public void loadedContextContextIsCopiedToSecurityContextHolderAndUpdatedContextIsStored()
+			throws Exception {
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		final TestingAuthenticationToken beforeAuth = new TestingAuthenticationToken(
+				"someoneelse", "passwd", "ROLE_B");
+		final SecurityContext scBefore = new SecurityContextImpl();
+		final SecurityContext scExpectedAfter = new SecurityContextImpl();
+		scExpectedAfter.setAuthentication(testToken);
+		scBefore.setAuthentication(beforeAuth);
+		final SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(
+				repo);
 
-        when(repo.loadContext(any(HttpRequestResponseHolder.class))).thenReturn(scBefore);
+		when(repo.loadContext(any(HttpRequestResponseHolder.class))).thenReturn(scBefore);
 
-        final FilterChain chain = new FilterChain() {
-            public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-                assertEquals(beforeAuth, SecurityContextHolder.getContext().getAuthentication());
-                // Change the context here
-                SecurityContextHolder.setContext(scExpectedAfter);
-            }
-        };
+		final FilterChain chain = new FilterChain() {
+			public void doFilter(ServletRequest request, ServletResponse response)
+					throws IOException, ServletException {
+				assertEquals(beforeAuth, SecurityContextHolder.getContext()
+						.getAuthentication());
+				// Change the context here
+				SecurityContextHolder.setContext(scExpectedAfter);
+			}
+		};
 
-        filter.doFilter(request, response, chain);
+		filter.doFilter(request, response, chain);
 
-        verify(repo).saveContext(scExpectedAfter, request, response);
-    }
+		verify(repo).saveContext(scExpectedAfter, request, response);
+	}
 
-    @Test
-    public void filterIsNotAppliedAgainIfFilterAppliedAttributeIsSet() throws Exception {
-        final FilterChain chain = mock(FilterChain.class);
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(mock(SecurityContextRepository.class));
+	@Test
+	public void filterIsNotAppliedAgainIfFilterAppliedAttributeIsSet() throws Exception {
+		final FilterChain chain = mock(FilterChain.class);
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(
+				mock(SecurityContextRepository.class));
 
-        request.setAttribute(SecurityContextPersistenceFilter.FILTER_APPLIED, Boolean.TRUE);
-        filter.doFilter(request, response, chain);
-        verify(chain).doFilter(request, response);
-    }
+		request.setAttribute(SecurityContextPersistenceFilter.FILTER_APPLIED,
+				Boolean.TRUE);
+		filter.doFilter(request, response, chain);
+		verify(chain).doFilter(request, response);
+	}
 
-    @Test
-    public void sessionIsEagerlyCreatedWhenConfigured() throws Exception {
-        final FilterChain chain = mock(FilterChain.class);
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
-        filter.setForceEagerSessionCreation(true);
-        filter.doFilter(request, response, chain);
-        assertNotNull(request.getSession(false));
-    }
+	@Test
+	public void sessionIsEagerlyCreatedWhenConfigured() throws Exception {
+		final FilterChain chain = mock(FilterChain.class);
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter();
+		filter.setForceEagerSessionCreation(true);
+		filter.doFilter(request, response, chain);
+		assertNotNull(request.getSession(false));
+	}
 
-    @Test
-    public void nullSecurityContextRepoDoesntSaveContextOrCreateSession() throws Exception {
-        final FilterChain chain = mock(FilterChain.class);
-        final MockHttpServletRequest request = new MockHttpServletRequest();
-        final MockHttpServletResponse response = new MockHttpServletResponse();
-        SecurityContextRepository repo = new NullSecurityContextRepository();
-        SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(repo);
-        filter.doFilter(request, response, chain);
-        assertFalse(repo.containsContext(request));
-        assertNull(request.getSession(false));
-    }
+	@Test
+	public void nullSecurityContextRepoDoesntSaveContextOrCreateSession()
+			throws Exception {
+		final FilterChain chain = mock(FilterChain.class);
+		final MockHttpServletRequest request = new MockHttpServletRequest();
+		final MockHttpServletResponse response = new MockHttpServletResponse();
+		SecurityContextRepository repo = new NullSecurityContextRepository();
+		SecurityContextPersistenceFilter filter = new SecurityContextPersistenceFilter(
+				repo);
+		filter.doFilter(request, response, chain);
+		assertFalse(repo.containsContext(request));
+		assertNull(request.getSession(false));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java
index 541f8b2eff..8099e63130 100644
--- a/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/request/async/SecurityContextCallableProcessingInterceptorTests.java
@@ -32,46 +32,46 @@ import org.springframework.web.context.request.NativeWebRequest;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class SecurityContextCallableProcessingInterceptorTests {
-    @Mock
-    private SecurityContext securityContext;
-    @Mock
-    private Callable<?> callable;
-    @Mock
-    private NativeWebRequest webRequest;
+	@Mock
+	private SecurityContext securityContext;
+	@Mock
+	private Callable<?> callable;
+	@Mock
+	private NativeWebRequest webRequest;
 
-    @After
-    public void clearSecurityContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearSecurityContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNull() {
-        new SecurityContextCallableProcessingInterceptor(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNull() {
+		new SecurityContextCallableProcessingInterceptor(null);
+	}
 
-    @Test
-    public void currentSecurityContext() throws Exception {
-        SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor();
-        SecurityContextHolder.setContext(securityContext);
-        interceptor.beforeConcurrentHandling(webRequest, callable);
-        SecurityContextHolder.clearContext();
+	@Test
+	public void currentSecurityContext() throws Exception {
+		SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor();
+		SecurityContextHolder.setContext(securityContext);
+		interceptor.beforeConcurrentHandling(webRequest, callable);
+		SecurityContextHolder.clearContext();
 
-        interceptor.preProcess(webRequest, callable);
-        assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext);
+		interceptor.preProcess(webRequest, callable);
+		assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext);
 
-        interceptor.postProcess(webRequest, callable, null);
-        assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
-    }
+		interceptor.postProcess(webRequest, callable, null);
+		assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
+	}
 
-    @Test
-    public void specificSecurityContext() throws Exception {
-        SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor(
-                securityContext);
+	@Test
+	public void specificSecurityContext() throws Exception {
+		SecurityContextCallableProcessingInterceptor interceptor = new SecurityContextCallableProcessingInterceptor(
+				securityContext);
 
-        interceptor.preProcess(webRequest, callable);
-        assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext);
+		interceptor.preProcess(webRequest, callable);
+		assertThat(SecurityContextHolder.getContext()).isSameAs(securityContext);
 
-        interceptor.postProcess(webRequest, callable, null);
-        assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
-    }
+		interceptor.postProcess(webRequest, callable, null);
+		assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java
index ddf368fc85..37848ce5f9 100644
--- a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java
@@ -37,7 +37,6 @@ import org.springframework.web.context.request.async.CallableProcessingIntercept
 import org.springframework.web.context.request.async.WebAsyncManager;
 import org.springframework.web.context.request.async.WebAsyncUtils;
 
-
 /**
  *
  * @author Rob Winch
@@ -45,99 +44,107 @@ import org.springframework.web.context.request.async.WebAsyncUtils;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class WebAsyncManagerIntegrationFilterTests {
-    @Mock
-    private SecurityContext securityContext;
-    @Mock
-    private HttpServletRequest request;
-    @Mock
-    private HttpServletResponse response;
-    @Mock
-    private AsyncWebRequest asyncWebRequest;
-    private WebAsyncManager asyncManager;
-    private JoinableThreadFactory threadFactory;
+	@Mock
+	private SecurityContext securityContext;
+	@Mock
+	private HttpServletRequest request;
+	@Mock
+	private HttpServletResponse response;
+	@Mock
+	private AsyncWebRequest asyncWebRequest;
+	private WebAsyncManager asyncManager;
+	private JoinableThreadFactory threadFactory;
 
-    private MockFilterChain filterChain;
+	private MockFilterChain filterChain;
 
-    private WebAsyncManagerIntegrationFilter filter;
+	private WebAsyncManagerIntegrationFilter filter;
 
-    @Before
-    public void setUp() {
-        when(asyncWebRequest.getNativeRequest(HttpServletRequest.class)).thenReturn(request);
-        when(request.getRequestURI()).thenReturn("/");
-        filterChain = new MockFilterChain();
+	@Before
+	public void setUp() {
+		when(asyncWebRequest.getNativeRequest(HttpServletRequest.class)).thenReturn(
+				request);
+		when(request.getRequestURI()).thenReturn("/");
+		filterChain = new MockFilterChain();
 
-        threadFactory = new JoinableThreadFactory();
-        SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor();
-        executor.setThreadFactory(threadFactory);
+		threadFactory = new JoinableThreadFactory();
+		SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor();
+		executor.setThreadFactory(threadFactory);
 
-        asyncManager = WebAsyncUtils.getAsyncManager(request);
-        asyncManager.setAsyncWebRequest(asyncWebRequest);
-        asyncManager.setTaskExecutor(executor);
-        when(request.getAttribute(WebAsyncUtils.WEB_ASYNC_MANAGER_ATTRIBUTE)).thenReturn(asyncManager);
+		asyncManager = WebAsyncUtils.getAsyncManager(request);
+		asyncManager.setAsyncWebRequest(asyncWebRequest);
+		asyncManager.setTaskExecutor(executor);
+		when(request.getAttribute(WebAsyncUtils.WEB_ASYNC_MANAGER_ATTRIBUTE)).thenReturn(
+				asyncManager);
 
-        filter = new WebAsyncManagerIntegrationFilter();
-    }
+		filter = new WebAsyncManagerIntegrationFilter();
+	}
 
-    @After
-    public void clearSecurityContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearSecurityContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void doFilterInternalRegistersSecurityContextCallableProcessor() throws Exception {
-        SecurityContextHolder.setContext(securityContext);
-        asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() {
-            @Override
-            public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult)
-                    throws Exception {
-                assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
-            }
-        });
-        filter.doFilterInternal(request, response, filterChain);
+	@Test
+	public void doFilterInternalRegistersSecurityContextCallableProcessor()
+			throws Exception {
+		SecurityContextHolder.setContext(securityContext);
+		asyncManager
+				.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() {
+					@Override
+					public <T> void postProcess(NativeWebRequest request,
+							Callable<T> task, Object concurrentResult) throws Exception {
+						assertThat(SecurityContextHolder.getContext()).isNotSameAs(
+								securityContext);
+					}
+				});
+		filter.doFilterInternal(request, response, filterChain);
 
-        VerifyingCallable verifyingCallable = new VerifyingCallable();
-        asyncManager.startCallableProcessing(verifyingCallable);
-        threadFactory.join();
-        assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext);
-    }
+		VerifyingCallable verifyingCallable = new VerifyingCallable();
+		asyncManager.startCallableProcessing(verifyingCallable);
+		threadFactory.join();
+		assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext);
+	}
 
-    @Test
-    public void doFilterInternalRegistersSecurityContextCallableProcessorContextUpdated() throws Exception {
-        SecurityContextHolder.setContext(SecurityContextHolder.createEmptyContext());
-        asyncManager.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() {
-            @Override
-            public <T> void postProcess(NativeWebRequest request, Callable<T> task, Object concurrentResult)
-                    throws Exception {
-                assertThat(SecurityContextHolder.getContext()).isNotSameAs(securityContext);
-            }
-        });
-        filter.doFilterInternal(request, response, filterChain);
-        SecurityContextHolder.setContext(securityContext);
+	@Test
+	public void doFilterInternalRegistersSecurityContextCallableProcessorContextUpdated()
+			throws Exception {
+		SecurityContextHolder.setContext(SecurityContextHolder.createEmptyContext());
+		asyncManager
+				.registerCallableInterceptors(new CallableProcessingInterceptorAdapter() {
+					@Override
+					public <T> void postProcess(NativeWebRequest request,
+							Callable<T> task, Object concurrentResult) throws Exception {
+						assertThat(SecurityContextHolder.getContext()).isNotSameAs(
+								securityContext);
+					}
+				});
+		filter.doFilterInternal(request, response, filterChain);
+		SecurityContextHolder.setContext(securityContext);
 
-        VerifyingCallable verifyingCallable = new VerifyingCallable();
-        asyncManager.startCallableProcessing(verifyingCallable);
-        threadFactory.join();
-        assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext);
-    }
+		VerifyingCallable verifyingCallable = new VerifyingCallable();
+		asyncManager.startCallableProcessing(verifyingCallable);
+		threadFactory.join();
+		assertThat(asyncManager.getConcurrentResult()).isSameAs(securityContext);
+	}
 
-    private static final class JoinableThreadFactory implements ThreadFactory {
-        private Thread t;
+	private static final class JoinableThreadFactory implements ThreadFactory {
+		private Thread t;
 
-        public Thread newThread(Runnable r) {
-            t =  new Thread(r);
-            return t;
-        }
+		public Thread newThread(Runnable r) {
+			t = new Thread(r);
+			return t;
+		}
 
-        public void join() throws InterruptedException {
-            t.join();
-        }
-    }
+		public void join() throws InterruptedException {
+			t.join();
+		}
+	}
 
-    private class VerifyingCallable implements Callable<SecurityContext> {
+	private class VerifyingCallable implements Callable<SecurityContext> {
 
-        public SecurityContext call() throws Exception {
-            return SecurityContextHolder.getContext();
-        }
+		public SecurityContext call() throws Exception {
+			return SecurityContextHolder.getContext();
+		}
 
-    }
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java
index 8b087ed697..ff1f5af7a8 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategyTests.java
@@ -40,69 +40,80 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfAuthenticationStrategyTests {
-    @Mock
-    private CsrfTokenRepository csrfTokenRepository;
+	@Mock
+	private CsrfTokenRepository csrfTokenRepository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private CsrfAuthenticationStrategy strategy;
+	private CsrfAuthenticationStrategy strategy;
 
-    private CsrfToken existingToken;
+	private CsrfToken existingToken;
 
-    private CsrfToken generatedToken;
+	private CsrfToken generatedToken;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        strategy = new CsrfAuthenticationStrategy(csrfTokenRepository);
-        existingToken = new DefaultCsrfToken("_csrf", "_csrf", "1");
-        generatedToken = new DefaultCsrfToken("_csrf", "_csrf", "2");
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		strategy = new CsrfAuthenticationStrategy(csrfTokenRepository);
+		existingToken = new DefaultCsrfToken("_csrf", "_csrf", "1");
+		generatedToken = new DefaultCsrfToken("_csrf", "_csrf", "2");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullCsrfTokenRepository() {
-        new CsrfAuthenticationStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullCsrfTokenRepository() {
+		new CsrfAuthenticationStrategy(null);
+	}
 
-    @Test
-    public void logoutRemovesCsrfTokenAndSavesNew() {
-        when(csrfTokenRepository.loadToken(request)).thenReturn(existingToken);
-        when(csrfTokenRepository.generateToken(request)).thenReturn(generatedToken);
-        strategy.onAuthentication(new TestingAuthenticationToken("user", "password", "ROLE_USER"), request, response);
+	@Test
+	public void logoutRemovesCsrfTokenAndSavesNew() {
+		when(csrfTokenRepository.loadToken(request)).thenReturn(existingToken);
+		when(csrfTokenRepository.generateToken(request)).thenReturn(generatedToken);
+		strategy.onAuthentication(new TestingAuthenticationToken("user", "password",
+				"ROLE_USER"), request, response);
 
-        verify(csrfTokenRepository).saveToken(null, request, response);
-        verify(csrfTokenRepository,never()).saveToken(eq(generatedToken), any(HttpServletRequest.class), any(HttpServletResponse.class));
-        // SEC-2404, SEC-2832
-        CsrfToken tokenInRequest = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
-        assertThat(tokenInRequest.getToken()).isSameAs(generatedToken.getToken());
-        assertThat(tokenInRequest.getHeaderName()).isSameAs(generatedToken.getHeaderName());
-        assertThat(tokenInRequest.getParameterName()).isSameAs(generatedToken.getParameterName());
-        assertThat(request.getAttribute(generatedToken.getParameterName())).isSameAs(tokenInRequest);
-    }
+		verify(csrfTokenRepository).saveToken(null, request, response);
+		verify(csrfTokenRepository, never()).saveToken(eq(generatedToken),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// SEC-2404, SEC-2832
+		CsrfToken tokenInRequest = (CsrfToken) request.getAttribute(CsrfToken.class
+				.getName());
+		assertThat(tokenInRequest.getToken()).isSameAs(generatedToken.getToken());
+		assertThat(tokenInRequest.getHeaderName()).isSameAs(
+				generatedToken.getHeaderName());
+		assertThat(tokenInRequest.getParameterName()).isSameAs(
+				generatedToken.getParameterName());
+		assertThat(request.getAttribute(generatedToken.getParameterName())).isSameAs(
+				tokenInRequest);
+	}
 
-    // SEC-2872
-    @Test
-    public void delaySavingCsrf() {
-        when(csrfTokenRepository.loadToken(request)).thenReturn(existingToken);
-        when(csrfTokenRepository.generateToken(request)).thenReturn(generatedToken);
-        strategy.onAuthentication(new TestingAuthenticationToken("user", "password", "ROLE_USER"), request, response);
+	// SEC-2872
+	@Test
+	public void delaySavingCsrf() {
+		when(csrfTokenRepository.loadToken(request)).thenReturn(existingToken);
+		when(csrfTokenRepository.generateToken(request)).thenReturn(generatedToken);
+		strategy.onAuthentication(new TestingAuthenticationToken("user", "password",
+				"ROLE_USER"), request, response);
 
-        verify(csrfTokenRepository).saveToken(null, request, response);
-        verify(csrfTokenRepository,never()).saveToken(eq(generatedToken), any(HttpServletRequest.class), any(HttpServletResponse.class));
+		verify(csrfTokenRepository).saveToken(null, request, response);
+		verify(csrfTokenRepository, never()).saveToken(eq(generatedToken),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
 
-        CsrfToken tokenInRequest = (CsrfToken) request.getAttribute(CsrfToken.class.getName());
-        tokenInRequest.getToken();
-        verify(csrfTokenRepository).saveToken(eq(generatedToken), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		CsrfToken tokenInRequest = (CsrfToken) request.getAttribute(CsrfToken.class
+				.getName());
+		tokenInRequest.getToken();
+		verify(csrfTokenRepository).saveToken(eq(generatedToken),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void logoutRemovesNoActionIfNullToken() {
-        strategy.onAuthentication(new TestingAuthenticationToken("user", "password", "ROLE_USER"), request, response);
+	@Test
+	public void logoutRemovesNoActionIfNullToken() {
+		strategy.onAuthentication(new TestingAuthenticationToken("user", "password",
+				"ROLE_USER"), request, response);
 
-        verify(csrfTokenRepository,never()).saveToken(any(CsrfToken.class), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
+		verify(csrfTokenRepository, never()).saveToken(any(CsrfToken.class),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+	}
 }
-
diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java
index e2891867a4..ae4a85d5fd 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java
@@ -50,366 +50,333 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfFilterTests {
 
-    @Mock
-    private RequestMatcher requestMatcher;
-    @Mock
-    private CsrfTokenRepository tokenRepository;
-    @Mock
-    private FilterChain filterChain;
-    @Mock
-    private AccessDeniedHandler deniedHandler;
-
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private CsrfToken token;
-
-    private CsrfFilter filter;
-
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("headerName", "paramName",
-                "csrfTokenValue");
-        resetRequestResponse();
-        filter = new CsrfFilter(tokenRepository);
-        filter.setRequireCsrfProtectionMatcher(requestMatcher);
-        filter.setAccessDeniedHandler(deniedHandler);
-    }
-
-    private void resetRequestResponse() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullRepository() {
-        new CsrfFilter(null);
-    }
-
-    // SEC-2276
-    @Test
-    public void doFilterDoesNotSaveCsrfTokenUntilAccessed() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(false);
-        when(tokenRepository.generateToken(request)).thenReturn(token);
-
-        filter.doFilter(request, response, filterChain);
-        CsrfToken attrToken = (CsrfToken) request.getAttribute(token.getParameterName());
-
-        // no CsrfToken should have been saved yet
-        verify(tokenRepository,times(0)).saveToken(any(CsrfToken.class), any(HttpServletRequest.class), any(HttpServletResponse.class));
-        verify(filterChain).doFilter(request, response);
-
-        // access the token
-        attrToken.getToken();
-
-        // now the CsrfToken should have been saved
-        verify(tokenRepository).saveToken(eq(token), any(HttpServletRequest.class), any(HttpServletResponse.class));
-    }
-
-    @Test
-    public void doFilterAccessDeniedNoTokenPresent() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(deniedHandler).handle(eq(request), eq(response),
-                any(InvalidCsrfTokenException.class));
-        verifyZeroInteractions(filterChain);
-    }
-
-    @Test
-    public void doFilterAccessDeniedIncorrectTokenPresent()
-            throws ServletException, IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.setParameter(token.getParameterName(), token.getToken()
-                + " INVALID");
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(deniedHandler).handle(eq(request), eq(response),
-                any(InvalidCsrfTokenException.class));
-        verifyZeroInteractions(filterChain);
-    }
-
-    @Test
-    public void doFilterAccessDeniedIncorrectTokenPresentHeader()
-            throws ServletException, IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.addHeader(token.getHeaderName(), token.getToken() + " INVALID");
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(deniedHandler).handle(eq(request), eq(response),
-                any(InvalidCsrfTokenException.class));
-        verifyZeroInteractions(filterChain);
-    }
-
-    @Test
-    public void doFilterAccessDeniedIncorrectTokenPresentHeaderPreferredOverParameter()
-            throws ServletException, IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.setParameter(token.getParameterName(), token.getToken());
-        request.addHeader(token.getHeaderName(), token.getToken() + " INVALID");
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(deniedHandler).handle(eq(request), eq(response),
-                any(InvalidCsrfTokenException.class));
-        verifyZeroInteractions(filterChain);
-    }
-
-    @Test
-    public void doFilterNotCsrfRequestExistingToken() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(false);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterNotCsrfRequestGenerateToken() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(false);
-        when(tokenRepository.generateToken(request))
-                .thenReturn(token);
-
-        filter.doFilter(request, response, filterChain);
-
-        assertToken(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertToken(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterIsCsrfRequestExistingTokenHeader()
-            throws ServletException, IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.addHeader(token.getHeaderName(), token.getToken());
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterIsCsrfRequestExistingTokenHeaderPreferredOverInvalidParam()
-            throws ServletException, IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.setParameter(token.getParameterName(), token.getToken()
-                + " INVALID");
-        request.addHeader(token.getHeaderName(), token.getToken());
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterIsCsrfRequestExistingToken() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-        request.setParameter(token.getParameterName(), token.getToken());
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterIsCsrfRequestGenerateToken() throws ServletException,
-            IOException {
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.generateToken(request))
-                .thenReturn(token);
-        request.setParameter(token.getParameterName(), token.getToken());
-
-        filter.doFilter(request, response, filterChain);
-
-        assertToken(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertToken(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        verify(filterChain).doFilter(request, response);
-        verifyZeroInteractions(deniedHandler);
-    }
-
-    @Test
-    public void doFilterDefaultRequireCsrfProtectionMatcherAllowedMethods()
-            throws ServletException, IOException {
-        filter = new CsrfFilter(tokenRepository);
-        filter.setAccessDeniedHandler(deniedHandler);
-
-        for (String method : Arrays.asList("GET", "TRACE", "OPTIONS", "HEAD")) {
-            resetRequestResponse();
-            when(tokenRepository.loadToken(request)).thenReturn(token);
-            request.setMethod(method);
-
-            filter.doFilter(request, response, filterChain);
-
-            verify(filterChain).doFilter(request, response);
-            verifyZeroInteractions(deniedHandler);
-        }
-    }
-
-    /**
-     * SEC-2292 Should not allow other cases through since spec states HTTP
-     * method is case sensitive
-     * http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.1
-     *
-     * @throws ServletException
-     * @throws IOException
-     */
-    @Test
-    public void doFilterDefaultRequireCsrfProtectionMatcherAllowedMethodsCaseSensitive()
-            throws ServletException, IOException {
-        filter = new CsrfFilter(tokenRepository);
-        filter.setAccessDeniedHandler(deniedHandler);
-
-        for (String method : Arrays.asList("get", "TrAcE", "oPTIOnS", "hEaD")) {
-            resetRequestResponse();
-            when(tokenRepository.loadToken(request)).thenReturn(token);
-            request.setMethod(method);
-
-            filter.doFilter(request, response, filterChain);
-
-            verify(deniedHandler).handle(eq(request), eq(response),
-                    any(InvalidCsrfTokenException.class));
-            verifyZeroInteractions(filterChain);
-        }
-    }
-
-    @Test
-    public void doFilterDefaultRequireCsrfProtectionMatcherDeniedMethods()
-            throws ServletException, IOException {
-        filter = new CsrfFilter(tokenRepository);
-        filter.setAccessDeniedHandler(deniedHandler);
-
-        for (String method : Arrays.asList("POST", "PUT", "PATCH", "DELETE",
-                "INVALID")) {
-            resetRequestResponse();
-            when(tokenRepository.loadToken(request)).thenReturn(token);
-            request.setMethod(method);
-
-            filter.doFilter(request, response, filterChain);
-
-            verify(deniedHandler).handle(eq(request), eq(response),
-                    any(InvalidCsrfTokenException.class));
-            verifyZeroInteractions(filterChain);
-        }
-    }
-
-    @Test
-    public void doFilterDefaultAccessDenied() throws ServletException,
-            IOException {
-        filter = new CsrfFilter(tokenRepository);
-        filter.setRequireCsrfProtectionMatcher(requestMatcher);
-        when(requestMatcher.matches(request)).thenReturn(true);
-        when(tokenRepository.loadToken(request)).thenReturn(token);
-
-        filter.doFilter(request, response, filterChain);
-
-        assertThat(request.getAttribute(token.getParameterName())).isEqualTo(
-                token);
-        assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(
-                token);
-
-        assertThat(response.getStatus()).isEqualTo(
-                HttpServletResponse.SC_FORBIDDEN);
-        verifyZeroInteractions(filterChain);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setRequireCsrfProtectionMatcherNull() {
-        filter.setRequireCsrfProtectionMatcher(null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void setAccessDeniedHandlerNull() {
-        filter.setAccessDeniedHandler(null);
-    }
-
-    private static final CsrfTokenAssert assertToken(Object token) {
-        return new CsrfTokenAssert((CsrfToken)token);
-    }
-
-    private static class CsrfTokenAssert extends
-            GenericAssert<CsrfTokenAssert, CsrfToken> {
-
-        /**
-         * Creates a new </code>{@link ObjectAssert}</code>.
-         *
-         * @param actual
-         *            the target to verify.
-         */
-        protected CsrfTokenAssert(CsrfToken actual) {
-            super(CsrfTokenAssert.class, actual);
-        }
-
-        public CsrfTokenAssert isEqualTo(CsrfToken expected) {
-            assertThat(actual.getHeaderName()).isEqualTo(expected.getHeaderName());
-            assertThat(actual.getParameterName()).isEqualTo(expected.getParameterName());
-            assertThat(actual.getToken()).isEqualTo(expected.getToken());
-            return this;
-        }
-    }
+	@Mock
+	private RequestMatcher requestMatcher;
+	@Mock
+	private CsrfTokenRepository tokenRepository;
+	@Mock
+	private FilterChain filterChain;
+	@Mock
+	private AccessDeniedHandler deniedHandler;
+
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private CsrfToken token;
+
+	private CsrfFilter filter;
+
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("headerName", "paramName", "csrfTokenValue");
+		resetRequestResponse();
+		filter = new CsrfFilter(tokenRepository);
+		filter.setRequireCsrfProtectionMatcher(requestMatcher);
+		filter.setAccessDeniedHandler(deniedHandler);
+	}
+
+	private void resetRequestResponse() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullRepository() {
+		new CsrfFilter(null);
+	}
+
+	// SEC-2276
+	@Test
+	public void doFilterDoesNotSaveCsrfTokenUntilAccessed() throws ServletException,
+			IOException {
+		when(requestMatcher.matches(request)).thenReturn(false);
+		when(tokenRepository.generateToken(request)).thenReturn(token);
+
+		filter.doFilter(request, response, filterChain);
+		CsrfToken attrToken = (CsrfToken) request.getAttribute(token.getParameterName());
+
+		// no CsrfToken should have been saved yet
+		verify(tokenRepository, times(0)).saveToken(any(CsrfToken.class),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+		verify(filterChain).doFilter(request, response);
+
+		// access the token
+		attrToken.getToken();
+
+		// now the CsrfToken should have been saved
+		verify(tokenRepository).saveToken(eq(token), any(HttpServletRequest.class),
+				any(HttpServletResponse.class));
+	}
+
+	@Test
+	public void doFilterAccessDeniedNoTokenPresent() throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(deniedHandler).handle(eq(request), eq(response),
+				any(InvalidCsrfTokenException.class));
+		verifyZeroInteractions(filterChain);
+	}
+
+	@Test
+	public void doFilterAccessDeniedIncorrectTokenPresent() throws ServletException,
+			IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.setParameter(token.getParameterName(), token.getToken() + " INVALID");
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(deniedHandler).handle(eq(request), eq(response),
+				any(InvalidCsrfTokenException.class));
+		verifyZeroInteractions(filterChain);
+	}
+
+	@Test
+	public void doFilterAccessDeniedIncorrectTokenPresentHeader()
+			throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.addHeader(token.getHeaderName(), token.getToken() + " INVALID");
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(deniedHandler).handle(eq(request), eq(response),
+				any(InvalidCsrfTokenException.class));
+		verifyZeroInteractions(filterChain);
+	}
+
+	@Test
+	public void doFilterAccessDeniedIncorrectTokenPresentHeaderPreferredOverParameter()
+			throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.setParameter(token.getParameterName(), token.getToken());
+		request.addHeader(token.getHeaderName(), token.getToken() + " INVALID");
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(deniedHandler).handle(eq(request), eq(response),
+				any(InvalidCsrfTokenException.class));
+		verifyZeroInteractions(filterChain);
+	}
+
+	@Test
+	public void doFilterNotCsrfRequestExistingToken() throws ServletException,
+			IOException {
+		when(requestMatcher.matches(request)).thenReturn(false);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterNotCsrfRequestGenerateToken() throws ServletException,
+			IOException {
+		when(requestMatcher.matches(request)).thenReturn(false);
+		when(tokenRepository.generateToken(request)).thenReturn(token);
+
+		filter.doFilter(request, response, filterChain);
+
+		assertToken(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertToken(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterIsCsrfRequestExistingTokenHeader() throws ServletException,
+			IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.addHeader(token.getHeaderName(), token.getToken());
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterIsCsrfRequestExistingTokenHeaderPreferredOverInvalidParam()
+			throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.setParameter(token.getParameterName(), token.getToken() + " INVALID");
+		request.addHeader(token.getHeaderName(), token.getToken());
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterIsCsrfRequestExistingToken() throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+		request.setParameter(token.getParameterName(), token.getToken());
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterIsCsrfRequestGenerateToken() throws ServletException, IOException {
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.generateToken(request)).thenReturn(token);
+		request.setParameter(token.getParameterName(), token.getToken());
+
+		filter.doFilter(request, response, filterChain);
+
+		assertToken(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertToken(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		verify(filterChain).doFilter(request, response);
+		verifyZeroInteractions(deniedHandler);
+	}
+
+	@Test
+	public void doFilterDefaultRequireCsrfProtectionMatcherAllowedMethods()
+			throws ServletException, IOException {
+		filter = new CsrfFilter(tokenRepository);
+		filter.setAccessDeniedHandler(deniedHandler);
+
+		for (String method : Arrays.asList("GET", "TRACE", "OPTIONS", "HEAD")) {
+			resetRequestResponse();
+			when(tokenRepository.loadToken(request)).thenReturn(token);
+			request.setMethod(method);
+
+			filter.doFilter(request, response, filterChain);
+
+			verify(filterChain).doFilter(request, response);
+			verifyZeroInteractions(deniedHandler);
+		}
+	}
+
+	/**
+	 * SEC-2292 Should not allow other cases through since spec states HTTP method is case
+	 * sensitive http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.1
+	 *
+	 * @throws ServletException
+	 * @throws IOException
+	 */
+	@Test
+	public void doFilterDefaultRequireCsrfProtectionMatcherAllowedMethodsCaseSensitive()
+			throws ServletException, IOException {
+		filter = new CsrfFilter(tokenRepository);
+		filter.setAccessDeniedHandler(deniedHandler);
+
+		for (String method : Arrays.asList("get", "TrAcE", "oPTIOnS", "hEaD")) {
+			resetRequestResponse();
+			when(tokenRepository.loadToken(request)).thenReturn(token);
+			request.setMethod(method);
+
+			filter.doFilter(request, response, filterChain);
+
+			verify(deniedHandler).handle(eq(request), eq(response),
+					any(InvalidCsrfTokenException.class));
+			verifyZeroInteractions(filterChain);
+		}
+	}
+
+	@Test
+	public void doFilterDefaultRequireCsrfProtectionMatcherDeniedMethods()
+			throws ServletException, IOException {
+		filter = new CsrfFilter(tokenRepository);
+		filter.setAccessDeniedHandler(deniedHandler);
+
+		for (String method : Arrays.asList("POST", "PUT", "PATCH", "DELETE", "INVALID")) {
+			resetRequestResponse();
+			when(tokenRepository.loadToken(request)).thenReturn(token);
+			request.setMethod(method);
+
+			filter.doFilter(request, response, filterChain);
+
+			verify(deniedHandler).handle(eq(request), eq(response),
+					any(InvalidCsrfTokenException.class));
+			verifyZeroInteractions(filterChain);
+		}
+	}
+
+	@Test
+	public void doFilterDefaultAccessDenied() throws ServletException, IOException {
+		filter = new CsrfFilter(tokenRepository);
+		filter.setRequireCsrfProtectionMatcher(requestMatcher);
+		when(requestMatcher.matches(request)).thenReturn(true);
+		when(tokenRepository.loadToken(request)).thenReturn(token);
+
+		filter.doFilter(request, response, filterChain);
+
+		assertThat(request.getAttribute(token.getParameterName())).isEqualTo(token);
+		assertThat(request.getAttribute(CsrfToken.class.getName())).isEqualTo(token);
+
+		assertThat(response.getStatus()).isEqualTo(HttpServletResponse.SC_FORBIDDEN);
+		verifyZeroInteractions(filterChain);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void setRequireCsrfProtectionMatcherNull() {
+		filter.setRequireCsrfProtectionMatcher(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void setAccessDeniedHandlerNull() {
+		filter.setAccessDeniedHandler(null);
+	}
+
+	private static final CsrfTokenAssert assertToken(Object token) {
+		return new CsrfTokenAssert((CsrfToken) token);
+	}
+
+	private static class CsrfTokenAssert extends
+			GenericAssert<CsrfTokenAssert, CsrfToken> {
+
+		/**
+		 * Creates a new </code>{@link ObjectAssert}</code>.
+		 *
+		 * @param actual the target to verify.
+		 */
+		protected CsrfTokenAssert(CsrfToken actual) {
+			super(CsrfTokenAssert.class, actual);
+		}
+
+		public CsrfTokenAssert isEqualTo(CsrfToken expected) {
+			assertThat(actual.getHeaderName()).isEqualTo(expected.getHeaderName());
+			assertThat(actual.getParameterName()).isEqualTo(expected.getParameterName());
+			assertThat(actual.getToken()).isEqualTo(expected.getToken());
+			return this;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java
index 665d7ea4eb..28c58249f4 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfLogoutHandlerTests.java
@@ -32,32 +32,33 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfLogoutHandlerTests {
-    @Mock
-    private CsrfTokenRepository csrfTokenRepository;
+	@Mock
+	private CsrfTokenRepository csrfTokenRepository;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private CsrfLogoutHandler handler;
+	private CsrfLogoutHandler handler;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        handler = new CsrfLogoutHandler(csrfTokenRepository);
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		handler = new CsrfLogoutHandler(csrfTokenRepository);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullCsrfTokenRepository() {
-        new CsrfLogoutHandler(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullCsrfTokenRepository() {
+		new CsrfLogoutHandler(null);
+	}
 
-    @Test
-    public void logoutRemovesCsrfToken() {
-        handler.logout(request, response, new TestingAuthenticationToken("user", "password", "ROLE_USER"));
+	@Test
+	public void logoutRemovesCsrfToken() {
+		handler.logout(request, response, new TestingAuthenticationToken("user",
+				"password", "ROLE_USER"));
 
-        verify(csrfTokenRepository).saveToken(null, request, response);
-    }
+		verify(csrfTokenRepository).saveToken(null, request, response);
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java b/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java
index 531f1f592a..c075f5a4cb 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/DefaultCsrfTokenTests.java
@@ -22,37 +22,37 @@ import org.junit.Test;
  *
  */
 public class DefaultCsrfTokenTests {
-    private final String headerName = "headerName";
-    private final String parameterName = "parameterName";
-    private final String tokenValue = "tokenValue";
+	private final String headerName = "headerName";
+	private final String parameterName = "parameterName";
+	private final String tokenValue = "tokenValue";
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaderName() {
-        new DefaultCsrfToken(null,parameterName, tokenValue);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaderName() {
+		new DefaultCsrfToken(null, parameterName, tokenValue);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyHeaderName() {
-        new DefaultCsrfToken("",parameterName, tokenValue);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyHeaderName() {
+		new DefaultCsrfToken("", parameterName, tokenValue);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullParameterName() {
-        new DefaultCsrfToken(headerName,null, tokenValue);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullParameterName() {
+		new DefaultCsrfToken(headerName, null, tokenValue);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyParameterName() {
-        new DefaultCsrfToken(headerName,"", tokenValue);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyParameterName() {
+		new DefaultCsrfToken(headerName, "", tokenValue);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullTokenValue() {
-        new DefaultCsrfToken(headerName,parameterName, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullTokenValue() {
+		new DefaultCsrfToken(headerName, parameterName, null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyTokenValue() {
-        new DefaultCsrfToken(headerName,parameterName, "");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyTokenValue() {
+		new DefaultCsrfToken(headerName, parameterName, "");
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java
index 5f238e519c..35f3f57641 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepositoryTests.java
@@ -27,127 +27,124 @@ import org.springframework.mock.web.MockHttpServletResponse;
  *
  */
 public class HttpSessionCsrfTokenRepositoryTests {
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private CsrfToken token;
-    private HttpSessionCsrfTokenRepository repo;
+	private CsrfToken token;
+	private HttpSessionCsrfTokenRepository repo;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        repo = new HttpSessionCsrfTokenRepository();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		repo = new HttpSessionCsrfTokenRepository();
+	}
 
-    @Test
-    public void generateToken() {
-        token = repo.generateToken(request);
+	@Test
+	public void generateToken() {
+		token = repo.generateToken(request);
 
-        assertThat(token.getParameterName()).isEqualTo("_csrf");
-        assertThat(token.getToken()).isNotEmpty();
+		assertThat(token.getParameterName()).isEqualTo("_csrf");
+		assertThat(token.getToken()).isNotEmpty();
 
-        CsrfToken loadedToken = repo.loadToken(request);
+		CsrfToken loadedToken = repo.loadToken(request);
 
-        assertThat(loadedToken).isNull();
-    }
+		assertThat(loadedToken).isNull();
+	}
 
-    @Test
-    public void generateCustomParameter() {
-        String paramName = "_csrf";
-        repo.setParameterName(paramName);
+	@Test
+	public void generateCustomParameter() {
+		String paramName = "_csrf";
+		repo.setParameterName(paramName);
 
-        token = repo.generateToken(request);
+		token = repo.generateToken(request);
 
-        assertThat(token.getParameterName()).isEqualTo(paramName);
-        assertThat(token.getToken()).isNotEmpty();
-    }
+		assertThat(token.getParameterName()).isEqualTo(paramName);
+		assertThat(token.getToken()).isNotEmpty();
+	}
 
-    @Test
-    public void generateCustomHeader() {
-        String headerName = "CSRF";
-        repo.setHeaderName(headerName);
+	@Test
+	public void generateCustomHeader() {
+		String headerName = "CSRF";
+		repo.setHeaderName(headerName);
 
-        token = repo.generateToken(request);
+		token = repo.generateToken(request);
 
-        assertThat(token.getHeaderName()).isEqualTo(headerName);
-        assertThat(token.getToken()).isNotEmpty();
-    }
+		assertThat(token.getHeaderName()).isEqualTo(headerName);
+		assertThat(token.getToken()).isNotEmpty();
+	}
 
-    @Test
-    public void loadTokenNull() {
-        assertThat(repo.loadToken(request)).isNull();
-        assertThat(request.getSession(false)).isNull();
-    }
+	@Test
+	public void loadTokenNull() {
+		assertThat(repo.loadToken(request)).isNull();
+		assertThat(request.getSession(false)).isNull();
+	}
 
-    @Test
-    public void loadTokenNullWhenSessionExists() {
-        request.getSession();
-        assertThat(repo.loadToken(request)).isNull();
-    }
+	@Test
+	public void loadTokenNullWhenSessionExists() {
+		request.getSession();
+		assertThat(repo.loadToken(request)).isNull();
+	}
 
-    @Test
-    public void saveToken() {
-        CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def");
-        repo.saveToken(tokenToSave, request, response);
+	@Test
+	public void saveToken() {
+		CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def");
+		repo.saveToken(tokenToSave, request, response);
 
-        String attrName = request.getSession().getAttributeNames()
-                .nextElement();
-        CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(
-                attrName);
+		String attrName = request.getSession().getAttributeNames().nextElement();
+		CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(attrName);
 
-        assertThat(loadedToken).isEqualTo(tokenToSave);
-    }
+		assertThat(loadedToken).isEqualTo(tokenToSave);
+	}
 
-    @Test
-    public void saveTokenCustomSessionAttribute() {
-        CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def");
-        String sessionAttributeName = "custom";
-        repo.setSessionAttributeName(sessionAttributeName);
-        repo.saveToken(tokenToSave, request, response);
+	@Test
+	public void saveTokenCustomSessionAttribute() {
+		CsrfToken tokenToSave = new DefaultCsrfToken("123", "abc", "def");
+		String sessionAttributeName = "custom";
+		repo.setSessionAttributeName(sessionAttributeName);
+		repo.saveToken(tokenToSave, request, response);
 
-        CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(
-                sessionAttributeName);
+		CsrfToken loadedToken = (CsrfToken) request.getSession().getAttribute(
+				sessionAttributeName);
 
-        assertThat(loadedToken).isEqualTo(tokenToSave);
-    }
+		assertThat(loadedToken).isEqualTo(tokenToSave);
+	}
 
-    @Test
-    public void saveTokenNullToken() {
-        saveToken();
+	@Test
+	public void saveTokenNullToken() {
+		saveToken();
 
-        repo.saveToken(null, request, response);
+		repo.saveToken(null, request, response);
 
-        assertThat(request.getSession().getAttributeNames().hasMoreElements())
-                .isFalse();
-    }
+		assertThat(request.getSession().getAttributeNames().hasMoreElements()).isFalse();
+	}
 
-    @Test
-    public void saveTokenNullTokenWhenSessionNotExists() {
+	@Test
+	public void saveTokenNullTokenWhenSessionNotExists() {
 
-        repo.saveToken(null, request, response);
+		repo.saveToken(null, request, response);
 
-        assertThat(request.getSession(false)).isNull();
-    }
+		assertThat(request.getSession(false)).isNull();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setSessionAttributeNameEmpty() {
-        repo.setSessionAttributeName("");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setSessionAttributeNameEmpty() {
+		repo.setSessionAttributeName("");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setSessionAttributeNameNull() {
-        repo.setSessionAttributeName(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setSessionAttributeNameNull() {
+		repo.setSessionAttributeName(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setParameterNameEmpty() {
-        repo.setParameterName("");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setParameterNameEmpty() {
+		repo.setParameterName("");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setParameterNameNull() {
-        repo.setParameterName(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setParameterNameNull() {
+		repo.setParameterName(null);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/csrf/MissingCsrfTokenExceptionTests.java b/web/src/test/java/org/springframework/security/web/csrf/MissingCsrfTokenExceptionTests.java
index d7f276efd5..19d7a37e72 100644
--- a/web/src/test/java/org/springframework/security/web/csrf/MissingCsrfTokenExceptionTests.java
+++ b/web/src/test/java/org/springframework/security/web/csrf/MissingCsrfTokenExceptionTests.java
@@ -24,10 +24,10 @@ import org.junit.Test;
  */
 public class MissingCsrfTokenExceptionTests {
 
-    // CsrfChannelInterceptor requires this to work
-    @Test
-    public void nullExpectedTokenDoesNotFail() {
-        new MissingCsrfTokenException(null);
-    }
+	// CsrfChannelInterceptor requires this to work
+	@Test
+	public void nullExpectedTokenDoesNotFail() {
+		new MissingCsrfTokenException(null);
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java
index f623b4bd4f..203169c565 100644
--- a/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java
+++ b/web/src/test/java/org/springframework/security/web/debug/DebugFilterTest.java
@@ -35,94 +35,90 @@ import org.springframework.security.web.FilterChainProxy;
 @RunWith(PowerMockRunner.class)
 @PrepareOnlyThisForTest(Logger.class)
 public class DebugFilterTest {
-    @Captor
-    private ArgumentCaptor<HttpServletRequest> requestCaptor;
-    @Captor
-    private ArgumentCaptor<String> logCaptor;
+	@Captor
+	private ArgumentCaptor<HttpServletRequest> requestCaptor;
+	@Captor
+	private ArgumentCaptor<String> logCaptor;
 
-    @Mock
-    private HttpServletRequest request;
-    @Mock
-    private HttpServletResponse response;
-    @Mock
-    private FilterChain filterChain;
-    @Mock
-    private FilterChainProxy fcp;
-    @Mock
-    private Logger logger;
+	@Mock
+	private HttpServletRequest request;
+	@Mock
+	private HttpServletResponse response;
+	@Mock
+	private FilterChain filterChain;
+	@Mock
+	private FilterChainProxy fcp;
+	@Mock
+	private Logger logger;
 
-    private String requestAttr;
+	private String requestAttr;
 
-    private DebugFilter filter;
+	private DebugFilter filter;
 
-    @Before
-    public void setUp() {
-        when(request.getHeaderNames()).thenReturn(Collections.enumeration(Collections.<String>emptyList()));
-        when(request.getServletPath()).thenReturn("/login");
-        filter = new DebugFilter(fcp);
-        WhiteboxImpl.setInternalState(filter, Logger.class, logger);
-        requestAttr = WhiteboxImpl.getInternalState(filter, "ALREADY_FILTERED_ATTR_NAME", filter.getClass());
-    }
+	@Before
+	public void setUp() {
+		when(request.getHeaderNames()).thenReturn(
+				Collections.enumeration(Collections.<String> emptyList()));
+		when(request.getServletPath()).thenReturn("/login");
+		filter = new DebugFilter(fcp);
+		WhiteboxImpl.setInternalState(filter, Logger.class, logger);
+		requestAttr = WhiteboxImpl.getInternalState(filter, "ALREADY_FILTERED_ATTR_NAME",
+				filter.getClass());
+	}
 
-    @Test
-    public void doFilterProcessesRequests() throws Exception {
-        filter.doFilter(request, response, filterChain);
+	@Test
+	public void doFilterProcessesRequests() throws Exception {
+		filter.doFilter(request, response, filterChain);
 
-        verify(logger).info(anyString());
-        verify(request).setAttribute(requestAttr, Boolean.TRUE);
-        verify(fcp).doFilter(requestCaptor.capture(), eq(response), eq(filterChain));
-        assertEquals(DebugRequestWrapper.class,requestCaptor.getValue().getClass());
-        verify(request).removeAttribute(requestAttr);
-    }
+		verify(logger).info(anyString());
+		verify(request).setAttribute(requestAttr, Boolean.TRUE);
+		verify(fcp).doFilter(requestCaptor.capture(), eq(response), eq(filterChain));
+		assertEquals(DebugRequestWrapper.class, requestCaptor.getValue().getClass());
+		verify(request).removeAttribute(requestAttr);
+	}
 
-    // SEC-1901
-    @Test
-    public void doFilterProcessesForwardedRequests() throws Exception {
-        when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE);
-        HttpServletRequest request = new DebugRequestWrapper(this.request);
+	// SEC-1901
+	@Test
+	public void doFilterProcessesForwardedRequests() throws Exception {
+		when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE);
+		HttpServletRequest request = new DebugRequestWrapper(this.request);
 
-        filter.doFilter(request, response, filterChain);
+		filter.doFilter(request, response, filterChain);
 
-        verify(logger).info(anyString());
-        verify(fcp).doFilter(request, response, filterChain);
-        verify(this.request,never()).removeAttribute(requestAttr);
-    }
+		verify(logger).info(anyString());
+		verify(fcp).doFilter(request, response, filterChain);
+		verify(this.request, never()).removeAttribute(requestAttr);
+	}
 
-    @Test
-    public void doFilterDoesNotWrapWithDebugRequestWrapperAgain() throws Exception {
-        when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE);
-        HttpServletRequest fireWalledRequest = new HttpServletRequestWrapper(new DebugRequestWrapper(this.request));
+	@Test
+	public void doFilterDoesNotWrapWithDebugRequestWrapperAgain() throws Exception {
+		when(request.getAttribute(requestAttr)).thenReturn(Boolean.TRUE);
+		HttpServletRequest fireWalledRequest = new HttpServletRequestWrapper(
+				new DebugRequestWrapper(this.request));
 
-        filter.doFilter(fireWalledRequest, response, filterChain);
+		filter.doFilter(fireWalledRequest, response, filterChain);
 
-        verify(fcp).doFilter(fireWalledRequest, response, filterChain);
-    }
+		verify(fcp).doFilter(fireWalledRequest, response, filterChain);
+	}
 
-    @Test
-    public void doFilterLogsProperly() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setMethod("GET");
-        request.setServletPath("/path");
-        request.setPathInfo("/");
-        request.addHeader("A", "A Value");
-        request.addHeader("A", "Another Value");
-        request.addHeader("B", "B Value");
+	@Test
+	public void doFilterLogsProperly() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setMethod("GET");
+		request.setServletPath("/path");
+		request.setPathInfo("/");
+		request.addHeader("A", "A Value");
+		request.addHeader("A", "Another Value");
+		request.addHeader("B", "B Value");
 
-        filter.doFilter(request, response, filterChain);
+		filter.doFilter(request, response, filterChain);
 
-        verify(logger).info(logCaptor.capture());
+		verify(logger).info(logCaptor.capture());
 
-        assertThat(logCaptor.getValue()).isEqualTo("Request received for GET '/path/':\n" +
-                "\n" +
-                request + "\n" +
-                "\n" +
-                "servletPath:/path\n" +
-                "pathInfo:/\n" +
-                "headers: \n" +
-                "A: A Value, Another Value\n" +
-                "B: B Value\n" +
-                "\n" +
-                "\n" +
-                "Security filter chain: no match");
-    }
+		assertThat(logCaptor.getValue()).isEqualTo(
+				"Request received for GET '/path/':\n" + "\n" + request + "\n" + "\n"
+						+ "servletPath:/path\n" + "pathInfo:/\n" + "headers: \n"
+						+ "A: A Value, Another Value\n" + "B: B Value\n" + "\n" + "\n"
+						+ "Security filter chain: no match");
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java b/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java
index 8b3df587e9..14b93b5f9f 100644
--- a/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java
+++ b/web/src/test/java/org/springframework/security/web/firewall/DefaultHttpFirewallTests.java
@@ -9,36 +9,30 @@ import org.springframework.mock.web.MockHttpServletRequest;
  * @author Luke Taylor
  */
 public class DefaultHttpFirewallTests {
-    public String[] unnormalizedPaths = {
-            "/..",
-            "/./path/",
-            "/path/path/.",
-            "/path/path//.",
-            "./path/../path//.",
-            "./path",
-            ".//path",
-            "."
-    };
+	public String[] unnormalizedPaths = { "/..", "/./path/", "/path/path/.",
+			"/path/path//.", "./path/../path//.", "./path", ".//path", "." };
 
-    @Test
-    public void unnormalizedPathsAreRejected() throws Exception {
-        DefaultHttpFirewall fw = new DefaultHttpFirewall();
+	@Test
+	public void unnormalizedPathsAreRejected() throws Exception {
+		DefaultHttpFirewall fw = new DefaultHttpFirewall();
 
-        MockHttpServletRequest request;
-        for (String path : unnormalizedPaths) {
-            request = new MockHttpServletRequest();
-            request.setServletPath(path);
-            try {
-                fw.getFirewalledRequest(request);
-                fail(path + " is un-normalized");
-            } catch (RequestRejectedException expected) {
-            }
-            request.setPathInfo(path);
-            try {
-                fw.getFirewalledRequest(request);
-                fail(path + " is un-normalized");
-            } catch (RequestRejectedException expected) {
-            }
-        }
-    }
+		MockHttpServletRequest request;
+		for (String path : unnormalizedPaths) {
+			request = new MockHttpServletRequest();
+			request.setServletPath(path);
+			try {
+				fw.getFirewalledRequest(request);
+				fail(path + " is un-normalized");
+			}
+			catch (RequestRejectedException expected) {
+			}
+			request.setPathInfo(path);
+			try {
+				fw.getFirewalledRequest(request);
+				fail(path + " is un-normalized");
+			}
+			catch (RequestRejectedException expected) {
+			}
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java
index 66a2268273..91676e2757 100644
--- a/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java
+++ b/web/src/test/java/org/springframework/security/web/firewall/FirewalledResponseTests.java
@@ -11,29 +11,32 @@ import org.springframework.mock.web.MockHttpServletResponse;
  */
 public class FirewalledResponseTests {
 
-    @Test
-    public void rejectsRedirectLocationContaingCRLF() throws Exception {
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        FirewalledResponse fwResponse  = new FirewalledResponse(response);
+	@Test
+	public void rejectsRedirectLocationContaingCRLF() throws Exception {
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		FirewalledResponse fwResponse = new FirewalledResponse(response);
 
-        fwResponse.sendRedirect("/theURL");
-        assertEquals("/theURL", response.getRedirectedUrl());
+		fwResponse.sendRedirect("/theURL");
+		assertEquals("/theURL", response.getRedirectedUrl());
 
-        try {
-            fwResponse.sendRedirect("/theURL\r\nsomething");
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-        try {
-            fwResponse.sendRedirect("/theURL\rsomething");
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
+		try {
+			fwResponse.sendRedirect("/theURL\r\nsomething");
+			fail();
+		}
+		catch (IllegalArgumentException expected) {
+		}
+		try {
+			fwResponse.sendRedirect("/theURL\rsomething");
+			fail();
+		}
+		catch (IllegalArgumentException expected) {
+		}
 
-        try {
-            fwResponse.sendRedirect("/theURL\nsomething");
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-    }
+		try {
+			fwResponse.sendRedirect("/theURL\nsomething");
+			fail();
+		}
+		catch (IllegalArgumentException expected) {
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java
index 39596c5a43..e92328bc3b 100644
--- a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java
+++ b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java
@@ -18,86 +18,86 @@ import org.springframework.mock.web.MockHttpServletRequest;
  * @author Luke Taylor
  */
 public class RequestWrapperTests {
-    private static Map<String, String> testPaths = new LinkedHashMap<String,String>();
+	private static Map<String, String> testPaths = new LinkedHashMap<String, String>();
 
-    @BeforeClass
-    // Some of these may be unrealistic values, but we can't be sure because of the
-    // inconsistency in the spec.
-    public static void createTestMap() {
-        testPaths.put("/path1;x=y;z=w/path2;x=y/path3;x=y", "/path1/path2/path3");
-        testPaths.put("/path1;x=y/path2;x=y/", "/path1/path2/");
-        testPaths.put("/path1//path2/", "/path1/path2/");
-        testPaths.put("//path1/path2//", "/path1/path2/");
-        testPaths.put(";x=y;z=w", "");
-    }
+	@BeforeClass
+	// Some of these may be unrealistic values, but we can't be sure because of the
+	// inconsistency in the spec.
+	public static void createTestMap() {
+		testPaths.put("/path1;x=y;z=w/path2;x=y/path3;x=y", "/path1/path2/path3");
+		testPaths.put("/path1;x=y/path2;x=y/", "/path1/path2/");
+		testPaths.put("/path1//path2/", "/path1/path2/");
+		testPaths.put("//path1/path2//", "/path1/path2/");
+		testPaths.put(";x=y;z=w", "");
+	}
 
-    @Test
-    public void pathParametersAreRemovedFromServletPath() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void pathParametersAreRemovedFromServletPath() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        for (Map.Entry<String,String> entry : testPaths.entrySet()) {
-            String path = entry.getKey();
-            String expectedResult = entry.getValue();
-            request.setServletPath(path);
-            RequestWrapper wrapper = new RequestWrapper(request);
-            assertEquals(expectedResult, wrapper.getServletPath());
-            wrapper.reset();
-            assertEquals(path, wrapper.getServletPath());
-        }
-    }
+		for (Map.Entry<String, String> entry : testPaths.entrySet()) {
+			String path = entry.getKey();
+			String expectedResult = entry.getValue();
+			request.setServletPath(path);
+			RequestWrapper wrapper = new RequestWrapper(request);
+			assertEquals(expectedResult, wrapper.getServletPath());
+			wrapper.reset();
+			assertEquals(path, wrapper.getServletPath());
+		}
+	}
 
-    @Test
-    public void pathParametersAreRemovedFromPathInfo() {
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void pathParametersAreRemovedFromPathInfo() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        for (Map.Entry<String,String> entry : testPaths.entrySet()) {
-            String path = entry.getKey();
-            String expectedResult = entry.getValue();
-            // Should be null when stripped value is empty
-            if (expectedResult.length() == 0) {
-                expectedResult = null;
-            }
-            request.setPathInfo(path);
-            RequestWrapper wrapper = new RequestWrapper(request);
-            assertEquals(expectedResult, wrapper.getPathInfo());
-            wrapper.reset();
-            assertEquals(path, wrapper.getPathInfo());
-        }
-    }
+		for (Map.Entry<String, String> entry : testPaths.entrySet()) {
+			String path = entry.getKey();
+			String expectedResult = entry.getValue();
+			// Should be null when stripped value is empty
+			if (expectedResult.length() == 0) {
+				expectedResult = null;
+			}
+			request.setPathInfo(path);
+			RequestWrapper wrapper = new RequestWrapper(request);
+			assertEquals(expectedResult, wrapper.getPathInfo());
+			wrapper.reset();
+			assertEquals(path, wrapper.getPathInfo());
+		}
+	}
 
-    @Test
-    public void resetWhenForward() throws Exception {
-        String denormalizedPath = testPaths.keySet().iterator().next();
-        String forwardPath = "/forward/path";
-        HttpServletRequest mockRequest = mock(HttpServletRequest.class);
-        HttpServletResponse mockResponse = mock(HttpServletResponse.class);
-        RequestDispatcher mockDispatcher = mock(RequestDispatcher.class);
-        when(mockRequest.getServletPath()).thenReturn("");
-        when(mockRequest.getPathInfo()).thenReturn(denormalizedPath);
-        when(mockRequest.getRequestDispatcher(forwardPath)).thenReturn(mockDispatcher);
+	@Test
+	public void resetWhenForward() throws Exception {
+		String denormalizedPath = testPaths.keySet().iterator().next();
+		String forwardPath = "/forward/path";
+		HttpServletRequest mockRequest = mock(HttpServletRequest.class);
+		HttpServletResponse mockResponse = mock(HttpServletResponse.class);
+		RequestDispatcher mockDispatcher = mock(RequestDispatcher.class);
+		when(mockRequest.getServletPath()).thenReturn("");
+		when(mockRequest.getPathInfo()).thenReturn(denormalizedPath);
+		when(mockRequest.getRequestDispatcher(forwardPath)).thenReturn(mockDispatcher);
 
-        RequestWrapper wrapper = new RequestWrapper(mockRequest);
-        RequestDispatcher dispatcher = wrapper.getRequestDispatcher(forwardPath);
-        dispatcher.forward(mockRequest, mockResponse);
+		RequestWrapper wrapper = new RequestWrapper(mockRequest);
+		RequestDispatcher dispatcher = wrapper.getRequestDispatcher(forwardPath);
+		dispatcher.forward(mockRequest, mockResponse);
 
-        verify(mockRequest).getRequestDispatcher(forwardPath);
-        verify(mockDispatcher).forward(mockRequest, mockResponse);
-        assertEquals(denormalizedPath,wrapper.getPathInfo());
-        verify(mockRequest,times(2)).getPathInfo();
-        // validate wrapper.getServletPath() delegates to the mock
-        wrapper.getServletPath();
-        verify(mockRequest,times(2)).getServletPath();
-        verifyNoMoreInteractions(mockRequest,mockResponse,mockDispatcher);
-    }
+		verify(mockRequest).getRequestDispatcher(forwardPath);
+		verify(mockDispatcher).forward(mockRequest, mockResponse);
+		assertEquals(denormalizedPath, wrapper.getPathInfo());
+		verify(mockRequest, times(2)).getPathInfo();
+		// validate wrapper.getServletPath() delegates to the mock
+		wrapper.getServletPath();
+		verify(mockRequest, times(2)).getServletPath();
+		verifyNoMoreInteractions(mockRequest, mockResponse, mockDispatcher);
+	}
 
-    @Test
-    public void requestDispatcherNotWrappedAfterReset() {
-        String path = "/forward/path";
-        HttpServletRequest request = mock(HttpServletRequest.class);
-        RequestDispatcher dispatcher = mock(RequestDispatcher.class);
-        when(request.getRequestDispatcher(path)).thenReturn(dispatcher);
-        RequestWrapper wrapper = new RequestWrapper(request);
-        wrapper.reset();
-        assertSame(dispatcher, wrapper.getRequestDispatcher(path));
-    }
+	@Test
+	public void requestDispatcherNotWrappedAfterReset() {
+		String path = "/forward/path";
+		HttpServletRequest request = mock(HttpServletRequest.class);
+		RequestDispatcher dispatcher = mock(RequestDispatcher.class);
+		when(request.getRequestDispatcher(path)).thenReturn(dispatcher);
+		RequestWrapper wrapper = new RequestWrapper(request);
+		wrapper.reset();
+		assertSame(dispatcher, wrapper.getRequestDispatcher(path));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java
index d38710b135..4df830eafc 100644
--- a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java
@@ -40,39 +40,40 @@ import org.springframework.security.web.header.HeaderWriterFilter;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class HeaderWriterFilterTests {
-    @Mock
-    private HeaderWriter writer1;
+	@Mock
+	private HeaderWriter writer1;
 
-    @Mock
-    private HeaderWriter writer2;
+	@Mock
+	private HeaderWriter writer2;
 
-    @Test(expected = IllegalArgumentException.class)
-    public void noHeadersConfigured() throws Exception {
-        List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
-        new HeaderWriterFilter(headerWriters);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void noHeadersConfigured() throws Exception {
+		List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
+		new HeaderWriterFilter(headerWriters);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullWriters() throws Exception {
-        new HeaderWriterFilter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullWriters() throws Exception {
+		new HeaderWriterFilter(null);
+	}
 
-    @Test
-    public void additionalHeadersShouldBeAddedToTheResponse() throws Exception {
-        List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
-        headerWriters.add(writer1);
-        headerWriters.add(writer2);
+	@Test
+	public void additionalHeadersShouldBeAddedToTheResponse() throws Exception {
+		List<HeaderWriter> headerWriters = new ArrayList<HeaderWriter>();
+		headerWriters.add(writer1);
+		headerWriters.add(writer2);
 
-        HeaderWriterFilter filter = new HeaderWriterFilter(headerWriters);
+		HeaderWriterFilter filter = new HeaderWriterFilter(headerWriters);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        MockFilterChain filterChain = new MockFilterChain();
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		MockFilterChain filterChain = new MockFilterChain();
 
-        filter.doFilter(request, response, filterChain);
+		filter.doFilter(request, response, filterChain);
 
-        verify(writer1).writeHeaders(request, response);
-        verify(writer2).writeHeaders(request, response);
-        assertThat(filterChain.getRequest()).isEqualTo(request); // verify the filterChain continued
-    }
+		verify(writer1).writeHeaders(request, response);
+		verify(writer2).writeHeaders(request, response);
+		assertThat(filterChain.getRequest()).isEqualTo(request); // verify the filterChain
+																	// continued
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java
index 7678bae5a0..90806c87a2 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/CacheControlHeadersWriterTests.java
@@ -30,26 +30,28 @@ import org.springframework.mock.web.MockHttpServletResponse;
  */
 public class CacheControlHeadersWriterTests {
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private CacheControlHeadersWriter writer;
+	private CacheControlHeadersWriter writer;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        writer = new CacheControlHeadersWriter();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		writer = new CacheControlHeadersWriter();
+	}
 
-    @Test
-    public void writeHeaders() {
-        writer.writeHeaders(request, response);
+	@Test
+	public void writeHeaders() {
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(3);
-        assertThat(response.getHeaderValues("Cache-Control")).isEqualTo(Arrays.asList("no-cache, no-store, max-age=0, must-revalidate"));
-        assertThat(response.getHeaderValues("Pragma")).isEqualTo(Arrays.asList("no-cache"));
-        assertThat(response.getHeaderValues("Expires")).isEqualTo(Arrays.asList("0"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(3);
+		assertThat(response.getHeaderValues("Cache-Control")).isEqualTo(
+				Arrays.asList("no-cache, no-store, max-age=0, must-revalidate"));
+		assertThat(response.getHeaderValues("Pragma")).isEqualTo(
+				Arrays.asList("no-cache"));
+		assertThat(response.getHeaderValues("Expires")).isEqualTo(Arrays.asList("0"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java
index 644bcfcf78..6cc023e67e 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriterTests.java
@@ -35,50 +35,50 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class DelegatingRequestMatcherHeaderWriterTests {
-    @Mock
-    private RequestMatcher matcher;
+	@Mock
+	private RequestMatcher matcher;
 
-    @Mock
-    private HeaderWriter delegate;
+	@Mock
+	private HeaderWriter delegate;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private DelegatingRequestMatcherHeaderWriter headerWriter;
+	private DelegatingRequestMatcherHeaderWriter headerWriter;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        headerWriter = new DelegatingRequestMatcherHeaderWriter(matcher, delegate);
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		headerWriter = new DelegatingRequestMatcherHeaderWriter(matcher, delegate);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullRequestMatcher() {
-        new DelegatingRequestMatcherHeaderWriter(null, delegate);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullRequestMatcher() {
+		new DelegatingRequestMatcherHeaderWriter(null, delegate);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullDelegate() {
-        new DelegatingRequestMatcherHeaderWriter(matcher, null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullDelegate() {
+		new DelegatingRequestMatcherHeaderWriter(matcher, null);
+	}
 
-    @Test
-    public void writeHeadersOnMatch() {
-        when(matcher.matches(request)).thenReturn(true);
+	@Test
+	public void writeHeadersOnMatch() {
+		when(matcher.matches(request)).thenReturn(true);
 
-        headerWriter.writeHeaders(request, response);
+		headerWriter.writeHeaders(request, response);
 
-        verify(delegate).writeHeaders(request, response);
-    }
+		verify(delegate).writeHeaders(request, response);
+	}
 
-    @Test
-    public void writeHeadersOnNoMatch() {
-        when(matcher.matches(request)).thenReturn(false);
+	@Test
+	public void writeHeadersOnNoMatch() {
+		when(matcher.matches(request)).thenReturn(false);
 
-        headerWriter.writeHeaders(request, response);
+		headerWriter.writeHeaders(request, response);
 
-        verify(delegate, times(0)).writeHeaders(request, response);
-    }
+		verify(delegate, times(0)).writeHeaders(request, response);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
index cbe0813ac9..81536be914 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
@@ -29,117 +29,125 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
  *
  */
 public class HstsHeaderWriterTests {
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
 
-    private HstsHeaderWriter writer;
+	private HstsHeaderWriter writer;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        request.setSecure(true);
-        response = new MockHttpServletResponse();
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		request.setSecure(true);
+		response = new MockHttpServletResponse();
 
-        writer = new HstsHeaderWriter();
-    }
+		writer = new HstsHeaderWriter();
+	}
 
-    @Test
-    public void allArgsCustomConstructorWriteHeaders() {
-        request.setSecure(false);
-        writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false);
+	@Test
+	public void allArgsCustomConstructorWriteHeaders() {
+		request.setSecure(false);
+		writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=15768000");
+	}
 
-    @Test
-    public void maxAgeAndIncludeSubdomainsCustomConstructorWriteHeaders() {
-        request.setSecure(false);
-        writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false);
+	@Test
+	public void maxAgeAndIncludeSubdomainsCustomConstructorWriteHeaders() {
+		request.setSecure(false);
+		writer = new HstsHeaderWriter(AnyRequestMatcher.INSTANCE, 15768000, false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=15768000");
+	}
 
-    @Test
-    public void maxAgeCustomConstructorWriteHeaders() {
-        writer = new HstsHeaderWriter(15768000);
+	@Test
+	public void maxAgeCustomConstructorWriteHeaders() {
+		writer = new HstsHeaderWriter(15768000);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=15768000 ; includeSubDomains");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=15768000 ; includeSubDomains");
+	}
 
-    @Test
-    public void includeSubDomainsCustomConstructorWriteHeaders() {
-        writer = new HstsHeaderWriter(false);
+	@Test
+	public void includeSubDomainsCustomConstructorWriteHeaders() {
+		writer = new HstsHeaderWriter(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=31536000");
+	}
 
-    @Test
-    public void writeHeadersDefaultValues() {
-        writer.writeHeaders(request, response);
+	@Test
+	public void writeHeadersDefaultValues() {
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000 ; includeSubDomains");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=31536000 ; includeSubDomains");
+	}
 
-    @Test
-    public void writeHeadersIncludeSubDomainsFalse() {
-        writer.setIncludeSubDomains(false);
+	@Test
+	public void writeHeadersIncludeSubDomainsFalse() {
+		writer.setIncludeSubDomains(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=31536000");
+	}
 
-    @Test
-    public void writeHeadersCustomMaxAgeInSeconds() {
-        writer.setMaxAgeInSeconds(1);
+	@Test
+	public void writeHeadersCustomMaxAgeInSeconds() {
+		writer.setMaxAgeInSeconds(1);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=1 ; includeSubDomains");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=1 ; includeSubDomains");
+	}
 
-    @Test
-    public void writeHeadersInsecureRequestDoesNotWriteHeader() {
-        request.setSecure(false);
+	@Test
+	public void writeHeadersInsecureRequestDoesNotWriteHeader() {
+		request.setSecure(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().isEmpty()).isTrue();
-    }
+		assertThat(response.getHeaderNames().isEmpty()).isTrue();
+	}
 
-    @Test
-    public void writeHeadersAnyRequestMatcher() {
-        writer.setRequestMatcher(AnyRequestMatcher.INSTANCE);
-        request.setSecure(false);
+	@Test
+	public void writeHeadersAnyRequestMatcher() {
+		writer.setRequestMatcher(AnyRequestMatcher.INSTANCE);
+		request.setSecure(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo("max-age=31536000 ; includeSubDomains");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader("Strict-Transport-Security")).isEqualTo(
+				"max-age=31536000 ; includeSubDomains");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setMaxAgeInSecondsToNegative() {
-        writer.setMaxAgeInSeconds(-1);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setMaxAgeInSecondsToNegative() {
+		writer.setMaxAgeInSeconds(-1);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setRequestMatcherToNull() {
-        writer.setRequestMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setRequestMatcherToNull() {
+		writer.setRequestMatcher(null);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
index a09a6efe3d..418ea1aaf2 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
@@ -35,60 +35,65 @@ import org.springframework.security.web.header.writers.StaticHeadersWriter;
  * @since 3.2
  */
 public class StaticHeaderWriterTests {
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaders() {
-        new StaticHeadersWriter(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaders() {
+		new StaticHeadersWriter(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyHeaders() {
-        new StaticHeadersWriter(Collections.<Header>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyHeaders() {
+		new StaticHeadersWriter(Collections.<Header> emptyList());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaderName() {
-        new StaticHeadersWriter(null, "value1");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaderName() {
+		new StaticHeadersWriter(null, "value1");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaderValues() {
-        new StaticHeadersWriter("name", (String[]) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaderValues() {
+		new StaticHeadersWriter("name", (String[]) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorContainsNullHeaderValue() {
-        new StaticHeadersWriter("name", "value1", null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorContainsNullHeaderValue() {
+		new StaticHeadersWriter("name", "value1", null);
+	}
 
-    @Test
-    public void sameHeaderShouldBeReturned() {
-        String headerName = "X-header";
-        String headerValue = "foo";
-        StaticHeadersWriter factory = new StaticHeadersWriter(headerName, headerValue);
+	@Test
+	public void sameHeaderShouldBeReturned() {
+		String headerName = "X-header";
+		String headerValue = "foo";
+		StaticHeadersWriter factory = new StaticHeadersWriter(headerName, headerValue);
 
-        factory.writeHeaders(request, response);
-        assertThat(response.getHeaderValues(headerName)).isEqualTo(Arrays.asList(headerValue));
-    }
+		factory.writeHeaders(request, response);
+		assertThat(response.getHeaderValues(headerName)).isEqualTo(
+				Arrays.asList(headerValue));
+	}
 
-    @Test
-    public void writeHeadersMulti() {
-        Header pragma = new Header("Pragma","no-cache");
-        Header cacheControl= new Header("Cache-Control","no-cache","no-store","must-revalidate");
-        StaticHeadersWriter factory = new StaticHeadersWriter(Arrays.asList(pragma, cacheControl));
+	@Test
+	public void writeHeadersMulti() {
+		Header pragma = new Header("Pragma", "no-cache");
+		Header cacheControl = new Header("Cache-Control", "no-cache", "no-store",
+				"must-revalidate");
+		StaticHeadersWriter factory = new StaticHeadersWriter(Arrays.asList(pragma,
+				cacheControl));
 
-        factory.writeHeaders(request, response);
+		factory.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(2);
-        assertThat(response.getHeaderValues(pragma.getName())).isEqualTo(pragma.getValues());
-        assertThat(response.getHeaderValues(cacheControl.getName())).isEqualTo(cacheControl.getValues());
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(2);
+		assertThat(response.getHeaderValues(pragma.getName())).isEqualTo(
+				pragma.getValues());
+		assertThat(response.getHeaderValues(cacheControl.getName())).isEqualTo(
+				cacheControl.getValues());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java
index eb4be1e090..f6bdd74c05 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/XContentTypeOptionsHeaderWriterTests.java
@@ -30,24 +30,25 @@ import org.springframework.mock.web.MockHttpServletResponse;
  */
 public class XContentTypeOptionsHeaderWriterTests {
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private XContentTypeOptionsHeaderWriter writer;
+	private XContentTypeOptionsHeaderWriter writer;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        writer = new XContentTypeOptionsHeaderWriter();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		writer = new XContentTypeOptionsHeaderWriter();
+	}
 
-    @Test
-    public void writeHeaders() {
-        writer.writeHeaders(request, response);
+	@Test
+	public void writeHeaders() {
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeaderValues("X-Content-Type-Options")).isEqualTo(Arrays.asList("nosniff"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeaderValues("X-Content-Type-Options")).isEqualTo(
+				Arrays.asList("nosniff"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
index fd3b6a6a5e..bee0606a36 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
@@ -30,64 +30,67 @@ import org.springframework.mock.web.MockHttpServletResponse;
  */
 public class XXssProtectionHeaderWriterTests {
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private XXssProtectionHeaderWriter writer;
+	private XXssProtectionHeaderWriter writer;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-        writer = new XXssProtectionHeaderWriter();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		writer = new XXssProtectionHeaderWriter();
+	}
 
-    @Test
-    public void writeHeaders() {
-        writer.writeHeaders(request, response);
+	@Test
+	public void writeHeaders() {
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(Arrays.asList("1; mode=block"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(
+				Arrays.asList("1; mode=block"));
+	}
 
-    @Test
-    public void writeHeadersNoBlock() {
-        writer.setBlock(false);
+	@Test
+	public void writeHeadersNoBlock() {
+		writer.setBlock(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(Arrays.asList("1"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(
+				Arrays.asList("1"));
+	}
 
-    @Test
-    public void writeHeadersDisabled() {
-        writer.setBlock(false);
-        writer.setEnabled(false);
+	@Test
+	public void writeHeadersDisabled() {
+		writer.setBlock(false);
+		writer.setEnabled(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(Arrays.asList("0"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(
+				Arrays.asList("0"));
+	}
 
-    @Test
-    public void setEnabledFalseWithBlockTrue() {
-        writer.setEnabled(false);
+	@Test
+	public void setEnabledFalseWithBlockTrue() {
+		writer.setEnabled(false);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(Arrays.asList("0"));
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeaderValues("X-XSS-Protection")).isEqualTo(
+				Arrays.asList("0"));
+	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void setBlockTrueWithEnabledFalse() {
+		writer.setBlock(false);
+		writer.setEnabled(false);
 
-    @Test(expected=IllegalArgumentException.class)
-    public void setBlockTrueWithEnabledFalse() {
-        writer.setBlock(false);
-        writer.setEnabled(false);
-
-        writer.setBlock(true);
-    }
+		writer.setBlock(true);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java
index ffa014ecec..d6a3e3e699 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategyTests.java
@@ -27,76 +27,72 @@ import org.springframework.security.web.header.writers.frameoptions.AbstractRequ
  *
  */
 public class AbstractRequestParameterAllowFromStrategyTests {
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+	}
 
-    @Test
-    public void nullAllowFromParameterValue() {
-        RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true);
+	@Test
+	public void nullAllowFromParameterValue() {
+		RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(
+				true);
 
-        assertThat(
-                strategy
-                        .getAllowFromValue(request)).isEqualTo("DENY");
-    }
+		assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY");
+	}
 
-    @Test
-    public void emptyAllowFromParameterValue() {
-        request.setParameter("x-frames-allow-from", "");
-        RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true);
+	@Test
+	public void emptyAllowFromParameterValue() {
+		request.setParameter("x-frames-allow-from", "");
+		RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(
+				true);
 
-        assertThat(
-                strategy
-                        .getAllowFromValue(request)).isEqualTo("DENY");
-    }
+		assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY");
+	}
 
-    @Test
-    public void emptyAllowFromCustomParameterValue() {
-        String customParam = "custom";
-        request.setParameter(customParam, "");
-        RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true);
-        strategy.setAllowFromParameterName(customParam);
+	@Test
+	public void emptyAllowFromCustomParameterValue() {
+		String customParam = "custom";
+		request.setParameter(customParam, "");
+		RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(
+				true);
+		strategy.setAllowFromParameterName(customParam);
 
-        assertThat(
-                strategy
-                        .getAllowFromValue(request)).isEqualTo("DENY");
-    }
+		assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY");
+	}
 
-    @Test
-    public void allowFromParameterValueAllowed() {
-        String value = "https://example.com";
-        request.setParameter("x-frames-allow-from", value);
-        RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(true);
+	@Test
+	public void allowFromParameterValueAllowed() {
+		String value = "https://example.com";
+		request.setParameter("x-frames-allow-from", value);
+		RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(
+				true);
 
-        assertThat(
-                strategy
-                        .getAllowFromValue(request)).isEqualTo(value);
-    }
+		assertThat(strategy.getAllowFromValue(request)).isEqualTo(value);
+	}
 
-    @Test
-    public void allowFromParameterValueDenied() {
-        String value = "https://example.com";
-        request.setParameter("x-frames-allow-from", value);
-        RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(false);
+	@Test
+	public void allowFromParameterValueDenied() {
+		String value = "https://example.com";
+		request.setParameter("x-frames-allow-from", value);
+		RequestParameterAllowFromStrategyStub strategy = new RequestParameterAllowFromStrategyStub(
+				false);
 
-        assertThat(
-                strategy
-                        .getAllowFromValue(request)).isEqualTo("DENY");
-    }
+		assertThat(strategy.getAllowFromValue(request)).isEqualTo("DENY");
+	}
 
-    private static class RequestParameterAllowFromStrategyStub extends AbstractRequestParameterAllowFromStrategy {
-        private boolean match;
+	private static class RequestParameterAllowFromStrategyStub extends
+			AbstractRequestParameterAllowFromStrategy {
+		private boolean match;
 
-        RequestParameterAllowFromStrategyStub(boolean match) {
-            this.match = match;
-        }
+		RequestParameterAllowFromStrategyStub(boolean match) {
+			this.match = match;
+		}
 
-        @Override
-        protected boolean allowed(String allowFromOrigin) {
-            return match;
-        }
-    }
+		@Override
+		protected boolean allowed(String allowFromOrigin) {
+			return match;
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java
index 429922c024..88fb16b1aa 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/FrameOptionsHeaderWriterTests.java
@@ -37,75 +37,77 @@ import org.springframework.security.web.header.writers.frameoptions.XFrameOption
  */
 @RunWith(MockitoJUnitRunner.class)
 public class FrameOptionsHeaderWriterTests {
-    @Mock
-    private AllowFromStrategy strategy;
+	@Mock
+	private AllowFromStrategy strategy;
 
-    private MockHttpServletResponse response;
+	private MockHttpServletResponse response;
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private XFrameOptionsHeaderWriter writer;
+	private XFrameOptionsHeaderWriter writer;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        response = new MockHttpServletResponse();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullMode() {
-        new XFrameOptionsHeaderWriter((XFrameOptionsMode)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullMode() {
+		new XFrameOptionsHeaderWriter((XFrameOptionsMode) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorAllowFromNoAllowFromStrategy() {
-        new XFrameOptionsHeaderWriter(XFrameOptionsMode.ALLOW_FROM);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorAllowFromNoAllowFromStrategy() {
+		new XFrameOptionsHeaderWriter(XFrameOptionsMode.ALLOW_FROM);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullAllowFromStrategy() {
-        new XFrameOptionsHeaderWriter((AllowFromStrategy)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullAllowFromStrategy() {
+		new XFrameOptionsHeaderWriter((AllowFromStrategy) null);
+	}
 
-    @Test
-    public void writeHeadersAllowFromReturnsNull() {
-        writer = new XFrameOptionsHeaderWriter(strategy);
+	@Test
+	public void writeHeadersAllowFromReturnsNull() {
+		writer = new XFrameOptionsHeaderWriter(strategy);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().isEmpty()).isTrue();
-    }
+		assertThat(response.getHeaderNames().isEmpty()).isTrue();
+	}
 
-    @Test
-    public void writeHeadersAllowFrom() {
-        String allowFromValue = "https://example.com/";
-        when(strategy.getAllowFromValue(request)).thenReturn(allowFromValue);
-        writer = new XFrameOptionsHeaderWriter(strategy);
+	@Test
+	public void writeHeadersAllowFrom() {
+		String allowFromValue = "https://example.com/";
+		when(strategy.getAllowFromValue(request)).thenReturn(allowFromValue);
+		writer = new XFrameOptionsHeaderWriter(strategy);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("ALLOW-FROM " + allowFromValue);
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER))
+				.isEqualTo("ALLOW-FROM " + allowFromValue);
+	}
 
-    @Test
-    public void writeHeadersDeny() {
-        writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
+	@Test
+	public void writeHeadersDeny() {
+		writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY);
 
-        writer.writeHeaders(request, response);
+		writer.writeHeaders(request, response);
 
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("DENY");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER))
+				.isEqualTo("DENY");
+	}
 
+	@Test
+	public void writeHeadersSameOrigin() {
+		writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN);
 
-    @Test
-    public void writeHeadersSameOrigin() {
-        writer = new XFrameOptionsHeaderWriter(XFrameOptionsMode.SAMEORIGIN);
+		writer.writeHeaders(request, response);
 
-        writer.writeHeaders(request, response);
-
-        assertThat(response.getHeaderNames().size()).isEqualTo(1);
-        assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER)).isEqualTo("SAMEORIGIN");
-    }
+		assertThat(response.getHeaderNames().size()).isEqualTo(1);
+		assertThat(response.getHeader(XFrameOptionsHeaderWriter.XFRAME_OPTIONS_HEADER))
+				.isEqualTo("SAMEORIGIN");
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategyTests.java
index 0884971ccf..4c031dcb6d 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategyTests.java
@@ -15,40 +15,42 @@ import org.springframework.security.web.header.writers.frameoptions.RegExpAllowF
  */
 public class RegExpAllowFromStrategyTests {
 
-    @Test(expected = PatternSyntaxException.class)
-    public void invalidRegularExpressionShouldLeadToException() {
-        new RegExpAllowFromStrategy("[a-z");
-    }
+	@Test(expected = PatternSyntaxException.class)
+	public void invalidRegularExpressionShouldLeadToException() {
+		new RegExpAllowFromStrategy("[a-z");
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void nullRegularExpressionShouldLeadToException() {
-        new RegExpAllowFromStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void nullRegularExpressionShouldLeadToException() {
+		new RegExpAllowFromStrategy(null);
+	}
 
-    @Test
-    public void subdomainMatchingRegularExpression() {
-        RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy("^http://([a-z0-9]*?\\.)test\\.com");
-        strategy.setAllowFromParameterName("from");
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void subdomainMatchingRegularExpression() {
+		RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy(
+				"^http://([a-z0-9]*?\\.)test\\.com");
+		strategy.setAllowFromParameterName("from");
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        request.setParameter("from", "http://abc.test.com");
-        String result1 = strategy.getAllowFromValue(request);
-        assertThat(result1, is("http://abc.test.com"));
+		request.setParameter("from", "http://abc.test.com");
+		String result1 = strategy.getAllowFromValue(request);
+		assertThat(result1, is("http://abc.test.com"));
 
-        request.setParameter("from", "http://foo.test.com");
-        String result2 = strategy.getAllowFromValue(request);
-        assertThat(result2, is("http://foo.test.com"));
+		request.setParameter("from", "http://foo.test.com");
+		String result2 = strategy.getAllowFromValue(request);
+		assertThat(result2, is("http://foo.test.com"));
 
-        request.setParameter("from", "http://test.foobar.com");
-        String result3 = strategy.getAllowFromValue(request);
-        assertThat(result3, is("DENY"));
-    }
+		request.setParameter("from", "http://test.foobar.com");
+		String result3 = strategy.getAllowFromValue(request);
+		assertThat(result3, is("DENY"));
+	}
 
-    @Test
-    public void noParameterShouldDeny() {
-        RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy("^http://([a-z0-9]*?\\.)test\\.com");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        String result1 = strategy.getAllowFromValue(request);
-        assertThat(result1, is("DENY"));
-    }
+	@Test
+	public void noParameterShouldDeny() {
+		RegExpAllowFromStrategy strategy = new RegExpAllowFromStrategy(
+				"^http://([a-z0-9]*?\\.)test\\.com");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		String result1 = strategy.getAllowFromValue(request);
+		assertThat(result1, is("DENY"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java
index 2a14ee7e86..998aebdcac 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/StaticAllowFromStrategyTests.java
@@ -16,10 +16,10 @@ import static org.junit.Assert.assertEquals;
  */
 public class StaticAllowFromStrategyTests {
 
-    @Test
-    public void shouldReturnUri() {
-        String uri = "http://www.test.com";
-        StaticAllowFromStrategy strategy = new StaticAllowFromStrategy(URI.create(uri));
-        assertEquals(uri, strategy.getAllowFromValue(new MockHttpServletRequest()));
-    }
+	@Test
+	public void shouldReturnUri() {
+		String uri = "http://www.test.com";
+		StaticAllowFromStrategy strategy = new StaticAllowFromStrategy(URI.create(uri));
+		assertEquals(uri, strategy.getAllowFromValue(new MockHttpServletRequest()));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java
index 40c1060023..c8229e9ec3 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java
@@ -18,68 +18,67 @@ import static org.springframework.test.util.MatcherAssertionErrors.assertThat;
  */
 public class WhiteListedAllowFromStrategyTests {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void emptyListShouldThrowException() {
-        new WhiteListedAllowFromStrategy(new ArrayList<String>());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void emptyListShouldThrowException() {
+		new WhiteListedAllowFromStrategy(new ArrayList<String>());
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void nullListShouldThrowException() {
-        new WhiteListedAllowFromStrategy(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void nullListShouldThrowException() {
+		new WhiteListedAllowFromStrategy(null);
+	}
 
-    @Test
-    public void listWithSingleElementShouldMatch() {
-        List<String> allowed = new ArrayList<String>();
-        allowed.add("http://www.test.com");
-        WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
-        strategy.setAllowFromParameterName("from");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setParameter("from", "http://www.test.com");
+	@Test
+	public void listWithSingleElementShouldMatch() {
+		List<String> allowed = new ArrayList<String>();
+		allowed.add("http://www.test.com");
+		WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
+		strategy.setAllowFromParameterName("from");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setParameter("from", "http://www.test.com");
 
-        String result = strategy.getAllowFromValue(request);
-        assertThat(result, is("http://www.test.com"));
-    }
+		String result = strategy.getAllowFromValue(request);
+		assertThat(result, is("http://www.test.com"));
+	}
 
-    @Test
-    public void listWithMultipleElementShouldMatch() {
-        List<String> allowed = new ArrayList<String>();
-        allowed.add("http://www.test.com");
-        allowed.add("http://www.springsource.org");
-        WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
-        strategy.setAllowFromParameterName("from");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setParameter("from", "http://www.test.com");
+	@Test
+	public void listWithMultipleElementShouldMatch() {
+		List<String> allowed = new ArrayList<String>();
+		allowed.add("http://www.test.com");
+		allowed.add("http://www.springsource.org");
+		WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
+		strategy.setAllowFromParameterName("from");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setParameter("from", "http://www.test.com");
 
-        String result = strategy.getAllowFromValue(request);
-        assertThat(result, is("http://www.test.com"));
-    }
+		String result = strategy.getAllowFromValue(request);
+		assertThat(result, is("http://www.test.com"));
+	}
 
-    @Test
-    public void listWithSingleElementShouldNotMatch() {
-        List<String> allowed = new ArrayList<String>();
-        allowed.add("http://www.test.com");
-        WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
-        strategy.setAllowFromParameterName("from");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setParameter("from", "http://www.test123.com");
+	@Test
+	public void listWithSingleElementShouldNotMatch() {
+		List<String> allowed = new ArrayList<String>();
+		allowed.add("http://www.test.com");
+		WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
+		strategy.setAllowFromParameterName("from");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setParameter("from", "http://www.test123.com");
 
-        String result = strategy.getAllowFromValue(request);
-        assertThat(result, is("DENY"));
-    }
+		String result = strategy.getAllowFromValue(request);
+		assertThat(result, is("DENY"));
+	}
 
-    @Test
-    public void requestWithoutParameterShouldNotMatch() {
-        List<String> allowed = new ArrayList<String>();
-        allowed.add("http://www.test.com");
-        WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
-        strategy.setAllowFromParameterName("from");
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void requestWithoutParameterShouldNotMatch() {
+		List<String> allowed = new ArrayList<String>();
+		allowed.add("http://www.test.com");
+		WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed);
+		strategy.setAllowFromParameterName("from");
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        String result = strategy.getAllowFromValue(request);
-        assertThat(result, is("DENY"));
-
-    }
+		String result = strategy.getAllowFromValue(request);
+		assertThat(result, is("DENY"));
 
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java
index fde10d9a19..d9dae40434 100644
--- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java
@@ -59,154 +59,170 @@ import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter;
  * @author Rob Winch
  */
 public class JaasApiIntegrationFilterTests {
-    //~ Instance fields ================================================================================================
-    private JaasApiIntegrationFilter filter;
-    private MockHttpServletRequest request;
-    private MockHttpServletResponse response;
-    private Authentication token;
-    private Subject authenticatedSubject;
-    private Configuration testConfiguration;
-    private CallbackHandler callbackHandler;
-    //~ Methods ========================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
+	private JaasApiIntegrationFilter filter;
+	private MockHttpServletRequest request;
+	private MockHttpServletResponse response;
+	private Authentication token;
+	private Subject authenticatedSubject;
+	private Configuration testConfiguration;
+	private CallbackHandler callbackHandler;
 
-    @Before
-    public void onBeforeTests() throws Exception {
-        this.filter = new JaasApiIntegrationFilter();
-        this.request = new MockHttpServletRequest();
-        this.response = new MockHttpServletResponse();
+	// ~ Methods
+	// ========================================================================================================
 
-        authenticatedSubject = new Subject();
-        authenticatedSubject.getPrincipals().add(new Principal() {
-            public String getName() {
-                return "principal";
-            }
-        });
-        authenticatedSubject.getPrivateCredentials().add("password");
-        authenticatedSubject.getPublicCredentials().add("username");
-        callbackHandler = new CallbackHandler() {
-            public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-                for (Callback callback : callbacks) {
-                    if (callback instanceof NameCallback) {
-                        ((NameCallback) callback).setName("user");
-                    } else if (callback instanceof PasswordCallback) {
-                        ((PasswordCallback) callback).setPassword("password".toCharArray());
-                    } else if (callback instanceof TextInputCallback) {
-                        // ignore
-                    } else {
-                        throw new UnsupportedCallbackException(callback, "Unrecognized Callback " + callback);
-                    }
-                }
-            }
-        };
-        testConfiguration = new Configuration() {
-            public void refresh() {
-            }
+	@Before
+	public void onBeforeTests() throws Exception {
+		this.filter = new JaasApiIntegrationFilter();
+		this.request = new MockHttpServletRequest();
+		this.response = new MockHttpServletResponse();
 
-            public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
-                return new AppConfigurationEntry[] { new AppConfigurationEntry(TestLoginModule.class.getName(),
-                        LoginModuleControlFlag.REQUIRED, new HashMap<String, String>()) };
-            }
-        };
-        LoginContext ctx = new LoginContext("SubjectDoAsFilterTest", authenticatedSubject, callbackHandler,
-                testConfiguration);
-        ctx.login();
-        token = new JaasAuthenticationToken("username", "password", AuthorityUtils.createAuthorityList("ROLE_ADMIN"),
-                ctx);
+		authenticatedSubject = new Subject();
+		authenticatedSubject.getPrincipals().add(new Principal() {
+			public String getName() {
+				return "principal";
+			}
+		});
+		authenticatedSubject.getPrivateCredentials().add("password");
+		authenticatedSubject.getPublicCredentials().add("username");
+		callbackHandler = new CallbackHandler() {
+			public void handle(Callback[] callbacks) throws IOException,
+					UnsupportedCallbackException {
+				for (Callback callback : callbacks) {
+					if (callback instanceof NameCallback) {
+						((NameCallback) callback).setName("user");
+					}
+					else if (callback instanceof PasswordCallback) {
+						((PasswordCallback) callback).setPassword("password"
+								.toCharArray());
+					}
+					else if (callback instanceof TextInputCallback) {
+						// ignore
+					}
+					else {
+						throw new UnsupportedCallbackException(callback,
+								"Unrecognized Callback " + callback);
+					}
+				}
+			}
+		};
+		testConfiguration = new Configuration() {
+			public void refresh() {
+			}
 
-        // just in case someone forgot to clear the context
-        SecurityContextHolder.clearContext();
-    }
+			public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
+				return new AppConfigurationEntry[] { new AppConfigurationEntry(
+						TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED,
+						new HashMap<String, String>()) };
+			}
+		};
+		LoginContext ctx = new LoginContext("SubjectDoAsFilterTest",
+				authenticatedSubject, callbackHandler, testConfiguration);
+		ctx.login();
+		token = new JaasAuthenticationToken("username", "password",
+				AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx);
 
-    @After
-    public void onAfterTests() {
-        SecurityContextHolder.clearContext();
-    }
+		// just in case someone forgot to clear the context
+		SecurityContextHolder.clearContext();
+	}
 
-    /**
-     * Ensure a Subject was not setup in some other manner.
-     */
-    @Test
-    public void currentSubjectNull() {
-        assertNull(Subject.getSubject(AccessController.getContext()));
-    }
+	@After
+	public void onAfterTests() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void obtainSubjectNullAuthentication() {
-        assertNullSubject(filter.obtainSubject(request));
-    }
+	/**
+	 * Ensure a Subject was not setup in some other manner.
+	 */
+	@Test
+	public void currentSubjectNull() {
+		assertNull(Subject.getSubject(AccessController.getContext()));
+	}
 
-    @Test
-    public void obtainSubjectNonJaasAuthentication() {
-        Authentication authentication = new TestingAuthenticationToken("un", "pwd");
-        authentication.setAuthenticated(true);
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-        assertNullSubject(filter.obtainSubject(request));
-    }
+	@Test
+	public void obtainSubjectNullAuthentication() {
+		assertNullSubject(filter.obtainSubject(request));
+	}
 
-    @Test
-    public void obtainSubjectNullLoginContext() {
-        token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), null);
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertNullSubject(filter.obtainSubject(request));
-    }
+	@Test
+	public void obtainSubjectNonJaasAuthentication() {
+		Authentication authentication = new TestingAuthenticationToken("un", "pwd");
+		authentication.setAuthenticated(true);
+		SecurityContextHolder.getContext().setAuthentication(authentication);
+		assertNullSubject(filter.obtainSubject(request));
+	}
 
-    @Test
-    public void obtainSubjectNullSubject() throws Exception {
-        LoginContext ctx = new LoginContext("obtainSubjectNullSubject", null, callbackHandler, testConfiguration);
-        assertNull(ctx.getSubject());
-        token = new JaasAuthenticationToken("un", "pwd", AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx);
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertNullSubject(filter.obtainSubject(request));
-    }
+	@Test
+	public void obtainSubjectNullLoginContext() {
+		token = new JaasAuthenticationToken("un", "pwd",
+				AuthorityUtils.createAuthorityList("ROLE_ADMIN"), null);
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertNullSubject(filter.obtainSubject(request));
+	}
 
-    @Test
-    public void obtainSubject() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertEquals(authenticatedSubject, filter.obtainSubject(request));
-    }
+	@Test
+	public void obtainSubjectNullSubject() throws Exception {
+		LoginContext ctx = new LoginContext("obtainSubjectNullSubject", null,
+				callbackHandler, testConfiguration);
+		assertNull(ctx.getSubject());
+		token = new JaasAuthenticationToken("un", "pwd",
+				AuthorityUtils.createAuthorityList("ROLE_ADMIN"), ctx);
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertNullSubject(filter.obtainSubject(request));
+	}
 
-    @Test
-    public void doFilterCurrentSubjectPopulated() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertJaasSubjectEquals(authenticatedSubject);
-    }
+	@Test
+	public void obtainSubject() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertEquals(authenticatedSubject, filter.obtainSubject(request));
+	}
 
-    @Test
-    public void doFilterAuthenticationNotAuthenticated() throws Exception {
-        // Authentication is null, so no Subject is populated.
-        token.setAuthenticated(false);
-        SecurityContextHolder.getContext().setAuthentication(token);
-        assertJaasSubjectEquals(null);
-        filter.setCreateEmptySubject(true);
-        assertJaasSubjectEquals(new Subject());
-    }
+	@Test
+	public void doFilterCurrentSubjectPopulated() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertJaasSubjectEquals(authenticatedSubject);
+	}
 
-    @Test
-    public void doFilterAuthenticationNull() throws Exception {
-        assertJaasSubjectEquals(null);
-        filter.setCreateEmptySubject(true);
-        assertJaasSubjectEquals(new Subject());
-    }
+	@Test
+	public void doFilterAuthenticationNotAuthenticated() throws Exception {
+		// Authentication is null, so no Subject is populated.
+		token.setAuthenticated(false);
+		SecurityContextHolder.getContext().setAuthentication(token);
+		assertJaasSubjectEquals(null);
+		filter.setCreateEmptySubject(true);
+		assertJaasSubjectEquals(new Subject());
+	}
 
-    //~ Helper Methods ====================================================================================================
+	@Test
+	public void doFilterAuthenticationNull() throws Exception {
+		assertJaasSubjectEquals(null);
+		filter.setCreateEmptySubject(true);
+		assertJaasSubjectEquals(new Subject());
+	}
 
-    private void assertJaasSubjectEquals(final Subject expectedValue) throws Exception {
-        MockFilterChain chain = new MockFilterChain() {
-            public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-                // See if the subject was updated
-                Subject currentSubject = Subject.getSubject(AccessController.getContext());
-                assertEquals(expectedValue, currentSubject);
+	// ~ Helper Methods
+	// ====================================================================================================
 
-                // run so we know the chain was executed
-                super.doFilter(request, response);
-            }
-        };
-        filter.doFilter(request, response, chain);
-        // ensure that the chain was actually invoked
-        assertNotNull(chain.getRequest());
-    }
+	private void assertJaasSubjectEquals(final Subject expectedValue) throws Exception {
+		MockFilterChain chain = new MockFilterChain() {
+			public void doFilter(ServletRequest request, ServletResponse response)
+					throws IOException, ServletException {
+				// See if the subject was updated
+				Subject currentSubject = Subject
+						.getSubject(AccessController.getContext());
+				assertEquals(expectedValue, currentSubject);
 
-    private void assertNullSubject(Subject subject) {
-        assertNull("Subject is expected to be null, but is not. Got " + subject, subject);
-    }
+				// run so we know the chain was executed
+				super.doFilter(request, response);
+			}
+		};
+		filter.doFilter(request, response, chain);
+		// ensure that the chain was actually invoked
+		assertNotNull(chain.getRequest());
+	}
+
+	private void assertNullSubject(Subject subject) {
+		assertNull("Subject is expected to be null, but is not. Got " + subject, subject);
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java
index cd9d262071..f7152949cb 100644
--- a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java
+++ b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.security.web.method.annotation;
 
-
 import static org.fest.assertions.Assertions.assertThat;
 
 import java.lang.annotation.ElementType;
@@ -41,162 +40,199 @@ import org.springframework.util.ReflectionUtils;
  *
  */
 public class AuthenticationPrincipalArgumentResolverTests {
-    private Object expectedPrincipal;
-    private AuthenticationPrincipalArgumentResolver resolver;
+	private Object expectedPrincipal;
+	private AuthenticationPrincipalArgumentResolver resolver;
 
-    @Before
-    public void setup() {
-        resolver = new AuthenticationPrincipalArgumentResolver();
-    }
+	@Before
+	public void setup() {
+		resolver = new AuthenticationPrincipalArgumentResolver();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void supportsParameterNoAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
-    }
+	@Test
+	public void supportsParameterNoAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserNoAnnotation())).isFalse();
+	}
 
-    @Test
-    public void supportsParameterAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
-    }
+	@Test
+	public void supportsParameterAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserAnnotationObject())).isTrue();
+	}
 
-    @Test
-    public void supportsParameterCustomAnnotation() throws Exception {
-        assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
-    }
+	@Test
+	public void supportsParameterCustomAnnotation() throws Exception {
+		assertThat(resolver.supportsParameter(showUserCustomAnnotation())).isTrue();
+	}
 
-    @Test
-    public void resolveArgumentNullAuthentication() throws Exception {
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullAuthentication() throws Exception {
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test
-    public void resolveArgumentNullPrincipal() throws Exception {
-        setAuthenticationPrincipal(null);
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullPrincipal() throws Exception {
+		setAuthenticationPrincipal(null);
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test
-    public void resolveArgumentString() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentString() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentPrincipalStringOnObject() throws Exception {
-        setAuthenticationPrincipal("john");
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentPrincipalStringOnObject() throws Exception {
+		setAuthenticationPrincipal("john");
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentUserDetails() throws Exception {
-        setAuthenticationPrincipal(new User("user", "password", AuthorityUtils.createAuthorityList("ROLE_USER")));
-        assertThat(resolver.resolveArgument(showUserAnnotationUserDetails(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentUserDetails() throws Exception {
+		setAuthenticationPrincipal(new User("user", "password",
+				AuthorityUtils.createAuthorityList("ROLE_USER")));
+		assertThat(
+				resolver.resolveArgument(showUserAnnotationUserDetails(), null, null,
+						null)).isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomUserPrincipal() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomUserPrincipal() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(
+				resolver.resolveArgument(showUserAnnotationCustomUserPrincipal(), null,
+						null, null)).isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentCustomAnnotation() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	@Test
+	public void resolveArgumentCustomAnnotation() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserCustomAnnotation(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentNullOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null)).isNull();
-    }
+	@Test
+	public void resolveArgumentNullOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		assertThat(resolver.resolveArgument(showUserAnnotationString(), null, null, null))
+				.isNull();
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null);
-    }
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationErrorOnInvalidType(), null, null, null);
+	}
 
+	@Test(expected = ClassCastException.class)
+	public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
+		setAuthenticationPrincipal(new CustomUserPrincipal());
+		resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null,
+				null, null);
+	}
 
-    @Test(expected = ClassCastException.class)
-    public void resolveArgumentCustomserErrorOnInvalidType() throws Exception {
-        setAuthenticationPrincipal(new CustomUserPrincipal());
-        resolver.resolveArgument(showUserAnnotationCurrentUserErrorOnInvalidType(), null, null, null);
-    }
+	@Test
+	public void resolveArgumentObject() throws Exception {
+		setAuthenticationPrincipal(new Object());
+		assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null))
+				.isEqualTo(expectedPrincipal);
+	}
 
-    @Test
-    public void resolveArgumentObject() throws Exception {
-        setAuthenticationPrincipal(new Object());
-        assertThat(resolver.resolveArgument(showUserAnnotationObject(), null, null, null)).isEqualTo(expectedPrincipal);
-    }
+	private MethodParameter showUserNoAnnotation() {
+		return getMethodParameter("showUserNoAnnotation", String.class);
+	}
 
-    private MethodParameter showUserNoAnnotation() {
-        return getMethodParameter("showUserNoAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationString() {
+		return getMethodParameter("showUserAnnotation", String.class);
+	}
 
-    private MethodParameter showUserAnnotationString() {
-        return getMethodParameter("showUserAnnotation", String.class);
-    }
+	private MethodParameter showUserAnnotationErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
+	}
 
-    private MethodParameter showUserAnnotationErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
+		return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType",
+				String.class);
+	}
 
-    private MethodParameter showUserAnnotationCurrentUserErrorOnInvalidType() {
-        return getMethodParameter("showUserAnnotationCurrentUserErrorOnInvalidType", String.class);
-    }
+	private MethodParameter showUserAnnotationUserDetails() {
+		return getMethodParameter("showUserAnnotation", UserDetails.class);
+	}
 
-    private MethodParameter showUserAnnotationUserDetails() {
-        return getMethodParameter("showUserAnnotation", UserDetails.class);
-    }
+	private MethodParameter showUserAnnotationCustomUserPrincipal() {
+		return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserAnnotationCustomUserPrincipal() {
-        return getMethodParameter("showUserAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserCustomAnnotation() {
+		return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
+	}
 
-    private MethodParameter showUserCustomAnnotation() {
-        return getMethodParameter("showUserCustomAnnotation", CustomUserPrincipal.class);
-    }
+	private MethodParameter showUserAnnotationObject() {
+		return getMethodParameter("showUserAnnotation", Object.class);
+	}
 
-    private MethodParameter showUserAnnotationObject() {
-        return getMethodParameter("showUserAnnotation", Object.class);
-    }
+	private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
+		Method method = ReflectionUtils.findMethod(TestController.class, methodName,
+				paramTypes);
+		return new MethodParameter(method, 0);
+	}
 
-    private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
-        Method method = ReflectionUtils.findMethod(TestController.class, methodName,paramTypes);
-        return new MethodParameter(method,0);
-    }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal
+	static @interface CurrentUser {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal
-    static @interface CurrentUser { }
+	@Target({ ElementType.PARAMETER })
+	@Retention(RetentionPolicy.RUNTIME)
+	@AuthenticationPrincipal(errorOnInvalidType = true)
+	static @interface CurrentUserErrorOnInvalidType {
+	}
 
-    @Target({ ElementType.PARAMETER})
-    @Retention(RetentionPolicy.RUNTIME)
-    @AuthenticationPrincipal(errorOnInvalidType = true)
-    static @interface CurrentUserErrorOnInvalidType { }
+	public static class TestController {
+		public void showUserNoAnnotation(String user) {
+		}
 
-    public static class TestController {
-        public void showUserNoAnnotation(String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal String user) {}
-        public void showUserAnnotationErrorOnInvalidType(@AuthenticationPrincipal(errorOnInvalidType=true) String user) {}
-        public void showUserAnnotationCurrentUserErrorOnInvalidType(@CurrentUserErrorOnInvalidType String user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {}
-        public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {}
-        public void showUserAnnotation(@AuthenticationPrincipal Object user) {}
-    }
+		public void showUserAnnotation(@AuthenticationPrincipal String user) {
+		}
 
-    private static class CustomUserPrincipal {}
+		public void showUserAnnotationErrorOnInvalidType(
+				@AuthenticationPrincipal(errorOnInvalidType = true) String user) {
+		}
 
-    private void setAuthenticationPrincipal(Object principal) {
-        this.expectedPrincipal = principal;
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken(expectedPrincipal, "password", "ROLE_USER"));
-    }
+		public void showUserAnnotationCurrentUserErrorOnInvalidType(
+				@CurrentUserErrorOnInvalidType String user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal UserDetails user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal CustomUserPrincipal user) {
+		}
+
+		public void showUserCustomAnnotation(@CurrentUser CustomUserPrincipal user) {
+		}
+
+		public void showUserAnnotation(@AuthenticationPrincipal Object user) {
+		}
+	}
+
+	private static class CustomUserPrincipal {
+	}
+
+	private void setAuthenticationPrincipal(Object principal) {
+		this.expectedPrincipal = principal;
+		SecurityContextHolder.getContext()
+				.setAuthentication(
+						new TestingAuthenticationToken(expectedPrincipal, "password",
+								"ROLE_USER"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java
index b4fb6497b3..c01a370756 100644
--- a/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java
+++ b/web/src/test/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolverTests.java
@@ -41,64 +41,72 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class CsrfTokenArgumentResolverTests {
-    @Mock
-    private ModelAndViewContainer mavContainer;
-    @Mock
-    private WebDataBinderFactory binderFactory;
+	@Mock
+	private ModelAndViewContainer mavContainer;
+	@Mock
+	private WebDataBinderFactory binderFactory;
 
-    private MockHttpServletRequest request;
-    private NativeWebRequest webRequest;
+	private MockHttpServletRequest request;
+	private NativeWebRequest webRequest;
 
-    private CsrfToken token;
+	private CsrfToken token;
 
-    private CsrfTokenArgumentResolver resolver;
+	private CsrfTokenArgumentResolver resolver;
 
-    @Before
-    public void setup() {
-        token = new DefaultCsrfToken("X-CSRF-TOKEN", "_csrf", "secret");
-        resolver = new CsrfTokenArgumentResolver();
-        request = new MockHttpServletRequest();
-        webRequest = new ServletWebRequest(request);
-    }
+	@Before
+	public void setup() {
+		token = new DefaultCsrfToken("X-CSRF-TOKEN", "_csrf", "secret");
+		resolver = new CsrfTokenArgumentResolver();
+		request = new MockHttpServletRequest();
+		webRequest = new ServletWebRequest(request);
+	}
 
-    @Test
-    public void supportsParameterFalse() {
-        assertThat(resolver.supportsParameter(noToken())).isFalse();
-    }
+	@Test
+	public void supportsParameterFalse() {
+		assertThat(resolver.supportsParameter(noToken())).isFalse();
+	}
 
-    @Test
-    public void supportsParameterTrue() {
-        assertThat(resolver.supportsParameter(token())).isTrue();
-    }
+	@Test
+	public void supportsParameterTrue() {
+		assertThat(resolver.supportsParameter(token())).isTrue();
+	}
 
-    @Test
-    public void resolveArgumentNotFound() throws Exception {
-        assertThat(resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory)).isNull();
-    }
+	@Test
+	public void resolveArgumentNotFound() throws Exception {
+		assertThat(
+				resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory))
+				.isNull();
+	}
 
-    @Test
-    public void resolveArgumentFound() throws Exception {
-        request.setAttribute(CsrfToken.class.getName(), token);
+	@Test
+	public void resolveArgumentFound() throws Exception {
+		request.setAttribute(CsrfToken.class.getName(), token);
 
-        assertThat(resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory)).isSameAs(token);
-    }
+		assertThat(
+				resolver.resolveArgument(token(), mavContainer, webRequest, binderFactory))
+				.isSameAs(token);
+	}
 
-    private MethodParameter noToken() {
-        return getMethodParameter("noToken", String.class);
-    }
+	private MethodParameter noToken() {
+		return getMethodParameter("noToken", String.class);
+	}
 
-    private MethodParameter token() {
-        return getMethodParameter("token", CsrfToken.class);
-    }
+	private MethodParameter token() {
+		return getMethodParameter("token", CsrfToken.class);
+	}
 
-    private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
-        Method method = ReflectionUtils.findMethod(TestController.class, methodName,paramTypes);
-        return new MethodParameter(method,0);
-    }
+	private MethodParameter getMethodParameter(String methodName, Class<?>... paramTypes) {
+		Method method = ReflectionUtils.findMethod(TestController.class, methodName,
+				paramTypes);
+		return new MethodParameter(method, 0);
+	}
 
-    public static class TestController {
-        public void noToken(String user) {}
-        public void token(CsrfToken token) {}
-    }
+	public static class TestController {
+		public void noToken(String user) {
+		}
+
+		public void token(CsrfToken token) {
+		}
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java
index 2c1913df16..9752b05452 100644
--- a/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java
+++ b/web/src/test/java/org/springframework/security/web/savedrequest/DefaultSavedRequestTests.java
@@ -12,30 +12,33 @@ import org.springframework.mock.web.MockHttpServletRequest;
  */
 public class DefaultSavedRequestTests {
 
-    // SEC-308, SEC-315
-    @Test
-    public void headersAreCaseInsensitive() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("USER-aGenT", "Mozilla");
-        DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443));
-        assertEquals("Mozilla", saved.getHeaderValues("user-agent").get(0));
-    }
+	// SEC-308, SEC-315
+	@Test
+	public void headersAreCaseInsensitive() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("USER-aGenT", "Mozilla");
+		DefaultSavedRequest saved = new DefaultSavedRequest(request,
+				new MockPortResolver(8080, 8443));
+		assertEquals("Mozilla", saved.getHeaderValues("user-agent").get(0));
+	}
 
-    // SEC-1412
-    @Test
-    public void discardsIfNoneMatchHeader() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("If-None-Match", "somehashvalue");
-        DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443));
-        assertTrue(saved.getHeaderValues("if-none-match").isEmpty());
-    }
+	// SEC-1412
+	@Test
+	public void discardsIfNoneMatchHeader() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("If-None-Match", "somehashvalue");
+		DefaultSavedRequest saved = new DefaultSavedRequest(request,
+				new MockPortResolver(8080, 8443));
+		assertTrue(saved.getHeaderValues("if-none-match").isEmpty());
+	}
 
-    // TODO: Why are parameters case insensitive. I think this is a mistake
-    @Test
-    public void parametersAreCaseInsensitive() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addParameter("ThisIsATest", "Hi mom");
-        DefaultSavedRequest saved = new DefaultSavedRequest(request, new MockPortResolver(8080, 8443));
-        assertEquals("Hi mom", saved.getParameterValues("thisisatest")[0]);
-    }
+	// TODO: Why are parameters case insensitive. I think this is a mistake
+	@Test
+	public void parametersAreCaseInsensitive() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("ThisIsATest", "Hi mom");
+		DefaultSavedRequest saved = new DefaultSavedRequest(request,
+				new MockPortResolver(8080, 8443));
+		assertEquals("Hi mom", saved.getParameterValues("thisisatest")[0]);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java
index eaac762f5d..21575e4eaa 100644
--- a/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java
+++ b/web/src/test/java/org/springframework/security/web/savedrequest/HttpSessionRequestCacheTests.java
@@ -26,98 +26,107 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
  */
 public class HttpSessionRequestCacheTests {
 
-    @Test
-    public void originalGetRequestDoesntMatchIncomingPost() {
-        HttpSessionRequestCache cache = new HttpSessionRequestCache();
+	@Test
+	public void originalGetRequestDoesntMatchIncomingPost() {
+		HttpSessionRequestCache cache = new HttpSessionRequestCache();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/destination");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        cache.saveRequest(request, response);
-        assertNotNull(request.getSession().getAttribute(HttpSessionRequestCache.SAVED_REQUEST));
-        assertNotNull(cache.getRequest(request, response));
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/destination");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		cache.saveRequest(request, response);
+		assertNotNull(request.getSession().getAttribute(
+				HttpSessionRequestCache.SAVED_REQUEST));
+		assertNotNull(cache.getRequest(request, response));
 
-        MockHttpServletRequest newRequest = new MockHttpServletRequest("POST", "/destination");
-        newRequest.setSession(request.getSession());
-        assertNull(cache.getMatchingRequest(newRequest, response));
+		MockHttpServletRequest newRequest = new MockHttpServletRequest("POST",
+				"/destination");
+		newRequest.setSession(request.getSession());
+		assertNull(cache.getMatchingRequest(newRequest, response));
 
-    }
+	}
 
-    @Test
-    public void requestMatcherDefinesCorrectSubsetOfCachedRequests() throws Exception {
-        HttpSessionRequestCache cache = new HttpSessionRequestCache();
-        cache.setRequestMatcher(new RequestMatcher() {
-            public boolean matches(HttpServletRequest request) {
-                return request.getMethod().equals("GET");
-            }
-        });
+	@Test
+	public void requestMatcherDefinesCorrectSubsetOfCachedRequests() throws Exception {
+		HttpSessionRequestCache cache = new HttpSessionRequestCache();
+		cache.setRequestMatcher(new RequestMatcher() {
+			public boolean matches(HttpServletRequest request) {
+				return request.getMethod().equals("GET");
+			}
+		});
 
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/destination");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        cache.saveRequest(request, response);
-        assertNull(cache.getRequest(request, response));
-        assertNull(cache.getRequest(new MockHttpServletRequest(), new MockHttpServletResponse()));
-        assertNull(cache.getMatchingRequest(request, response));
-    }
+		MockHttpServletRequest request = new MockHttpServletRequest("POST",
+				"/destination");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		cache.saveRequest(request, response);
+		assertNull(cache.getRequest(request, response));
+		assertNull(cache.getRequest(new MockHttpServletRequest(),
+				new MockHttpServletResponse()));
+		assertNull(cache.getMatchingRequest(request, response));
+	}
 
-    // SEC-2246
-    @Test
-    public void getRequestCustomNoClassCastException() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/destination");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        HttpSessionRequestCache cache = new HttpSessionRequestCache() {
+	// SEC-2246
+	@Test
+	public void getRequestCustomNoClassCastException() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("POST",
+				"/destination");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		HttpSessionRequestCache cache = new HttpSessionRequestCache() {
 
-            @Override
-            public void saveRequest(HttpServletRequest request,
-                    HttpServletResponse response) {
-                request.getSession().setAttribute(SAVED_REQUEST, new CustomSavedRequest(new DefaultSavedRequest(request, new PortResolverImpl())));
-            }
+			@Override
+			public void saveRequest(HttpServletRequest request,
+					HttpServletResponse response) {
+				request.getSession().setAttribute(
+						SAVED_REQUEST,
+						new CustomSavedRequest(new DefaultSavedRequest(request,
+								new PortResolverImpl())));
+			}
 
-        };
-        cache.saveRequest(request,response);
+		};
+		cache.saveRequest(request, response);
 
-        cache.saveRequest(request, response);
-        assertThat(cache.getRequest(request, response)).isInstanceOf(CustomSavedRequest.class);
-    }
+		cache.saveRequest(request, response);
+		assertThat(cache.getRequest(request, response)).isInstanceOf(
+				CustomSavedRequest.class);
+	}
 
-    private static final class CustomSavedRequest implements SavedRequest {
-        private final SavedRequest delegate;
+	private static final class CustomSavedRequest implements SavedRequest {
+		private final SavedRequest delegate;
 
-        private CustomSavedRequest(SavedRequest delegate) {
-            this.delegate = delegate;
-        }
+		private CustomSavedRequest(SavedRequest delegate) {
+			this.delegate = delegate;
+		}
 
-        public String getRedirectUrl() {
-            return delegate.getRedirectUrl();
-        }
+		public String getRedirectUrl() {
+			return delegate.getRedirectUrl();
+		}
 
-        public List<Cookie> getCookies() {
-            return delegate.getCookies();
-        }
+		public List<Cookie> getCookies() {
+			return delegate.getCookies();
+		}
 
-        public String getMethod() {
-            return delegate.getMethod();
-        }
+		public String getMethod() {
+			return delegate.getMethod();
+		}
 
-        public List<String> getHeaderValues(String name) {
-            return delegate.getHeaderValues(name);
-        }
+		public List<String> getHeaderValues(String name) {
+			return delegate.getHeaderValues(name);
+		}
 
-        public Collection<String> getHeaderNames() {
-            return delegate.getHeaderNames();
-        }
+		public Collection<String> getHeaderNames() {
+			return delegate.getHeaderNames();
+		}
 
-        public List<Locale> getLocales() {
-            return delegate.getLocales();
-        }
+		public List<Locale> getLocales() {
+			return delegate.getLocales();
+		}
 
-        public String[] getParameterValues(String name) {
-            return delegate.getParameterValues(name);
-        }
+		public String[] getParameterValues(String name) {
+			return delegate.getParameterValues(name);
+		}
 
-        public Map<String, String[]> getParameterMap() {
-            return delegate.getParameterMap();
-        }
+		public Map<String, String[]> getParameterMap() {
+			return delegate.getParameterMap();
+		}
 
-        private static final long serialVersionUID = 2426831999233621470L;
-    }
+		private static final long serialVersionUID = 2426831999233621470L;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java
index f7faa7dd43..102b02dd25 100644
--- a/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/savedrequest/RequestCacheAwareFilterTests.java
@@ -9,17 +9,20 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 public class RequestCacheAwareFilterTests {
 
-    @Test
-    public void savedRequestIsRemovedAfterMatch() throws Exception {
-        RequestCacheAwareFilter filter = new RequestCacheAwareFilter();
-        HttpSessionRequestCache cache = new HttpSessionRequestCache();
+	@Test
+	public void savedRequestIsRemovedAfterMatch() throws Exception {
+		RequestCacheAwareFilter filter = new RequestCacheAwareFilter();
+		HttpSessionRequestCache cache = new HttpSessionRequestCache();
 
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/destination");
-        MockHttpServletResponse response = new MockHttpServletResponse();
-        cache.saveRequest(request, response);
-        assertNotNull(request.getSession().getAttribute(HttpSessionRequestCache.SAVED_REQUEST));
+		MockHttpServletRequest request = new MockHttpServletRequest("POST",
+				"/destination");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		cache.saveRequest(request, response);
+		assertNotNull(request.getSession().getAttribute(
+				HttpSessionRequestCache.SAVED_REQUEST));
 
-        filter.doFilter(request, response, new MockFilterChain());
-        assertNull(request.getSession().getAttribute(HttpSessionRequestCache.SAVED_REQUEST));
-    }
+		filter.doFilter(request, response, new MockFilterChain());
+		assertNull(request.getSession().getAttribute(
+				HttpSessionRequestCache.SAVED_REQUEST));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java
index d57d11f0f0..67cef16e2c 100644
--- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java
+++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedCookieTests.java
@@ -10,61 +10,61 @@ import java.io.Serializable;
 
 public class SavedCookieTests extends TestCase {
 
-    Cookie cookie;
-    SavedCookie savedCookie;
+	Cookie cookie;
+	SavedCookie savedCookie;
 
-    protected void setUp() throws Exception {
-        cookie = new Cookie("name", "value");
-        cookie.setComment("comment");
-        cookie.setDomain("domain");
-        cookie.setMaxAge(100);
-        cookie.setPath("path");
-        cookie.setSecure(true);
-        cookie.setVersion(11);
-        savedCookie = new SavedCookie(cookie);
-    }
+	protected void setUp() throws Exception {
+		cookie = new Cookie("name", "value");
+		cookie.setComment("comment");
+		cookie.setDomain("domain");
+		cookie.setMaxAge(100);
+		cookie.setPath("path");
+		cookie.setSecure(true);
+		cookie.setVersion(11);
+		savedCookie = new SavedCookie(cookie);
+	}
 
-    public void testGetName() throws Exception {
-        assertEquals(cookie.getName(), savedCookie.getName());
-    }
+	public void testGetName() throws Exception {
+		assertEquals(cookie.getName(), savedCookie.getName());
+	}
 
-    public void testGetValue() throws Exception {
-        assertEquals(cookie.getValue(), savedCookie.getValue());
-    }
+	public void testGetValue() throws Exception {
+		assertEquals(cookie.getValue(), savedCookie.getValue());
+	}
 
-    public void testGetComment() throws Exception {
-        assertEquals(cookie.getComment(), savedCookie.getComment());
-    }
+	public void testGetComment() throws Exception {
+		assertEquals(cookie.getComment(), savedCookie.getComment());
+	}
 
-    public void testGetDomain() throws Exception {
-        assertEquals(cookie.getDomain(), savedCookie.getDomain());
-    }
+	public void testGetDomain() throws Exception {
+		assertEquals(cookie.getDomain(), savedCookie.getDomain());
+	}
 
-    public void testGetMaxAge() throws Exception {
-        assertEquals(cookie.getMaxAge(), savedCookie.getMaxAge());
-    }
+	public void testGetMaxAge() throws Exception {
+		assertEquals(cookie.getMaxAge(), savedCookie.getMaxAge());
+	}
 
-    public void testGetPath() throws Exception {
-        assertEquals(cookie.getPath(), savedCookie.getPath());
-    }
+	public void testGetPath() throws Exception {
+		assertEquals(cookie.getPath(), savedCookie.getPath());
+	}
 
-    public void testGetVersion() throws Exception {
-        assertEquals(cookie.getVersion(), savedCookie.getVersion());
-    }
+	public void testGetVersion() throws Exception {
+		assertEquals(cookie.getVersion(), savedCookie.getVersion());
+	}
 
-    public void testGetCookie() throws Exception {
-        Cookie other = savedCookie.getCookie();
-        assertEquals(cookie.getComment(), other.getComment());
-        assertEquals(cookie.getDomain(), other.getDomain());
-        assertEquals(cookie.getMaxAge(), other.getMaxAge());
-        assertEquals(cookie.getName(), other.getName());
-        assertEquals(cookie.getPath(), other.getPath());
-        assertEquals(cookie.getSecure(), other.getSecure());
-        assertEquals(cookie.getValue(), other.getValue());
-        assertEquals(cookie.getVersion(), other.getVersion());
-    }
+	public void testGetCookie() throws Exception {
+		Cookie other = savedCookie.getCookie();
+		assertEquals(cookie.getComment(), other.getComment());
+		assertEquals(cookie.getDomain(), other.getDomain());
+		assertEquals(cookie.getMaxAge(), other.getMaxAge());
+		assertEquals(cookie.getName(), other.getName());
+		assertEquals(cookie.getPath(), other.getPath());
+		assertEquals(cookie.getSecure(), other.getSecure());
+		assertEquals(cookie.getValue(), other.getValue());
+		assertEquals(cookie.getVersion(), other.getVersion());
+	}
 
-    public void testSerializable() throws Exception {
-        assertTrue(savedCookie instanceof Serializable);
-    }
+	public void testSerializable() throws Exception {
+		assertTrue(savedCookie instanceof Serializable);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java
index c8197abec4..fd3e4d4659 100644
--- a/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java
+++ b/web/src/test/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapperTests.java
@@ -18,144 +18,155 @@ import org.springframework.security.web.savedrequest.SavedRequestAwareWrapper;
 
 public class SavedRequestAwareWrapperTests {
 
-    private SavedRequestAwareWrapper createWrapper(MockHttpServletRequest requestToSave, MockHttpServletRequest requestToWrap) {
-        DefaultSavedRequest saved = new DefaultSavedRequest(requestToSave, new PortResolverImpl());
-        return new SavedRequestAwareWrapper(saved, requestToWrap);
-    }
+	private SavedRequestAwareWrapper createWrapper(MockHttpServletRequest requestToSave,
+			MockHttpServletRequest requestToWrap) {
+		DefaultSavedRequest saved = new DefaultSavedRequest(requestToSave,
+				new PortResolverImpl());
+		return new SavedRequestAwareWrapper(saved, requestToWrap);
+	}
 
-    // SEC-2569
-    @Test
-    public void savedRequestCookiesAreIgnored() throws Exception {
-        MockHttpServletRequest newRequest = new MockHttpServletRequest();
-        newRequest.setCookies(new Cookie[] {new Cookie("cookie", "fromnew")});
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.setCookies(new Cookie[] {new Cookie("cookie", "fromsaved")});
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, newRequest);
-        assertEquals(1, wrapper.getCookies().length);
-        assertEquals("fromnew", wrapper.getCookies()[0].getValue());
-    }
+	// SEC-2569
+	@Test
+	public void savedRequestCookiesAreIgnored() throws Exception {
+		MockHttpServletRequest newRequest = new MockHttpServletRequest();
+		newRequest.setCookies(new Cookie[] { new Cookie("cookie", "fromnew") });
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.setCookies(new Cookie[] { new Cookie("cookie", "fromsaved") });
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, newRequest);
+		assertEquals(1, wrapper.getCookies().length);
+		assertEquals("fromnew", wrapper.getCookies()[0].getValue());
+	}
 
-    @Test
-    @SuppressWarnings("unchecked")
-    public void savedRequesthHeaderIsReturnedIfSavedRequestIsSet() throws Exception {
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.addHeader("header", "savedheader");
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, new MockHttpServletRequest());
+	@Test
+	@SuppressWarnings("unchecked")
+	public void savedRequesthHeaderIsReturnedIfSavedRequestIsSet() throws Exception {
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.addHeader("header", "savedheader");
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest,
+				new MockHttpServletRequest());
 
-        assertNull(wrapper.getHeader("nonexistent"));
-        Enumeration headers = wrapper.getHeaders("nonexistent");
-        assertFalse(headers.hasMoreElements());
+		assertNull(wrapper.getHeader("nonexistent"));
+		Enumeration headers = wrapper.getHeaders("nonexistent");
+		assertFalse(headers.hasMoreElements());
 
-        assertEquals("savedheader", wrapper.getHeader("Header"));
-        headers = wrapper.getHeaders("heaDer");
-        assertTrue(headers.hasMoreElements());
-        assertEquals("savedheader", headers.nextElement());
-        assertFalse(headers.hasMoreElements());
-        assertTrue(wrapper.getHeaderNames().hasMoreElements());
-        assertEquals("header", wrapper.getHeaderNames().nextElement());
-    }
+		assertEquals("savedheader", wrapper.getHeader("Header"));
+		headers = wrapper.getHeaders("heaDer");
+		assertTrue(headers.hasMoreElements());
+		assertEquals("savedheader", headers.nextElement());
+		assertFalse(headers.hasMoreElements());
+		assertTrue(wrapper.getHeaderNames().hasMoreElements());
+		assertEquals("header", wrapper.getHeaderNames().nextElement());
+	}
 
-    @Test
-    /* SEC-830. Assume we have a request to /someUrl?action=foo (the saved request)
-     * and then RequestDispatcher.forward() it to /someUrl?action=bar.
-     * What should action parameter be before and during the forward?
-     **/
-    public void wrappedRequestParameterTakesPrecedenceOverSavedRequest() {
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.setParameter("action", "foo");
-        MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
-        assertEquals("foo", wrapper.getParameter("action"));
-        // The request after forward
-        wrappedRequest.setParameter("action", "bar");
-        assertEquals("bar", wrapper.getParameter("action"));
-        // Both values should be set, but "bar" should be first
-        assertEquals(2, wrapper.getParameterValues("action").length);
-        assertEquals("bar", wrapper.getParameterValues("action")[0]);
-    }
+	@Test
+	/*
+	 * SEC-830. Assume we have a request to /someUrl?action=foo (the saved request) and
+	 * then RequestDispatcher.forward() it to /someUrl?action=bar. What should action
+	 * parameter be before and during the forward?
+	 */
+	public void wrappedRequestParameterTakesPrecedenceOverSavedRequest() {
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.setParameter("action", "foo");
+		MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
+		assertEquals("foo", wrapper.getParameter("action"));
+		// The request after forward
+		wrappedRequest.setParameter("action", "bar");
+		assertEquals("bar", wrapper.getParameter("action"));
+		// Both values should be set, but "bar" should be first
+		assertEquals(2, wrapper.getParameterValues("action").length);
+		assertEquals("bar", wrapper.getParameterValues("action")[0]);
+	}
 
-    @Test
-    public void savedRequestDoesntCreateDuplicateParams() {
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.setParameter("action", "foo");
-        MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
-        wrappedRequest.setParameter("action", "foo");
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
-        assertEquals(1, wrapper.getParameterValues("action").length);
-        assertEquals(1, wrapper.getParameterMap().size());
-        assertEquals(1, ((String[])wrapper.getParameterMap().get("action")).length);
-    }
+	@Test
+	public void savedRequestDoesntCreateDuplicateParams() {
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.setParameter("action", "foo");
+		MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
+		wrappedRequest.setParameter("action", "foo");
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
+		assertEquals(1, wrapper.getParameterValues("action").length);
+		assertEquals(1, wrapper.getParameterMap().size());
+		assertEquals(1, ((String[]) wrapper.getParameterMap().get("action")).length);
+	}
 
-    @Test
-    public void savedRequestHeadersTakePrecedence() {
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.addHeader("Authorization","foo");
-        MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
-        wrappedRequest.addHeader("Authorization","bar");
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
-        assertEquals("foo", wrapper.getHeader("Authorization"));
-    }
+	@Test
+	public void savedRequestHeadersTakePrecedence() {
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.addHeader("Authorization", "foo");
+		MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
+		wrappedRequest.addHeader("Authorization", "bar");
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
+		assertEquals("foo", wrapper.getHeader("Authorization"));
+	}
 
-    @Test
-    public void getParameterValuesReturnsNullIfParameterIsntSet() {
-        SavedRequestAwareWrapper wrapper = createWrapper(new MockHttpServletRequest(), new MockHttpServletRequest());
-        assertNull(wrapper.getParameterValues("action"));
-        assertNull(wrapper.getParameterMap().get("action"));
-    }
+	@Test
+	public void getParameterValuesReturnsNullIfParameterIsntSet() {
+		SavedRequestAwareWrapper wrapper = createWrapper(new MockHttpServletRequest(),
+				new MockHttpServletRequest());
+		assertNull(wrapper.getParameterValues("action"));
+		assertNull(wrapper.getParameterMap().get("action"));
+	}
 
-    @Test
-    public void getParameterValuesReturnsCombinedSavedAndWrappedRequestValues() {
-        MockHttpServletRequest savedRequest = new MockHttpServletRequest();
-        savedRequest.setParameter("action", "foo");
-        MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
-        SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
+	@Test
+	public void getParameterValuesReturnsCombinedSavedAndWrappedRequestValues() {
+		MockHttpServletRequest savedRequest = new MockHttpServletRequest();
+		savedRequest.setParameter("action", "foo");
+		MockHttpServletRequest wrappedRequest = new MockHttpServletRequest();
+		SavedRequestAwareWrapper wrapper = createWrapper(savedRequest, wrappedRequest);
 
-        assertArrayEquals(new Object[] {"foo"}, wrapper.getParameterValues("action"));
-        wrappedRequest.setParameter("action", "bar");
-        assertArrayEquals(new Object[] {"bar","foo"}, wrapper.getParameterValues("action"));
-        // Check map is consistent
-        String[] valuesFromMap = (String[]) wrapper.getParameterMap().get("action");
-        assertEquals(2, valuesFromMap.length);
-        assertEquals("bar", valuesFromMap[0]);
-    }
+		assertArrayEquals(new Object[] { "foo" }, wrapper.getParameterValues("action"));
+		wrappedRequest.setParameter("action", "bar");
+		assertArrayEquals(new Object[] { "bar", "foo" },
+				wrapper.getParameterValues("action"));
+		// Check map is consistent
+		String[] valuesFromMap = (String[]) wrapper.getParameterMap().get("action");
+		assertEquals(2, valuesFromMap.length);
+		assertEquals("bar", valuesFromMap[0]);
+	}
 
-    @Test
-    public void expecteDateHeaderIsReturnedFromSavedRequest() throws Exception {
-        SimpleDateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
-        String nowString = FastHttpDateFormat.getCurrentDate();
-        Date now = formatter.parse(nowString);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("header", nowString);
-        SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest());
-        assertEquals(now.getTime(), wrapper.getDateHeader("header"));
+	@Test
+	public void expecteDateHeaderIsReturnedFromSavedRequest() throws Exception {
+		SimpleDateFormat formatter = new SimpleDateFormat(
+				"EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US);
+		String nowString = FastHttpDateFormat.getCurrentDate();
+		Date now = formatter.parse(nowString);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("header", nowString);
+		SavedRequestAwareWrapper wrapper = createWrapper(request,
+				new MockHttpServletRequest());
+		assertEquals(now.getTime(), wrapper.getDateHeader("header"));
 
-        assertEquals(-1L, wrapper.getDateHeader("nonexistent"));
-    }
+		assertEquals(-1L, wrapper.getDateHeader("nonexistent"));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void invalidDateHeaderIsRejected() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("header", "notadate");
-        SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest());
-        wrapper.getDateHeader("header");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidDateHeaderIsRejected() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("header", "notadate");
+		SavedRequestAwareWrapper wrapper = createWrapper(request,
+				new MockHttpServletRequest());
+		wrapper.getDateHeader("header");
+	}
 
-    @Test
-    public void correctHttpMethodIsReturned() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/notused");
-        SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest("GET", "/notused"));
-        assertEquals("PUT", wrapper.getMethod());
-    }
+	@Test
+	public void correctHttpMethodIsReturned() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest("PUT", "/notused");
+		SavedRequestAwareWrapper wrapper = createWrapper(request,
+				new MockHttpServletRequest("GET", "/notused"));
+		assertEquals("PUT", wrapper.getMethod());
+	}
 
-    @Test
-    public void correctIntHeaderIsReturned() throws Exception {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("header", "999");
-        request.addHeader("header", "1000");
-        SavedRequestAwareWrapper wrapper = createWrapper(request, new MockHttpServletRequest());
+	@Test
+	public void correctIntHeaderIsReturned() throws Exception {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("header", "999");
+		request.addHeader("header", "1000");
+		SavedRequestAwareWrapper wrapper = createWrapper(request,
+				new MockHttpServletRequest());
 
-        assertEquals(999, wrapper.getIntHeader("header"));
-        assertEquals(-1, wrapper.getIntHeader("nonexistent"));
-    }
+		assertEquals(999, wrapper.getIntHeader("header"));
+		assertEquals(-1, wrapper.getIntHeader("nonexistent"));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java
index 98062e5998..4b86e200eb 100644
--- a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java
+++ b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java
@@ -34,99 +34,105 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
  *
  */
 public class CsrfRequestDataValueProcessorTests {
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    private CsrfRequestDataValueProcessor processor;
+	private CsrfRequestDataValueProcessor processor;
 
-    private CsrfToken token;
-    private Map<String,String> expected = new HashMap<String,String>();
+	private CsrfToken token;
+	private Map<String, String> expected = new HashMap<String, String>();
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-        processor = new CsrfRequestDataValueProcessor();
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+		processor = new CsrfRequestDataValueProcessor();
 
-        token = new DefaultCsrfToken("1", "a", "b");
-        request.setAttribute(CsrfToken.class.getName(), token);
+		token = new DefaultCsrfToken("1", "a", "b");
+		request.setAttribute(CsrfToken.class.getName(), token);
 
-        expected.put(token.getParameterName(),token.getToken());
-    }
+		expected.put(token.getParameterName(), token.getToken());
+	}
 
-    @Test
-    public void assertAllMethodsDeclared() {
-        Method[] expectedMethods = ReflectionUtils.getAllDeclaredMethods(RequestDataValueProcessor.class);
-        for(Method expected : expectedMethods) {
-            assertThat(ReflectionUtils.findMethod(CsrfRequestDataValueProcessor.class, expected.getName(), expected.getParameterTypes())).as("Expected to find "+ expected+ " defined on "+CsrfRequestDataValueProcessor.class).isNotNull();
-        }
-    }
+	@Test
+	public void assertAllMethodsDeclared() {
+		Method[] expectedMethods = ReflectionUtils
+				.getAllDeclaredMethods(RequestDataValueProcessor.class);
+		for (Method expected : expectedMethods) {
+			assertThat(
+					ReflectionUtils.findMethod(CsrfRequestDataValueProcessor.class,
+							expected.getName(), expected.getParameterTypes())).as(
+					"Expected to find " + expected + " defined on "
+							+ CsrfRequestDataValueProcessor.class).isNotNull();
+		}
+	}
 
-    @Test
-    public void getExtraHiddenFieldsNoCsrfToken() {
-        request = new MockHttpServletRequest();
-        assertThat(processor.getExtraHiddenFields(request)).isEmpty();
-    }
+	@Test
+	public void getExtraHiddenFieldsNoCsrfToken() {
+		request = new MockHttpServletRequest();
+		assertThat(processor.getExtraHiddenFields(request)).isEmpty();
+	}
 
-    @Test
-    public void getExtraHiddenFieldsHasCsrfTokenNoMethodSet() {
-        assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
-    }
+	@Test
+	public void getExtraHiddenFieldsHasCsrfTokenNoMethodSet() {
+		assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
+	}
 
-    @Test
-    public void getExtraHiddenFieldsHasCsrfToken_GET() {
-        processor.processAction(request, "action", "GET");
-        assertThat(processor.getExtraHiddenFields(request)).isEmpty();
-    }
+	@Test
+	public void getExtraHiddenFieldsHasCsrfToken_GET() {
+		processor.processAction(request, "action", "GET");
+		assertThat(processor.getExtraHiddenFields(request)).isEmpty();
+	}
 
-    @Test
-    public void getExtraHiddenFieldsHasCsrfToken_get() {
-        processor.processAction(request, "action", "get");
-        assertThat(processor.getExtraHiddenFields(request)).isEmpty();
-    }
+	@Test
+	public void getExtraHiddenFieldsHasCsrfToken_get() {
+		processor.processAction(request, "action", "get");
+		assertThat(processor.getExtraHiddenFields(request)).isEmpty();
+	}
 
-    @Test
-    public void getExtraHiddenFieldsHasCsrfToken_POST() {
-        processor.processAction(request, "action", "POST");
-        assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
-    }
+	@Test
+	public void getExtraHiddenFieldsHasCsrfToken_POST() {
+		processor.processAction(request, "action", "POST");
+		assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
+	}
 
-    @Test
-    public void getExtraHiddenFieldsHasCsrfToken_post() {
-        processor.processAction(request, "action", "post");
-        assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
-    }
+	@Test
+	public void getExtraHiddenFieldsHasCsrfToken_post() {
+		processor.processAction(request, "action", "post");
+		assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
+	}
 
-    @Test
-    public void processAction() {
-        String action = "action";
-        assertThat(processor.processAction(request, action)).isEqualTo(action);
-    }
+	@Test
+	public void processAction() {
+		String action = "action";
+		assertThat(processor.processAction(request, action)).isEqualTo(action);
+	}
 
-    @Test
-    public void processActionWithMethodArg() {
-        String action = "action";
-        assertThat(processor.processAction(request, action, null)).isEqualTo(action);
-    }
+	@Test
+	public void processActionWithMethodArg() {
+		String action = "action";
+		assertThat(processor.processAction(request, action, null)).isEqualTo(action);
+	}
 
-    @Test
-    public void processFormFieldValue() {
-        String value = "action";
-        assertThat(processor.processFormFieldValue(request, "name", value, "hidden")).isEqualTo(value);
-    }
+	@Test
+	public void processFormFieldValue() {
+		String value = "action";
+		assertThat(processor.processFormFieldValue(request, "name", value, "hidden"))
+				.isEqualTo(value);
+	}
 
-    @Test
-    public void processUrl() {
-        String url = "url";
-        assertThat(processor.processUrl(request, url)).isEqualTo(url);
-    }
+	@Test
+	public void processUrl() {
+		String url = "url";
+		assertThat(processor.processUrl(request, url)).isEqualTo(url);
+	}
 
-    @Test
-    public void createGetExtraHiddenFieldsHasCsrfToken() {
-        CsrfToken token = new DefaultCsrfToken("1", "a", "b");
-        request.setAttribute(CsrfToken.class.getName(), token);
-        Map<String,String> expected = new HashMap<String,String>();
-        expected.put(token.getParameterName(),token.getToken());
+	@Test
+	public void createGetExtraHiddenFieldsHasCsrfToken() {
+		CsrfToken token = new DefaultCsrfToken("1", "a", "b");
+		request.setAttribute(CsrfToken.class.getName(), token);
+		Map<String, String> expected = new HashMap<String, String>();
+		expected.put(token.getParameterName(), token.getToken());
 
-        RequestDataValueProcessor processor = new CsrfRequestDataValueProcessor();
-        assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
-    }
+		RequestDataValueProcessor processor = new CsrfRequestDataValueProcessor();
+		assertThat(processor.getExtraHiddenFields(request)).isEqualTo(expected);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java
index cf0a51bd5f..9237c9db85 100644
--- a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilterTests.java
@@ -63,7 +63,6 @@ import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.util.ClassUtils;
 
-
 /**
  * Tests {@link SecurityContextHolderAwareRequestFilter}.
  *
@@ -73,268 +72,318 @@ import org.springframework.util.ClassUtils;
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(ClassUtils.class)
 public class SecurityContextHolderAwareRequestFilterTests {
-    @Captor
-    private ArgumentCaptor<HttpServletRequest> requestCaptor;
-    @Mock
-    private AuthenticationManager authenticationManager;
-    @Mock
-    private AuthenticationEntryPoint authenticationEntryPoint;
-    @Mock
-    private LogoutHandler logoutHandler;
-    @Mock
-    private FilterChain filterChain;
-    @Mock
-    private HttpServletRequest request;
-    @Mock
-    private HttpServletResponse response;
+	@Captor
+	private ArgumentCaptor<HttpServletRequest> requestCaptor;
+	@Mock
+	private AuthenticationManager authenticationManager;
+	@Mock
+	private AuthenticationEntryPoint authenticationEntryPoint;
+	@Mock
+	private LogoutHandler logoutHandler;
+	@Mock
+	private FilterChain filterChain;
+	@Mock
+	private HttpServletRequest request;
+	@Mock
+	private HttpServletResponse response;
 
-    private List<LogoutHandler> logoutHandlers;
+	private List<LogoutHandler> logoutHandlers;
 
-    private SecurityContextHolderAwareRequestFilter filter;
+	private SecurityContextHolderAwareRequestFilter filter;
 
-    @Before
-    public void setUp() throws Exception {
-        logoutHandlers = Arrays.asList(logoutHandler);
-        filter = new SecurityContextHolderAwareRequestFilter();
-        filter.setAuthenticationEntryPoint(authenticationEntryPoint);
-        filter.setAuthenticationManager(authenticationManager);
-        filter.setLogoutHandlers(logoutHandlers);
-        filter.afterPropertiesSet();
-    }
+	@Before
+	public void setUp() throws Exception {
+		logoutHandlers = Arrays.asList(logoutHandler);
+		filter = new SecurityContextHolderAwareRequestFilter();
+		filter.setAuthenticationEntryPoint(authenticationEntryPoint);
+		filter.setAuthenticationManager(authenticationManager);
+		filter.setLogoutHandlers(logoutHandlers);
+		filter.afterPropertiesSet();
+	}
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    @Test
-    public void expectedRequestWrapperClassIsUsed() throws Exception {
-        filter.setRolePrefix("ROLE_");
+	@Test
+	public void expectedRequestWrapperClassIsUsed() throws Exception {
+		filter.setRolePrefix("ROLE_");
 
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), filterChain);
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				filterChain);
 
-        // Now re-execute the filter, ensuring our replacement wrapper is still used
-        filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(), filterChain);
+		// Now re-execute the filter, ensuring our replacement wrapper is still used
+		filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
+				filterChain);
 
-        verify(filterChain, times(2)).doFilter(any(SecurityContextHolderAwareRequestWrapper.class), any(HttpServletResponse.class));
+		verify(filterChain, times(2)).doFilter(
+				any(SecurityContextHolderAwareRequestWrapper.class),
+				any(HttpServletResponse.class));
 
-        filter.destroy();
-    }
+		filter.destroy();
+	}
 
-    @Test
-    public void authenticateFalse() throws Exception {
-        assertThat(wrappedRequest().authenticate(response)).isFalse();
-        verify(authenticationEntryPoint).commence(eq(requestCaptor.getValue()), eq(response), any(AuthenticationException.class));
-        verifyZeroInteractions(authenticationManager, logoutHandler);
-        verify(request, times(0)).authenticate(any(HttpServletResponse.class));
-    }
+	@Test
+	public void authenticateFalse() throws Exception {
+		assertThat(wrappedRequest().authenticate(response)).isFalse();
+		verify(authenticationEntryPoint).commence(eq(requestCaptor.getValue()),
+				eq(response), any(AuthenticationException.class));
+		verifyZeroInteractions(authenticationManager, logoutHandler);
+		verify(request, times(0)).authenticate(any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void authenticateTrue() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("test","password","ROLE_USER"));
+	@Test
+	public void authenticateTrue() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("test", "password", "ROLE_USER"));
 
-        assertThat(wrappedRequest().authenticate(response)).isTrue();
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-        verify(request, times(0)).authenticate(any(HttpServletResponse.class));
-    }
+		assertThat(wrappedRequest().authenticate(response)).isTrue();
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+		verify(request, times(0)).authenticate(any(HttpServletResponse.class));
+	}
 
-    @Test
-    public void authenticateNullEntryPointFalse() throws Exception {
-        filter.setAuthenticationEntryPoint(null);
-        filter.afterPropertiesSet();
+	@Test
+	public void authenticateNullEntryPointFalse() throws Exception {
+		filter.setAuthenticationEntryPoint(null);
+		filter.afterPropertiesSet();
 
-        assertThat(wrappedRequest().authenticate(response)).isFalse();
-        verify(request).authenticate(response);
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-    }
+		assertThat(wrappedRequest().authenticate(response)).isFalse();
+		verify(request).authenticate(response);
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+	}
 
-    @Test
-    public void authenticateNullEntryPointTrue() throws Exception {
-        when(request.authenticate(response)).thenReturn(true);
-        filter.setAuthenticationEntryPoint(null);
-        filter.afterPropertiesSet();
+	@Test
+	public void authenticateNullEntryPointTrue() throws Exception {
+		when(request.authenticate(response)).thenReturn(true);
+		filter.setAuthenticationEntryPoint(null);
+		filter.afterPropertiesSet();
 
-        assertThat(wrappedRequest().authenticate(response)).isTrue();
-        verify(request).authenticate(response);
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-    }
+		assertThat(wrappedRequest().authenticate(response)).isTrue();
+		verify(request).authenticate(response);
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+	}
 
-    @Test
-    public void login() throws Exception {
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        when(authenticationManager.authenticate(any(UsernamePasswordAuthenticationToken.class))).thenReturn(expectedAuth);
+	@Test
+	public void login() throws Exception {
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		when(
+				authenticationManager
+						.authenticate(any(UsernamePasswordAuthenticationToken.class)))
+				.thenReturn(expectedAuth);
 
-        wrappedRequest().login(expectedAuth.getName(),String.valueOf(expectedAuth.getCredentials()));
+		wrappedRequest().login(expectedAuth.getName(),
+				String.valueOf(expectedAuth.getCredentials()));
 
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(expectedAuth);
-        verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
-        verify(request, times(0)).login(anyString(),anyString());
-    }
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+				expectedAuth);
+		verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
+		verify(request, times(0)).login(anyString(), anyString());
+	}
 
-    // SEC-2296
-    @Test
-    public void loginWithExstingUser() throws Exception {
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        when(authenticationManager.authenticate(any(UsernamePasswordAuthenticationToken.class))).thenReturn(new TestingAuthenticationToken("newuser","not be found","ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(expectedAuth);
+	// SEC-2296
+	@Test
+	public void loginWithExstingUser() throws Exception {
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		when(
+				authenticationManager
+						.authenticate(any(UsernamePasswordAuthenticationToken.class)))
+				.thenReturn(
+						new TestingAuthenticationToken("newuser", "not be found",
+								"ROLE_USER"));
+		SecurityContextHolder.getContext().setAuthentication(expectedAuth);
 
-        try {
-            wrappedRequest().login(expectedAuth.getName(),String.valueOf(expectedAuth.getCredentials()));
-            fail("Expected Exception");
-        } catch(ServletException success) {
-            assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(expectedAuth);
-            verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
-            verify(request, times(0)).login(anyString(),anyString());
-        }
-    }
+		try {
+			wrappedRequest().login(expectedAuth.getName(),
+					String.valueOf(expectedAuth.getCredentials()));
+			fail("Expected Exception");
+		}
+		catch (ServletException success) {
+			assertThat(SecurityContextHolder.getContext().getAuthentication()).isSameAs(
+					expectedAuth);
+			verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
+			verify(request, times(0)).login(anyString(), anyString());
+		}
+	}
 
-    @Test
-    public void loginFail() throws Exception {
-        AuthenticationException authException = new BadCredentialsException("Invalid");
-        when(authenticationManager.authenticate(any(UsernamePasswordAuthenticationToken.class))).thenThrow(authException);
+	@Test
+	public void loginFail() throws Exception {
+		AuthenticationException authException = new BadCredentialsException("Invalid");
+		when(
+				authenticationManager
+						.authenticate(any(UsernamePasswordAuthenticationToken.class)))
+				.thenThrow(authException);
 
-        try {
-            wrappedRequest().login("invalid","credentials");
-            Assert.fail("Expected Exception");
-        } catch(ServletException success) {
-            assertThat(success.getCause()).isEqualTo(authException);
-        }
-        assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
+		try {
+			wrappedRequest().login("invalid", "credentials");
+			Assert.fail("Expected Exception");
+		}
+		catch (ServletException success) {
+			assertThat(success.getCause()).isEqualTo(authException);
+		}
+		assertThat(SecurityContextHolder.getContext().getAuthentication()).isNull();
 
-        verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
-        verify(request, times(0)).login(anyString(),anyString());
-    }
+		verifyZeroInteractions(authenticationEntryPoint, logoutHandler);
+		verify(request, times(0)).login(anyString(), anyString());
+	}
 
-    @Test
-    public void loginNullAuthenticationManager() throws Exception {
-        filter.setAuthenticationManager(null);
-        filter.afterPropertiesSet();
+	@Test
+	public void loginNullAuthenticationManager() throws Exception {
+		filter.setAuthenticationManager(null);
+		filter.afterPropertiesSet();
 
-        String username = "username";
-        String password = "password";
+		String username = "username";
+		String password = "password";
 
-        wrappedRequest().login(username, password);
+		wrappedRequest().login(username, password);
 
-        verify(request).login(username, password);
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-    }
+		verify(request).login(username, password);
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+	}
 
-    @Test
-    public void loginNullAuthenticationManagerFail() throws Exception {
-        filter.setAuthenticationManager(null);
-        filter.afterPropertiesSet();
+	@Test
+	public void loginNullAuthenticationManagerFail() throws Exception {
+		filter.setAuthenticationManager(null);
+		filter.afterPropertiesSet();
 
-        String username = "username";
-        String password = "password";
-        ServletException authException = new ServletException("Failed Login");
-        doThrow(authException).when(request).login(username, password);
+		String username = "username";
+		String password = "password";
+		ServletException authException = new ServletException("Failed Login");
+		doThrow(authException).when(request).login(username, password);
 
-        try {
-            wrappedRequest().login(username, password);
-            Assert.fail("Expected Exception");
-        } catch(ServletException success) {
-            assertThat(success).isEqualTo(authException);
-        }
+		try {
+			wrappedRequest().login(username, password);
+			Assert.fail("Expected Exception");
+		}
+		catch (ServletException success) {
+			assertThat(success).isEqualTo(authException);
+		}
 
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-    }
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+	}
 
-    @Test
-    public void logout() throws Exception {
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(expectedAuth);
+	@Test
+	public void logout() throws Exception {
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(expectedAuth);
 
-        HttpServletRequest wrappedRequest = wrappedRequest();
-        wrappedRequest.logout();
+		HttpServletRequest wrappedRequest = wrappedRequest();
+		wrappedRequest.logout();
 
-        verify(logoutHandler).logout(wrappedRequest, response, expectedAuth);
-        verifyZeroInteractions(authenticationManager, logoutHandler);
-        verify(request, times(0)).logout();
-    }
+		verify(logoutHandler).logout(wrappedRequest, response, expectedAuth);
+		verifyZeroInteractions(authenticationManager, logoutHandler);
+		verify(request, times(0)).logout();
+	}
 
-    @Test
-    public void logoutNullLogoutHandler() throws Exception {
-        filter.setLogoutHandlers(null);
-        filter.afterPropertiesSet();
+	@Test
+	public void logoutNullLogoutHandler() throws Exception {
+		filter.setLogoutHandlers(null);
+		filter.afterPropertiesSet();
 
-        wrappedRequest().logout();
+		wrappedRequest().logout();
 
-        verify(request).logout();
-        verifyZeroInteractions(authenticationEntryPoint, authenticationManager, logoutHandler);
-    }
+		verify(request).logout();
+		verifyZeroInteractions(authenticationEntryPoint, authenticationManager,
+				logoutHandler);
+	}
 
-    @Test
-    public void getAsyncContextStart() throws Exception {
-        ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        context.setAuthentication(expectedAuth);
-        SecurityContextHolder.setContext(context);
-        AsyncContext asyncContext = mock(AsyncContext.class);
-        when(request.getAsyncContext()).thenReturn(asyncContext);
-        Runnable runnable = new Runnable() {
-            public void run() {}
-        };
+	@Test
+	public void getAsyncContextStart() throws Exception {
+		ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		context.setAuthentication(expectedAuth);
+		SecurityContextHolder.setContext(context);
+		AsyncContext asyncContext = mock(AsyncContext.class);
+		when(request.getAsyncContext()).thenReturn(asyncContext);
+		Runnable runnable = new Runnable() {
+			public void run() {
+			}
+		};
 
-        wrappedRequest().getAsyncContext().start(runnable);
+		wrappedRequest().getAsyncContext().start(runnable);
 
-        verifyZeroInteractions(authenticationManager, logoutHandler);
-        verify(asyncContext).start(runnableCaptor.capture());
-        DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor.getValue();
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class)).isEqualTo(context);
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class)).isEqualTo(runnable);
-    }
+		verifyZeroInteractions(authenticationManager, logoutHandler);
+		verify(asyncContext).start(runnableCaptor.capture());
+		DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor
+				.getValue();
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class))
+				.isEqualTo(context);
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class))
+				.isEqualTo(runnable);
+	}
 
-    @Test
-    public void startAsyncStart() throws Exception {
-        ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        context.setAuthentication(expectedAuth);
-        SecurityContextHolder.setContext(context);
-        AsyncContext asyncContext = mock(AsyncContext.class);
-        when(request.startAsync()).thenReturn(asyncContext);
-        Runnable runnable = new Runnable() {
-            public void run() {}
-        };
+	@Test
+	public void startAsyncStart() throws Exception {
+		ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		context.setAuthentication(expectedAuth);
+		SecurityContextHolder.setContext(context);
+		AsyncContext asyncContext = mock(AsyncContext.class);
+		when(request.startAsync()).thenReturn(asyncContext);
+		Runnable runnable = new Runnable() {
+			public void run() {
+			}
+		};
 
-        wrappedRequest().startAsync().start(runnable);
+		wrappedRequest().startAsync().start(runnable);
 
-        verifyZeroInteractions(authenticationManager, logoutHandler);
-        verify(asyncContext).start(runnableCaptor.capture());
-        DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor.getValue();
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class)).isEqualTo(context);
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class)).isEqualTo(runnable);
-    }
+		verifyZeroInteractions(authenticationManager, logoutHandler);
+		verify(asyncContext).start(runnableCaptor.capture());
+		DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor
+				.getValue();
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class))
+				.isEqualTo(context);
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class))
+				.isEqualTo(runnable);
+	}
 
-    @Test
-    public void startAsyncWithRequestResponseStart() throws Exception {
-        ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
-        SecurityContext context = SecurityContextHolder.createEmptyContext();
-        TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user", "password","ROLE_USER");
-        context.setAuthentication(expectedAuth);
-        SecurityContextHolder.setContext(context);
-        AsyncContext asyncContext = mock(AsyncContext.class);
-        when(request.startAsync(request,response)).thenReturn(asyncContext);
-        Runnable runnable = new Runnable() {
-            public void run() {}
-        };
+	@Test
+	public void startAsyncWithRequestResponseStart() throws Exception {
+		ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+		SecurityContext context = SecurityContextHolder.createEmptyContext();
+		TestingAuthenticationToken expectedAuth = new TestingAuthenticationToken("user",
+				"password", "ROLE_USER");
+		context.setAuthentication(expectedAuth);
+		SecurityContextHolder.setContext(context);
+		AsyncContext asyncContext = mock(AsyncContext.class);
+		when(request.startAsync(request, response)).thenReturn(asyncContext);
+		Runnable runnable = new Runnable() {
+			public void run() {
+			}
+		};
 
-        wrappedRequest().startAsync(request, response).start(runnable);
+		wrappedRequest().startAsync(request, response).start(runnable);
 
-        verifyZeroInteractions(authenticationManager, logoutHandler);
-        verify(asyncContext).start(runnableCaptor.capture());
-        DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor.getValue();
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class)).isEqualTo(context);
-        assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class)).isEqualTo(runnable);
-    }
+		verifyZeroInteractions(authenticationManager, logoutHandler);
+		verify(asyncContext).start(runnableCaptor.capture());
+		DelegatingSecurityContextRunnable wrappedRunnable = (DelegatingSecurityContextRunnable) runnableCaptor
+				.getValue();
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, SecurityContext.class))
+				.isEqualTo(context);
+		assertThat(WhiteboxImpl.getInternalState(wrappedRunnable, Runnable.class))
+				.isEqualTo(runnable);
+	}
 
-    private HttpServletRequest wrappedRequest() throws Exception {
-        filter.doFilter(request, response, filterChain);
-        verify(filterChain).doFilter(requestCaptor.capture(), any(HttpServletResponse.class));
+	private HttpServletRequest wrappedRequest() throws Exception {
+		filter.doFilter(request, response, filterChain);
+		verify(filterChain).doFilter(requestCaptor.capture(),
+				any(HttpServletResponse.class));
 
-        return requestCaptor.getValue();
-    }
+		return requestCaptor.getValue();
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java
index 2e082b1a5b..91f11a3629 100644
--- a/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java
+++ b/web/src/test/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestWrapperTests.java
@@ -32,79 +32,86 @@ import org.springframework.security.web.servletapi.SecurityContextHolderAwareReq
  */
 public class SecurityContextHolderAwareRequestWrapperTests extends TestCase {
 
-    protected void tearDown() throws Exception {
-        SecurityContextHolder.clearContext();
-    }
+	protected void tearDown() throws Exception {
+		SecurityContextHolder.clearContext();
+	}
 
-    public void testCorrectOperationWithStringBasedPrincipal() throws Exception {
-        Authentication auth = new TestingAuthenticationToken("rod", "koala","ROLE_FOO");
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	public void testCorrectOperationWithStringBasedPrincipal() throws Exception {
+		Authentication auth = new TestingAuthenticationToken("rod", "koala", "ROLE_FOO");
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/");
 
-        SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, "");
+		SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(
+				request, "");
 
-        assertEquals("rod", wrapper.getRemoteUser());
-        assertTrue(wrapper.isUserInRole("ROLE_FOO"));
-        assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED"));
-        assertEquals(auth, wrapper.getUserPrincipal());
-    }
+		assertEquals("rod", wrapper.getRemoteUser());
+		assertTrue(wrapper.isUserInRole("ROLE_FOO"));
+		assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED"));
+		assertEquals(auth, wrapper.getUserPrincipal());
+	}
 
-    public void testUseOfRolePrefixMeansItIsntNeededWhenCallngIsUserInRole() {
-        Authentication auth = new TestingAuthenticationToken("rod", "koala", "ROLE_FOO");
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	public void testUseOfRolePrefixMeansItIsntNeededWhenCallngIsUserInRole() {
+		Authentication auth = new TestingAuthenticationToken("rod", "koala", "ROLE_FOO");
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/");
 
-        SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, "ROLE_");
+		SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(
+				request, "ROLE_");
 
-        assertTrue(wrapper.isUserInRole("FOO"));
-    }
+		assertTrue(wrapper.isUserInRole("FOO"));
+	}
 
-    public void testCorrectOperationWithUserDetailsBasedPrincipal() throws Exception {
-        Authentication auth = new TestingAuthenticationToken(new User("rodAsUserDetails", "koala", true, true,
-                    true, true, AuthorityUtils.NO_AUTHORITIES ), "koala", "ROLE_HELLO", "ROLE_FOOBAR");
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	public void testCorrectOperationWithUserDetailsBasedPrincipal() throws Exception {
+		Authentication auth = new TestingAuthenticationToken(new User("rodAsUserDetails",
+				"koala", true, true, true, true, AuthorityUtils.NO_AUTHORITIES), "koala",
+				"ROLE_HELLO", "ROLE_FOOBAR");
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/");
 
-        SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, "");
+		SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(
+				request, "");
 
-        assertEquals("rodAsUserDetails", wrapper.getRemoteUser());
-        assertFalse(wrapper.isUserInRole("ROLE_FOO"));
-        assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED"));
-        assertTrue(wrapper.isUserInRole("ROLE_FOOBAR"));
-        assertTrue(wrapper.isUserInRole("ROLE_HELLO"));
-        assertEquals(auth, wrapper.getUserPrincipal());
-    }
+		assertEquals("rodAsUserDetails", wrapper.getRemoteUser());
+		assertFalse(wrapper.isUserInRole("ROLE_FOO"));
+		assertFalse(wrapper.isUserInRole("ROLE_NOT_GRANTED"));
+		assertTrue(wrapper.isUserInRole("ROLE_FOOBAR"));
+		assertTrue(wrapper.isUserInRole("ROLE_HELLO"));
+		assertEquals(auth, wrapper.getUserPrincipal());
+	}
 
-    public void testRoleIsntHeldIfAuthenticationIsNull() throws Exception {
-        SecurityContextHolder.getContext().setAuthentication(null);
+	public void testRoleIsntHeldIfAuthenticationIsNull() throws Exception {
+		SecurityContextHolder.getContext().setAuthentication(null);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/");
 
-        SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, "");
-        assertNull(wrapper.getRemoteUser());
-        assertFalse(wrapper.isUserInRole("ROLE_ANY"));
-        assertNull(wrapper.getUserPrincipal());
-    }
+		SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(
+				request, "");
+		assertNull(wrapper.getRemoteUser());
+		assertFalse(wrapper.isUserInRole("ROLE_ANY"));
+		assertNull(wrapper.getUserPrincipal());
+	}
 
-    public void testRolesArentHeldIfAuthenticationPrincipalIsNull() throws Exception {
-        Authentication auth = new TestingAuthenticationToken(null, "koala","ROLE_HELLO","ROLE_FOOBAR");
-        SecurityContextHolder.getContext().setAuthentication(auth);
+	public void testRolesArentHeldIfAuthenticationPrincipalIsNull() throws Exception {
+		Authentication auth = new TestingAuthenticationToken(null, "koala", "ROLE_HELLO",
+				"ROLE_FOOBAR");
+		SecurityContextHolder.getContext().setAuthentication(auth);
 
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestURI("/");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestURI("/");
 
-        SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(request, "");
+		SecurityContextHolderAwareRequestWrapper wrapper = new SecurityContextHolderAwareRequestWrapper(
+				request, "");
 
-        assertNull(wrapper.getRemoteUser());
-        assertFalse(wrapper.isUserInRole("ROLE_HELLO")); // principal is null, so reject
-        assertFalse(wrapper.isUserInRole("ROLE_FOOBAR")); // principal is null, so reject
-        assertNull(wrapper.getUserPrincipal());
-    }
+		assertNull(wrapper.getRemoteUser());
+		assertFalse(wrapper.isUserInRole("ROLE_HELLO")); // principal is null, so reject
+		assertFalse(wrapper.isUserInRole("ROLE_FOOBAR")); // principal is null, so reject
+		assertNull(wrapper.getUserPrincipal());
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java
index aaea5b0df9..07a70cd246 100644
--- a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java
+++ b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java
@@ -38,114 +38,131 @@ import org.springframework.security.web.authentication.session.SessionFixationPr
  */
 public class DefaultSessionAuthenticationStrategyTests {
 
-    @Test
-    public void newSessionShouldNotBeCreatedIfNoSessionExistsAndAlwaysCreateIsFalse() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        HttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void newSessionShouldNotBeCreatedIfNoSessionExistsAndAlwaysCreateIsFalse()
+			throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		HttpServletRequest request = new MockHttpServletRequest();
 
-        strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse());
+		strategy.onAuthentication(mock(Authentication.class), request,
+				new MockHttpServletResponse());
 
-        assertNull(request.getSession(false));
-    }
+		assertNull(request.getSession(false));
+	}
 
-    @Test
-    public void newSessionIsCreatedIfSessionAlreadyExists() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        HttpServletRequest request = new MockHttpServletRequest();
-        String sessionId = request.getSession().getId();
+	@Test
+	public void newSessionIsCreatedIfSessionAlreadyExists() throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		HttpServletRequest request = new MockHttpServletRequest();
+		String sessionId = request.getSession().getId();
 
-        strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse());
+		strategy.onAuthentication(mock(Authentication.class), request,
+				new MockHttpServletResponse());
 
-        assertFalse(sessionId.equals(request.getSession().getId()));
-    }
+		assertFalse(sessionId.equals(request.getSession().getId()));
+	}
 
-    // SEC-2002
-    @Test
-    public void newSessionIsCreatedIfSessionAlreadyExistsWithEventPublisher() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        HttpServletRequest request = new MockHttpServletRequest();
-        HttpSession session = request.getSession();
-        session.setAttribute("blah", "blah");
-        session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
-        String oldSessionId = session.getId();
+	// SEC-2002
+	@Test
+	public void newSessionIsCreatedIfSessionAlreadyExistsWithEventPublisher()
+			throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		HttpServletRequest request = new MockHttpServletRequest();
+		HttpSession session = request.getSession();
+		session.setAttribute("blah", "blah");
+		session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
+		String oldSessionId = session.getId();
 
-        ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
-        strategy.setApplicationEventPublisher(eventPublisher);
+		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
+		strategy.setApplicationEventPublisher(eventPublisher);
 
-        Authentication mockAuthentication = mock(Authentication.class);
+		Authentication mockAuthentication = mock(Authentication.class);
 
-        strategy.onAuthentication(mockAuthentication, request, new MockHttpServletResponse());
+		strategy.onAuthentication(mockAuthentication, request,
+				new MockHttpServletResponse());
 
-        ArgumentCaptor<ApplicationEvent> eventArgumentCaptor = ArgumentCaptor.forClass(ApplicationEvent.class);
-        verify(eventPublisher).publishEvent(eventArgumentCaptor.capture());
+		ArgumentCaptor<ApplicationEvent> eventArgumentCaptor = ArgumentCaptor
+				.forClass(ApplicationEvent.class);
+		verify(eventPublisher).publishEvent(eventArgumentCaptor.capture());
 
-        assertFalse(oldSessionId.equals(request.getSession().getId()));
-        assertNotNull(request.getSession().getAttribute("blah"));
-        assertNotNull(request.getSession().getAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY"));
+		assertFalse(oldSessionId.equals(request.getSession().getId()));
+		assertNotNull(request.getSession().getAttribute("blah"));
+		assertNotNull(request.getSession().getAttribute(
+				"SPRING_SECURITY_SAVED_REQUEST_KEY"));
 
-        assertNotNull(eventArgumentCaptor.getValue());
-        assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent);
-        SessionFixationProtectionEvent event = (SessionFixationProtectionEvent)eventArgumentCaptor.getValue();
-        assertEquals(oldSessionId, event.getOldSessionId());
-        assertEquals(request.getSession().getId(), event.getNewSessionId());
-        assertSame(mockAuthentication, event.getAuthentication());
-    }
+		assertNotNull(eventArgumentCaptor.getValue());
+		assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent);
+		SessionFixationProtectionEvent event = (SessionFixationProtectionEvent) eventArgumentCaptor
+				.getValue();
+		assertEquals(oldSessionId, event.getOldSessionId());
+		assertEquals(request.getSession().getId(), event.getNewSessionId());
+		assertSame(mockAuthentication, event.getAuthentication());
+	}
 
-    // See SEC-1077
-    @Test
-    public void onlySavedRequestAttributeIsMigratedIfMigrateAttributesIsFalse() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        strategy.setMigrateSessionAttributes(false);
-        HttpServletRequest request = new MockHttpServletRequest();
-        HttpSession session = request.getSession();
-        session.setAttribute("blah", "blah");
-        session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
+	// See SEC-1077
+	@Test
+	public void onlySavedRequestAttributeIsMigratedIfMigrateAttributesIsFalse()
+			throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		strategy.setMigrateSessionAttributes(false);
+		HttpServletRequest request = new MockHttpServletRequest();
+		HttpSession session = request.getSession();
+		session.setAttribute("blah", "blah");
+		session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
 
-        strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse());
+		strategy.onAuthentication(mock(Authentication.class), request,
+				new MockHttpServletResponse());
 
-        assertNull(request.getSession().getAttribute("blah"));
-        assertNotNull(request.getSession().getAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY"));
-    }
+		assertNull(request.getSession().getAttribute("blah"));
+		assertNotNull(request.getSession().getAttribute(
+				"SPRING_SECURITY_SAVED_REQUEST_KEY"));
+	}
 
-    // SEC-2002
-    @Test
-    public void onlySavedRequestAttributeIsMigratedIfMigrateAttributesIsFalseWithEventPublisher() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        strategy.setMigrateSessionAttributes(false);
-        HttpServletRequest request = new MockHttpServletRequest();
-        HttpSession session = request.getSession();
-        session.setAttribute("blah", "blah");
-        session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
-        String oldSessionId = session.getId();
+	// SEC-2002
+	@Test
+	public void onlySavedRequestAttributeIsMigratedIfMigrateAttributesIsFalseWithEventPublisher()
+			throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		strategy.setMigrateSessionAttributes(false);
+		HttpServletRequest request = new MockHttpServletRequest();
+		HttpSession session = request.getSession();
+		session.setAttribute("blah", "blah");
+		session.setAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY", "DefaultSavedRequest");
+		String oldSessionId = session.getId();
 
-        ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
-        strategy.setApplicationEventPublisher(eventPublisher);
+		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
+		strategy.setApplicationEventPublisher(eventPublisher);
 
-        Authentication mockAuthentication = mock(Authentication.class);
+		Authentication mockAuthentication = mock(Authentication.class);
 
-        strategy.onAuthentication(mockAuthentication, request, new MockHttpServletResponse());
+		strategy.onAuthentication(mockAuthentication, request,
+				new MockHttpServletResponse());
 
-        ArgumentCaptor<ApplicationEvent> eventArgumentCaptor = ArgumentCaptor.forClass(ApplicationEvent.class);
-        verify(eventPublisher).publishEvent(eventArgumentCaptor.capture());
+		ArgumentCaptor<ApplicationEvent> eventArgumentCaptor = ArgumentCaptor
+				.forClass(ApplicationEvent.class);
+		verify(eventPublisher).publishEvent(eventArgumentCaptor.capture());
 
-        assertNull(request.getSession().getAttribute("blah"));
-        assertNotNull(request.getSession().getAttribute("SPRING_SECURITY_SAVED_REQUEST_KEY"));
+		assertNull(request.getSession().getAttribute("blah"));
+		assertNotNull(request.getSession().getAttribute(
+				"SPRING_SECURITY_SAVED_REQUEST_KEY"));
 
-        assertNotNull(eventArgumentCaptor.getValue());
-        assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent);
-        SessionFixationProtectionEvent event = (SessionFixationProtectionEvent)eventArgumentCaptor.getValue();
-        assertEquals(oldSessionId, event.getOldSessionId());
-        assertEquals(request.getSession().getId(), event.getNewSessionId());
-        assertSame(mockAuthentication, event.getAuthentication());
-    }
+		assertNotNull(eventArgumentCaptor.getValue());
+		assertTrue(eventArgumentCaptor.getValue() instanceof SessionFixationProtectionEvent);
+		SessionFixationProtectionEvent event = (SessionFixationProtectionEvent) eventArgumentCaptor
+				.getValue();
+		assertEquals(oldSessionId, event.getOldSessionId());
+		assertEquals(request.getSession().getId(), event.getNewSessionId());
+		assertSame(mockAuthentication, event.getAuthentication());
+	}
 
-    @Test
-    public void sessionIsCreatedIfAlwaysCreateTrue() throws Exception {
-        SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
-        strategy.setAlwaysCreateSession(true);
-        HttpServletRequest request = new MockHttpServletRequest();
-        strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse());
-        assertNotNull(request.getSession(false));
-    }
+	@Test
+	public void sessionIsCreatedIfAlwaysCreateTrue() throws Exception {
+		SessionFixationProtectionStrategy strategy = new SessionFixationProtectionStrategy();
+		strategy.setAlwaysCreateSession(true);
+		HttpServletRequest request = new MockHttpServletRequest();
+		strategy.onAuthentication(mock(Authentication.class), request,
+				new MockHttpServletResponse());
+		assertNotNull(request.getSession(false));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java
index 0e9d984ef0..2011335e3c 100644
--- a/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java
+++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionDestroyedEventTests.java
@@ -18,38 +18,38 @@ import org.springframework.security.core.context.SecurityContextImpl;
  *
  */
 public class HttpSessionDestroyedEventTests {
-    private MockHttpSession session;
-    private HttpSessionDestroyedEvent destroyedEvent;
+	private MockHttpSession session;
+	private HttpSessionDestroyedEvent destroyedEvent;
 
-    @Before
-    public void setUp() {
-        session = new MockHttpSession();
-        session.setAttribute("notcontext", "notcontext");
-        session.setAttribute("null", null);
-        session.setAttribute("context", new SecurityContextImpl());
-        destroyedEvent = new HttpSessionDestroyedEvent(session);
-    }
+	@Before
+	public void setUp() {
+		session = new MockHttpSession();
+		session.setAttribute("notcontext", "notcontext");
+		session.setAttribute("null", null);
+		session.setAttribute("context", new SecurityContextImpl());
+		destroyedEvent = new HttpSessionDestroyedEvent(session);
+	}
 
-    // SEC-1870
-    @Test
-    public void getSecurityContexts() {
-        List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
-        assertEquals(1,securityContexts.size());
-        assertSame(session.getAttribute("context"), securityContexts.get(0));
-    }
+	// SEC-1870
+	@Test
+	public void getSecurityContexts() {
+		List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
+		assertEquals(1, securityContexts.size());
+		assertSame(session.getAttribute("context"), securityContexts.get(0));
+	}
 
-    @Test
-    public void getSecurityContextsMulti() {
-        session.setAttribute("another", new SecurityContextImpl());
-        List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
-        assertEquals(2,securityContexts.size());
-    }
+	@Test
+	public void getSecurityContextsMulti() {
+		session.setAttribute("another", new SecurityContextImpl());
+		List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
+		assertEquals(2, securityContexts.size());
+	}
 
-    @Test
-    public void getSecurityContextsDiffImpl() {
-        session.setAttribute("context", mock(SecurityContext.class));
-        List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
-        assertEquals(1,securityContexts.size());
-        assertSame(session.getAttribute("context"), securityContexts.get(0));
-    }
+	@Test
+	public void getSecurityContextsDiffImpl() {
+		session.setAttribute("context", mock(SecurityContext.class));
+		List<SecurityContext> securityContexts = destroyedEvent.getSecurityContexts();
+		assertEquals(1, securityContexts.size());
+		assertSame(session.getAttribute("context"), securityContexts.get(0));
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java
index 2509473096..c5e2c43f4c 100644
--- a/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java
+++ b/web/src/test/java/org/springframework/security/web/session/HttpSessionEventPublisherTests.java
@@ -25,70 +25,73 @@ import org.springframework.mock.web.MockServletContext;
 import org.springframework.security.web.session.HttpSessionEventPublisher;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 
-
 /**
  * The HttpSessionEventPublisher tests
  *
  * @author Ray Krueger
  */
 public class HttpSessionEventPublisherTests {
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    /**
-     * It's not that complicated so we'll just run it straight through here.
-     */
-    @Test
-    public void publishedEventIsReceivedbyListener() {
-        HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
+	/**
+	 * It's not that complicated so we'll just run it straight through here.
+	 */
+	@Test
+	public void publishedEventIsReceivedbyListener() {
+		HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
 
-        StaticWebApplicationContext context = new StaticWebApplicationContext();
+		StaticWebApplicationContext context = new StaticWebApplicationContext();
 
-        MockServletContext servletContext = new MockServletContext();
-        servletContext.setAttribute(StaticWebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, context);
+		MockServletContext servletContext = new MockServletContext();
+		servletContext.setAttribute(
+				StaticWebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
+				context);
 
-        context.setServletContext(servletContext);
-        context.registerSingleton("listener", MockApplicationListener.class, null);
-        context.refresh();
+		context.setServletContext(servletContext);
+		context.registerSingleton("listener", MockApplicationListener.class, null);
+		context.refresh();
 
-        MockHttpSession session = new MockHttpSession(servletContext);
-        MockApplicationListener listener = (MockApplicationListener) context.getBean("listener");
+		MockHttpSession session = new MockHttpSession(servletContext);
+		MockApplicationListener listener = (MockApplicationListener) context
+				.getBean("listener");
 
-        HttpSessionEvent event = new HttpSessionEvent(session);
+		HttpSessionEvent event = new HttpSessionEvent(session);
 
-        publisher.sessionCreated(event);
+		publisher.sessionCreated(event);
 
-        assertNotNull(listener.getCreatedEvent());
-        assertNull(listener.getDestroyedEvent());
-        assertEquals(session, listener.getCreatedEvent().getSession());
+		assertNotNull(listener.getCreatedEvent());
+		assertNull(listener.getDestroyedEvent());
+		assertEquals(session, listener.getCreatedEvent().getSession());
 
-        listener.setCreatedEvent(null);
-        listener.setDestroyedEvent(null);
+		listener.setCreatedEvent(null);
+		listener.setDestroyedEvent(null);
 
-        publisher.sessionDestroyed(event);
-        assertNotNull(listener.getDestroyedEvent());
-        assertNull(listener.getCreatedEvent());
-        assertEquals(session, listener.getDestroyedEvent().getSession());
-    }
+		publisher.sessionDestroyed(event);
+		assertNotNull(listener.getDestroyedEvent());
+		assertNull(listener.getCreatedEvent());
+		assertEquals(session, listener.getDestroyedEvent().getSession());
+	}
 
-    // SEC-2599
-    @Test(expected=IllegalStateException.class)
-    public void sessionCreatedNullApplicationContext() {
-        HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
-        MockServletContext servletContext = new MockServletContext();
-        MockHttpSession session = new MockHttpSession(servletContext);
-        HttpSessionEvent event = new HttpSessionEvent(session);
+	// SEC-2599
+	@Test(expected = IllegalStateException.class)
+	public void sessionCreatedNullApplicationContext() {
+		HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
+		MockServletContext servletContext = new MockServletContext();
+		MockHttpSession session = new MockHttpSession(servletContext);
+		HttpSessionEvent event = new HttpSessionEvent(session);
 
-        publisher.sessionCreated(event);
-    }
+		publisher.sessionCreated(event);
+	}
 
-    // SEC-2599
-    @Test(expected=IllegalStateException.class)
-    public void sessionDestroyedNullApplicationContext() {
-        HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
-        MockServletContext servletContext = new MockServletContext();
-        MockHttpSession session = new MockHttpSession(servletContext);
-        HttpSessionEvent event = new HttpSessionEvent(session);
+	// SEC-2599
+	@Test(expected = IllegalStateException.class)
+	public void sessionDestroyedNullApplicationContext() {
+		HttpSessionEventPublisher publisher = new HttpSessionEventPublisher();
+		MockServletContext servletContext = new MockServletContext();
+		MockHttpSession session = new MockHttpSession(servletContext);
+		HttpSessionEvent event = new HttpSessionEvent(session);
 
-        publisher.sessionDestroyed(event);
-    }
+		publisher.sessionDestroyed(event);
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java
index b674212c42..f552757149 100644
--- a/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java
+++ b/web/src/test/java/org/springframework/security/web/session/MockApplicationListener.java
@@ -20,41 +20,43 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.security.web.session.HttpSessionCreatedEvent;
 import org.springframework.security.web.session.HttpSessionDestroyedEvent;
 
-
 /**
  * Listener for tests
  *
  * @author Ray Krueger
  */
 public class MockApplicationListener implements ApplicationListener<ApplicationEvent> {
-    //~ Instance fields ================================================================================================
+	// ~ Instance fields
+	// ================================================================================================
 
-    private HttpSessionCreatedEvent createdEvent;
-    private HttpSessionDestroyedEvent destroyedEvent;
+	private HttpSessionCreatedEvent createdEvent;
+	private HttpSessionDestroyedEvent destroyedEvent;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
-    public HttpSessionCreatedEvent getCreatedEvent() {
-        return createdEvent;
-    }
+	public HttpSessionCreatedEvent getCreatedEvent() {
+		return createdEvent;
+	}
 
-    public HttpSessionDestroyedEvent getDestroyedEvent() {
-        return destroyedEvent;
-    }
+	public HttpSessionDestroyedEvent getDestroyedEvent() {
+		return destroyedEvent;
+	}
 
-    public void onApplicationEvent(ApplicationEvent event) {
-        if (event instanceof HttpSessionCreatedEvent) {
-            createdEvent = (HttpSessionCreatedEvent) event;
-        } else if (event instanceof HttpSessionDestroyedEvent) {
-            destroyedEvent = (HttpSessionDestroyedEvent) event;
-        }
-    }
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event instanceof HttpSessionCreatedEvent) {
+			createdEvent = (HttpSessionCreatedEvent) event;
+		}
+		else if (event instanceof HttpSessionDestroyedEvent) {
+			destroyedEvent = (HttpSessionDestroyedEvent) event;
+		}
+	}
 
-    public void setCreatedEvent(HttpSessionCreatedEvent createdEvent) {
-        this.createdEvent = createdEvent;
-    }
+	public void setCreatedEvent(HttpSessionCreatedEvent createdEvent) {
+		this.createdEvent = createdEvent;
+	}
 
-    public void setDestroyedEvent(HttpSessionDestroyedEvent destroyedEvent) {
-        this.destroyedEvent = destroyedEvent;
-    }
+	public void setDestroyedEvent(HttpSessionDestroyedEvent destroyedEvent) {
+		this.destroyedEvent = destroyedEvent;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java b/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java
index e52032430d..69d909b5a5 100644
--- a/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java
+++ b/web/src/test/java/org/springframework/security/web/session/SessionManagementFilterTests.java
@@ -43,139 +43,147 @@ import org.springframework.security.web.context.SecurityContextRepository;
  */
 public class SessionManagementFilterTests {
 
-    @After
-    public void clearContext() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void clearContext() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test
-    public void newSessionShouldNotBeCreatedIfSessionExistsAndUserIsNotAuthenticated() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo);
-        HttpServletRequest request = new MockHttpServletRequest();
-        String sessionId = request.getSession().getId();
+	@Test
+	public void newSessionShouldNotBeCreatedIfSessionExistsAndUserIsNotAuthenticated()
+			throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo);
+		HttpServletRequest request = new MockHttpServletRequest();
+		String sessionId = request.getSession().getId();
 
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
 
-        assertEquals(sessionId, request.getSession().getId());
-    }
+		assertEquals(sessionId, request.getSession().getId());
+	}
 
-    @Test
-    public void strategyIsNotInvokedIfSecurityContextAlreadyExistsForRequest() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
-        // mock that repo contains a security context
-        when(repo.containsContext(any(HttpServletRequest.class))).thenReturn(true);
-        SessionManagementFilter filter = new SessionManagementFilter(repo,strategy);
-        HttpServletRequest request = new MockHttpServletRequest();
-        authenticateUser();
+	@Test
+	public void strategyIsNotInvokedIfSecurityContextAlreadyExistsForRequest()
+			throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
+		// mock that repo contains a security context
+		when(repo.containsContext(any(HttpServletRequest.class))).thenReturn(true);
+		SessionManagementFilter filter = new SessionManagementFilter(repo, strategy);
+		HttpServletRequest request = new MockHttpServletRequest();
+		authenticateUser();
 
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
 
-        verifyZeroInteractions(strategy);
-    }
+		verifyZeroInteractions(strategy);
+	}
 
-    @Test
-    public void strategyIsNotInvokedIfAuthenticationIsNull() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo,strategy);
-        HttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void strategyIsNotInvokedIfAuthenticationIsNull() throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo, strategy);
+		HttpServletRequest request = new MockHttpServletRequest();
 
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
 
-        verifyZeroInteractions(strategy);
-    }
+		verifyZeroInteractions(strategy);
+	}
 
-    @Test
-    public void strategyIsInvokedIfUserIsNewlyAuthenticated() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        // repo will return false to containsContext()
-        SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo,strategy);
-        HttpServletRequest request = new MockHttpServletRequest();
-        authenticateUser();
+	@Test
+	public void strategyIsInvokedIfUserIsNewlyAuthenticated() throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		// repo will return false to containsContext()
+		SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo, strategy);
+		HttpServletRequest request = new MockHttpServletRequest();
+		authenticateUser();
 
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
 
-        verify(strategy).onAuthentication(any(Authentication.class), any(HttpServletRequest.class), any(HttpServletResponse.class));
-        // Check that it is only applied once to the request
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
-        verifyNoMoreInteractions(strategy);
-    }
+		verify(strategy).onAuthentication(any(Authentication.class),
+				any(HttpServletRequest.class), any(HttpServletResponse.class));
+		// Check that it is only applied once to the request
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		verifyNoMoreInteractions(strategy);
+	}
 
-    @Test
-    public void strategyFailureInvokesFailureHandler() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        // repo will return false to containsContext()
-        SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
+	@Test
+	public void strategyFailureInvokesFailureHandler() throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		// repo will return false to containsContext()
+		SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
 
-        AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo,strategy);
-        filter.setAuthenticationFailureHandler(failureHandler);
-        HttpServletRequest request = new MockHttpServletRequest();
-        HttpServletResponse response = new MockHttpServletResponse();
-        FilterChain fc = mock(FilterChain.class);
-        authenticateUser();
-        SessionAuthenticationException exception = new SessionAuthenticationException("Failure");
-        doThrow(exception).when(strategy).onAuthentication(
-                SecurityContextHolder.getContext().getAuthentication(), request, response);
+		AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo, strategy);
+		filter.setAuthenticationFailureHandler(failureHandler);
+		HttpServletRequest request = new MockHttpServletRequest();
+		HttpServletResponse response = new MockHttpServletResponse();
+		FilterChain fc = mock(FilterChain.class);
+		authenticateUser();
+		SessionAuthenticationException exception = new SessionAuthenticationException(
+				"Failure");
+		doThrow(exception).when(strategy)
+				.onAuthentication(SecurityContextHolder.getContext().getAuthentication(),
+						request, response);
 
-        filter.doFilter(request,response, fc);
-        verifyZeroInteractions(fc);
-        verify(failureHandler).onAuthenticationFailure(request, response, exception);
-    }
+		filter.doFilter(request, response, fc);
+		verifyZeroInteractions(fc);
+		verify(failureHandler).onAuthenticationFailure(request, response, exception);
+	}
 
-    @Test
-    public void responseIsRedirectedToTimeoutUrlIfSetAndSessionIsInvalid() throws Exception {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        // repo will return false to containsContext()
-        SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo,strategy);
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRequestedSessionId("xxx");
-        request.setRequestedSessionIdValid(false);
-        MockHttpServletResponse response = new MockHttpServletResponse();
+	@Test
+	public void responseIsRedirectedToTimeoutUrlIfSetAndSessionIsInvalid()
+			throws Exception {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		// repo will return false to containsContext()
+		SessionAuthenticationStrategy strategy = mock(SessionAuthenticationStrategy.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo, strategy);
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRequestedSessionId("xxx");
+		request.setRequestedSessionIdValid(false);
+		MockHttpServletResponse response = new MockHttpServletResponse();
 
-        filter.doFilter(request, response, new MockFilterChain());
-        assertNull(response.getRedirectedUrl());
+		filter.doFilter(request, response, new MockFilterChain());
+		assertNull(response.getRedirectedUrl());
 
-        // Now set a redirect URL
-        request = new MockHttpServletRequest();
-        request.setRequestedSessionId("xxx");
-        request.setRequestedSessionIdValid(false);
-        SimpleRedirectInvalidSessionStrategy iss = new SimpleRedirectInvalidSessionStrategy("/timedOut");
-        iss.setCreateNewSession(true);
-        filter.setInvalidSessionStrategy(iss);
-        FilterChain fc = mock(FilterChain.class);
-        filter.doFilter(request, response, fc);
-        verifyZeroInteractions(fc);
+		// Now set a redirect URL
+		request = new MockHttpServletRequest();
+		request.setRequestedSessionId("xxx");
+		request.setRequestedSessionIdValid(false);
+		SimpleRedirectInvalidSessionStrategy iss = new SimpleRedirectInvalidSessionStrategy(
+				"/timedOut");
+		iss.setCreateNewSession(true);
+		filter.setInvalidSessionStrategy(iss);
+		FilterChain fc = mock(FilterChain.class);
+		filter.doFilter(request, response, fc);
+		verifyZeroInteractions(fc);
 
-        assertEquals("/timedOut", response.getRedirectedUrl());
-    }
+		assertEquals("/timedOut", response.getRedirectedUrl());
+	}
 
-    @Test
-    public void customAuthenticationTrustResolver() throws Exception {
-        AuthenticationTrustResolver trustResolver= mock(AuthenticationTrustResolver.class);
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setTrustResolver(trustResolver);
-        HttpServletRequest request = new MockHttpServletRequest();
-        authenticateUser();
+	@Test
+	public void customAuthenticationTrustResolver() throws Exception {
+		AuthenticationTrustResolver trustResolver = mock(AuthenticationTrustResolver.class);
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo);
+		filter.setTrustResolver(trustResolver);
+		HttpServletRequest request = new MockHttpServletRequest();
+		authenticateUser();
 
-        filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
+		filter.doFilter(request, new MockHttpServletResponse(), new MockFilterChain());
 
-        verify(trustResolver).isAnonymous(any(Authentication.class));
-    }
+		verify(trustResolver).isAnonymous(any(Authentication.class));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void setTrustResolverNull() {
-        SecurityContextRepository repo = mock(SecurityContextRepository.class);
-        SessionManagementFilter filter = new SessionManagementFilter(repo);
-        filter.setTrustResolver(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void setTrustResolverNull() {
+		SecurityContextRepository repo = mock(SecurityContextRepository.class);
+		SessionManagementFilter filter = new SessionManagementFilter(repo);
+		filter.setTrustResolver(null);
+	}
 
-    private void authenticateUser() {
-        SecurityContextHolder.getContext().setAuthentication(new TestingAuthenticationToken("user", "pass"));
-    }
+	private void authenticateUser() {
+		SecurityContextHolder.getContext().setAuthentication(
+				new TestingAuthenticationToken("user", "pass"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java b/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java
index 44935df031..605659c84b 100644
--- a/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/TextEscapeUtilsTests.java
@@ -7,45 +7,46 @@ import org.springframework.security.web.util.TextEscapeUtils;
 
 public class TextEscapeUtilsTests {
 
-    /**
-     * &amp;, &lt;, &gt;, &#34;, &#39 and&#32;(space) escaping
-     */
-    @Test
-    public void charactersAreEscapedCorrectly() {
-        assertEquals("&amp;&#32;a&lt;script&gt;&#34;&#39;", TextEscapeUtils.escapeEntities("& a<script>\"'"));
-    }
+	/**
+	 * &amp;, &lt;, &gt;, &#34;, &#39 and&#32;(space) escaping
+	 */
+	@Test
+	public void charactersAreEscapedCorrectly() {
+		assertEquals("&amp;&#32;a&lt;script&gt;&#34;&#39;",
+				TextEscapeUtils.escapeEntities("& a<script>\"'"));
+	}
 
-    @Test
-    public void nullOrEmptyStringIsHandled() throws Exception {
-        assertEquals("", TextEscapeUtils.escapeEntities(""));
-        assertNull(TextEscapeUtils.escapeEntities(null));
-    }
+	@Test
+	public void nullOrEmptyStringIsHandled() throws Exception {
+		assertEquals("", TextEscapeUtils.escapeEntities(""));
+		assertNull(TextEscapeUtils.escapeEntities(null));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void invalidLowSurrogateIsDetected() throws Exception {
-        TextEscapeUtils.escapeEntities("abc\uDCCCdef");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidLowSurrogateIsDetected() throws Exception {
+		TextEscapeUtils.escapeEntities("abc\uDCCCdef");
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void missingLowSurrogateIsDetected() throws Exception {
-        TextEscapeUtils.escapeEntities("abc\uD888a");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void missingLowSurrogateIsDetected() throws Exception {
+		TextEscapeUtils.escapeEntities("abc\uD888a");
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void highSurrogateAtEndOfStringIsRejected() throws Exception {
-        TextEscapeUtils.escapeEntities("abc\uD888");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void highSurrogateAtEndOfStringIsRejected() throws Exception {
+		TextEscapeUtils.escapeEntities("abc\uD888");
+	}
 
-    /**
-     * Delta char: &#66560;
-     */
-    @Test
-    public void validSurrogatePairIsAccepted() throws Exception {
-        assertEquals("abc&#66560;a", TextEscapeUtils.escapeEntities("abc\uD801\uDC00a"));
-    }
+	/**
+	 * Delta char: &#66560;
+	 */
+	@Test
+	public void validSurrogatePairIsAccepted() throws Exception {
+		assertEquals("abc&#66560;a", TextEscapeUtils.escapeEntities("abc\uD801\uDC00a"));
+	}
 
-    @Test
-    public void undefinedSurrogatePairIsIgnored() throws Exception {
-        assertEquals("abca", TextEscapeUtils.escapeEntities("abc\uD888\uDC00a"));
-    }
+	@Test
+	public void undefinedSurrogatePairIsIgnored() throws Exception {
+		assertEquals("abca", TextEscapeUtils.escapeEntities("abc\uD888\uDC00a"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java
index d632314666..251db3474e 100644
--- a/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/ThrowableAnalyzerTests.java
@@ -15,243 +15,257 @@ import junit.framework.TestCase;
 @SuppressWarnings("unchecked")
 public class ThrowableAnalyzerTests extends TestCase {
 
-    /**
-     * Exception for testing purposes. The cause is not retrievable by {@link #getCause()}.
-     */
-    public static final class NonStandardException extends Exception {
+	/**
+	 * Exception for testing purposes. The cause is not retrievable by {@link #getCause()}
+	 * .
+	 */
+	public static final class NonStandardException extends Exception {
 
-        private Throwable cause;
+		private Throwable cause;
 
-        public NonStandardException(String message, Throwable cause) {
-            super(message);
-            this.cause = cause;
-        }
+		public NonStandardException(String message, Throwable cause) {
+			super(message);
+			this.cause = cause;
+		}
 
-        public Throwable resolveCause() {
-            return this.cause;
-        }
-    }
+		public Throwable resolveCause() {
+			return this.cause;
+		}
+	}
 
-    /**
-     * <code>ThrowableCauseExtractor</code> for handling <code>NonStandardException</code> instances.
-     */
-    public static final class NonStandardExceptionCauseExtractor implements ThrowableCauseExtractor {
+	/**
+	 * <code>ThrowableCauseExtractor</code> for handling <code>NonStandardException</code>
+	 * instances.
+	 */
+	public static final class NonStandardExceptionCauseExtractor implements
+			ThrowableCauseExtractor {
 
-        public Throwable extractCause(Throwable throwable) {
-            ThrowableAnalyzer.verifyThrowableHierarchy(throwable, NonStandardException.class);
-            return ((NonStandardException) throwable).resolveCause();
-        }
+		public Throwable extractCause(Throwable throwable) {
+			ThrowableAnalyzer.verifyThrowableHierarchy(throwable,
+					NonStandardException.class);
+			return ((NonStandardException) throwable).resolveCause();
+		}
 
-    }
+	}
 
+	/**
+	 * An array of nested throwables for testing. The cause of element 0 is element 1, the
+	 * cause of element 1 is element 2 and so on.
+	 */
+	private Throwable[] testTrace;
 
-    /**
-     * An array of nested throwables for testing.
-     * The cause of element 0 is element 1, the cause of element 1 is element 2 and so on.
-     */
-    private Throwable[] testTrace;
+	/**
+	 * Plain <code>ThrowableAnalyzer</code>.
+	 */
+	private ThrowableAnalyzer standardAnalyzer;
 
-    /**
-     * Plain <code>ThrowableAnalyzer</code>.
-     */
-    private ThrowableAnalyzer standardAnalyzer;
+	/**
+	 * Enhanced <code>ThrowableAnalyzer</code> capable to process
+	 * <code>NonStandardException</code>s.
+	 */
+	private ThrowableAnalyzer nonstandardAnalyzer;
 
-    /**
-     * Enhanced <code>ThrowableAnalyzer</code> capable to process
-     * <code>NonStandardException</code>s.
-     */
-    private ThrowableAnalyzer nonstandardAnalyzer;
+	/**
+	 * @see junit.framework.TestCase#setUp()
+	 */
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
 
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+		// Set up test trace
+		this.testTrace = new Throwable[7];
+		this.testTrace[6] = new IllegalArgumentException("Test_6");
+		this.testTrace[5] = new Throwable("Test_5", this.testTrace[6]);
+		this.testTrace[4] = new InvocationTargetException(this.testTrace[5], "Test_4");
+		this.testTrace[3] = new Exception("Test_3", this.testTrace[4]);
+		this.testTrace[2] = new NonStandardException("Test_2", this.testTrace[3]);
+		this.testTrace[1] = new RuntimeException("Test_1", this.testTrace[2]);
+		this.testTrace[0] = new Exception("Test_0", this.testTrace[1]);
 
-       // Set up test trace
-       this.testTrace = new Throwable[7];
-       this.testTrace[6] = new IllegalArgumentException("Test_6");
-       this.testTrace[5] = new Throwable("Test_5",this.testTrace[6]);
-       this.testTrace[4] = new InvocationTargetException(this.testTrace[5], "Test_4");
-       this.testTrace[3] = new Exception("Test_3", this.testTrace[4]);
-       this.testTrace[2] = new NonStandardException("Test_2", this.testTrace[3]);
-       this.testTrace[1] = new RuntimeException("Test_1", this.testTrace[2]);
-       this.testTrace[0] = new Exception("Test_0", this.testTrace[1]);
+		// Set up standard analyzer
+		this.standardAnalyzer = new ThrowableAnalyzer();
 
-       // Set up standard analyzer
-       this.standardAnalyzer = new ThrowableAnalyzer();
+		// Set up nonstandard analyzer
+		this.nonstandardAnalyzer = new ThrowableAnalyzer() {
+			/**
+			 * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
+			 */
+			@Override
+			protected void initExtractorMap() {
+				super.initExtractorMap();
+				// register extractor for NonStandardException
+				registerExtractor(NonStandardException.class,
+						new NonStandardExceptionCauseExtractor());
+			}
+		};
+	}
 
-       // Set up nonstandard analyzer
-       this.nonstandardAnalyzer = new ThrowableAnalyzer() {
-           /**
-            * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
-            */
-           @Override
-           protected void initExtractorMap() {
-               super.initExtractorMap();
-               // register extractor for NonStandardException
-               registerExtractor(NonStandardException.class, new NonStandardExceptionCauseExtractor());
-           }
-       };
-    }
+	/**
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	@Override
+	protected void tearDown() throws Exception {
+		super.tearDown();
+	}
 
+	public void testRegisterExtractorWithInvalidExtractor() {
+		try {
+			new ThrowableAnalyzer() {
 
-    /**
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
+				/**
+				 * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
+				 */
+				@Override
+				protected void initExtractorMap() {
+					// null is no valid extractor
+					super.registerExtractor(Exception.class, null);
+				}
+			};
 
-    public void testRegisterExtractorWithInvalidExtractor() {
-        try {
-            new ThrowableAnalyzer() {
+			fail("IllegalArgumentExpected");
+		}
+		catch (IllegalArgumentException e) {
+			// ok
+		}
+	}
 
-                /**
-                 * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
-                 */
-                @Override
-                protected void initExtractorMap() {
-                    // null is no valid extractor
-                    super.registerExtractor(Exception.class, null);
-                }
-            };
+	public void testGetRegisteredTypes() {
 
-            fail("IllegalArgumentExpected");
-        } catch (IllegalArgumentException e) {
-            // ok
-        }
-    }
+		Class[] registeredTypes = this.nonstandardAnalyzer.getRegisteredTypes();
 
-    public void testGetRegisteredTypes() {
+		for (int i = 0; i < registeredTypes.length; ++i) {
+			Class clazz = registeredTypes[i];
 
-        Class[] registeredTypes = this.nonstandardAnalyzer.getRegisteredTypes();
+			// The most specific types have to occur first.
+			for (int j = 0; j < i; ++j) {
+				Class prevClazz = registeredTypes[j];
 
-        for (int i = 0; i < registeredTypes.length; ++i) {
-            Class clazz = registeredTypes[i];
+				assertFalse("Unexpected order of registered classes: " + prevClazz
+						+ " is assignable from " + clazz,
+						prevClazz.isAssignableFrom(clazz));
+			}
+		}
+	}
 
-            // The most specific types have to occur first.
-            for (int j = 0; j < i; ++j) {
-                Class prevClazz = registeredTypes[j];
+	public void testDetermineCauseChainWithNoExtractors() {
+		ThrowableAnalyzer analyzer = new ThrowableAnalyzer() {
 
-                assertFalse("Unexpected order of registered classes: "
-                        + prevClazz + " is assignable from " + clazz, prevClazz.isAssignableFrom(clazz));
-            }
-        }
-    }
+			/**
+			 * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
+			 */
+			@Override
+			protected void initExtractorMap() {
+				// skip default initialization
+			}
+		};
 
-    public void testDetermineCauseChainWithNoExtractors() {
-        ThrowableAnalyzer analyzer = new ThrowableAnalyzer() {
+		assertEquals("Unexpected number of registered types", 0,
+				analyzer.getRegisteredTypes().length);
 
-            /**
-             * @see org.springframework.security.web.util.ThrowableAnalyzer#initExtractorMap()
-             */
-            @Override
-            protected void initExtractorMap() {
-                // skip default initialization
-            }
-        };
+		Throwable t = this.testTrace[0];
+		Throwable[] chain = analyzer.determineCauseChain(t);
+		// Without extractors only the root throwable is available
+		assertEquals("Unexpected chain size", 1, chain.length);
+		assertEquals("Unexpected chain entry", t, chain[0]);
+	}
 
-        assertEquals("Unexpected number of registered types", 0, analyzer.getRegisteredTypes().length);
+	public void testDetermineCauseChainWithDefaultExtractors() {
+		ThrowableAnalyzer analyzer = this.standardAnalyzer;
 
-        Throwable t = this.testTrace[0];
-        Throwable[] chain = analyzer.determineCauseChain(t);
-        // Without extractors only the root throwable is available
-        assertEquals("Unexpected chain size", 1, chain.length);
-        assertEquals("Unexpected chain entry", t, chain[0]);
-    }
+		assertEquals("Unexpected number of registered types", 2,
+				analyzer.getRegisteredTypes().length);
 
-    public void testDetermineCauseChainWithDefaultExtractors() {
-        ThrowableAnalyzer analyzer = this.standardAnalyzer;
+		Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
 
-        assertEquals("Unexpected number of registered types", 2, analyzer.getRegisteredTypes().length);
+		// Element at index 2 is a NonStandardException which cannot be analyzed further
+		// by default
+		assertEquals("Unexpected chain size", 3, chain.length);
+		for (int i = 0; i < 3; ++i) {
+			assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]);
+		}
+	}
 
-        Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
+	public void testDetermineCauseChainWithCustomExtractors() {
+		ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
 
-        // Element at index 2 is a NonStandardException which cannot be analyzed further by default
-        assertEquals("Unexpected chain size", 3, chain.length);
-        for (int i = 0; i < 3; ++i) {
-            assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]);
-        }
-    }
+		Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
 
-    public void testDetermineCauseChainWithCustomExtractors() {
-        ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
+		assertEquals("Unexpected chain size", this.testTrace.length, chain.length);
+		for (int i = 0; i < chain.length; ++i) {
+			assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]);
+		}
+	}
 
-        Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
+	public void testGetFirstThrowableOfTypeWithSuccess1() {
+		ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
 
-        assertEquals("Unexpected chain size", this.testTrace.length, chain.length);
-        for (int i = 0; i < chain.length; ++i) {
-            assertEquals("Unexpected chain entry: " + i, this.testTrace[i], chain[i]);
-        }
-    }
+		Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
 
-    public void testGetFirstThrowableOfTypeWithSuccess1() {
-        ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
+		Throwable result = analyzer.getFirstThrowableOfType(Exception.class, chain);
 
-        Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
+		assertNotNull("null not expected", result);
+		assertEquals("Unexpected throwable found", this.testTrace[0], result);
+	}
 
-        Throwable result = analyzer.getFirstThrowableOfType(Exception.class, chain);
+	public void testGetFirstThrowableOfTypeWithSuccess2() {
+		ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
 
-        assertNotNull("null not expected", result);
-        assertEquals("Unexpected throwable found", this.testTrace[0], result);
-    }
+		Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
 
-    public void testGetFirstThrowableOfTypeWithSuccess2() {
-        ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
+		Throwable result = analyzer.getFirstThrowableOfType(NonStandardException.class,
+				chain);
 
-        Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
+		assertNotNull("null not expected", result);
+		assertEquals("Unexpected throwable found", this.testTrace[2], result);
+	}
 
-        Throwable result = analyzer.getFirstThrowableOfType(NonStandardException.class, chain);
+	public void testGetFirstThrowableOfTypeWithFailure() {
+		ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
 
-        assertNotNull("null not expected", result);
-        assertEquals("Unexpected throwable found", this.testTrace[2], result);
-    }
+		Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
 
-    public void testGetFirstThrowableOfTypeWithFailure() {
-        ThrowableAnalyzer analyzer = this.nonstandardAnalyzer;
+		// IllegalStateException not in trace
+		Throwable result = analyzer.getFirstThrowableOfType(IllegalStateException.class,
+				chain);
 
-        Throwable[] chain = analyzer.determineCauseChain(this.testTrace[0]);
+		assertNull("null expected", result);
+	}
 
-        // IllegalStateException not in trace
-        Throwable result = analyzer.getFirstThrowableOfType(IllegalStateException.class, chain);
+	public void testVerifyThrowableHierarchyWithExactType() {
 
-        assertNull("null expected", result);
-    }
+		Throwable throwable = new IllegalStateException("Test");
+		ThrowableAnalyzer
+				.verifyThrowableHierarchy(throwable, IllegalStateException.class);
+		// No exception expected
+	}
 
-    public void testVerifyThrowableHierarchyWithExactType() {
+	public void testVerifyThrowableHierarchyWithCompatibleType() {
 
-        Throwable throwable = new IllegalStateException("Test");
-        ThrowableAnalyzer.verifyThrowableHierarchy(throwable, IllegalStateException.class);
-        // No exception expected
-    }
+		Throwable throwable = new IllegalStateException("Test");
+		ThrowableAnalyzer.verifyThrowableHierarchy(throwable, Exception.class);
+		// No exception expected
+	}
 
-    public void testVerifyThrowableHierarchyWithCompatibleType() {
+	public void testVerifyThrowableHierarchyWithNull() {
+		try {
+			ThrowableAnalyzer.verifyThrowableHierarchy(null, Throwable.class);
+			fail("IllegalArgumentException expected");
+		}
+		catch (IllegalArgumentException e) {
+			// ok
+		}
+	}
 
-        Throwable throwable = new IllegalStateException("Test");
-        ThrowableAnalyzer.verifyThrowableHierarchy(throwable, Exception.class);
-        // No exception expected
-    }
+	public void testVerifyThrowableHierarchyWithNonmatchingType() {
 
-    public void testVerifyThrowableHierarchyWithNull() {
-        try {
-            ThrowableAnalyzer.verifyThrowableHierarchy(null, Throwable.class);
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException e) {
-            // ok
-        }
-    }
-
-    public void testVerifyThrowableHierarchyWithNonmatchingType() {
-
-        Throwable throwable = new IllegalStateException("Test");
-        try {
-            ThrowableAnalyzer.verifyThrowableHierarchy(throwable, InvocationTargetException.class);
-            fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException e) {
-            // ok
-        }
-    }
+		Throwable throwable = new IllegalStateException("Test");
+		try {
+			ThrowableAnalyzer.verifyThrowableHierarchy(throwable,
+					InvocationTargetException.class);
+			fail("IllegalArgumentException expected");
+		}
+		catch (IllegalArgumentException e) {
+			// ok
+		}
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java b/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java
index aa4da44958..46c921cd86 100644
--- a/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/UrlUtilsTests.java
@@ -10,14 +10,14 @@ import org.junit.Test;
  */
 public class UrlUtilsTests {
 
-    @Test
-    public void absoluteUrlsAreMatchedAsAbsolute() throws Exception {
-        assertTrue(UrlUtils.isAbsoluteUrl("http://something/"));
-        assertTrue(UrlUtils.isAbsoluteUrl("http1://something/"));
-        assertTrue(UrlUtils.isAbsoluteUrl("HTTP://something/"));
-        assertTrue(UrlUtils.isAbsoluteUrl("https://something/"));
-        assertTrue(UrlUtils.isAbsoluteUrl("a://something/"));
-        assertTrue(UrlUtils.isAbsoluteUrl("zz+zz.zz-zz://something/"));
-    }
+	@Test
+	public void absoluteUrlsAreMatchedAsAbsolute() throws Exception {
+		assertTrue(UrlUtils.isAbsoluteUrl("http://something/"));
+		assertTrue(UrlUtils.isAbsoluteUrl("http1://something/"));
+		assertTrue(UrlUtils.isAbsoluteUrl("HTTP://something/"));
+		assertTrue(UrlUtils.isAbsoluteUrl("https://something/"));
+		assertTrue(UrlUtils.isAbsoluteUrl("a://something/"));
+		assertTrue(UrlUtils.isAbsoluteUrl("zz+zz.zz-zz://something/"));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java
index ba0b7869cd..2727b99c1f 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/AndRequestMatcherTests.java
@@ -38,88 +38,87 @@ import org.springframework.security.web.util.matcher.AndRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AndRequestMatcherTests {
-    @Mock
-    private RequestMatcher delegate;
+	@Mock
+	private RequestMatcher delegate;
 
-    @Mock
-    private RequestMatcher delegate2;
+	@Mock
+	private RequestMatcher delegate2;
 
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    private RequestMatcher matcher;
+	private RequestMatcher matcher;
 
-    @Test(expected = NullPointerException.class)
-    public void constructorNullArray() {
-        new AndRequestMatcher((RequestMatcher[]) null);
-    }
+	@Test(expected = NullPointerException.class)
+	public void constructorNullArray() {
+		new AndRequestMatcher((RequestMatcher[]) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorArrayContainsNull() {
-        new AndRequestMatcher((RequestMatcher)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorArrayContainsNull() {
+		new AndRequestMatcher((RequestMatcher) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyArray() {
-        new AndRequestMatcher(new RequestMatcher[0]);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyArray() {
+		new AndRequestMatcher(new RequestMatcher[0]);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullList() {
-        new AndRequestMatcher((List<RequestMatcher>) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullList() {
+		new AndRequestMatcher((List<RequestMatcher>) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorListContainsNull() {
-        new AndRequestMatcher(Arrays.asList((RequestMatcher)null));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorListContainsNull() {
+		new AndRequestMatcher(Arrays.asList((RequestMatcher) null));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyList() {
-        new AndRequestMatcher(Collections.<RequestMatcher>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyList() {
+		new AndRequestMatcher(Collections.<RequestMatcher> emptyList());
+	}
 
-    @Test
-    public void matchesSingleTrue() {
-        when(delegate.matches(request)).thenReturn(true);
-        matcher = new AndRequestMatcher(delegate);
+	@Test
+	public void matchesSingleTrue() {
+		when(delegate.matches(request)).thenReturn(true);
+		matcher = new AndRequestMatcher(delegate);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void matchesMultiTrue() {
-        when(delegate.matches(request)).thenReturn(true);
-        when(delegate2.matches(request)).thenReturn(true);
-        matcher = new AndRequestMatcher(delegate, delegate2);
+	@Test
+	public void matchesMultiTrue() {
+		when(delegate.matches(request)).thenReturn(true);
+		when(delegate2.matches(request)).thenReturn(true);
+		matcher = new AndRequestMatcher(delegate, delegate2);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
+	@Test
+	public void matchesSingleFalse() {
+		when(delegate.matches(request)).thenReturn(false);
+		matcher = new AndRequestMatcher(delegate);
 
-    @Test
-    public void matchesSingleFalse() {
-        when(delegate.matches(request)).thenReturn(false);
-        matcher = new AndRequestMatcher(delegate);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void matchesMultiBothFalse() {
+		when(delegate.matches(request)).thenReturn(false);
+		when(delegate2.matches(request)).thenReturn(false);
+		matcher = new AndRequestMatcher(delegate, delegate2);
 
-    @Test
-    public void matchesMultiBothFalse() {
-        when(delegate.matches(request)).thenReturn(false);
-        when(delegate2.matches(request)).thenReturn(false);
-        matcher = new AndRequestMatcher(delegate, delegate2);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void matchesMultiSingleFalse() {
+		when(delegate.matches(request)).thenReturn(true);
+		when(delegate2.matches(request)).thenReturn(false);
+		matcher = new AndRequestMatcher(delegate, delegate2);
 
-    @Test
-    public void matchesMultiSingleFalse() {
-        when(delegate.matches(request)).thenReturn(true);
-        when(delegate2.matches(request)).thenReturn(false);
-        matcher = new AndRequestMatcher(delegate, delegate2);
-
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
index c9c010d98b..ebaf457bbf 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/AntPathRequestMatcherTests.java
@@ -34,176 +34,186 @@ import org.springframework.security.web.util.matcher.AnyRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AntPathRequestMatcherTests {
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    @Test
-    public void singleWildcardMatchesAnyPath() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**");
-        assertEquals("/**", matcher.getPattern());
+	@Test
+	public void singleWildcardMatchesAnyPath() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**");
+		assertEquals("/**", matcher.getPattern());
 
-        assertTrue(matcher.matches(createRequest("/blah")));
+		assertTrue(matcher.matches(createRequest("/blah")));
 
-        matcher = new AntPathRequestMatcher("**");
-        assertTrue(matcher.matches(createRequest("/blah")));
-        assertTrue(matcher.matches(createRequest("")));
-    }
+		matcher = new AntPathRequestMatcher("**");
+		assertTrue(matcher.matches(createRequest("/blah")));
+		assertTrue(matcher.matches(createRequest("")));
+	}
 
-    @Test
-    public void trailingWildcardMatchesCorrectly() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah/blAh/**");
-        assertTrue(matcher.matches(createRequest("/BLAH/blah")));
-        assertFalse(matcher.matches(createRequest("/blah/bleh")));
-        assertTrue(matcher.matches(createRequest("/blah/blah/")));
-        assertTrue(matcher.matches(createRequest("/blah/blah/xxx")));
-        assertFalse(matcher.matches(createRequest("/blah/blaha")));
-        assertFalse(matcher.matches(createRequest("/blah/bleh/")));
-        MockHttpServletRequest request = createRequest("/blah/");
+	@Test
+	public void trailingWildcardMatchesCorrectly() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah/blAh/**");
+		assertTrue(matcher.matches(createRequest("/BLAH/blah")));
+		assertFalse(matcher.matches(createRequest("/blah/bleh")));
+		assertTrue(matcher.matches(createRequest("/blah/blah/")));
+		assertTrue(matcher.matches(createRequest("/blah/blah/xxx")));
+		assertFalse(matcher.matches(createRequest("/blah/blaha")));
+		assertFalse(matcher.matches(createRequest("/blah/bleh/")));
+		MockHttpServletRequest request = createRequest("/blah/");
 
-        request.setPathInfo("blah/bleh");
-        assertTrue(matcher.matches(request));
+		request.setPathInfo("blah/bleh");
+		assertTrue(matcher.matches(request));
 
-        matcher = new AntPathRequestMatcher("/bl?h/blAh/**");
-        assertTrue(matcher.matches(createRequest("/BLAH/Blah/aaa/")));
-        assertTrue(matcher.matches(createRequest("/bleh/Blah")));
+		matcher = new AntPathRequestMatcher("/bl?h/blAh/**");
+		assertTrue(matcher.matches(createRequest("/BLAH/Blah/aaa/")));
+		assertTrue(matcher.matches(createRequest("/bleh/Blah")));
 
-        matcher = new AntPathRequestMatcher("/blAh/**/blah/**");
-        assertTrue(matcher.matches(createRequest("/blah/blah")));
-        assertFalse(matcher.matches(createRequest("/blah/bleh")));
-        assertTrue(matcher.matches(createRequest("/blah/aaa/blah/bbb")));
+		matcher = new AntPathRequestMatcher("/blAh/**/blah/**");
+		assertTrue(matcher.matches(createRequest("/blah/blah")));
+		assertFalse(matcher.matches(createRequest("/blah/bleh")));
+		assertTrue(matcher.matches(createRequest("/blah/aaa/blah/bbb")));
 
-        matcher = new AntPathRequestMatcher("/{id}/blAh/**");
-        assertTrue(matcher.matches(createRequest("/1234/blah")));
-        assertFalse(matcher.matches(createRequest("/4567/bleh")));
-        assertTrue(matcher.matches(createRequest("/paskos/blah/")));
-        assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
-        assertFalse(matcher.matches(createRequest("/12345/blaha")));
-        assertFalse(matcher.matches(createRequest("/paskos/bleh/")));
+		matcher = new AntPathRequestMatcher("/{id}/blAh/**");
+		assertTrue(matcher.matches(createRequest("/1234/blah")));
+		assertFalse(matcher.matches(createRequest("/4567/bleh")));
+		assertTrue(matcher.matches(createRequest("/paskos/blah/")));
+		assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
+		assertFalse(matcher.matches(createRequest("/12345/blaha")));
+		assertFalse(matcher.matches(createRequest("/paskos/bleh/")));
 
-    }
+	}
 
-    @Test
-    public void trailingWildcardWithVariableMatchesCorrectly() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/{id}/blAh/**");
-        assertTrue(matcher.matches(createRequest("/1234/blah")));
-        assertFalse(matcher.matches(createRequest("/4567/bleh")));
-        assertTrue(matcher.matches(createRequest("/paskos/blah/")));
-        assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
-        assertFalse(matcher.matches(createRequest("/12345/blaha")));
-        assertFalse(matcher.matches(createRequest("/paskos/bleh/")));
-    }
+	@Test
+	public void trailingWildcardWithVariableMatchesCorrectly() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/{id}/blAh/**");
+		assertTrue(matcher.matches(createRequest("/1234/blah")));
+		assertFalse(matcher.matches(createRequest("/4567/bleh")));
+		assertTrue(matcher.matches(createRequest("/paskos/blah/")));
+		assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
+		assertFalse(matcher.matches(createRequest("/12345/blaha")));
+		assertFalse(matcher.matches(createRequest("/paskos/bleh/")));
+	}
 
-    @Test
-    public void nontrailingWildcardWithVariableMatchesCorrectly() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**/{id}");
-        assertTrue(matcher.matches(createRequest("/blah/1234")));
-        assertTrue(matcher.matches(createRequest("/bleh/4567")));
-        assertTrue(matcher.matches(createRequest("/paskos/blah/")));
-        assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
-        assertTrue(matcher.matches(createRequest("/12345/blaha")));
-        assertTrue(matcher.matches(createRequest("/paskos/bleh/")));
-    }
+	@Test
+	public void nontrailingWildcardWithVariableMatchesCorrectly() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/**/{id}");
+		assertTrue(matcher.matches(createRequest("/blah/1234")));
+		assertTrue(matcher.matches(createRequest("/bleh/4567")));
+		assertTrue(matcher.matches(createRequest("/paskos/blah/")));
+		assertTrue(matcher.matches(createRequest("/12345/blah/xxx")));
+		assertTrue(matcher.matches(createRequest("/12345/blaha")));
+		assertTrue(matcher.matches(createRequest("/paskos/bleh/")));
+	}
 
-    @Test
-    public void requestHasNullMethodMatches() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET");
-        HttpServletRequest request = createRequestWithNullMethod("/something/here");
-        assertTrue(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodMatches() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET");
+		HttpServletRequest request = createRequestWithNullMethod("/something/here");
+		assertTrue(matcher.matches(request));
+	}
 
-    // SEC-2084
-    @Test
-    public void requestHasNullMethodNoMatch() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET");
-        HttpServletRequest request = createRequestWithNullMethod("/nomatch");
-        assertFalse(matcher.matches(request));
-    }
+	// SEC-2084
+	@Test
+	public void requestHasNullMethodNoMatch() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*", "GET");
+		HttpServletRequest request = createRequestWithNullMethod("/nomatch");
+		assertFalse(matcher.matches(request));
+	}
 
-    @Test
-    public void requestHasNullMethodAndNullMatcherMatches() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*");
-        MockHttpServletRequest request = createRequest("/something/here");
-        request.setMethod(null);
-        assertTrue(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodAndNullMatcherMatches() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*");
+		MockHttpServletRequest request = createRequest("/something/here");
+		request.setMethod(null);
+		assertTrue(matcher.matches(request));
+	}
 
-    @Test
-    public void requestHasNullMethodAndNullMatcherNoMatch() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*");
-        MockHttpServletRequest request = createRequest("/nomatch");
-        request.setMethod(null);
-        assertFalse(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodAndNullMatcherNoMatch() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/something/*");
+		MockHttpServletRequest request = createRequest("/nomatch");
+		request.setMethod(null);
+		assertFalse(matcher.matches(request));
+	}
 
-    @Test
-    public void exactMatchOnlyMatchesIdenticalPath() throws Exception {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/login.html");
-        assertTrue(matcher.matches(createRequest("/login.html")));
-        assertFalse(matcher.matches(createRequest("/login.html/")));
-        assertFalse(matcher.matches(createRequest("/login.html/blah")));
-    }
+	@Test
+	public void exactMatchOnlyMatchesIdenticalPath() throws Exception {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/login.html");
+		assertTrue(matcher.matches(createRequest("/login.html")));
+		assertFalse(matcher.matches(createRequest("/login.html/")));
+		assertFalse(matcher.matches(createRequest("/login.html/blah")));
+	}
 
-    @Test
-    public void httpMethodSpecificMatchOnlyMatchesRequestsWithCorrectMethod() throws Exception {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah", "GET");
-        MockHttpServletRequest request = createRequest("/blah");
-        request.setMethod("GET");
-        assertTrue(matcher.matches(request));
-        request.setMethod("POST");
-        assertFalse(matcher.matches(request));
-    }
+	@Test
+	public void httpMethodSpecificMatchOnlyMatchesRequestsWithCorrectMethod()
+			throws Exception {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah", "GET");
+		MockHttpServletRequest request = createRequest("/blah");
+		request.setMethod("GET");
+		assertTrue(matcher.matches(request));
+		request.setMethod("POST");
+		assertFalse(matcher.matches(request));
+	}
 
-    @Test
-    public void caseSensitive() throws Exception {
-        MockHttpServletRequest request = createRequest("/UPPER");
-        assertThat(new AntPathRequestMatcher("/upper",null,true).matches(request)).isFalse();
-        assertThat(new AntPathRequestMatcher("/upper","POST",true).matches(request)).isFalse();
-        assertThat(new AntPathRequestMatcher("/upper","GET",true).matches(request)).isFalse();
+	@Test
+	public void caseSensitive() throws Exception {
+		MockHttpServletRequest request = createRequest("/UPPER");
+		assertThat(new AntPathRequestMatcher("/upper", null, true).matches(request))
+				.isFalse();
+		assertThat(new AntPathRequestMatcher("/upper", "POST", true).matches(request))
+				.isFalse();
+		assertThat(new AntPathRequestMatcher("/upper", "GET", true).matches(request))
+				.isFalse();
 
-        assertThat(new AntPathRequestMatcher("/upper",null,false).matches(request)).isTrue();
-        assertThat(new AntPathRequestMatcher("/upper","POST",false).matches(request)).isTrue();
-    }
+		assertThat(new AntPathRequestMatcher("/upper", null, false).matches(request))
+				.isTrue();
+		assertThat(new AntPathRequestMatcher("/upper", "POST", false).matches(request))
+				.isTrue();
+	}
 
-    @Test
-    public void equalsBehavesCorrectly() throws Exception {
-        // Both universal wildcard options should be equal
-        assertEquals(new AntPathRequestMatcher("/**"), new AntPathRequestMatcher("**"));
-        assertEquals(new AntPathRequestMatcher("/xyz"), new AntPathRequestMatcher("/xyz"));
-        assertEquals(new AntPathRequestMatcher("/xyz", "POST"), new AntPathRequestMatcher("/xyz", "POST"));
-        assertFalse(new AntPathRequestMatcher("/xyz", "POST").equals(new AntPathRequestMatcher("/xyz", "GET")));
-        assertFalse(new AntPathRequestMatcher("/xyz").equals(new AntPathRequestMatcher("/xxx")));
-        assertFalse(new AntPathRequestMatcher("/xyz").equals(AnyRequestMatcher.INSTANCE));
-        assertFalse(new AntPathRequestMatcher("/xyz","GET", false).equals(new AntPathRequestMatcher("/xyz","GET", true)));
-    }
+	@Test
+	public void equalsBehavesCorrectly() throws Exception {
+		// Both universal wildcard options should be equal
+		assertEquals(new AntPathRequestMatcher("/**"), new AntPathRequestMatcher("**"));
+		assertEquals(new AntPathRequestMatcher("/xyz"), new AntPathRequestMatcher("/xyz"));
+		assertEquals(new AntPathRequestMatcher("/xyz", "POST"),
+				new AntPathRequestMatcher("/xyz", "POST"));
+		assertFalse(new AntPathRequestMatcher("/xyz", "POST")
+				.equals(new AntPathRequestMatcher("/xyz", "GET")));
+		assertFalse(new AntPathRequestMatcher("/xyz").equals(new AntPathRequestMatcher(
+				"/xxx")));
+		assertFalse(new AntPathRequestMatcher("/xyz").equals(AnyRequestMatcher.INSTANCE));
+		assertFalse(new AntPathRequestMatcher("/xyz", "GET", false)
+				.equals(new AntPathRequestMatcher("/xyz", "GET", true)));
+	}
 
-    @Test
-    public void toStringIsOk() throws Exception {
-        new AntPathRequestMatcher("/blah").toString();
-        new AntPathRequestMatcher("/blah", "GET").toString();
-    }
+	@Test
+	public void toStringIsOk() throws Exception {
+		new AntPathRequestMatcher("/blah").toString();
+		new AntPathRequestMatcher("/blah", "GET").toString();
+	}
 
-    // SEC-2831
-    @Test
-    public void matchesWithInvalidMethod() {
-        AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah", "GET");
-        MockHttpServletRequest request = createRequest("/blah");
-        request.setMethod("INVALID");
+	// SEC-2831
+	@Test
+	public void matchesWithInvalidMethod() {
+		AntPathRequestMatcher matcher = new AntPathRequestMatcher("/blah", "GET");
+		MockHttpServletRequest request = createRequest("/blah");
+		request.setMethod("INVALID");
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    private HttpServletRequest createRequestWithNullMethod(String path) {
-        when(request.getQueryString()).thenReturn("doesntMatter");
-        when(request.getServletPath()).thenReturn(path);
-        return request;
-    }
+	private HttpServletRequest createRequestWithNullMethod(String path) {
+		when(request.getQueryString()).thenReturn("doesntMatter");
+		when(request.getServletPath()).thenReturn(path);
+		return request;
+	}
 
-    private MockHttpServletRequest createRequest(String path) {
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setQueryString("doesntMatter");
-        request.setServletPath(path);
-        request.setMethod("POST");
+	private MockHttpServletRequest createRequest(String path) {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setQueryString("doesntMatter");
+		request.setServletPath(path);
+		request.setMethod("POST");
 
-        return request;
-    }
+		return request;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java
index 7e63cae362..3eb354e4a6 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/ELRequestMatcherTests.java
@@ -27,64 +27,67 @@ import org.springframework.security.web.util.matcher.ELRequestMatcher;
  */
 public class ELRequestMatcherTests {
 
-    @Test
-    public void testHasIpAddressTrue() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher("hasIpAddress('1.1.1.1')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRemoteAddr("1.1.1.1");
+	@Test
+	public void testHasIpAddressTrue() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher("hasIpAddress('1.1.1.1')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRemoteAddr("1.1.1.1");
 
-        assertTrue(requestMatcher.matches(request));
-    }
+		assertTrue(requestMatcher.matches(request));
+	}
 
-    @Test
-    public void testHasIpAddressFalse() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher("hasIpAddress('1.1.1.1')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.setRemoteAddr("1.1.1.2");
+	@Test
+	public void testHasIpAddressFalse() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher("hasIpAddress('1.1.1.1')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setRemoteAddr("1.1.1.2");
 
-        assertFalse(requestMatcher.matches(request));
-    }
+		assertFalse(requestMatcher.matches(request));
+	}
 
-    @Test
-    public void testHasHeaderTrue() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher("hasHeader('User-Agent','MSIE')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("User-Agent", "MSIE");
+	@Test
+	public void testHasHeaderTrue() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher(
+				"hasHeader('User-Agent','MSIE')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("User-Agent", "MSIE");
 
-        assertTrue(requestMatcher.matches(request));
-    }
+		assertTrue(requestMatcher.matches(request));
+	}
 
-    @Test
-    public void testHasHeaderTwoEntries() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher(
-                "hasHeader('User-Agent','MSIE') or hasHeader('User-Agent','Mozilla')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("User-Agent", "MSIE");
+	@Test
+	public void testHasHeaderTwoEntries() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher(
+				"hasHeader('User-Agent','MSIE') or hasHeader('User-Agent','Mozilla')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("User-Agent", "MSIE");
 
-        assertTrue(requestMatcher.matches(request));
+		assertTrue(requestMatcher.matches(request));
 
-        request = new MockHttpServletRequest();
-        request.addHeader("User-Agent", "Mozilla");
+		request = new MockHttpServletRequest();
+		request.addHeader("User-Agent", "Mozilla");
 
-        assertTrue(requestMatcher.matches(request));
+		assertTrue(requestMatcher.matches(request));
 
-    }
+	}
 
-    @Test
-    public void testHasHeaderFalse() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher("hasHeader('User-Agent','MSIE')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.addHeader("User-Agent", "wrong");
+	@Test
+	public void testHasHeaderFalse() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher(
+				"hasHeader('User-Agent','MSIE')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("User-Agent", "wrong");
 
-        assertFalse(requestMatcher.matches(request));
-    }
+		assertFalse(requestMatcher.matches(request));
+	}
 
-    @Test
-    public void testHasHeaderNull() throws Exception {
-        ELRequestMatcher requestMatcher = new ELRequestMatcher("hasHeader('User-Agent','MSIE')");
-        MockHttpServletRequest request = new MockHttpServletRequest();
+	@Test
+	public void testHasHeaderNull() throws Exception {
+		ELRequestMatcher requestMatcher = new ELRequestMatcher(
+				"hasHeader('User-Agent','MSIE')");
+		MockHttpServletRequest request = new MockHttpServletRequest();
 
-        assertFalse(requestMatcher.matches(request));
-    }
+		assertFalse(requestMatcher.matches(request));
+	}
 
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java
index 833d3f9f19..df685a3b0a 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/IpAddressMatcherTests.java
@@ -1,6 +1,5 @@
 package org.springframework.security.web.util.matcher;
 
-
 import static org.junit.Assert.*;
 
 import org.junit.Before;
@@ -8,67 +7,66 @@ import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.web.util.matcher.IpAddressMatcher;
 
-
 /**
  * @author Luke Taylor
  */
 public class IpAddressMatcherTests {
-    final IpAddressMatcher v6matcher = new IpAddressMatcher("fe80::21f:5bff:fe33:bd68");
-    final IpAddressMatcher v4matcher = new IpAddressMatcher("192.168.1.104");
-    MockHttpServletRequest ipv4Request = new MockHttpServletRequest();
-    MockHttpServletRequest ipv6Request = new MockHttpServletRequest();
+	final IpAddressMatcher v6matcher = new IpAddressMatcher("fe80::21f:5bff:fe33:bd68");
+	final IpAddressMatcher v4matcher = new IpAddressMatcher("192.168.1.104");
+	MockHttpServletRequest ipv4Request = new MockHttpServletRequest();
+	MockHttpServletRequest ipv6Request = new MockHttpServletRequest();
 
-    @Before
-    public void setup() {
-        ipv6Request.setRemoteAddr("fe80::21f:5bff:fe33:bd68");
-        ipv4Request.setRemoteAddr("192.168.1.104");
-    }
+	@Before
+	public void setup() {
+		ipv6Request.setRemoteAddr("fe80::21f:5bff:fe33:bd68");
+		ipv4Request.setRemoteAddr("192.168.1.104");
+	}
 
-    @Test
-    public void ipv6MatcherMatchesIpv6Address() {
-        assertTrue(v6matcher.matches(ipv6Request));
-    }
+	@Test
+	public void ipv6MatcherMatchesIpv6Address() {
+		assertTrue(v6matcher.matches(ipv6Request));
+	}
 
-    @Test
-    public void ipv6MatcherDoesntMatchIpv4Address() {
-        assertFalse(v6matcher.matches(ipv4Request));
-    }
+	@Test
+	public void ipv6MatcherDoesntMatchIpv4Address() {
+		assertFalse(v6matcher.matches(ipv4Request));
+	}
 
-    @Test
-    public void ipv4MatcherMatchesIpv4Address() {
-        assertTrue(v4matcher.matches(ipv4Request));
-    }
+	@Test
+	public void ipv4MatcherMatchesIpv4Address() {
+		assertTrue(v4matcher.matches(ipv4Request));
+	}
 
-    @Test
-    public void ipv4SubnetMatchesCorrectly() throws Exception {
-        IpAddressMatcher matcher = new IpAddressMatcher("192.168.1.0/24");
-        assertTrue(matcher.matches(ipv4Request));
-        matcher = new IpAddressMatcher("192.168.1.128/25");
-        assertFalse(matcher.matches(ipv4Request));
-        ipv4Request.setRemoteAddr("192.168.1.159"); // 159 = 0x9f
-        assertTrue(matcher.matches(ipv4Request));
-    }
+	@Test
+	public void ipv4SubnetMatchesCorrectly() throws Exception {
+		IpAddressMatcher matcher = new IpAddressMatcher("192.168.1.0/24");
+		assertTrue(matcher.matches(ipv4Request));
+		matcher = new IpAddressMatcher("192.168.1.128/25");
+		assertFalse(matcher.matches(ipv4Request));
+		ipv4Request.setRemoteAddr("192.168.1.159"); // 159 = 0x9f
+		assertTrue(matcher.matches(ipv4Request));
+	}
 
-    @Test
-    public void ipv6RangeMatches() throws Exception {
-        IpAddressMatcher matcher = new IpAddressMatcher("2001:DB8::/48");
+	@Test
+	public void ipv6RangeMatches() throws Exception {
+		IpAddressMatcher matcher = new IpAddressMatcher("2001:DB8::/48");
 
-        assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:0"));
-        assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:1"));
-        assertTrue(matcher.matches("2001:DB8:0:FFFF:FFFF:FFFF:FFFF:FFFF"));
-        assertFalse(matcher.matches("2001:DB8:1:0:0:0:0:0"));
-    }
+		assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:0"));
+		assertTrue(matcher.matches("2001:DB8:0:0:0:0:0:1"));
+		assertTrue(matcher.matches("2001:DB8:0:FFFF:FFFF:FFFF:FFFF:FFFF"));
+		assertFalse(matcher.matches("2001:DB8:1:0:0:0:0:0"));
+	}
 
-    // SEC-1733
-    @Test
-    public void zeroMaskMatchesAnything() throws Exception {
-        IpAddressMatcher matcher = new IpAddressMatcher("0.0.0.0/0");
+	// SEC-1733
+	@Test
+	public void zeroMaskMatchesAnything() throws Exception {
+		IpAddressMatcher matcher = new IpAddressMatcher("0.0.0.0/0");
 
-        assertTrue(matcher.matches("123.4.5.6"));
-        assertTrue(matcher.matches("192.168.0.159"));
+		assertTrue(matcher.matches("123.4.5.6"));
+		assertTrue(matcher.matches("192.168.0.159"));
 
-        matcher = new IpAddressMatcher("192.168.0.159/0");
-        assertTrue(matcher.matches("123.4.5.6"));
-        assertTrue(matcher.matches("192.168.0.159"));
-    }
+		matcher = new IpAddressMatcher("192.168.0.159/0");
+		assertTrue(matcher.matches("123.4.5.6"));
+		assertTrue(matcher.matches("192.168.0.159"));
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java
index 5a32c0d962..57247f2766 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherRequestHCNSTests.java
@@ -34,117 +34,120 @@ import org.springframework.web.accept.HeaderContentNegotiationStrategy;
  *
  */
 public class MediaTypeRequestMatcherRequestHCNSTests {
-    private MediaTypeRequestMatcher matcher;
-    private MockHttpServletRequest request;
+	private MediaTypeRequestMatcher matcher;
+	private MockHttpServletRequest request;
 
-    private ContentNegotiationStrategy negotiationStrategy;
+	private ContentNegotiationStrategy negotiationStrategy;
 
-    @Before
-    public void setup() {
-        negotiationStrategy = new HeaderContentNegotiationStrategy();
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		negotiationStrategy = new HeaderContentNegotiationStrategy();
+		request = new MockHttpServletRequest();
+	}
 
-    @Test
-    public void mediaAllMatches() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+	@Test
+	public void mediaAllMatches() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
 
-        assertThat(matcher.matches(request)).isTrue();
+		assertThat(matcher.matches(request)).isTrue();
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_XHTML_XML);
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy,
+				MediaType.APPLICATION_XHTML_XML);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    // ignoreMediaTypeAll
+	// ignoreMediaTypeAll
 
-    @Test
-    public void mediaAllIgnoreMediaTypeAll() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+	@Test
+	public void mediaAllIgnoreMediaTypeAll() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void mediaAllAndTextHtmlIgnoreMediaTypeAll() {
-        request.addHeader("Accept", MediaType.ALL_VALUE + "," + MediaType.TEXT_HTML_VALUE);
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+	@Test
+	public void mediaAllAndTextHtmlIgnoreMediaTypeAll() {
+		request.addHeader("Accept", MediaType.ALL_VALUE + "," + MediaType.TEXT_HTML_VALUE);
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    // JavaDoc
+	// JavaDoc
 
-    @Test
-    public void javadocJsonJson() {
-        request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
+	@Test
+	public void javadocJsonJson() {
+		request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
+	@Test
+	public void javadocAllJson() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
 
-    @Test
-    public void javadocAllJson() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+	@Test
+	public void javadocAllJsonIgnoreAll() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
+	@Test
+	public void javadocJsonJsonIgnoreAll() {
+		request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void javadocAllJsonIgnoreAll() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void javadocJsonJsonUseEquals() {
+		request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
+	@Test
+	public void javadocAllJsonUseEquals() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void javadocJsonJsonIgnoreAll() {
-        request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
-        assertThat(matcher.matches(request)).isTrue();
-    }
+	@Test
+	public void javadocApplicationAllJsonUseEquals() {
+		request.addHeader("Accept", new MediaType("application", "*"));
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-
-    @Test
-    public void javadocJsonJsonUseEquals() {
-        request.addHeader("Accept", MediaType.APPLICATION_JSON_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isTrue();
-    }
-
-    @Test
-    public void javadocAllJsonUseEquals() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isFalse();
-    }
-
-
-    @Test
-    public void javadocApplicationAllJsonUseEquals() {
-        request.addHeader("Accept", new MediaType("application","*"));
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isFalse();
-    }
-
-
-    @Test
-    public void javadocAllJsonUseFalse() {
-        request.addHeader("Accept", MediaType.ALL_VALUE);
-        MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_JSON);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void javadocAllJsonUseFalse() {
+		request.addHeader("Accept", MediaType.ALL_VALUE);
+		MediaTypeRequestMatcher matcher = new MediaTypeRequestMatcher(
+				negotiationStrategy, MediaType.APPLICATION_JSON);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
index e6b16872c0..0cedb78719 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/MediaTypeRequestMatcherTests.java
@@ -41,156 +41,187 @@ import org.springframework.web.context.request.NativeWebRequest;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MediaTypeRequestMatcherTests {
-    private MediaTypeRequestMatcher matcher;
-    private MockHttpServletRequest request;
+	private MediaTypeRequestMatcher matcher;
+	private MockHttpServletRequest request;
 
-    @Mock
-    private ContentNegotiationStrategy negotiationStrategy;
+	@Mock
+	private ContentNegotiationStrategy negotiationStrategy;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorNullCNSVarargs() {
-        new MediaTypeRequestMatcher(null, MediaType.ALL);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullCNSVarargs() {
+		new MediaTypeRequestMatcher(null, MediaType.ALL);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorNullCNSSet() {
-        new MediaTypeRequestMatcher(null, Collections.singleton(MediaType.ALL));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullCNSSet() {
+		new MediaTypeRequestMatcher(null, Collections.singleton(MediaType.ALL));
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorNoVarargs() {
-        new MediaTypeRequestMatcher(negotiationStrategy);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNoVarargs() {
+		new MediaTypeRequestMatcher(negotiationStrategy);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorNullMediaTypes() {
-        Collection<MediaType> mediaTypes = null;
-        new MediaTypeRequestMatcher(negotiationStrategy, mediaTypes);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullMediaTypes() {
+		Collection<MediaType> mediaTypes = null;
+		new MediaTypeRequestMatcher(negotiationStrategy, mediaTypes);
+	}
 
-    @Test(expected=IllegalArgumentException.class)
-    public void constructorEmtpyMediaTypes() {
-        new MediaTypeRequestMatcher(negotiationStrategy, Collections.<MediaType>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmtpyMediaTypes() {
+		new MediaTypeRequestMatcher(negotiationStrategy,
+				Collections.<MediaType> emptyList());
+	}
 
-    @Test
-    public void negotiationStrategyThrowsHMTNAE() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenThrow(new HttpMediaTypeNotAcceptableException("oops"));
+	@Test
+	public void negotiationStrategyThrowsHMTNAE()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenThrow(new HttpMediaTypeNotAcceptableException("oops"));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.ALL);
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.ALL);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void mediaAllMatches() throws Exception {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.ALL));
+	@Test
+	public void mediaAllMatches() throws Exception {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.ALL));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        assertThat(matcher.matches(request)).isTrue();
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		assertThat(matcher.matches(request)).isTrue();
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_XHTML_XML);
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy,
+				MediaType.APPLICATION_XHTML_XML);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void multipleMediaType() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.TEXT_PLAIN,MediaType.APPLICATION_XHTML_XML,MediaType.TEXT_HTML));
+	@Test
+	public void multipleMediaType() throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(
+						Arrays.asList(MediaType.TEXT_PLAIN,
+								MediaType.APPLICATION_XHTML_XML, MediaType.TEXT_HTML));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_ATOM_XML, MediaType.TEXT_HTML);
-        assertThat(matcher.matches(request)).isTrue();
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy,
+				MediaType.APPLICATION_ATOM_XML, MediaType.TEXT_HTML);
+		assertThat(matcher.matches(request)).isTrue();
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_XHTML_XML, MediaType.APPLICATION_JSON);
-        assertThat(matcher.matches(request)).isTrue();
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy,
+				MediaType.APPLICATION_XHTML_XML, MediaType.APPLICATION_JSON);
+		assertThat(matcher.matches(request)).isTrue();
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON);
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy,
+				MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void resolveTextPlainMatchesTextAll() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
+	@Test
+	public void resolveTextPlainMatchesTextAll()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text","*"));
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text",
+				"*"));
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void resolveTextAllMatchesTextPlain() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(new MediaType("text","*")));
+	@Test
+	public void resolveTextAllMatchesTextPlain()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(new MediaType("text", "*")));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    // useEquals
+	// useEquals
 
-    @Test
-    public void useEqualsResolveTextAllMatchesTextPlain() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(new MediaType("text","*")));
+	@Test
+	public void useEqualsResolveTextAllMatchesTextPlain()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(new MediaType("text", "*")));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void useEqualsResolveTextPlainMatchesTextAll() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
+	@Test
+	public void useEqualsResolveTextPlainMatchesTextAll()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text","*"));
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text",
+				"*"));
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void useEqualsSame() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
+	@Test
+	public void useEqualsSame() throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.TEXT_PLAIN));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_PLAIN);
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void useEqualsWithCustomMediaType() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(new MediaType("text","unique")));
+	@Test
+	public void useEqualsWithCustomMediaType() throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(new MediaType("text", "unique")));
 
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text","unique"));
-        matcher.setUseEquals(true);
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, new MediaType("text",
+				"unique"));
+		matcher.setUseEquals(true);
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    // ignoreMediaTypeAll
+	// ignoreMediaTypeAll
 
-    @Test
-    public void mediaAllIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.ALL));
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+	@Test
+	public void mediaAllIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.ALL));
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    @Test
-    public void mediaAllAndTextHtmlIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.ALL,MediaType.TEXT_HTML));
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+	@Test
+	public void mediaAllAndTextHtmlIgnoreMediaTypeAll()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(Arrays.asList(MediaType.ALL, MediaType.TEXT_HTML));
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void mediaAllQ08AndTextPlainIgnoreMediaTypeAll() throws HttpMediaTypeNotAcceptableException {
-        when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class))).thenReturn(Arrays.asList(MediaType.TEXT_PLAIN,MediaType.parseMediaType("*/*;q=0.8")));
-        matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
-        matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
+	@Test
+	public void mediaAllQ08AndTextPlainIgnoreMediaTypeAll()
+			throws HttpMediaTypeNotAcceptableException {
+		when(negotiationStrategy.resolveMediaTypes(any(NativeWebRequest.class)))
+				.thenReturn(
+						Arrays.asList(MediaType.TEXT_PLAIN,
+								MediaType.parseMediaType("*/*;q=0.8")));
+		matcher = new MediaTypeRequestMatcher(negotiationStrategy, MediaType.TEXT_HTML);
+		matcher.setIgnoredMediaTypes(Collections.singleton(MediaType.ALL));
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java
index 7f189504ff..44cc5fd6c9 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/NegatedRequestMatcherTests.java
@@ -34,32 +34,32 @@ import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class NegatedRequestMatcherTests {
-    @Mock
-    private RequestMatcher delegate;
+	@Mock
+	private RequestMatcher delegate;
 
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    private RequestMatcher matcher;
+	private RequestMatcher matcher;
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNull() {
-        new NegatedRequestMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNull() {
+		new NegatedRequestMatcher(null);
+	}
 
-    @Test
-    public void matchesDelegateFalse() {
-        when(delegate.matches(request)).thenReturn(false);
-        matcher = new NegatedRequestMatcher(delegate);
+	@Test
+	public void matchesDelegateFalse() {
+		when(delegate.matches(request)).thenReturn(false);
+		matcher = new NegatedRequestMatcher(delegate);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void matchesDelegateTrue() {
-        when(delegate.matches(request)).thenReturn(true);
-        matcher = new NegatedRequestMatcher(delegate);
+	@Test
+	public void matchesDelegateTrue() {
+		when(delegate.matches(request)).thenReturn(true);
+		matcher = new NegatedRequestMatcher(delegate);
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java
index ccf5a4291a..56bd3e1295 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/OrRequestMatcherTests.java
@@ -38,88 +38,87 @@ import org.springframework.security.web.util.matcher.OrRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class OrRequestMatcherTests {
-    @Mock
-    private RequestMatcher delegate;
+	@Mock
+	private RequestMatcher delegate;
 
-    @Mock
-    private RequestMatcher delegate2;
+	@Mock
+	private RequestMatcher delegate2;
 
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    private RequestMatcher matcher;
+	private RequestMatcher matcher;
 
-    @Test(expected = NullPointerException.class)
-    public void constructorNullArray() {
-        new OrRequestMatcher((RequestMatcher[]) null);
-    }
+	@Test(expected = NullPointerException.class)
+	public void constructorNullArray() {
+		new OrRequestMatcher((RequestMatcher[]) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorArrayContainsNull() {
-        new OrRequestMatcher((RequestMatcher)null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorArrayContainsNull() {
+		new OrRequestMatcher((RequestMatcher) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyArray() {
-        new OrRequestMatcher(new RequestMatcher[0]);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyArray() {
+		new OrRequestMatcher(new RequestMatcher[0]);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullList() {
-        new OrRequestMatcher((List<RequestMatcher>) null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullList() {
+		new OrRequestMatcher((List<RequestMatcher>) null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorListContainsNull() {
-        new OrRequestMatcher(Arrays.asList((RequestMatcher)null));
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorListContainsNull() {
+		new OrRequestMatcher(Arrays.asList((RequestMatcher) null));
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorEmptyList() {
-        new OrRequestMatcher(Collections.<RequestMatcher>emptyList());
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorEmptyList() {
+		new OrRequestMatcher(Collections.<RequestMatcher> emptyList());
+	}
 
-    @Test
-    public void matchesSingleTrue() {
-        when(delegate.matches(request)).thenReturn(true);
-        matcher = new OrRequestMatcher(delegate);
+	@Test
+	public void matchesSingleTrue() {
+		when(delegate.matches(request)).thenReturn(true);
+		matcher = new OrRequestMatcher(delegate);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
-    @Test
-    public void matchesMultiTrue() {
-        when(delegate.matches(request)).thenReturn(true);
-        when(delegate2.matches(request)).thenReturn(true);
-        matcher = new OrRequestMatcher(delegate, delegate2);
+	@Test
+	public void matchesMultiTrue() {
+		when(delegate.matches(request)).thenReturn(true);
+		when(delegate2.matches(request)).thenReturn(true);
+		matcher = new OrRequestMatcher(delegate, delegate2);
 
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 
+	@Test
+	public void matchesSingleFalse() {
+		when(delegate.matches(request)).thenReturn(false);
+		matcher = new OrRequestMatcher(delegate);
 
-    @Test
-    public void matchesSingleFalse() {
-        when(delegate.matches(request)).thenReturn(false);
-        matcher = new OrRequestMatcher(delegate);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void matchesMultiBothFalse() {
+		when(delegate.matches(request)).thenReturn(false);
+		when(delegate2.matches(request)).thenReturn(false);
+		matcher = new OrRequestMatcher(delegate, delegate2);
 
-    @Test
-    public void matchesMultiBothFalse() {
-        when(delegate.matches(request)).thenReturn(false);
-        when(delegate2.matches(request)).thenReturn(false);
-        matcher = new OrRequestMatcher(delegate, delegate2);
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+	@Test
+	public void matchesMultiSingleFalse() {
+		when(delegate.matches(request)).thenReturn(true);
+		when(delegate2.matches(request)).thenReturn(false);
+		matcher = new OrRequestMatcher(delegate, delegate2);
 
-    @Test
-    public void matchesMultiSingleFalse() {
-        when(delegate.matches(request)).thenReturn(true);
-        when(delegate2.matches(request)).thenReturn(false);
-        matcher = new OrRequestMatcher(delegate, delegate2);
-
-        assertThat(matcher.matches(request)).isTrue();
-    }
+		assertThat(matcher.matches(request)).isTrue();
+	}
 }
\ No newline at end of file
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java
index a0a31936a8..794d4960b7 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/RegexRequestMatcherTests.java
@@ -32,82 +32,83 @@ import org.springframework.security.web.util.matcher.RegexRequestMatcher;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class RegexRequestMatcherTests {
-    @Mock
-    private HttpServletRequest request;
+	@Mock
+	private HttpServletRequest request;
 
-    @Test
-    public void doesntMatchIfHttpMethodIsDifferent() throws Exception {
-        RegexRequestMatcher matcher = new RegexRequestMatcher(".*", "GET");
+	@Test
+	public void doesntMatchIfHttpMethodIsDifferent() throws Exception {
+		RegexRequestMatcher matcher = new RegexRequestMatcher(".*", "GET");
 
-        MockHttpServletRequest request = new MockHttpServletRequest("POST", "/anything");
+		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/anything");
 
-        assertFalse(matcher.matches(request));
-    }
+		assertFalse(matcher.matches(request));
+	}
 
-    @Test
-    public void matchesIfHttpMethodAndPathMatch() throws Exception {
-        RegexRequestMatcher matcher = new RegexRequestMatcher(".*", "GET");
+	@Test
+	public void matchesIfHttpMethodAndPathMatch() throws Exception {
+		RegexRequestMatcher matcher = new RegexRequestMatcher(".*", "GET");
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/anything");
-        request.setServletPath("/anything");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/anything");
+		request.setServletPath("/anything");
 
-        assertTrue(matcher.matches(request));
-    }
+		assertTrue(matcher.matches(request));
+	}
 
-    @Test
-    public void queryStringIsMatcherCorrectly() throws Exception {
-        RegexRequestMatcher matcher = new RegexRequestMatcher(".*\\?x=y", "GET");
+	@Test
+	public void queryStringIsMatcherCorrectly() throws Exception {
+		RegexRequestMatcher matcher = new RegexRequestMatcher(".*\\?x=y", "GET");
 
-        MockHttpServletRequest request = new MockHttpServletRequest("GET", "/any/path?x=y");
-        request.setServletPath("/any");
-        request.setPathInfo("/path");
-        request.setQueryString("x=y");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET",
+				"/any/path?x=y");
+		request.setServletPath("/any");
+		request.setPathInfo("/path");
+		request.setQueryString("x=y");
 
-        assertTrue(matcher.matches(request));
-    }
+		assertTrue(matcher.matches(request));
+	}
 
-    @Test
-    public void requestHasNullMethodMatches() {
-        RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET");
-        HttpServletRequest request = createRequestWithNullMethod("/something/here");
-        assertTrue(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodMatches() {
+		RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET");
+		HttpServletRequest request = createRequestWithNullMethod("/something/here");
+		assertTrue(matcher.matches(request));
+	}
 
-    // SEC-2084
-    @Test
-    public void requestHasNullMethodNoMatch() {
-        RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET");
-        HttpServletRequest request = createRequestWithNullMethod("/nomatch");
-        assertFalse(matcher.matches(request));
-    }
+	// SEC-2084
+	@Test
+	public void requestHasNullMethodNoMatch() {
+		RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", "GET");
+		HttpServletRequest request = createRequestWithNullMethod("/nomatch");
+		assertFalse(matcher.matches(request));
+	}
 
-    @Test
-    public void requestHasNullMethodAndNullMatcherMatches() {
-        RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null);
-        HttpServletRequest request = createRequestWithNullMethod("/something/here");
-        assertTrue(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodAndNullMatcherMatches() {
+		RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null);
+		HttpServletRequest request = createRequestWithNullMethod("/something/here");
+		assertTrue(matcher.matches(request));
+	}
 
-    @Test
-    public void requestHasNullMethodAndNullMatcherNoMatch() {
-        RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null);
-        HttpServletRequest request = createRequestWithNullMethod("/nomatch");
-        assertFalse(matcher.matches(request));
-    }
+	@Test
+	public void requestHasNullMethodAndNullMatcherNoMatch() {
+		RegexRequestMatcher matcher = new RegexRequestMatcher("/something/.*", null);
+		HttpServletRequest request = createRequestWithNullMethod("/nomatch");
+		assertFalse(matcher.matches(request));
+	}
 
-    // SEC-2831
-    @Test
-    public void matchesWithInvalidMethod() {
-        RegexRequestMatcher matcher = new RegexRequestMatcher("/blah", "GET");
-        MockHttpServletRequest request = new MockHttpServletRequest("INVALID","/blah");
-        request.setMethod("INVALID");
+	// SEC-2831
+	@Test
+	public void matchesWithInvalidMethod() {
+		RegexRequestMatcher matcher = new RegexRequestMatcher("/blah", "GET");
+		MockHttpServletRequest request = new MockHttpServletRequest("INVALID", "/blah");
+		request.setMethod("INVALID");
 
-        assertThat(matcher.matches(request)).isFalse();
-    }
+		assertThat(matcher.matches(request)).isFalse();
+	}
 
-    private HttpServletRequest createRequestWithNullMethod(String path) {
-        when(request.getQueryString()).thenReturn("doesntMatter");
-        when(request.getServletPath()).thenReturn(path);
-        return request;
-    }
+	private HttpServletRequest createRequestWithNullMethod(String path) {
+		when(request.getQueryString()).thenReturn("doesntMatter");
+		when(request.getServletPath()).thenReturn(path);
+		return request;
+	}
 }
diff --git a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java
index 22077eb012..a29a07cced 100644
--- a/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java
+++ b/web/src/test/java/org/springframework/security/web/util/matcher/RequestHeaderRequestMatcherTests.java
@@ -29,61 +29,70 @@ import org.springframework.security.web.util.matcher.RequestHeaderRequestMatcher
  */
 public class RequestHeaderRequestMatcherTests {
 
-    private final String headerName = "headerName";
+	private final String headerName = "headerName";
 
-    private final String headerValue = "headerValue";
+	private final String headerValue = "headerValue";
 
-    private MockHttpServletRequest request;
+	private MockHttpServletRequest request;
 
-    @Before
-    public void setup() {
-        request = new MockHttpServletRequest();
-    }
+	@Before
+	public void setup() {
+		request = new MockHttpServletRequest();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaderName() {
-        new RequestHeaderRequestMatcher(null);
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaderName() {
+		new RequestHeaderRequestMatcher(null);
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void constructorNullHeaderNameNonNullHeaderValue() {
-        new RequestHeaderRequestMatcher(null,"v");
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNullHeaderNameNonNullHeaderValue() {
+		new RequestHeaderRequestMatcher(null, "v");
+	}
 
-    @Test
-    public void matchesHeaderNameMatches() {
-        request.addHeader(headerName, headerValue);
-        assertThat(new RequestHeaderRequestMatcher(headerName).matches(request)).isTrue();
-    }
+	@Test
+	public void matchesHeaderNameMatches() {
+		request.addHeader(headerName, headerValue);
+		assertThat(new RequestHeaderRequestMatcher(headerName).matches(request)).isTrue();
+	}
 
-    @Test
-    public void matchesHeaderNameDoesNotMatch() {
-        request.addHeader(headerName+"notMatch", headerValue);
-        assertThat(new RequestHeaderRequestMatcher(headerName).matches(request)).isFalse();
-    }
+	@Test
+	public void matchesHeaderNameDoesNotMatch() {
+		request.addHeader(headerName + "notMatch", headerValue);
+		assertThat(new RequestHeaderRequestMatcher(headerName).matches(request))
+				.isFalse();
+	}
 
-    @Test
-    public void matchesHeaderNameValueMatches() {
-        request.addHeader(headerName, headerValue);
-        assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isTrue();
-    }
+	@Test
+	public void matchesHeaderNameValueMatches() {
+		request.addHeader(headerName, headerValue);
+		assertThat(
+				new RequestHeaderRequestMatcher(headerName, headerValue).matches(request))
+				.isTrue();
+	}
 
-    @Test
-    public void matchesHeaderNameValueHeaderNameNotMatch() {
-        request.addHeader(headerName+"notMatch", headerValue);
-        assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse();
-    }
+	@Test
+	public void matchesHeaderNameValueHeaderNameNotMatch() {
+		request.addHeader(headerName + "notMatch", headerValue);
+		assertThat(
+				new RequestHeaderRequestMatcher(headerName, headerValue).matches(request))
+				.isFalse();
+	}
 
-    @Test
-    public void matchesHeaderNameValueHeaderValueNotMatch() {
-        request.addHeader(headerName, headerValue+"notMatch");
-        assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse();
-    }
+	@Test
+	public void matchesHeaderNameValueHeaderValueNotMatch() {
+		request.addHeader(headerName, headerValue + "notMatch");
+		assertThat(
+				new RequestHeaderRequestMatcher(headerName, headerValue).matches(request))
+				.isFalse();
+	}
 
-    @Test
-    public void matchesHeaderNameValueHeaderValueMultiNotMatch() {
-        request.addHeader(headerName, headerValue+"notMatch");
-        request.addHeader(headerName, headerValue);
-        assertThat(new RequestHeaderRequestMatcher(headerName, headerValue).matches(request)).isFalse();
-    }
+	@Test
+	public void matchesHeaderNameValueHeaderValueMultiNotMatch() {
+		request.addHeader(headerName, headerValue + "notMatch");
+		request.addHeader(headerName, headerValue);
+		assertThat(
+				new RequestHeaderRequestMatcher(headerName, headerValue).matches(request))
+				.isFalse();
+	}
 }